Feat/support granting records credit budgets by TroyceGowdy · Pull Request #845 · casual-simulation/casualos

TroyceGowdy · 2026-05-11T17:45:00Z

fixes #830

- add record credit billing fields and financial account relation - introduce helper to resolve billing target (record account first, then owner) - apply billing target resolution across AI, data, and file usage paths - preserve existing behavior by falling back to studio/user billing when record billing is unavailable

…ntroller.spec.ts, FileRecordsController.spec.ts, and AIController.spec.ts suites.

Copilot

Pull request overview

Adds support for billing metered record usage against a dedicated “record credit account” (budget) instead of always billing the owning user/studio, spanning schema, financial helpers, and multiple usage controllers.

Changes:

Extends the auth schema to let Record reference a FinancialAccount for credit-budget billing and enable/disable it per record.
Introduces getBillingAccountForRecord() and updates AI/data/file usage billing paths to use record billing when configured.
Updates/adjusts financial transfer listing and subscription-related code paths, plus adds/updates tests and changelog entries.

Reviewed changes

Copilot reviewed 11 out of 11 changed files in this pull request and generated 11 comments.

Show a summary per file

File	Description
src/aux-server/aux-backend/schemas/auth.prisma	Adds record → financial account link and flag for record-level credit billing.
src/aux-records/SubscriptionController.ts	Removes/changes transfer-listing APIs and Stripe checkout session options; updates docs/comments.
src/aux-records/financial/FinancialController.ts	Adds billing-account resolution helper; modifies transfer listing behavior.
src/aux-records/financial/FinancialController.spec.ts	Adds unit tests for `getBillingAccountForRecord()`.
src/aux-records/FileRecordsController.ts	Switches file-write billing to use record billing when enabled.
src/aux-records/FileRecordsController.spec.ts	Adds coverage for fallback billing behavior when record billing is disabled.
src/aux-records/DataRecordsController.ts	Switches data read/write billing to use record billing when enabled.
src/aux-records/DataRecordsController.spec.ts	Adds coverage for fallback billing behavior when record billing is disabled.
src/aux-records/AIController.ts	Switches AI billing to record billing when enabled; adjusts AI response payload shape.
src/aux-records/AIController.spec.ts	Adds coverage for fallback billing behavior when record billing is disabled.
CHANGELOG.md	Documents record-level credit billing support.

+                    this._store,
+                    recordName


+                    // Billing to record account
+                    billingStudioId = undefined;
+                    billingUserId = undefined;
+                    metricsFilter = { ownerId: request.userId };
+                    subscriptionType = 'user';
+                    metricsRecordStudioId = undefined;
+                    metricsRecordUserId = request.userId;


+-   Added support for record-level credit billing accounts.
+    -   Records can now be configured with a dedicated credit account budget for metered usage.
+    -   AI, data, and file usage billing now supports charging a record-level credit account when configured.



    /**
-     * The unix time in milliseconds that the subscription period starts.
+     * The unix time in miliseconds that the subscription period starts.



    /**
-     * The time of the transfer in milliseconds since the Unix epoch.
+     * The time of the transfer in miliseconds since the Unix epoch.


 export interface SubscriptionInfo {
    /**
-     * The unix time in milliseconds that the user/studio's subscription period started at.
+     * The unix time in miliseconds that the user/studio's subscription period started at.


            return {
                success: true,
                choices: chatResult.value.choices,


…r /api/v2/transfers

KallynGowdy · 2026-05-11T18:13:20Z

fixe #325

@TroyceGowdy Did you mean #830 instead?

- restore transfers compatibility and filtering behavior in subscription/financial controllers

- chat() now spreads provider-keyed properties (e.g. openai, anthropic) from the interface response into the return value alongside choices, restoring the API contract documented in the changelog - chatStream() yield similarly spreads provider-keyed chunk properties - Widened chatStream generator yield type to Pick<AIChatInterfaceStreamResponse, 'choices'> & Record<string, unknown> to accommodate the passthrough

- unblock TypeDoc build and improve failure diagnostics - Fix DataRecordsController billing account lookup typing so TypeDoc can load the project without TS conversion errors - Add explicit success narrowing for getBillingAccountForRecord() result handling - Improve typedoc-plugin error reporting to surface underlying TypeDoc load failures instead of only a generic message

KallynGowdy · 2026-06-04T20:54:09Z

            const billing = await billForUsage(this._financial, {
                userId: billingUserId,
                studioId: billingStudioId,
                transferCode: TransferCodes.records_usage_fee,
                billingCode: BillingCodes.ai_chat_tokens,
            });


@TroyceGowdy Looks like this has to be updated to bill the record account

…ing_records_credit_budgets

KallynGowdy · 2026-06-18T14:06:26Z

-    /**
-     * Lists account balance history entries for the given account.
-     * @param accountId The account ID.
-     * @param options The options.
-     */
-    @traced(TRACE_NAME)
-    async listBalanceHistory(
-        accountId: bigint | string,
-        options?: {
-            minTimeMs?: number;
-            maxTimeMs?: number;
-            limit?: number;
-        }
-    ): Promise<Result<TigerBeetleAccountBalance[], SimpleError>> {
-        if (typeof accountId === 'string') {
-            accountId = BigInt(accountId);
-        }
-
-        const minTime =
-            typeof options?.minTimeMs === 'number'
-                ? BigInt(Math.floor(options.minTimeMs)) * 1000000n
-                : 0n;
-        const maxTime =
-            typeof options?.maxTimeMs === 'number'
-                ? BigInt(Math.floor(options.maxTimeMs)) * 1000000n
-                : 0n;
-        const limit = Math.max(0, options?.limit ?? 0);
-
-        const balances = await this._financialInterface.getAccountBalances({
-            account_id: accountId,
-            code: 0, // 0 means all codes
-            flags: AccountFilterFlags.credits | AccountFilterFlags.debits,
-            limit,
-            timestamp_max: maxTime,
-            timestamp_min: minTime,
-            user_data_128: 0n, // No user data filter
-            user_data_64: 0n, // No user data filter
-            user_data_32: 0, // No user data filter
-        });
-
-        return success(balances);
-    }


@TroyceGowdy This function should not have been removed

KallynGowdy · 2026-06-18T14:13:01Z

     * Cannot be specified with userId.
     */
    studioId?: string;



@TroyceGowdy Please add the ability to accept a GetBillingAccountForRecordSuccess interface instead of userId and studioId. It should bill whatever userId, or studioId, or recordAccountId is specified.

Please also update billForUsage() in the FinancialController class to support billing record accounts. Also add tests for it.

KallynGowdy · 2026-06-18T14:14:11Z

+    /**
+     * Whether billing is using the record's credit account.
+     */
+    isRecordBilling: boolean;


@TroyceGowdy I don't think we need isRecordBilling here, because we can figure that out based on if recordAccountId is not null.

KallynGowdy · 2026-06-18T14:16:24Z

            const billing = await billForUsage(this._financial, {
                userId: billingUserId,
                studioId: billingStudioId,
                transferCode: TransferCodes.records_usage_fee,
                billingCode: BillingCodes.ai_image_pixels,
            });


@TroyceGowdy This also needs to be updated

KallynGowdy · 2026-06-18T14:16:43Z

-function getProviderNativePayloads(response: {
-    [key: string]: unknown;
-}): Record<string, unknown> {
-    const payload: Record<string, unknown> = {};
-
-    for (const key in response) {
-        if (
-            key !== 'choices' &&
-            key !== 'totalTokens' &&
-            key !== 'inputTokens' &&
-            key !== 'outputTokens'
-        ) {
-            payload[key] = response[key];
-        }
-    }
-
-    return payload;
-}


@TroyceGowdy This looks like it was removed when it shouldn't be?

KallynGowdy · 2026-06-18T14:21:07Z

                const billing = await billForUsage(this._financialController, {
-                    userId: metricsResult.ownerId,
-                    studioId: metricsResult.studioId,
+                    userId: billingAccountResult.userId,
+                    studioId: billingAccountResult.studioId,
                    transferCode: TransferCodes.records_usage_fee,
                    billingCode: BillingCodes.data_read,
                });


@TroyceGowdy And this

KallynGowdy · 2026-06-18T14:21:29Z

@@ -2566,6 +2566,79 @@ describe('FileRecordsController', () => {
            });
        });



@TroyceGowdy Please also add a test for billing the record credit account

KallynGowdy · 2026-06-18T14:21:59Z

@@ -1019,6 +1019,71 @@ describe('DataRecordsController', () => {
                );
            });



@TroyceGowdy Please also add a test for billing the record credit account

KallynGowdy · 2026-06-18T14:22:13Z

                const billing = await billForUsage(this._financialController, {
-                    userId: metricsResult.ownerId,
-                    studioId: metricsResult.studioId,
+                    userId: billingAccountResult.userId,
+                    studioId: billingAccountResult.studioId,
                    transferCode: TransferCodes.records_usage_fee,
                    billingCode: BillingCodes.file_write,
                });


@TroyceGowdy Please also update this

KallynGowdy · 2026-06-18T14:32:49Z

    studioId String?
    studio Studio? @relation(fields: [studioId], references: [id])

+    creditAccountId String? @db.String(128)


@TroyceGowdy Please add a migration for CockroachDB. You can do this by starting CockroachDB (npm run cockroach) and then running the migration script for it (pnpm prisma:migrate:dev)

KallynGowdy · 2026-06-18T14:34:33Z

@@ -1980,6 +1980,127 @@ describe('AIController', () => {
                    expect(callerMetrics.totalTokensInCurrentPeriod).toBe(0);
                });



@TroyceGowdy Please also add a test here and also for chatStream() that tests that a record credit account can be billed for usage

…unt tests - add billingAccount: GetBillingAccountForRecordSuccess to usage billing options - update FinancialController._billForUsage() to resolve billing target by: recordAccountId (direct account billing), or userId / studioId from billingAccount, with legacy fallback to top-level userId/studioId - return invalid_request when billingAccount has no usable identifier - fix billForUsage() wrapper to preserve early generator failures (before first yield) - add tests for record-account billing and invalid billingAccount input

…rdBilling - remove isRecordBilling from GetBillingAccountForRecordSuccess - update getBillingAccountForRecord() return payloads accordingly - update AIController billing logic to use recordAccountId instead of isRecordBilling - update FinancialController tests and fixtures to match new shape - keep billForUsage() behavior unchanged while simplifying billing-account contract

…ller.ts

- Adds the Prisma migration for the new Record.creditAccountId / creditBillingEnabled schema.

…chatStream - Add billing tests in AIController.spec.ts for chat() and chatStream() when creditBillingEnabled is true and a record credit account is configured. - Assert usage charges debit the record budget account, not caller or owner accounts. - Fix generateImage() billing scope in AIController.ts by declaring billingAccount before use.

TroyceGowdy added 4 commits May 8, 2026 17:19

fix: fixed hard compile break in FinancialController.ts

5976ff7

feat: add new tests in the FinancialController.spec.ts, DataRecordsCo…

6edf9a8

…ntroller.spec.ts, FileRecordsController.spec.ts, and AIController.spec.ts suites.

chore: update CHANGELOG.md

998453e

TroyceGowdy added this to the v3.5.x milestone May 11, 2026

TroyceGowdy requested review from KallynGowdy and Copilot May 11, 2026 17:45

TroyceGowdy self-assigned this May 11, 2026

TroyceGowdy added enhancement New feature or request area:backend Is related to the backend server. (Everything in aux-records and aux-server/aux-backend) area:xp-api Everything related to the xpAPI labels May 11, 2026

TroyceGowdy added this to CasualOS May 11, 2026

github-project-automation Bot moved this to To triage in CasualOS May 11, 2026

Copilot started reviewing on behalf of TroyceGowdy May 11, 2026 17:45 View session

Copilot AI reviewed May 11, 2026

View reviewed changes

fix: restore SubscriptionController.ts listTransfers compatibility fo…

dc1d958

…r /api/v2/transfers

TroyceGowdy added 8 commits May 11, 2026 14:13

fix: pass getBillingAccountForRecord args in correct order

ef21c76

feat: support record-level credit billing with owner/studio fallback

46fa456

- restore transfers compatibility and filtering behavior in subscription/financial controllers

fix: restore configurable promo codes for credit purchases

b8ae1dc

fix: gate record-billed usage by record subscription context

7294ff8

chore: fix comment in SubscriptionController.ts

253f370

fix: update spelling "miliseconds" to be "milliseconds"

2db010f

KallynGowdy reviewed Jun 4, 2026

View reviewed changes

rboorman and others added 3 commits June 5, 2026 08:05

chore: added fields for sqlite to support creditBilling for records

4b18b96

chore: added sqlite prisma migration for add_record_credit_billing

ade5fd6

Merge remote-tracking branch 'origin/develop' into feat/Support_grant…

0cae05d

…ing_records_credit_budgets

KallynGowdy reviewed Jun 18, 2026

View reviewed changes

TroyceGowdy added 10 commits June 19, 2026 16:59

chore: update AIController.ts

c769a03

chore: restore removed function getProviderNativePayloads in AIContro…

bab3267

…ller.ts

chore: restore removed code

1d78b3b

chore: update DataRecordsController.ts

7e5629c

feat: Add tests to FileRecordsController.spec.ts

695bc04

chore: add tests to DataRecordsController.spec.ts

75d71c5

feat: add CockroachDB migration for record credit billing

c613191

- Adds the Prisma migration for the new Record.creditAccountId / creditBillingEnabled schema.

TroyceGowdy force-pushed the feat/Support_granting_records_credit_budgets branch from 1bd9f4d to 8eb91e0 Compare June 19, 2026 23:10

		@@ -2566,6 +2566,79 @@ describe('FileRecordsController', () => {
		});
		});

		@@ -1019,6 +1019,71 @@ describe('DataRecordsController', () => {
		);
		});

		@@ -1980,6 +1980,127 @@ describe('AIController', () => {
		expect(callerMetrics.totalTokensInCurrentPeriod).toBe(0);
		});

Uh oh!

Conversation

TroyceGowdy commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

KallynGowdy commented May 11, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

TroyceGowdy commented May 11, 2026 •

edited

Loading