@wopr-network/platform-core 1.73.0 → 1.74.1

package/dist/monetization/credits/storage-tier-billing.test.js

@@ -5,6 +5,7 @@ import { DrizzleBotBilling } from "./bot-billing.js";
 describe("bot-billing storage tier", () => {
     let pool;
     let db;
+    let repo;
     let billing;
     beforeAll(async () => {
         ({ db, pool } = await createTestDb());
@@ -16,14 +17,17 @@ describe("bot-billing storage tier", () => {
     });
     beforeEach(async () => {
         await rollbackTestTransaction(pool);
-        billing = new DrizzleBotBilling(new DrizzleBotInstanceRepository(db));
+        repo = new DrizzleBotInstanceRepository(db);
+        billing = new DrizzleBotBilling(repo);
     });
     it("new bot defaults to standard storage tier", async () => {
         await billing.registerBot("bot-1", "tenant-1", "TestBot");
+        await repo.startBilling("bot-1");
         expect(await billing.getStorageTier("bot-1")).toBe("standard");
     });
     it("setStorageTier updates tier", async () => {
         await billing.registerBot("bot-1", "tenant-1", "TestBot");
+        await repo.startBilling("bot-1");
         await billing.setStorageTier("bot-1", "pro");
         expect(await billing.getStorageTier("bot-1")).toBe("pro");
     });
@@ -32,8 +36,11 @@ describe("bot-billing storage tier", () => {
     });
     it("getStorageTierCostsForTenant sums active bot storage costs", async () => {
         await billing.registerBot("bot-1", "tenant-1", "Bot1");
+        await repo.startBilling("bot-1");
         await billing.registerBot("bot-2", "tenant-1", "Bot2");
+        await repo.startBilling("bot-2");
         await billing.registerBot("bot-3", "tenant-1", "Bot3");
+        await repo.startBilling("bot-3");
         await billing.setStorageTier("bot-1", "plus"); // 3 credits/day
         await billing.setStorageTier("bot-2", "max"); // 15 credits/day
         // bot-3 stays standard                        // 0 credits/day
@@ -41,6 +48,7 @@ describe("bot-billing storage tier", () => {
     });
     it("getStorageTierCostsForTenant excludes suspended bots", async () => {
         await billing.registerBot("bot-1", "tenant-1", "Bot1");
+        await repo.startBilling("bot-1");
         await billing.setStorageTier("bot-1", "pro"); // 8 credits/day
         await billing.suspendBot("bot-1");
         expect((await billing.getStorageTierCostsForTenant("tenant-1")).toCents()).toBe(0);

package/dist/monetization/credits/storage-tier-cron.test.js

@@ -1,9 +1,10 @@
 import { Credit, DrizzleLedger } from "@wopr-network/platform-core/credits";
 import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
 import { createTestDb, truncateAllTables } from "../../test/db.js";
-import { runRuntimeDeductions } from "./runtime-cron.js";
+import { dailyBotCost, runRuntimeDeductions } from "./runtime-cron.js";
 describe("runtime cron with storage tiers", () => {
     const TODAY = "2025-01-01";
+    const BASE_COST_CREDIT = dailyBotCost(TODAY);
     let pool;
     let db;
     let ledger;
@@ -28,8 +29,9 @@ describe("runtime cron with storage tiers", () => {
         });
         expect(result.processed).toBe(1);
         const balance = await ledger.balance("t1");
-        // 1000 - 17 (base) - 8 (pro storage surcharge) = 975
-        expect(balance.toCents()).toBe(975);
+        // 1000 - dailyBotCost (base) - 8 (pro storage surcharge)
+        const expected = Credit.fromCents(1000).subtract(BASE_COST_CREDIT).subtract(Credit.fromCents(8));
+        expect(balance.toCents()).toBe(expected.toCents());
     });
     it("debits only base cost for standard storage tier (zero surcharge)", async () => {
         await ledger.credit("t1", Credit.fromCents(1000), "purchase");
@@ -40,7 +42,8 @@ describe("runtime cron with storage tiers", () => {
             getStorageTierCosts: async () => Credit.ZERO,
         });
         expect(result.processed).toBe(1);
-        expect((await ledger.balance("t1")).toCents()).toBe(983); // 1000 - 17
+        const expectedStd = Credit.fromCents(1000).subtract(BASE_COST_CREDIT);
+        expect((await ledger.balance("t1")).toCents()).toBe(expectedStd.toCents());
     });
     it("skips storage surcharge when callback not provided (backward compat)", async () => {
         await ledger.credit("t1", Credit.fromCents(1000), "purchase");
@@ -50,10 +53,13 @@ describe("runtime cron with storage tiers", () => {
             getActiveBotCount: async () => 1,
         });
         expect(result.processed).toBe(1);
-        expect((await ledger.balance("t1")).toCents()).toBe(983); // 1000 - 17
+        const expectedBackcompat = Credit.fromCents(1000).subtract(BASE_COST_CREDIT);
+        expect((await ledger.balance("t1")).toCents()).toBe(expectedBackcompat.toCents());
     });
     it("suspends tenant when storage surcharge exhausts remaining balance", async () => {
-        await ledger.credit("t1", Credit.fromCents(20), "purchase"); // Only 20 cents
+        // Seed just enough for base cost + 3 cents, so storage surcharge (8) exceeds remainder
+        const seed = BASE_COST_CREDIT.add(Credit.fromCents(3));
+        await ledger.credit("t1", seed, "purchase");
         const suspended = [];
         const result = await runRuntimeDeductions({
             ledger,
@@ -64,7 +70,7 @@ describe("runtime cron with storage tiers", () => {
                 suspended.push(tenantId);
             },
         });
-        // 20 - 17 = 3 remaining, then 8 surcharge > 3, so partial debit + suspend
+        // seed - BASE_COST = 3 remaining, then 8 surcharge > 3, so partial debit + suspend
         expect(result.processed).toBe(1);
         expect(result.suspended).toContain("t1");
         expect((await ledger.balance("t1")).toCents()).toBe(0);

package/dist/server/container.js

@@ -80,9 +80,12 @@ export async function buildContainer(bootConfig) {
         const profileStore = new ProfileStore(fleetDataDir);
         const proxy = new ProxyManager();
         const serviceKeyRepo = new DrizzleServiceKeyRepository(db);
+        const { DrizzleBotInstanceRepository } = await import("../fleet/drizzle-bot-instance-repository.js");
+        const botInstanceRepo = new DrizzleBotInstanceRepository(db);
         const manager = new FleetManagerClass(docker, profileStore, undefined, // platformDiscovery
         undefined, // networkPolicy
-        proxy);
+        proxy, undefined, // commandBus
+        botInstanceRepo);
         fleet = { manager, docker, proxy, profileStore, serviceKeyRepo };
     }
     // 9. Crypto services (when enabled)

package/dist/server/lifecycle.js

@@ -27,6 +27,33 @@ export async function startBackgroundServices(container) {
             // Non-fatal — proxy sync will retry on next health tick
         }
     }
+    // Backfill bot_instances from YAML profiles (one-time sync on startup)
+    if (container.fleet) {
+        try {
+            const { DrizzleBotInstanceRepository } = await import("../fleet/drizzle-bot-instance-repository.js");
+            const botInstanceRepo = new DrizzleBotInstanceRepository(container.db);
+            const profiles = await container.fleet.profileStore.list();
+            let synced = 0;
+            for (const profile of profiles) {
+                const existing = await botInstanceRepo.getById(profile.id);
+                if (!existing) {
+                    try {
+                        await botInstanceRepo.register(profile.id, profile.tenantId, profile.name);
+                        synced++;
+                    }
+                    catch {
+                        // Ignore duplicates / constraint violations
+                    }
+                }
+            }
+            if (synced > 0) {
+                logger.info(`Backfilled ${synced} bot instances from profiles into DB`);
+            }
+        }
+        catch (err) {
+            logger.warn("Failed to backfill bot_instances (non-fatal)", { error: String(err) });
+        }
+    }
     // Hot pool manager (if enabled)
     if (container.hotPool) {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.73.0",
+  "version": "1.74.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/fleet/drizzle-bot-instance-repository.ts

@@ -218,15 +218,28 @@ export class DrizzleBotInstanceRepository implements IBotInstanceRepository {
       .where(eq(botInstances.id, botId));
   }
 
-  async register(botId: string, tenantId: string, name: string): Promise<void> {
+  async register(
+    botId: string,
+    tenantId: string,
+    name: string,
+    billingState: BillingState = "inactive",
+  ): Promise<void> {
     await this.db.insert(botInstances).values({
       id: botId,
       tenantId,
       name,
-      billingState: "active",
+      billingState,
     });
   }
 
+  async startBilling(botId: string): Promise<void> {
+    await this.db.update(botInstances).set({ billingState: "active" }).where(eq(botInstances.id, botId));
+  }
+
+  async stopBilling(botId: string): Promise<void> {
+    await this.db.update(botInstances).set({ billingState: "inactive" }).where(eq(botInstances.id, botId));
+  }
+
   async getStorageTier(botId: string): Promise<string | null> {
     const row = (
       await this.db

package/src/fleet/fleet-manager.ts

@@ -152,6 +152,16 @@ export class FleetManager {
 
       const instance = await this.buildInstance(profile);
       instance.emitCreated();
+
+      // Register in bot_instances DB table for billing
+      if (this.instanceRepo) {
+        try {
+          await this.instanceRepo.register(id, profile.tenantId, profile.name);
+        } catch (err) {
+          logger.warn("Failed to register bot instance in DB (non-fatal)", { id, err });
+        }
+      }
+
       return instance;
     };
 
@@ -239,6 +249,15 @@ export class FleetManager {
         await this.networkPolicy.cleanupAfterRemoval(profile.tenantId);
       }
 
+      // Remove from bot_instances DB table
+      if (this.instanceRepo) {
+        try {
+          await this.instanceRepo.deleteById(id);
+        } catch (err) {
+          logger.warn("Failed to delete bot instance from DB (non-fatal)", { id, err });
+        }
+      }
+
       await this.store.delete(id);
       logger.info(`Removed bot ${id}`);
       this.emitEvent("bot.removed", id, profile.tenantId);

package/src/fleet/instance.ts

@@ -109,6 +109,27 @@ export class Instance {
     this.emit("bot.created");
   }
 
+  /**
+   * Start billing for this instance ($5/month prorated daily).
+   * Call after creation for persistent, billable instances (e.g., Paperclip).
+   * Ephemeral instances (e.g., Holy Ship) skip this — they bill per-token at the gateway.
+   */
+  async startBilling(): Promise<void> {
+    if (!this.instanceRepo) {
+      logger.warn("startBilling() called but no instanceRepo available", { id: this.id });
+      return;
+    }
+    await this.instanceRepo.setBillingState(this.id, "active");
+    logger.info("Billing started for instance", { id: this.id, name: this.profile.name });
+  }
+
+  /** Stop billing for this instance (e.g., on suspend or downgrade). */
+  async stopBilling(): Promise<void> {
+    if (!this.instanceRepo) return;
+    await this.instanceRepo.setBillingState(this.id, "suspended");
+    logger.info("Billing stopped for instance", { id: this.id, name: this.profile.name });
+  }
+
   async start(): Promise<void> {
     this.assertLocal("start()");
     return this.withLock(async () => {

package/src/fleet/repository-types.ts

@@ -78,7 +78,7 @@ export interface SelfHostedNodeRegistration extends NodeRegistration {
 // ---------------------------------------------------------------------------
 
 /** Billing lifecycle states for a bot instance. */
-export type BillingState = "active" | "suspended" | "destroyed";
+export type BillingState = "active" | "inactive" | "suspended" | "destroyed";
 
 /** Plain domain object for a bot instance — mirrors `bot_instances` table. */
 export interface BotInstance {

package/src/monetization/credits/bot-billing.test.ts

@@ -56,6 +56,7 @@ function createMockDeps(nodeId: string | null = "node-1") {
 describe("BotBilling", () => {
   let pool: PGlite;
   let db: DrizzleDb;
+  let repo: DrizzleBotInstanceRepository;
   let billing: BotBilling;
   let ledger: DrizzleLedger;
 
@@ -69,7 +70,8 @@ describe("BotBilling", () => {
 
   beforeEach(async () => {
     await truncateAllTables(pool);
-    billing = new BotBilling(new DrizzleBotInstanceRepository(db));
+    repo = new DrizzleBotInstanceRepository(db);
+    billing = new BotBilling(repo);
     ledger = new DrizzleLedger(db);
 
     await ledger.seedSystemAccounts();
@@ -78,6 +80,7 @@ describe("BotBilling", () => {
   describe("registerBot", () => {
     it("registers a bot in active billing state", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       const info = await billing.getBotBilling("bot-1");
       expect(info).not.toBeNull();
       // biome-ignore lint/suspicious/noExplicitAny: intentional test cast
@@ -100,8 +103,11 @@ describe("BotBilling", () => {
 
     it("counts only active bots for the tenant", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.registerBot("bot-2", "tenant-1", "bot-b");
+      await repo.startBilling("bot-2");
       await billing.registerBot("bot-3", "tenant-2", "bot-c");
+      await repo.startBilling("bot-3");
 
       expect(await billing.getActiveBotCount("tenant-1")).toBe(2);
       expect(await billing.getActiveBotCount("tenant-2")).toBe(1);
@@ -109,7 +115,9 @@ describe("BotBilling", () => {
 
     it("does not count suspended bots", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.registerBot("bot-2", "tenant-1", "bot-b");
+      await repo.startBilling("bot-2");
       await billing.suspendBot("bot-1");
 
       expect(await billing.getActiveBotCount("tenant-1")).toBe(1);
@@ -117,6 +125,7 @@ describe("BotBilling", () => {
 
     it("does not count destroyed bots", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.destroyBot("bot-1");
 
       expect(await billing.getActiveBotCount("tenant-1")).toBe(0);
@@ -126,6 +135,7 @@ describe("BotBilling", () => {
   describe("suspendBot", () => {
     it("transitions bot from active to suspended", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.suspendBot("bot-1");
 
       const info = await billing.getBotBilling("bot-1");
@@ -139,6 +149,7 @@ describe("BotBilling", () => {
 
     it("sets destroyAfter to 30 days after suspension", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.suspendBot("bot-1");
 
       const info = await billing.getBotBilling("bot-1");
@@ -155,8 +166,11 @@ describe("BotBilling", () => {
   describe("suspendAllForTenant", () => {
     it("suspends all active bots for a tenant", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.registerBot("bot-2", "tenant-1", "bot-b");
+      await repo.startBilling("bot-2");
       await billing.registerBot("bot-3", "tenant-2", "bot-c");
+      await repo.startBilling("bot-3");
 
       const suspended = await billing.suspendAllForTenant("tenant-1");
 
@@ -174,6 +188,7 @@ describe("BotBilling", () => {
   describe("reactivateBot", () => {
     it("transitions bot from suspended to active", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.suspendBot("bot-1");
       await billing.reactivateBot("bot-1");
 
@@ -188,6 +203,7 @@ describe("BotBilling", () => {
 
     it("does not reactivate a destroyed bot", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.destroyBot("bot-1");
       await billing.reactivateBot("bot-1");
 
@@ -198,6 +214,7 @@ describe("BotBilling", () => {
 
     it("does not affect already-active bots", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.reactivateBot("bot-1");
 
       const info = await billing.getBotBilling("bot-1");
@@ -209,7 +226,9 @@ describe("BotBilling", () => {
   describe("checkReactivation", () => {
     it("reactivates suspended bots when balance is positive", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.registerBot("bot-2", "tenant-1", "bot-b");
+      await repo.startBilling("bot-2");
       await billing.suspendBot("bot-1");
       await billing.suspendBot("bot-2");
 
@@ -226,6 +245,7 @@ describe("BotBilling", () => {
 
     it("does not reactivate when balance is zero", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.suspendBot("bot-1");
 
       const reactivated = await billing.checkReactivation("tenant-1", ledger);
@@ -235,6 +255,7 @@ describe("BotBilling", () => {
 
     it("does not reactivate destroyed bots", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.destroyBot("bot-1");
 
       await ledger.credit("tenant-1", Credit.fromCents(500), "purchase", {
@@ -261,6 +282,7 @@ describe("BotBilling", () => {
   describe("destroyBot", () => {
     it("marks bot as destroyed", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.destroyBot("bot-1");
 
       const info = await billing.getBotBilling("bot-1");
@@ -272,6 +294,7 @@ describe("BotBilling", () => {
   describe("destroyExpiredBots", () => {
     it("destroys bots past their grace period", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
 
       // Set destroyAfter to the past using drizzle sql
       await db
@@ -293,6 +316,7 @@ describe("BotBilling", () => {
 
     it("does not destroy bots still within grace period", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.suspendBot("bot-1");
 
       const destroyed = await billing.destroyExpiredBots();
@@ -305,6 +329,7 @@ describe("BotBilling", () => {
 
     it("does not touch active bots", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
 
       const destroyed = await billing.destroyExpiredBots();
       expect(destroyed).toEqual([]);
@@ -386,8 +411,10 @@ describe("BotBilling", () => {
 
     it("returns correct daily cost for known storage tiers", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.setStorageTier("bot-1", "pro");
       await billing.registerBot("bot-2", "tenant-1", "bot-b");
+      await repo.startBilling("bot-2");
       await billing.setStorageTier("bot-2", "plus");
 
       expect((await billing.getStorageTierCostsForTenant("tenant-1")).toCents()).toBe(11);
@@ -395,6 +422,7 @@ describe("BotBilling", () => {
 
     it("returns 0 for unknown storage tier (fallback branch)", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       // Bypass setStorageTier to insert an unrecognized tier value directly
       await pool.query(`UPDATE bot_instances SET storage_tier = 'unknown_tier' WHERE id = 'bot-1'`);
 
@@ -404,6 +432,7 @@ describe("BotBilling", () => {
 
     it("does not include suspended bots in storage tier cost", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.setStorageTier("bot-1", "pro");
       await billing.suspendBot("bot-1");
 
@@ -414,8 +443,11 @@ describe("BotBilling", () => {
   describe("listForTenant", () => {
     it("lists all bots regardless of billing state", async () => {
       await billing.registerBot("bot-1", "tenant-1", "bot-a");
+      await repo.startBilling("bot-1");
       await billing.registerBot("bot-2", "tenant-1", "bot-b");
+      await repo.startBilling("bot-2");
       await billing.registerBot("bot-3", "tenant-2", "bot-c");
+      await repo.startBilling("bot-3");
       await billing.suspendBot("bot-2");
 
       const bots = await billing.listForTenant("tenant-1");
@@ -427,6 +459,7 @@ describe("BotBilling", () => {
   describe("full lifecycle", () => {
     it("active -> suspended -> reactivated -> active", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       // biome-ignore lint/suspicious/noExplicitAny: intentional test cast
       expect(((await billing.getBotBilling("bot-1")) as any)?.billingState).toBe("active");
 
@@ -446,6 +479,7 @@ describe("BotBilling", () => {
 
     it("active -> suspended -> destroyed (after grace period)", async () => {
       await billing.registerBot("bot-1", "tenant-1", "my-bot");
+      await repo.startBilling("bot-1");
       await billing.suspendBot("bot-1");
 
       await db.update(botInstances).set({ destroyAfter: sql`now() - interval '1 day'` }).where(sql`id = 'bot-1'`);