@kaitranntt/ccs 3.1.0 → 3.1.1

package/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

package/bin/ccs.js

@@ -262,11 +262,6 @@ async function main() {
     recovery.showRecoveryHints();
   }
 
-  // Run migration to shared structure (Phase 1: idempotent)
-  const SharedManager = require('./shared-manager');
-  const sharedManager = new SharedManager();
-  sharedManager.migrateToSharedStructure();
-
   // Detect profile
   const { profile, remainingArgs } = detectProfile(args);
 

package/bin/shared-manager.js

@@ -68,52 +68,100 @@ class SharedManager {
     }
   }
 
+  /**
+   * Check if migration is needed
+   * @returns {boolean}
+   * @private
+   */
+  _needsMigration() {
+    // If shared dir doesn't exist, migration needed
+    if (!fs.existsSync(this.sharedDir)) {
+      return true;
+    }
+
+    // Check if ALL shared directories are empty
+    const allEmpty = this.sharedDirs.every(dir => {
+      const dirPath = path.join(this.sharedDir, dir);
+      if (!fs.existsSync(dirPath)) return true;
+      try {
+        const files = fs.readdirSync(dirPath);
+        return files.length === 0;
+      } catch (err) {
+        return true; // If can't read, assume empty
+      }
+    });
+
+    return allEmpty;
+  }
+
+  /**
+   * Perform migration from ~/.claude/ to ~/.ccs/shared/
+   * @returns {object} { commands: N, skills: N, agents: N }
+   * @private
+   */
+  _performMigration() {
+    const stats = { commands: 0, skills: 0, agents: 0 };
+    const claudeDir = path.join(this.homeDir, '.claude');
+
+    if (!fs.existsSync(claudeDir)) {
+      return stats; // No content to migrate
+    }
+
+    // Migrate commands
+    const commandsPath = path.join(claudeDir, 'commands');
+    if (fs.existsSync(commandsPath)) {
+      const result = this._copyDirectory(commandsPath, path.join(this.sharedDir, 'commands'));
+      stats.commands = result.copied;
+    }
+
+    // Migrate skills
+    const skillsPath = path.join(claudeDir, 'skills');
+    if (fs.existsSync(skillsPath)) {
+      const result = this._copyDirectory(skillsPath, path.join(this.sharedDir, 'skills'));
+      stats.skills = result.copied;
+    }
+
+    // Migrate agents
+    const agentsPath = path.join(claudeDir, 'agents');
+    if (fs.existsSync(agentsPath)) {
+      const result = this._copyDirectory(agentsPath, path.join(this.sharedDir, 'agents'));
+      stats.agents = result.copied;
+    }
+
+    return stats;
+  }
+
   /**
    * Migrate existing instances to shared structure
    * Idempotent: Safe to run multiple times
    */
   migrateToSharedStructure() {
-    // Check if migration is needed (shared dirs exist but are empty)
-    const needsMigration = !fs.existsSync(this.sharedDir) ||
-      this.sharedDirs.every(dir => {
-        const dirPath = path.join(this.sharedDir, dir);
-        if (!fs.existsSync(dirPath)) return true;
-        try {
-          const files = fs.readdirSync(dirPath);
-          return files.length === 0; // Empty directory needs migration
-        } catch (err) {
-          return true; // If we can't read it, assume it needs migration
-        }
-      });
+    console.log('[i] Checking for content migration...');
 
-    if (!needsMigration) {
-      return; // Already migrated with content
+    // Check if migration is needed
+    if (!this._needsMigration()) {
+      console.log('[OK] Migration not needed (shared dirs have content)');
+      return;
     }
 
+    console.log('[i] Migrating ~/.claude/ content to ~/.ccs/shared/...');
+
     // Create shared directories
     this.ensureSharedDirectories();
 
-    // Copy from ~/.claude/ (actual Claude CLI directory)
-    const claudeDir = path.join(this.homeDir, '.claude');
-
-    if (fs.existsSync(claudeDir)) {
-      // Copy commands to shared (if exists)
-      const commandsPath = path.join(claudeDir, 'commands');
-      if (fs.existsSync(commandsPath)) {
-        this._copyDirectory(commandsPath, path.join(this.sharedDir, 'commands'));
-      }
-
-      // Copy skills to shared (if exists)
-      const skillsPath = path.join(claudeDir, 'skills');
-      if (fs.existsSync(skillsPath)) {
-        this._copyDirectory(skillsPath, path.join(this.sharedDir, 'skills'));
-      }
-
-      // Copy agents to shared (if exists)
-      const agentsPath = path.join(claudeDir, 'agents');
-      if (fs.existsSync(agentsPath)) {
-        this._copyDirectory(agentsPath, path.join(this.sharedDir, 'agents'));
-      }
+    // Perform migration
+    const stats = this._performMigration();
+
+    // Show results
+    const total = stats.commands + stats.skills + stats.agents;
+    if (total === 0) {
+      console.log('[OK] No content to migrate (empty ~/.claude/)');
+    } else {
+      const parts = [];
+      if (stats.commands > 0) parts.push(`${stats.commands} commands`);
+      if (stats.skills > 0) parts.push(`${stats.skills} skills`);
+      if (stats.agents > 0) parts.push(`${stats.agents} agents`);
+      console.log(`[OK] Migrated ${parts.join(', ')}`);
     }
 
     // Update all instances to use symlinks
@@ -127,19 +175,18 @@ class SharedManager {
         }
       }
     }
-
-    console.log('[OK] Migrated to shared structure');
   }
 
   /**
-   * Copy directory recursively (fallback for Windows)
+   * Copy directory recursively (SAFE: preserves existing files)
    * @param {string} src - Source directory
    * @param {string} dest - Destination directory
+   * @returns {object} { copied: N, skipped: N }
    * @private
    */
   _copyDirectory(src, dest) {
     if (!fs.existsSync(src)) {
-      return;
+      return { copied: 0, skipped: 0 };
     }
 
     if (!fs.existsSync(dest)) {
@@ -147,17 +194,30 @@ class SharedManager {
     }
 
     const entries = fs.readdirSync(src, { withFileTypes: true });
+    let copied = 0;
+    let skipped = 0;
 
     for (const entry of entries) {
       const srcPath = path.join(src, entry.name);
       const destPath = path.join(dest, entry.name);
 
+      // SAFETY: Skip if destination exists (preserve user modifications)
+      if (fs.existsSync(destPath)) {
+        skipped++;
+        continue;
+      }
+
       if (entry.isDirectory()) {
-        this._copyDirectory(srcPath, destPath);
+        const stats = this._copyDirectory(srcPath, destPath);
+        copied += stats.copied;
+        skipped += stats.skipped;
       } else {
         fs.copyFileSync(srcPath, destPath);
+        copied++;
       }
     }
+
+    return { copied, skipped };
   }
 }
 

package/lib/ccs

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Version (updated by scripts/bump-version.sh)
-CCS_VERSION="3.1.0"
+CCS_VERSION="3.1.1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 readonly CONFIG_FILE="${CCS_CONFIG:-$HOME/.ccs/config.json}"
 readonly PROFILES_JSON="$HOME/.ccs/profiles.json"
@@ -1010,9 +1010,6 @@ auto_recover || {
   exit 1
 }
 
-# Run migration to shared structure (Phase 1: idempotent)
-migrate_to_shared_structure
-
 # Smart profile detection: if first arg starts with '-', it's a flag not a profile
 if [[ $# -eq 0 ]] || [[ "${1}" =~ ^- ]]; then
   # No args or first arg is a flag → use default profile

package/lib/ccs.ps1

@@ -12,7 +12,7 @@ param(
 $ErrorActionPreference = "Stop"
 
 # Version (updated by scripts/bump-version.sh)
-$CcsVersion = "3.1.0"
+$CcsVersion = "3.1.1"
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $ConfigFile = if ($env:CCS_CONFIG) { $env:CCS_CONFIG } else { "$env:USERPROFILE\.ccs\config.json" }
 $ProfilesJson = "$env:USERPROFILE\.ccs\profiles.json"
@@ -1000,9 +1000,6 @@ if (-not (Invoke-AutoRecovery)) {
     exit 1
 }
 
-# Run migration to shared structure (Phase 1: idempotent)
-Migrate-SharedStructure
-
 # Smart profile detection: if first arg starts with '-', it's a flag not a profile
 if ($RemainingArgs.Count -eq 0 -or $RemainingArgs[0] -match '^-') {
     # No args or first arg is a flag → use default profile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6",
   "keywords": [
     "cli",

package/scripts/postinstall.js

@@ -89,6 +89,18 @@ function createConfigFiles() {
       }
     }
 
+    // Migrate from ~/.claude/ to ~/.ccs/shared/ (v3.1.1)
+    console.log('');
+    try {
+      const SharedManager = require('../bin/shared-manager');
+      const sharedManager = new SharedManager();
+      sharedManager.migrateToSharedStructure();
+    } catch (err) {
+      console.warn('[!] Migration warning:', err.message);
+      console.warn('    You can manually copy files from ~/.claude/ to ~/.ccs/shared/');
+    }
+    console.log('');
+
     // Create config.json if missing
     const configPath = path.join(ccsDir, 'config.json');
     if (!fs.existsSync(configPath)) {