tapimo 0.6.0 → 0.7.1

package/src/admin/apps/organizations.ts

@@ -6,6 +6,7 @@ import * as ApiKeys from '../../ApiKeys.js'
 import * as core_Billing from '../../apps/management/Billing.js'
 import * as BillingSettings from '../../db/tables/billingSettings.js'
 import * as Db from '../../db/Db.js'
+import * as EnabledBillingSources from '../../db/tables/enabledBillingSources.js'
 import * as Memberships from '../../db/tables/memberships.js'
 import * as Organizations from '../../db/tables/organizations.js'
 import * as Projects from '../../db/tables/projects.js'
@@ -26,6 +27,21 @@ export namespace schema {
     .string()
     .check(z.describe('An ISO 8601 timestamp.'), z.meta({ examples: ['2026-01-01T00:00:00.000Z'] }))
 
+  const enabledBillingSources = z
+    .array(z.enum(EnabledBillingSources.sources))
+    .check(
+      z.describe('Billing-source types available for new setup.'),
+      z.meta({ examples: [['stripe', 'tempo']] }),
+    )
+
+  const organizationId = z
+    .string()
+    .check(
+      z.minLength(1),
+      z.describe('Stable organization id.'),
+      z.meta({ examples: ['org_1a2b3c4d5e6f7g8h9j0k1m2n'] }),
+    )
+
   const Organization = Schema.describe(
     z.object({
       createdAt: timestamp,
@@ -118,13 +134,7 @@ export namespace schema {
     /** Path parameters identifying an organization. */
     export const Params = z
       .object({
-        orgId: z
-          .string()
-          .check(
-            z.minLength(1),
-            z.describe('Stable organization id.'),
-            z.meta({ examples: ['org_1a2b3c4d5e6f7g8h9j0k1m2n'] }),
-          ),
+        orgId: organizationId,
       })
       .check(z.describe('Path parameters for one organization.'))
 
@@ -252,29 +262,58 @@ export namespace schema {
     /** Detailed organization lookup response. */
     export const Response = Schema.describe(
       z.extend(listOrganizations.OrganizationSummary, {
-        billing: z.object({ production: Billing, sandbox: Billing }).check(
-          z.describe('Billing state split by environment.'),
-          z.meta({
-            examples: [
-              {
-                production: {
-                  settings: null,
-                  source: {
-                    status: 'active',
-                    stripeCustomerId: 'cus_abc123',
-                    updatedAt: '2026-01-01T00:00:00.000Z',
+        billing: z
+          .object({
+            enabledSources: enabledBillingSources,
+            production: Billing,
+            sandbox: Billing,
+          })
+          .check(
+            z.describe('Organization-wide availability and environment billing state.'),
+            z.meta({
+              examples: [
+                {
+                  enabledSources: ['stripe', 'tempo'],
+                  production: {
+                    settings: null,
+                    source: {
+                      status: 'active',
+                      stripeCustomerId: 'cus_abc123',
+                      updatedAt: '2026-01-01T00:00:00.000Z',
+                    },
                   },
+                  sandbox: { settings: null, source: null },
                 },
-                sandbox: { settings: null, source: null },
-              },
-            ],
-          }),
-        ),
+              ],
+            }),
+          ),
       }),
       'Detailed organization information for administrators.',
     )
   }
 
+  /** Schemas for the setBillingSource operation. */
+  export namespace setBillingSource {
+    /** Path parameters identifying an organization billing source. */
+    export const Params = z
+      .object({
+        orgId: organizationId,
+        source: z
+          .enum(EnabledBillingSources.sources)
+          .check(
+            z.describe('Billing-source type to enable or disable.'),
+            z.meta({ examples: ['stripe'] }),
+          ),
+      })
+      .check(z.describe('Path parameters for one organization billing source.'))
+
+    /** Current enabled billing sources. */
+    export const Response = Schema.describe(
+      z.object({ data: enabledBillingSources }),
+      'Current enabled billing sources for the organization.',
+    )
+  }
+
   /** Schemas for the listOrganizationMembers operation. */
   export namespace listOrganizationMembers {
     /** Query parameters for paginating organization members. */
@@ -502,7 +541,7 @@ export namespace schema {
   }
 }
 
-/** Read-only organization lookup routes for administrators. */
+/** Organization lookup and support routes for administrators. */
 export function organizations() {
   return new Hono<App.Environment>()
     .get(
@@ -576,17 +615,24 @@ export function organizations() {
           const organization = await Organizations.getSummary(db, orgId)
           if (!organization) return organizationNotFound(c)
 
-          const [productionSettings, productionSource, sandboxSettings, sandboxSource] =
-            await Promise.all([
-              BillingSettings.get(db, orgId, 'production'),
-              StripeCustomers.get(db, orgId, 'production'),
-              BillingSettings.get(db, orgId, 'sandbox'),
-              StripeCustomers.get(db, orgId, 'sandbox'),
-            ])
+          const [
+            enabledSources,
+            productionSettings,
+            productionSource,
+            sandboxSettings,
+            sandboxSource,
+          ] = await Promise.all([
+            EnabledBillingSources.listByOrg(db, orgId),
+            BillingSettings.get(db, orgId, 'production'),
+            StripeCustomers.get(db, orgId, 'production'),
+            BillingSettings.get(db, orgId, 'sandbox'),
+            StripeCustomers.get(db, orgId, 'sandbox'),
+          ])
           return c.json(
             Response.validated(schema.getOrganization.Response, {
               ...organization,
               billing: {
+                enabledSources: enabledSources.map((record) => record.source),
                 production: serializeBilling(productionSettings, productionSource),
                 sandbox: serializeBilling(sandboxSettings, sandboxSource),
               },
@@ -598,6 +644,84 @@ export function organizations() {
         }
       },
     )
+    .put(
+      '/:orgId/billing-sources/:source',
+      OpenApi.validate('param', schema.setBillingSource.Params, {
+        code: 'param_invalid',
+        message: 'Invalid path parameters',
+      }),
+      OpenApi.describeRoute({
+        operationId: 'enableAdminOrganizationBillingSource',
+        responses: OpenApi.responses({
+          errors: { 404: 'Organization not found.' },
+          success: {
+            description: 'Current enabled billing sources.',
+            schema: schema.setBillingSource.Response,
+          },
+        }),
+        summary: 'Enable billing source',
+        tags: ['Organizations'],
+      }),
+      async (c) => {
+        const { orgId, source } = c.req.valid('param')
+        const db = Db.get(c.get('db'))
+        try {
+          if (!(await Organizations.get(db, orgId))) return organizationNotFound(c)
+          await EnabledBillingSources.add(db, {
+            createdBy: c.get('identity')!.email,
+            orgId,
+            source,
+          })
+          return c.json(
+            Response.validated(schema.setBillingSource.Response, {
+              data: (await EnabledBillingSources.listByOrg(db, orgId)).map(
+                (record) => record.source,
+              ),
+            }),
+            200,
+          )
+        } catch (cause) {
+          return Response.upstream(c, cause)
+        }
+      },
+    )
+    .delete(
+      '/:orgId/billing-sources/:source',
+      OpenApi.validate('param', schema.setBillingSource.Params, {
+        code: 'param_invalid',
+        message: 'Invalid path parameters',
+      }),
+      OpenApi.describeRoute({
+        operationId: 'disableAdminOrganizationBillingSource',
+        responses: OpenApi.responses({
+          errors: { 404: 'Organization not found.' },
+          success: {
+            description: 'Current enabled billing sources.',
+            schema: schema.setBillingSource.Response,
+          },
+        }),
+        summary: 'Disable billing source',
+        tags: ['Organizations'],
+      }),
+      async (c) => {
+        const { orgId, source } = c.req.valid('param')
+        const db = Db.get(c.get('db'))
+        try {
+          if (!(await Organizations.get(db, orgId))) return organizationNotFound(c)
+          await EnabledBillingSources.remove(db, { orgId, source })
+          return c.json(
+            Response.validated(schema.setBillingSource.Response, {
+              data: (await EnabledBillingSources.listByOrg(db, orgId)).map(
+                (record) => record.source,
+              ),
+            }),
+            200,
+          )
+        } catch (cause) {
+          return Response.upstream(c, cause)
+        }
+      },
+    )
     .get(
       '/:orgId/members',
       OpenApi.validate('param', schema.getOrganization.Params, {

package/src/admin/apps/scopes.test.ts

@@ -34,6 +34,11 @@ describe('GET /scopes', () => {
             "scope": "management:write",
             "selfServe": true,
           },
+          {
+            "description": "Validate and broadcast MPP payment credentials through the Tempo relay.",
+            "scope": "mpp:write",
+            "selfServe": true,
+          },
           {
             "description": "Fill and submit transactions through the relay.",
             "scope": "rpc-relay:read",

package/src/admin/ui/src/lib/organizations.test.ts

@@ -1,9 +1,11 @@
 import { QueryClient } from '@tanstack/react-query'
 import { createMemoryHistory, createRouter } from '@tanstack/react-router'
+import { createElement } from 'react'
+import { renderToStaticMarkup } from 'react-dom/server'
 import { describe, expect, it, vi } from 'vite-plus/test'
 
 import { routeTree } from '../routeTree.gen'
-import { Route as DetailRoute } from '../routes/organizations_.$orgId'
+import { BillingSourcesCard, Route as DetailRoute } from '../routes/organizations_.$orgId'
 import { Route as ListRoute } from '../routes/organizations'
 import * as Organizations from './organizations'
 
@@ -49,6 +51,84 @@ describe('searchParameters', () => {
   })
 })
 
+describe('withEnabledSources', () => {
+  it('replaces only organization-wide billing availability', () => {
+    const detail = {
+      billing: {
+        enabledSources: [],
+        production: { settings: null, source: null },
+        sandbox: { settings: null, source: null },
+      },
+      createdAt: '2026-01-01T00:00:00.000Z',
+      createdBy: null,
+      id: 'org_example',
+      memberCount: 0,
+      name: 'Example',
+      projectCount: 0,
+      updatedAt: '2026-01-01T00:00:00.000Z',
+      userId: null,
+    } satisfies Organizations.Detail
+
+    const updated = Organizations.withEnabledSources({
+      detail,
+      enabledSources: ['stripe', 'tempo'],
+    })
+
+    expect({
+      original: detail.billing.enabledSources,
+      productionPreserved: updated.billing.production === detail.billing.production,
+      updated: updated.billing.enabledSources,
+    }).toMatchInlineSnapshot(`
+      {
+        "original": [],
+        "productionPreserved": true,
+        "updated": [
+          "stripe",
+          "tempo",
+        ],
+      }
+    `)
+  })
+})
+
+describe('BillingSourcesCard', () => {
+  it('renders source state and the setup-only warning', () => {
+    const markup = renderToStaticMarkup(
+      createElement(BillingSourcesCard, {
+        enabledSources: ['stripe'],
+        error: null,
+        onChange() {},
+        pending: false,
+      }),
+    )
+
+    function isChecked(label: string) {
+      const marker = `aria-label="${label} billing source"`
+      const markerIndex = markup.indexOf(marker)
+      if (markerIndex === -1) return undefined
+      const tag = markup.slice(
+        markup.lastIndexOf('<', markerIndex),
+        markup.indexOf('>', markerIndex),
+      )
+      return tag.includes('aria-checked="true"')
+    }
+
+    expect({
+      stripe: isChecked('Stripe'),
+      tempo: isChecked('Tempo'),
+      warning: markup.includes(
+        'Disabling a source only blocks new setup. Existing billing connections continue to work.',
+      ),
+    }).toMatchInlineSnapshot(`
+      {
+        "stripe": true,
+        "tempo": false,
+        "warning": true,
+      }
+    `)
+  })
+})
+
 describe('organization routes', () => {
   it('matches a direct detail URL without the list route as a parent', () => {
     const router = createRouter({

package/src/admin/ui/src/lib/organizations.ts

@@ -6,6 +6,10 @@ import { client } from './client'
 
 type ListResponse = InferResponseType<(typeof client)['organizations']['$get'], 200>
 type DetailResponse = InferResponseType<(typeof client)['organizations'][':orgId']['$get'], 200>
+type BillingSourcesResponse = InferResponseType<
+  (typeof client)['organizations'][':orgId']['billing-sources'][':source']['$put'],
+  200
+>
 type MembersResponse = InferResponseType<
   (typeof client)['organizations'][':orgId']['members']['$get'],
   200
@@ -37,6 +41,9 @@ export type Organization = ListResponse['data'][number]
 /** Detailed organization information, including billing state. */
 export type Detail = DetailResponse
 
+/** An organization-wide billing source. */
+export type BillingSource = Detail['billing']['enabledSources'][number]
+
 /** An organization member with resolved identity. */
 export type Member = MembersResponse['data'][number]
 
@@ -138,6 +145,91 @@ export namespace get {
   }
 }
 
+/** Returns organization detail with its enabled billing sources replaced. */
+export function withEnabledSources(options: withEnabledSources.Options): Detail {
+  return {
+    ...options.detail,
+    billing: {
+      ...options.detail.billing,
+      enabledSources: options.enabledSources,
+    },
+  }
+}
+
+export declare namespace withEnabledSources {
+  /** Inputs for replacing enabled billing sources in cached organization detail. */
+  type Options = {
+    /** Organization detail to update. */
+    detail: Detail
+    /** Current enabled billing sources. */
+    enabledSources: Detail['billing']['enabledSources']
+  }
+}
+
+/** Enable an organization-wide billing source. */
+export namespace enableBillingSource {
+  /** Billing source to enable for an organization. */
+  export type Input = {
+    /** Organization id. */
+    orgId: string
+    /** Billing source to enable. */
+    source: BillingSource
+  }
+
+  /** Enables a billing source and returns the current enabled sources. */
+  export async function fn(options: Input) {
+    const response = await client.organizations[':orgId']['billing-sources'][':source'].$put({
+      param: options,
+    })
+    if (!response.ok) throw new Error('Failed to enable billing source.')
+    return (await response.json()) as BillingSourcesResponse
+  }
+
+  /** Creates a mutation that enables a billing source. */
+  export function useMutation(orgId: string) {
+    const queryClient = ReactQuery.useQueryClient()
+    return ReactQuery.useMutation({
+      mutationFn: (source: BillingSource) => fn({ orgId, source }),
+      onSuccess: (response) =>
+        queryClient.setQueryData(get.key(orgId), (detail: Detail | undefined) =>
+          detail ? withEnabledSources({ detail, enabledSources: response.data }) : detail,
+        ),
+    })
+  }
+}
+
+/** Disable an organization-wide billing source. */
+export namespace disableBillingSource {
+  /** Billing source to disable for an organization. */
+  export type Input = {
+    /** Organization id. */
+    orgId: string
+    /** Billing source to disable. */
+    source: BillingSource
+  }
+
+  /** Disables a billing source and returns the current enabled sources. */
+  export async function fn(options: Input) {
+    const response = await client.organizations[':orgId']['billing-sources'][':source'].$delete({
+      param: options,
+    })
+    if (!response.ok) throw new Error('Failed to disable billing source.')
+    return (await response.json()) as BillingSourcesResponse
+  }
+
+  /** Creates a mutation that disables a billing source. */
+  export function useMutation(orgId: string) {
+    const queryClient = ReactQuery.useQueryClient()
+    return ReactQuery.useMutation({
+      mutationFn: (source: BillingSource) => fn({ orgId, source }),
+      onSuccess: (response) =>
+        queryClient.setQueryData(get.key(orgId), (detail: Detail | undefined) =>
+          detail ? withEnabledSources({ detail, enabledSources: response.data }) : detail,
+        ),
+    })
+  }
+}
+
 /** List members for one organization. */
 export namespace members {
   export function key(orgId: string) {

package/src/admin/ui/src/routes/api-keys.tsx

@@ -218,7 +218,7 @@ function ProvisionForm(props: {
             </select>
           </div>
           <Input
-            defaultValue="100"
+            defaultValue="10000"
             label="Rate limit"
             min={0}
             name="rateLimit"

package/src/admin/ui/src/routes/early-access.tsx

@@ -21,7 +21,7 @@ function RouteComponent() {
     <Dialog.Root onOpenChange={setOpen} open={open}>
       <Page
         title="Early Access"
-        description="Manage which accounts have early access"
+        description="Accounts whose new organizations receive early access features by default."
         action={
           <Dialog.Trigger
             render={
@@ -69,7 +69,7 @@ function AddEntryForm(props: {
     <>
       <Dialog.Title>Add Entry</Dialog.Title>
       <Dialog.Description>
-        Grant early access to a whole domain or a single email
+        Grant early access features to new organizations created by a whole domain or a single email
       </Dialog.Description>
       <form className="mt-6 flex flex-col gap-8" onSubmit={onSubmit}>
         <Fields className="gap-6" variant="default">
@@ -122,7 +122,12 @@ function EntryRow(props: { entry: EarlyAccess.Entry }) {
   const remove = EarlyAccess.remove.useMutation()
 
   function onRemove() {
-    if (!confirm(`Remove ${entry.entry}? Matching users lose early access.`)) return
+    if (
+      !confirm(
+        `Remove ${entry.entry}? Future organizations created by matching users start without early access features. Existing organizations keep their enabled billing sources.`,
+      )
+    )
+      return
     remove.mutate({ entry: entry.entry }, { onError: (error) => alert(error.message) })
   }
 

package/src/admin/ui/src/routes/organizations_.$orgId.tsx

@@ -1,3 +1,4 @@
+import { Switch } from '@base-ui/react/switch'
 import {
   type UseQueryResult,
   useInfiniteQuery,
@@ -30,6 +31,8 @@ function PageComponent() {
   const { period: period_search, query } = Route.useSearch()
   const navigate = useNavigate({ from: Route.fullPath })
   const period = period_search ?? '7d'
+  const disableBillingSource = Organizations.disableBillingSource.useMutation(orgId)
+  const enableBillingSource = Organizations.enableBillingSource.useMutation(orgId)
   const organizationQuery = useSuspenseQuery(Organizations.get.options(orgId))
   const organization = organizationQuery.data
   const members = useInfiniteQuery(Organizations.members.options(orgId))
@@ -54,6 +57,8 @@ function PageComponent() {
   const updateComplete = operationalQueries.every((result) => result.dataUpdatedAt > 0)
   const updateError = operationalQueries.some((result) => result.error)
   const refreshing = operationalQueries.some((result) => result.isFetching)
+  const billingSourceError = disableBillingSource.error ?? enableBillingSource.error
+  const billingSourcePending = disableBillingSource.isPending || enableBillingSource.isPending
 
   function refresh() {
     void Promise.all([
@@ -67,6 +72,16 @@ function PageComponent() {
     ])
   }
 
+  function setBillingSource(options: BillingSourceChange) {
+    if (options.enabled) {
+      disableBillingSource.reset()
+      enableBillingSource.mutate(options.source)
+    } else {
+      enableBillingSource.reset()
+      disableBillingSource.mutate(options.source)
+    }
+  }
+
   return (
     <Page
       title={organization.name}
@@ -176,6 +191,12 @@ function PageComponent() {
 
       <section className="flex flex-col gap-3">
         <h2 className="text-heading-18 text-foreground">Billing</h2>
+        <BillingSourcesCard
+          enabledSources={organization.billing.enabledSources}
+          error={billingSourceError}
+          onChange={setBillingSource}
+          pending={billingSourcePending}
+        />
         <div className="grid gap-3 md:grid-cols-2">
           <BillingCard
             environment="Production"
@@ -550,6 +571,88 @@ declare namespace SectionError {
   type Props = { error: Error; onRetry: () => unknown }
 }
 
+type BillingSourceChange = {
+  /** Whether the source should be enabled. */
+  enabled: boolean
+  /** Billing source being changed. */
+  source: Organizations.BillingSource
+}
+
+const billingSourceOptions = [
+  {
+    description: 'Allow the organization to set up Stripe as a billing method.',
+    label: 'Stripe',
+    source: 'stripe',
+  },
+  {
+    description: 'Allow the organization to set up a Tempo account as a billing method.',
+    label: 'Tempo',
+    source: 'tempo',
+  },
+] as const
+
+/** Organization-wide controls for billing-source setup. */
+export function BillingSourcesCard(options: BillingSourcesCard.Props) {
+  return (
+    <Card>
+      <div className="p-4">
+        <h3 className="text-label-14 text-foreground">Enabled sources</h3>
+        <p className="mt-1 text-copy-13 text-foreground-secondary">
+          Disabling a source only blocks new setup. Existing billing connections continue to work.
+        </p>
+      </div>
+      <div className="divide-y divide-border border-t border-border">
+        {billingSourceOptions.map((source) => {
+          const enabled = options.enabledSources.includes(source.source)
+          return (
+            <div className="flex items-center justify-between gap-4 p-4" key={source.source}>
+              <div className="min-w-0">
+                <div className="flex items-center gap-2">
+                  <span className="text-label-14 text-foreground">{source.label}</span>
+                  <span className="text-label-12 text-foreground-secondary">
+                    {enabled ? 'Enabled' : 'Disabled'}
+                  </span>
+                </div>
+                <p className="mt-1 text-copy-13 text-foreground-secondary">{source.description}</p>
+              </div>
+              <Switch.Root
+                aria-label={`${source.label} billing source`}
+                checked={enabled}
+                className="flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border border-border bg-secondary p-0.5 outline-none transition-colors hover:bg-secondary-hover focus-visible:border-focus data-[checked]:bg-invert disabled:cursor-not-allowed disabled:opacity-50"
+                disabled={options.pending}
+                onCheckedChange={(checked) =>
+                  options.onChange({ enabled: checked, source: source.source })
+                }
+              >
+                <Switch.Thumb className="block size-4 translate-x-0 rounded-full bg-foreground-secondary transition-transform data-[checked]:translate-x-4 data-[checked]:bg-on-invert" />
+              </Switch.Root>
+            </div>
+          )
+        })}
+      </div>
+      {options.error ? (
+        <p className="border-t border-border p-4 text-copy-13 text-negative" role="alert">
+          {options.error.message}
+        </p>
+      ) : null}
+    </Card>
+  )
+}
+
+export declare namespace BillingSourcesCard {
+  /** Billing-source control properties. */
+  type Props = {
+    /** Currently enabled billing sources. */
+    enabledSources: readonly Organizations.BillingSource[]
+    /** Latest mutation error. */
+    error: Error | null
+    /** Handles a requested source change. */
+    onChange: (options: BillingSourceChange) => void
+    /** Whether a source change is pending. */
+    pending: boolean
+  }
+}
+
 function BillingCard(options: BillingCard.Props) {
   const { settings, source } = options.record
   const remaining =