create-githat-app 1.0.4 → 1.0.6

package/dist/cli.js

@@ -11,7 +11,7 @@ import gradient from "gradient-string";
 import chalk from "chalk";
 
 // src/constants.ts
-var VERSION = "1.0.4";
+var VERSION = "1.0.6";
 var DEFAULT_API_URL = "https://api.githat.io";
 var DASHBOARD_URL = "https://githat.io/dashboard/apps";
 var BRAND_COLORS = ["#7c3aed", "#6366f1", "#8b5cf6"];
@@ -406,15 +406,77 @@ function openBrowser(url) {
   } catch {
   }
 }
+function sleep(ms) {
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
+}
+async function deviceAuthFlow() {
+  const spinner2 = p5.spinner();
+  try {
+    spinner2.start("Requesting device code...");
+    const codeRes = await fetch(`${DEFAULT_API_URL}/auth/device/code`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ client_name: "create-githat-app" })
+    });
+    if (!codeRes.ok) {
+      spinner2.stop("Failed to get device code");
+      return null;
+    }
+    const codeData = await codeRes.json();
+    spinner2.stop("Device code generated");
+    p5.note(
+      `Code: ${codeData.user_code}
+
+Opening browser to complete sign-in...
+If it doesn't open, visit: ${codeData.verification_uri_complete}`,
+      "Authorize Device"
+    );
+    openBrowser(codeData.verification_uri_complete);
+    spinner2.start("Waiting for browser authorization...");
+    const expiresAt = Date.now() + codeData.expires_in * 1e3;
+    const pollInterval = (codeData.interval || 5) * 1e3;
+    while (Date.now() < expiresAt) {
+      await sleep(pollInterval);
+      const tokenRes = await fetch(`${DEFAULT_API_URL}/auth/device/token`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ device_code: codeData.device_code })
+      });
+      const tokenData = await tokenRes.json();
+      if (tokenData.error === "authorization_pending") {
+        continue;
+      }
+      if (tokenData.error === "expired_token") {
+        spinner2.stop("Device code expired");
+        p5.log.error("Authorization timed out. Please try again.");
+        return null;
+      }
+      if (tokenData.publishable_key) {
+        spinner2.stop("Authorized!");
+        p5.log.success(`Connected to ${tokenData.app_name || "your app"} (${tokenData.org_name || "your org"})`);
+        return tokenData.publishable_key;
+      }
+      spinner2.stop("Authorization failed");
+      return null;
+    }
+    spinner2.stop("Timed out");
+    p5.log.error("Authorization timed out. Please try again.");
+    return null;
+  } catch (err) {
+    spinner2.stop("Connection error");
+    p5.log.error("Failed to connect to GitHat API. Check your internet connection.");
+    return null;
+  }
+}
 async function promptGitHat(existingKey) {
   let publishableKey = existingKey || "";
   if (!publishableKey) {
     const connectChoice = await p5.select({
       message: "Connect to GitHat",
       options: [
-        { value: "browser", label: "Sign in with browser", hint: "opens githat.io \u2014 recommended" },
-        { value: "paste", label: "I have a key", hint: "paste your pk_live_... key" },
-        { value: "skip", label: "Skip for now", hint: "add key to .env later" }
+        { value: "skip", label: "Skip for now", hint: "auth works on localhost \u2014 add key later" },
+        { value: "browser", label: "Sign in with browser", hint: "opens githat.io to authorize" },
+        { value: "paste", label: "I have a key", hint: "paste your pk_live_... key" }
       ]
     });
     if (p5.isCancel(connectChoice)) {
@@ -422,19 +484,10 @@ async function promptGitHat(existingKey) {
       process.exit(0);
     }
     if (connectChoice === "browser") {
-      p5.log.step("Opening githat.io in your browser...");
-      openBrowser("https://githat.io/sign-up");
-      p5.log.info("Sign up (or sign in), then go to Dashboard \u2192 Apps to copy your key.");
-      const pastedKey = await p5.text({
-        message: "Paste your publishable key",
-        placeholder: "pk_live_...",
-        validate: validatePublishableKey
-      });
-      if (p5.isCancel(pastedKey)) {
-        p5.cancel("Setup cancelled.");
-        process.exit(0);
+      const key = await deviceAuthFlow();
+      if (key) {
+        publishableKey = key;
       }
-      publishableKey = pastedKey || "";
     } else if (connectChoice === "paste") {
       const pastedKey = await p5.text({
         message: "Publishable key",
@@ -446,9 +499,6 @@ async function promptGitHat(existingKey) {
         process.exit(0);
       }
       publishableKey = pastedKey || "";
-    } else if (connectChoice === "skip") {
-      p5.log.info("Auth works on localhost without a key (CORS bypass for development).");
-      p5.log.info("Sign up at githat.io \u2014 a publishable key is auto-created for you.");
     }
   }
   const authFeatures = await p5.multiselect({
@@ -528,13 +578,15 @@ async function promptFinalize() {
 function toDisplayName(projectName) {
   return projectName.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
-function getDefaults(projectName, publishableKey, typescript) {
+function getDefaults(projectName, publishableKey, typescript, fullstack, backendFramework) {
   const displayName = toDisplayName(projectName);
+  const projectType = fullstack ? "fullstack" : "frontend";
   return {
     projectName,
     businessName: displayName,
     description: `${displayName} \u2014 Built with GitHat`,
-    projectType: "frontend",
+    projectType,
+    backendFramework: fullstack ? backendFramework || "hono" : void 0,
     framework: "nextjs",
     typescript: typescript ?? true,
     packageManager: detectPackageManager(),
@@ -544,7 +596,7 @@ function getDefaults(projectName, publishableKey, typescript) {
     databaseChoice: "none",
     useTailwind: true,
     includeDashboard: true,
-    includeGithatFolder: true,
+    includeGithatFolder: projectType === "frontend",
     initGit: true,
     installDeps: true
   };
@@ -552,7 +604,7 @@ function getDefaults(projectName, publishableKey, typescript) {
 async function runPrompts(args) {
   if (args.yes && args.initialName) {
     p8.log.info("Using defaults (--yes flag)");
-    return getDefaults(args.initialName, args.publishableKey, args.typescript);
+    return getDefaults(args.initialName, args.publishableKey, args.typescript, args.fullstack, args.backendFramework);
   }
   p8.intro("Let's set up your GitHat app");
   sectionHeader("Project");
@@ -725,14 +777,14 @@ function createSpinner(text4) {
   return ora({ text: text4, color: "magenta" });
 }
 async function withSpinner(text4, fn, successText) {
-  const spinner = createSpinner(text4);
-  spinner.start();
+  const spinner2 = createSpinner(text4);
+  spinner2.start();
   try {
     const result = await fn();
-    spinner.succeed(successText || text4);
+    spinner2.succeed(successText || text4);
     return result;
   } catch (err) {
-    spinner.fail(text4);
+    spinner2.fail(text4);
     throw err;
   }
 }
@@ -1436,7 +1488,7 @@ skillsCommand.action(() => {
 // src/cli.ts
 var program = new Command7();
 program.name("githat").description("GitHat CLI - Scaffold apps and manage skills").version(VERSION);
-program.command("create [project-name]", { isDefault: true }).description("Scaffold a new GitHat app").option("--key <key>", "GitHat publishable key (pk_live_...)").option("--ts", "Use TypeScript (default)").option("--js", "Use JavaScript").option("-y, --yes", "Skip prompts and use defaults").action(async (projectName, opts) => {
+program.command("create [project-name]", { isDefault: true }).description("Scaffold a new GitHat app").option("--key <key>", "GitHat publishable key (pk_live_...)").option("--ts", "Use TypeScript (default)").option("--js", "Use JavaScript").option("--fullstack", "Create fullstack project (Turborepo)").option("--backend <framework>", "Backend framework (hono, express, fastify)").option("-y, --yes", "Skip prompts and use defaults").action(async (projectName, opts) => {
   try {
     displayBanner();
     const typescript = opts.js ? false : opts.ts ? true : void 0;
@@ -1448,7 +1500,9 @@ program.command("create [project-name]", { isDefault: true }).description("Scaff
       initialName: projectName,
       publishableKey: opts.key,
       typescript,
-      yes: opts.yes
+      yes: opts.yes,
+      fullstack: opts.fullstack,
+      backendFramework: opts.backend
     });
     const context = answersToContext(answers);
     await scaffold(context, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-githat-app",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "GitHat CLI — scaffold apps and manage the skills marketplace",
   "type": "module",
   "bin": {

package/templates/fullstack/apps-web-nextjs/app/(auth)/reset-password/page.tsx.hbs

@@ -1,11 +1,39 @@
 {{#if includeForgotPassword}}
+'use client';
+
+import { Suspense } from 'react';
+import { useSearchParams } from 'next/navigation';
 import { ResetPasswordForm } from '@githat/nextjs';
 
-export default function ResetPasswordPage() {
+function ResetPasswordContent() {
+  const searchParams = useSearchParams();
+  const token = searchParams.get('token');
+
+  if (!token) {
+    return (
+      <main {{#if useTailwind}}className="flex items-center justify-center min-h-screen bg-[#09090b]"{{else}}style=\{{ display: 'flex', alignItems: 'center', justifyContent: 'center', minHeight: '100vh', background: '#09090b' }}{{/if}}>
+        <div {{#if useTailwind}}className="text-center"{{else}}style=\{{ textAlign: 'center' }}{{/if}}>
+          <h1 {{#if useTailwind}}className="text-xl font-semibold text-white mb-2"{{else}}style=\{{ fontSize: '1.25rem', fontWeight: 600, color: '#fafafa', marginBottom: '0.5rem' }}{{/if}}>Invalid reset link</h1>
+          <p {{#if useTailwind}}className="text-zinc-400"{{else}}style=\{{ color: '#a1a1aa' }}{{/if}}>
+            <a href="/forgot-password" {{#if useTailwind}}className="text-violet-500 hover:underline"{{else}}style=\{{ color: '#7c3aed' }}{{/if}}>Request a new one</a>
+          </p>
+        </div>
+      </main>
+    );
+  }
+
   return (
     <main {{#if useTailwind}}className="flex items-center justify-center min-h-screen bg-[#09090b]"{{else}}style=\{{ display: 'flex', alignItems: 'center', justifyContent: 'center', minHeight: '100vh', background: '#09090b' }}{{/if}}>
-      <ResetPasswordForm signInUrl="/sign-in" />
+      <ResetPasswordForm token={token} signInUrl="/sign-in" />
     </main>
   );
 }
+
+export default function ResetPasswordPage() {
+  return (
+    <Suspense fallback={<div {{#if useTailwind}}className="flex items-center justify-center min-h-screen bg-[#09090b] text-zinc-400"{{else}}style=\{{ display: 'flex', alignItems: 'center', justifyContent: 'center', minHeight: '100vh', background: '#09090b', color: '#a1a1aa' }}{{/if}}>Loading...</div>}>
+      <ResetPasswordContent />
+    </Suspense>
+  );
+}
 {{/if}}

package/templates/fullstack/apps-web-nextjs/app/dashboard/layout.tsx.hbs

@@ -1,9 +1,15 @@
 {{#if includeDashboard}}
-import { withAuth } from '@githat/nextjs/server';
+import { redirect } from 'next/navigation';
+import { cookies } from 'next/headers';
+
+export default async function DashboardLayout({ children }{{#if typescript}}: { children: React.ReactNode }{{/if}}) {
+  const cookieStore = await cookies();
+  const token = cookieStore.get('githat_access')?.value;
+
+  if (!token) {
+    redirect('/sign-in');
+  }
 
-async function DashboardLayout({ children }{{#if typescript}}: { children: React.ReactNode }{{/if}}) {
   return <>{children}</>;
 }
-
-export default withAuth(DashboardLayout);
 {{/if}}

package/templates/fullstack/apps-web-nextjs/app/dashboard/page.tsx.hbs

@@ -1,9 +1,9 @@
 {{#if includeDashboard}}
 'use client';
-import { useGitHat, UserButton } from '@githat/nextjs';
+import { useAuth, UserButton } from '@githat/nextjs';
 
 export default function DashboardPage() {
-  const { user, org } = useGitHat();
+  const { user, org } = useAuth();
 
   return (
     <div {{#if useTailwind}}className="p-8"{{else}}style=\{{ padding: '2rem' }}{{/if}}>

package/templates/fullstack/root/package.json.hbs

@@ -11,5 +11,5 @@
   "devDependencies": {
     "turbo": "^2.3.0"
   },
-  "packageManager": "{{packageManager}}@*"
+  "packageManager": "{{packageManager}}@10.9.2"
 }

package/templates/nextjs/app/(auth)/reset-password/page.tsx.hbs

@@ -1,13 +1,13 @@
 {{#if includeForgotPassword}}
 'use client';
 
-import { useState } from 'react';
+import { Suspense, useState } from 'react';
 import { useSearchParams, useRouter } from 'next/navigation';
 {{#if includeGithatFolder}}
 import { authApi } from '../../../githat/api/auth{{#unless typescript}}.js{{/unless}}';
 {{/if}}
 
-export default function ResetPasswordPage() {
+function ResetPasswordContent() {
   const searchParams = useSearchParams();
   const router = useRouter();
   const token = searchParams.get('token');
@@ -95,4 +95,12 @@ export default function ResetPasswordPage() {
     </main>
   );
 }
+
+export default function ResetPasswordPage() {
+  return (
+    <Suspense fallback={<div {{#if useTailwind}}className="flex items-center justify-center min-h-screen bg-[#09090b] text-zinc-400"{{else}}style=\{{ display: 'flex', alignItems: 'center', justifyContent: 'center', minHeight: '100vh', background: '#09090b', color: '#a1a1aa' }}{{/if}}>Loading...</div>}>
+      <ResetPasswordContent />
+    </Suspense>
+  );
+}
 {{/if}}