zerostart-cli 0.0.38 → 0.0.40

package/out/cli.js

@@ -75,6 +75,7 @@ function showGitHubTokenHelp() {
     openUrl(tokenUrl);
 }
 async function initializeProject(name, language, type, options) {
+    // Returns the project path so the wizard can continue with deploy steps
     const cwd = process.cwd();
     const projectPath = path.join(cwd, name);
     if (fs.existsSync(projectPath)) {
@@ -96,17 +97,23 @@ async function initializeProject(name, language, type, options) {
         const gitHubService = options.githubToken ? new GitHubServiceCLI_1.GitHubServiceCLI(options.githubToken) : null;
         if (!await gitManager.checkGitInstalled()) {
             spinner.fail(chalk_1.default.red('Git is not installed!'));
-            return;
+            return projectPath;
         }
+        // ── Step 1: Create project files ────────────────────────────────────
         spinner.text = chalk_1.default.cyan('Generating project structure...');
         await templateManager.createProjectStructure(config);
         spinner.succeed(chalk_1.default.green('Project structure created'));
         if (type !== types_1.ProjectType.DSAPractice) {
+            // ── Step 2: Git init + FIRST human commit ────────────────────────
             spinner.start(chalk_1.default.cyan('Initializing Git repository...'));
             await gitManager.init(projectPath);
-            await gitManager.commit(projectPath, "Initial commit");
-            spinner.succeed(chalk_1.default.green('Git repository initialized'));
+            // First commit: just README and .gitignore (base project skeleton)
+            await gitManager.commitSelective(projectPath, ['README.md', '.gitignore', 'roadmap.md'], 'feat: initialize project with ZeroStart CLI');
+            // Second commit: everything else (source files, config, etc.)
+            await gitManager.commit(projectPath, 'chore: add project structure and configuration files');
+            spinner.succeed(chalk_1.default.green('Git repository initialized (2 commits)'));
         }
+        // ── Step 3: Create GitHub remote if requested ─────────────────────
         if (options.createRemote) {
             spinner.start(chalk_1.default.cyan('Creating GitHub repository...'));
             let repoUrl;
@@ -122,16 +129,17 @@ async function initializeProject(name, language, type, options) {
                 if (options.authMethod !== 'GitHub CLI')
                     await gitManager.addRemote(projectPath, repoUrl);
                 await gitManager.push(projectPath);
-                spinner.succeed(chalk_1.default.green('Pushed to GitHub'));
+                spinner.succeed(chalk_1.default.green('Pushed to GitHub ✓'));
             }
             else {
-                spinner.warn(chalk_1.default.yellow('GitHub repository creation failed'));
+                spinner.warn(chalk_1.default.yellow('GitHub repository creation failed — continuing locally'));
             }
         }
         console.log();
-        console.log(chalk_1.default.bold.green('  Success! Your project is ready!'));
+        console.log(chalk_1.default.bold.green('  ✅ Success! Your project is ready!'));
         console.log(chalk_1.default.gray('  Location: ') + chalk_1.default.cyan(projectPath));
         console.log();
+        // ── CP languages: open browser + interactive terminal ─────────────
         if ([types_1.ProjectLanguage.Python, types_1.ProjectLanguage.Java, types_1.ProjectLanguage.CPP].includes(language)) {
             const gdbLinks = {
                 [types_1.ProjectLanguage.Python]: 'https://www.onlinegdb.com/online_python_compiler',
@@ -143,18 +151,26 @@ async function initializeProject(name, language, type, options) {
             console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan(link));
             console.log(chalk_1.default.gray('  (Opening in your browser...)'));
             openUrl(link);
-        }
-        if (language === types_1.ProjectLanguage.HTMLCSS) {
-            console.log(chalk_1.default.bold.cyan('\n  Deployment:'));
-            console.log(chalk_1.default.gray('  To deploy to Vercel, run: ') + chalk_1.default.white('zerostart deploy-vercel'));
+            const terminalCmds = {
+                [types_1.ProjectLanguage.Python]: 'start cmd /k "python"',
+                [types_1.ProjectLanguage.Java]: `start cmd /k "cd /d ${projectPath} && javac src/main/java/com/example/Main.java && java -cp src/main/java com.example.Main"`,
+                [types_1.ProjectLanguage.CPP]: `start cmd /k "cd /d ${projectPath} && g++ main.cpp -o main && main"`,
+            };
+            const termCmd = terminalCmds[language];
+            if (termCmd) {
+                console.log(chalk_1.default.bold.yellow('  Opening interactive terminal...'));
+                (0, child_process_1.exec)(termCmd, { cwd: projectPath });
+            }
         }
         console.log(chalk_1.default.bold('\n  Get started:'));
         console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan(`cd ${name}`));
         console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan('code .') + chalk_1.default.gray(' (or your favorite editor)'));
         console.log();
+        return projectPath;
     }
     catch (error) {
         spinner.fail(chalk_1.default.red('Error: ' + error.message));
+        return projectPath;
     }
 }
 program
@@ -564,6 +580,14 @@ shortcuts.forEach(s => {
     });
 });
 async function startWizard(initialName) {
+    // ── Wizard Steps ────────────────────────────────────────────────────────
+    // 1 → What are you building? (Web Dev / CP)
+    // 2 → Select Language
+    // 3 → Project Name
+    // 4 → [Web Dev only] Create GitHub repo? (Yes/No)
+    // 5 → [Web Dev + GitHub=Yes] Enter GitHub token
+    // 6 → [Web Dev only] Run locally OR Deploy to Vercel?
+    // ────────────────────────────────────────────────────────────────────────
     let step = 1;
     let name = initialName;
     let category;
@@ -573,123 +597,213 @@ async function startWizard(initialName) {
     const BACK = '< Back';
     const CAT_WEB = '🌐 Web Development (React, TS, HTML/CSS)';
     const CAT_CP = '🏆 Competitive Programming (C++, Java, Python)';
-    while (step > 0 && step <= 4) {
+    while (step > 0 && step <= 6) {
+        // ── STEP 1: Category ────────────────────────────────────────────────
         if (step === 1) {
-            if (!name) {
-                const ans = await inquirer_1.default.prompt([{
-                        type: 'input',
-                        name: 'name',
-                        message: 'Project Name:',
-                        default: 'my-project'
-                    }]);
-                name = ans.name;
-            }
-            step++;
-        }
-        else if (step === 2) {
-            // Category Selection
             const ans = await inquirer_1.default.prompt([{
                     type: 'list',
                     name: 'category',
                     message: 'What are you building?',
-                    choices: [CAT_WEB, CAT_CP, new inquirer_1.default.Separator(), BACK]
+                    choices: [CAT_WEB, CAT_CP]
                 }]);
-            if (ans.category === BACK) {
-                name = undefined;
+            category = ans.category;
+            step++;
+            // ── STEP 2: Language ────────────────────────────────────────────────
+        }
+        else if (step === 2) {
+            const langChoices = category === CAT_WEB
+                ? [types_1.ProjectLanguage.React, types_1.ProjectLanguage.TypeScript, types_1.ProjectLanguage.HTMLCSS, new inquirer_1.default.Separator(), BACK]
+                : [types_1.ProjectLanguage.CPP, types_1.ProjectLanguage.Java, types_1.ProjectLanguage.Python, new inquirer_1.default.Separator(), BACK];
+            const langAns = await inquirer_1.default.prompt([{
+                    type: 'list',
+                    name: 'language',
+                    message: 'Select Language:',
+                    choices: langChoices
+                }]);
+            if (langAns.language === BACK) {
                 step--;
             }
             else {
-                category = ans.category;
-                // Sub-selection for languages
-                const langChoices = category === CAT_WEB
-                    ? [types_1.ProjectLanguage.React, types_1.ProjectLanguage.TypeScript, types_1.ProjectLanguage.HTMLCSS, BACK]
-                    : [types_1.ProjectLanguage.CPP, types_1.ProjectLanguage.Java, types_1.ProjectLanguage.Python, BACK];
-                const langAns = await inquirer_1.default.prompt([{
-                        type: 'list',
-                        name: 'language',
-                        message: 'Select Language:',
-                        choices: langChoices
-                    }]);
-                if (langAns.language === BACK) {
-                    // Stay on step 2, loop back to category selection
-                    continue;
-                }
-                else {
-                    language = langAns.language;
-                    step++;
-                }
+                language = langAns.language;
+                step++;
             }
+            // ── STEP 3: Project Name ────────────────────────────────────────────
         }
         else if (step === 3) {
-            if (language === types_1.ProjectLanguage.React || language === types_1.ProjectLanguage.TypeScript) {
+            if (!name) {
+                const ans = await inquirer_1.default.prompt([{
+                        type: 'input',
+                        name: 'name',
+                        message: 'Project Name:',
+                        default: 'my-project',
+                        validate: (v) => v.trim().length > 0 || 'Name cannot be empty'
+                    }]);
+                name = ans.name.trim();
+            }
+            step++;
+            // ── STEP 4: GitHub repo? (Web Dev only) ────────────────────────────
+        }
+        else if (step === 4) {
+            if (category === CAT_WEB) {
                 const ans = await inquirer_1.default.prompt([{
                         type: 'list',
                         name: 'github',
-                        message: 'Do you want to add this to GitHub?',
-                        choices: ['Yes', 'No', BACK],
-                        default: 'Yes'
+                        message: 'Create a GitHub repository for this project?',
+                        choices: [
+                            { name: '✅ Yes — push to GitHub', value: 'yes' },
+                            { name: '❌ No — keep it local', value: 'no' },
+                            new inquirer_1.default.Separator(),
+                            { name: BACK, value: 'back' }
+                        ],
+                        default: 'yes'
                     }]);
-                if (ans.github === BACK) {
+                if (ans.github === 'back') {
+                    name = undefined;
                     step--;
                 }
                 else {
-                    github = ans.github === 'Yes';
+                    github = ans.github === 'yes';
                     step++;
                 }
             }
             else {
+                // CP projects skip straight to done
                 github = false;
-                step++;
+                step = 7; // jump past all web dev steps
             }
+            // ── STEP 5: GitHub Token ────────────────────────────────────────────
         }
-        else if (step === 4) {
+        else if (step === 5) {
             if (github) {
                 showGitHubTokenHelp();
-                const ans = await inquirer_1.default.prompt([
-                    {
+                console.log(chalk_1.default.gray('  💡 Tip: ') + chalk_1.default.white('Your token can be saved and reused for all future ZeroStart projects.'));
+                console.log(chalk_1.default.gray('  💡 Tip: ') + chalk_1.default.white('Scopes needed: ') + chalk_1.default.cyan('repo'));
+                console.log();
+                const tokenAns = await inquirer_1.default.prompt([{
                         type: 'password',
                         name: 'token',
-                        message: 'Enter your GitHub Personal Access Token (or type "back" to return):',
-                        validate: (input) => input.length > 0 || 'Token is required'
-                    }
-                ]);
-                if (ans.token.toLowerCase() === 'back') {
+                        message: 'Paste your GitHub Personal Access Token:',
+                        validate: (input) => {
+                            if (input.toLowerCase() === 'back')
+                                return true;
+                            if (input.trim().length < 10)
+                                return 'That doesn\'t look like a valid token';
+                            return true;
+                        }
+                    }]);
+                if (tokenAns.token.toLowerCase() === 'back') {
                     step--;
                 }
                 else {
-                    githubToken = ans.token;
-                    step++;
+                    // Validate token immediately
+                    const spinner = (0, ora_1.default)({ text: 'Validating token...', color: 'cyan' }).start();
+                    const svc = new GitHubServiceCLI_1.GitHubServiceCLI(tokenAns.token);
+                    const user = await svc.validateToken();
+                    if (user) {
+                        spinner.succeed(chalk_1.default.green(`Token valid! Logged in as @${user.login}`));
+                        githubToken = tokenAns.token;
+                        step++;
+                    }
+                    else {
+                        spinner.fail(chalk_1.default.red('Invalid token or no internet. Please try again.'));
+                        // Stay on step 5 to retry
+                    }
                 }
             }
             else {
+                step++; // No GitHub — skip token step
+            }
+            // ── STEP 6: Run locally or Deploy to Vercel? (Web Dev only) ────────
+        }
+        else if (step === 6) {
+            const deployAns = await inquirer_1.default.prompt([{
+                    type: 'list',
+                    name: 'action',
+                    message: 'What do you want to do next?',
+                    choices: [
+                        { name: '🚀 Deploy to Vercel (live URL in seconds)', value: 'vercel' },
+                        { name: '💻 Run locally first (I\'ll deploy later)', value: 'local' },
+                        new inquirer_1.default.Separator(),
+                        { name: BACK, value: 'back' }
+                    ],
+                    default: 'local'
+                }]);
+            if (deployAns.action === 'back') {
+                step--;
+            }
+            else {
+                // Store deploy choice and break out of loop
+                startWizard._deployChoice = deployAns.action;
                 step++;
             }
         }
     }
-    if (step > 4 && name && language) {
+    // ── Execute the project creation ─────────────────────────────────────────
+    if ((step > 6 || step === 7) && name && language) {
         let type = types_1.ProjectType.WebApp;
         if (language === types_1.ProjectLanguage.TypeScript)
             type = types_1.ProjectType.CLITool;
         if (category === CAT_CP)
             type = types_1.ProjectType.DSAPractice;
-        await initializeProject(name, language, type, {
+        const projectPath = await initializeProject(name, language, type, {
             isPublic: false,
             createRemote: !!githubToken,
-            githubToken: githubToken,
+            githubToken,
             authMethod: 'none'
         });
-        if (language === types_1.ProjectLanguage.HTMLCSS) {
-            const { deploy } = await inquirer_1.default.prompt([
-                { type: 'confirm', name: 'deploy', message: 'Do you want to deploy to Vercel right now?', default: true }
-            ]);
-            if (deploy) {
-                const vercelManager = new VercelManager_1.VercelManager();
-                const projectPath = path.join(process.cwd(), name);
-                if (await vercelManager.checkAuth()) {
-                    await vercelManager.deploy(projectPath, name);
-                }
+        // ── Post-creation: Web Dev deploy / local run ─────────────────────
+        const deployChoice = startWizard._deployChoice;
+        delete startWizard._deployChoice;
+        if (category === CAT_WEB && deployChoice === 'vercel') {
+            console.log();
+            console.log(chalk_1.default.bold.cyan('  🚀 Starting Vercel deployment...'));
+            console.log(chalk_1.default.gray('  This will be tagged as a demo deployment from ZeroStart CLI'));
+            console.log();
+            const vercelManager = new VercelManager_1.VercelManager();
+            const isInstalled = await vercelManager.checkVercelInstalled();
+            if (!isInstalled) {
+                const installSpinner = (0, ora_1.default)({ text: 'Installing Vercel CLI...', color: 'cyan' }).start();
+                await vercelManager.installGlobal();
+                installSpinner.succeed(chalk_1.default.green('Vercel CLI installed'));
+            }
+            const isAuthed = await vercelManager.checkAuth();
+            if (!isAuthed) {
+                console.log(chalk_1.default.yellow('  You need to log in to Vercel first. Opening login...'));
+                await vercelManager.login();
+            }
+            const deploySpinner = (0, ora_1.default)({ text: `Deploying ${name} to Vercel...`, color: 'cyan' }).start();
+            const url = await vercelManager.deploy(projectPath, name);
+            if (url) {
+                deploySpinner.succeed(chalk_1.default.green('Deployed successfully!'));
+                console.log();
+                console.log(chalk_1.default.bold('  🌐 Live URL: ') + chalk_1.default.cyan.underline(url));
+                console.log(chalk_1.default.gray('  (Demo deployment via ZeroStart CLI — upgrade in Vercel dashboard)'));
+                openUrl(url);
+            }
+            else {
+                deploySpinner.fail(chalk_1.default.red('Deployment failed. Run ' + chalk_1.default.white('vercel') + ' manually from project folder.'));
             }
         }
+        else if (category === CAT_WEB && deployChoice === 'local') {
+            console.log();
+            console.log(chalk_1.default.bold.cyan('  💻 Run your project locally:'));
+            if (language === types_1.ProjectLanguage.React || language === types_1.ProjectLanguage.TypeScript) {
+                console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan(`cd ${name}`));
+                console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan('npm install'));
+                console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan('npm run dev'));
+                console.log(chalk_1.default.gray('\n  Then open: ') + chalk_1.default.cyan('http://localhost:5173'));
+            }
+            else if (language === types_1.ProjectLanguage.HTMLCSS) {
+                console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan(`cd ${name}`));
+                console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan('Open index.html in your browser'));
+                console.log(chalk_1.default.gray('  - Or use: ') + chalk_1.default.cyan('npx serve .') + chalk_1.default.gray(' for a local server'));
+            }
+        }
+        console.log();
+        console.log(chalk_1.default.bold('  Get started:'));
+        console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan(`cd ${name}`));
+        console.log(chalk_1.default.gray('  - ') + chalk_1.default.cyan('code .') + chalk_1.default.gray(' (or your favorite editor)'));
+        console.log();
     }
 }
 // Main wizard

package/out/managers/GitManager.js

@@ -67,6 +67,23 @@ class GitManager {
             console.warn(`Git commit failed (might be empty): ${error.message}`);
         }
     }
+    /**
+     * Stage only specific files and commit them.
+     * Used for the first human-style commit (README, .gitignore etc.) before
+     * committing the rest of the project structure as a second commit.
+     */
+    async commitSelective(cwd, files, message) {
+        try {
+            for (const file of files) {
+                // git add is silent if the file doesn't exist — that's fine
+                await exec(`git add "${file}"`, { cwd }).catch(() => { });
+            }
+            await exec(`git commit -m "${message}" --allow-empty`, { cwd });
+        }
+        catch (error) {
+            console.warn(`Selective git commit failed: ${error.message}`);
+        }
+    }
     async addRemote(cwd, url) {
         try {
             await exec(`git remote add origin ${url}`, { cwd });

package/package.json

@@ -5,7 +5,7 @@
         "zerostart": "./out/cli.js"
     },
     "description": "Create and deploy a complete project with one command.",
-    "version": "0.0.38",
+    "version": "0.0.40",
     "engines": {
         "vscode": "^1.85.0"
     },
@@ -45,4 +45,4 @@
         "inquirer": "^9.3.8",
         "ora": "^5.4.1"
     }
-}
+}