@intelligo-dev/cli 1.0.0-beta.1 → 1.0.0-beta.13

package/templates/maintenance/maintenance-route.ts.tpl

@@ -0,0 +1,119 @@
+/**
+ * Maintenance route: the periodic work the framework relies on.
+ *
+ * Mount a scheduler at GET /api/cron/maintenance with
+ * `Authorization: Bearer $CRON_SECRET` every five minutes. A stale
+ * execution is reconciled once it is ten minutes old, so the cadence
+ * decides how long an abandoned run keeps its credit hold.
+ *
+ * On Vercel, `intelligo add maintenance` writes the `crons` entry to
+ * vercel.json (`0-59/5 * * * *`) when the app has none, and Vercel
+ * sends the header itself. Vercel Hobby runs a cron at most once a day
+ * and refuses a deployment that asks for more: on Hobby, or on any
+ * other host, drop the entry and call the route from a scheduler of
+ * your own —
+ *
+ *   curl -fsS -H "Authorization: Bearer $CRON_SECRET" \
+ *     https://your-app.example/api/cron/maintenance
+ *
+ * What one run does, and why each step exists:
+ *
+ * - **Reconcile stale executions.** A row still `running` or `settling`
+ *   past the chat route's `maxDuration` is usage nobody finished
+ *   accounting for. `executions.reconcile` confirms a charge the
+ *   ledger already holds, re-runs settlement from the recorded usage,
+ *   or fails an abandoned run and releases its hold.
+ * - **Drop expired reservations.** Admission already ignores them; this
+ *   is table hygiene.
+ * - **Drop old rate-limit buckets.** Same.
+ * - **Expire trials and send reminders.** `hasActiveTrial` checks the
+ *   end date inline, so admission is safe without this — feature
+ *   access and the reminder emails are what it drives.
+ * - **Prune finished jobs** older than a week.
+ *
+ * Draining the job queue is NOT done here: `drain` needs your handlers,
+ * so give it its own route (or call it below once you have some).
+ *
+ * This file is yours. Add product maintenance to it freely.
+ */
+
+import { timingSafeEqual } from "node:crypto";
+
+import {
+  cleanupExpiredReservations,
+  cleanupRateLimitEntries,
+  processTrialExpirations,
+} from "@intelligo-dev/billing";
+import { findStaleExecutions } from "@intelligo-dev/executions";
+import { pruneJobs } from "@intelligo-dev/jobs";
+import { createLogger } from "@intelligo-dev/core/logger";
+
+import { composeIntelligo, executions } from "@/lib/intelligo";
+
+const log = createLogger("cron.maintenance");
+
+export const maxDuration = 60;
+
+/** Executions older than this and still non-terminal are reconciled. */
+const STALE_AFTER_MS = 10 * 60_000;
+/** Finished jobs older than this are pruned. */
+const PRUNE_JOBS_AFTER_MS = 7 * 24 * 60 * 60_000;
+
+/** Constant-time bearer comparison; length is compared too. */
+function bearerMatches(header: string | null, secret: string): boolean {
+  if (!header?.startsWith("Bearer ")) return false;
+  const token = Buffer.from(header.slice("Bearer ".length));
+  const expected = Buffer.from(secret);
+  if (token.length !== expected.length) return false;
+  return timingSafeEqual(token, expected);
+}
+
+export async function GET(request: Request) {
+  const secret = process.env.CRON_SECRET;
+  if (!secret || secret.length < 32) {
+    log.error("CRON_SECRET missing or shorter than 32 chars — refusing");
+    return new Response("Forbidden", { status: 403 });
+  }
+  if (!bearerMatches(request.headers.get("authorization"), secret)) {
+    return new Response("Unauthorized", { status: 401 });
+  }
+
+  composeIntelligo();
+  const errors: string[] = [];
+  const step = async <T>(name: string, run: () => Promise<T>): Promise<T | null> => {
+    try {
+      return await run();
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      log.error(`${name} failed`, { error: message });
+      errors.push(`${name}: ${message}`);
+      return null;
+    }
+  };
+
+  const stale = await step("findStaleExecutions", () =>
+    findStaleExecutions(new Date(Date.now() - STALE_AFTER_MS))
+  );
+  const reconciled: Record<string, number> = {};
+  for (const row of stale ?? []) {
+    const result = await step(`reconcile ${row.id}`, () =>
+      executions.reconcile(row.id, { abandonRunningAfterMs: STALE_AFTER_MS })
+    );
+    if (result) reconciled[result.action] = (reconciled[result.action] ?? 0) + 1;
+  }
+
+  const summary = {
+    staleExecutions: stale?.length ?? 0,
+    reconciled,
+    expiredReservationsDeleted: await step("cleanupExpiredReservations", cleanupExpiredReservations),
+    rateLimitEntriesDeleted: await step("cleanupRateLimitEntries", cleanupRateLimitEntries),
+    trials: await step("processTrialExpirations", processTrialExpirations),
+    jobsPruned: await step("pruneJobs", () =>
+      pruneJobs(new Date(Date.now() - PRUNE_JOBS_AFTER_MS))
+    ),
+    errors,
+  };
+
+  log.info("Maintenance run", summary);
+  return Response.json(summary, { status: errors.length ? 207 : 200 });
+}

package/templates/manifest.json

@@ -1,18 +1,18 @@
 {
   "usage-page": {
-    "templateVersion": "1.0.0",
+    "templateVersion": "1.0.1",
     "description": "A usage page listing executions and cost for the current workspace",
     "files": [
       {
         "template": "usage-page/usage-page.tsx.tpl",
-        "target": "app/usage/page.tsx"
+        "target": "app/[locale]/usage/page.tsx"
       }
     ],
     "deprecated": "Superseded by the `usage` registry item \u2014 install it with the shadcn CLI from the Intelligo registry instead; it ships a full page, components and thin actions as consumer-owned source."
   },
   "app-scaffold": {
-    "templateVersion": "1.4.0",
-    "description": "A new application: composition root, plans, an assistant route, config, next-intl i18n plumbing, and a registry-consuming shadcn/Tailwind setup",
+    "templateVersion": "1.14.0",
+    "description": "A new application: composition root (run once per server process from instrumentation.ts), plans, an assistant route, a Stripe webhook endpoint, config, a drizzle config for the tables you own, next-intl i18n plumbing, and a registry-consuming shadcn base-nova setup with the intelligo design tokens",
     "files": [
       {
         "template": "app-scaffold/package.json.tpl",
@@ -34,10 +34,22 @@
         "template": "app-scaffold/intelligo.ts.tpl",
         "target": "lib/intelligo.ts"
       },
+      {
+        "template": "app-scaffold/instrumentation.ts.tpl",
+        "target": "instrumentation.ts"
+      },
       {
         "template": "app-scaffold/plans.ts.tpl",
         "target": "lib/plans.ts"
       },
+      {
+        "template": "app-scaffold/workspace-bootstrap.ts.tpl",
+        "target": "lib/workspace-bootstrap.ts"
+      },
+      {
+        "template": "app-scaffold/auth-route.ts.tpl",
+        "target": "app/api/auth/[...all]/route.ts"
+      },
       {
         "template": "app-scaffold/assistant-route.ts.tpl",
         "target": "app/api/assistant/route.ts"
@@ -58,10 +70,18 @@
         "template": "app-scaffold/lib-utils.ts.tpl",
         "target": "lib/utils.ts"
       },
+      {
+        "template": "app-scaffold/use-mobile.ts.tpl",
+        "target": "hooks/use-mobile.ts"
+      },
       {
         "template": "app-scaffold/layout.tsx.tpl",
         "target": "app/[locale]/layout.tsx"
       },
+      {
+        "template": "app-scaffold/page.tsx.tpl",
+        "target": "app/[locale]/page.tsx"
+      },
       {
         "template": "app-scaffold/theme-provider.tsx.tpl",
         "target": "components/shell/theme-provider.tsx"
@@ -83,33 +103,52 @@
         "target": "i18n/request.ts"
       },
       {
-        "template": "app-scaffold/middleware.ts.tpl",
-        "target": "middleware.ts"
+        "template": "app-scaffold/proxy.ts.tpl",
+        "target": "proxy.ts"
       },
       {
         "template": "app-scaffold/messages-en-app.json.tpl",
         "target": "messages/en/app.json"
+      },
+      {
+        "template": "app-scaffold/drizzle.config.ts.tpl",
+        "target": "drizzle.config.ts"
+      },
+      {
+        "template": "app-scaffold/db-schema.ts.tpl",
+        "target": "lib/db/schema.ts"
+      },
+      {
+        "template": "app-scaffold/drizzle-journal.json.tpl",
+        "target": "drizzle/meta/_journal.json"
+      },
+      {
+        "template": "app-scaffold/stripe-webhook-route.ts.tpl",
+        "target": "app/api/webhooks/stripe/route.ts"
       }
     ]
   },
-  "billing-page": {
-    "templateVersion": "1.0.0",
-    "description": "A billing page reading your registered plan catalogue",
+  "admin-page": {
+    "templateVersion": "1.1.0",
+    "description": "Mount the Intelligo operational console at /admin",
     "files": [
       {
-        "template": "billing-page/billing-page.tsx.tpl",
-        "target": "app/billing/page.tsx"
+        "template": "admin-page/admin-page.tsx.tpl",
+        "target": "app/[locale]/admin/page.tsx"
       }
-    ],
-    "deprecated": "Superseded by the `pricing` and `billing-settings` registry items \u2014 install them with the shadcn CLI from the Intelligo registry instead."
+    ]
   },
-  "admin-page": {
-    "templateVersion": "1.0.0",
-    "description": "Mount the Intelligo operational console at /admin",
+  "maintenance": {
+    "templateVersion": "1.1.0",
+    "description": "A CRON_SECRET-gated GET /api/cron/maintenance that reconciles stale executions, drops expired reservations and rate-limit buckets, expires trials and prunes old jobs \u2014 scheduled every five minutes, in vercel.json when the app has none",
+    "cron": {
+      "path": "/api/cron/maintenance",
+      "schedule": "0-59/5 * * * *"
+    },
     "files": [
       {
-        "template": "admin-page/admin-page.tsx.tpl",
-        "target": "app/admin/page.tsx"
+        "template": "maintenance/maintenance-route.ts.tpl",
+        "target": "app/api/cron/maintenance/route.ts"
       }
     ]
   }

package/templates/registry-items.json

@@ -0,0 +1,116 @@
+{
+  "items": {
+    "route-error": {
+      "title": "Route Error States",
+      "description": "The app's error surfaces: a shared RouteError component every error.tsx renders, message-based error classification, an (app) group boundary, a translated 404, and a dependency-free global-error. Error reporting goes through the lib/error-reporting.ts seam (a no-op until you bind a reporter), so no SDK enters the registry. Items that ship an error.tsx depend on this one - install it first."
+    },
+    "team-settings": {
+      "title": "Team Settings",
+      "description": "Workspace team management: invite members, change roles, remove members, and manage pending invitations, backed by the framework's team service."
+    },
+    "usage": {
+      "title": "Usage",
+      "description": "Workspace usage dashboard: current-period summary tiles, a period selector, and a table of recent AI execution records."
+    },
+    "invitation-accept": {
+      "title": "Invitation Accept",
+      "description": "Accept or decline a workspace invitation via the team service. Requires the team-settings item (provides lib/team.ts and the role badge); install it first."
+    },
+    "app-shell": {
+      "title": "App Shell",
+      "description": "Authenticated application shell: session and onboarding gate, workspace bootstrap, a sidebar that morphs into an icon rail with a gliding active pill, workspace switcher, configurable nav and user menu, and a page region that lifts each section in."
+    },
+    "settings-shell": {
+      "title": "Settings Shell",
+      "description": "The shared frame around every /settings page: layout with heading and width constraint, a configurable tab bar (lib/settings-nav.ts), and a /settings index that redirects to the first tab. Install alongside the settings items - without it they render unframed and plain /settings links 404."
+    },
+    "workspace-settings": {
+      "title": "Workspace Settings",
+      "description": "Workspace name/URL editing and owner-only deletion, backed by the framework's workspace service."
+    },
+    "auth-login": {
+      "title": "Auth: Login",
+      "description": "Email/password and OAuth login. Ships the shared auth route layout, the de-branded AuthCard shell, and the auth-validation.ts zod schemas reused by auth-signup, auth-password-reset, and auth-email-verification - install this item first."
+    },
+    "auth-signup": {
+      "title": "Auth: Signup",
+      "description": "Email/password and OAuth account creation. Requires the auth-login item (provides the shared AuthCard shell, SocialLoginButtons, and lib/auth-validation.ts schemas); install it first. Redirects to auth-email-verification's /verify-email route when the server requires email verification."
+    },
+    "auth-password-reset": {
+      "title": "Auth: Password Reset",
+      "description": "Forgot-password and reset-password pages, backed by the Better-Auth client SDK's requestPasswordReset/resetPassword actions. Requires the auth-login item (provides the shared AuthCard shell and lib/auth-validation.ts schemas); install it first."
+    },
+    "auth-email-verification": {
+      "title": "Auth: Email Verification",
+      "description": "Post-signup email verification status page with a resend control, backed by the Better-Auth client SDK's sendVerificationEmail action. Reads the ?error=/?email= search params Better-Auth's own /verify-email link handler redirects back with. Requires the auth-login item (provides the shared AuthCard shell); install it first."
+    },
+    "language-switcher": {
+      "title": "Language Switcher",
+      "description": "Locale dropdown over the locales i18n/routing.ts declares, labeled with each language's own name. Renders nothing in a single-locale deployment, so it is safe to mount unconditionally (e.g. in shellConfig.headerRight). Adding a locale to routing.ts plus a messages directory is the whole job."
+    },
+    "trial-banner": {
+      "title": "Trial Banner",
+      "description": "Dismissable trial-status strip for the app shell's bannerTop seam: days and credits remaining with an upgrade CTA, urgency-ramped visuals, dismiss-for-today, and a consumer config (lib/trial-banner-config.ts) for the CTA target and route suppression (hidden on /chat by default). Bind TrialBannerContainer as shellConfig.bannerTop."
+    },
+    "notifications": {
+      "title": "Notifications",
+      "description": "Notification bell with an unread badge and dropdown, plus a full notifications page with mark-as-read and load-more, backed by the framework's notification records."
+    },
+    "pricing": {
+      "title": "Pricing",
+      "description": "Plan comparison and upgrade page with a monthly/yearly toggle, backed by the framework's checkout service and the product's registered plan catalogue. Ships the lib/billing.ts product binding and actions/billing.ts checkout actions that the checkout and billing-settings items also depend on — install this item first."
+    },
+    "checkout": {
+      "title": "Checkout",
+      "description": "Checkout-success page that verifies the Stripe session directly through the framework's checkout service, covering the webhook-race window between the browser redirect and Stripe's webhook delivery."
+    },
+    "billing-settings": {
+      "title": "Billing Settings",
+      "description": "Workspace billing management: current plan, credit balance, credit bundle purchase, and the Stripe billing portal, shaped server-side by role (member/admin/owner). Requires the pricing item (provides lib/billing.ts and actions/billing.ts); install it first."
+    },
+    "feature-gating": {
+      "title": "Feature Gating",
+      "description": "The vocabulary for selling a plan: a server-side FeatureGate that renders gated content only to entitled workspaces, three densities of upgrade prompt (full, compact, inline), a quota warning that escalates as a limit approaches, and a preview paywall that blurs content instead of hiding it. Which features exist and which plan unlocks them is consumer config (lib/feature-catalog.ts). Install pricing or billing-settings for somewhere to send the user."
+    },
+    "payment-poll": {
+      "title": "QR Payment (poll)",
+      "description": "The non-card checkout the catalogue was missing: issue an invoice, show a QR the user scans in their banking app, poll until the provider confirms. Provider-agnostic — QPay, SocialPay, PIX, UPI, PromptPay all fit — through the lib/local-payment.ts binding. Requires the pricing item for lib/billing-config.ts's CURRENCY."
+    },
+    "profile-settings": {
+      "title": "Profile Settings",
+      "description": "User profile name editing, read-only email, and account deletion with typed confirmation, backed by the framework's profile service."
+    },
+    "onboarding": {
+      "title": "Onboarding",
+      "description": "A generic multi-step onboarding wizard driven by a consumer-owned steps config: text and single-select-card fields, a completion screen, skip, and back/next - backed by the framework's onboarding service (durable step progress, no vertical-specific UI)."
+    },
+    "dashboard": {
+      "title": "Dashboard",
+      "description": "An AI-first workspace home: a hero and a real composer centred as one unit, starter chips that fill it, and a resume affordance for unfinished work — and nothing else, because history belongs to the sidebar and spend to /usage. Configurable through lib/dashboard-config.tsx (copy, starters, chat base path) and lib/dashboard-data.ts (what \"resume\" means). Pairs with the chat item for its /chat routes; install it first."
+    },
+    "artifacts": {
+      "title": "Artifacts",
+      "description": "Browse and manage AI-generated document artifacts: filterable list, full-content preview, copy-to-clipboard, and version delete, backed by the framework's document persistence service."
+    },
+    "privacy-settings": {
+      "title": "Privacy Settings",
+      "description": "GDPR-style data export, a read-only memory-audit trail, and per-category fact listing with delete, backed by the framework's identity service."
+    },
+    "chat": {
+      "title": "Chat",
+      "description": "A ChatGPT-level AI chat surface: a streaming thread with edit, regenerate and response versions, attachments, a model picker, reasoning, sources, tool cards and human-in-the-loop approvals, agent activity for Mastra and eve turns, a canvas beside the chat for documents a tool streams, a sidebar with pinned and dated groups, share links and feedback — on a two-line Route Handler that binds @intelligo-dev/chat's transport (auth, rate limit, feature gate, persistence, the execution boundary) to consumer-owned config (lib/chat-server-config.ts). Every tool renders through one entry in lib/chat-renderers.tsx, inline and in the canvas. Ships with a deterministic stub model so a clean install streams with no API keys. The config imports lib/intelligo.ts (the composition root) and lib/plans.ts, which are provided by the `intelligo create` scaffold, not by any registry item - in a hand-rolled app, create both before installing (see the CLI's app-scaffold templates)."
+    },
+    "chat-panel": {
+      "title": "Chat Panel",
+      "description": "The chat as a side panel on any page: a sheet that opens the same thread the chat page runs, with the page's context on every turn. Requires the chat item."
+    },
+    "chat-widget": {
+      "title": "Chat Widget",
+      "description": "The floating assistant: a launcher in a corner of every page and a compact chat over it, configured in lib/chat-widget-config.tsx. Requires the chat item."
+    },
+    "chat-share": {
+      "title": "Chat Share",
+      "description": "A conversation its owner published, readable by anyone with the link at /share/[id]: the same transcript, read-only, minus reasoning, tool details and attachments. Requires the chat item."
+    }
+  }
+}

package/templates/registry-requires.json

@@ -0,0 +1,156 @@
+{
+  "$comment": "Machine-readable requirements of every registry item \u2014 what shadcn's schema cannot express. `scaffold`: consumer files `intelligo create` provides that items may import. Per item: `marker` (the file whose presence means the item is installed), `items` (sibling items that ship files this one imports \u2014 install them first), `files` (scaffold files it imports), `exports` (names a scaffold file must export), `features` (feature keys the item gates on; register them in lib/plans.ts). tests/architecture/registry.test.ts asserts this file matches the code; CI derives the install order from it; `intelligo doctor` checks an app against it (packages/cli/templates/registry-requires.json is a copy the CLI build regenerates; the suite fails if it is stale).",
+  "scaffold": [
+    "lib/intelligo",
+    "lib/plans",
+    "lib/utils",
+    "hooks/use-mobile",
+    "i18n/routing",
+    "i18n/navigation"
+  ],
+  "items": {
+    "smoke": {
+      "marker": "app/[locale]/registry-smoke/page.tsx"
+    },
+    "route-error": {
+      "marker": "app/[locale]/(app)/error.tsx",
+      "files": ["i18n/navigation"]
+    },
+    "team-settings": {
+      "marker": "app/[locale]/(app)/settings/team/page.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "usage": {
+      "marker": "app/[locale]/(app)/usage/page.tsx",
+      "items": ["pricing", "route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "invitation-accept": {
+      "marker": "app/[locale]/accept-invitation/[id]/page.tsx",
+      "items": ["team-settings"],
+      "files": ["i18n/navigation"]
+    },
+    "app-shell": {
+      "marker": "app/[locale]/(app)/layout.tsx",
+      "files": ["i18n/navigation", "lib/utils"]
+    },
+    "settings-shell": {
+      "marker": "app/[locale]/(app)/settings/layout.tsx",
+      "files": ["i18n/navigation"]
+    },
+    "workspace-settings": {
+      "marker": "app/[locale]/(app)/settings/workspace/page.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "auth-login": {
+      "marker": "app/[locale]/(auth)/layout.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "auth-signup": {
+      "marker": "app/[locale]/(auth)/signup/page.tsx",
+      "items": ["auth-login"],
+      "files": ["i18n/navigation"]
+    },
+    "auth-password-reset": {
+      "marker": "app/[locale]/(auth)/forgot-password/page.tsx",
+      "items": ["auth-login"],
+      "files": ["i18n/navigation"]
+    },
+    "auth-email-verification": {
+      "marker": "app/[locale]/(auth)/verify-email/page.tsx",
+      "items": ["auth-login"],
+      "files": ["i18n/navigation"]
+    },
+    "language-switcher": {
+      "marker": "components/layout/language-switcher.tsx",
+      "files": ["i18n/navigation", "i18n/routing"]
+    },
+    "trial-banner": {
+      "marker": "components/trial/trial-banner-container.tsx",
+      "files": ["i18n/navigation"]
+    },
+    "notifications": {
+      "marker": "app/[locale]/(app)/notifications/page.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "pricing": {
+      "marker": "app/[locale]/(app)/pricing/page.tsx",
+      "files": ["i18n/navigation"]
+    },
+    "checkout": {
+      "marker": "app/[locale]/(app)/checkout/success/page.tsx",
+      "files": ["i18n/navigation"]
+    },
+    "billing-settings": {
+      "marker": "app/[locale]/(app)/settings/billing/page.tsx",
+      "items": ["pricing", "route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "feature-gating": {
+      "marker": "components/billing/feature-gate.tsx",
+      "items": ["pricing"],
+      "files": ["i18n/navigation", "lib/utils"]
+    },
+    "payment-poll": {
+      "marker": "components/billing/local-payment-modal.tsx",
+      "items": ["pricing"]
+    },
+    "profile-settings": {
+      "marker": "app/[locale]/(app)/settings/profile/page.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "onboarding": {
+      "marker": "app/[locale]/onboarding/layout.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "dashboard": {
+      "marker": "app/[locale]/(app)/dashboard/page.tsx",
+      "items": ["route-error"],
+      "files": ["i18n/navigation"]
+    },
+    "artifacts": {
+      "marker": "app/[locale]/(app)/artifacts/page.tsx",
+      "files": ["i18n/navigation"]
+    },
+    "privacy-settings": {
+      "marker": "app/[locale]/(app)/settings/privacy/page.tsx",
+      "items": ["route-error"]
+    },
+    "chat": {
+      "marker": "app/[locale]/(app)/chat/page.tsx",
+      "items": ["route-error"],
+      "files": [
+        "hooks/use-mobile",
+        "i18n/navigation",
+        "i18n/routing",
+        "lib/intelligo",
+        "lib/utils"
+      ],
+      "features": ["chat"],
+      "exports": {
+        "lib/intelligo": ["composeIntelligo", "executions"]
+      }
+    },
+    "chat-panel": {
+      "marker": "components/chat/chat-panel.tsx",
+      "items": ["chat"],
+      "files": ["lib/utils"]
+    },
+    "chat-widget": {
+      "marker": "components/chat/chat-widget.tsx",
+      "items": ["chat"],
+      "files": ["i18n/navigation", "lib/utils"]
+    },
+    "chat-share": {
+      "marker": "app/[locale]/share/[id]/page.tsx",
+      "items": ["chat"],
+      "files": ["i18n/navigation"]
+    }
+  }
+}

package/templates/usage-page/usage-page.tsx.tpl

@@ -1,22 +1,30 @@
 /**
- * Usage page — generated by `intelligo add usage-page`.
- *
- * This file is YOURS. Intelligo will not overwrite it: once you edit
- * it, `intelligo upgrade --check` reports the upstream change as a
- * diff and leaves your version alone (ADR-0002).
+ * Generated by `intelligo add usage-page` and never overwritten: once
+ * you edit it, `intelligo upgrade --check` reports a template change as
+ * a diff and leaves your version alone.
  *
  * It reads through @intelligo-dev/executions' query API rather than the
  * database directly, so it keeps working across schema changes.
  */
 
 import { requireWorkspace } from "@intelligo-dev/auth";
+import { formatMoney, type Money } from "@intelligo-dev/core/money";
 import { listExecutions, summarizeExecutions } from "@intelligo-dev/executions";
 
+/** Amounts arrive as micros with their currency; never assume a symbol. */
+const show = (amounts: Money[]) =>
+  amounts.length === 0
+    ? "—"
+    : amounts.map((amount) => formatMoney(amount, "en-US")).join(" · ");
+
 export default async function UsagePage() {
   const { workspace } = await requireWorkspace();
 
   const now = new Date();
-  const monthStart = new Date(now.getFullYear(), now.getMonth(), 1);
+  // Billing periods are UTC calendar months.
+  const monthStart = new Date(
+    Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1)
+  );
 
   const [summary, recent] = await Promise.all([
     summarizeExecutions(workspace.id, { from: monthStart, to: now }),
@@ -30,7 +38,7 @@ export default async function UsagePage() {
       <p>
         {summary.totals.count} executions this month ·{" "}
         {summary.totals.totalTokens.toLocaleString()} tokens ·{" "}
-        {summary.totals.chargedMnt.toLocaleString()}₮
+        {show(summary.totals.charged)}
       </p>
 
       <table cellPadding={8}>
@@ -49,7 +57,14 @@ export default async function UsagePage() {
               <td>{e.capability}</td>
               <td>{e.status}</td>
               <td align="right">{e.totalTokens ?? 0}</td>
-              <td align="right">{e.chargedMnt ?? 0}₮</td>
+              <td align="right">
+                {e.chargedMicros !== null && e.currency
+                  ? formatMoney(
+                      { amount: e.chargedMicros, currency: e.currency } as Money,
+                      "en-US"
+                    )
+                  : "—"}
+              </td>
               <td>{e.startedAt.toISOString()}</td>
             </tr>
           ))}

package/templates/billing-page/billing-page.tsx.tpl

@@ -1,72 +0,0 @@
-/**
- * Billing page — generated by `intelligo add billing-page`.
- *
- * Yours from here. It reads the plan catalogue your composition root
- * registered rather than a list baked into the framework, so changing
- * your prices is a change to your own `lib/plans.ts` (ADR-0006).
- */
-
-import { requireWorkspace } from "@intelligo-dev/auth";
-import { getWorkspaceBilling } from "@intelligo-dev/billing";
-import { getPlanConfigs } from "@intelligo-dev/billing/plans";
-import { CreditBalance } from "@intelligo-dev/ui";
-
-import { PRODUCT_SLUG } from "@/lib/intelligo";
-
-/**
- * Your currency, in one place. @intelligo-dev/ui takes a formatter rather
- * than assuming one, because a framework package deciding that money
- * is written "5,000₮" is wrong everywhere but here.
- */
-const formatAmount = (amount: number) => `${amount.toLocaleString()}₮`;
-
-export const dynamic = "force-dynamic";
-
-export default async function BillingPage() {
-  const { workspace } = await requireWorkspace();
-
-  const [billing, plans] = await Promise.all([
-    getWorkspaceBilling(workspace.id),
-    Promise.resolve(getPlanConfigs(PRODUCT_SLUG)),
-  ]);
-
-  const currentSlug = billing.plan?.slug ?? "free";
-
-  return (
-    <main style={{ fontFamily: "system-ui", padding: "2rem" }}>
-      <h1>Billing</h1>
-
-      <p>
-        Current plan: <strong>{billing.plan?.name ?? "Free"}</strong>
-      </p>
-
-      <CreditBalance
-        remainingMnt={billing.creditBalance.balanceMnt ?? 0}
-        formatAmount={formatAmount}
-      />
-
-      <section>
-        <h2>Plans</h2>
-        {Object.values(plans).map((plan) => (
-          <article key={plan.slug} style={{ marginBottom: "1.5rem" }}>
-            <h3>
-              {plan.name}
-              {plan.slug === currentSlug ? " (current)" : ""}
-            </h3>
-            <p>{plan.description}</p>
-            <p>
-              {plan.priceOneTime === 0
-                ? "Free"
-                : formatAmount(plan.priceOneTime)}
-            </p>
-            <ul>
-              {plan.features.map((f) => (
-                <li key={f}>{f}</li>
-              ))}
-            </ul>
-          </article>
-        ))}
-      </section>
-    </main>
-  );
-}