@geekmidas/cli 1.10.35 → 1.10.36

package/dist/index.cjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env -S npx tsx
 const require_chunk = require('./chunk-CUT6urMc.cjs');
-const require_workspace = require('./workspace-CGYykWfn.cjs');
-const require_config = require('./config-Cuo8vFsp.cjs');
+const require_workspace = require('./workspace-BobDOIG9.cjs');
+const require_config = require('./config-QnuOcYXp.cjs');
 const require_credentials = require('./credentials-C8DWtnMY.cjs');
 const require_fullstack_secrets = require('./fullstack-secrets-Bchl2MDd.cjs');
 const require_storage = require('./storage-B1wvztiJ.cjs');
-const require_openapi = require('./openapi-B_rJjImN.cjs');
+const require_openapi = require('./openapi-Bb4UEyZN.cjs');
 const require_dokploy_api = require('./dokploy-api-Dvyq-LsM.cjs');
 const require_encryption = require('./encryption-DgKS-Dv9.cjs');
 const require_CachedStateProvider = require('./CachedStateProvider-CxsXOKkg.cjs');
@@ -27,15 +27,15 @@ const node_crypto = require_chunk.__toESM(require("node:crypto"));
 const __geekmidas_constructs_crons = require_chunk.__toESM(require("@geekmidas/constructs/crons"));
 const __geekmidas_constructs_functions = require_chunk.__toESM(require("@geekmidas/constructs/functions"));
 const __geekmidas_constructs_subscribers = require_chunk.__toESM(require("@geekmidas/constructs/subscribers"));
+const node_url = require_chunk.__toESM(require("node:url"));
 const pg = require_chunk.__toESM(require("pg"));
 const node_dns_promises = require_chunk.__toESM(require("node:dns/promises"));
 const node_module = require_chunk.__toESM(require("node:module"));
-const node_url = require_chunk.__toESM(require("node:url"));
 const prompts = require_chunk.__toESM(require("prompts"));
 
 //#region package.json
 var name = "@geekmidas/cli";
-var version = "1.10.34";
+var version = "1.10.35";
 var description = "CLI tools for building Lambda handlers, server applications, and generating OpenAPI specs";
 var private$1 = false;
 var type = "module";
@@ -1489,6 +1489,27 @@ const FRONTEND_FRAMEWORKS = {
 		],
 		dependency: "vite",
 		installCommand: "pnpm add -D vite"
+	},
+	"tanstack-start": {
+		displayName: "TanStack Start",
+		configFiles: [
+			"vite.config.js",
+			"vite.config.ts",
+			"vite.config.mjs",
+			"vite.config.cjs"
+		],
+		dependency: "@tanstack/react-start",
+		installCommand: "pnpm add @tanstack/react-start @tanstack/react-router"
+	},
+	expo: {
+		displayName: "Expo",
+		configFiles: [
+			"app.config.ts",
+			"app.config.js",
+			"app.json"
+		],
+		dependency: "expo",
+		installCommand: "pnpm add expo"
 	}
 };
 /**
@@ -1498,6 +1519,8 @@ const FRONTEND_FRAMEWORKS = {
 */
 function detectFrontendFramework(fullPath, deps) {
 	const order = [
+		"expo",
+		"tanstack-start",
 		"nextjs",
 		"remix",
 		"vite"
@@ -4881,9 +4904,8 @@ function resolveEnvVar(varName, context) {
 			break;
 	}
 	if (context.dependencyUrls && varName.endsWith("_URL")) {
-		let depName;
-		if (varName.startsWith("NEXT_PUBLIC_")) depName = varName.slice(12, -4).toLowerCase();
-		else depName = varName.slice(0, -4).toLowerCase();
+		const stripped = require_workspace.stripPublicPrefix(varName) ?? varName;
+		const depName = stripped.slice(0, -4).toLowerCase();
 		if (context.dependencyUrls[depName]) return context.dependencyUrls[depName];
 	}
 	if (context.userSecrets) {
@@ -5296,7 +5318,8 @@ function resolveSnifferFile(baseName) {
 async function sniffAppEnvironment(app, appName, workspacePath, options = {}) {
 	const { logWarnings = true, markOptional = false } = options;
 	if (app.type === "frontend") {
-		const depVars = (app.dependencies ?? []).map((dep) => `NEXT_PUBLIC_${dep.toUpperCase()}_URL`);
+		const publicPrefix = require_workspace.getPublicEnvPrefix(app.framework);
+		const depVars = publicPrefix ? (app.dependencies ?? []).map((dep) => `${publicPrefix}${dep.toUpperCase()}_URL`) : [];
 		if (app.config) {
 			const sniffedVars = [];
 			const sniffedOptional = [];
@@ -6473,11 +6496,14 @@ async function workspaceDeployCommand(workspace, options) {
 				const { valid, missing, resolved } = validateEnvVars(sniffedVars, envContext);
 				if (!valid) throw new Error(formatMissingVarsError(appName, missing, stage));
 				if (Object.keys(resolved).length > 0) logger$3.log(`      Resolved ${Object.keys(resolved).length} env vars: ${Object.keys(resolved).join(", ")}`);
+				const publicPrefix = require_workspace.getPublicEnvPrefix(app.framework);
 				const buildArgs = [];
 				const publicUrlArgNames = [];
-				for (const [key, value] of Object.entries(resolved)) if (key.startsWith("NEXT_PUBLIC_")) {
-					buildArgs.push(`${key}=${value}`);
-					publicUrlArgNames.push(key);
+				if (publicPrefix) {
+					for (const [key, value] of Object.entries(resolved)) if (key.startsWith(publicPrefix)) {
+						buildArgs.push(`${key}=${value}`);
+						publicUrlArgNames.push(key);
+					}
 				}
 				if (buildArgs.length > 0) logger$3.log(`      Build args: ${publicUrlArgNames.join(", ")}`);
 				const imageName = `${workspace.name}-${appName}`;
@@ -6914,9 +6940,9 @@ const GEEKMIDAS_VERSIONS = {
 	"@geekmidas/constructs": "~3.0.9",
 	"@geekmidas/db": "~1.0.1",
 	"@geekmidas/emailkit": "~1.0.0",
-	"@geekmidas/envkit": "~1.0.5",
+	"@geekmidas/envkit": "~1.0.6",
 	"@geekmidas/errors": "~1.0.0",
-	"@geekmidas/events": "~1.1.0",
+	"@geekmidas/events": "~1.1.1",
 	"@geekmidas/logger": "~1.0.1",
 	"@geekmidas/rate-limit": "~2.0.0",
 	"@geekmidas/schema": "~1.0.0",
@@ -7722,6 +7748,604 @@ coverage/
 	return files;
 }
 
+//#endregion
+//#region src/init/generators/mobile-expo.ts
+/**
+* Generate an Expo mobile app for the fullstack template.
+*
+* Mirrors the structure of rezgo/apps/app: NativeWind for styling,
+* expo-router for navigation, better-auth + magic link, React Query
+* for data, all wired into the toolbox's typed API client.
+*/
+function generateExpoAppFiles(options) {
+	if (!options.monorepo || options.template !== "fullstack") return [];
+	const packageName = `@${options.name}/app`;
+	const apiPackage = `@${options.name}/api`;
+	const modelsPackage = `@${options.name}/models`;
+	const slug = options.name.toLowerCase().replace(/[^a-z0-9-]/g, "-");
+	const scheme = slug.replace(/-/g, "");
+	const bundleId = `com.${scheme}.app`;
+	const packageJson = {
+		name: packageName,
+		version: "0.0.1",
+		main: "expo-router/entry",
+		private: true,
+		scripts: {
+			dev: "gkm exec -- expo start -c",
+			ios: "expo start --ios",
+			android: "expo start --android",
+			web: "expo start --web",
+			typecheck: "tsc --noEmit"
+		},
+		dependencies: {
+			[apiPackage]: "workspace:*",
+			[modelsPackage]: "workspace:*",
+			"@better-auth/expo": "~1.2.0",
+			"@geekmidas/client": GEEKMIDAS_VERSIONS["@geekmidas/client"],
+			"@geekmidas/envkit": GEEKMIDAS_VERSIONS["@geekmidas/envkit"],
+			"@react-navigation/native": "^7.1.0",
+			"@tanstack/react-query": "~5.80.0",
+			"better-auth": "~1.2.0",
+			expo: "~55.0.0",
+			"expo-constants": "~55.0.0",
+			"expo-dev-client": "~55.0.0",
+			"expo-linking": "~55.0.0",
+			"expo-router": "~55.0.0",
+			"expo-secure-store": "~14.2.0",
+			"expo-splash-screen": "~55.0.0",
+			"expo-status-bar": "~55.0.0",
+			nativewind: "~4.2.0",
+			react: "19.2.0",
+			"react-dom": "19.2.0",
+			"react-native": "0.83.6",
+			"react-native-gesture-handler": "~2.30.0",
+			"react-native-reanimated": "~4.2.0",
+			"react-native-safe-area-context": "~5.6.0",
+			"react-native-screens": "~4.23.0",
+			"react-native-web": "~0.21.0",
+			tailwindcss: "~3.4.0"
+		},
+		devDependencies: {
+			"@babel/core": "^7.25.0",
+			"@types/react": "~19.0.0",
+			typescript: "~5.8.2"
+		}
+	};
+	const appConfig = `import type { ConfigContext, ExpoConfig } from '@expo/config';
+
+/**
+ * Expo runtime config. Public env vars (\`EXPO_PUBLIC_*\`) are inlined
+ * at build time; everything else is read at runtime from \`extra\`.
+ */
+export default function config(_context: ConfigContext): ExpoConfig {
+  return {
+    name: '${options.name}',
+    slug: '${slug}',
+    version: '0.0.1',
+    orientation: 'portrait',
+    icon: './assets/icon.png',
+    scheme: '${scheme}',
+    userInterfaceStyle: 'automatic',
+    newArchEnabled: true,
+    ios: {
+      supportsTablet: true,
+      bundleIdentifier: '${bundleId}',
+    },
+    android: {
+      package: '${bundleId}',
+      adaptiveIcon: {
+        foregroundImage: './assets/adaptive-icon.png',
+        backgroundColor: '#ffffff',
+      },
+      edgeToEdgeEnabled: true,
+    },
+    web: {
+      output: 'static',
+    },
+    plugins: [
+      'expo-router',
+      'expo-secure-store',
+      [
+        'expo-splash-screen',
+        {
+          image: './assets/splash.png',
+          imageWidth: 200,
+          resizeMode: 'contain',
+          backgroundColor: '#ffffff',
+        },
+      ],
+    ],
+    experiments: {
+      typedRoutes: true,
+    },
+  };
+}
+`;
+	const easJson = {
+		cli: {
+			version: ">= 10.2.1",
+			appVersionSource: "remote"
+		},
+		build: {
+			dev: {
+				developmentClient: true,
+				distribution: "internal",
+				environment: "development",
+				env: {
+					EXPO_PUBLIC_API_URL: "http://localhost:3000",
+					EXPO_PUBLIC_AUTH_URL: "http://localhost:3002"
+				}
+			},
+			preview: {
+				distribution: "internal",
+				environment: "preview",
+				env: {
+					EXPO_PUBLIC_API_URL: "https://api.example.com",
+					EXPO_PUBLIC_AUTH_URL: "https://auth.example.com"
+				}
+			},
+			production: {
+				autoIncrement: true,
+				environment: "production",
+				env: {
+					EXPO_PUBLIC_API_URL: "https://api.example.com",
+					EXPO_PUBLIC_AUTH_URL: "https://auth.example.com"
+				}
+			}
+		}
+	};
+	const babelConfig = `module.exports = function (api) {
+  api.cache(true);
+  return {
+    presets: [
+      ['babel-preset-expo', { jsxImportSource: 'nativewind' }],
+      'nativewind/babel',
+    ],
+  };
+};
+`;
+	const metroConfig = `const { getDefaultConfig } = require('expo/metro-config');
+const { withNativeWind } = require('nativewind/metro');
+
+const config = getDefaultConfig(__dirname);
+
+module.exports = withNativeWind(config, { input: './global.css' });
+`;
+	const tsConfig = {
+		extends: "expo/tsconfig.base",
+		compilerOptions: {
+			strict: true,
+			allowImportingTsExtensions: true,
+			types: ["nativewind/types"],
+			paths: {
+				"@/*": ["./*"],
+				[modelsPackage]: ["../../packages/models/src"],
+				[`${modelsPackage}/*`]: ["../../packages/models/src/*"],
+				[`${apiPackage}/client`]: ["../../apps/api/.gkm/openapi.ts"]
+			}
+		},
+		include: [
+			"**/*.ts",
+			"**/*.tsx",
+			".expo/types/**/*.ts",
+			"expo-env.d.ts",
+			"nativewind-env.d.ts"
+		]
+	};
+	const tailwindConfig = `import type { Config } from 'tailwindcss';
+
+export default {
+  content: ['./app/**/*.{ts,tsx}', './components/**/*.{ts,tsx}'],
+  presets: [require('nativewind/preset')],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+} satisfies Config;
+`;
+	const globalCss = `@tailwind base;
+@tailwind components;
+@tailwind utilities;
+`;
+	const expoEnvDts = `/// <reference types="expo/types" />\n`;
+	const nativewindEnvDts = `/// <reference types="nativewind/types" />\n`;
+	const configTs = `import { EnvironmentParser } from '@geekmidas/envkit';
+
+/**
+ * Public app config. EXPO_PUBLIC_* vars are inlined into the bundle at
+ * build time, so they're safe to read in client code.
+ */
+const envParser = new EnvironmentParser({
+  EXPO_PUBLIC_API_URL: process.env.EXPO_PUBLIC_API_URL,
+  EXPO_PUBLIC_AUTH_URL: process.env.EXPO_PUBLIC_AUTH_URL,
+});
+
+export const config = envParser
+  .create((get) => ({
+    apiUrl: get('EXPO_PUBLIC_API_URL').string(),
+    authUrl: get('EXPO_PUBLIC_AUTH_URL').string(),
+  }))
+  .parse();
+`;
+	const queryClientTs = `import { QueryClient } from '@tanstack/react-query';
+
+export const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: 60 * 1000,
+    },
+  },
+});
+`;
+	const authClientTs = `import { expoClient } from '@better-auth/expo/client';
+import { magicLinkClient } from 'better-auth/client/plugins';
+import { createAuthClient } from 'better-auth/react';
+import * as SecureStore from 'expo-secure-store';
+
+import { config } from '@/config.ts';
+
+export const STORAGE_PREFIX = '${scheme}';
+export const COOKIE_STORE_KEY = \`\${STORAGE_PREFIX}_cookie\`;
+
+export const authClient = createAuthClient({
+  baseURL: config.authUrl,
+  plugins: [
+    expoClient({
+      scheme: '${scheme}',
+      storagePrefix: STORAGE_PREFIX,
+      storage: SecureStore,
+    }),
+    magicLinkClient(),
+  ],
+});
+
+export const { signIn, useSession } = authClient;
+
+export async function signOut() {
+  try {
+    await authClient.signOut();
+  } finally {
+    await SecureStore.deleteItemAsync(COOKIE_STORE_KEY);
+  }
+}
+`;
+	const apiTs = `import { createApi } from '${apiPackage}/client';
+
+import { config } from '@/config.ts';
+import { authClient } from './auth-client.ts';
+import { queryClient } from './query-client.ts';
+
+export function createAppApi(options?: { headers?: Record<string, string> }) {
+  return createApi({
+    baseURL: config.apiUrl,
+    queryClient,
+    headers: options?.headers,
+    onRequest: (cfg) => {
+      const cookie = authClient.getCookie();
+      const next = { ...cfg, credentials: 'omit' as const };
+      if (cookie) {
+        return {
+          ...next,
+          headers: { ...(next.headers ?? {}), Cookie: cookie },
+        };
+      }
+      return next;
+    },
+  });
+}
+`;
+	const apiContextTsx = `import { createContext, type ReactNode, use } from 'react';
+import type { createAppApi } from './api.ts';
+
+export type Api = ReturnType<typeof createAppApi>;
+
+const ApiContext = createContext<Api | null>(null);
+
+export function ApiProvider({
+  api,
+  children,
+}: {
+  api: Api;
+  children: ReactNode;
+}) {
+  return <ApiContext.Provider value={api}>{children}</ApiContext.Provider>;
+}
+
+export function useApi(): Api {
+  const api = use(ApiContext);
+  if (!api) {
+    throw new Error('useApi must be used within an ApiProvider');
+  }
+  return api;
+}
+`;
+	const layoutTsx = `import '../global.css';
+
+import { QueryClientProvider } from '@tanstack/react-query';
+import { Stack, useRouter, useSegments } from 'expo-router';
+import { StatusBar } from 'expo-status-bar';
+import { useEffect, useMemo } from 'react';
+import 'react-native-reanimated';
+
+import { authClient } from '@/lib/auth-client.ts';
+import { ApiProvider } from '@/lib/api-context.tsx';
+import { createAppApi } from '@/lib/api.ts';
+import { queryClient } from '@/lib/query-client.ts';
+
+function AuthGate({ children }: { children: React.ReactNode }) {
+  const router = useRouter();
+  const segments = useSegments();
+  const { data: session, isPending } = authClient.useSession();
+
+  useEffect(() => {
+    if (isPending) return;
+    const onAuthRoute = segments[0] === 'login';
+    if (!session && !onAuthRoute) {
+      router.replace('/login');
+    } else if (session && onAuthRoute) {
+      router.replace('/');
+    }
+  }, [isPending, session, segments, router]);
+
+  return <>{children}</>;
+}
+
+export default function RootLayout() {
+  const api = useMemo(() => createAppApi(), []);
+
+  return (
+    <QueryClientProvider client={queryClient}>
+      <ApiProvider api={api}>
+        <AuthGate>
+          <Stack screenOptions={{ headerShown: false }}>
+            <Stack.Screen name="index" />
+            <Stack.Screen name="login" />
+          </Stack>
+        </AuthGate>
+        <StatusBar style="auto" />
+      </ApiProvider>
+    </QueryClientProvider>
+  );
+}
+`;
+	const indexTsx = `import { Pressable, Text, View } from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
+
+import { signOut, useSession } from '@/lib/auth-client.ts';
+import { useApi } from '@/lib/api-context.tsx';
+
+export default function Home() {
+  const { data: session } = useSession();
+  const api = useApi();
+  const { data: health } = api.useQuery('GET /health', {});
+
+  return (
+    <SafeAreaView className="flex-1 bg-white">
+      <View className="flex-1 items-center justify-center gap-4 px-6">
+        <Text className="text-3xl font-bold text-slate-900">
+          Welcome to ${options.name}
+        </Text>
+        {session ? (
+          <Text className="text-sm text-slate-500">
+            Signed in as {session.user.email}
+          </Text>
+        ) : null}
+        {health ? (
+          <Text className="text-xs text-slate-400">
+            API: {JSON.stringify(health)}
+          </Text>
+        ) : null}
+        <Pressable
+          onPress={signOut}
+          className="mt-4 rounded-lg bg-slate-900 px-6 py-3"
+        >
+          <Text className="font-semibold text-white">Sign out</Text>
+        </Pressable>
+      </View>
+    </SafeAreaView>
+  );
+}
+`;
+	const loginTsx = `import * as Linking from 'expo-linking';
+import { useState } from 'react';
+import {
+  KeyboardAvoidingView,
+  Platform,
+  Pressable,
+  Text,
+  TextInput,
+  View,
+} from 'react-native';
+import { SafeAreaView } from 'react-native-safe-area-context';
+
+import { authClient } from '@/lib/auth-client.ts';
+
+const EMAIL_RE = /^[^\\s@]+@[^\\s@]+\\.[^\\s@]+$/;
+
+export default function LoginScreen() {
+  const [email, setEmail] = useState('');
+  const [submitting, setSubmitting] = useState(false);
+  const [sent, setSent] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  async function handleSubmit() {
+    if (!EMAIL_RE.test(email.trim())) {
+      setError('Enter a valid email address');
+      return;
+    }
+    setError(null);
+    setSubmitting(true);
+
+    const callbackURL = Linking.createURL('/').replace(/^(\\w+):\\/\\/\\//, '$1://');
+    try {
+      const result = await authClient.signIn.magicLink({
+        email: email.trim(),
+        callbackURL,
+      });
+      if (result.error) {
+        setError(result.error.message ?? 'Could not send magic link');
+        return;
+      }
+      setSent(true);
+    } catch (err) {
+      setError(err instanceof Error ? err.message : 'Something went wrong');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  if (sent) {
+    return (
+      <SafeAreaView className="flex-1 bg-white">
+        <View className="flex-1 items-center justify-center px-6">
+          <Text className="text-2xl font-bold text-slate-900">
+            Check your inbox
+          </Text>
+          <Text className="mt-3 text-center text-slate-500">
+            We sent a sign-in link to {email.trim()}
+          </Text>
+        </View>
+      </SafeAreaView>
+    );
+  }
+
+  return (
+    <SafeAreaView className="flex-1 bg-white">
+      <KeyboardAvoidingView
+        behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+        className="flex-1"
+      >
+        <View className="flex-1 justify-center px-6">
+          <Text className="text-3xl font-bold text-slate-900">Sign in</Text>
+          <Text className="mt-1 text-sm text-slate-500">
+            We'll email you a one-time sign-in link.
+          </Text>
+
+          <Text className="mt-6 text-xs font-semibold uppercase text-slate-500">
+            Email
+          </Text>
+          <TextInput
+            value={email}
+            onChangeText={(v) => {
+              setEmail(v);
+              if (error) setError(null);
+            }}
+            autoCapitalize="none"
+            autoCorrect={false}
+            keyboardType="email-address"
+            placeholder="you@example.com"
+            placeholderTextColor="#94a3b8"
+            editable={!submitting}
+            className="mt-2 rounded-lg border border-slate-300 px-4 py-3"
+          />
+          {error ? (
+            <Text className="mt-2 text-sm text-red-600">{error}</Text>
+          ) : null}
+
+          <Pressable
+            onPress={handleSubmit}
+            disabled={submitting}
+            className="mt-6 items-center rounded-lg bg-slate-900 py-4 disabled:opacity-60"
+          >
+            <Text className="font-semibold text-white">
+              {submitting ? 'Sending…' : 'Email me a sign-in link'}
+            </Text>
+          </Pressable>
+        </View>
+      </KeyboardAvoidingView>
+    </SafeAreaView>
+  );
+}
+`;
+	const gitignore = `node_modules/
+.expo/
+dist/
+*.log
+.env*.local
+ios/
+android/
+.eas/
+`;
+	return [
+		{
+			path: "apps/app/package.json",
+			content: `${JSON.stringify(packageJson, null, 2)}\n`
+		},
+		{
+			path: "apps/app/app.config.ts",
+			content: appConfig
+		},
+		{
+			path: "apps/app/eas.json",
+			content: `${JSON.stringify(easJson, null, 2)}\n`
+		},
+		{
+			path: "apps/app/babel.config.js",
+			content: babelConfig
+		},
+		{
+			path: "apps/app/metro.config.js",
+			content: metroConfig
+		},
+		{
+			path: "apps/app/tsconfig.json",
+			content: `${JSON.stringify(tsConfig, null, 2)}\n`
+		},
+		{
+			path: "apps/app/tailwind.config.ts",
+			content: tailwindConfig
+		},
+		{
+			path: "apps/app/global.css",
+			content: globalCss
+		},
+		{
+			path: "apps/app/expo-env.d.ts",
+			content: expoEnvDts
+		},
+		{
+			path: "apps/app/nativewind-env.d.ts",
+			content: nativewindEnvDts
+		},
+		{
+			path: "apps/app/config.ts",
+			content: configTs
+		},
+		{
+			path: "apps/app/lib/query-client.ts",
+			content: queryClientTs
+		},
+		{
+			path: "apps/app/lib/auth-client.ts",
+			content: authClientTs
+		},
+		{
+			path: "apps/app/lib/api.ts",
+			content: apiTs
+		},
+		{
+			path: "apps/app/lib/api-context.tsx",
+			content: apiContextTsx
+		},
+		{
+			path: "apps/app/app/_layout.tsx",
+			content: layoutTsx
+		},
+		{
+			path: "apps/app/app/index.tsx",
+			content: indexTsx
+		},
+		{
+			path: "apps/app/app/login.tsx",
+			content: loginTsx
+		},
+		{
+			path: "apps/app/.gitignore",
+			content: gitignore
+		}
+	];
+}
+
 //#endregion
 //#region src/init/generators/models.ts
 /**
@@ -8111,6 +8735,43 @@ export default defineConfig({
 	return files;
 }
 /**
+* Generate the frontend app entry for the workspace config based on the
+* selected `frontendFramework`. Defaults to Next.js for backwards compat.
+*/
+function generateFrontendAppEntry(options) {
+	switch (options.frontendFramework) {
+		case "tanstack-start": return `web: {
+      type: 'frontend',
+      framework: 'tanstack-start',
+      path: 'apps/web',
+      port: 3001,
+      dependencies: ['api', 'auth'],
+      config: {
+        client: './src/config/client.ts',
+        server: './src/config/server.ts',
+      },
+    },`;
+		case "expo": return `app: {
+      type: 'frontend',
+      framework: 'expo',
+      path: 'apps/app',
+      port: 8081,
+      dependencies: ['api', 'auth'],
+    },`;
+		default: return `web: {
+      type: 'frontend',
+      framework: 'nextjs',
+      path: 'apps/web',
+      port: 3001,
+      dependencies: ['api', 'auth'],
+      config: {
+        client: './src/config/client.ts',
+        server: './src/config/server.ts',
+      },
+    },`;
+	}
+}
+/**
 * Generate gkm.config.ts with defineWorkspace for fullstack template
 */
 function generateWorkspaceConfig(options) {
@@ -8154,17 +8815,7 @@ export default defineWorkspace({
       envParser: './src/config/env#envParser',
       logger: './src/config/logger#logger',
     },
-    web: {
-      type: 'frontend',
-      framework: 'nextjs',
-      path: 'apps/web',
-      port: 3001,
-      dependencies: ['api', 'auth'],
-      config: {
-        client: './src/config/client.ts',
-        server: './src/config/server.ts',
-      },
-    },
+    ${generateFrontendAppEntry(options)}
   },
   shared: {
     packages: ['packages/*'],
@@ -9067,6 +9718,26 @@ const templateChoices = [{
 	description: "Monorepo with API + Next.js + shared models"
 }];
 /**
+* Frontend framework choices for the fullstack template prompt.
+*/
+const frontendFrameworkChoices = [
+	{
+		title: "Next.js",
+		value: "nextjs",
+		description: "React server components, app router (default)"
+	},
+	{
+		title: "TanStack Start",
+		value: "tanstack-start",
+		description: "File-based router on Vite + Nitro"
+	},
+	{
+		title: "Expo",
+		value: "expo",
+		description: "React Native mobile app (iOS + Android)"
+	}
+];
+/**
 * Logger type choices for prompts
 */
 const loggerTypeChoices = [{
@@ -11174,6 +11845,382 @@ node_modules/
 	];
 }
 
+//#endregion
+//#region src/init/generators/web-tanstack.ts
+/**
+* Generate TanStack Start web app files for the fullstack template.
+*
+* Mirrors the Next.js scaffold (apps/web) but on Vite + TanStack Start +
+* TanStack Router with the `VITE_` env-var convention.
+*/
+function generateTanStackWebFiles(options) {
+	if (!options.monorepo || options.template !== "fullstack") return [];
+	const packageName = `@${options.name}/web`;
+	const apiPackage = `@${options.name}/api`;
+	const modelsPackage = `@${options.name}/models`;
+	const uiPackage = `@${options.name}/ui`;
+	const packageJson = {
+		name: packageName,
+		version: "0.0.1",
+		private: true,
+		type: "module",
+		scripts: {
+			dev: "gkm exec -- vite dev",
+			build: "gkm exec -- vite build",
+			start: "node .output/server/index.mjs",
+			typecheck: "tsc --noEmit"
+		},
+		dependencies: {
+			[apiPackage]: "workspace:*",
+			[modelsPackage]: "workspace:*",
+			[uiPackage]: "workspace:*",
+			"@geekmidas/client": GEEKMIDAS_VERSIONS["@geekmidas/client"],
+			"@geekmidas/envkit": GEEKMIDAS_VERSIONS["@geekmidas/envkit"],
+			"@tanstack/react-query": "~5.80.0",
+			"@tanstack/react-router": "^1.87.0",
+			"@tanstack/react-start": "^1.87.0",
+			"better-auth": "~1.2.0",
+			react: "~19.2.0",
+			"react-dom": "~19.2.0"
+		},
+		devDependencies: {
+			"@geekmidas/cli": GEEKMIDAS_VERSIONS["@geekmidas/cli"],
+			"@tailwindcss/vite": "^4.0.0",
+			"@tanstack/router-plugin": "^1.87.0",
+			"@types/node": "~22.0.0",
+			"@types/react": "~19.0.0",
+			"@types/react-dom": "~19.0.0",
+			"@vitejs/plugin-react": "^4.3.4",
+			tailwindcss: "^4.0.0",
+			tsx: "~4.20.0",
+			typescript: "~5.8.2",
+			vite: "^7.0.0",
+			"vite-tsconfig-paths": "~5.1.0"
+		}
+	};
+	const viteConfig = `import { Credentials } from '@geekmidas/envkit/credentials';
+import tailwindcss from '@tailwindcss/vite';
+import { tanstackStart } from '@tanstack/react-start/plugin/vite';
+import viteReact from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  server: {
+    port: Number(Credentials.PORT ?? 3001),
+  },
+  // VITE_* vars are inlined automatically; no manual loadEnv needed.
+  envPrefix: 'VITE_',
+  plugins: [
+    tsconfigPaths({ root: import.meta.dirname }),
+    tailwindcss(),
+    tanstackStart(),
+    viteReact(),
+  ],
+});
+`;
+	const tsConfig = {
+		extends: "../../tsconfig.json",
+		compilerOptions: {
+			lib: [
+				"dom",
+				"dom.iterable",
+				"ES2022"
+			],
+			allowJs: true,
+			skipLibCheck: true,
+			strict: true,
+			noEmit: true,
+			allowImportingTsExtensions: true,
+			esModuleInterop: true,
+			module: "ESNext",
+			moduleResolution: "bundler",
+			resolveJsonModule: true,
+			isolatedModules: true,
+			jsx: "preserve",
+			incremental: true,
+			baseUrl: ".",
+			types: ["vite/client"],
+			paths: {
+				"~/*": ["./src/*", "../../packages/ui/src/*"],
+				[modelsPackage]: ["../../packages/models/src"],
+				[`${modelsPackage}/*`]: ["../../packages/models/src/*"],
+				[uiPackage]: ["../../packages/ui/src"],
+				[`${uiPackage}/*`]: ["../../packages/ui/src/*"],
+				[`${apiPackage}/client`]: ["../../apps/api/.gkm/openapi.ts"]
+			}
+		},
+		include: [
+			"**/*.ts",
+			"**/*.tsx",
+			"src/routeTree.gen.ts"
+		],
+		exclude: [
+			"node_modules",
+			".output",
+			".vinxi",
+			"dist"
+		]
+	};
+	const queryClientTs = `import { QueryClient } from '@tanstack/react-query';
+
+function makeQueryClient() {
+  return new QueryClient({
+    defaultOptions: {
+      queries: {
+        staleTime: 60 * 1000,
+      },
+    },
+  });
+}
+
+let browserQueryClient: QueryClient | undefined = undefined;
+
+export function getQueryClient() {
+  if (typeof window === 'undefined') {
+    return makeQueryClient();
+  }
+  if (!browserQueryClient) browserQueryClient = makeQueryClient();
+  return browserQueryClient;
+}
+`;
+	const clientConfigTs = `import { EnvironmentParser } from '@geekmidas/envkit';
+
+// Client config - VITE_* vars are inlined at build time.
+const envParser = new EnvironmentParser({
+  VITE_API_URL: import.meta.env.VITE_API_URL,
+  VITE_AUTH_URL: import.meta.env.VITE_AUTH_URL,
+});
+
+export const clientConfig = envParser
+  .create((get) => ({
+    apiUrl: get('VITE_API_URL').string(),
+    authUrl: get('VITE_AUTH_URL').string(),
+  }))
+  .parse();
+`;
+	const serverConfigTs = `import { EnvironmentParser } from '@geekmidas/envkit';
+
+// Server config - all env vars (server-side only, not exposed to browser).
+// Access these only in TanStack Start server functions / server routes.
+const envParser = new EnvironmentParser({ ...process.env });
+
+export const serverConfig = envParser
+  .create((_get) => ({
+    // Add server-only secrets here
+    // Example: stripeSecretKey: _get('STRIPE_SECRET_KEY').string(),
+  }))
+  .parse();
+`;
+	const authClientTs = `import { magicLinkClient } from 'better-auth/client/plugins';
+import { createAuthClient } from 'better-auth/react';
+import { clientConfig } from '~/config/client.ts';
+
+export const authClient = createAuthClient({
+  baseURL: clientConfig.authUrl,
+  plugins: [magicLinkClient()],
+});
+
+export const { signIn, signUp, signOut, useSession, magicLink } = authClient;
+`;
+	const apiIndexTs = `import { createApi } from '${apiPackage}/client';
+import { clientConfig } from '~/config/client.ts';
+import { getQueryClient } from '~/lib/query-client.ts';
+
+export function createAppApi(options?: { headers?: Record<string, string> }) {
+  return createApi({
+    baseURL: clientConfig.apiUrl,
+    queryClient: getQueryClient(),
+    headers: options?.headers,
+    onRequest: (config) => ({ ...config, credentials: 'include' }),
+  });
+}
+
+export const api = createAppApi();
+`;
+	const routerTs = `import { createRouter } from '@tanstack/react-router';
+import { routeTree } from './routeTree.gen.ts';
+
+export function getRouter() {
+  return createRouter({
+    routeTree,
+    scrollRestoration: true,
+    defaultPreload: 'intent',
+  });
+}
+
+declare module '@tanstack/react-router' {
+  interface Register {
+    router: ReturnType<typeof getRouter>;
+  }
+}
+`;
+	const routeTreeGen = `// This file is auto-generated by @tanstack/router-plugin.
+// It will be overwritten on the next \`vite dev\` run.
+import { rootRouteWithContext } from '@tanstack/react-router';
+
+export const routeTree = rootRouteWithContext()({
+  // Routes are populated by the plugin from src/routes/**.tsx
+} as never);
+`;
+	const rootRouteTsx = `/// <reference types="vite/client" />
+import '~/styles/globals.css';
+
+import { QueryClientProvider } from '@tanstack/react-query';
+import {
+  HeadContent,
+  Outlet,
+  Scripts,
+  createRootRoute,
+} from '@tanstack/react-router';
+import type { ReactNode } from 'react';
+import { getQueryClient } from '~/lib/query-client.ts';
+
+export const Route = createRootRoute({
+  head: () => ({
+    meta: [
+      { charSet: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { title: '${options.name}' },
+    ],
+  }),
+  component: RootComponent,
+});
+
+function RootComponent() {
+  const queryClient = getQueryClient();
+  return (
+    <RootDocument>
+      <QueryClientProvider client={queryClient}>
+        <Outlet />
+      </QueryClientProvider>
+    </RootDocument>
+  );
+}
+
+function RootDocument({ children }: { children: ReactNode }) {
+  return (
+    <html lang="en">
+      <head>
+        <HeadContent />
+      </head>
+      <body>
+        {children}
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+`;
+	const indexRouteTsx = `import { createFileRoute } from '@tanstack/react-router';
+import { api } from '~/api/index.ts';
+
+export const Route = createFileRoute('/')({
+  component: HomeComponent,
+});
+
+function HomeComponent() {
+  const { data: health } = api.useQuery('GET /health', {});
+
+  return (
+    <main className="min-h-screen bg-background p-8">
+      <div className="mx-auto max-w-4xl space-y-8">
+        <div className="space-y-2">
+          <h1 className="text-4xl font-bold tracking-tight">
+            Welcome to ${options.name}
+          </h1>
+          <p className="text-muted-foreground">
+            Your TanStack Start app is ready.
+          </p>
+        </div>
+
+        <section className="rounded-lg border p-6">
+          <h2 className="text-xl font-semibold">API Status</h2>
+          {health ? (
+            <pre className="mt-4 rounded bg-muted p-4 text-sm">
+              {JSON.stringify(health, null, 2)}
+            </pre>
+          ) : (
+            <p className="mt-2 text-muted-foreground">Connecting…</p>
+          )}
+        </section>
+      </div>
+    </main>
+  );
+}
+`;
+	const globalsCss = `@import '${uiPackage}/styles';
+
+@source "../..";
+@source "../../../../packages/ui/src";
+`;
+	const gitignore = `.output/
+.vinxi/
+node_modules/
+.env.local
+*.log
+src/routeTree.gen.ts
+`;
+	return [
+		{
+			path: "apps/web/package.json",
+			content: `${JSON.stringify(packageJson, null, 2)}\n`
+		},
+		{
+			path: "apps/web/vite.config.ts",
+			content: viteConfig
+		},
+		{
+			path: "apps/web/tsconfig.json",
+			content: `${JSON.stringify(tsConfig, null, 2)}\n`
+		},
+		{
+			path: "apps/web/src/lib/query-client.ts",
+			content: queryClientTs
+		},
+		{
+			path: "apps/web/src/lib/auth-client.ts",
+			content: authClientTs
+		},
+		{
+			path: "apps/web/src/config/client.ts",
+			content: clientConfigTs
+		},
+		{
+			path: "apps/web/src/config/server.ts",
+			content: serverConfigTs
+		},
+		{
+			path: "apps/web/src/api/index.ts",
+			content: apiIndexTs
+		},
+		{
+			path: "apps/web/src/router.tsx",
+			content: routerTs
+		},
+		{
+			path: "apps/web/src/routeTree.gen.ts",
+			content: routeTreeGen
+		},
+		{
+			path: "apps/web/src/routes/__root.tsx",
+			content: rootRouteTsx
+		},
+		{
+			path: "apps/web/src/routes/index.tsx",
+			content: indexRouteTsx
+		},
+		{
+			path: "apps/web/src/styles/globals.css",
+			content: globalsCss
+		},
+		{
+			path: "apps/web/.gitignore",
+			content: gitignore
+		}
+	];
+}
+
 //#endregion
 //#region src/init/utils.ts
 /**
@@ -11386,6 +12433,13 @@ async function initCommand(projectName, options = {}) {
 			message: "Routes structure:",
 			choices: routesStructureChoices,
 			initial: 0
+		},
+		{
+			type: (_prev, values) => !options.yes && (options.template === "fullstack" || values.template === "fullstack") ? "select" : null,
+			name: "frontendFramework",
+			message: "Frontend framework:",
+			choices: frontendFrameworkChoices,
+			initial: 0
 		}
 	], { onCancel });
 	const name$1 = projectName || options.name || answers.name;
@@ -11427,6 +12481,7 @@ async function initCommand(projectName, options = {}) {
 	const pkgManager = options.pm ? options.pm : options.yes ? "pnpm" : answers.packageManager ?? detectedPkgManager;
 	const deployTarget = options.yes ? "dokploy" : answers.deployTarget ?? "dokploy";
 	const database = services.db;
+	const frontendFramework = isFullstack ? options.yes ? "nextjs" : answers.frontendFramework ?? "nextjs" : void 0;
 	const templateOptions = {
 		name: name$1,
 		template,
@@ -11439,7 +12494,8 @@ async function initCommand(projectName, options = {}) {
 		apiPath: monorepo ? options.apiPath ?? "apps/api" : "",
 		packageManager: pkgManager,
 		deployTarget,
-		services
+		services,
+		frontendFramework
 	};
 	const targetDir = (0, node_path.join)(cwd, name$1);
 	const baseTemplate = getTemplate(templateOptions.template);
@@ -11467,7 +12523,7 @@ async function initCommand(projectName, options = {}) {
 	] : [];
 	const dockerFiles = isMonorepo$1 && baseTemplate ? generateDockerFiles(templateOptions, baseTemplate, dbApps) : [];
 	const rootFiles = baseTemplate ? [...generateMonorepoFiles(templateOptions, baseTemplate), ...generateModelsPackage(templateOptions)] : [];
-	const webAppFiles = isFullstack ? generateWebAppFiles(templateOptions) : [];
+	const webAppFiles = isFullstack ? frontendFramework === "tanstack-start" ? generateTanStackWebFiles(templateOptions) : frontendFramework === "expo" ? generateExpoAppFiles(templateOptions) : generateWebAppFiles(templateOptions) : [];
 	const authAppFiles = isFullstack ? generateAuthAppFiles(templateOptions) : [];
 	const uiPackageFiles = isFullstack ? generateUiPackageFiles(templateOptions) : [];
 	for (const { path, content } of rootFiles) {
@@ -11600,7 +12656,15 @@ function printNextSteps(projectName, options, pkgManager) {
 		console.log(`  │   ├── api/          # Backend API`);
 		if (isFullstackTemplate(options.template)) {
 			console.log(`  │   ├── auth/         # Auth service (better-auth)`);
-			console.log(`  │   └── web/          # Next.js frontend`);
+			switch (options.frontendFramework) {
+				case "tanstack-start":
+					console.log(`  │   └── web/          # TanStack Start frontend`);
+					break;
+				case "expo":
+					console.log(`  │   └── app/          # Expo (React Native) app`);
+					break;
+				default: console.log(`  │   └── web/          # Next.js frontend`);
+			}
 		}
 		console.log(`  ├── packages/`);
 		console.log(`  │   ├── models/       # Shared Zod schemas`);
@@ -12434,11 +13498,11 @@ program.command("api").description("Manage REST API endpoints").action(() => {
 	if (globalOptions.cwd) process.chdir(globalOptions.cwd);
 	process.stdout.write("REST API management - coming soon\n");
 });
-program.command("openapi").description("Generate OpenAPI specification from endpoints").action(async () => {
+program.command("openapi").description("Generate OpenAPI specification from endpoints").option("--app <name>", "Workspace mode: generate for a single named backend app").action(async (options) => {
 	try {
 		const globalOptions = program.opts();
 		if (globalOptions.cwd) process.chdir(globalOptions.cwd);
-		await require_openapi.openapiCommand({});
+		await require_openapi.openapiCommand({ app: options.app });
 	} catch (error) {
 		console.error(formatError(error));
 		process.exit(1);