Merge pull request #78 from kaitranntt/dev

feat: unified config architecture and profile management UX improvements

Author: kaitranntt

README.md

@@ -120,10 +120,19 @@ ccs gemini --auth --add
 # Add with nickname for easy identification
 ccs gemini --auth --add --nickname work
 
-# List all accounts
+# Codex provider examples
+ccs codex --auth              # First account for Codex
+ccs codex --auth --add        # Add another Codex account
+ccs codex --auth --add --nickname work  # Named account
+
+# List all accounts (any provider)
+ccs gemini --accounts
+ccs codex --accounts
 ccs agy --accounts
 
 # Switch to a different account
+ccs gemini --use work
+ccs codex --use work
 ccs agy --use work
 ```
 

VERSION

@@ -1 +1 @@
-5.14.0
+5.14.0-dev.3

bun.lock

@@ -11,6 +11,7 @@
         "express": "^4.18.2",
         "get-port": "^7.0.0",
         "gradient-string": "^3.0.0",
+        "js-yaml": "^4.1.1",
         "listr2": "^9.0.5",
         "open": "^10.1.0",
         "ora": "^9.0.0",
@@ -24,6 +25,7 @@
         "@tailwindcss/vite": "^4.1.17",
         "@types/chokidar": "^2.1.7",
         "@types/express": "^4.17.21",
+        "@types/js-yaml": "^4.0.9",
         "@types/node": "^20.19.25",
         "@types/ws": "^8.5.10",
         "@typescript-eslint/eslint-plugin": "^8.48.0",
@@ -365,6 +367,8 @@
 
     "@types/http-errors": ["@types/[email protected]", "", {}, "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg=="],
 
+    "@types/js-yaml": ["@types/[email protected]", "", {}, "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg=="],
+
     "@types/json-schema": ["@types/[email protected]", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
 
     "@types/mime": ["@types/[email protected]", "", {}, "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "5.14.0",
+  "version": "5.14.0-dev.3",
   "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6",
   "keywords": [
     "cli",
@@ -87,6 +87,7 @@
     "express": "^4.18.2",
     "get-port": "^7.0.0",
     "gradient-string": "^3.0.0",
+    "js-yaml": "^4.1.1",
     "listr2": "^9.0.5",
     "open": "^10.1.0",
     "ora": "^9.0.0",
@@ -100,6 +101,7 @@
     "@tailwindcss/vite": "^4.1.17",
     "@types/chokidar": "^2.1.7",
     "@types/express": "^4.17.21",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.19.25",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^8.48.0",

src/auth/auth-commands.ts

@@ -6,6 +6,10 @@
  *
  * Login-per-profile model: Each profile is an isolated Claude instance.
  * Users login directly in each instance (no credential copying).
+ *
+ * Supports dual-mode configuration:
+ * - Unified YAML format (config.yaml) when CCS_UNIFIED_CONFIG=1 or config.yaml exists
+ * - Legacy JSON format (profiles.json) as fallback
  */
 
 import { spawn, ChildProcess } from 'child_process';
@@ -29,6 +33,8 @@ import {
 import { detectClaudeCli } from '../utils/claude-detector';
 import { InteractivePrompt } from '../utils/prompt';
 import packageJson from '../../package.json';
+import { hasUnifiedConfig } from '../config/unified-config-loader';
+import { isUnifiedConfigEnabled } from '../config/feature-flags';
 
 interface AuthCommandArgs {
   profileName?: string;
@@ -66,6 +72,13 @@ class AuthCommands {
     this.instanceMgr = new InstanceManager();
   }
 
+  /**
+   * Check if unified config mode is active
+   */
+  private isUnifiedMode(): boolean {
+    return hasUnifiedConfig() || isUnifiedConfigEnabled();
+  }
+
   /**
    * Show help for auth commands
    */
@@ -152,8 +165,10 @@ class AuthCommands {
       process.exit(1);
     }
 
-    // Check if profile already exists
-    if (!force && this.registry.hasProfile(profileName)) {
+    // Check if profile already exists (check both legacy and unified)
+    const existsLegacy = this.registry.hasProfile(profileName);
+    const existsUnified = this.registry.hasAccountUnified(profileName);
+    if (!force && (existsLegacy || existsUnified)) {
       console.log(fail(`Profile already exists: ${profileName}`));
       console.log(`    Use ${color('--force', 'command')} to overwrite`);
       process.exit(1);
@@ -164,15 +179,25 @@ class AuthCommands {
       console.log(info(`Creating profile: ${profileName}`));
       const instancePath = this.instanceMgr.ensureInstance(profileName);
 
-      // Create/update profile entry
-      if (this.registry.hasProfile(profileName)) {
-        this.registry.updateProfile(profileName, {
-          type: 'account',
-        });
+      // Create/update profile entry based on config mode
+      if (this.isUnifiedMode()) {
+        // Use unified config (config.yaml)
+        if (existsUnified) {
+          this.registry.touchAccountUnified(profileName);
+        } else {
+          this.registry.createAccountUnified(profileName);
+        }
       } else {
-        this.registry.createProfile(profileName, {
-          type: 'account',
-        });
+        // Use legacy profiles.json
+        if (existsLegacy) {
+          this.registry.updateProfile(profileName, {
+            type: 'account',
+          });
+        } else {
+          this.registry.createProfile(profileName, {
+            type: 'account',
+          });
+        }
       }
 
       console.log(info(`Instance directory: ${instancePath}`));
@@ -458,7 +483,11 @@ class AuthCommands {
       process.exit(1);
     }
 
-    if (!this.registry.hasProfile(profileName)) {
+    // Check existence in both legacy and unified
+    const existsLegacy = this.registry.hasProfile(profileName);
+    const existsUnified = this.registry.hasAccountUnified(profileName);
+
+    if (!existsLegacy && !existsUnified) {
       console.log(fail(`Profile not found: ${profileName}`));
       process.exit(1);
     }
@@ -501,8 +530,13 @@ class AuthCommands {
       // Delete instance
       this.instanceMgr.deleteInstance(profileName);
 
-      // Delete profile
-      this.registry.deleteProfile(profileName);
+      // Delete profile from appropriate config
+      if (this.isUnifiedMode() && existsUnified) {
+        this.registry.removeAccountUnified(profileName);
+      }
+      if (existsLegacy) {
+        this.registry.deleteProfile(profileName);
+      }
 
       console.log(ok(`Profile removed: ${profileName}`));
       console.log('');
@@ -527,7 +561,12 @@ class AuthCommands {
     }
 
     try {
-      this.registry.setDefaultProfile(profileName);
+      // Use unified or legacy based on config mode
+      if (this.isUnifiedMode()) {
+        this.registry.setDefaultUnified(profileName);
+      } else {
+        this.registry.setDefaultProfile(profileName);
+      }
 
       console.log(ok(`Default profile set: ${profileName}`));
       console.log('');