cronus-ui 0.6.3 → 0.6.5

package/README.md

@@ -49,7 +49,7 @@ Notes that match the commander surface:
   `packages/cli/scripts/build-registry.ts` — each item carries its source, its npm
   `dependencies`, and its `registryDependencies` (other components it imports),
   derived by parsing imports.
-- The default registry is pinned to the CLI package version (`v0.6.3` here), not
+- The default registry is pinned to the CLI package version (`v0.6.5` here), not
   mutable `main`, so a published CLI reads the registry snapshot it was released
   with. Use `-r, --registry ./registry` when testing local registry changes before
   a release tag exists.
@@ -80,7 +80,7 @@ Notes that match the commander surface:
     "lib": "lib",
     "blocks": "components/blocks"
   },
-  "registry": "https://raw.githubusercontent.com/pedrogbraz/cronus-ui/v0.6.3/registry"
+  "registry": "https://raw.githubusercontent.com/pedrogbraz/cronus-ui/v0.6.5/registry"
 }
 ```
 

package/dist/compose/gold-path.d.ts

@@ -37,10 +37,21 @@ export declare function goldPathLayout(config: CronusUIConfig): GoldPathLayout;
 export declare function patchChromeSource(source: string, workspaceImport: string, inviteImport: string, sessionImport?: string): string | undefined;
 /** Insert ItemsPanel into a generated home page. Returns undefined when there is no main. */
 export declare function patchHomePageSource(source: string, itemsImport: string): string | undefined;
+/**
+ * Replace the catalog TeamBlock on a generated /team page with MembersPanel.
+ * Idempotent. Returns undefined when there is no TeamBlock and no MembersPanel.
+ */
+export declare function patchTeamPageSource(source: string, membersImport: string): string | undefined;
+/**
+ * Validate the session in the shell layout so a stale cookie cannot sit in the
+ * app chrome. Idempotent. Returns undefined when AppShellNav is missing.
+ */
+export declare function patchShellLayoutSource(source: string, authImport: string): string | undefined;
 /**
  * Write sqlite + Drizzle + Better-Auth files into a composed saas/admin app.
- * Overwrites lib/auth-adapter.ts and lib/items.ts always. Patches the shell
- * home page only when compose wrote it this run.
+ * Overwrites lib/auth-adapter.ts, lib/items.ts, and lib/members.ts always.
+ * Patches the shell home, /team, and shell layout only when compose wrote them
+ * this run.
  */
 export declare function applyGoldPath(options: ApplyGoldPathOptions): Promise<ApplyGoldPathResult>;
 //# sourceMappingURL=gold-path.d.ts.map

package/dist/compose/gold-path.js

@@ -82,6 +82,20 @@ function homePageRel(appDir, generatedFiles) {
     const any = generatedFiles.find((f) => /(^|\/)\(shell\)\/page\.tsx$/.test(posix(f)));
     return any !== undefined ? posix(any) : undefined;
 }
+function teamPageRel(appDir, generatedFiles) {
+    const match = generatedFiles.find((f) => posix(f) === `${appDir}/(shell)/team/page.tsx`);
+    if (match !== undefined)
+        return posix(match);
+    const any = generatedFiles.find((f) => /(^|\/)\(shell\)\/team\/page\.tsx$/.test(posix(f)));
+    return any !== undefined ? posix(any) : undefined;
+}
+function shellLayoutRel(appDir, generatedFiles) {
+    const match = generatedFiles.find((f) => posix(f) === `${appDir}/(shell)/layout.tsx`);
+    if (match !== undefined)
+        return posix(match);
+    const any = generatedFiles.find((f) => /(^|\/)\(shell\)\/layout\.tsx$/.test(posix(f)));
+    return any !== undefined ? posix(any) : undefined;
+}
 function drizzleConfigSource(dbDir) {
     return `import { mkdirSync } from "node:fs";
 import { dirname } from "node:path";
@@ -231,6 +245,19 @@ function newId(): string {
   return crypto.randomUUID().replaceAll("-", "");
 }
 
+function authBaseURL() {
+  const env = process.env.BETTER_AUTH_URL;
+  const hosts = ["localhost:*", "127.0.0.1:*"];
+  if (env) {
+    try {
+      hosts.push(new URL(env).host);
+    } catch {
+      // ignore invalid BETTER_AUTH_URL
+    }
+  }
+  return { allowedHosts: hosts, fallback: env || "http://localhost:3000" };
+}
+
 export const auth = betterAuth({
   database: drizzleAdapter(db, { provider: "sqlite", schema }),
   emailAndPassword: {
@@ -287,12 +314,11 @@ export const auth = betterAuth({
     },
   },
   secret: process.env.BETTER_AUTH_SECRET,
-  baseURL: process.env.BETTER_AUTH_URL,
+  baseURL: authBaseURL(),
   plugins: [
     organization({
       sendInvitationEmail: async (data) => {
-        const base = process.env.BETTER_AUTH_URL ?? "http://localhost:3000";
-        console.info(\`Invite \${data.email}: \${base}/accept-invitation?id=\${data.id}\`);
+        console.info(\`Invite \${data.email}: /accept-invitation?id=\${data.id}\`);
       },
     }),
     nextCookies(),
@@ -415,13 +441,10 @@ export function middleware(request: NextRequest) {
     if (invitation) url.searchParams.set("invitation", invitation);
     return NextResponse.redirect(url);
   }
-  if (sessionCookie && isAuthPage) {
-    if (invitation) {
-      return NextResponse.redirect(
-        new URL(\`/accept-invitation?id=\${encodeURIComponent(invitation)}\`, request.url),
-      );
-    }
-    return NextResponse.redirect(new URL("/", request.url));
+  if (sessionCookie && isAuthPage && invitation) {
+    return NextResponse.redirect(
+      new URL(\`/accept-invitation?id=\${encodeURIComponent(invitation)}\`, request.url),
+    );
   }
   return NextResponse.next();
 }
@@ -585,6 +608,156 @@ export function ItemsView({
 }
 `;
 }
+function membersActionsSource(authImport) {
+    return `"use server";
+
+import { and, asc, eq } from "drizzle-orm";
+import { headers } from "next/headers";
+import { db } from "@/db";
+import { member, organization, user } from "@/db/schema";
+import { auth } from ${JSON.stringify(authImport)};
+
+async function activeWorkspaceId(): Promise<string | null> {
+  const session = await auth.api.getSession({ headers: await headers() });
+  const userId = session?.user?.id;
+  if (!userId) return null;
+  const hinted = session.session?.activeOrganizationId ?? null;
+  if (hinted) {
+    const [membership] = await db
+      .select({ organizationId: member.organizationId })
+      .from(member)
+      .where(and(eq(member.userId, userId), eq(member.organizationId, hinted)))
+      .limit(1);
+    if (membership?.organizationId) return membership.organizationId;
+  }
+  const [row] = await db
+    .select({ organizationId: member.organizationId })
+    .from(member)
+    .where(eq(member.userId, userId))
+    .limit(1);
+  return row?.organizationId ?? null;
+}
+
+export async function loadMembers(): Promise<{
+  workspace: string;
+  rows: { id: string; name: string; email: string; image: string | null; role: string }[];
+}> {
+  const orgId = await activeWorkspaceId();
+  if (!orgId) return { workspace: "no workspace", rows: [] };
+  const [org] = await db.select().from(organization).where(eq(organization.id, orgId)).limit(1);
+  const rows = await db
+    .select({
+      id: member.id,
+      name: user.name,
+      email: user.email,
+      image: user.image,
+      role: member.role,
+    })
+    .from(member)
+    .innerJoin(user, eq(member.userId, user.id))
+    .where(eq(member.organizationId, orgId))
+    .orderBy(asc(member.createdAt));
+  return { workspace: org?.name ?? "no workspace", rows };
+}
+`;
+}
+function membersPanelSource(actionsImport, viewImport) {
+    return `import { loadMembers } from ${JSON.stringify(actionsImport)};
+import { MembersView } from ${JSON.stringify(viewImport)};
+
+export async function MembersPanel() {
+  const data = await loadMembers();
+  return <MembersView workspace={data.workspace} rows={data.rows} />;
+}
+`;
+}
+function membersViewSource(inviteImport) {
+    return `"use client";
+
+import { Avatar, AvatarFallback, AvatarImage, Badge, Button } from "@cronus-ui/ui";
+import { InviteMember } from ${JSON.stringify(inviteImport)};
+
+function initialsOf(name: string, email: string): string {
+  const parts = name.trim().split(/\\s+/).filter(Boolean);
+  if (parts.length >= 2) {
+    return \`\${parts[0]?.[0] ?? ""}\${parts[1]?.[0] ?? ""}\`.toUpperCase();
+  }
+  if (parts[0]?.[0]) return parts[0][0].toUpperCase();
+  return email.slice(0, 2).toUpperCase();
+}
+
+function roleLabel(role: string): string {
+  if (role === "owner") return "Owner";
+  if (role === "admin") return "Admin";
+  if (role === "member") return "Member";
+  return role;
+}
+
+function roleVariant(role: string): "primary" | "info" | "secondary" {
+  if (role === "owner") return "primary";
+  if (role === "admin") return "info";
+  return "secondary";
+}
+
+export function MembersView({
+  workspace,
+  rows,
+}: {
+  workspace: string;
+  rows: { id: string; name: string; email: string; image: string | null; role: string }[];
+}) {
+  const count = String(rows.length);
+  return (
+    <section
+      data-slot="members-panel"
+      aria-labelledby="members-heading"
+      className="mx-auto w-full max-w-xl px-6 py-6"
+    >
+      <div className="flex items-end justify-between gap-3">
+        <div className="min-w-0">
+          <h1 id="members-heading" className="text-sm font-semibold text-fg">
+            Team
+          </h1>
+          <p className="mt-1 text-sm text-fg-tertiary">
+            {workspace} · {count} members
+          </p>
+        </div>
+        <InviteMember
+          trigger={
+            <Button type="button" size="sm">
+              Invite
+            </Button>
+          }
+        />
+      </div>
+      {rows.length === 0 ? (
+        <p className="mt-4 text-sm text-fg-tertiary">No members yet.</p>
+      ) : (
+        <ul className="mt-4">
+          {rows.map((row) => (
+            <li
+              key={row.id}
+              data-slot="member"
+              className="flex items-center gap-3 border-t border-border py-3"
+            >
+              <Avatar className="size-8">
+                {row.image ? <AvatarImage src={row.image} alt={row.name} /> : null}
+                <AvatarFallback>{initialsOf(row.name, row.email)}</AvatarFallback>
+              </Avatar>
+              <div className="flex min-w-0 flex-1 flex-col">
+                <span className="truncate text-sm text-fg">{row.name}</span>
+                <span className="truncate text-sm text-fg-tertiary">{row.email}</span>
+              </div>
+              <Badge variant={roleVariant(row.role)}>{roleLabel(row.role)}</Badge>
+            </li>
+          ))}
+        </ul>
+      )}
+    </section>
+  );
+}
+`;
+}
 function workspaceMenuSource(authClientImport) {
     return `"use client";
 
@@ -846,6 +1019,48 @@ export function patchHomePageSource(source, itemsImport) {
     }
     return out;
 }
+/**
+ * Replace the catalog TeamBlock on a generated /team page with MembersPanel.
+ * Idempotent. Returns undefined when there is no TeamBlock and no MembersPanel.
+ */
+export function patchTeamPageSource(source, membersImport) {
+    const hasPanel = /<MembersPanel\s*\/>/.test(source);
+    const hasTeam = /<TeamBlock\s*\/>/.test(source);
+    if (!hasPanel && !hasTeam)
+        return undefined;
+    if (hasPanel)
+        return source;
+    let out = source;
+    const importLine = `import { MembersPanel } from ${JSON.stringify(membersImport)};`;
+    out = insertImport(out, importLine);
+    out = out.replace(/import \{ TeamBlock \} from "[^"]+";\n/, "");
+    out = out.replace(/export default(?! async) function/, "export default async function");
+    out = out.replace(/<TeamBlock\s*\/>/, "<MembersPanel />");
+    return out;
+}
+/**
+ * Validate the session in the shell layout so a stale cookie cannot sit in the
+ * app chrome. Idempotent. Returns undefined when AppShellNav is missing.
+ */
+export function patchShellLayoutSource(source, authImport) {
+    if (source.includes("auth.api.getSession") && source.includes('redirect("/login")')) {
+        return source;
+    }
+    if (!source.includes("AppShellNav") || !source.includes("{children}"))
+        return undefined;
+    let out = source;
+    out = insertImport(out, `import { headers } from "next/headers";`);
+    out = insertImport(out, `import { redirect } from "next/navigation";`);
+    out = insertImport(out, `import { auth } from ${JSON.stringify(authImport)};`);
+    out = out.replace(/export default(?! async) function/, "export default async function");
+    if (!out.includes("auth.api.getSession")) {
+        out = out.replace(/(\{ children \}: \{ children: ReactNode \}\) \{)\n/, `$1
+  const session = await auth.api.getSession({ headers: await headers() });
+  if (!session) redirect("/login");
+`);
+    }
+    return out;
+}
 function mergePackageJson(raw) {
     const pkg = JSON.parse(raw);
     const dependencies = { ...(pkg.dependencies ?? {}) };
@@ -915,8 +1130,9 @@ async function writeRel(targetDir, rel, content, overwrite, always, written, ski
 }
 /**
  * Write sqlite + Drizzle + Better-Auth files into a composed saas/admin app.
- * Overwrites lib/auth-adapter.ts and lib/items.ts always. Patches the shell
- * home page only when compose wrote it this run.
+ * Overwrites lib/auth-adapter.ts, lib/items.ts, and lib/members.ts always.
+ * Patches the shell home, /team, and shell layout only when compose wrote them
+ * this run.
  */
 export async function applyGoldPath(options) {
     const { targetDir, config, generatedFiles, overwrite } = options;
@@ -932,6 +1148,9 @@ export async function applyGoldPath(options) {
     const itemsActionsImport = `${config.aliases.lib}/items`;
     const itemsViewImport = "@/components/items-view";
     const itemsImport = "@/components/items-panel";
+    const membersActionsImport = `${config.aliases.lib}/members`;
+    const membersViewImport = "@/components/members-view";
+    const membersImport = "@/components/members-panel";
     const workspaceImport = "@/components/workspace-menu";
     const inviteImport = "@/components/invite-member";
     const sessionImport = "@/components/session-user";
@@ -965,6 +1184,21 @@ export async function applyGoldPath(options) {
             content: itemsViewSource(itemsActionsImport),
             always: true,
         },
+        {
+            rel: `${layout.libDir}/members.ts`,
+            content: membersActionsSource(authImport),
+            always: true,
+        },
+        {
+            rel: `${layout.componentsDir}/members-panel.tsx`,
+            content: membersPanelSource(membersActionsImport, membersViewImport),
+            always: true,
+        },
+        {
+            rel: `${layout.componentsDir}/members-view.tsx`,
+            content: membersViewSource(inviteImport),
+            always: true,
+        },
         {
             rel: `${layout.componentsDir}/workspace-menu.tsx`,
             content: workspaceMenuSource(authClientImport),
@@ -1004,6 +1238,38 @@ export async function applyGoldPath(options) {
             }
         }
     }
+    const layoutRel = shellLayoutRel(appDir, generatedFiles);
+    if (layoutRel !== undefined) {
+        const dest = resolveSafeDest(targetDir, ".", layoutRel);
+        if (existsSync(dest)) {
+            const current = await readFile(dest, "utf8");
+            const patched = patchShellLayoutSource(current, authImport);
+            if (patched !== undefined && patched !== current) {
+                await writeFileEnsured(dest, patched);
+                const templateName = options.templateName;
+                if (templateName !== undefined) {
+                    const snapDest = resolveSafeDest(targetDir, baseSnapshotDir(templateName), layoutRel);
+                    await writeFileEnsured(snapDest, patched);
+                }
+            }
+        }
+    }
+    const teamRel = teamPageRel(appDir, generatedFiles);
+    if (teamRel !== undefined) {
+        const dest = resolveSafeDest(targetDir, ".", teamRel);
+        if (existsSync(dest)) {
+            const current = await readFile(dest, "utf8");
+            const patched = patchTeamPageSource(current, membersImport);
+            if (patched !== undefined && patched !== current) {
+                await writeFileEnsured(dest, patched);
+                const templateName = options.templateName;
+                if (templateName !== undefined) {
+                    const snapDest = resolveSafeDest(targetDir, baseSnapshotDir(templateName), teamRel);
+                    await writeFileEnsured(snapDest, patched);
+                }
+            }
+        }
+    }
     const homeRel = homePageRel(appDir, generatedFiles);
     if (homeRel !== undefined) {
         const dest = resolveSafeDest(targetDir, ".", homeRel);

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 export declare const CONFIG_FILE = "cronus-ui.json";
-export declare const CLI_VERSION = "0.6.3";
-export declare const DEFAULT_REGISTRY = "https://raw.githubusercontent.com/pedrogbraz/cronus-ui/v0.6.3/registry";
+export declare const CLI_VERSION = "0.6.5";
+export declare const DEFAULT_REGISTRY = "https://raw.githubusercontent.com/pedrogbraz/cronus-ui/v0.6.5/registry";
 /** Manifest entry `add`/`upgrade` record per installed registry item. */
 export interface InstalledRecord {
     /** Registry release the files came from (git tag without the leading "v"). */

package/dist/config.js

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 export const CONFIG_FILE = "cronus-ui.json";
-export const CLI_VERSION = "0.6.3";
+export const CLI_VERSION = "0.6.5";
 export const DEFAULT_REGISTRY = `https://raw.githubusercontent.com/pedrogbraz/cronus-ui/v${CLI_VERSION}/registry`;
 export const DEFAULT_CONFIG = {
     aliases: { ui: "@/components/ui", lib: "@/lib", blocks: "@/components/blocks" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronus-ui",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "cronus-ui — add Cronus UI components to your project, shadcn-style (copy-paste registry).",
   "type": "module",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "registry:check": "bun run scripts/check-registry.ts"
   },
   "dependencies": {
-    "@cronus-ui/ai-kit": "0.6.3",
+    "@cronus-ui/ai-kit": "0.6.5",
     "commander": "^15.0.0",
     "picocolors": "^1.1.1"
   },