brainjar 0.3.1228 → 0.3.1230

package/brainjar.js

@@ -107,7 +107,7 @@ var CLI_VERSION, CACHE, DAY;
 var init_version_check = __esm({
   "packages/cli/src/version-check.ts"() {
     "use strict";
-    CLI_VERSION = "0.3.1228";
+    CLI_VERSION = "0.3.1230";
     CACHE = path.join(os.homedir(), ".brainjar", "version-check.json");
     DAY = 864e5;
   }
@@ -6496,8 +6496,12 @@ var init_settings = __esm({
       // "on" | "off": monthly contingent per workspace (default on in SaaS)
       "ai_free_monthly_usd",
       // Free workspace, USD per month
+      "ai_pro_monthly_usd",
+      // Pro workspace, USD per billing period (BJ-132)
       "ai_team_seat_monthly_usd",
-      // Team, USD per seat and month (applies once licenses exist)
+      // Company, USD per seat and billing period, pooled (BJ-132)
+      "credits_per_usd",
+      // what SaaS customers see: credits per USD of inference (BJ-132)
       "ai_operator_exempt",
       // "true" | "false": operator accounts are never capped
       "ai_daily_budget_usd",
@@ -6524,7 +6528,9 @@ var init_settings = __esm({
       "stripe_price_company",
       "stripe_price_license_pro",
       "stripe_price_license_company",
-      "billing_consent_text"
+      "billing_consent_text",
+      // Credit packs (BJ-132 step 3): one per line, "<Stripe price id> <credits>".
+      "credit_packs"
     ];
     PROVIDER_KEY_SETTINGS = {
       anthropic: "anthropic_api_key",
@@ -6547,7 +6553,7 @@ MCowBQYDK2VwAyEAKOUWx/Qgav+dKg78fIlckGby22CRKeuMWR5tkT1rYuw=
 
 // packages/db/src/plan.ts
 import { createPublicKey, sign, verify } from "node:crypto";
-var trustedKeys;
+var trustedKeys, PAID_STATUSES;
 var init_plan = __esm({
   "packages/db/src/plan.ts"() {
     "use strict";
@@ -6556,6 +6562,7 @@ var init_plan = __esm({
     init_settings();
     init_license_key();
     trustedKeys = [createPublicKey(LICENSE_PUBLIC_KEY)];
+    PAID_STATUSES = ["active", "trialing", "past_due"];
   }
 });
 
@@ -8189,9 +8196,6 @@ var init_health = __esm({
 });
 
 // packages/db/src/spend.ts
-function monthKey(ownerId, at = /* @__PURE__ */ new Date()) {
-  return `ws:${ownerId}:${at.toISOString().slice(0, 7)}`;
-}
 function dayKey(at = /* @__PURE__ */ new Date()) {
   return `day:${at.toISOString().slice(0, 10)}`;
 }
@@ -8203,19 +8207,59 @@ function dayRenewal(at = /* @__PURE__ */ new Date()) {
     Date.UTC(at.getUTCFullYear(), at.getUTCMonth(), at.getUTCDate() + 1)
   );
 }
-async function addSpend(brainId, usd, at = /* @__PURE__ */ new Date(), pool2 = getPool()) {
+async function addSpend(brainId, usd, at = /* @__PURE__ */ new Date(), pool2 = getPool(), credits) {
   if (!(usd > 0)) return;
-  await pool2.query(
+  const r = await pool2.query(
     `INSERT INTO llm_spend (key, usd)
      SELECT k, $2 FROM (
        SELECT $3::text AS k
        UNION ALL
-       SELECT 'ws:' || b.owner_id || ':' || $4 FROM brain b
-       WHERE b.id = $1 AND b.owner_id IS NOT NULL
+       (SELECT 'ws:' || b.owner_id || ':' || $4 FROM brain b
+         WHERE b.id = $1 AND b.owner_id IS NOT NULL
+        UNION
+        SELECT credit_key(b.owner_id, $5) FROM brain b
+         WHERE b.id = $1 AND b.owner_id IS NOT NULL)
      ) keys
-     ON CONFLICT (key) DO UPDATE SET usd = llm_spend.usd + EXCLUDED.usd, updated_at = now()`,
-    [brainId, usd, dayKey(at), at.toISOString().slice(0, 7)]
+     ON CONFLICT (key) DO UPDATE SET usd = llm_spend.usd + EXCLUDED.usd, updated_at = now()
+     RETURNING key, usd`,
+    [brainId, usd, dayKey(at), at.toISOString().slice(0, 7), at]
+  );
+  if (!credits) return;
+  const row = r.rows.find((x) => x.key.startsWith("wsp:")) ?? r.rows.find((x) => x.key.startsWith("ws:"));
+  if (!row) return;
+  const over = Math.min(
+    usd,
+    Math.max(0, Number(row.usd) - credits.includedUsd)
+  );
+  if (over > 0)
+    await pool2.query(
+      `UPDATE credit_balance SET credits = greatest(0, credits - $2), updated_at = now()
+        WHERE user_id = $1`,
+      [row.key.split(":")[1], over * credits.creditsPerUsd]
+    );
+}
+async function creditPeriod(ownerId, at = /* @__PURE__ */ new Date(), pool2 = getPool()) {
+  const r = await pool2.query(
+    `SELECT credit_key($1, $2) AS key, ap.period_start, ap.period_end
+       FROM (SELECT 1) one
+       LEFT JOIN account_plan ap ON ap.user_id = $1
+        AND ap.status IN ('active', 'trialing', 'past_due')
+        AND ap.period_start <= $2 AND ap.period_end > $2`,
+    [ownerId, at]
+  );
+  const row = r.rows[0];
+  return row.key.startsWith("wsp:") && row.period_start && row.period_end ? { key: row.key, start: row.period_start, end: row.period_end } : {
+    key: row.key,
+    start: new Date(Date.UTC(at.getUTCFullYear(), at.getUTCMonth(), 1)),
+    end: monthRenewal(at)
+  };
+}
+async function purchasedCredits(ownerId, pool2 = getPool()) {
+  const r = await pool2.query(
+    "SELECT credits FROM credit_balance WHERE user_id = $1",
+    [ownerId]
   );
+  return Number(r.rows[0]?.credits ?? 0);
 }
 async function spendUsd(key, pool2 = getPool()) {
   const r = await pool2.query(
@@ -8242,6 +8286,19 @@ var init_spend = __esm({
 });
 
 // packages/db/src/billing.ts
+async function accountPlanRow(userId, pool2 = getPool()) {
+  const r = await pool2.query(
+    `SELECT plan, seats, status, period_end, cancel_at_period_end, ended_at
+       FROM account_plan WHERE user_id = $1`,
+    [userId]
+  );
+  return r.rows[0] ?? null;
+}
+async function paidAccountPlan(userId, pool2 = getPool()) {
+  const row = await accountPlanRow(userId, pool2);
+  return row && isPaid(row.status) ? { plan: row.plan, seats: row.seats } : null;
+}
+var isPaid;
 var init_billing = __esm({
   "packages/db/src/billing.ts"() {
     "use strict";
@@ -8249,6 +8306,7 @@ var init_billing = __esm({
     init_pool();
     init_settings();
     init_plan();
+    isPaid = (status) => PAID_STATUSES.includes(status);
   }
 });
 
@@ -8315,7 +8373,7 @@ var init_ruleset = __esm({
 });
 
 // packages/db/src/usage.ts
-async function recordLlmUsage(u) {
+async function recordLlmUsage(u, credits) {
   await getPool().query(
     `INSERT INTO llm_usage (brain_id, workload, model, triggered_by, input_tokens, cached_input_tokens, output_tokens)
      VALUES ($1,$2,$3,$4,$5,$6,$7)`,
@@ -8335,7 +8393,10 @@ async function recordLlmUsage(u) {
       input: u.inputTokens,
       cachedInput: u.cachedInputTokens,
       output: u.outputTokens
-    })
+    }),
+    void 0,
+    void 0,
+    await credits?.().catch(() => null)
   );
 }
 var init_usage = __esm({
@@ -13346,6 +13407,145 @@ var init_provider_rate2 = __esm({
   }
 });
 
+// packages/ingest/src/allowance.ts
+async function aiBudgetSettings() {
+  const env = loadEnv();
+  const stored = await getAppSettings().catch(
+    () => ({})
+  );
+  const pick = (key, envValue) => envValue?.trim() || stored[key];
+  const contingent = pick("ai_contingent", env.BRAINJAR_AI_CONTINGENT);
+  const exempt = pick("ai_operator_exempt", env.BRAINJAR_AI_OPERATOR_EXEMPT);
+  const daily = amount(
+    pick("ai_daily_budget_usd", env.BRAINJAR_AI_DAILY_BUDGET_USD)
+  );
+  return {
+    contingent: contingent ? contingent === "on" : loadConfig().environment === "saas",
+    freeUsd: amount(pick("ai_free_monthly_usd", env.BRAINJAR_FREE_MONTHLY_USD)) ?? DEFAULT_FREE_MONTHLY_USD,
+    proUsd: amount(pick("ai_pro_monthly_usd", env.BRAINJAR_PRO_MONTHLY_USD)) ?? DEFAULT_PRO_MONTHLY_USD,
+    teamSeatUsd: amount(
+      pick("ai_team_seat_monthly_usd", env.BRAINJAR_TEAM_SEAT_MONTHLY_USD)
+    ) ?? DEFAULT_TEAM_SEAT_MONTHLY_USD,
+    creditsPerUsd: positive(pick("credits_per_usd", env.BRAINJAR_CREDITS_PER_USD)) ?? DEFAULT_CREDITS_PER_USD,
+    operatorExempt: exempt ? exempt !== "false" : true,
+    dailyBudgetUsd: daily && daily > 0 ? daily : null,
+    releasedDay: pick("ai_budget_released_day", void 0) ?? null
+  };
+}
+async function aiAllowance(brainId, now = /* @__PURE__ */ new Date()) {
+  const cfg = await aiBudgetSettings();
+  if (cfg.dailyBudgetUsd !== null && cfg.releasedDay !== day(now)) {
+    const used2 = await spendUsd(dayKey(now));
+    if (used2 >= cfg.dailyBudgetUsd) {
+      if (brainId && await swapAppSetting("ai_budget_alerted_day", day(now)))
+        await enqueueJob(
+          brainId,
+          "budget-alert",
+          { usedUsd: used2, budgetUsd: cfg.dailyBudgetUsd, day: day(now) },
+          { priority: JOB_PRIORITY.interactive, dedupeKey: day(now) }
+        ).catch(() => {
+        });
+      return {
+        reason: "daily_budget",
+        usedUsd: used2,
+        limitUsd: cfg.dailyBudgetUsd,
+        renewsAt: dayRenewal(now)
+      };
+    }
+  }
+  if (!cfg.contingent || !brainId) return null;
+  const ws = await brainWorkspace(brainId);
+  if (!ws || ws.operator && cfg.operatorExempt) return null;
+  const [limit, period] = await Promise.all([
+    includedUsd(ws.ownerId, cfg),
+    creditPeriod(ws.ownerId, now)
+  ]);
+  const used = await spendUsd(period.key);
+  if (used < limit) {
+    if (used >= limit * WARN_SHARE)
+      await warnOwnerOnce(ws.ownerId, brainId, period, now).catch(() => {
+      });
+    return null;
+  }
+  if (await purchasedCredits(ws.ownerId) > 0) return null;
+  await tellOwnerOnce(ws.ownerId, brainId, period, now).catch(() => {
+  });
+  return {
+    reason: "contingent",
+    usedUsd: used,
+    limitUsd: limit,
+    renewsAt: period.end
+  };
+}
+async function includedUsd(ownerId, cfg) {
+  const paid = await paidAccountPlan(ownerId).catch(() => null);
+  if (!paid) return cfg.freeUsd;
+  return paid.plan === "pro" ? cfg.proUsd : paid.seats * cfg.teamSeatUsd;
+}
+async function creditTerms(brainId) {
+  const cfg = await aiBudgetSettings();
+  if (!cfg.contingent || !brainId) return null;
+  const ws = await brainWorkspace(brainId);
+  if (!ws || ws.operator && cfg.operatorExempt) return null;
+  return {
+    includedUsd: await includedUsd(ws.ownerId, cfg),
+    creditsPerUsd: cfg.creditsPerUsd
+  };
+}
+async function tellOwnerOnce(ownerId, brainId, period, _now) {
+  if (await hasUserNotificationSince(ownerId, "ai_contingent", period.start))
+    return;
+  await createNotification({
+    kind: "ai_contingent",
+    brainId,
+    userId: ownerId,
+    title: "This month's AI credits are used up",
+    body: `BrainJar keeps working without AI until ${renewalDate(period.end)}: capture uses the basic extraction, docs are built without AI text, verification and written summaries pause. Pro and Company can buy more credits under Account, Plan.`,
+    href: creditsHref(brainId)
+  });
+}
+async function warnOwnerOnce(ownerId, brainId, period, _now) {
+  if (await hasUserNotificationSince(ownerId, "ai_credits_low", period.start))
+    return;
+  await createNotification({
+    kind: "ai_credits_low",
+    brainId,
+    userId: ownerId,
+    title: "80 percent of this month's AI credits are used",
+    body: `The rest lasts until ${renewalDate(period.end)}. When it is used up, BrainJar keeps working without AI until then; Pro and Company can buy more credits under Account, Plan.`,
+    href: creditsHref(brainId)
+  });
+}
+var DEFAULT_FREE_MONTHLY_USD, DEFAULT_PRO_MONTHLY_USD, DEFAULT_TEAM_SEAT_MONTHLY_USD, DEFAULT_CREDITS_PER_USD, amount, positive, day, WARN_SHARE, renewalDate, creditsHref;
+var init_allowance = __esm({
+  "packages/ingest/src/allowance.ts"() {
+    "use strict";
+    init_src2();
+    init_src();
+    DEFAULT_FREE_MONTHLY_USD = 1;
+    DEFAULT_PRO_MONTHLY_USD = 10;
+    DEFAULT_TEAM_SEAT_MONTHLY_USD = 5;
+    DEFAULT_CREDITS_PER_USD = 100;
+    amount = (v) => {
+      if (v === void 0 || v.trim() === "") return null;
+      const n2 = Number(v);
+      return Number.isFinite(n2) && n2 >= 0 ? n2 : null;
+    };
+    positive = (v) => {
+      const n2 = amount(v);
+      return n2 !== null && n2 > 0 ? n2 : null;
+    };
+    day = (d) => d.toISOString().slice(0, 10);
+    WARN_SHARE = 0.8;
+    renewalDate = (d) => d.toLocaleDateString("en-GB", {
+      day: "numeric",
+      month: "long",
+      timeZone: "UTC"
+    });
+    creditsHref = (brainId) => loadConfig().environment === "saas" ? "/account?tab=plan" : `/settings?brain=${encodeURIComponent(brainId)}&tab=usage`;
+  }
+});
+
 // packages/ingest/src/llm.ts
 function rationaleModelId(env = process.env) {
   return env.BRAINJAR_RATIONALE_MODEL?.trim() || "claude-opus-5";
@@ -13355,16 +13555,20 @@ function logUsage(meta, model, usage) {
     console.warn(
       `brainjar: AI call without a Brain (workload ${meta?.workload ?? "other"}); it counts only toward the daily budget`
     );
-  void recordLlmUsage({
-    brainId: meta?.brainId ?? null,
-    workload: meta?.workload ?? "other",
-    triggeredBy: meta?.actor ?? null,
-    model,
-    // Cache writes bill near the input rate; booked as input to keep the ledger simple.
-    inputTokens: (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0),
-    cachedInputTokens: usage.cache_read_input_tokens ?? 0,
-    outputTokens: usage.output_tokens ?? 0
-  }).catch(() => {
+  void recordLlmUsage(
+    {
+      brainId: meta?.brainId ?? null,
+      workload: meta?.workload ?? "other",
+      triggeredBy: meta?.actor ?? null,
+      model,
+      // Cache writes bill near the input rate; booked as input to keep the ledger simple.
+      inputTokens: (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0),
+      cachedInputTokens: usage.cache_read_input_tokens ?? 0,
+      outputTokens: usage.output_tokens ?? 0
+    },
+    // The workspace's credit terms decide what comes off purchased credits (BJ-132).
+    () => creditTerms(meta?.brainId)
+  ).catch(() => {
   });
 }
 function anthropicClient(apiKey, model, meta) {
@@ -13381,6 +13585,7 @@ var init_llm = __esm({
     init_sdk();
     init_src2();
     init_provider_rate2();
+    init_allowance();
     cachedSystem = (system) => [
       {
         type: "text",
@@ -13619,98 +13824,6 @@ var init_openai = __esm({
   }
 });
 
-// packages/ingest/src/allowance.ts
-async function aiBudgetSettings() {
-  const env = loadEnv();
-  const stored = await getAppSettings().catch(
-    () => ({})
-  );
-  const pick = (key, envValue) => envValue?.trim() || stored[key];
-  const contingent = pick("ai_contingent", env.BRAINJAR_AI_CONTINGENT);
-  const exempt = pick("ai_operator_exempt", env.BRAINJAR_AI_OPERATOR_EXEMPT);
-  const daily = amount(
-    pick("ai_daily_budget_usd", env.BRAINJAR_AI_DAILY_BUDGET_USD)
-  );
-  return {
-    contingent: contingent ? contingent === "on" : loadConfig().environment === "saas",
-    freeUsd: amount(pick("ai_free_monthly_usd", env.BRAINJAR_FREE_MONTHLY_USD)) ?? DEFAULT_FREE_MONTHLY_USD,
-    teamSeatUsd: amount(
-      pick("ai_team_seat_monthly_usd", env.BRAINJAR_TEAM_SEAT_MONTHLY_USD)
-    ) ?? DEFAULT_TEAM_SEAT_MONTHLY_USD,
-    operatorExempt: exempt ? exempt !== "false" : true,
-    dailyBudgetUsd: daily && daily > 0 ? daily : null,
-    releasedDay: pick("ai_budget_released_day", void 0) ?? null
-  };
-}
-async function aiAllowance(brainId, now = /* @__PURE__ */ new Date()) {
-  const cfg = await aiBudgetSettings();
-  if (cfg.dailyBudgetUsd !== null && cfg.releasedDay !== day(now)) {
-    const used2 = await spendUsd(dayKey(now));
-    if (used2 >= cfg.dailyBudgetUsd) {
-      if (brainId && await swapAppSetting("ai_budget_alerted_day", day(now)))
-        await enqueueJob(
-          brainId,
-          "budget-alert",
-          { usedUsd: used2, budgetUsd: cfg.dailyBudgetUsd, day: day(now) },
-          { priority: JOB_PRIORITY.interactive, dedupeKey: day(now) }
-        ).catch(() => {
-        });
-      return {
-        reason: "daily_budget",
-        usedUsd: used2,
-        limitUsd: cfg.dailyBudgetUsd,
-        renewsAt: dayRenewal(now)
-      };
-    }
-  }
-  if (!cfg.contingent || !brainId) return null;
-  const ws = await brainWorkspace(brainId);
-  if (!ws || ws.operator && cfg.operatorExempt) return null;
-  const limit = cfg.freeUsd;
-  const used = await spendUsd(monthKey(ws.ownerId, now));
-  if (used < limit) return null;
-  const renewsAt = monthRenewal(now);
-  await tellOwnerOnce(ws.ownerId, brainId, renewsAt, now).catch(() => {
-  });
-  return { reason: "contingent", usedUsd: used, limitUsd: limit, renewsAt };
-}
-async function tellOwnerOnce(ownerId, brainId, renewsAt, now) {
-  const monthStart = new Date(
-    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1)
-  );
-  if (await hasUserNotificationSince(ownerId, "ai_contingent", monthStart))
-    return;
-  await createNotification({
-    kind: "ai_contingent",
-    brainId,
-    userId: ownerId,
-    title: "Monthly AI contingent used up",
-    body: `BrainJar keeps working without AI until ${renewalDate(renewsAt)}: capture uses the basic extraction, docs are built without AI text, verification and written summaries pause.`,
-    href: `/settings?brain=${encodeURIComponent(brainId)}&tab=usage`
-  });
-}
-var DEFAULT_FREE_MONTHLY_USD, DEFAULT_TEAM_SEAT_MONTHLY_USD, amount, day, renewalDate;
-var init_allowance = __esm({
-  "packages/ingest/src/allowance.ts"() {
-    "use strict";
-    init_src2();
-    init_src();
-    DEFAULT_FREE_MONTHLY_USD = 1;
-    DEFAULT_TEAM_SEAT_MONTHLY_USD = 5;
-    amount = (v) => {
-      if (v === void 0 || v.trim() === "") return null;
-      const n2 = Number(v);
-      return Number.isFinite(n2) && n2 >= 0 ? n2 : null;
-    };
-    day = (d) => d.toISOString().slice(0, 10);
-    renewalDate = (d) => d.toLocaleDateString("en-GB", {
-      day: "numeric",
-      month: "long",
-      timeZone: "UTC"
-    });
-  }
-});
-
 // packages/ingest/src/routing.ts
 async function tierClient(tier, meta, effort) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brainjar",
-  "version": "0.3.1228",
+  "version": "0.3.1230",
   "description": "BrainJar CLI: turn a repository into a live, self-documenting Brain.",
   "type": "module",
   "bin": {