From d2676feac6e22a0eebed1e68cddb8b998f3d7b34 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Wed, 18 Mar 2026 21:38:00 -0700
Subject: [PATCH 1/9] feat: add chatbot template via generic GitHub template
 downloader

Adds downloadGitHubTemplate() that clones InsForge/insforge-templates repo,
copies the selected template to the project dir, writes .env.local with
credentials, and runs migrations/db_int.sql if present.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/commands/create.ts | 80 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 3 deletions(-)

diff --git a/src/commands/create.ts b/src/commands/create.ts
index 4642c4d..787b48a 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -11,7 +11,7 @@ import {
   getProject,
   getProjectApiKey,
 } from '../lib/api/platform.js';
-import { getAnonKey } from '../lib/api/oss.js';
+import { getAnonKey, ossFetch } from '../lib/api/oss.js';
 import { getGlobalConfig, saveGlobalConfig, saveProjectConfig, getFrontendUrl } from '../lib/config.js';
 import { requireAuth } from '../lib/credentials.js';
 import { handleError, getRootOpts, CLIError } from '../lib/errors.js';
@@ -59,7 +59,7 @@ export function registerCreateCommand(program: Command): void {
     .option('--name <name>', 'Project name')
     .option('--org-id <id>', 'Organization ID')
     .option('--region <region>', 'Deployment region (us-east, us-west, eu-central, ap-southeast)')
-    .option('--template <template>', 'Template to use: react, nextjs, or empty')
+    .option('--template <template>', 'Template to use: react, nextjs, chatbot, or empty')
     .action(async (opts, cmd) => {
       const { json, apiUrl } = getRootOpts(cmd);
       try {
@@ -118,6 +118,7 @@ export function registerCreateCommand(program: Command): void {
               options: [
                 { value: 'react', label: 'Web app template with React' },
                 { value: 'nextjs', label: 'Web app template with Next.js' },
+                { value: 'chatbot', label: 'AI Chatbot with Next.js' },
                 { value: 'empty', label: 'Empty project' },
               ],
             });
@@ -152,7 +153,9 @@ export function registerCreateCommand(program: Command): void {
 
         // 6. Download template if selected
         const hasTemplate = template !== 'empty';
-        if (hasTemplate) {
+        if (template === 'chatbot') {
+          await downloadGitHubTemplate('chatbot', projectConfig, json);
+        } else if (hasTemplate) {
           await downloadTemplate(template as Framework, projectConfig, projectName, json, apiUrl);
         }
 
@@ -291,4 +294,75 @@ async function downloadTemplate(
   }
 }
 
+async function downloadGitHubTemplate(
+  templateName: string,
+  projectConfig: ProjectConfig,
+  json: boolean,
+): Promise<void> {
+  const s = !json ? clack.spinner() : null;
+  s?.start(`Downloading ${templateName} template...`);
+
+  const tempDir = path.join(tmpdir(), `insforge-template-${Date.now()}`);
+
+  try {
+    await fs.mkdir(tempDir, { recursive: true });
+
+    // Shallow clone the templates repo
+    await execAsync(
+      'git clone --depth 1 https://github.com/InsForge/insforge-templates.git .',
+      { cwd: tempDir, maxBuffer: 10 * 1024 * 1024, timeout: 60_000 },
+    );
+
+    const templateDir = path.join(tempDir, templateName);
+    const stat = await fs.stat(templateDir).catch(() => null);
+    if (!stat?.isDirectory()) {
+      throw new Error(`Template "${templateName}" not found in repository`);
+    }
+
+    // Copy template files to cwd
+    s?.message('Copying template files...');
+    const cwd = process.cwd();
+    await copyDir(templateDir, cwd);
 
+    // Write .env.local with InsForge credentials
+    const anonKey = await getAnonKey();
+    const envContent = [
+      `NEXT_PUBLIC_INSFORGE_URL=${projectConfig.oss_host}`,
+      `NEXT_PUBLIC_INSFORGE_ANON_KEY=${anonKey}`,
+      '',
+    ].join('\n');
+    await fs.writeFile(path.join(cwd, '.env.local'), envContent);
+
+    s?.stop(`${templateName} template downloaded`);
+
+    // Run database migrations if db_int.sql exists
+    const migrationPath = path.join(cwd, 'migrations', 'db_int.sql');
+    const migrationExists = await fs.stat(migrationPath).catch(() => null);
+    if (migrationExists) {
+      const dbSpinner = !json ? clack.spinner() : null;
+      dbSpinner?.start('Running database migrations...');
+      try {
+        const sql = await fs.readFile(migrationPath, 'utf-8');
+        await ossFetch('/api/database/advance/rawsql/unrestricted', {
+          method: 'POST',
+          body: JSON.stringify({ query: sql }),
+        });
+        dbSpinner?.stop('Database migrations applied');
+      } catch (err) {
+        dbSpinner?.stop('Database migration failed');
+        if (!json) {
+          clack.log.warn(`Migration failed: ${(err as Error).message}`);
+          clack.log.info('You can run the migration manually: insforge db query --unrestricted "$(cat migrations/db_int.sql)"');
+        }
+      }
+    }
+  } catch (err) {
+    s?.stop(`${templateName} template download failed`);
+    if (!json) {
+      clack.log.warn(`Failed to download ${templateName} template: ${(err as Error).message}`);
+      clack.log.info('You can manually clone from: https://github.com/InsForge/insforge-templates');
+    }
+  } finally {
+    await fs.rm(tempDir, { recursive: true, force: true }).catch(() => {});
+  }
+}

From 56c603ba18a5eecd451ee8ab4c1f3a29f2eb6fb1 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 10:18:16 -0700
Subject: [PATCH 2/9] 0.1.22

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3bab6fa..a4c215e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "InsForge CLI - Command line tool for InsForge platform",
   "type": "module",
   "bin": {

From 63a66f130ea43be37facf6fd3efc21f3a3811c79 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 13:33:11 -0700
Subject: [PATCH 3/9] fix: read .env.example instead of hardcoding env vars in
 GitHub templates

Instead of writing hardcoded NEXT_PUBLIC_ vars to .env.local, the CLI
now reads the template's .env.example, pattern-matches INSFORGE URL and
ANON_KEY vars (regardless of prefix), and fills in the real values.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/commands/create.ts | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/commands/create.ts b/src/commands/create.ts
index 787b48a..d4f832f 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -324,14 +324,23 @@ async function downloadGitHubTemplate(
     const cwd = process.cwd();
     await copyDir(templateDir, cwd);
 
-    // Write .env.local with InsForge credentials
-    const anonKey = await getAnonKey();
-    const envContent = [
-      `NEXT_PUBLIC_INSFORGE_URL=${projectConfig.oss_host}`,
-      `NEXT_PUBLIC_INSFORGE_ANON_KEY=${anonKey}`,
-      '',
-    ].join('\n');
-    await fs.writeFile(path.join(cwd, '.env.local'), envContent);
+    // Write .env.local from .env.example with InsForge credentials filled in
+    const envExamplePath = path.join(cwd, '.env.example');
+    const envExampleExists = await fs.stat(envExamplePath).catch(() => null);
+    if (envExampleExists) {
+      const anonKey = await getAnonKey();
+      const envExample = await fs.readFile(envExamplePath, 'utf-8');
+      const envContent = envExample.replace(
+        /^([A-Z_]+=)(.*)$/gm,
+        (_, prefix: string, _value: string) => {
+          const key = prefix.slice(0, -1); // remove trailing '='
+          if (/INSFORGE.*(URL|BASE_URL)$/.test(key)) return `${prefix}${projectConfig.oss_host}`;
+          if (/INSFORGE.*ANON_KEY$/.test(key)) return `${prefix}${anonKey}`;
+          return `${prefix}${_value}`;
+        },
+      );
+      await fs.writeFile(path.join(cwd, '.env.local'), envContent);
+    }
 
     s?.stop(`${templateName} template downloaded`);
 

From 53cd4e8067afaa5d390b94f8fb331be4520012dd Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 13:41:58 -0700
Subject: [PATCH 4/9] 0.1.23

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4c215e..017015a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "InsForge CLI - Command line tool for InsForge platform",
   "type": "module",
   "bin": {

From 10fe7e6ac1dd637afb14765cb25c4c0624d68d6e Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 14:38:27 -0700
Subject: [PATCH 5/9] feat: auto-read env vars during create deploy step

During `insforge create`, the CLI now reads .env.local / .env.production
/ .env and passes the variables to the deployment API so the deployed
app has the correct InsForge credentials.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/commands/create.ts | 10 ++++++++++
 src/lib/env.ts         | 29 +++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 src/lib/env.ts

diff --git a/src/commands/create.ts b/src/commands/create.ts
index d4f832f..811c6c9 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -16,6 +16,7 @@ import { getGlobalConfig, saveGlobalConfig, saveProjectConfig, getFrontendUrl }
 import { requireAuth } from '../lib/credentials.js';
 import { handleError, getRootOpts, CLIError } from '../lib/errors.js';
 import { outputJson } from '../lib/output.js';
+import { readEnvFile } from '../lib/env.js';
 import { installCliGlobally, installSkills, reportCliUsage } from '../lib/skills.js';
 import { deployProject } from './deployments/deploy.js';
 import type { ProjectConfig } from '../types.js';
@@ -189,9 +190,17 @@ export function registerCreateCommand(program: Command): void {
 
           if (!clack.isCancel(shouldDeploy) && shouldDeploy) {
             try {
+              // Read env vars from .env.local or .env to pass to deployment
+              const envVars = await readEnvFile(process.cwd());
+              const startBody: { envVars?: Array<{ key: string; value: string }> } = {};
+              if (envVars.length > 0) {
+                startBody.envVars = envVars;
+              }
+
               const deploySpinner = clack.spinner();
               const result = await deployProject({
                 sourceDir: process.cwd(),
+                startBody,
                 spinner: deploySpinner,
               });
 
@@ -375,3 +384,4 @@ async function downloadGitHubTemplate(
     await fs.rm(tempDir, { recursive: true, force: true }).catch(() => {});
   }
 }
+
diff --git a/src/lib/env.ts b/src/lib/env.ts
new file mode 100644
index 0000000..c98e18a
--- /dev/null
+++ b/src/lib/env.ts
@@ -0,0 +1,29 @@
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+
+/**
+ * Read environment variables from the first env file found in the directory.
+ * Priority: .env.local > .env.production > .env
+ */
+export async function readEnvFile(cwd: string): Promise<Array<{ key: string; value: string }>> {
+  const candidates = ['.env.local', '.env.production', '.env'];
+  for (const name of candidates) {
+    const filePath = path.join(cwd, name);
+    const exists = await fs.stat(filePath).catch(() => null);
+    if (!exists) continue;
+
+    const content = await fs.readFile(filePath, 'utf-8');
+    const vars: Array<{ key: string; value: string }> = [];
+    for (const line of content.split('\n')) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith('#')) continue;
+      const eqIndex = trimmed.indexOf('=');
+      if (eqIndex === -1) continue;
+      const key = trimmed.slice(0, eqIndex).trim();
+      const value = trimmed.slice(eqIndex + 1).trim();
+      if (key) vars.push({ key, value });
+    }
+    return vars;
+  }
+  return [];
+}

From cc36a429b69df31b7a0fc6f951e54b251f178c61 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 14:39:20 -0700
Subject: [PATCH 6/9] 0.1.24

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 017015a..8e1c0ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "InsForge CLI - Command line tool for InsForge platform",
   "type": "module",
   "bin": {

From a32af9ef8a9052f4a91d29a9a43473e227266dd4 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 14:51:36 -0700
Subject: [PATCH 7/9] fix: validate template flag, match env vars with digits,
 strip quotes

- Reject invalid --template values with a clear error
- Env var regex now matches names containing digits (e.g. API_KEY_V2)
- Strip surrounding quotes from env file values before deploying

0.1.25

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 package.json           | 2 +-
 src/commands/create.ts | 6 +++++-
 src/lib/env.ts         | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 8e1c0ba..100158c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "InsForge CLI - Command line tool for InsForge platform",
   "type": "module",
   "bin": {
diff --git a/src/commands/create.ts b/src/commands/create.ts
index 811c6c9..b2cbf93 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -109,7 +109,11 @@ export function registerCreateCommand(program: Command): void {
         }
 
         // 3. Select template
+        const validTemplates = ['react', 'nextjs', 'chatbot', 'empty'];
         let template = opts.template as string | undefined;
+        if (template && !validTemplates.includes(template)) {
+          throw new CLIError(`Invalid template "${template}". Valid options: ${validTemplates.join(', ')}`);
+        }
         if (!template) {
           if (json) {
             template = 'empty';
@@ -340,7 +344,7 @@ async function downloadGitHubTemplate(
       const anonKey = await getAnonKey();
       const envExample = await fs.readFile(envExamplePath, 'utf-8');
       const envContent = envExample.replace(
-        /^([A-Z_]+=)(.*)$/gm,
+        /^([A-Z][A-Z0-9_]*=)(.*)$/gm,
         (_, prefix: string, _value: string) => {
           const key = prefix.slice(0, -1); // remove trailing '='
           if (/INSFORGE.*(URL|BASE_URL)$/.test(key)) return `${prefix}${projectConfig.oss_host}`;
diff --git a/src/lib/env.ts b/src/lib/env.ts
index c98e18a..7a35bb4 100644
--- a/src/lib/env.ts
+++ b/src/lib/env.ts
@@ -20,7 +20,11 @@ export async function readEnvFile(cwd: string): Promise<Array<{ key: string; val
       const eqIndex = trimmed.indexOf('=');
       if (eqIndex === -1) continue;
       const key = trimmed.slice(0, eqIndex).trim();
-      const value = trimmed.slice(eqIndex + 1).trim();
+      let value = trimmed.slice(eqIndex + 1).trim();
+      // Strip surrounding quotes
+      if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+        value = value.slice(1, -1);
+      }
       if (key) vars.push({ key, value });
     }
     return vars;

From e86b60823a46bc8469b687de743b46bcc2d48c22 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 15:12:06 -0700
Subject: [PATCH 8/9] feat: seed NEXT_PUBLIC_APP_URL with appkey.insforge.site

0.1.26

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 package.json           | 2 +-
 src/commands/create.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 100158c..7f707ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@insforge/cli",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "InsForge CLI - Command line tool for InsForge platform",
   "type": "module",
   "bin": {
diff --git a/src/commands/create.ts b/src/commands/create.ts
index b2cbf93..d5a9755 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -349,6 +349,7 @@ async function downloadGitHubTemplate(
           const key = prefix.slice(0, -1); // remove trailing '='
           if (/INSFORGE.*(URL|BASE_URL)$/.test(key)) return `${prefix}${projectConfig.oss_host}`;
           if (/INSFORGE.*ANON_KEY$/.test(key)) return `${prefix}${anonKey}`;
+          if (key === 'NEXT_PUBLIC_APP_URL') return `${prefix}https://${projectConfig.appkey}.insforge.site`;
           return `${prefix}${_value}`;
         },
       );

From f4572f2a88dfd2a75139747c4f09d73415ca9092 Mon Sep 17 00:00:00 2001
From: yaowenc2 <tonychang430@gmail.com>
Date: Thu, 19 Mar 2026 15:18:28 -0700
Subject: [PATCH 9/9] fix: confirm before running template database migrations

Prompt user for confirmation before executing SQL from downloaded
templates, addressing CodeRabbit review feedback.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/commands/create.ts | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/commands/create.ts b/src/commands/create.ts
index d5a9755..d05abc9 100644
--- a/src/commands/create.ts
+++ b/src/commands/create.ts
@@ -361,19 +361,23 @@ async function downloadGitHubTemplate(
     // Run database migrations if db_int.sql exists
     const migrationPath = path.join(cwd, 'migrations', 'db_int.sql');
     const migrationExists = await fs.stat(migrationPath).catch(() => null);
-    if (migrationExists) {
-      const dbSpinner = !json ? clack.spinner() : null;
-      dbSpinner?.start('Running database migrations...');
-      try {
-        const sql = await fs.readFile(migrationPath, 'utf-8');
-        await ossFetch('/api/database/advance/rawsql/unrestricted', {
-          method: 'POST',
-          body: JSON.stringify({ query: sql }),
-        });
-        dbSpinner?.stop('Database migrations applied');
-      } catch (err) {
-        dbSpinner?.stop('Database migration failed');
-        if (!json) {
+    if (migrationExists && !json) {
+      const runMigration = await clack.confirm({
+        message: 'This template includes a database migration. Apply it now?',
+      });
+
+      if (!clack.isCancel(runMigration) && runMigration) {
+        const dbSpinner = clack.spinner();
+        dbSpinner.start('Running database migrations...');
+        try {
+          const sql = await fs.readFile(migrationPath, 'utf-8');
+          await ossFetch('/api/database/advance/rawsql/unrestricted', {
+            method: 'POST',
+            body: JSON.stringify({ query: sql }),
+          });
+          dbSpinner.stop('Database migrations applied');
+        } catch (err) {
+          dbSpinner.stop('Database migration failed');
           clack.log.warn(`Migration failed: ${(err as Error).message}`);
           clack.log.info('You can run the migration manually: insforge db query --unrestricted "$(cat migrations/db_int.sql)"');
         }