@champpaba/claude-agent-kit 1.1.1 → 1.4.1

package/lib/helpers.js

@@ -0,0 +1,108 @@
+/**
+ * Helpers - Shared utility functions for CLI commands
+ */
+
+const fs = require('fs-extra');
+const path = require('path');
+const readline = require('readline');
+const { execSync } = require('child_process');
+const chalk = require('chalk');
+
+/**
+ * Prompt user for yes/no question
+ * @param {string} question - Question to ask
+ * @returns {Promise<boolean>} - True if user answered yes
+ */
+async function promptUser(question) {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+
+  return new Promise((resolve) => {
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+    });
+  });
+}
+
+/**
+ * Merge template files into target directory
+ * - Overwrites files with same name
+ * - Keeps existing files that don't exist in template
+ * @param {string} templatePath - Source template directory
+ * @param {string} targetPath - Target directory
+ */
+async function mergeTemplateFiles(templatePath, targetPath) {
+  await fs.copy(templatePath, targetPath, {
+    overwrite: true,
+    errorOnExist: false
+  });
+}
+
+/**
+ * Get latest version from npm registry
+ * @param {string} packageName - Package name
+ * @returns {Promise<string|null>} - Latest version or null if failed
+ */
+async function getLatestVersion(packageName) {
+  try {
+    const result = execSync(`npm view ${packageName} version`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    });
+    return result.trim();
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * Get currently installed global package version
+ * @param {string} packageName - Package name
+ * @returns {string|null} - Current version or null if not installed
+ */
+function getCurrentVersion(packageName) {
+  try {
+    const result = execSync(`npm list -g ${packageName} --depth=0`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    });
+    const match = result.match(new RegExp(`${packageName}@([\\d.]+)`));
+    return match ? match[1] : null;
+  } catch (error) {
+    return null;
+  }
+}
+
+/**
+ * Install package globally
+ * @param {string} packageName - Package name
+ * @param {string} version - Version to install (default: latest)
+ * @returns {Promise<boolean>} - True if successful
+ */
+async function installGlobalPackage(packageName, version = 'latest') {
+  try {
+    console.log(chalk.gray(`\n📦 Installing ${packageName}@${version} globally...\n`));
+
+    execSync(`npm install -g ${packageName}@${version}`, {
+      encoding: 'utf-8',
+      stdio: 'inherit'
+    });
+
+    console.log(chalk.green(`\n✅ Package installed successfully!\n`));
+    return true;
+  } catch (error) {
+    console.error(chalk.red(`\n❌ Failed to install package: ${error.message}\n`));
+    return false;
+  }
+}
+
+module.exports = {
+  promptUser,
+  mergeTemplateFiles,
+  getLatestVersion,
+  getCurrentVersion,
+  installGlobalPackage
+};

package/lib/init.js

@@ -1,16 +1,17 @@
 /**
  * Init Command - Initialize Claude Agent Kit template
  *
- * This function copies the .claude/ template folder to the current project.
+ * This function merges the .claude/ template folder into the current project.
+ * - Overwrites files with same name
+ * - Keeps existing files that don't exist in template
  */
 
 const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
+const { promptUser, mergeTemplateFiles } = require('./helpers');
 
 module.exports = async function init(options = {}) {
-  const { force } = options;
-
   // Paths
   const templatePath = path.join(__dirname, '../.claude');
   const targetPath = path.join(process.cwd(), '.claude');
@@ -24,29 +25,33 @@ module.exports = async function init(options = {}) {
 
   // Check if .claude/ already exists
   if (fs.existsSync(targetPath)) {
-    if (!force) {
-      console.log(chalk.yellow('⚠️  .claude/ already exists in this project.'));
-      console.log(chalk.gray('   Use --force to overwrite:\n'));
-      console.log(chalk.cyan('   cak init --force\n'));
+    console.log(chalk.yellow('⚠️  .claude/ already exists in this project.'));
+    console.log(chalk.gray('   Existing files will be preserved, template files will be merged.\n'));
+
+    const shouldContinue = await promptUser(
+      chalk.cyan('❓ Merge with template files? (y/N): ')
+    );
+
+    if (!shouldContinue) {
+      console.log(chalk.gray('\n❌ Initialization cancelled.\n'));
       return;
     }
 
-    console.log(chalk.yellow('⚠️  Overwriting existing .claude/ folder...\n'));
-    await fs.remove(targetPath);
+    console.log(chalk.gray('\n📦 Merging template files...\n'));
   }
 
-  // Copy template
+  // Merge template files
   try {
-    await fs.copy(templatePath, targetPath);
+    await mergeTemplateFiles(templatePath, targetPath);
 
     console.log(chalk.green('✅ Successfully initialized Claude Agent Kit!\n'));
-    console.log(chalk.white('📁 Files copied to: ') + chalk.cyan(targetPath));
+    console.log(chalk.white('📁 Files merged to: ') + chalk.cyan(targetPath));
     console.log(chalk.white('\n📚 Next steps:\n'));
     console.log(chalk.gray('   1. Review the .claude/ folder'));
     console.log(chalk.gray('   2. Run: ') + chalk.cyan('/psetup') + chalk.gray(' (one-time project setup)'));
     console.log(chalk.gray('   3. Start using agents with Claude Code\n'));
 
   } catch (error) {
-    throw new Error(`Failed to copy template: ${error.message}`);
+    throw new Error(`Failed to merge template: ${error.message}`);
   }
 };

package/lib/update.js

@@ -1,20 +1,30 @@
 /**
  * Update Command - Update Claude Agent Kit template to latest version
  *
- * This function updates the .claude/ folder with the latest template files.
+ * This function:
+ * 1. Checks for new version in npm registry
+ * 2. Optionally updates the global package
+ * 3. Merges latest template files into .claude/
  */
 
 const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
+const pkg = require('../package.json');
+const {
+  promptUser,
+  mergeTemplateFiles,
+  getLatestVersion,
+  getCurrentVersion,
+  installGlobalPackage
+} = require('./helpers');
 
 module.exports = async function update(options = {}) {
-  const { backup } = options;
+  const packageName = pkg.name;
 
   // Paths
   const templatePath = path.join(__dirname, '../.claude');
   const targetPath = path.join(process.cwd(), '.claude');
-  const backupPath = path.join(process.cwd(), '.claude.backup');
 
   console.log(chalk.cyan('\n🤖 Claude Agent Kit - Updating...\n'));
 
@@ -26,46 +36,53 @@ module.exports = async function update(options = {}) {
     return;
   }
 
-  // Check if template exists
-  if (!fs.existsSync(templatePath)) {
-    throw new Error('Template folder not found. Please reinstall the package.');
-  }
+  // STEP 1: Check version
+  console.log(chalk.gray('🔍 Checking for updates...\n'));
+
+  const currentVersion = getCurrentVersion(packageName) || pkg.version;
+  const latestVersion = await getLatestVersion(packageName);
+
+  if (!latestVersion) {
+    console.log(chalk.yellow('⚠️  Unable to check npm registry. Continuing with local version.\n'));
+  } else if (currentVersion === latestVersion) {
+    console.log(chalk.green(`✅ Already on latest version (${latestVersion})\n`));
+  } else {
+    console.log(chalk.cyan(`📦 New version available: ${chalk.bold(latestVersion)} (current: ${currentVersion})\n`));
+
+    const shouldUpdatePackage = await promptUser(
+      chalk.cyan('❓ Update package globally first? (y/N): ')
+    );
 
-  // Create backup if requested
-  if (backup) {
-    console.log(chalk.gray('📦 Creating backup...\n'));
+    // STEP 2: Update package globally
+    if (shouldUpdatePackage) {
+      const success = await installGlobalPackage(packageName, latestVersion);
 
-    // Remove old backup if exists
-    if (fs.existsSync(backupPath)) {
-      await fs.remove(backupPath);
+      if (!success) {
+        console.log(chalk.yellow('⚠️  Package update failed. Continuing with current version.\n'));
+      }
+    } else {
+      console.log(chalk.gray('\n⏭️  Skipping package update. Using current version.\n'));
     }
+  }
 
-    // Copy current .claude/ to backup
-    await fs.copy(targetPath, backupPath);
-    console.log(chalk.green('✅ Backup created: ') + chalk.cyan('.claude.backup\n'));
+  // Check if template exists
+  if (!fs.existsSync(templatePath)) {
+    throw new Error('Template folder not found. Please reinstall the package.');
   }
 
-  // Update template
+  // STEP 3: Update files (merge mode)
+  console.log(chalk.gray('📦 Merging template files...\n'));
+
   try {
-    // Strategy: Overwrite all files from template
-    // User customizations in domain/ should be preserved if they don't conflict
-    await fs.copy(templatePath, targetPath, {
-      overwrite: true,
-      errorOnExist: false
-    });
+    await mergeTemplateFiles(templatePath, targetPath);
 
     console.log(chalk.green('✅ Successfully updated Claude Agent Kit!\n'));
     console.log(chalk.white('📁 Updated files in: ') + chalk.cyan(targetPath));
+    console.log(chalk.gray('   (Existing files preserved, template files merged)\n'));
 
-    if (backup) {
-      console.log(chalk.white('\n💾 Backup available at: ') + chalk.cyan(backupPath));
-      console.log(chalk.gray('   You can restore it if needed:\n'));
-      console.log(chalk.cyan('   rm -rf .claude && mv .claude.backup .claude\n'));
-    }
-
-    console.log(chalk.white('\n📚 What\'s new:\n'));
+    console.log(chalk.white('📚 What\'s new:\n'));
     console.log(chalk.gray('   Check CHANGELOG.md for latest changes'));
-    console.log(chalk.gray('   Or visit: ') + chalk.cyan('https://github.com/your-username/claude-agent-kit\n'));
+    console.log(chalk.gray('   Or visit: ') + chalk.cyan('https://github.com/ChampPABA/claude-multi-agent-template\n'));
 
   } catch (error) {
     throw new Error(`Failed to update template: ${error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@champpaba/claude-agent-kit",
-  "version": "1.1.1",
+  "version": "1.4.1",
   "description": "Universal multi-agent template for Claude Code - AI-assisted development with specialized agents",
   "main": "bin/cli.js",
   "bin": {