create-skybridge 0.0.0-dev.17fa8fd → 0.0.0-dev.180fd98

package/dist/index.js

@@ -1,371 +1,256 @@
+import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import * as prompts from "@clack/prompts";
-import spawn from "cross-spawn";
+import { downloadTemplate } from "giget";
 import mri from "mri";
-const OUTPUT_TAIL_LINES = 10;
-const DEFAULT_PROJECT_NAME = "skybridge-project";
-const PACKAGE_MANAGERS = ["bun", "deno", "npm", "pnpm", "yarn"];
-const TEMPLATES = ["demo", "blank"];
-const pkg = JSON.parse(fs.readFileSync(fileURLToPath(new URL("../package.json", import.meta.url)), "utf-8"));
-const version = pkg.version;
-const HELP_MESSAGE = `Usage: skybridge create [path] [options]
+const defaultProjectName = "skybridge-project";
+// prettier-ignore
+const helpMessage = `\
+Usage: create-skybridge [OPTION]... [DIRECTORY]
 
-⛰ Skybridge v${version} - the fullstack framework for building MCP Apps
-
-Arguments:
-  path           Where the project will be created. Prompted when omitted.
+Create a new Skybridge project by copying the starter template.
 
 Options:
-  --blank        scaffold a minimal project without demo tools and views
-  --overwrite    remove existing files if target directory is not empty
-  --pm <choice>  package manager to use (choices: ${PACKAGE_MANAGERS.join(", ")}. default to npm when none is provided or infered)
-  --skip-skills  skip installing coding agent skills
-  --start        start dev server
-  --yes          skip prompts and use default values for unprovided options
-  --help         display this help message
+  -h, --help              show this help message
+  --repo <uri>            use a git repository instead of the built-in template
+  --overwrite             remove existing files in target directory
+  --immediate             install dependencies and start development server
 
-Non-interactive usage:
-  Mandatory: path argument and --yes option
-  Example: skybridge create my-app --yes`;
-const isTTY = process.stdout.isTTY;
-const _spinner = prompts.spinner();
-const Spinner = {
-    start(msg) {
-        if (!isTTY) {
-            prompts.log.info(msg);
-        }
-        else {
-            _spinner.clear();
-            _spinner.start(msg);
-        }
-    },
-    stop(msg) {
-        if (!isTTY) {
-            prompts.log.success(msg);
-        }
-        else {
-            _spinner.stop(msg);
-        }
-    },
-    error(msg) {
-        if (!isTTY) {
-            prompts.log.error(msg);
-        }
-        else {
-            _spinner.error(msg);
-        }
-    },
-};
+Repository URI formats:
+  github:user/repo
+  gitlab:user/repo/subdirectory
+  bitbucket:user/repo#branch
+
+Examples:
+  create-skybridge my-app
+  create-skybridge my-app --repo github:alpic-ai/skybridge/examples/ecom-carousel
+  create-skybridge . --overwrite --immediate
+`;
 export async function init(args = process.argv.slice(2)) {
     const argv = mri(args, {
-        boolean: ["help", "blank", "overwrite", "skip-skills", "start", "yes"],
-        string: ["pm"],
+        boolean: ["help", "overwrite", "immediate"],
+        string: ["repo"],
         alias: { h: "help" },
     });
-    if (argv.help) {
-        console.log(HELP_MESSAGE);
+    const argTargetDir = argv._[0]
+        ? sanitizeTargetDir(String(argv._[0]))
+        : undefined;
+    const argRepo = argv.repo;
+    const argOverwrite = argv.overwrite;
+    const argImmediate = argv.immediate;
+    const help = argv.help;
+    if (help) {
+        console.log(helpMessage);
         return;
     }
-    const { yes } = argv;
-    let targetDir = argv._[0] ? sanitizeTargetDir(String(argv._[0])) : undefined;
-    if (yes && !targetDir) {
-        abort("The target directory is required in non-interactive mode.", "Example: skybridge create my-app --yes");
-    }
-    let pm = parsePackageManager(argv.pm || "");
-    if (argv.pm && !pm) {
-        abort(`Invalid --pm value "${argv.pm}". Expected one of: ${PACKAGE_MANAGERS.join(", ")}.`);
-    }
-    console.log(); // cosmetic line break
-    prompts.intro(`\x1b[1;36m⛰  Welcome to Skybridge v${version} \x1b[22m- the fullstack framework for building MCP Apps\x1b[0m`);
-    // 1. Target directory
+    const interactive = process.stdin.isTTY;
+    const cancel = () => prompts.cancel("Operation cancelled");
+    // 1. Get project name and target dir
+    let targetDir = argTargetDir;
     if (!targetDir) {
-        const choice = await prompts.text({
-            message: "Project directory:",
-            placeholder: DEFAULT_PROJECT_NAME,
-            defaultValue: DEFAULT_PROJECT_NAME,
-            validate: (value) => !value || sanitizeTargetDir(value).length > 0
-                ? undefined
-                : "Invalid project name",
-        });
-        if (prompts.isCancel(choice)) {
-            return cancel();
-        }
-        targetDir = sanitizeTargetDir(choice);
-    }
-    // 2. Existing-directory handling
-    if (fs.existsSync(targetDir) && !isEmpty(targetDir)) {
-        if (argv.overwrite) {
-            emptyDir(targetDir);
-        }
-        else if (yes) {
-            prompts.log.error(`Target directory "${targetDir}" is not empty. Use --overwrite to remove existing files.`);
-            process.exit(1);
-        }
-        else {
-            const ok = await prompts.confirm({
-                message: `Target directory "${targetDir}" is not empty. Remove existing files?`,
-                initialValue: true,
+        if (interactive) {
+            const projectName = await prompts.text({
+                message: "Project name:",
+                defaultValue: defaultProjectName,
+                placeholder: defaultProjectName,
+                validate: (value) => {
+                    return !value || sanitizeTargetDir(value).length > 0
+                        ? undefined
+                        : "Invalid project name";
+                },
             });
-            if (prompts.isCancel(ok) || !ok) {
+            if (prompts.isCancel(projectName)) {
                 return cancel();
             }
-            Spinner.start(`Cleaning up ${targetDir}`);
-            emptyDir(targetDir);
-            Spinner.stop(`Cleaned up ${targetDir}`);
+            targetDir = sanitizeTargetDir(projectName);
+        }
+        else {
+            targetDir = defaultProjectName;
         }
     }
-    // 3. Template
-    let template;
-    if (argv.blank) {
-        template = "blank";
-    }
-    else if (yes) {
-        template = "demo";
-    }
-    else {
-        const choice = await prompts.select({
-            message: "Choose a template:",
-            options: [
-                {
-                    value: "demo",
-                    label: "demo",
-                    hint: "starter code with tools and UI",
-                },
-                {
-                    value: "blank",
-                    label: "blank",
-                    hint: "minimal boilerplate without tools",
-                },
-            ],
-            initialValue: "demo",
-        });
-        if (prompts.isCancel(choice)) {
-            return cancel();
+    // 2. Handle directory if exist and not empty
+    if (fs.existsSync(targetDir) && !isEmpty(targetDir)) {
+        let overwrite = argOverwrite ? "yes" : undefined;
+        if (!overwrite) {
+            if (interactive) {
+                const res = await prompts.select({
+                    message: (targetDir === "."
+                        ? "Current directory"
+                        : `Target directory "${targetDir}"`) +
+                        ` is not empty. Please choose how to proceed:`,
+                    options: [
+                        {
+                            label: "Cancel operation",
+                            value: "no",
+                        },
+                        {
+                            label: "Remove existing files and continue",
+                            value: "yes",
+                        },
+                    ],
+                });
+                if (prompts.isCancel(res)) {
+                    return cancel();
+                }
+                overwrite = res;
+            }
+            else {
+                overwrite = "no";
+            }
+        }
+        switch (overwrite) {
+            case "yes":
+                emptyDir(targetDir);
+                break;
+            case "no":
+                prompts.log.error("Target directory is not empty.");
+                process.exit(1);
         }
-        template = choice;
     }
-    // 4. Copy template
-    const root = path.resolve(targetDir);
-    Spinner.start(`Copying ${template} template`);
+    const root = path.join(process.cwd(), targetDir);
+    // 3. Download from repo or copy template
     try {
-        const templateDir = fileURLToPath(new URL(`../templates/${template}`, import.meta.url));
-        fs.cpSync(templateDir, root, {
-            recursive: true,
-            filter: (src) => [".npmrc"].every((file) => !src.endsWith(file)),
-        });
-        const gitignoreSource = path.join(root, "_gitignore");
-        if (fs.existsSync(gitignoreSource)) {
-            fs.renameSync(gitignoreSource, path.join(root, ".gitignore"));
+        if (argRepo) {
+            prompts.log.step(`Downloading ${argRepo}...`);
+            await downloadTemplate(argRepo, { dir: root });
+            prompts.log.success(`Project created in ${root}`);
+        }
+        else {
+            prompts.log.step(`Copying template...`);
+            const templateDir = fileURLToPath(new URL("../template", import.meta.url));
+            // Copy template to target directory
+            fs.cpSync(templateDir, root, {
+                recursive: true,
+                filter: (src) => [".npmrc"].every((file) => !src.endsWith(file)),
+            });
+            // Rename _gitignore to .gitignore
+            fs.renameSync(path.join(root, "_gitignore"), path.join(root, ".gitignore"));
+            prompts.log.success(`Project created in ${root}`);
         }
-        Spinner.stop(`Copied ${template} template`);
     }
     catch (error) {
-        Spinner.error("Failed to copy template");
-        abort(String(error));
+        prompts.log.error("Failed to create project from template");
+        console.error(error);
+        process.exit(1);
+    }
+    // Update project name in package.json
+    const pkgPath = path.join(root, "package.json");
+    if (!fs.existsSync(pkgPath)) {
+        prompts.log.error("No package.json found in project");
+        process.exit(1);
     }
-    // 5. Set package.json name to the project dir basename
     try {
-        const pkgPath = path.join(root, "package.json");
-        const projectPkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-        projectPkg.name = path.basename(root);
-        fs.writeFileSync(pkgPath, `${JSON.stringify(projectPkg, null, 2)}\n`);
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+        pkg.name = path.basename(root);
+        fs.writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}\n`);
     }
     catch (error) {
-        abort("Failed to update project name in package.json.", String(error));
-    }
-    // Async spawn wrapper so a spinner can keep animating during the subprocess
-    // (cross-spawn.sync would block the event loop). Captures stdout/stderr to
-    // `output` when stdio is "pipe", trimmed to the last OUTPUT_TAIL_LINES lines
-    // — install errors land at the tail, so we keep that and prefix with an
-    // ellipsis when content gets dropped.
-    function spawnAsync(command, args) {
-        return new Promise((resolve) => {
-            let raw = "";
-            const child = spawn(command, args, {
-                stdio: ["ignore", "pipe", "pipe"],
-                cwd: root,
-            });
-            child.stdout?.on("data", (chunk) => {
-                raw += chunk.toString();
-            });
-            child.stderr?.on("data", (chunk) => {
-                raw += chunk.toString();
-            });
-            const done = (status) => {
-                const tail = [];
-                for (const part of raw.split("\n").reverse()) {
-                    const line = part.trim();
-                    if (!line) {
-                        continue;
-                    }
-                    if (tail.length >= OUTPUT_TAIL_LINES) {
-                        tail.push(`… (truncated, showing last ${OUTPUT_TAIL_LINES} lines)`);
-                        break;
-                    }
-                    tail.push(line);
-                }
-                resolve({ status, output: tail.reverse().join("\n") });
-            };
-            child.on("close", done);
-            child.on("error", () => done(1));
-        });
+        prompts.log.error("Failed to update project name in package.json");
+        console.error(error);
+        process.exit(1);
     }
-    // 6. Skills install (single Y/n prompt)
-    let installSkills;
-    if (argv["skip-skills"]) {
-        installSkills = false;
-    }
-    else if (yes) {
-        installSkills = true;
-    }
-    else {
-        const choice = await prompts.confirm({
-            message: "Install coding agent skills? (recommended)",
+    const userAgent = process.env.npm_config_user_agent;
+    const pkgManager = userAgent?.split(" ")[0]?.split("/")[0] || "npm";
+    // 4. Ask about skills installation (installed by default)
+    let skill = true;
+    if (interactive) {
+        const skillsResult = await prompts.confirm({
+            message: "Install the coding agents skills? (recommended)",
             initialValue: true,
         });
-        if (prompts.isCancel(choice)) {
+        if (prompts.isCancel(skillsResult)) {
             return cancel();
         }
-        installSkills = choice;
+        skill = skillsResult;
     }
-    if (installSkills) {
-        Spinner.start("Installing coding agent skills");
-        const { status, output } = await spawnAsync("npx", [
-            "--yes",
-            "skills",
+    if (skill) {
+        run([
+            ...getPkgExecCmd(pkgManager, "skills"),
             "add",
             "alpic-ai/skybridge",
-            "--skill",
+            "-s",
             "chatgpt-app-builder",
-            "--agent",
-            "universal",
-            "claude-code",
-            "--copy", // something the symlink fails for some reason
-            "--yes",
-        ]);
-        // skills cli always returns 0 so we look for the success message
-        if (status === 0 && output.includes("Done!")) {
-            Spinner.stop(`Installed coding agent skills`);
-        }
-        else {
-            Spinner.error(`Failed to install coding agent skills:
-\x1b[2m${output}\x1b[0m`);
-            prompts.log.error("Try manually: `npx skills add alpic-ai/skybridge`.");
-        }
-    }
-    // 7. Package manager — autodetect, prompt only if detection fails (interactive)
-    if (!pm) {
-        pm = detectPackageManager() || "npm";
-    }
-    if (!yes) {
-        const choice = await prompts.select({
-            message: "Choose a package manager:",
-            options: PACKAGE_MANAGERS.map((value) => ({ value })),
-            initialValue: pm,
-        });
-        if (prompts.isCancel(choice)) {
-            return cancel();
-        }
-        pm = choice;
-    }
-    // 8. Always install dependencies
-    Spinner.start(`Installing dependencies with ${pm}`);
-    const { status, output } = await spawnAsync(pm, ["install"]);
-    if (status === 0) {
-        Spinner.stop(`Installed dependencies with ${pm}`);
-    }
-    else {
-        Spinner.error(`Dependency installation failed:
-\x1b[2m${output}\x1b[0m`);
-        abort(`Try manually: cd ${targetDir} && ${pm} install`);
-    }
-    // 9. Start dev server?
-    let start = false;
-    if (argv.start) {
-        start = true;
-    }
-    else if (!yes) {
-        const choice = await prompts.confirm({
-            message: "Start dev server now?",
-            initialValue: true,
-        });
-        if (prompts.isCancel(choice)) {
-            return cancel();
-        }
-        start = choice;
-    }
-    if (start) {
-        prompts.outro(`Starting dev server in ${targetDir}…`);
-        const devResult = spawn.sync(pm, scriptArgs(pm, "dev"), {
+            ...(interactive
+                ? []
+                : ["--yes", "-a", "universal", "-a", "claude-code"]),
+        ], {
             stdio: "inherit",
-            cwd: root,
+            cwd: targetDir,
         });
-        process.exit(devResult.status ?? 0);
     }
-    prompts.log.success("All set! Next steps:");
-    prompts.log.info(`Start:
-cd ${targetDir}
-${scriptCommand(pm, "dev")}`);
-    prompts.log.info(`Deploy:
-${scriptCommand(pm, "deploy")}`);
-    prompts.outro(`🛟  Need help?
-   Chat: https://discord.alpic.ai
-   Docs: https://docs.skybridge.tech`);
-}
-function cancel() {
-    prompts.cancel("Operation cancelled");
-    process.exit(0);
-}
-function abort(...lines) {
-    for (const line of lines) {
-        prompts.log.error(line);
+    // 5. Ask about immediate installation
+    let immediate = argImmediate;
+    if (immediate === undefined) {
+        if (interactive) {
+            const immediateResult = await prompts.confirm({
+                message: `Install with ${pkgManager} and start now?`,
+            });
+            if (prompts.isCancel(immediateResult)) {
+                return cancel();
+            }
+            immediate = immediateResult;
+        }
+        else {
+            immediate = false;
+        }
     }
-    prompts.outro("Aborted");
-    process.exit(1);
-}
-function parsePackageManager(value) {
-    switch (value) {
+    const installCmd = [pkgManager, "install"];
+    const runCmd = [pkgManager];
+    switch (pkgManager) {
+        case "yarn":
+        case "pnpm":
         case "bun":
-            return "bun";
+            break;
         case "deno":
-            return "deno";
-        case "npm":
-            return "npm";
-        case "pnpm":
-            return "pnpm";
-        case "yarn":
-            return "yarn";
+            runCmd.push("task");
+            break;
         default:
-            return undefined;
+            runCmd.push("run");
     }
-}
-function detectPackageManager() {
-    const userAgent = process.env.npm_config_user_agent;
-    if (!userAgent) {
-        return undefined;
+    runCmd.push("dev");
+    if (!immediate) {
+        prompts.outro(`Done! Next steps:
+  cd ${targetDir}
+  ${installCmd.join(" ")}
+  ${runCmd.join(" ")}
+`);
+        return;
     }
-    const name = userAgent.split(" ")[0]?.split("/")[0];
-    return parsePackageManager(name);
+    prompts.log.step(`Installing dependencies with ${pkgManager}...`);
+    run(installCmd, {
+        stdio: "inherit",
+        cwd: root,
+    });
+    prompts.log.step("Starting dev server...");
+    run(runCmd, {
+        stdio: "inherit",
+        cwd: root,
+    });
 }
-function scriptArgs(pm, script) {
-    switch (pm) {
-        case "yarn":
-        case "pnpm":
-        case "bun":
-            return [script];
-        case "deno":
-            return ["task", script];
-        case "npm":
-            return ["run", script];
+function run([command, ...args], options) {
+    const { status, error } = spawnSync(command, args, options);
+    if (status != null && status > 0) {
+        process.exit(status);
+    }
+    if (error) {
+        console.error(`\n${command} ${args.join(" ")} error!`);
+        console.error(error);
+        process.exit(1);
     }
-}
-function scriptCommand(pm, script) {
-    return [pm, ...scriptArgs(pm, script)].join(" ");
 }
 function sanitizeTargetDir(targetDir) {
-    return targetDir.trim().replace(/\/+$/g, "");
+    return (targetDir
+        .trim()
+        // Only keep alphanumeric, dash, underscore, dot, @, /
+        .replace(/[^a-zA-Z0-9\-_.@/]/g, "")
+        // Prevent path traversal
+        .replace(/\.\./g, "")
+        // Collapse multiple slashes
+        .replace(/\/+/g, "/")
+        // Remove leading/trailing slashes
+        .replace(/^\/+|\/+$/g, ""));
 }
 // Skip user's SPEC.md and IDE/agent preferences (.idea, .claude, etc.)
 function isSkippedEntry(entry) {
@@ -387,3 +272,17 @@ function emptyDir(dir) {
         fs.rmSync(path.join(dir, entry.name), { recursive: true, force: true });
     }
 }
+function getPkgExecCmd(pkgManager, cmd) {
+    switch (pkgManager) {
+        case "yarn":
+            return ["yarn", "dlx", cmd];
+        case "pnpm":
+            return ["pnpm", "dlx", cmd];
+        case "bun":
+            return ["bunx", cmd];
+        case "deno":
+            return ["deno", "run", "-A", `npm:${cmd}`];
+        default:
+            return ["npx", "--yes", cmd];
+    }
+}

package/dist/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/index.test.js

@@ -0,0 +1,35 @@
+import { randomBytes } from "node:crypto";
+import fs from "node:fs/promises";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { init } from "./index.js";
+describe("create-skybridge", () => {
+    let tempDirName;
+    beforeEach(() => {
+        tempDirName = `test-${randomBytes(2).toString("hex")}`;
+    });
+    afterEach(async () => {
+        await fs.rm(path.join(process.cwd(), tempDirName), {
+            recursive: true,
+            force: true,
+        });
+    });
+    it("should copy the template", { timeout: 10000 }, async () => {
+        const name = `../../${tempDirName}//project$`;
+        await init([name]);
+        await fs.access(path.join(process.cwd(), tempDirName, "project", ".gitignore"));
+        await fs.access(path.join(process.cwd(), tempDirName, "project", ".dockerignore"));
+        await fs.access(path.join(process.cwd(), tempDirName, "project", "Dockerfile"));
+        expect(fs.access(path.join(process.cwd(), tempDirName, "project", ".npmrc"))).rejects.toThrowError();
+    });
+    it("should download template from repo", { timeout: 10000 }, async () => {
+        const name = `../../${tempDirName}//project$`;
+        await init([
+            name,
+            "--repo",
+            "github:alpic-ai/skybridge/examples/ecom-carousel",
+        ]);
+        await fs.access(path.join(process.cwd(), tempDirName, "project", ".gitignore"));
+        expect(fs.access(path.join(process.cwd(), tempDirName, "project", ".npmrc"))).rejects.toThrowError();
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-skybridge",
-  "version": "0.0.0-dev.17fa8fd",
+  "version": "0.0.0-dev.180fd98",
   "type": "module",
   "license": "MIT",
   "author": "Alpic",
@@ -14,15 +14,14 @@
   "files": [
     "index.js",
     "dist",
-    "templates"
+    "template"
   ],
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "cross-spawn": "^7.0.6",
+    "giget": "^3.2.0",
     "mri": "^1.2.0"
   },
   "devDependencies": {
-    "@types/cross-spawn": "^6.0.6",
     "typescript": "^6.0.2",
     "vitest": "^4.1.4"
   },