apero-kit-cli 1.2.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apero-kit-cli",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "CLI tool to scaffold AI agent projects with pre-configured kits (Claude, OpenCode, Codex)",
   "type": "module",
   "bin": {

package/src/commands/init.js

@@ -15,30 +15,64 @@ import {
   promptCommands,
   promptIncludeRouter,
   promptIncludeHooks,
-  promptConfirm
+  promptConfirm,
+  promptExistingTarget
 } from '../utils/prompts.js';
 
 export async function initCommand(projectName, options) {
   console.log('');
 
-  // 1. Get project name
-  if (!projectName) {
-    projectName = await promptProjectName();
+  // 1. Get project name (support current directory with "." or empty)
+  let projectDir;
+  let isCurrentDir = false;
+
+  if (!projectName || projectName === '.') {
+    // Use current directory
+    projectDir = process.cwd();
+    projectName = '.';
+    isCurrentDir = true;
+    console.log(chalk.gray(`Initializing in current directory: ${projectDir}`));
+  } else {
+    projectDir = resolve(process.cwd(), projectName);
   }
 
-  const projectDir = resolve(process.cwd(), projectName);
+  // 2. Get target early to check existing
+  let target = options.target || 'claude';
+  if (!TARGETS[target]) {
+    console.log(chalk.yellow(`Unknown target "${target}", using "claude"`));
+    target = 'claude';
+  }
+
+  const targetDir = getTargetDir(projectDir, target);
+  let existingAction = null;
+
+  // Check if target directory (.claude, .opencode, etc.) already exists
+  if (fs.existsSync(targetDir) && !options.force) {
+    if (!process.stdin.isTTY) {
+      // Non-interactive mode - skip
+      console.log(chalk.yellow(`${TARGETS[target]} already exists. Use --force to override.`));
+      return;
+    }
+
+    existingAction = await promptExistingTarget(TARGETS[target]);
+
+    if (existingAction === 'skip') {
+      console.log(chalk.yellow('Skipped. No changes made.'));
+      return;
+    }
+  }
 
-  // Check if directory exists
-  if (fs.existsSync(projectDir) && !options.force) {
+  // For new project directory, check if it exists
+  if (!isCurrentDir && fs.existsSync(projectDir) && !options.force) {
     const files = fs.readdirSync(projectDir);
-    if (files.length > 0) {
+    if (files.length > 0 && !existingAction) {
       console.log(chalk.red(`Directory "${projectName}" already exists and is not empty.`));
       console.log(chalk.gray('Use --force to overwrite.'));
       return;
     }
   }
 
-  // 2. Resolve source
+  // 3. Resolve source
   const source = resolveSource(options.source);
   if (source.error) {
     console.log(chalk.red(`Error: ${source.error}`));
@@ -47,20 +81,18 @@ export async function initCommand(projectName, options) {
 
   console.log(chalk.gray(`Source: ${source.path}`));
 
-  // 3. Get kit
+  // 4. Get kit
   let kitName = options.kit;
-  if (!kitName) {
+  if (!kitName && !options.force) {
     kitName = await promptKit();
+  } else if (!kitName) {
+    kitName = 'engineer'; // Default kit for --force mode
   }
 
-  // 4. Get target
-  let target = options.target || 'claude';
-  if (!TARGETS[target]) {
-    console.log(chalk.yellow(`Unknown target "${target}", using "claude"`));
-    target = 'claude';
-  }
+  // 5. Set merge mode based on existing action
+  const mergeMode = existingAction === 'merge';
 
-  // 5. Prepare what to install
+  // 6. Prepare what to install
   let toInstall = {
     agents: [],
     commands: [],
@@ -134,56 +166,56 @@ export async function initCommand(projectName, options) {
     await fs.ensureDir(targetDir);
 
     // Copy agents
-    spinner.text = 'Copying agents...';
+    spinner.text = mergeMode ? 'Merging agents...' : 'Copying agents...';
     if (toInstall.agents === 'all') {
-      await copyAllOfType('agents', source.claudeDir, targetDir);
+      await copyAllOfType('agents', source.claudeDir, targetDir, mergeMode);
     } else if (toInstall.agents.length > 0) {
-      await copyItems(toInstall.agents, 'agents', source.claudeDir, targetDir);
+      await copyItems(toInstall.agents, 'agents', source.claudeDir, targetDir, mergeMode);
     }
 
     // Copy skills
-    spinner.text = 'Copying skills...';
+    spinner.text = mergeMode ? 'Merging skills...' : 'Copying skills...';
     if (toInstall.skills === 'all') {
-      await copyAllOfType('skills', source.claudeDir, targetDir);
+      await copyAllOfType('skills', source.claudeDir, targetDir, mergeMode);
     } else if (toInstall.skills.length > 0) {
-      await copyItems(toInstall.skills, 'skills', source.claudeDir, targetDir);
+      await copyItems(toInstall.skills, 'skills', source.claudeDir, targetDir, mergeMode);
     }
 
     // Copy commands
-    spinner.text = 'Copying commands...';
+    spinner.text = mergeMode ? 'Merging commands...' : 'Copying commands...';
     if (toInstall.commands === 'all') {
-      await copyAllOfType('commands', source.claudeDir, targetDir);
+      await copyAllOfType('commands', source.claudeDir, targetDir, mergeMode);
     } else if (toInstall.commands.length > 0) {
-      await copyItems(toInstall.commands, 'commands', source.claudeDir, targetDir);
+      await copyItems(toInstall.commands, 'commands', source.claudeDir, targetDir, mergeMode);
     }
 
     // Copy workflows
-    spinner.text = 'Copying workflows...';
+    spinner.text = mergeMode ? 'Merging workflows...' : 'Copying workflows...';
     if (toInstall.workflows === 'all') {
-      await copyAllOfType('workflows', source.claudeDir, targetDir);
+      await copyAllOfType('workflows', source.claudeDir, targetDir, mergeMode);
     } else if (toInstall.workflows && toInstall.workflows.length > 0) {
-      await copyItems(toInstall.workflows, 'workflows', source.claudeDir, targetDir);
+      await copyItems(toInstall.workflows, 'workflows', source.claudeDir, targetDir, mergeMode);
     }
 
     // Copy router
     if (toInstall.includeRouter) {
-      spinner.text = 'Copying router...';
-      await copyRouter(source.claudeDir, targetDir);
+      spinner.text = mergeMode ? 'Merging router...' : 'Copying router...';
+      await copyRouter(source.claudeDir, targetDir, mergeMode);
     }
 
     // Copy hooks
     if (toInstall.includeHooks) {
-      spinner.text = 'Copying hooks...';
-      await copyHooks(source.claudeDir, targetDir);
+      spinner.text = mergeMode ? 'Merging hooks...' : 'Copying hooks...';
+      await copyHooks(source.claudeDir, targetDir, mergeMode);
     }
 
     // Copy base files
-    spinner.text = 'Copying base files...';
-    await copyBaseFiles(source.claudeDir, targetDir);
+    spinner.text = mergeMode ? 'Merging base files...' : 'Copying base files...';
+    await copyBaseFiles(source.claudeDir, targetDir, mergeMode);
 
     // Copy AGENTS.md
     if (source.agentsMd) {
-      await copyAgentsMd(source.agentsMd, projectDir);
+      await copyAgentsMd(source.agentsMd, projectDir, mergeMode);
     }
 
     // Create state file
@@ -202,13 +234,18 @@ export async function initCommand(projectName, options) {
       }
     });
 
-    spinner.succeed(chalk.green('Project created successfully!'));
+    const actionWord = mergeMode ? 'merged' : (existingAction === 'override' ? 'overridden' : 'created');
+    spinner.succeed(chalk.green(`Project ${actionWord} successfully!`));
 
     // Print next steps
     console.log('');
-    console.log(chalk.cyan('Next steps:'));
-    console.log(chalk.white(`  cd ${projectName}`));
-    console.log(chalk.white('  # Start coding with Claude Code'));
+    if (!isCurrentDir) {
+      console.log(chalk.cyan('Next steps:'));
+      console.log(chalk.white(`  cd ${projectName}`));
+      console.log(chalk.white('  # Start coding with Claude Code'));
+    } else {
+      console.log(chalk.cyan('Ready to code with Claude Code!'));
+    }
     console.log('');
     console.log(chalk.gray('Useful commands:'));
     console.log(chalk.gray('  ak status     - Check file status'));

package/src/utils/copy.js

@@ -3,8 +3,9 @@ import { join, basename } from 'path';
 
 /**
  * Copy specific items from source to destination
+ * @param {boolean} mergeMode - If true, skip existing files
  */
-export async function copyItems(items, type, sourceDir, destDir) {
+export async function copyItems(items, type, sourceDir, destDir, mergeMode = false) {
   const typeDir = join(sourceDir, type);
   const destTypeDir = join(destDir, type);
 
@@ -37,14 +38,14 @@ export async function copyItems(items, type, sourceDir, destDir) {
       // Determine destination path
       const stat = fs.statSync(srcPath);
       if (stat.isDirectory()) {
-        await fs.copy(srcPath, join(destTypeDir, item), { overwrite: true });
+        await fs.copy(srcPath, join(destTypeDir, item), { overwrite: !mergeMode });
       } else {
         // Preserve directory structure for nested items
         const destPath = srcPath.endsWith('.md')
           ? join(destTypeDir, item + '.md')
           : join(destTypeDir, item);
         await fs.ensureDir(join(destTypeDir, item.split('/').slice(0, -1).join('/')));
-        await fs.copy(srcPath, destPath, { overwrite: true });
+        await fs.copy(srcPath, destPath, { overwrite: !mergeMode });
       }
 
       copied.push(item);
@@ -58,8 +59,9 @@ export async function copyItems(items, type, sourceDir, destDir) {
 
 /**
  * Copy all items of a type
+ * @param {boolean} mergeMode - If true, skip existing files
  */
-export async function copyAllOfType(type, sourceDir, destDir) {
+export async function copyAllOfType(type, sourceDir, destDir, mergeMode = false) {
   const typeDir = join(sourceDir, type);
   const destTypeDir = join(destDir, type);
 
@@ -68,7 +70,7 @@ export async function copyAllOfType(type, sourceDir, destDir) {
   }
 
   try {
-    await fs.copy(typeDir, destTypeDir, { overwrite: true });
+    await fs.copy(typeDir, destTypeDir, { overwrite: !mergeMode });
     return { success: true };
   } catch (err) {
     return { success: false, error: err.message };
@@ -77,8 +79,9 @@ export async function copyAllOfType(type, sourceDir, destDir) {
 
 /**
  * Copy router directory
+ * @param {boolean} mergeMode - If true, skip existing files
  */
-export async function copyRouter(sourceDir, destDir) {
+export async function copyRouter(sourceDir, destDir, mergeMode = false) {
   const routerDir = join(sourceDir, 'router');
 
   if (!fs.existsSync(routerDir)) {
@@ -86,7 +89,7 @@ export async function copyRouter(sourceDir, destDir) {
   }
 
   try {
-    await fs.copy(routerDir, join(destDir, 'router'), { overwrite: true });
+    await fs.copy(routerDir, join(destDir, 'router'), { overwrite: !mergeMode });
     return { success: true };
   } catch (err) {
     return { success: false, error: err.message };
@@ -95,8 +98,9 @@ export async function copyRouter(sourceDir, destDir) {
 
 /**
  * Copy hooks directory
+ * @param {boolean} mergeMode - If true, skip existing files
  */
-export async function copyHooks(sourceDir, destDir) {
+export async function copyHooks(sourceDir, destDir, mergeMode = false) {
   const hooksDir = join(sourceDir, 'hooks');
 
   if (!fs.existsSync(hooksDir)) {
@@ -104,7 +108,7 @@ export async function copyHooks(sourceDir, destDir) {
   }
 
   try {
-    await fs.copy(hooksDir, join(destDir, 'hooks'), { overwrite: true });
+    await fs.copy(hooksDir, join(destDir, 'hooks'), { overwrite: !mergeMode });
     return { success: true };
   } catch (err) {
     return { success: false, error: err.message };
@@ -123,15 +127,23 @@ export async function copyWorkflows(items, sourceDir, destDir) {
 
 /**
  * Copy base files (README, settings, etc.)
+ * @param {boolean} mergeMode - If true, skip existing files
  */
-export async function copyBaseFiles(sourceDir, destDir) {
+export async function copyBaseFiles(sourceDir, destDir, mergeMode = false) {
   const baseFiles = ['README.md', 'settings.json', '.env.example'];
   const copied = [];
 
   for (const file of baseFiles) {
     const srcPath = join(sourceDir, file);
+    const destPath = join(destDir, file);
+
+    // Skip if merge mode and file exists
+    if (mergeMode && fs.existsSync(destPath)) {
+      continue;
+    }
+
     if (fs.existsSync(srcPath)) {
-      await fs.copy(srcPath, join(destDir, file), { overwrite: true });
+      await fs.copy(srcPath, destPath, { overwrite: !mergeMode });
       copied.push(file);
     }
   }
@@ -141,13 +153,21 @@ export async function copyBaseFiles(sourceDir, destDir) {
 
 /**
  * Copy AGENTS.md to project root
+ * @param {boolean} mergeMode - If true, skip if file exists
  */
-export async function copyAgentsMd(agentsMdPath, projectDir) {
+export async function copyAgentsMd(agentsMdPath, projectDir, mergeMode = false) {
   if (!agentsMdPath || !fs.existsSync(agentsMdPath)) {
     return false;
   }
 
-  await fs.copy(agentsMdPath, join(projectDir, 'AGENTS.md'), { overwrite: true });
+  const destPath = join(projectDir, 'AGENTS.md');
+
+  // Skip if merge mode and file exists
+  if (mergeMode && fs.existsSync(destPath)) {
+    return false;
+  }
+
+  await fs.copy(agentsMdPath, destPath, { overwrite: !mergeMode });
   return true;
 }
 

package/src/utils/prompts.js

@@ -207,6 +207,25 @@ export async function promptConfirm(message, defaultValue = true) {
   return confirmed;
 }
 
+/**
+ * Prompt for existing target directory action
+ */
+export async function promptExistingTarget(targetPath) {
+  const { action } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'action',
+      message: `${targetPath} already exists. What do you want to do?`,
+      choices: [
+        { name: '🔄 Override - Replace all files', value: 'override' },
+        { name: '📦 Merge - Only add missing files', value: 'merge' },
+        { name: '⏭️  Skip - Do nothing', value: 'skip' }
+      ]
+    }
+  ]);
+  return action;
+}
+
 /**
  * Prompt for update confirmation with file list
  */