@intelligo-dev/core 1.0.0-beta.14 → 1.0.0-beta.15

package/src/db/migrations/meta/_journal.json

@@ -29,6 +29,13 @@
       "when": 1790179158533,
       "tag": "0003_local_payments",
       "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "7",
+      "when": 1790259860351,
+      "tag": "0004_usage_subjects",
+      "breakpoints": true
     }
   ]
 }

package/src/db/schema/usage.ts

@@ -27,10 +27,12 @@ export const usageRecords = pgTable(
     workspaceId: text("workspace_id")
       .notNull()
       .references(() => organization.id, { onDelete: "cascade" }),
-    userId: text("user_id")
-      .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    type: text("type").notNull(), // "ai_tokens", "api_call"
+    /** Null for work no signed-in user started: a job, an anonymous request. */
+    userId: text("user_id").references(() => users.id, {
+      onDelete: "cascade",
+    }),
+    /** "ai_tokens", "fixed_charge", or "credit" (a refund or goodwill credit, negative). */
+    type: text("type").notNull(),
     model: text("model"), // "gpt-4o", "gpt-4o-mini"
     agent: text("agent"), // the product's agent slug
     inputTokens: integer("input_tokens").notNull().default(0),
@@ -155,7 +157,8 @@ export const trialCredits = pgTable(
 );
 
 /**
- * One row per (workspace, endpoint, minute bucket). Each request upserts the
+ * One row per (subject, endpoint, bucket); a window other than a minute
+ * is part of the endpoint key (`export@86400s`). Each request upserts the
  * row and atomically increments `count`, so N concurrent requests observe
  * 1..N and exactly `limit` are admitted. Old buckets are deleted by the
  * billing-maintenance job.
@@ -164,13 +167,18 @@ export const rateLimitEntries = pgTable(
   "rate_limit_entries",
   {
     id: text("id").primaryKey(),
-    workspaceId: text("workspace_id")
-      .notNull()
-      .references(() => organization.id, { onDelete: "cascade" }),
+    /**
+     * Who is counted: a workspace id, or any key the caller chose (a
+     * hashed IP). Not a foreign key, so a subject need not be a
+     * workspace; rows expire with their window either way.
+     */
+    workspaceId: text("workspace_id").notNull(),
     endpoint: text("endpoint").notNull().default("chat"),
     requestedAt: timestamp("requested_at").notNull().defaultNow(),
-    /** Floored minute bucket for unique constraint enforcement */
+    /** The start of the window this row counts, floored to its length. */
     minuteBucket: timestamp("minute_bucket").notNull(),
+    /** The window's length, for cleanup: a row expires when its window has closed. */
+    windowSeconds: integer("window_seconds").notNull().default(60),
     /** Requests observed in this bucket — incremented via upsert */
     count: integer("count").notNull().default(1),
   },

package/src/env.ts

@@ -76,6 +76,7 @@ export function validateEnv(): {
 } {
   const errors: string[] = [];
   const warnings: string[] = [];
+  const unsetOptional: string[] = [];
 
   for (const envVar of ENV_VARS) {
     let value = process.env[envVar.name];
@@ -97,9 +98,7 @@ export function validateEnv(): {
           `Missing required env var: ${envVar.name} — ${envVar.description}`
         );
       } else {
-        warnings.push(
-          `Missing optional env var: ${envVar.name} — ${envVar.description}`
-        );
+        unsetOptional.push(envVar.name);
       }
       continue;
     }
@@ -113,6 +112,14 @@ export function validateEnv(): {
     }
   }
 
+  // One line for all of them: each is a feature left off, which is the
+  // point of its being optional, not a fault to repeat on every boot.
+  if (unsetOptional.length > 0) {
+    warnings.push(
+      `Optional env vars not set, their features stay off: ${unsetOptional.join(", ")}`
+    );
+  }
+
   // Resend rejects a send without a sender on a verified domain, and the
   // framework has no domain of its own to fall back on. Loops takes the
   // sender from each template, so only Resend is checked.