fix(usage): drop inline workspace attachment, tighten window and chart edges

Removes the workspace attachment from admin organization creation, on the
maintainer's call. Three review rounds went into its failure semantics, and the
conclusion each time was that it cannot be made honest inline: it runs its own
transaction under a lock order that exists to avoid deadlocking against invitation
acceptance, so it could only ever be best-effort after the organization committed.

This codebase already solves the problem properly. `AdminMemberOperationView`
tracks workspace moves with `pending | processing | dead_letter | applied` and
per-workspace retry, and the enterprise-owner-claim path creates the workspace and
the organization in one transaction and enqueues an outbox event for the rest.
Provisioning belongs on one of those, not inline in a create call that also
relocates the owner's billing payer as a side effect. The endpoint is back to
creating an organization and its owner membership, and the contract says why.

The rest are edges found in review:

- A zero bucket rendered as a 3px colored bar. `chartPlotBand` clamps drawn
  geometry off the axis rule, but applied to zero it floored every densified empty
  day at the band — the opposite of what densifying zeros is for.
- `preset=custom` without both dates fell back to the raw period, bypassing the
  unbounded-period bound added last round. It now recurses through `current-period`
  so there is one rule rather than two copies.
- `Date.parse` accepts `2026-02-30` and rolls it forward, so a February request
  silently returned a window starting March 2. Dates now round-trip.
- `?limit=` coerced to `0` and answered 400 instead of using the declared default.
- The period picker bound to the raw URL preset, so a partial custom deep link read
  "Custom range" over current-period data — and suppressed the allowance that was
  exactly comparable to it.
- The CSV rendered a sub-credit charge as the string "0 credits", losing it, and
  left the column unsummable. Export rows now carry unrounded credits and the CSV
  writes a bare number.

Also regenerates the docs manifest, which CI flagged for the new docs page.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: icecrasher321

apps/docs/content/docs/en/platform/enterprise/usage-tracking.mdx

@@ -102,7 +102,7 @@ The **BYOK** tab groups this usage by provider and reports **tokens** rather tha
 
 ## Exporting
 
-**Export** downloads the events behind the current period and filters as a CSV with columns `Date, Source, Description, Workflow, Credits`.
+**Export** downloads the events behind the current period and filters as a CSV with columns `Date, Source, Description, Workflow, Credits`. Credits are exported as plain numbers so the column can be summed, and carry decimals — an individual event often costs a fraction of a credit.
 
 **All events** opens the full ledger — every credit-consuming event, newest first, with its own filters and export.
 

apps/sim/app/api/organizations/[id]/usage/export/route.ts

@@ -12,7 +12,6 @@ import {
   UsageWindowRangeInvertedError,
   UsageWindowRangeTooLargeError,
 } from '@/lib/billing/core/usage-analytics'
-import { formatCreditsLabel } from '@/lib/billing/credits/conversion'
 import { ForbiddenOperationError } from '@/lib/core/application'
 import { formatCsvValue, toCsvRow } from '@/lib/core/utils/csv'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
@@ -21,14 +20,25 @@ const logger = createLogger('OrganizationUsageExportAPI')
 
 const CSV_HEADER = toCsvRow(['Date', 'Source', 'Description', 'Workflow', 'Credits'])
 
+/**
+ * A bare number, to four decimals, with trailing zeros trimmed.
+ *
+ * Not `formatCreditsLabel`: that renders `"0 credits"` for any charge under half a
+ * credit, so a real cost vanished from the export, and the `"N credits"` text made
+ * the column unsummable in a spreadsheet — which is most of what a CSV is for.
+ */
+function formatExportCredits(credits: number): string {
+  return String(Number(credits.toFixed(4)))
+}
+
 /** `formatCsvValue` neutralizes formula injection — model and workflow names are user-controlled. */
 function toCsvLine(row: OrganizationUsageExportRow): string {
   return toCsvRow([
     formatCsvValue(row.createdAt),
     formatCsvValue(row.source),
     formatCsvValue(row.description),
     formatCsvValue(row.workflowName ?? ''),
-    formatCsvValue(formatCreditsLabel(row.credits)),
+    formatCsvValue(formatExportCredits(row.credits)),
   ])
 }
 

apps/sim/app/api/v1/admin/organizations/route.ts

@@ -18,18 +18,17 @@
  *   - slug: string - Organization slug (optional, auto-generated from name if not provided)
  *   - ownerId: string - User ID of the organization owner (required)
  *
- * Response: AdminSingleResponse<AdminOrganization & { memberId, attachedWorkspaceIds, workspaceAttachmentFailed }>
- *   `attachedWorkspaceIds` reports which of the owner's workspaces moved under the
- *   organization, and `workspaceAttachmentFailed` distinguishes an owner who had
- *   none from an attachment that threw after the organization was committed — the
- *   latter leaves the organization unreachable and is worth retrying.
+ * Response: AdminSingleResponse<AdminOrganization & { memberId: string }>
+ *
+ * Creates the organization and its owner membership, and nothing else. Attaching
+ * or creating a workspace for it is deliberately not done here — see the note on
+ * `adminV1CreateOrganizationContract`.
  */
 
 import { AuditAction, AuditResourceType, recordAudit } from '@sim/audit'
 import { db, dbReplica } from '@sim/db'
 import { member, organization, organizationColumns, user } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
-import { getErrorMessage } from '@sim/utils/errors'
 import { slugify } from '@sim/utils/string'
 import { count, eq } from 'drizzle-orm'
 import {
@@ -43,7 +42,6 @@ import {
   OrganizationSlugTakenError,
 } from '@/lib/billing/organizations/create-organization'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
-import { attachOwnedWorkspacesToOrganization } from '@/lib/workspaces/organization-workspaces'
 import { withAdminAuth } from '@/app/api/v1/admin/middleware'
 import {
   adminInvalidJsonResponse,
@@ -156,53 +154,6 @@ export const POST = withRouteHandler(
         slug,
       })
 
-      /**
-       * Organization settings are reached only through a workspace the organization
-       * owns, so an organization that owns none leaves its own admin with no route
-       * to administer it. Attaching the owner's existing workspaces is what makes the
-       * organization reachable, and matches what `POST /api/organizations` already
-       * does — this path was the inconsistent one.
-       *
-       * An owner with no workspaces has nothing to attach and stays unreachable until
-       * one exists. Creating a workspace only closes that gap once the organization
-       * carries a usable Team/Enterprise plan; without one the creation policy still
-       * resolves to a personal workspace.
-       *
-       * Attachment is a follow-on effect, not part of creating the organization, and
-       * it is deliberately not folded into the creation transaction: it runs its own,
-       * under a documented lock order (invitation scope, then organization, then
-       * workspace rows) that exists to avoid deadlocking against invitation
-       * acceptance. Re-deriving that ordering in a route is how a deadlock ships.
-       *
-       * So its failure must not be reported as a failure to create: the organization
-       * is already committed, and answering 500 for state that exists left the retry
-       * blocked by the existing-membership check above, with no way to reach the
-       * organization at all.
-       *
-       * It must not be reported as an unqualified success either. Both the ids that
-       * moved and whether the attach threw are on the response contract and on the
-       * audit event, because an empty list alone cannot distinguish an owner who had
-       * no workspaces from provisioning that is genuinely incomplete — only the
-       * second is worth retrying, and only the caller can decide to.
-       */
-      let attachedWorkspaceIds: string[] = []
-      let workspaceAttachmentFailed = false
-      try {
-        ;({ attachedWorkspaceIds } = await attachOwnedWorkspacesToOrganization({
-          ownerUserId: ownerId,
-          organizationId,
-          externalMemberPolicy: 'keep-external',
-          includeArchived: true,
-        }))
-      } catch (attachError) {
-        workspaceAttachmentFailed = true
-        logger.error('Admin API: Created organization but could not attach its workspaces', {
-          organizationId,
-          ownerId,
-          error: getErrorMessage(attachError),
-        })
-      }
-
       const [createdOrg] = await db
         .select(organizationColumns)
         .from(organization)
@@ -214,7 +165,6 @@ export const POST = withRouteHandler(
         slug,
         ownerId,
         memberId,
-        attachedWorkspaceIds,
       })
 
       recordAudit({
@@ -225,21 +175,13 @@ export const POST = withRouteHandler(
         resourceId: organizationId,
         resourceName: name,
         description: `Admin API created organization "${name}"`,
-        metadata: {
-          slug,
-          ownerId,
-          memberId,
-          attachedWorkspaceIds,
-          ...(workspaceAttachmentFailed ? { workspaceAttachmentFailed: true } : {}),
-        },
+        metadata: { slug, ownerId, memberId },
         request,
       })
 
       return singleResponse({
         ...toAdminOrganization(createdOrg),
         memberId,
-        attachedWorkspaceIds,
-        workspaceAttachmentFailed,
       })
     } catch (error) {
       if (error instanceof OrganizationSlugInvalidError) {

apps/sim/components/charts/bar-chart.tsx

@@ -106,7 +106,19 @@ function BarChartComponent({
         const x = padding.left + slot * index + (slot - barWidth) / 2
         const rawY = padding.top + chartHeight - (point.value / maxValue) * chartHeight
         const y = Math.max(yMin, Math.min(yMax, rawY))
-        return { x, y, height: Math.max(0, height - padding.bottom - y), point }
+        return {
+          x,
+          y,
+          /*
+           * A zero bucket draws nothing. The clamp above keeps a *drawn* bar off the
+           * axis rule, but applied to zero it floored the bar at the 3px band and
+           * every empty day rendered as a small amount of usage — the densified zeros
+           * this chart exists to show honestly. Only the track represents an empty
+           * bucket.
+           */
+          height: point.value > 0 ? Math.max(0, height - padding.bottom - y) : 0,
+          point,
+        }
       }),
     [data, slot, barWidth, maxValue, chartHeight, height, padding.left, padding.top, yMin, yMax]
   )

apps/sim/ee/organization-usage/components/usage-monitoring.tsx

@@ -280,6 +280,12 @@ export function UsageMonitoring({ organizationId, workspaceId }: UsageMonitoring
             options={PERIOD_OPTIONS}
             value={preset}
             onChange={handlePeriodChange}
+            /*
+              The visible layer is masked, so the interactive layer owns the one
+              reachable tooltip — a custom range's label truncates, and without
+              `overlayLabel` its full value was unreadable.
+            */
+            overlayLabel={periodLabel}
             overlayContent={
               <span className='truncate text-[var(--text-primary)]'>{periodLabel}</span>
             }

apps/sim/ee/organization-usage/hooks/use-usage-window.ts

@@ -46,7 +46,13 @@ export function useUsageWindow() {
     window,
     tab: state.tab,
     workspace: state.workspace,
-    preset: state.preset,
+    /**
+     * The *resolved* preset, not the raw URL value. A partial custom deep link
+     * queries the current period, so surfacing `state.preset` left the picker
+     * reading "Custom range" over data that was not custom — and the allowance
+     * gate, which keys on `current-period`, disagreed with the window too.
+     */
+    preset,
     startDate: state.startDate,
     endDate: state.endDate,
     periodLabel,

apps/sim/lib/api/contracts/organization-usage.ts

@@ -40,12 +40,41 @@ export type UsageBreakdownDimension = z.output<typeof usageBreakdownDimensionSch
  */
 export const MAX_CUSTOM_RANGE_DAYS = 92
 
+/**
+ * A calendar date the window resolver can trust.
+ *
+ * `Date.parse` alone accepts `2026-02-30` and rolls it forward, so a request for
+ * February silently returned a window starting on March 2 — worse than a rejection,
+ * because the response looks authoritative. The round-trip is what makes the check
+ * a calendar one: a date that does not survive re-serialization did not exist.
+ */
 const isoDateSchema = z
   .string()
   .optional()
-  .refine((value) => !value || !Number.isNaN(Date.parse(value)), {
-    message: 'Expected an ISO date such as 2026-08-01',
-  })
+  .refine(
+    (value) => {
+      if (!value) return true
+      const parsed = new Date(value)
+      if (Number.isNaN(parsed.getTime())) return false
+      // Bare `YYYY-MM-DD` parses as UTC, so compare against the UTC serialization.
+      return !/^\d{4}-\d{2}-\d{2}$/.test(value) || parsed.toISOString().slice(0, 10) === value
+    },
+    { message: 'Expected a real calendar date such as 2026-08-01' }
+  )
+
+/**
+ * A page size that treats an empty or absent parameter as omitted.
+ *
+ * `z.coerce.number()` turns `''` into `0`, which then fails `.min(1)` — so a client
+ * that serializes an unset filter as `?limit=` got a 400 instead of the default the
+ * schema declares. Explicit numeric values still validate normally.
+ */
+function usageLimitSchema(max: number, fallback: number) {
+  return z.preprocess(
+    (value) => (value === '' || value === null ? undefined : value),
+    z.coerce.number().int().min(1).max(max).default(fallback)
+  )
+}
 
 /**
  * Shared by all four contracts so the four surfaces cannot describe different
@@ -79,7 +108,7 @@ export const organizationUsageBreakdownQuerySchema = organizationUsageWindowQuer
   dimension: usageBreakdownDimensionSchema,
   /** Narrows the breakdown to one workspace, for the Workspaces drill-down. */
   workspaceId: workspaceIdSchema.optional(),
-  limit: z.coerce.number().int().min(1).max(50).default(10),
+  limit: usageLimitSchema(50, 10),
 })
 export type OrganizationUsageBreakdownQuery = z.input<typeof organizationUsageBreakdownQuerySchema>
 
@@ -100,7 +129,7 @@ const usageLogSourceFilterSchema = z
 
 export const organizationUsageEventsQuerySchema = organizationUsageWindowQuerySchema.extend({
   source: usageLogSourceFilterSchema.optional(),
-  limit: z.coerce.number().int().min(1).max(100).default(50),
+  limit: usageLimitSchema(100, 50),
   cursor: z.string().min(1).optional(),
 })
 export type OrganizationUsageEventsQuery = z.input<typeof organizationUsageEventsQuerySchema>

apps/sim/lib/api/contracts/v1/admin/organizations.ts

@@ -210,30 +210,30 @@ export const adminV1ListOrganizationsContract = defineRouteContract({
 })
 
 /**
- * Creating an organization also attaches the owner's existing workspaces, so that
- * the organization is reachable through the workspace-scoped settings it is
- * administered from. That attachment runs in its own transaction and can fail after
- * the organization is already committed, so the outcome is part of the response
- * rather than something only the logs know.
+ * Creates the organization and its owner membership, and deliberately nothing else.
  *
- * `attachedWorkspaceIds` alone is ambiguous — empty means both "the owner had none"
- * and "the attach threw" — which is why the failure carries its own flag. A caller
- * seeing `workspaceAttachmentFailed` can retry the attachment; a caller seeing an
- * empty list without it has nothing outstanding.
+ * Organization settings are reached through a workspace the organization owns, so a
+ * brand-new organization with none is not yet administrable. Closing that inside
+ * this call was tried and removed: attaching the owner's existing workspaces cannot
+ * join the creation transaction (it runs its own, under a lock order that exists to
+ * avoid deadlocking against invitation acceptance), so it could only ever be
+ * best-effort — leaving a committed organization, a response that could not honestly
+ * report the outcome, and a retry blocked by the existing-membership check.
+ *
+ * This codebase already solves it properly elsewhere. `AdminMemberOperationView`
+ * tracks workspace moves with `pending | processing | dead_letter | applied` and
+ * per-workspace retry, and the enterprise-owner-claim path creates the workspace and
+ * the organization in one transaction and enqueues an outbox event for the rest.
+ * Provisioning a workspace for an organization belongs on one of those paths, not
+ * inline here.
  */
-const adminV1CreatedOrganizationSchema = adminV1OrganizationSchema.extend({
-  memberId: z.string(),
-  attachedWorkspaceIds: z.array(z.string()),
-  workspaceAttachmentFailed: z.boolean(),
-})
-
 export const adminV1CreateOrganizationContract = defineRouteContract({
   method: 'POST',
   path: '/api/v1/admin/organizations',
   body: adminV1CreateOrganizationBodySchema,
   response: {
     mode: 'json',
-    schema: adminV1SingleResponseSchema(adminV1CreatedOrganizationSchema),
+    schema: adminV1SingleResponseSchema(adminV1OrganizationSchema.extend({ memberId: z.string() })),
   },
 })
 

apps/sim/lib/billing/application/organization-usage/export-organization-usage-events.ts

@@ -6,7 +6,7 @@ import {
   usageWindowLedgerFilter,
 } from '@/lib/billing/core/usage-analytics'
 import { getBillingEntityUsageLogs } from '@/lib/billing/core/usage-log'
-import { dollarsToCredits } from '@/lib/billing/credits/conversion'
+import { CREDIT_MULTIPLIER } from '@/lib/billing/credits/conversion'
 import type { InternalUsageLogSource } from '@/lib/billing/usage-sources'
 
 /**
@@ -31,6 +31,14 @@ export interface OrganizationUsageExportRow {
   source: string
   description: string
   workflowName: string | null
+  /**
+   * Unrounded, unlike the event list's integer credits.
+   *
+   * A CSV is an analysis surface, and rounding each row to a whole credit printed a
+   * real sub-credit charge as `0` — the charge disappearing rather than reading as
+   * small. Full precision here also makes the column summable, which the previous
+   * `"N credits"` label never was.
+   */
   credits: number
 }
 
@@ -81,7 +89,7 @@ export const exportOrganizationUsageEvents = defineAuthorizedOrganizationUsageUs
           source: log.source,
           description: log.description,
           workflowName: log.workflowName ?? null,
-          credits: dollarsToCredits(log.cost),
+          credits: log.cost * CREDIT_MULTIPLIER,
         })
       }
 

apps/sim/lib/billing/core/usage-analytics.test.ts

@@ -430,10 +430,9 @@ describe('foldUsageBreakdown', () => {
     expect(fold.rows[0].share).toBe(0)
   })
 
-  it('carries the omitted rows tokens, so a zero-cost dimension still adds up', () => {
-    // BYOK ranks by a cost that is zero for every row, so which rows land in the
-    // visible slice is effectively arbitrary — dropping the tail's tokens would
-    // hide real volume behind an em dash.
+  it('measures share in the ranking unit, so a zero-cost list still draws bars', () => {
+    // BYOK ranks by a cost that is zero for every row, so a cost-based share is 0/0
+    // for all of them and every bar renders at the same minimum width.
     const byokRows = [
       { key: 'gpt-4o', cost: '0', events: 1, inputTokens: 100, outputTokens: 50 },
       { key: 'claude', cost: '0', events: 1, inputTokens: 700, outputTokens: 300 },