byterover-cli 3.12.0 → 3.13.0

package/dist/server/infra/billing/billing-state-endpoint.d.ts

@@ -0,0 +1,4 @@
+import type { BillingStateRequest, BillingStateResponse } from '../../core/domain/transport/schemas.js';
+import type { IBillingConfigStore } from '../../core/interfaces/storage/i-billing-config-store.js';
+export type BillingConfigStoreFactory = (projectPath: string) => IBillingConfigStore;
+export declare function createBillingStateHandler(storeFactory: BillingConfigStoreFactory): (data: BillingStateRequest) => Promise<BillingStateResponse>;

package/dist/server/infra/billing/billing-state-endpoint.js

@@ -0,0 +1,7 @@
+export function createBillingStateHandler(storeFactory) {
+    return async (data) => {
+        const store = storeFactory(data.projectPath);
+        const pinnedTeamId = await store.getPinnedTeamId();
+        return pinnedTeamId === undefined ? {} : { pinnedTeamId };
+    };
+}

package/dist/server/infra/billing/build-status-billing.d.ts

@@ -0,0 +1,9 @@
+import type { BillingFreeUserLimitDTO, BillingUsageDTO, StatusBillingDTO } from '../../../shared/transport/types/dto.js';
+export interface BuildStatusBillingInput {
+    activeProvider: string;
+    freeUserLimit?: BillingFreeUserLimitDTO;
+    isAuthenticated: boolean;
+    paidUsages: readonly BillingUsageDTO[];
+    pinnedTeamId?: string;
+}
+export declare function buildStatusBilling(input: BuildStatusBillingInput): StatusBillingDTO | undefined;

package/dist/server/infra/billing/build-status-billing.js

@@ -0,0 +1,36 @@
+import { resolveBillingTeamId } from './resolve-billing-team.js';
+const BYTEROVER_PROVIDER_ID = 'byterover';
+export function buildStatusBilling(input) {
+    if (!input.isAuthenticated)
+        return undefined;
+    if (input.activeProvider !== BYTEROVER_PROVIDER_ID) {
+        return { activeProvider: input.activeProvider, source: 'other-provider' };
+    }
+    const paidIds = input.paidUsages.map((u) => u.organizationId);
+    const resolved = resolveBillingTeamId({
+        paidOrganizationIds: paidIds,
+        pinnedTeamId: input.pinnedTeamId,
+    });
+    if (resolved === undefined)
+        return freeSource(input.freeUserLimit);
+    const usage = input.paidUsages.find((u) => u.organizationId === resolved);
+    if (!usage)
+        return { organizationId: resolved, source: 'paid' };
+    return {
+        organizationId: usage.organizationId,
+        organizationName: usage.organizationName,
+        remaining: usage.remaining,
+        source: 'paid',
+        tier: usage.tier,
+        total: usage.totalLimit,
+    };
+}
+function freeSource(freeLimit) {
+    if (!freeLimit)
+        return { source: 'free' };
+    return {
+        remaining: freeLimit.monthly.remaining,
+        source: 'free',
+        total: freeLimit.monthly.limit,
+    };
+}

package/dist/server/infra/billing/http-billing-service.d.ts

@@ -0,0 +1,19 @@
+import type { BillingFreeUserLimitDTO, BillingOrganizationTierDTO, BillingUsageDTO } from '../../../shared/transport/types/dto.js';
+import type { IBillingService } from '../../core/interfaces/services/i-billing-service.js';
+export type BillingServiceConfig = {
+    apiBaseUrl: string;
+    timeout?: number;
+};
+/**
+ * HTTP-backed billing service. `getUsages` joins `/billing/usages` and
+ * `/billing/organizations/tiers` in parallel so consumers see tier alongside
+ * credit usage in a single DTO. `getFreeUserLimit` mirrors its endpoint 1:1.
+ */
+export declare class HttpBillingService implements IBillingService {
+    private readonly config;
+    constructor(config: BillingServiceConfig);
+    getFreeUserLimit(sessionKey: string): Promise<BillingFreeUserLimitDTO>;
+    getTiers(sessionKey: string): Promise<BillingOrganizationTierDTO[]>;
+    getUsages(sessionKey: string): Promise<BillingUsageDTO[]>;
+    private fetchRawUsages;
+}

package/dist/server/infra/billing/http-billing-service.js

@@ -0,0 +1,57 @@
+import { getErrorMessage } from '../../utils/error-helpers.js';
+import { AuthenticatedHttpClient } from '../http/authenticated-http-client.js';
+const DEFAULT_TIMEOUT_MS = 10_000;
+/**
+ * HTTP-backed billing service. `getUsages` joins `/billing/usages` and
+ * `/billing/organizations/tiers` in parallel so consumers see tier alongside
+ * credit usage in a single DTO. `getFreeUserLimit` mirrors its endpoint 1:1.
+ */
+export class HttpBillingService {
+    config;
+    constructor(config) {
+        this.config = {
+            apiBaseUrl: config.apiBaseUrl,
+            timeout: config.timeout ?? DEFAULT_TIMEOUT_MS,
+        };
+    }
+    async getFreeUserLimit(sessionKey) {
+        try {
+            const httpClient = new AuthenticatedHttpClient(sessionKey);
+            const url = `${this.config.apiBaseUrl}/billing/usage/free-user/limit`;
+            return await httpClient.get(url, { timeout: this.config.timeout });
+        }
+        catch (error) {
+            throw new Error(`Failed to fetch free-user limit: ${getErrorMessage(error)}`);
+        }
+    }
+    async getTiers(sessionKey) {
+        try {
+            const httpClient = new AuthenticatedHttpClient(sessionKey);
+            const url = `${this.config.apiBaseUrl}/billing/organizations/tiers`;
+            const response = await httpClient.get(url, { timeout: this.config.timeout });
+            return response.organizations;
+        }
+        catch (error) {
+            throw new Error(`Failed to fetch billing tiers: ${getErrorMessage(error)}`);
+        }
+    }
+    async getUsages(sessionKey) {
+        const [rawUsages, tiers] = await Promise.all([this.fetchRawUsages(sessionKey), this.getTiers(sessionKey)]);
+        const tierByOrg = new Map(tiers.map((t) => [t.organizationId, t]));
+        return rawUsages.map((usage) => {
+            const tier = tierByOrg.get(usage.organizationId);
+            return { ...usage, isTrialing: tier?.isTrialing ?? false, tier: tier?.tier ?? 'FREE' };
+        });
+    }
+    async fetchRawUsages(sessionKey) {
+        try {
+            const httpClient = new AuthenticatedHttpClient(sessionKey);
+            const url = `${this.config.apiBaseUrl}/billing/usages`;
+            const response = await httpClient.get(url, { timeout: this.config.timeout });
+            return response.organizations;
+        }
+        catch (error) {
+            throw new Error(`Failed to fetch billing usages: ${getErrorMessage(error)}`);
+        }
+    }
+}

package/dist/server/infra/billing/paid-organizations-endpoint.d.ts

@@ -0,0 +1,8 @@
+import type { PaidOrganizationsResponse } from '../../core/domain/transport/schemas.js';
+import type { IBillingService } from '../../core/interfaces/services/i-billing-service.js';
+import type { IAuthStateStore } from '../../core/interfaces/state/i-auth-state-store.js';
+export interface PaidOrganizationsHandlerDeps {
+    authStateStore: IAuthStateStore;
+    billingService: IBillingService;
+}
+export declare function createPaidOrganizationsHandler(deps: PaidOrganizationsHandlerDeps): () => Promise<PaidOrganizationsResponse>;

package/dist/server/infra/billing/paid-organizations-endpoint.js

@@ -0,0 +1,18 @@
+import { getErrorMessage } from '../../utils/error-helpers.js';
+export function createPaidOrganizationsHandler(deps) {
+    return async () => {
+        const token = deps.authStateStore.getToken();
+        if (!token?.isValid())
+            return { organizationIds: [] };
+        try {
+            const tiers = await deps.billingService.getTiers(token.sessionKey);
+            const organizationIds = tiers
+                .filter((tier) => tier.tier !== 'FREE')
+                .map((tier) => tier.organizationId);
+            return { organizationIds };
+        }
+        catch (error) {
+            return { error: getErrorMessage(error), organizationIds: [] };
+        }
+    };
+}

package/dist/server/infra/billing/resolve-billing-source.d.ts

@@ -0,0 +1,13 @@
+import type { StatusBillingDTO } from '../../../shared/transport/types/dto.js';
+import type { IProviderConfigStore } from '../../core/interfaces/i-provider-config-store.js';
+import type { IBillingService } from '../../core/interfaces/services/i-billing-service.js';
+import type { IAuthStateStore } from '../../core/interfaces/state/i-auth-state-store.js';
+import type { IBillingConfigStore } from '../../core/interfaces/storage/i-billing-config-store.js';
+export interface ResolveBillingDeps {
+    authStateStore: IAuthStateStore;
+    billingConfigStoreFactory: (projectPath: string) => IBillingConfigStore;
+    billingService: IBillingService;
+    projectPath: string;
+    providerConfigStore: IProviderConfigStore;
+}
+export declare function resolveBillingForProject(deps: ResolveBillingDeps): Promise<StatusBillingDTO | undefined>;

package/dist/server/infra/billing/resolve-billing-source.js

@@ -0,0 +1,36 @@
+import { buildStatusBilling } from './build-status-billing.js';
+const BYTEROVER_PROVIDER_ID = 'byterover';
+export async function resolveBillingForProject(deps) {
+    const activeProvider = await deps.providerConfigStore.getActiveProvider().catch(() => '');
+    const token = deps.authStateStore.getToken();
+    if (!token?.isValid()) {
+        return buildStatusBilling({ activeProvider, isAuthenticated: false, paidUsages: [] });
+    }
+    if (activeProvider !== BYTEROVER_PROVIDER_ID) {
+        return buildStatusBilling({ activeProvider, isAuthenticated: true, paidUsages: [] });
+    }
+    const { sessionKey } = token;
+    const [pinnedTeamId, usagesResult] = await Promise.all([
+        deps
+            .billingConfigStoreFactory(deps.projectPath)
+            .getPinnedTeamId()
+            .catch(() => undefined),
+        deps.billingService
+            .getUsages(sessionKey)
+            .then((usages) => ({ ok: true, usages }))
+            .catch(() => ({ ok: false })),
+    ]);
+    if (!usagesResult.ok)
+        return undefined;
+    const paidUsages = usagesResult.usages.filter((u) => u.tier !== 'FREE');
+    const freeUserLimit = paidUsages.length === 0
+        ? await deps.billingService.getFreeUserLimit(sessionKey).catch(() => undefined)
+        : undefined;
+    return buildStatusBilling({
+        activeProvider,
+        freeUserLimit,
+        isAuthenticated: true,
+        paidUsages,
+        pinnedTeamId,
+    });
+}

package/dist/server/infra/billing/resolve-billing-team.d.ts

@@ -0,0 +1,5 @@
+export interface BillingTeamResolverInput {
+    paidOrganizationIds: readonly string[];
+    pinnedTeamId?: string;
+}
+export declare function resolveBillingTeamId(input: BillingTeamResolverInput): string | undefined;

package/dist/server/infra/billing/resolve-billing-team.js

@@ -0,0 +1,8 @@
+export function resolveBillingTeamId(input) {
+    const { paidOrganizationIds, pinnedTeamId } = input;
+    if (pinnedTeamId)
+        return pinnedTeamId;
+    if (paidOrganizationIds.length === 1)
+        return paidOrganizationIds[0];
+    return undefined;
+}

package/dist/server/infra/connectors/rules/rules-connector.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { AGENT_CONNECTOR_CONFIG } from '../../../core/domain/entities/agent.js';
-import { hasMcpToolsInBrvSection } from '../shared/constants.js';
+import { extractInstalledAgentFromBrvSection, hasMcpToolsInBrvSection } from '../shared/constants.js';
 import { RuleFileManager } from '../shared/rule-file-manager.js';
 import { RULES_CONNECTOR_CONFIGS } from './rules-connector-config.js';
 /**
@@ -99,7 +99,12 @@ export class RulesConnector {
             }
             const content = await this.fileService.read(fullPath);
             const hasMcpTools = hasMcpToolsInBrvSection(content);
-            const installed = hasMarkers && !hasMcpTools;
+            const footerAgent = extractInstalledAgentFromBrvSection(content);
+            // Footer present: only the agent named in the footer owns this rule file.
+            // Footer absent (legacy file pre-footer): fall back to marker presence so
+            // existing installs keep reporting installed until the next reinstall.
+            const matchesFooter = footerAgent === undefined ? true : footerAgent === agent;
+            const installed = hasMarkers && !hasMcpTools && matchesFooter;
             return {
                 configExists: true,
                 configPath: config.filePath,

package/dist/server/infra/connectors/shared/constants.d.ts

@@ -15,3 +15,12 @@ export declare const BRV_RULE_MARKERS: {
  * Only checks within the markers section to avoid false positives from user content.
  */
 export declare const hasMcpToolsInBrvSection: (content: string) => boolean;
+/**
+ * Extracts the agent name from a `Generated by ByteRover CLI for X` footer
+ * inside the BRV markers section. Used to disambiguate which agent owns a
+ * shared rule file (Amp / Codex / OpenCode all map to AGENTS.md).
+ *
+ * Returns undefined when markers are missing, when the footer is absent
+ * (legacy pre-footer installs), or when the footer line is empty.
+ */
+export declare const extractInstalledAgentFromBrvSection: (content: string) => string | undefined;

package/dist/server/infra/connectors/shared/constants.js

@@ -10,16 +10,42 @@ export const BRV_RULE_MARKERS = {
     END: '<!-- END BYTEROVER RULES -->',
     START: '<!-- BEGIN BYTEROVER RULES -->',
 };
+const sliceBrvSection = (content) => {
+    const startIdx = content.indexOf(BRV_RULE_MARKERS.START);
+    const endIdx = content.indexOf(BRV_RULE_MARKERS.END);
+    if (startIdx === -1 || endIdx === -1 || endIdx < startIdx)
+        return undefined;
+    return content.slice(startIdx, endIdx);
+};
 /**
  * Checks if the BRV markers section contains MCP tool references (brv-query/brv-curate).
  * Only checks within the markers section to avoid false positives from user content.
  */
 export const hasMcpToolsInBrvSection = (content) => {
-    const startIdx = content.indexOf(BRV_RULE_MARKERS.START);
-    const endIdx = content.indexOf(BRV_RULE_MARKERS.END);
-    if (startIdx === -1 || endIdx === -1)
+    const brvSection = sliceBrvSection(content);
+    if (brvSection === undefined)
         return false;
-    // eslint-disable-next-line unicorn/prefer-set-has
-    const brvSection = content.slice(startIdx, endIdx);
     return brvSection.includes('brv-query') || brvSection.includes('brv-curate');
 };
+/**
+ * Extracts the agent name from a `Generated by ByteRover CLI for X` footer
+ * inside the BRV markers section. Used to disambiguate which agent owns a
+ * shared rule file (Amp / Codex / OpenCode all map to AGENTS.md).
+ *
+ * Returns undefined when markers are missing, when the footer is absent
+ * (legacy pre-footer installs), or when the footer line is empty.
+ */
+export const extractInstalledAgentFromBrvSection = (content) => {
+    const brvSection = sliceBrvSection(content);
+    if (brvSection === undefined)
+        return undefined;
+    const tagWithDelimiter = `${BRV_RULE_TAG} `;
+    const tagIdx = brvSection.indexOf(tagWithDelimiter);
+    if (tagIdx === -1)
+        return undefined;
+    const afterTag = brvSection.slice(tagIdx + tagWithDelimiter.length);
+    const newlineIdx = afterTag.indexOf('\n');
+    const agentLine = newlineIdx === -1 ? afterTag : afterTag.slice(0, newlineIdx);
+    const agent = agentLine.trim();
+    return agent.length === 0 ? undefined : agent;
+};

package/dist/server/infra/daemon/agent-process.js

@@ -133,7 +133,7 @@ async function activateExistingSession(sessionId, providerId) {
  */
 let cachedSessionKey = '';
 let cachedBrvConfig;
-let cachedTeamId = '';
+let cachedPinnedOrgId;
 let cachedSpaceId = '';
 let cachedActiveProvider = '';
 let cachedActiveModel = '';
@@ -177,15 +177,16 @@ async function start() {
     transport.on('connect_error', (err) => {
         agentLog(`Transport connect_error: ${err?.message ?? 'unknown'}`);
     });
-    const [configResult, authResult, providerResult] = await Promise.all([
+    const [configResult, authResult, providerResult, billingResult] = await Promise.all([
         transport.requestWithAck(TransportStateEventNames.GET_PROJECT_CONFIG, { projectPath }),
         transport.requestWithAck(TransportStateEventNames.GET_AUTH),
         transport.requestWithAck(TransportStateEventNames.GET_PROVIDER_CONFIG),
+        transport.requestWithAck(TransportStateEventNames.GET_BILLING_CONFIG, { projectPath }),
     ]);
     cachedBrvConfig = configResult.brvConfig;
-    cachedTeamId = configResult.teamId ?? '';
     cachedSpaceId = configResult.spaceId ?? '';
     cachedSessionKey = authResult.sessionKey ?? '';
+    cachedPinnedOrgId = billingResult.pinnedTeamId;
     agentLog('Initial config loaded from state server');
     // 3. Listen for config/auth/provider updates from daemon
     transport.on('config:updated', (data) => {
@@ -193,8 +194,6 @@ async function start() {
             return;
         if (data.brvConfig)
             cachedBrvConfig = data.brvConfig;
-        if (data.teamId !== undefined)
-            cachedTeamId = data.teamId;
         if (data.spaceId !== undefined)
             cachedSpaceId = data.spaceId;
     });
@@ -206,6 +205,11 @@ async function start() {
         providerConfigDirty = true;
         providerFetchRetries = 0;
     });
+    transport.on(TransportDaemonEventNames.BILLING_PIN_CHANGED, (data) => {
+        if (data.projectPath !== projectPath)
+            return;
+        cachedPinnedOrgId = data.teamId;
+    });
     // 4. Provider config resolved by daemon (API key, base URL, headers, etc.)
     const { activeModel, activeProvider } = providerResult;
     cachedActiveProvider = activeProvider;
@@ -244,7 +248,7 @@ async function start() {
         projectIdProvider: () => PROJECT,
         sessionKeyProvider: () => cachedSessionKey,
         spaceIdProvider: () => cachedSpaceId,
-        teamIdProvider: () => cachedTeamId,
+        teamIdProvider: () => cachedPinnedOrgId ?? '',
         transportClient: transport,
     });
     await agent.start();
@@ -393,8 +397,6 @@ async function executeTask(task, curateExecutor, folderPackExecutor, queryExecut
                 const configResult = await transport.requestWithAck(TransportStateEventNames.GET_PROJECT_CONFIG, { projectPath });
                 if (configResult.brvConfig)
                     cachedBrvConfig = configResult.brvConfig;
-                if (configResult.teamId !== undefined)
-                    cachedTeamId = configResult.teamId;
                 if (configResult.spaceId !== undefined)
                     cachedSpaceId = configResult.spaceId;
             }

package/dist/server/infra/daemon/brv-server.js

@@ -34,6 +34,7 @@ import { TransportStateEventNames, TransportTaskEventNames, } from '../../core/d
 import { getGlobalDataDir } from '../../utils/global-data-path.js';
 import { getProjectDataDir } from '../../utils/path-utils.js';
 import { crashLog, processLog } from '../../utils/process-logger.js';
+import { createBillingStateHandler } from '../billing/billing-state-endpoint.js';
 import { ClientManager } from '../client/client-manager.js';
 import { ProjectConfigStore } from '../config/file-config-store.js';
 import { readContextTreeRemoteUrl } from '../context-tree/read-context-tree-remote.js';
@@ -54,6 +55,7 @@ import { clearStaleProviderConfig, resolveProviderConfig } from '../provider/pro
 import { ProjectRouter } from '../routing/project-router.js';
 import { AuthStateStore } from '../state/auth-state-store.js';
 import { ProjectStateLoader } from '../state/project-state-loader.js';
+import { FileBillingConfigStore } from '../storage/file-billing-config-store.js';
 import { FileCurateLogStore } from '../storage/file-curate-log-store.js';
 import { FileProviderConfigStore } from '../storage/file-provider-config-store.js';
 import { FileReviewBackupStore } from '../storage/file-review-backup-store.js';
@@ -360,6 +362,8 @@ async function main() {
         await clearStaleProviderConfig(providerConfigStore, providerKeychainStore, providerOAuthTokenStore);
         // State endpoint: provider config — agents request this on startup and after provider:updated
         transportServer.onRequest(TransportStateEventNames.GET_PROVIDER_CONFIG, async () => resolveProviderConfig({ authStateStore, providerConfigStore, providerKeychainStore, tokenRefreshManager }));
+        const billingConfigStoreFactory = (projectPath) => new FileBillingConfigStore({ baseDir: join(projectPath, BRV_DIR) });
+        transportServer.onRequest(TransportStateEventNames.GET_BILLING_CONFIG, createBillingStateHandler(billingConfigStoreFactory));
         const transportHandlers = new TransportHandlers({
             agentPool,
             clientManager,
@@ -573,6 +577,7 @@ async function main() {
         // without waiting for OIDC discovery (~400ms).
         await setupFeatureHandlers({
             authStateStore,
+            billingConfigStoreFactory,
             broadcastToProject(projectPath, event, data) {
                 broadcastToProjectRoom(projectRegistry, projectRouter, projectPath, event, data);
             },

package/dist/server/infra/http/provider-model-fetchers.js

@@ -361,17 +361,23 @@ export class OpenAICompatibleModelFetcher {
         const modelList = Array.isArray(responseData)
             ? responseData
             : (responseData.data ?? responseData.models ?? []);
-        const models = modelList.map((model) => {
+        const uniqueModels = new Map();
+        for (const model of modelList) {
             const id = String(model.id ?? model.name ?? '');
-            return {
+            if (!id)
+                continue;
+            if (uniqueModels.has(id))
+                continue;
+            uniqueModels.set(id, {
                 contextLength: typeof model.context_length === 'number' ? model.context_length : 128_000,
                 id,
                 isFree: false,
                 name: id,
                 pricing: { inputPerM: 0, outputPerM: 0 },
                 provider: this.providerName,
-            };
-        });
+            });
+        }
+        const models = [...uniqueModels.values()];
         // Sort by ID
         models.sort((a, b) => a.id.localeCompare(b.id));
         this.cache = { models, timestamp: Date.now() };

package/dist/server/infra/process/feature-handlers.d.ts

@@ -9,10 +9,12 @@ import type { IProviderKeychainStore } from '../../core/interfaces/i-provider-ke
 import type { IProviderOAuthTokenStore } from '../../core/interfaces/i-provider-oauth-token-store.js';
 import type { IProjectRegistry } from '../../core/interfaces/project/i-project-registry.js';
 import type { IAuthStateStore } from '../../core/interfaces/state/i-auth-state-store.js';
+import type { IBillingConfigStore } from '../../core/interfaces/storage/i-billing-config-store.js';
 import type { ITransportServer } from '../../core/interfaces/transport/i-transport-server.js';
 import type { ProjectBroadcaster, ProjectPathResolver } from '../transport/handlers/handler-types.js';
 export interface FeatureHandlersOptions {
     authStateStore: IAuthStateStore;
+    billingConfigStoreFactory: (projectPath: string) => IBillingConfigStore;
     broadcastToProject: ProjectBroadcaster;
     getActiveProjectPaths: () => string[];
     log: (msg: string) => void;
@@ -28,4 +30,4 @@ export interface FeatureHandlersOptions {
  * Setup all feature handlers on the transport server.
  * These handlers implement the TUI ↔ Server event contract (auth:*, config:*, status:*, etc.).
  */
-export declare function setupFeatureHandlers({ authStateStore, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }: FeatureHandlersOptions): Promise<void>;
+export declare function setupFeatureHandlers({ authStateStore, billingConfigStoreFactory, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }: FeatureHandlersOptions): Promise<void>;

package/dist/server/infra/process/feature-handlers.js

@@ -10,9 +10,12 @@ import { ReviewEvents } from '../../../shared/transport/events/review-events.js'
 import { getAuthConfig } from '../../config/auth.config.js';
 import { getCurrentConfig } from '../../config/environment.js';
 import { API_V1_PATH, BRV_DIR } from '../../constants.js';
+import { TransportStateEventNames } from '../../core/domain/transport/schemas.js';
 import { getProjectDataDir } from '../../utils/path-utils.js';
 import { OAuthService } from '../auth/oauth-service.js';
 import { OidcDiscoveryService } from '../auth/oidc-discovery-service.js';
+import { HttpBillingService } from '../billing/http-billing-service.js';
+import { createPaidOrganizationsHandler } from '../billing/paid-organizations-endpoint.js';
 import { SystemBrowserLauncher } from '../browser/system-browser-launcher.js';
 import { HttpCogitPullService } from '../cogit/http-cogit-pull-service.js';
 import { HttpCogitPushService } from '../cogit/http-cogit-push-service.js';
@@ -37,23 +40,25 @@ import { FileReviewBackupStore } from '../storage/file-review-backup-store.js';
 import { createTokenStore } from '../storage/token-store.js';
 import { HttpTeamService } from '../team/http-team-service.js';
 import { FsTemplateLoader } from '../template/fs-template-loader.js';
-import { AuthHandler, ConfigHandler, ConnectorsHandler, ContextTreeHandler, HubHandler, InitHandler, LocationsHandler, ModelHandler, ProviderHandler, PullHandler, PushHandler, ResetHandler, ReviewHandler, SourceHandler, SpaceHandler, StatusHandler, VcHandler, WorktreeHandler, } from '../transport/handlers/index.js';
+import { AuthHandler, BillingHandler, ConfigHandler, ConnectorsHandler, ContextTreeHandler, HubHandler, InitHandler, LocationsHandler, ModelHandler, ProviderHandler, PullHandler, PushHandler, ResetHandler, ReviewHandler, SourceHandler, SpaceHandler, StatusHandler, TeamHandler, VcHandler, WorktreeHandler, } from '../transport/handlers/index.js';
 import { HttpUserService } from '../user/http-user-service.js';
 import { FileVcGitConfigStore } from '../vc/file-vc-git-config-store.js';
 /**
  * Setup all feature handlers on the transport server.
  * These handlers implement the TUI ↔ Server event contract (auth:*, config:*, status:*, etc.).
  */
-export async function setupFeatureHandlers({ authStateStore, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }) {
+export async function setupFeatureHandlers({ authStateStore, billingConfigStoreFactory, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }) {
     const envConfig = getCurrentConfig();
     const tokenStore = createTokenStore();
     const projectConfigStore = new ProjectConfigStore();
     // API version paths appended at point of use.
     // Note: IAM and Cogit currently share this version path, but may version independently in the future.
     const iamApiV1 = `${envConfig.iamBaseUrl}${API_V1_PATH}`;
+    const billingApiV1 = `${envConfig.billingBaseUrl}${API_V1_PATH}`;
     const userService = new HttpUserService({ apiBaseUrl: iamApiV1 });
     const teamService = new HttpTeamService({ apiBaseUrl: iamApiV1 });
     const spaceService = new HttpSpaceService({ apiBaseUrl: iamApiV1 });
+    const billingService = new HttpBillingService({ apiBaseUrl: billingApiV1 });
     // Auth handler requires async OIDC discovery
     const discoveryService = new OidcDiscoveryService();
     const authConfig = await getAuthConfig(discoveryService);
@@ -65,6 +70,7 @@ export async function setupFeatureHandlers({ authStateStore, broadcastToProject,
         browserLauncher: new SystemBrowserLauncher(),
         callbackHandler: new CallbackHandler(),
         projectConfigStore,
+        providerConfigStore,
         resolveProjectPath,
         tokenStore,
         transport,
@@ -78,6 +84,20 @@ export async function setupFeatureHandlers({ authStateStore, broadcastToProject,
         providerOAuthTokenStore,
         transport,
     }).setup();
+    new BillingHandler({
+        authStateStore,
+        billingConfigStoreFactory,
+        billingService,
+        providerConfigStore,
+        resolveProjectPath,
+        transport,
+    }).setup();
+    transport.onRequest(TransportStateEventNames.GET_PAID_ORGANIZATIONS, createPaidOrganizationsHandler({ authStateStore, billingService }));
+    new TeamHandler({
+        authStateStore,
+        teamService,
+        transport,
+    }).setup();
     new ModelHandler({
         providerConfigStore,
         providerKeychainStore,
@@ -100,10 +120,14 @@ export async function setupFeatureHandlers({ authStateStore, broadcastToProject,
     // Project-scoped handlers (receive resolveProjectPath for client → project resolution)
     const gitService = new IsomorphicGitService(authStateStore);
     new StatusHandler({
+        authStateStore,
+        billingConfigStoreFactory,
+        billingService,
         contextTreeService,
         contextTreeSnapshotService,
         curateLogStoreFactory: (projectPath) => new FileCurateLogStore({ baseDir: getProjectDataDir(projectPath) }),
         projectConfigStore,
+        providerConfigStore,
         resolveProjectPath,
         tokenStore,
         transport,

package/dist/server/infra/storage/file-billing-config-store.d.ts

@@ -0,0 +1,13 @@
+import type { IBillingConfigStore } from '../../core/interfaces/storage/i-billing-config-store.js';
+export interface FileBillingConfigStoreOptions {
+    baseDir: string;
+}
+export declare class FileBillingConfigStore implements IBillingConfigStore {
+    private readonly baseDir;
+    private readonly configPath;
+    constructor(options: FileBillingConfigStoreOptions);
+    getPinnedTeamId(): Promise<string | undefined>;
+    setPinnedTeamId(teamId: string | undefined): Promise<void>;
+    private readJson;
+    private writeJson;
+}

package/dist/server/infra/storage/file-billing-config-store.js

@@ -0,0 +1,55 @@
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+const PROVIDER_CONFIG_FILE = 'brv-provider.json';
+export class FileBillingConfigStore {
+    baseDir;
+    configPath;
+    constructor(options) {
+        this.baseDir = options.baseDir;
+        this.configPath = join(options.baseDir, PROVIDER_CONFIG_FILE);
+    }
+    async getPinnedTeamId() {
+        const json = await this.readJson();
+        return json.billing?.pinnedTeamId;
+    }
+    async setPinnedTeamId(teamId) {
+        const json = await this.readJson();
+        const billing = { ...json.billing };
+        if (teamId === undefined) {
+            delete billing.pinnedTeamId;
+        }
+        else {
+            billing.pinnedTeamId = teamId;
+        }
+        const next = { ...json, billing };
+        if (Object.keys(billing).length === 0)
+            delete next.billing;
+        await this.writeJson(next);
+    }
+    async readJson() {
+        try {
+            const content = await readFile(this.configPath, 'utf8');
+            const parsed = JSON.parse(content);
+            if (!isRecord(parsed))
+                return {};
+            const result = { ...parsed };
+            if (isRecord(parsed.billing) && typeof parsed.billing.pinnedTeamId === 'string') {
+                result.billing = { pinnedTeamId: parsed.billing.pinnedTeamId };
+            }
+            else {
+                delete result.billing;
+            }
+            return result;
+        }
+        catch {
+            return {};
+        }
+    }
+    async writeJson(json) {
+        await mkdir(this.baseDir, { recursive: true });
+        await writeFile(this.configPath, JSON.stringify(json, null, 2), 'utf8');
+    }
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}