@kaitranntt/ccs 2.4.4 → 2.4.6

package/bin/helpers.js

@@ -4,26 +4,44 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-// Color formatting (TTY-aware)
-const useColors = process.stderr.isTTY && !process.env.NO_COLOR;
-const colors = useColors ? {
-  red: '\x1b[0;31m',
-  yellow: '\x1b[1;33m',
-  cyan: '\x1b[0;36m',
-  green: '\x1b[0;32m',
-  bold: '\x1b[1m',
-  reset: '\x1b[0m'
-} : { red: '', yellow: '', cyan: '', green: '', bold: '', reset: '' };
+// TTY-aware color detection (matches lib/ccs bash logic)
+function getColors() {
+  const forcedColors = process.env.FORCE_COLOR;
+  const noColor = process.env.NO_COLOR;
+  const isTTY = process.stdout.isTTY === true;  // Must be explicitly true
 
-// Error formatting
-function showError(message) {
-  console.error('');
-  console.error(colors.red + colors.bold + '╔═════════════════════════════════════════════╗' + colors.reset);
-  console.error(colors.red + colors.bold + '║  ERROR                                      ║' + colors.reset);
-  console.error(colors.red + colors.bold + '╚═════════════════════════════════════════════╝' + colors.reset);
-  console.error('');
-  console.error(colors.red + message + colors.reset);
-  console.error('');
+  const useColors = forcedColors || (isTTY && !noColor);
+
+  if (useColors) {
+    return {
+      red: '\x1b[0;31m',
+      yellow: '\x1b[1;33m',
+      cyan: '\x1b[0;36m',
+      green: '\x1b[0;32m',
+      bold: '\x1b[1m',
+      reset: '\x1b[0m'
+    };
+  }
+
+  return { red: '', yellow: '', cyan: '', green: '', bold: '', reset: '' };
+}
+
+
+// Colors object (dynamic)
+const colors = getColors();
+
+// Helper: Apply color to text (returns plain text if colors disabled)
+function colored(text, colorName = 'reset') {
+  const currentColors = getColors();
+  const color = currentColors[colorName] || '';
+  return color ? `${color}${text}${currentColors.reset}` : text;
+}
+
+// Simple error formatting
+function error(message) {
+  console.error(`ERROR: ${message}`);
+  console.error('Try: npm install -g @kaitranntt/ccs --force');
+  process.exit(1);
 }
 
 // Path expansion (~ and env vars)
@@ -45,21 +63,10 @@ function expandPath(pathStr) {
   return path.normalize(pathStr);
 }
 
-// Validate profile name (alphanumeric, dash, underscore only)
-function validateProfileName(profile) {
-  return /^[a-zA-Z0-9_-]+$/.test(profile);
-}
-
-// Validate path safety (prevent injection)
-function isPathSafe(pathStr) {
-  // Allow: alphanumeric, path separators, space, dash, underscore, dot, colon, tilde
-  return !/[;|&<>`$*?\[\]'"()]/.test(pathStr);
-}
 
 module.exports = {
   colors,
-  showError,
-  expandPath,
-  validateProfileName,
-  isPathSafe
+  colored,
+  error,
+  expandPath
 };

package/lib/ccs

@@ -2,18 +2,23 @@
 set -euo pipefail
 
 # Version (updated by scripts/bump-version.sh)
-CCS_VERSION="2.4.4"
+CCS_VERSION="2.4.6"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+readonly CONFIG_FILE="${CCS_CONFIG:-$HOME/.ccs/config.json}"
 
 # --- Color/Format Functions ---
 setup_colors() {
-  if [[ -t 2 ]] && [[ -z "${NO_COLOR:-}" ]]; then
+  # Enable colors if: FORCE_COLOR set OR (TTY detected AND NO_COLOR not set) OR (TERM supports colors AND NO_COLOR not set)
+  if [[ -n "${FORCE_COLOR:-}" ]] || \
+     ([[ -t 1 || -t 2 ]] && [[ -z "${NO_COLOR:-}" ]]) || \
+     ([[ -n "${TERM:-}" && "${TERM}" != "dumb" ]] && [[ -z "${NO_COLOR:-}" ]]); then
     RED='\033[0;31m'
     YELLOW='\033[1;33m'
+    CYAN='\033[0;36m'
     BOLD='\033[1m'
     RESET='\033[0m'
   else
-    RED='' YELLOW='' BOLD='' RESET=''
+    RED='' YELLOW='' CYAN='' BOLD='' RESET=''
   fi
 }
 
@@ -27,27 +32,67 @@ msg_error() {
   echo "" >&2
 }
 
+show_help() {
+  echo -e "${BOLD}CCS (Claude Code Switch) - Instant profile switching for Claude CLI${RESET}"
+  echo ""
+  echo -e "${CYAN}Usage:${RESET}"
+  echo -e "  ${YELLOW}ccs${RESET} [profile] [claude-args...]"
+  echo -e "  ${YELLOW}ccs${RESET} [flags]"
+  echo ""
+  echo -e "${CYAN}Description:${RESET}"
+  echo -e "  Switch between Claude models instantly. Stop hitting rate limits."
+  echo -e "  Maps profile names to Claude settings files via ~/.ccs/config.json"
+  echo ""
+  echo -e "${CYAN}Profile Switching:${RESET}"
+  echo -e "  ${YELLOW}ccs${RESET}                         Use default profile"
+  echo -e "  ${YELLOW}ccs glm${RESET}                     Switch to GLM profile"
+  echo -e "  ${YELLOW}ccs glm${RESET} \"debug this code\"   Switch to GLM and run command"
+  echo -e "  ${YELLOW}ccs glm${RESET} --verbose           Switch to GLM with Claude flags"
+  echo ""
+  echo -e "${CYAN}Flags:${RESET}"
+  echo -e "  ${YELLOW}-h, --help${RESET}                  Show this help message"
+  echo -e "  ${YELLOW}-v, --version${RESET}               Show version and installation info"
+    echo ""
+  echo -e "${CYAN}Configuration:${RESET}"
+  echo -e "  Config File: ~/.ccs/config.json"
+  echo -e "  Settings:    ~/.ccs/*.settings.json"
+  echo -e "  Environment: CCS_CONFIG (override config path)"
+  echo ""
+  echo -e "${CYAN}Examples:${RESET}"
+  echo -e "  # Use default Claude subscription"
+  echo -e "  ${YELLOW}ccs${RESET} \"Review this architecture\""
+  echo ""
+  echo -e "  # Switch to GLM for cost-effective tasks"
+  echo -e "  ${YELLOW}ccs glm${RESET} \"Write unit tests\""
+  echo ""
+  echo -e "  # Use GLM with verbose output"
+  echo -e "  ${YELLOW}ccs glm${RESET} --verbose \"Debug error\""
+  echo ""
+    echo -e "${YELLOW}Uninstall:${RESET}"
+  echo -e "  macOS/Linux:  curl -fsSL ccs.kaitran.ca/uninstall | bash"
+  echo -e "  Windows:      irm ccs.kaitran.ca/uninstall | iex"
+  echo -e "  npm:          npm uninstall -g @kaitranntt/ccs"
+  echo ""
+  echo -e "${CYAN}Documentation:${RESET}"
+  echo -e "  GitHub:  ${CYAN}https://github.com/kaitranntt/ccs${RESET}"
+  echo -e "  Docs:    https://github.com/kaitranntt/ccs/blob/main/README.md"
+  echo -e "  Issues:  https://github.com/kaitranntt/ccs/issues"
+  echo ""
+  echo -e "${CYAN}License:${RESET} MIT"
+}
+
 setup_colors
 
+# Check dependencies early
+command -v jq &>/dev/null || {
+  msg_error "jq required but not installed. Install: brew install jq (macOS) or apt install jq (Ubuntu)"
+  exit 1
+}
+
 # --- Claude CLI Detection Logic ---
 
 detect_claude_cli() {
-  # Priority 1: CCS_CLAUDE_PATH environment variable (if user wants custom path)
-  if [[ -n "${CCS_CLAUDE_PATH:-}" ]]; then
-    # Basic validation: file exists
-    if [[ -f "$CCS_CLAUDE_PATH" ]]; then
-      echo "$CCS_CLAUDE_PATH"
-      return 0
-    fi
-    # Invalid CCS_CLAUDE_PATH - show warning and fall back to PATH
-    echo "[!] Warning: CCS_CLAUDE_PATH is set but file not found: $CCS_CLAUDE_PATH" >&2
-    echo "    Falling back to system PATH lookup..." >&2
-  fi
-
-  # Priority 2: Use 'claude' from PATH (trust the system)
-  # This is the standard case - if user installed Claude CLI, it's in their PATH
-  echo "claude"
-  return 0
+  echo "${CCS_CLAUDE_PATH:-claude}"
 }
 
 show_claude_not_found_error() {
@@ -72,10 +117,10 @@ Solutions:
 Restart your terminal after installation."
 }
 
-CONFIG_FILE="${CCS_CONFIG:-$HOME/.ccs/config.json}"
-
-# Installation function for commands and skills
-install_commands_and_skills() {
+# WIP: .claude/ integration testing incomplete
+# Feature disabled until testing complete
+# install_commands_and_skills() {
+: <<'COMMENTED_OUT'
   # Try both possible locations for .claude directory
   local source_dir=""
   local possible_dirs=(
@@ -179,10 +224,13 @@ Solution:
   echo ""
   echo "You can now use the /ccs command in Claude CLI for task delegation."
   echo "Example: /ccs glm /plan 'add user authentication'"
-}
+COMMENTED_OUT
+# }
 
-# Uninstallation function for commands and skills
-uninstall_commands_and_skills() {
+# WIP: .claude/ integration testing incomplete
+# Feature disabled until testing complete
+# uninstall_commands_and_skills() {
+: <<'COMMENTED_OUT'
   local target_dir="$HOME/.claude"
   local removed_count=0
   local not_found_count=0
@@ -259,49 +307,66 @@ uninstall_commands_and_skills() {
   echo ""
   echo "The /ccs command is no longer available in Claude CLI."
   echo "To reinstall: ccs --install"
+COMMENTED_OUT
+# }
+
+show_version() {
+  echo -e "${BOLD}CCS (Claude Code Switch) v${CCS_VERSION}${RESET}"
+  echo ""
+  echo -e "${CYAN}Installation:${RESET}"
+
+  # Simple location - just show what 'command -v' returns
+  local location=$(command -v ccs 2>/dev/null || echo "(not installed)")
+  echo -e "  ${CYAN}Location:${RESET} ${location}"
+
+  # Simple config display
+  local config="${CCS_CONFIG:-$HOME/.ccs/config.json}"
+  echo -e "  ${CYAN}Config:${RESET} ${config}"
+  echo ""
+
+  echo -e "${CYAN}Documentation:${RESET} https://github.com/kaitranntt/ccs"
+  echo -e "${CYAN}License:${RESET} MIT"
+  echo ""
+  echo -e "${YELLOW}Run 'ccs --help' for usage information${RESET}"
 }
 
 # Special case: version command (check BEFORE profile detection)
 if [[ $# -gt 0 ]] && [[ "${1}" == "version" || "${1}" == "--version" || "${1}" == "-v" ]]; then
-  echo "CCS (Claude Code Switch) version $CCS_VERSION"
-
-  # Show install location if we can determine it
-  INSTALL_LOCATION=$(command -v ccs 2>/dev/null || echo "unknown")
-  if [[ "$INSTALL_LOCATION" != "unknown" ]]; then
-    # Resolve symlink to actual file
-    if [[ -L "$INSTALL_LOCATION" ]]; then
-      ACTUAL_LOCATION=$(readlink "$INSTALL_LOCATION" 2>/dev/null || echo "$INSTALL_LOCATION")
-      echo "Installed at: $INSTALL_LOCATION -> $ACTUAL_LOCATION"
-    else
-      echo "Installed at: $INSTALL_LOCATION"
-    fi
-  fi
-
-  echo "https://github.com/kaitranntt/ccs"
+  show_version
   exit 0
 fi
 
 # Special case: help command (check BEFORE profile detection)
 if [[ $# -gt 0 ]] && [[ "${1}" == "--help" || "${1}" == "-h" || "${1}" == "help" ]]; then
-  shift  # Remove the help argument
-  CLAUDE_CLI=$(detect_claude_cli)
-
-  if ! exec "$CLAUDE_CLI" --help "$@"; then
-    show_claude_not_found_error
-    exit 1
-  fi
+  setup_colors
+  show_help
+  exit 0
 fi
 
 # Special case: install command (check BEFORE profile detection)
 if [[ $# -gt 0 ]] && [[ "${1}" == "--install" ]]; then
-  install_commands_and_skills
-  exit $?
+  echo ""
+  echo "Feature not available"
+  echo ""
+  echo "The --install flag is currently under development."
+  echo ".claude/ integration testing is not complete."
+  echo ""
+  echo "For updates: https://github.com/kaitranntt/ccs/issues"
+  echo ""
+  exit 0
 fi
 
 # Special case: uninstall command (check BEFORE profile detection)
 if [[ $# -gt 0 ]] && [[ "${1}" == "--uninstall" ]]; then
-  uninstall_commands_and_skills
-  exit $?
+  echo ""
+  echo "Feature not available"
+  echo ""
+  echo "The --uninstall flag is currently under development."
+  echo ".claude/ integration testing is not complete."
+  echo ""
+  echo "For updates: https://github.com/kaitranntt/ccs/issues"
+  echo ""
+  exit 0
 fi
 
 # Smart profile detection: if first arg starts with '-', it's a flag not a profile
@@ -334,16 +399,6 @@ EOF"
   exit 1
 fi
 
-# Check jq installed
-if ! command -v jq &> /dev/null; then
-  msg_error "jq is required but not installed
-
-Install jq:
-  macOS:   brew install jq
-  Ubuntu:  sudo apt install jq
-  Fedora:  sudo dnf install jq"
-  exit 1
-fi
 
 # Validate profile name (alphanumeric, dash, underscore only)
 if [[ "$PROFILE" =~ [^a-zA-Z0-9_-] ]]; then
@@ -353,34 +408,30 @@ Use only alphanumeric characters, dash, or underscore."
   exit 1
 fi
 
-# Validate JSON syntax
-if ! jq -e . "$CONFIG_FILE" &>/dev/null; then
-  msg_error "Invalid JSON in $CONFIG_FILE
+# Single check gets profile path, validates JSON + structure in one step
+SETTINGS_PATH=$(jq -r --arg profile "$PROFILE" '.profiles[$profile] // empty' "$CONFIG_FILE" 2>/dev/null)
+
+if [[ -z "$SETTINGS_PATH" ]]; then
+  # Could be: invalid JSON, no profiles object, or profile not found
+  # Show helpful error based on what we can detect
+  if ! jq -e . "$CONFIG_FILE" &>/dev/null; then
+    msg_error "Invalid JSON in $CONFIG_FILE
 
 Fix the JSON syntax or reinstall:
   curl -fsSL ccs.kaitran.ca/install | bash"
-  exit 1
-fi
-
-# Validate config has profiles object
-if ! jq -e '.profiles' "$CONFIG_FILE" &>/dev/null; then
-  msg_error "Config must have 'profiles' object
+  elif ! jq -e '.profiles' "$CONFIG_FILE" &>/dev/null; then
+    msg_error "Config must have 'profiles' object
 
 See config/config.example.json for correct format
 Or reinstall:
   curl -fsSL ccs.kaitran.ca/install | bash"
-  exit 1
-fi
-
-# Get settings path for profile (using --arg to prevent injection)
-SETTINGS_PATH=$(jq -r --arg profile "$PROFILE" '.profiles[$profile] // empty' "$CONFIG_FILE")
-
-if [[ -z "$SETTINGS_PATH" ]]; then
-  AVAILABLE_PROFILES=$(jq -r '.profiles | keys[]' "$CONFIG_FILE" 2>/dev/null | sed 's/^/  - /')
-  msg_error "Profile '$PROFILE' not found in $CONFIG_FILE
+  else
+    AVAILABLE_PROFILES=$(jq -r '.profiles | keys[]' "$CONFIG_FILE" 2>/dev/null | sed 's/^/  - /')
+    msg_error "Profile '$PROFILE' not found in $CONFIG_FILE
 
 Available profiles:
 $AVAILABLE_PROFILES"
+  fi
   exit 1
 fi