@playcraft/cli 0.0.55 → 0.0.56

package/dist/commands/create.js

@@ -21,6 +21,43 @@ function toPackageName(name) {
         .replace(/[^a-z0-9\-]/g, '')
         .replace(/^-+|-+$/g, '');
 }
+/** 检测目标目录的父目录是否在 Git 仓库内 */
+function isInsideGitWorktree(dir) {
+    try {
+        execSync('git rev-parse --is-inside-work-tree', {
+            cwd: dir,
+            stdio: 'pipe',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function gitBranchExists(cwd, branchName) {
+    try {
+        execSync(`git show-ref --verify --quiet "refs/heads/${branchName}"`, {
+            cwd,
+            stdio: 'pipe',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function getUniqueProjectBranchName(cwd, projectName) {
+    const baseName = `project/${toPackageName(path.basename(projectName))}`;
+    if (!gitBranchExists(cwd, baseName))
+        return baseName;
+    const suffixBase = Date.now().toString(36);
+    for (let i = 0; i < 100; i += 1) {
+        const candidate = `${baseName}-${suffixBase}${i === 0 ? '' : `-${i}`}`;
+        if (!gitBranchExists(cwd, candidate))
+            return candidate;
+    }
+    throw new Error(`无法生成唯一 Git 分支名: ${baseName}`);
+}
 /** 初始化 git 仓库并创建初始提交（供 Claude Code 子 agent worktree 隔离使用） */
 async function initGitRepository(targetDir) {
     const gitDir = path.join(targetDir, '.git');
@@ -46,6 +83,48 @@ async function initGitRepository(targetDir) {
         env: gitEnv,
     });
 }
+/**
+ * 在父 Git 仓库中为新项目创建独立 worktree 并初始化 orphan 分支。
+ *
+ * - 使用 --no-checkout 避免在 Windows / 大工程场景下复制父仓库文件
+ * - checkout --orphan 保证分支历史干净，不含父仓库的任何文件
+ * - 后续 add -A + commit 在 worktree 内天然安全
+ */
+async function initParentGitWorktree(targetDir, _projectName) {
+    const gitEnv = {
+        ...process.env,
+        GIT_AUTHOR_NAME: process.env.GIT_AUTHOR_NAME ?? 'PlayCraft',
+        GIT_AUTHOR_EMAIL: process.env.GIT_AUTHOR_EMAIL ?? 'playcraft@local',
+        GIT_COMMITTER_NAME: process.env.GIT_COMMITTER_NAME ?? 'PlayCraft',
+        GIT_COMMITTER_EMAIL: process.env.GIT_COMMITTER_EMAIL ?? 'playcraft@local',
+    };
+    const parentDir = path.dirname(targetDir);
+    // 零膨胀创建 worktree：不 checkout 任何文件
+    execSync(`git worktree add --no-checkout --detach "${targetDir}" HEAD`, {
+        cwd: parentDir,
+        stdio: 'pipe',
+        env: gitEnv,
+    });
+    // 创建无历史 orphan 分支
+    execSync('git checkout --orphan worktree-init', {
+        cwd: targetDir,
+        stdio: 'pipe',
+        env: gitEnv,
+    });
+    // checkout --orphan 不清空 index（保留 HEAD tree），需要手动清理
+    execSync('git rm --cached -r --ignore-unmatch .', {
+        cwd: targetDir,
+        stdio: 'pipe',
+        env: gitEnv,
+    });
+    // 清理 orphan checkout 遗留文件；-x 确保父仓库 ignored 产物不会混入新模板。
+    execSync('git clean -fdx', {
+        cwd: targetDir,
+        stdio: 'pipe',
+        env: gitEnv,
+    });
+}
+/** 任何层级都要排除的通用产物（文件名 / 目录名） */
 const TEMPLATE_COPY_EXCLUDES = new Set([
     '.DS_Store',
     '.git',
@@ -53,35 +132,42 @@ const TEMPLATE_COPY_EXCLUDES = new Set([
     'dist',
     'package-lock.json',
     'playable.ui.profile.yaml',
-    'playground',
-    'recordings',
-    'validate',
 ]);
-function shouldCopyTemplateEntry(srcPath, entryName) {
-    if (srcPath.includes(`${path.sep}skills${path.sep}playable-focus${path.sep}templates${path.sep}`)) {
-        return true;
-    }
+/**
+ * 仅作为「模板根直接子目录」时才排除的运行时产物目录。
+ * 这些名字也会出现在 skills 内部（如 skills/playable-focus/templates/playground），
+ * 故只在顶层排除，避免误伤 skills 的模板素材（否则 bootstrap-playground.mjs 会因找不到
+ * registry.template.json 而 ENOENT 退出）。
+ */
+const TEMPLATE_ROOTLEVEL_EXCLUDES = new Set(['playground', 'recordings', 'validate']);
+function shouldCopyTemplateEntry(srcPath, entryName, templateRoot) {
     if (TEMPLATE_COPY_EXCLUDES.has(entryName))
         return false;
+    if (TEMPLATE_ROOTLEVEL_EXCLUDES.has(entryName) && path.dirname(srcPath) === templateRoot) {
+        return false;
+    }
     if (srcPath.includes(`${path.sep}ta-workspace${path.sep}logs${path.sep}`))
         return entryName === '.gitkeep';
     if (srcPath.includes(`${path.sep}ta-workspace${path.sep}tmp${path.sep}`))
         return entryName === '.gitkeep';
-    if (srcPath.includes(`${path.sep}focus-lab${path.sep}`))
+    // 顶层 focus-lab/ 是运行时 lab 目录，只保留 .gitkeep 占位；但 skills 内部的同名目录
+    // （如 skills/playable-focus/templates/focus-lab）是模板素材，需正常复制，故限定在模板根之下。
+    const toplevelFocusLabPrefix = path.join(templateRoot, 'focus-lab') + path.sep;
+    if (srcPath.startsWith(toplevelFocusLabPrefix))
         return entryName === '.gitkeep';
     return true;
 }
 /** 递归复制目录，跳过模板运行时产物 */
-async function copyDir(src, dest) {
+async function copyDir(src, dest, templateRoot) {
     await fs.mkdir(dest, { recursive: true });
     const entries = await fs.readdir(src, { withFileTypes: true });
     for (const entry of entries) {
         const srcPath = path.join(src, entry.name);
-        if (!shouldCopyTemplateEntry(srcPath, entry.name))
+        if (!shouldCopyTemplateEntry(srcPath, entry.name, templateRoot))
             continue;
         const destPath = path.join(dest, entry.name);
         if (entry.isDirectory()) {
-            await copyDir(srcPath, destPath);
+            await copyDir(srcPath, destPath, templateRoot);
         }
         else {
             await fs.copyFile(srcPath, destPath);
@@ -861,7 +947,12 @@ async function setupPlatformSkillLinks(targetDir, cliCommandsDir) {
 }
 async function runEnsureProject(targetDir) {
     const ensureScript = path.join(targetDir, 'skills', '_shared', 'scripts', 'ensure-project.mjs');
-    await fs.access(ensureScript);
+    try {
+        await fs.access(ensureScript);
+    }
+    catch {
+        return { warnings: ['ensure-project script not found; skipped workflow bootstrap'] };
+    }
     const output = execFileSync(process.execPath, [ensureScript, `--root=${targetDir}`, '--no-install', '--json'], {
         cwd: targetDir,
         encoding: 'utf8',
@@ -874,6 +965,31 @@ async function runEnsureProject(targetDir) {
         return { warnings: ['ensure-project completed but returned non-JSON (JavaScript Object Notation, JavaScript 对象表示法) output'] };
     }
 }
+async function runNpmInstall(targetDir) {
+    execSync('npm install', {
+        cwd: targetDir,
+        stdio: 'pipe',
+        encoding: 'utf8',
+    });
+}
+async function runHarnessSmoke(targetDir) {
+    const smokeScript = path.join(targetDir, 'skills', '_shared', 'scripts', 'harness-smoke.mjs');
+    try {
+        await fs.access(smokeScript);
+    }
+    catch {
+        return {
+            ok: true,
+            checks: [{ name: 'harness:smoke', status: 'skip', message: 'harness-smoke script not found' }],
+        };
+    }
+    const output = execFileSync(process.execPath, [smokeScript, `--root=${targetDir}`, '--json'], {
+        cwd: targetDir,
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return JSON.parse(output);
+}
 async function patchPlayablePackageJson(targetDir, name) {
     const pkgPath = path.join(targetDir, 'package.json');
     const pkg = JSON.parse(await fs.readFile(pkgPath, 'utf8'));
@@ -911,6 +1027,17 @@ async function initializeAgentProject(targetDir) {
     catch {
         // settings.local.json 不存在或解析失败，跳过
     }
+    const installSpinner = ora('安装项目依赖...').start();
+    try {
+        await runNpmInstall(targetDir);
+        installSpinner.succeed('项目依赖安装完成');
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        installSpinner.fail(`项目依赖安装失败: ${message}`);
+        console.error(pc.dim('  提示: 请检查网络连接和 Node.js 版本（需 >= 20）'));
+        process.exit(1);
+    }
     const ensureSpinner = ora('初始化项目工作流...').start();
     try {
         const ensureResult = await runEnsureProject(targetDir);
@@ -921,17 +1048,28 @@ async function initializeAgentProject(targetDir) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
+        const stderr = error.stderr?.trimEnd();
+        const stdout = error.stdout?.trimEnd();
         ensureSpinner.fail(`项目工作流初始化失败: ${message}`);
+        if (stderr)
+            console.error(pc.red(`  ${stderr}`));
+        if (stdout)
+            console.error(pc.dim(`  ${stdout}`));
         process.exit(1);
     }
 }
-function printCreateNextSteps(template, _targetDir, name, here) {
+function printCreateNextSteps(template, _targetDir, name, here, worktree) {
     console.log();
+    if (worktree) {
+        console.log(pc.dim('提示：本项目为 Git worktree，分支已独立提交。'));
+        console.log(pc.dim(`       完成后合并到主仓库（合并后文件在 experiments/${name}/ 下，保留完整提交历史）：`));
+        console.log(`  ${pc.cyan(`git rm --cached -r experiments/${name}/ 2>/dev/null; git read-tree --prefix=experiments/${name}/ ${worktree.projectBranchName}; T=$(git write-tree); C=$(echo "merge: ${name}" | git commit-tree $T -p HEAD -p ${worktree.projectBranchName}); git merge --ff-only $C; git checkout HEAD -- experiments/${name}/`)}`);
+        console.log();
+    }
     console.log(pc.dim('下一步：'));
     if (!here) {
         console.log(`  ${pc.cyan(`cd ${name}`)}`);
     }
-    console.log(`  ${pc.cyan('npm install')}`);
     if (template.kind === 'agent') {
         console.log(`  ${pc.cyan('playcraft skills init-atom-tree --intent "<your game keywords>"')}`);
         console.log(`  ${pc.cyan('playcraft remix init-template --from-atom-tree')}`);
@@ -944,6 +1082,7 @@ function printCreateNextSteps(template, _targetDir, name, here) {
         console.log(`  ${pc.cyan('playcraft config set --key projectId --value <真实项目ID>')}`);
     }
     else {
+        console.log(`  ${pc.cyan('npm install')}`);
         console.log(`  ${pc.cyan('npm run dev')}`);
         console.log();
         console.log(pc.dim('构建渠道包：'));
@@ -968,15 +1107,15 @@ export function resolveCreatePaths(baseDir, projectName, here) {
     }
     return { targetDir: path.join(resolvedBase, name), name };
 }
-/** Returns false when the user declines overwrite; exits the process. */
+/** Returns whether the target directory should be removed before worktree creation. */
 export async function confirmTargetDirOverwrite(targetDir, displayLabel, force) {
     try {
         const stat = await fs.stat(targetDir);
         if (!stat.isDirectory())
-            return true;
+            return false;
         const entries = await fs.readdir(targetDir);
         if (entries.length === 0)
-            return true;
+            return false;
         if (force)
             return true;
         const { overwrite } = await inquirer.prompt([
@@ -994,7 +1133,7 @@ export async function confirmTargetDirOverwrite(targetDir, displayLabel, force)
         return true;
     }
     catch {
-        return true;
+        return false;
     }
 }
 export async function createCommand(projectName, options) {
@@ -1011,73 +1150,106 @@ export async function createCommand(projectName, options) {
     const baseDir = options.dir ? path.resolve(options.dir) : process.cwd();
     const here = options.here ?? false;
     const force = options.force ?? false;
+    const nonInteractive = options.nonInteractive === true;
     const isAgentTemplate = template.kind === 'agent';
-    const answers = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'projectName',
-            message: '项目目录名:',
-            default: projectName ?? (here ? path.basename(baseDir) : undefined),
-            when: !projectName && !here,
-            validate: (input) => {
-                if (!input.trim())
-                    return '项目名称不能为空';
-                if (/[/\\:*?"<>|]/.test(input))
-                    return '项目名称不能包含特殊字符';
-                return true;
-            },
-        },
-        {
-            type: 'input',
-            name: 'port',
-            message: '本地 Agent 端口:',
-            default: '2468',
-            when: isAgentTemplate,
-            validate: (input) => {
-                const port = parseInt(input, 10);
-                if (isNaN(port) || port < 1 || port > 65535) {
-                    return '端口号必须是 1-65535 之间的数字';
-                }
-                return true;
-            },
-        },
-        {
-            type: 'input',
-            name: 'skillsDir',
-            message: 'Skills 目录路径 (可选，供 playcraft skills 命令使用，直接回车跳过):',
-            default: '',
-            when: isAgentTemplate,
-            validate: async (input) => {
-                if (!input.trim())
+    if (nonInteractive && !projectName && !here) {
+        console.error(pc.red('非交互模式需要指定项目名称: playcraft create <project-name> --non-interactive'));
+        process.exit(1);
+    }
+    let name;
+    let port;
+    let skillsDir;
+    if (nonInteractive) {
+        ({ name } = resolveCreatePaths(baseDir, projectName, here));
+        port = isAgentTemplate ? parseInt(options.port || '2468', 10) : 0;
+        skillsDir = '';
+    }
+    else {
+        const answers = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'projectName',
+                message: '项目目录名:',
+                default: projectName ?? (here ? path.basename(baseDir) : undefined),
+                when: !projectName && !here,
+                validate: (input) => {
+                    if (!input.trim())
+                        return '项目名称不能为空';
+                    if (/[/\\:*?"<>|]/.test(input))
+                        return '项目名称不能包含特殊字符';
                     return true;
-                try {
-                    const stat = await fs.stat(path.resolve(input));
-                    if (!stat.isDirectory())
-                        return '路径不是一个目录';
+                },
+            },
+            {
+                type: 'input',
+                name: 'port',
+                message: '本地 Agent 端口:',
+                default: '2468',
+                when: isAgentTemplate,
+                validate: (input) => {
+                    const parsedPort = parseInt(input, 10);
+                    if (isNaN(parsedPort) || parsedPort < 1 || parsedPort > 65535) {
+                        return '端口号必须是 1-65535 之间的数字';
+                    }
                     return true;
-                }
-                catch {
-                    return '目录不存在，请检查路径';
-                }
+                },
             },
-        },
-        {
-            type: 'input',
-            name: 'token',
-            message: '认证令牌 (可选，可稍后通过 playcraft config set 更新):',
-            default: '',
-            when: isAgentTemplate,
-        },
-    ]);
-    const name = here
-        ? (projectName?.trim() || path.basename(baseDir) || 'project')
-        : (projectName || answers.projectName);
-    const port = isAgentTemplate ? parseInt(answers.port ?? '2468', 10) : 0;
-    const skillsDir = isAgentTemplate ? (answers.skillsDir?.trim() || '') : '';
+            {
+                type: 'input',
+                name: 'skillsDir',
+                message: 'Skills 目录路径 (可选，供 playcraft skills 命令使用，直接回车跳过):',
+                default: '',
+                when: isAgentTemplate,
+                validate: async (input) => {
+                    if (!input.trim())
+                        return true;
+                    try {
+                        const stat = await fs.stat(path.resolve(input));
+                        if (!stat.isDirectory())
+                            return '路径不是一个目录';
+                        return true;
+                    }
+                    catch {
+                        return '目录不存在，请检查路径';
+                    }
+                },
+            },
+            {
+                type: 'input',
+                name: 'token',
+                message: '认证令牌 (可选，可稍后通过 playcraft config set 更新):',
+                default: '',
+                when: isAgentTemplate,
+            },
+        ]);
+        name = here
+            ? (projectName?.trim() || path.basename(baseDir) || 'project')
+            : (projectName || answers.projectName);
+        port = isAgentTemplate ? parseInt(answers.port ?? '2468', 10) : 0;
+        skillsDir = isAgentTemplate ? (answers.skillsDir?.trim() || '') : '';
+    }
     const projectId = generateMockProjectId();
     const { targetDir } = resolveCreatePaths(baseDir, name, here);
     const overwriteLabel = here ? targetDir : name;
-    await confirmTargetDirOverwrite(targetDir, overwriteLabel, force);
+    let projectBranchName = `project/${toPackageName(path.basename(name))}`;
+    const shouldOverwrite = await confirmTargetDirOverwrite(targetDir, overwriteLabel, force);
+    let isWorktreeMode = isInsideGitWorktree(path.dirname(targetDir));
+    if (isWorktreeMode) {
+        const wtSpinner = ora('创建 Git worktree...').start();
+        try {
+            if (shouldOverwrite) {
+                await fs.rm(targetDir, { recursive: true, force: true });
+            }
+            await initParentGitWorktree(targetDir, name);
+            projectBranchName = getUniqueProjectBranchName(targetDir, name);
+            wtSpinner.succeed('Git worktree 创建完成');
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            wtSpinner.warn(`Git worktree 创建跳过: ${message}`);
+            isWorktreeMode = false;
+        }
+    }
     const spinner = ora(`复制项目模板 (${template.id})...`).start();
     try {
         const templateDir = resolveCreateTemplateDir(template.id);
@@ -1088,7 +1260,7 @@ export async function createCommand(projectName, options) {
             spinner.fail(`找不到项目模板目录: ${templateDir}`);
             process.exit(1);
         }
-        await copyDir(templateDir, targetDir);
+        await copyDir(templateDir, targetDir, templateDir);
         spinner.succeed(`项目模板复制完成 (${template.label})`);
         if (template.kind === 'playable') {
             await patchPlayablePackageJson(targetDir, name);
@@ -1096,28 +1268,70 @@ export async function createCommand(projectName, options) {
         else {
             await initializeAgentProject(targetDir);
         }
-        const gitSpinner = ora('初始化 Git 仓库...').start();
+        if (isAgentTemplate) {
+            const smokeSpinner = ora('Harness 自检...').start();
+            try {
+                const smokeResult = await runHarnessSmoke(targetDir);
+                if (smokeResult.ok) {
+                    smokeSpinner.succeed('Harness 自检通过');
+                }
+                else {
+                    smokeSpinner.warn('Harness 自检未通过（项目仍可用）');
+                    for (const check of smokeResult.checks) {
+                        if (check.status === 'fail') {
+                            console.log(pc.yellow(`  ✗ ${check.name}: ${check.message}`));
+                        }
+                    }
+                }
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                smokeSpinner.warn(`Harness 自检跳过: ${message}`);
+            }
+        }
+        const gitSpinner = ora(isWorktreeMode ? '提交项目分支...' : '初始化 Git 仓库...').start();
         try {
-            await initGitRepository(targetDir);
-            gitSpinner.succeed('Git 仓库初始化完成');
+            if (isWorktreeMode) {
+                execSync(`git branch -m "${projectBranchName}"`, {
+                    cwd: targetDir,
+                    stdio: 'pipe',
+                });
+                execSync('git add -A', {
+                    cwd: targetDir,
+                    stdio: 'pipe',
+                });
+                execSync('git commit -m "chore: initial commit from playcraft create"', {
+                    cwd: targetDir,
+                    stdio: 'pipe',
+                });
+                gitSpinner.succeed('项目分支提交完成');
+            }
+            else {
+                await initGitRepository(targetDir);
+                gitSpinner.succeed('Git 仓库初始化完成');
+            }
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             gitSpinner.warn(`Git 初始化跳过: ${message}`);
             console.log(pc.dim('  提示: 安装 git 后可在项目目录执行 git init && git add -A && git commit -m "initial"'));
         }
-        // 完成提示
         console.log(pc.green(`\n✅ 项目创建完成！\n`));
         console.log(pc.bold('  目录:   ') + pc.cyan(targetDir));
         console.log(pc.bold('  模板:   ') + pc.cyan(template.id) + pc.dim(` (${template.label})`));
         if (isAgentTemplate) {
-            console.log(pc.bold('  项目ID: ') + pc.cyan(projectId) + pc.dim('  （临时占位 ID，正式接入 PlayCraft 后请更新）'));
+            console.log(pc.bold('  项目ID: ') +
+                pc.cyan(projectId) +
+                pc.dim('  （临时占位 ID，正式接入 PlayCraft 后请更新）'));
             console.log(pc.bold('  端口:   ') + pc.cyan(String(port)));
+            if (isWorktreeMode) {
+                console.log(pc.bold('  分支:   ') + pc.cyan(projectBranchName));
+            }
             if (skillsDir) {
                 console.log(pc.bold('  Skills: ') + pc.cyan(skillsDir));
             }
         }
-        printCreateNextSteps(template, targetDir, name, here);
+        printCreateNextSteps(template, targetDir, name, here, isWorktreeMode ? { projectBranchName } : undefined);
     }
     catch (error) {
         spinner.fail('项目创建失败');