@open-mercato/ai-assistant 0.6.1-develop.3291.1.6fad645fd0 → 0.6.1

package/dist/modules/ai_assistant/migrations/Migration20260508170000_ai_token_usage.js

@@ -0,0 +1,88 @@
+import { Migration } from "@mikro-orm/migrations";
+class Migration20260508170000_ai_token_usage extends Migration {
+  async up() {
+    this.addSql(`
+      create table "ai_token_usage_events" (
+        "id" uuid not null default gen_random_uuid(),
+        "tenant_id" uuid not null,
+        "organization_id" uuid null,
+        "user_id" uuid not null,
+        "agent_id" text not null,
+        "module_id" text not null,
+        "session_id" uuid not null,
+        "turn_id" uuid not null,
+        "step_index" int not null,
+        "provider_id" text not null,
+        "model_id" text not null,
+        "input_tokens" int not null,
+        "output_tokens" int not null,
+        "cached_input_tokens" int null,
+        "reasoning_tokens" int null,
+        "finish_reason" text null,
+        "loop_abort_reason" text null,
+        "created_at" timestamptz not null,
+        "updated_at" timestamptz not null,
+        constraint "ai_token_usage_events_pkey" primary key ("id")
+      );
+    `);
+    this.addSql(`
+      create index "ai_token_usage_events_tenant_created_idx"
+        on "ai_token_usage_events" ("tenant_id", "created_at" desc);
+    `);
+    this.addSql(`
+      create index "ai_token_usage_events_tenant_agent_created_idx"
+        on "ai_token_usage_events" ("tenant_id", "agent_id", "created_at" desc);
+    `);
+    this.addSql(`
+      create index "ai_token_usage_events_tenant_model_created_idx"
+        on "ai_token_usage_events" ("tenant_id", "model_id", "created_at" desc);
+    `);
+    this.addSql(`
+      create index "ai_token_usage_events_tenant_session_turn_step_idx"
+        on "ai_token_usage_events" ("tenant_id", "session_id", "turn_id", "step_index");
+    `);
+    this.addSql(`
+      create table "ai_token_usage_daily" (
+        "id" uuid not null default gen_random_uuid(),
+        "tenant_id" uuid not null,
+        "organization_id" uuid null,
+        "day" date not null,
+        "agent_id" text not null,
+        "model_id" text not null,
+        "provider_id" text not null,
+        "input_tokens" bigint not null default 0,
+        "output_tokens" bigint not null default 0,
+        "cached_input_tokens" bigint not null default 0,
+        "reasoning_tokens" bigint not null default 0,
+        "step_count" bigint not null default 0,
+        "turn_count" bigint not null default 0,
+        "session_count" bigint not null default 0,
+        "created_at" timestamptz not null,
+        "updated_at" timestamptz not null,
+        constraint "ai_token_usage_daily_pkey" primary key ("id")
+      );
+    `);
+    this.addSql(`
+      create unique index "ai_token_usage_daily_tenant_day_agent_model_org_uq"
+        on "ai_token_usage_daily" ("tenant_id", "day", "agent_id", "model_id", "organization_id")
+        where "organization_id" is not null;
+    `);
+    this.addSql(`
+      create unique index "ai_token_usage_daily_tenant_day_agent_model_null_org_uq"
+        on "ai_token_usage_daily" ("tenant_id", "day", "agent_id", "model_id")
+        where "organization_id" is null;
+    `);
+    this.addSql(`
+      create index "ai_token_usage_daily_tenant_day_idx"
+        on "ai_token_usage_daily" ("tenant_id", "day");
+    `);
+  }
+  async down() {
+    this.addSql(`drop table if exists "ai_token_usage_events" cascade;`);
+    this.addSql(`drop table if exists "ai_token_usage_daily" cascade;`);
+  }
+}
+export {
+  Migration20260508170000_ai_token_usage
+};
+//# sourceMappingURL=Migration20260508170000_ai_token_usage.js.map

package/dist/modules/ai_assistant/migrations/Migration20260508170000_ai_token_usage.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/ai_assistant/migrations/Migration20260508170000_ai_token_usage.ts"],
+  "sourcesContent": ["import { Migration } from '@mikro-orm/migrations'\n\nexport class Migration20260508170000_ai_token_usage extends Migration {\n\n  override async up(): Promise<void> {\n    this.addSql(`\n      create table \"ai_token_usage_events\" (\n        \"id\" uuid not null default gen_random_uuid(),\n        \"tenant_id\" uuid not null,\n        \"organization_id\" uuid null,\n        \"user_id\" uuid not null,\n        \"agent_id\" text not null,\n        \"module_id\" text not null,\n        \"session_id\" uuid not null,\n        \"turn_id\" uuid not null,\n        \"step_index\" int not null,\n        \"provider_id\" text not null,\n        \"model_id\" text not null,\n        \"input_tokens\" int not null,\n        \"output_tokens\" int not null,\n        \"cached_input_tokens\" int null,\n        \"reasoning_tokens\" int null,\n        \"finish_reason\" text null,\n        \"loop_abort_reason\" text null,\n        \"created_at\" timestamptz not null,\n        \"updated_at\" timestamptz not null,\n        constraint \"ai_token_usage_events_pkey\" primary key (\"id\")\n      );\n    `)\n    this.addSql(`\n      create index \"ai_token_usage_events_tenant_created_idx\"\n        on \"ai_token_usage_events\" (\"tenant_id\", \"created_at\" desc);\n    `)\n    this.addSql(`\n      create index \"ai_token_usage_events_tenant_agent_created_idx\"\n        on \"ai_token_usage_events\" (\"tenant_id\", \"agent_id\", \"created_at\" desc);\n    `)\n    this.addSql(`\n      create index \"ai_token_usage_events_tenant_model_created_idx\"\n        on \"ai_token_usage_events\" (\"tenant_id\", \"model_id\", \"created_at\" desc);\n    `)\n    this.addSql(`\n      create index \"ai_token_usage_events_tenant_session_turn_step_idx\"\n        on \"ai_token_usage_events\" (\"tenant_id\", \"session_id\", \"turn_id\", \"step_index\");\n    `)\n\n    this.addSql(`\n      create table \"ai_token_usage_daily\" (\n        \"id\" uuid not null default gen_random_uuid(),\n        \"tenant_id\" uuid not null,\n        \"organization_id\" uuid null,\n        \"day\" date not null,\n        \"agent_id\" text not null,\n        \"model_id\" text not null,\n        \"provider_id\" text not null,\n        \"input_tokens\" bigint not null default 0,\n        \"output_tokens\" bigint not null default 0,\n        \"cached_input_tokens\" bigint not null default 0,\n        \"reasoning_tokens\" bigint not null default 0,\n        \"step_count\" bigint not null default 0,\n        \"turn_count\" bigint not null default 0,\n        \"session_count\" bigint not null default 0,\n        \"created_at\" timestamptz not null,\n        \"updated_at\" timestamptz not null,\n        constraint \"ai_token_usage_daily_pkey\" primary key (\"id\")\n      );\n    `)\n    this.addSql(`\n      create unique index \"ai_token_usage_daily_tenant_day_agent_model_org_uq\"\n        on \"ai_token_usage_daily\" (\"tenant_id\", \"day\", \"agent_id\", \"model_id\", \"organization_id\")\n        where \"organization_id\" is not null;\n    `)\n    this.addSql(`\n      create unique index \"ai_token_usage_daily_tenant_day_agent_model_null_org_uq\"\n        on \"ai_token_usage_daily\" (\"tenant_id\", \"day\", \"agent_id\", \"model_id\")\n        where \"organization_id\" is null;\n    `)\n    this.addSql(`\n      create index \"ai_token_usage_daily_tenant_day_idx\"\n        on \"ai_token_usage_daily\" (\"tenant_id\", \"day\");\n    `)\n  }\n\n  override async down(): Promise<void> {\n    this.addSql(`drop table if exists \"ai_token_usage_events\" cascade;`)\n    this.addSql(`drop table if exists \"ai_token_usage_daily\" cascade;`)\n  }\n\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAEnB,MAAM,+CAA+C,UAAU;AAAA,EAEpE,MAAe,KAAoB;AACjC,SAAK,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAuBX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA,KAGX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA,KAGX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA,KAGX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA,KAGX;AAED,SAAK,OAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,KAoBX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA;AAAA,KAIX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA;AAAA,KAIX;AACD,SAAK,OAAO;AAAA;AAAA;AAAA,KAGX;AAAA,EACH;AAAA,EAEA,MAAe,OAAsB;AACnC,SAAK,OAAO,uDAAuD;AACnE,SAAK,OAAO,sDAAsD;AAAA,EACpE;AAEF;",
+  "names": []
+}

package/dist/modules/ai_assistant/setup.js

@@ -1,4 +1,5 @@
 const PENDING_ACTION_CLEANUP_SCHEDULE_ID = "ai_assistant:pending-action-cleanup";
+const TOKEN_USAGE_PRUNE_SCHEDULE_ID = "ai_assistant:token-usage-prune";
 async function ensurePendingActionCleanupSchedule(container) {
   if (!container) return;
   let schedulerService;
@@ -31,6 +32,38 @@ async function ensurePendingActionCleanupSchedule(container) {
     );
   }
 }
+async function ensureTokenUsagePruneSchedule(container) {
+  if (!container) return;
+  let schedulerService;
+  try {
+    schedulerService = container.resolve("schedulerService");
+  } catch {
+    schedulerService = void 0;
+  }
+  if (!schedulerService) return;
+  try {
+    await schedulerService.register({
+      id: TOKEN_USAGE_PRUNE_SCHEDULE_ID,
+      name: "AI token-usage prune",
+      description: "Delete ai_token_usage_events rows older than AI_TOKEN_USAGE_EVENTS_RETENTION_DAYS (default 90) and reconcile session_count on the daily rollup.",
+      scopeType: "system",
+      scheduleType: "interval",
+      scheduleValue: "24h",
+      timezone: "UTC",
+      targetType: "queue",
+      targetQueue: "ai-token-usage-prune",
+      targetPayload: {},
+      sourceType: "module",
+      sourceModule: "ai_assistant",
+      isEnabled: true
+    });
+  } catch (error) {
+    console.warn(
+      "[ai_assistant] Failed to register token-usage prune schedule:",
+      error instanceof Error ? error.message : error
+    );
+  }
+}
 const setup = {
   defaultRoleFeatures: {
     admin: [
@@ -45,6 +78,7 @@ const setup = {
   },
   async seedDefaults({ container }) {
     await ensurePendingActionCleanupSchedule(container);
+    await ensureTokenUsagePruneSchedule(container);
   }
 };
 var setup_default = setup;

package/dist/modules/ai_assistant/setup.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/modules/ai_assistant/setup.ts"],
-  "sourcesContent": ["import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'\n\nconst PENDING_ACTION_CLEANUP_SCHEDULE_ID = 'ai_assistant:pending-action-cleanup'\n\n/**\n * System-scoped recurring schedule: every 5 minutes, enqueue a job to the\n * `ai-pending-action-cleanup` queue so the worker can sweep rows whose TTL\n * elapsed without any confirm/cancel activity (Step 5.12). The schedule id\n * is stable and `scheduler.register()` is an upsert, so calling this from\n * every tenant bootstrap stays idempotent.\n */\nasync function ensurePendingActionCleanupSchedule(\n  container: import('awilix').AwilixContainer | undefined,\n): Promise<void> {\n  if (!container) return\n  let schedulerService:\n    | {\n        register: (registration: Record<string, unknown>) => Promise<void>\n      }\n    | undefined\n  try {\n    schedulerService = container.resolve('schedulerService')\n  } catch {\n    schedulerService = undefined\n  }\n  if (!schedulerService) return\n  try {\n    await schedulerService.register({\n      id: PENDING_ACTION_CLEANUP_SCHEDULE_ID,\n      name: 'AI pending-action cleanup',\n      description:\n        'Sweep pending AI mutation approvals whose TTL elapsed without confirm/cancel and flip them to expired.',\n      scopeType: 'system',\n      scheduleType: 'interval',\n      scheduleValue: '5m',\n      timezone: 'UTC',\n      targetType: 'queue',\n      targetQueue: 'ai-pending-action-cleanup',\n      targetPayload: {},\n      sourceType: 'module',\n      sourceModule: 'ai_assistant',\n      isEnabled: true,\n    })\n  } catch (error) {\n    console.warn(\n      '[ai_assistant] Failed to register pending-action cleanup schedule:',\n      error instanceof Error ? error.message : error,\n    )\n  }\n}\n\nexport const setup: ModuleSetupConfig = {\n  defaultRoleFeatures: {\n    admin: [\n      'ai_assistant.view',\n      'ai_assistant.settings.manage',\n      'ai_assistant.mcp.serve',\n      'ai_assistant.tools.list',\n      'ai_assistant.mcp_servers.view',\n      'ai_assistant.mcp_servers.manage',\n    ],\n    employee: ['ai_assistant.view'],\n  },\n\n  async seedDefaults({ container }) {\n    await ensurePendingActionCleanupSchedule(container)\n  },\n}\n\nexport default setup\n"],
-  "mappings": "AAEA,MAAM,qCAAqC;AAS3C,eAAe,mCACb,WACe;AACf,MAAI,CAAC,UAAW;AAChB,MAAI;AAKJ,MAAI;AACF,uBAAmB,UAAU,QAAQ,kBAAkB;AAAA,EACzD,QAAQ;AACN,uBAAmB;AAAA,EACrB;AACA,MAAI,CAAC,iBAAkB;AACvB,MAAI;AACF,UAAM,iBAAiB,SAAS;AAAA,MAC9B,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,aACE;AAAA,MACF,WAAW;AAAA,MACX,cAAc;AAAA,MACd,eAAe;AAAA,MACf,UAAU;AAAA,MACV,YAAY;AAAA,MACZ,aAAa;AAAA,MACb,eAAe,CAAC;AAAA,MAChB,YAAY;AAAA,MACZ,cAAc;AAAA,MACd,WAAW;AAAA,IACb,CAAC;AAAA,EACH,SAAS,OAAO;AACd,YAAQ;AAAA,MACN;AAAA,MACA,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AACF;AAEO,MAAM,QAA2B;AAAA,EACtC,qBAAqB;AAAA,IACnB,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,UAAU,CAAC,mBAAmB;AAAA,EAChC;AAAA,EAEA,MAAM,aAAa,EAAE,UAAU,GAAG;AAChC,UAAM,mCAAmC,SAAS;AAAA,EACpD;AACF;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import type { ModuleSetupConfig } from '@open-mercato/shared/modules/setup'\n\nconst PENDING_ACTION_CLEANUP_SCHEDULE_ID = 'ai_assistant:pending-action-cleanup'\nconst TOKEN_USAGE_PRUNE_SCHEDULE_ID = 'ai_assistant:token-usage-prune'\n\n/**\n * System-scoped recurring schedule: every 5 minutes, enqueue a job to the\n * `ai-pending-action-cleanup` queue so the worker can sweep rows whose TTL\n * elapsed without any confirm/cancel activity (Step 5.12). The schedule id\n * is stable and `scheduler.register()` is an upsert, so calling this from\n * every tenant bootstrap stays idempotent.\n */\nasync function ensurePendingActionCleanupSchedule(\n  container: import('awilix').AwilixContainer | undefined,\n): Promise<void> {\n  if (!container) return\n  let schedulerService:\n    | {\n        register: (registration: Record<string, unknown>) => Promise<void>\n      }\n    | undefined\n  try {\n    schedulerService = container.resolve('schedulerService')\n  } catch {\n    schedulerService = undefined\n  }\n  if (!schedulerService) return\n  try {\n    await schedulerService.register({\n      id: PENDING_ACTION_CLEANUP_SCHEDULE_ID,\n      name: 'AI pending-action cleanup',\n      description:\n        'Sweep pending AI mutation approvals whose TTL elapsed without confirm/cancel and flip them to expired.',\n      scopeType: 'system',\n      scheduleType: 'interval',\n      scheduleValue: '5m',\n      timezone: 'UTC',\n      targetType: 'queue',\n      targetQueue: 'ai-pending-action-cleanup',\n      targetPayload: {},\n      sourceType: 'module',\n      sourceModule: 'ai_assistant',\n      isEnabled: true,\n    })\n  } catch (error) {\n    console.warn(\n      '[ai_assistant] Failed to register pending-action cleanup schedule:',\n      error instanceof Error ? error.message : error,\n    )\n  }\n}\n\n/**\n * System-scoped daily schedule: enqueue a job to the `ai-token-usage-prune`\n * queue to prune events older than the retention window and reconcile the\n * daily rollup session counts.\n *\n * Phase 6.4 of spec `2026-04-28-ai-agents-agentic-loop-controls`.\n */\nasync function ensureTokenUsagePruneSchedule(\n  container: import('awilix').AwilixContainer | undefined,\n): Promise<void> {\n  if (!container) return\n  let schedulerService:\n    | {\n        register: (registration: Record<string, unknown>) => Promise<void>\n      }\n    | undefined\n  try {\n    schedulerService = container.resolve('schedulerService')\n  } catch {\n    schedulerService = undefined\n  }\n  if (!schedulerService) return\n  try {\n    await schedulerService.register({\n      id: TOKEN_USAGE_PRUNE_SCHEDULE_ID,\n      name: 'AI token-usage prune',\n      description:\n        'Delete ai_token_usage_events rows older than AI_TOKEN_USAGE_EVENTS_RETENTION_DAYS (default 90) and reconcile session_count on the daily rollup.',\n      scopeType: 'system',\n      scheduleType: 'interval',\n      scheduleValue: '24h',\n      timezone: 'UTC',\n      targetType: 'queue',\n      targetQueue: 'ai-token-usage-prune',\n      targetPayload: {},\n      sourceType: 'module',\n      sourceModule: 'ai_assistant',\n      isEnabled: true,\n    })\n  } catch (error) {\n    console.warn(\n      '[ai_assistant] Failed to register token-usage prune schedule:',\n      error instanceof Error ? error.message : error,\n    )\n  }\n}\n\nexport const setup: ModuleSetupConfig = {\n  defaultRoleFeatures: {\n    admin: [\n      'ai_assistant.view',\n      'ai_assistant.settings.manage',\n      'ai_assistant.mcp.serve',\n      'ai_assistant.tools.list',\n      'ai_assistant.mcp_servers.view',\n      'ai_assistant.mcp_servers.manage',\n    ],\n    employee: ['ai_assistant.view'],\n  },\n\n  async seedDefaults({ container }) {\n    await ensurePendingActionCleanupSchedule(container)\n    await ensureTokenUsagePruneSchedule(container)\n  },\n}\n\nexport default setup\n"],
+  "mappings": "AAEA,MAAM,qCAAqC;AAC3C,MAAM,gCAAgC;AAStC,eAAe,mCACb,WACe;AACf,MAAI,CAAC,UAAW;AAChB,MAAI;AAKJ,MAAI;AACF,uBAAmB,UAAU,QAAQ,kBAAkB;AAAA,EACzD,QAAQ;AACN,uBAAmB;AAAA,EACrB;AACA,MAAI,CAAC,iBAAkB;AACvB,MAAI;AACF,UAAM,iBAAiB,SAAS;AAAA,MAC9B,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,aACE;AAAA,MACF,WAAW;AAAA,MACX,cAAc;AAAA,MACd,eAAe;AAAA,MACf,UAAU;AAAA,MACV,YAAY;AAAA,MACZ,aAAa;AAAA,MACb,eAAe,CAAC;AAAA,MAChB,YAAY;AAAA,MACZ,cAAc;AAAA,MACd,WAAW;AAAA,IACb,CAAC;AAAA,EACH,SAAS,OAAO;AACd,YAAQ;AAAA,MACN;AAAA,MACA,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AACF;AASA,eAAe,8BACb,WACe;AACf,MAAI,CAAC,UAAW;AAChB,MAAI;AAKJ,MAAI;AACF,uBAAmB,UAAU,QAAQ,kBAAkB;AAAA,EACzD,QAAQ;AACN,uBAAmB;AAAA,EACrB;AACA,MAAI,CAAC,iBAAkB;AACvB,MAAI;AACF,UAAM,iBAAiB,SAAS;AAAA,MAC9B,IAAI;AAAA,MACJ,MAAM;AAAA,MACN,aACE;AAAA,MACF,WAAW;AAAA,MACX,cAAc;AAAA,MACd,eAAe;AAAA,MACf,UAAU;AAAA,MACV,YAAY;AAAA,MACZ,aAAa;AAAA,MACb,eAAe,CAAC;AAAA,MAChB,YAAY;AAAA,MACZ,cAAc;AAAA,MACd,WAAW;AAAA,IACb,CAAC;AAAA,EACH,SAAS,OAAO;AACd,YAAQ;AAAA,MACN;AAAA,MACA,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AACF;AAEO,MAAM,QAA2B;AAAA,EACtC,qBAAqB;AAAA,IACnB,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,UAAU,CAAC,mBAAmB;AAAA,EAChC;AAAA,EAEA,MAAM,aAAa,EAAE,UAAU,GAAG;AAChC,UAAM,mCAAmC,SAAS;AAClD,UAAM,8BAA8B,SAAS;AAAA,EAC/C;AACF;AAEA,IAAO,gBAAQ;",
   "names": []
 }

package/dist/modules/ai_assistant/workers/ai-token-usage-prune.js

@@ -0,0 +1,114 @@
+const DEFAULT_RETENTION_DAYS = 90;
+const DELETE_BATCH_SIZE = 5e3;
+const RECONCILE_TRAILING_DAYS = 7;
+const metadata = {
+  queue: "ai-token-usage-prune",
+  id: "ai_assistant:token-usage-prune",
+  concurrency: 1
+};
+function resolveRetentionDays() {
+  const raw = process.env.AI_TOKEN_USAGE_EVENTS_RETENTION_DAYS;
+  if (!raw) return DEFAULT_RETENTION_DAYS;
+  const parsed = parseInt(raw.trim(), 10);
+  return !isNaN(parsed) && parsed > 0 ? parsed : DEFAULT_RETENTION_DAYS;
+}
+async function pruneOldEvents(connection, cutoff, batchSize) {
+  let totalDeleted = 0;
+  for (; ; ) {
+    const result = await connection.execute(
+      `
+      delete from ai_token_usage_events
+      where id in (
+        select id from ai_token_usage_events
+        where created_at < ?
+        limit ?
+      )
+      `,
+      [cutoff, batchSize],
+      "run"
+    );
+    const deleted = result?.affectedRows ?? result?.rowCount ?? 0;
+    totalDeleted += deleted;
+    if (deleted < batchSize) break;
+  }
+  return totalDeleted;
+}
+async function reconcileSessionCounts(connection, now, trailingDays) {
+  const trailingStart = new Date(now);
+  trailingStart.setUTCDate(trailingStart.getUTCDate() - trailingDays);
+  const from = trailingStart.toISOString().slice(0, 10);
+  const rows = await connection.execute(
+    `
+    select
+      d.id,
+      count(distinct e.session_id)::bigint as computed_session_count
+    from ai_token_usage_daily d
+    left join ai_token_usage_events e
+      on e.tenant_id = d.tenant_id
+      and e.agent_id = d.agent_id
+      and e.model_id = d.model_id
+      and date_trunc('day', e.created_at)::date = d.day
+      and (
+        (d.organization_id is null and e.organization_id is null)
+        or (d.organization_id is not null and e.organization_id = d.organization_id)
+      )
+    where d.day >= ?::date
+    group by d.id
+    `,
+    [from],
+    "all"
+  );
+  if (!Array.isArray(rows) || rows.length === 0) return 0;
+  let reconciled = 0;
+  for (const row of rows) {
+    const rowId = row.id;
+    const computed = typeof row.computed_session_count === "string" ? parseInt(row.computed_session_count, 10) : row.computed_session_count ?? 0;
+    await connection.execute(
+      `update ai_token_usage_daily set session_count = ?, updated_at = now() where id = ?`,
+      [computed, rowId],
+      "run"
+    );
+    reconciled += 1;
+  }
+  return reconciled;
+}
+async function runTokenUsagePrune(options) {
+  const now = options.now ?? /* @__PURE__ */ new Date();
+  const retentionDays = options.retentionDays ?? resolveRetentionDays();
+  const batchSize = options.batchSize ?? DELETE_BATCH_SIZE;
+  const cutoff = new Date(now);
+  cutoff.setUTCDate(cutoff.getUTCDate() - retentionDays);
+  const connection = options.em.getConnection();
+  let eventsDeleted = 0;
+  try {
+    eventsDeleted = await pruneOldEvents(connection, cutoff, batchSize);
+  } catch (error) {
+    console.error(
+      "[ai-token-usage-prune] Failed to prune old events:",
+      error instanceof Error ? error.message : error
+    );
+  }
+  let dailyRowsReconciled = 0;
+  try {
+    dailyRowsReconciled = await reconcileSessionCounts(connection, now, RECONCILE_TRAILING_DAYS);
+  } catch (error) {
+    console.error(
+      "[ai-token-usage-prune] Failed to reconcile session counts:",
+      error instanceof Error ? error.message : error
+    );
+  }
+  console.info(
+    `[ai-token-usage-prune] Done. eventsDeleted=${eventsDeleted}, dailyRowsReconciled=${dailyRowsReconciled}, retentionDays=${retentionDays}.`
+  );
+  return { eventsDeleted, dailyRowsReconciled };
+}
+async function handle(_job, ctx) {
+  const em = ctx.resolve("em");
+  await runTokenUsagePrune({ em });
+}
+export {
+  handle as default,
+  metadata,
+  runTokenUsagePrune
+};
+//# sourceMappingURL=ai-token-usage-prune.js.map

package/dist/modules/ai_assistant/workers/ai-token-usage-prune.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/ai_assistant/workers/ai-token-usage-prune.ts"],
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { JobContext, QueuedJob, WorkerMeta } from '@open-mercato/queue'\n\n/** Default retention window for the ai_token_usage_events table (days). */\nconst DEFAULT_RETENTION_DAYS = 90\n/** Batch size for delete operations to avoid long locks. */\nconst DELETE_BATCH_SIZE = 5_000\n/** Number of trailing days to reconcile session_count against events table. */\nconst RECONCILE_TRAILING_DAYS = 7\n\nexport const metadata: WorkerMeta = {\n  queue: 'ai-token-usage-prune',\n  id: 'ai_assistant:token-usage-prune',\n  concurrency: 1,\n}\n\nexport interface TokenUsagePruneRunOptions {\n  em: EntityManager\n  /** Override for deterministic tests. Defaults to `new Date()`. */\n  now?: Date\n  /** Override retention days (default from env). */\n  retentionDays?: number\n  /** Override batch size (default 5000). */\n  batchSize?: number\n}\n\nexport interface TokenUsagePruneSummary {\n  eventsDeleted: number\n  dailyRowsReconciled: number\n}\n\n/**\n * Reads `AI_TOKEN_USAGE_EVENTS_RETENTION_DAYS` env var (default 90).\n */\nfunction resolveRetentionDays(): number {\n  const raw = process.env.AI_TOKEN_USAGE_EVENTS_RETENTION_DAYS\n  if (!raw) return DEFAULT_RETENTION_DAYS\n  const parsed = parseInt(raw.trim(), 10)\n  return !isNaN(parsed) && parsed > 0 ? parsed : DEFAULT_RETENTION_DAYS\n}\n\n/**\n * Deletes events older than the retention cutoff in batches of `batchSize` to\n * avoid long table locks. Returns total rows deleted.\n */\nasync function pruneOldEvents(\n  connection: ReturnType<EntityManager['getConnection']>,\n  cutoff: Date,\n  batchSize: number,\n): Promise<number> {\n  let totalDeleted = 0\n  for (;;) {\n    const result = await connection.execute(\n      `\n      delete from ai_token_usage_events\n      where id in (\n        select id from ai_token_usage_events\n        where created_at < ?\n        limit ?\n      )\n      `,\n      [cutoff, batchSize],\n      'run',\n    ) as { affectedRows?: number; rowCount?: number } | undefined\n    const deleted = result?.affectedRows ?? result?.rowCount ?? 0\n    totalDeleted += deleted\n    if (deleted < batchSize) break\n  }\n  return totalDeleted\n}\n\n/**\n * Reconciles `session_count` on daily rollup rows for the trailing N days by\n * recomputing it directly from the events table. This corrects any drift caused\n * by out-of-order event delivery, retention pruning, or failed incremental\n * writes.\n */\nasync function reconcileSessionCounts(\n  connection: ReturnType<EntityManager['getConnection']>,\n  now: Date,\n  trailingDays: number,\n): Promise<number> {\n  const trailingStart = new Date(now)\n  trailingStart.setUTCDate(trailingStart.getUTCDate() - trailingDays)\n  const from = trailingStart.toISOString().slice(0, 10)\n\n  // Recompute session_count for each (tenant_id, day, agent_id, model_id, org)\n  // combination by counting distinct session_ids from the events table.\n  const rows = await connection.execute(\n    `\n    select\n      d.id,\n      count(distinct e.session_id)::bigint as computed_session_count\n    from ai_token_usage_daily d\n    left join ai_token_usage_events e\n      on e.tenant_id = d.tenant_id\n      and e.agent_id = d.agent_id\n      and e.model_id = d.model_id\n      and date_trunc('day', e.created_at)::date = d.day\n      and (\n        (d.organization_id is null and e.organization_id is null)\n        or (d.organization_id is not null and e.organization_id = d.organization_id)\n      )\n    where d.day >= ?::date\n    group by d.id\n    `,\n    [from],\n    'all',\n  )\n\n  if (!Array.isArray(rows) || rows.length === 0) return 0\n\n  let reconciled = 0\n  for (const row of rows as Array<Record<string, unknown>>) {\n    const rowId = row.id as string\n    const computed = typeof row.computed_session_count === 'string'\n      ? parseInt(row.computed_session_count, 10)\n      : (row.computed_session_count as number) ?? 0\n    await connection.execute(\n      `update ai_token_usage_daily set session_count = ?, updated_at = now() where id = ?`,\n      [computed, rowId],\n      'run',\n    )\n    reconciled += 1\n  }\n\n  return reconciled\n}\n\n/**\n * Core logic for the token-usage prune worker. Exported for unit testing.\n *\n * 1. Resolves the retention cutoff from `AI_TOKEN_USAGE_EVENTS_RETENTION_DAYS`.\n * 2. Deletes events older than the cutoff in batches of 5_000.\n * 3. Reconciles `session_count` on the daily rollup for trailing 7 days.\n *\n * Phase 6.4 of spec `2026-04-28-ai-agents-agentic-loop-controls`.\n */\nexport async function runTokenUsagePrune(\n  options: TokenUsagePruneRunOptions,\n): Promise<TokenUsagePruneSummary> {\n  const now = options.now ?? new Date()\n  const retentionDays = options.retentionDays ?? resolveRetentionDays()\n  const batchSize = options.batchSize ?? DELETE_BATCH_SIZE\n\n  const cutoff = new Date(now)\n  cutoff.setUTCDate(cutoff.getUTCDate() - retentionDays)\n\n  const connection = options.em.getConnection()\n\n  let eventsDeleted = 0\n  try {\n    eventsDeleted = await pruneOldEvents(connection, cutoff, batchSize)\n  } catch (error) {\n    console.error(\n      '[ai-token-usage-prune] Failed to prune old events:',\n      error instanceof Error ? error.message : error,\n    )\n  }\n\n  let dailyRowsReconciled = 0\n  try {\n    dailyRowsReconciled = await reconcileSessionCounts(connection, now, RECONCILE_TRAILING_DAYS)\n  } catch (error) {\n    console.error(\n      '[ai-token-usage-prune] Failed to reconcile session counts:',\n      error instanceof Error ? error.message : error,\n    )\n  }\n\n  console.info(\n    `[ai-token-usage-prune] Done. eventsDeleted=${eventsDeleted}, dailyRowsReconciled=${dailyRowsReconciled}, retentionDays=${retentionDays}.`,\n  )\n\n  return { eventsDeleted, dailyRowsReconciled }\n}\n\ntype HandlerContext = JobContext & {\n  resolve: <T = unknown>(name: string) => T\n}\n\nexport default async function handle(\n  _job: QueuedJob,\n  ctx: HandlerContext,\n): Promise<void> {\n  const em = ctx.resolve<EntityManager>('em')\n  await runTokenUsagePrune({ em })\n}\n"],
+  "mappings": "AAIA,MAAM,yBAAyB;AAE/B,MAAM,oBAAoB;AAE1B,MAAM,0BAA0B;AAEzB,MAAM,WAAuB;AAAA,EAClC,OAAO;AAAA,EACP,IAAI;AAAA,EACJ,aAAa;AACf;AAoBA,SAAS,uBAA+B;AACtC,QAAM,MAAM,QAAQ,IAAI;AACxB,MAAI,CAAC,IAAK,QAAO;AACjB,QAAM,SAAS,SAAS,IAAI,KAAK,GAAG,EAAE;AACtC,SAAO,CAAC,MAAM,MAAM,KAAK,SAAS,IAAI,SAAS;AACjD;AAMA,eAAe,eACb,YACA,QACA,WACiB;AACjB,MAAI,eAAe;AACnB,aAAS;AACP,UAAM,SAAS,MAAM,WAAW;AAAA,MAC9B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAQA,CAAC,QAAQ,SAAS;AAAA,MAClB;AAAA,IACF;AACA,UAAM,UAAU,QAAQ,gBAAgB,QAAQ,YAAY;AAC5D,oBAAgB;AAChB,QAAI,UAAU,UAAW;AAAA,EAC3B;AACA,SAAO;AACT;AAQA,eAAe,uBACb,YACA,KACA,cACiB;AACjB,QAAM,gBAAgB,IAAI,KAAK,GAAG;AAClC,gBAAc,WAAW,cAAc,WAAW,IAAI,YAAY;AAClE,QAAM,OAAO,cAAc,YAAY,EAAE,MAAM,GAAG,EAAE;AAIpD,QAAM,OAAO,MAAM,WAAW;AAAA,IAC5B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAiBA,CAAC,IAAI;AAAA,IACL;AAAA,EACF;AAEA,MAAI,CAAC,MAAM,QAAQ,IAAI,KAAK,KAAK,WAAW,EAAG,QAAO;AAEtD,MAAI,aAAa;AACjB,aAAW,OAAO,MAAwC;AACxD,UAAM,QAAQ,IAAI;AAClB,UAAM,WAAW,OAAO,IAAI,2BAA2B,WACnD,SAAS,IAAI,wBAAwB,EAAE,IACtC,IAAI,0BAAqC;AAC9C,UAAM,WAAW;AAAA,MACf;AAAA,MACA,CAAC,UAAU,KAAK;AAAA,MAChB;AAAA,IACF;AACA,kBAAc;AAAA,EAChB;AAEA,SAAO;AACT;AAWA,eAAsB,mBACpB,SACiC;AACjC,QAAM,MAAM,QAAQ,OAAO,oBAAI,KAAK;AACpC,QAAM,gBAAgB,QAAQ,iBAAiB,qBAAqB;AACpE,QAAM,YAAY,QAAQ,aAAa;AAEvC,QAAM,SAAS,IAAI,KAAK,GAAG;AAC3B,SAAO,WAAW,OAAO,WAAW,IAAI,aAAa;AAErD,QAAM,aAAa,QAAQ,GAAG,cAAc;AAE5C,MAAI,gBAAgB;AACpB,MAAI;AACF,oBAAgB,MAAM,eAAe,YAAY,QAAQ,SAAS;AAAA,EACpE,SAAS,OAAO;AACd,YAAQ;AAAA,MACN;AAAA,MACA,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AAEA,MAAI,sBAAsB;AAC1B,MAAI;AACF,0BAAsB,MAAM,uBAAuB,YAAY,KAAK,uBAAuB;AAAA,EAC7F,SAAS,OAAO;AACd,YAAQ;AAAA,MACN;AAAA,MACA,iBAAiB,QAAQ,MAAM,UAAU;AAAA,IAC3C;AAAA,EACF;AAEA,UAAQ;AAAA,IACN,8CAA8C,aAAa,yBAAyB,mBAAmB,mBAAmB,aAAa;AAAA,EACzI;AAEA,SAAO,EAAE,eAAe,oBAAoB;AAC9C;AAMA,eAAO,OACL,MACA,KACe;AACf,QAAM,KAAK,IAAI,QAAuB,IAAI;AAC1C,QAAM,mBAAmB,EAAE,GAAG,CAAC;AACjC;",
+  "names": []
+}

package/generated/entities/ai_agent_runtime_override/index.ts

@@ -11,3 +11,10 @@ export const updated_by_user_id = "updated_by_user_id";
 export const created_at = "created_at";
 export const updated_at = "updated_at";
 export const deleted_at = "deleted_at";
+export const loop_disabled = "loop_disabled";
+export const loop_max_steps = "loop_max_steps";
+export const loop_max_tool_calls = "loop_max_tool_calls";
+export const loop_max_wall_clock_ms = "loop_max_wall_clock_ms";
+export const loop_max_tokens = "loop_max_tokens";
+export const loop_stop_when_json = "loop_stop_when_json";
+export const loop_active_tools_json = "loop_active_tools_json";

package/generated/entities/ai_token_usage_daily/index.ts

@@ -0,0 +1,16 @@
+export const id = "id";
+export const tenant_id = "tenant_id";
+export const organization_id = "organization_id";
+export const day = "day";
+export const agent_id = "agent_id";
+export const model_id = "model_id";
+export const provider_id = "provider_id";
+export const input_tokens = "input_tokens";
+export const output_tokens = "output_tokens";
+export const cached_input_tokens = "cached_input_tokens";
+export const reasoning_tokens = "reasoning_tokens";
+export const step_count = "step_count";
+export const turn_count = "turn_count";
+export const session_count = "session_count";
+export const created_at = "created_at";
+export const updated_at = "updated_at";

package/generated/entities/ai_token_usage_event/index.ts

@@ -0,0 +1,19 @@
+export const id = "id";
+export const tenant_id = "tenant_id";
+export const organization_id = "organization_id";
+export const user_id = "user_id";
+export const agent_id = "agent_id";
+export const module_id = "module_id";
+export const session_id = "session_id";
+export const turn_id = "turn_id";
+export const step_index = "step_index";
+export const provider_id = "provider_id";
+export const model_id = "model_id";
+export const input_tokens = "input_tokens";
+export const output_tokens = "output_tokens";
+export const cached_input_tokens = "cached_input_tokens";
+export const reasoning_tokens = "reasoning_tokens";
+export const finish_reason = "finish_reason";
+export const loop_abort_reason = "loop_abort_reason";
+export const created_at = "created_at";
+export const updated_at = "updated_at";

package/generated/entities.ids.generated.ts

@@ -6,6 +6,8 @@ export const M = {
       "ai_agent_prompt_override": "ai_assistant:ai_agent_prompt_override",
       "ai_pending_action": "ai_assistant:ai_pending_action",
       "ai_agent_runtime_override": "ai_assistant:ai_agent_runtime_override",
+      "ai_token_usage_event": "ai_assistant:ai_token_usage_event",
+      "ai_token_usage_daily": "ai_assistant:ai_token_usage_daily",
       "ai_tenant_model_allowlist": "ai_assistant:ai_tenant_model_allowlist",
       "ai_agent_mutation_policy_override": "ai_assistant:ai_agent_mutation_policy_override"
     }

package/generated/entity-fields-registry.ts

@@ -37,7 +37,14 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "updated_by_user_id": "updated_by_user_id",
       "created_at": "created_at",
       "updated_at": "updated_at",
-      "deleted_at": "deleted_at"
+      "deleted_at": "deleted_at",
+      "loop_disabled": "loop_disabled",
+      "loop_max_steps": "loop_max_steps",
+      "loop_max_tool_calls": "loop_max_tool_calls",
+      "loop_max_wall_clock_ms": "loop_max_wall_clock_ms",
+      "loop_max_tokens": "loop_max_tokens",
+      "loop_stop_when_json": "loop_stop_when_json",
+      "loop_active_tools_json": "loop_active_tools_json"
     },
     "ai_pending_action": {
       "id": "id",
@@ -75,6 +82,45 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "created_at": "created_at",
       "updated_at": "updated_at",
       "deleted_at": "deleted_at"
+    },
+    "ai_token_usage_daily": {
+      "id": "id",
+      "tenant_id": "tenant_id",
+      "organization_id": "organization_id",
+      "day": "day",
+      "agent_id": "agent_id",
+      "model_id": "model_id",
+      "provider_id": "provider_id",
+      "input_tokens": "input_tokens",
+      "output_tokens": "output_tokens",
+      "cached_input_tokens": "cached_input_tokens",
+      "reasoning_tokens": "reasoning_tokens",
+      "step_count": "step_count",
+      "turn_count": "turn_count",
+      "session_count": "session_count",
+      "created_at": "created_at",
+      "updated_at": "updated_at"
+    },
+    "ai_token_usage_event": {
+      "id": "id",
+      "tenant_id": "tenant_id",
+      "organization_id": "organization_id",
+      "user_id": "user_id",
+      "agent_id": "agent_id",
+      "module_id": "module_id",
+      "session_id": "session_id",
+      "turn_id": "turn_id",
+      "step_index": "step_index",
+      "provider_id": "provider_id",
+      "model_id": "model_id",
+      "input_tokens": "input_tokens",
+      "output_tokens": "output_tokens",
+      "cached_input_tokens": "cached_input_tokens",
+      "reasoning_tokens": "reasoning_tokens",
+      "finish_reason": "finish_reason",
+      "loop_abort_reason": "loop_abort_reason",
+      "created_at": "created_at",
+      "updated_at": "updated_at"
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/ai-assistant",
-  "version": "0.6.1-develop.3291.1.6fad645fd0",
+  "version": "0.6.1",
   "type": "module",
   "engines": {
     "node": ">=22.0.0"
@@ -98,13 +98,22 @@
     "zod-to-json-schema": "^3.25.2"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.6.1-develop.3291.1.6fad645fd0",
-    "@open-mercato/ui": "0.6.1-develop.3291.1.6fad645fd0",
+    "@open-mercato/shared": "0.6.1",
+    "@open-mercato/ui": "0.6.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "zod": ">=3.23.0"
   },
   "devDependencies": {
-    "@open-mercato/cli": "0.6.1-develop.3291.1.6fad645fd0",
-    "tsx": "^4.21.0"
+    "@open-mercato/cli": "0.6.1",
+    "@open-mercato/shared": "0.6.1",
+    "@open-mercato/ui": "0.6.1",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "react": "19.2.6",
+    "react-dom": "19.2.6",
+    "tsx": "^4.21.0",
+    "zod": "^4.3.6"
   },
   "publishConfig": {
     "access": "public"
@@ -113,6 +122,5 @@
     "type": "git",
     "url": "https://github.com/open-mercato/open-mercato",
     "directory": "packages/ai-assistant"
-  },
-  "stableVersion": "0.6.0"
+  }
 }

package/src/frontend/components/AiChatButton.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import * as React from 'react'
-import { Sparkles } from 'lucide-react'
+import { AiIcon } from '@open-mercato/ui/ai/AiIcon'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Tooltip, TooltipContent, TooltipTrigger, TooltipProvider } from '@open-mercato/ui/primitives/tooltip'
 
@@ -23,13 +23,14 @@ export function AiChatButton({ onClick, className }: AiChatButtonProps) {
       <Tooltip>
         <TooltipTrigger asChild>
           <Button
+            type="button"
             variant="ghost"
             size="icon"
             onClick={handleClick}
             className={className}
             aria-label="Open AI Assistant"
           >
-            <Sparkles className="h-5 w-5" />
+            <AiIcon className="h-5 w-5" />
           </Button>
         </TooltipTrigger>
         <TooltipContent side="bottom">