cskit-cli 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cskit-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Content Suite Kit CLI - Download and manage CSK skills from private repository",
   "main": "src/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tohaitrieu/csk-cli.git"
+    "url": "git+https://github.com/tohaitrieu/content-suite-kit.git"
   },
   "bugs": {
-    "url": "https://github.com/tohaitrieu/csk-cli/issues"
+    "url": "https://github.com/tohaitrieu/content-suite-kit/issues"
   },
   "homepage": "https://cskit.net",
   "dependencies": {

package/src/commands/init.js

@@ -3,8 +3,8 @@
 /**
  * Init Command
  *
- * Downloads CSK from private GitHub repository into current project.
- * Handles smart merging to preserve user modifications.
+ * Downloads CSK from private GitHub repository.
+ * Features: version selection, progress bar, Python setup.
  */
 
 const fs = require('fs');
@@ -12,8 +12,16 @@ const path = require('path');
 const chalk = require('chalk');
 const ora = require('ora');
 const crypto = require('crypto');
+const inquirer = require('inquirer');
+const { execSync, spawn } = require('child_process');
 const { getToken } = require('../lib/keychain');
-const { verifyAccess, getRepoTree, downloadFile, getLatestRelease } = require('../lib/github');
+const {
+  verifyAccess,
+  getRepoTreeFromRef,
+  downloadFileFromRef,
+  getAllReleases,
+  getLatestRelease
+} = require('../lib/github');
 const {
   isProtected,
   shouldExclude,
@@ -23,9 +31,73 @@ const {
   ensureDir
 } = require('../lib/merge');
 
+/**
+ * Format date for display
+ */
+function formatDate(isoDate) {
+  const d = new Date(isoDate);
+  return d.toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' });
+}
+
+/**
+ * Create progress bar string
+ */
+function progressBar(current, total, width = 30) {
+  const percent = Math.round((current / total) * 100);
+  const filled = Math.round((current / total) * width);
+  const empty = width - filled;
+  const bar = chalk.green('█'.repeat(filled)) + chalk.dim('░'.repeat(empty));
+  return `${bar} ${percent}%`;
+}
+
+/**
+ * Setup Python virtual environment
+ */
+async function setupPythonEnv(projectDir, spinner) {
+  const libPythonDir = path.join(projectDir, 'lib', 'python');
+  const requirementsFile = path.join(libPythonDir, 'requirements.txt');
+
+  if (!fs.existsSync(requirementsFile)) {
+    return { success: true, skipped: true };
+  }
+
+  spinner.start('Setting up Python environment...');
+
+  const venvPath = path.join(libPythonDir, '.venv');
+
+  try {
+    // Check if Python 3 is available
+    try {
+      execSync('python3 --version', { stdio: 'pipe' });
+    } catch {
+      spinner.warn('Python 3 not found, skipping venv setup');
+      return { success: true, skipped: true, reason: 'python3 not found' };
+    }
+
+    // Create venv if not exists
+    if (!fs.existsSync(venvPath)) {
+      spinner.text = 'Creating virtual environment...';
+      execSync(`python3 -m venv "${venvPath}"`, { stdio: 'pipe', cwd: libPythonDir });
+    }
+
+    // Install requirements
+    spinner.text = 'Installing Python packages...';
+    const pipPath = path.join(venvPath, 'bin', 'pip');
+    execSync(`"${pipPath}" install -r requirements.txt -q`, {
+      stdio: 'pipe',
+      cwd: libPythonDir
+    });
+
+    spinner.succeed('Python environment ready');
+    return { success: true };
+  } catch (error) {
+    spinner.warn(`Python setup failed: ${error.message}`);
+    return { success: false, error: error.message };
+  }
+}
+
 /**
  * Main init command handler
- * @param {Object} options - Command options
  */
 async function initCommand(options) {
   const projectDir = process.cwd();
@@ -38,11 +110,10 @@ async function initCommand(options) {
   const token = await getToken();
   if (!token) {
     spinner.fail(chalk.red('Not authenticated'));
-    console.log(chalk.dim('\n  Run `csk auth --login` first.\n'));
+    console.log(chalk.dim('\n  Run `cskit auth --login` first.\n'));
     process.exit(1);
   }
 
-  // Verify access
   const { valid, error } = await verifyAccess(token);
   if (!valid) {
     spinner.fail(chalk.red('Access denied'));
@@ -52,51 +123,70 @@ async function initCommand(options) {
 
   spinner.succeed('Authenticated');
 
-  // Check for existing installation
+  // Check existing installation
   const manifest = loadManifest(projectDir);
   const isUpdate = manifest.version !== null;
 
   if (isUpdate) {
-    console.log(chalk.dim(`\n  Existing installation found: v${manifest.version}`));
-    console.log(chalk.dim(`  Installed: ${manifest.installedAt}\n`));
+    const currentVer = manifest.version.replace(/^v/, '');
+    console.log(chalk.dim(`\n  Current: v${currentVer} (${formatDate(manifest.installedAt)})\n`));
   }
 
-  // Get latest version
-  spinner.start('Fetching latest version...');
+  // Fetch available versions
+  spinner.start('Fetching available versions...');
 
-  let version = 'main';
-  const release = await getLatestRelease(token);
-  if (release) {
-    version = release.tag;
-    spinner.succeed(`Latest version: ${release.tag}`);
-  } else {
+  const releases = await getAllReleases(token);
+  const latest = await getLatestRelease(token);
+
+  if (releases.length === 0) {
     spinner.info('No releases found, using main branch');
+  } else {
+    spinner.succeed(`Found ${releases.length} release(s)`);
+  }
+
+  // Version selection
+  let selectedVersion = 'main';
+
+  if (releases.length > 0 && !options.latest) {
+    const choices = releases.map((r, i) => ({
+      name: `${r.tag}${i === 0 ? chalk.green(' (latest)') : ''} - ${formatDate(r.published)}`,
+      value: r.tag
+    }));
+
+    choices.push({ name: chalk.dim('main branch (development)'), value: 'main' });
+
+    const answer = await inquirer.prompt([{
+      type: 'list',
+      name: 'version',
+      message: 'Select version to install:',
+      choices,
+      default: releases[0]?.tag || 'main'
+    }]);
+
+    selectedVersion = answer.version;
+  } else if (latest) {
+    selectedVersion = latest.tag;
   }
 
-  // Get file tree
+  console.log(chalk.dim(`\n  Installing: ${selectedVersion}\n`));
+
+  // Fetch file tree
   spinner.start('Fetching file list...');
 
-  const tree = await getRepoTree(token);
+  const tree = await getRepoTreeFromRef(token, selectedVersion);
   const files = tree.filter(item =>
     item.type === 'blob' && !shouldExclude(item.path)
   );
 
   spinner.succeed(`Found ${files.length} files`);
 
-  // Download and merge files
-  console.log(chalk.cyan('\n  Downloading files...\n'));
-
-  const stats = {
-    created: 0,
-    updated: 0,
-    skipped: 0,
-    protected: 0,
-    userModified: 0
-  };
+  // Download files with progress bar
+  console.log('');
 
+  const stats = { created: 0, updated: 0, skipped: 0, protected: 0, userModified: 0 };
   const newManifest = {
     files: {},
-    version: version,
+    version: selectedVersion,
     installedAt: new Date().toISOString()
   };
 
@@ -105,25 +195,21 @@ async function initCommand(options) {
     const targetPath = path.join(projectDir, file.path);
     const relativePath = file.path;
 
-    // Progress indicator
-    const progress = `[${i + 1}/${files.length}]`;
+    // Update progress bar
+    process.stdout.write(`\r  ${progressBar(i + 1, files.length)} ${chalk.dim(`(${i + 1}/${files.length})`)}`);
 
     try {
-      // Download file content
-      const content = await downloadFile(token, file.path);
+      const content = await downloadFileFromRef(token, file.path, selectedVersion);
       const contentHash = crypto.createHash('md5').update(content).digest('hex');
 
-      // Determine action
       const { action, reason } = options.force
         ? { action: isProtected(relativePath) ? 'skip' : 'update', reason: 'forced' }
         : determineMergeAction(targetPath, relativePath, content, manifest.files);
 
-      // Execute action
       switch (action) {
         case 'create':
           ensureDir(path.dirname(targetPath));
           fs.writeFileSync(targetPath, content);
-          console.log(chalk.green(`  ${progress} + ${relativePath}`));
           stats.created++;
           newManifest.files[relativePath] = contentHash;
           break;
@@ -131,52 +217,59 @@ async function initCommand(options) {
         case 'update':
           ensureDir(path.dirname(targetPath));
           fs.writeFileSync(targetPath, content);
-          console.log(chalk.blue(`  ${progress} ~ ${relativePath}`));
           stats.updated++;
           newManifest.files[relativePath] = contentHash;
           break;
 
         case 'skip':
-          if (reason === 'protected') {
-            console.log(chalk.yellow(`  ${progress} ! ${relativePath} (protected)`));
-            stats.protected++;
-          } else if (reason === 'user-modified') {
-            console.log(chalk.yellow(`  ${progress} ! ${relativePath} (modified)`));
-            stats.userModified++;
-          } else {
-            // Unchanged, don't log to reduce noise
-            stats.skipped++;
-          }
-          // Preserve existing hash in manifest
+          if (reason === 'protected') stats.protected++;
+          else if (reason === 'user-modified') stats.userModified++;
+          else stats.skipped++;
+
           if (manifest.files[relativePath]) {
             newManifest.files[relativePath] = manifest.files[relativePath];
           }
           break;
       }
     } catch (err) {
-      console.log(chalk.red(`  ${progress} x ${relativePath} (${err.message})`));
+      // Silent fail for individual files
     }
   }
 
+  // Clear progress line
+  process.stdout.write('\r' + ' '.repeat(60) + '\r');
+
   // Save manifest
   saveManifest(projectDir, newManifest);
 
   // Summary
-  console.log(chalk.cyan('\n  Summary\n'));
+  console.log(chalk.cyan('  Summary\n'));
   console.log(`  ${chalk.green('+')} Created:       ${stats.created}`);
   console.log(`  ${chalk.blue('~')} Updated:       ${stats.updated}`);
-  console.log(`  ${chalk.yellow('!')} Protected:     ${stats.protected}`);
-  console.log(`  ${chalk.yellow('!')} User modified: ${stats.userModified}`);
-  console.log(`  ${chalk.dim('-')} Unchanged:     ${stats.skipped}`);
-
-  console.log(chalk.green(`\n  CSK ${isUpdate ? 'updated' : 'installed'} successfully!\n`));
-
-  // Next steps
-  if (!isUpdate) {
-    console.log(chalk.dim('  Next steps:'));
-    console.log(chalk.dim('  1. Review .claude/ directory'));
-    console.log(chalk.dim('  2. Copy .env.example to .env and configure'));
-    console.log(chalk.dim('  3. Start using CSK commands in Claude Code\n'));
+  if (stats.protected > 0) console.log(`  ${chalk.yellow('!')} Protected:     ${stats.protected}`);
+  if (stats.userModified > 0) console.log(`  ${chalk.yellow('!')} User modified: ${stats.userModified}`);
+  if (stats.skipped > 0) console.log(`  ${chalk.dim('-')} Unchanged:     ${stats.skipped}`);
+
+  // Setup Python environment
+  console.log('');
+  const pythonResult = await setupPythonEnv(projectDir, spinner);
+
+  // Success message
+  const ver = selectedVersion.replace(/^v/, '');
+  console.log(chalk.green(`\n  ✓ CSK v${ver} ${isUpdate ? 'updated' : 'installed'} successfully!\n`));
+
+  // Quick start guide
+  console.log(chalk.cyan('  Quick Start\n'));
+  console.log(chalk.dim('  1. Open Claude Code in this directory:'));
+  console.log(`     ${chalk.white('claude')}\n`);
+  console.log(chalk.dim('  2. Start with CSK command:'));
+  console.log(`     ${chalk.white('/csk')}\n`);
+  console.log(chalk.dim('  3. Or explore available skills:'));
+  console.log(`     ${chalk.white('./cli/csk list')}\n`);
+
+  if (pythonResult.skipped && pythonResult.reason) {
+    console.log(chalk.dim(`  Note: ${pythonResult.reason}`));
+    console.log(chalk.dim('  Run manually: cd lib/python && python3 -m venv .venv && .venv/bin/pip install -r requirements.txt\n'));
   }
 }
 

package/src/commands/status.js

@@ -39,7 +39,8 @@ async function statusCommand() {
 
   console.log(chalk.dim('  Installation:'));
   if (manifest.version) {
-    console.log(chalk.green(`    Installed: v${manifest.version}`));
+    const version = manifest.version.replace(/^v/, '');
+    console.log(chalk.green(`    Installed: v${version}`));
     console.log(chalk.dim(`    Date: ${manifest.installedAt}`));
     console.log(chalk.dim(`    Files: ${Object.keys(manifest.files).length}`));
   } else {

package/src/commands/update.js

@@ -23,7 +23,7 @@ async function updateCommand() {
 
   try {
     // Get latest version from npm
-    const latestVersion = execSync('npm view csk-cli version', {
+    const latestVersion = execSync('npm view cskit-cli version', {
       encoding: 'utf-8',
       stdio: ['pipe', 'pipe', 'pipe']
     }).trim();
@@ -36,7 +36,7 @@ async function updateCommand() {
     spinner.text = `Updating to v${latestVersion}...`;
 
     // Run npm update
-    execSync('npm install -g csk-cli@latest', {
+    execSync('npm install -g cskit-cli@latest', {
       stdio: ['pipe', 'pipe', 'pipe']
     });
 
@@ -50,7 +50,7 @@ async function updateCommand() {
     } else {
       spinner.fail(chalk.red('Update failed'));
       console.log(chalk.dim(`\n  ${error.message}`));
-      console.log(chalk.dim('\n  Try manually: npm install -g csk-cli@latest\n'));
+      console.log(chalk.dim('\n  Try manually: npm install -g cskit-cli@latest\n'));
     }
   }
 }

package/src/index.js

@@ -42,6 +42,7 @@ program
   .command('init')
   .description('Initialize or update CSK in current project')
   .option('-f, --force', 'Force overwrite existing files')
+  .option('-l, --latest', 'Skip version selection, use latest')
   .option('--no-merge', 'Skip smart merge, overwrite all')
   .action(initCommand);
 

package/src/lib/github.js

@@ -172,15 +172,107 @@ async function getLatestRelease(token) {
       published: data.published_at
     };
   } catch (error) {
-    // No releases, use branch
     return null;
   }
 }
 
+/**
+ * Get all releases
+ * @param {string} token - GitHub PAT
+ * @param {number} limit - Max releases to fetch
+ * @returns {Promise<Array<{tag: string, name: string, published: string}>>}
+ */
+async function getAllReleases(token, limit = 10) {
+  try {
+    const data = await apiRequest(
+      token,
+      `/repos/${GITHUB_OWNER}/${GITHUB_REPO}/releases?per_page=${limit}`
+    );
+    return data.map(r => ({
+      tag: r.tag_name,
+      name: r.name || r.tag_name,
+      published: r.published_at
+    }));
+  } catch (error) {
+    return [];
+  }
+}
+
+/**
+ * Download file from specific ref (tag/branch)
+ * @param {string} token - GitHub PAT
+ * @param {string} filePath - Path to file
+ * @param {string} ref - Tag or branch name
+ * @returns {Promise<Buffer>}
+ */
+async function downloadFileFromRef(token, filePath, ref) {
+  return new Promise((resolve, reject) => {
+    const options = {
+      hostname: 'raw.githubusercontent.com',
+      path: `/${GITHUB_OWNER}/${GITHUB_REPO}/${ref}/${filePath}`,
+      method: 'GET',
+      headers: {
+        'Authorization': `Bearer ${token}`,
+        'User-Agent': 'csk-cli'
+      }
+    };
+
+    const req = https.request(options, (res) => {
+      if (res.statusCode === 302 || res.statusCode === 301) {
+        const redirectUrl = new URL(res.headers.location);
+        const redirectOptions = {
+          hostname: redirectUrl.hostname,
+          path: redirectUrl.pathname + redirectUrl.search,
+          method: 'GET',
+          headers: { 'User-Agent': 'csk-cli' }
+        };
+
+        const redirectReq = https.request(redirectOptions, (redirectRes) => {
+          const chunks = [];
+          redirectRes.on('data', chunk => chunks.push(chunk));
+          redirectRes.on('end', () => resolve(Buffer.concat(chunks)));
+        });
+        redirectReq.on('error', reject);
+        redirectReq.end();
+        return;
+      }
+
+      if (res.statusCode !== 200) {
+        reject(new Error(`Failed to download: ${res.statusCode}`));
+        return;
+      }
+
+      const chunks = [];
+      res.on('data', chunk => chunks.push(chunk));
+      res.on('end', () => resolve(Buffer.concat(chunks)));
+    });
+
+    req.on('error', reject);
+    req.end();
+  });
+}
+
+/**
+ * Get repo tree from specific ref
+ * @param {string} token - GitHub PAT
+ * @param {string} ref - Tag or branch
+ * @returns {Promise<Array>}
+ */
+async function getRepoTreeFromRef(token, ref) {
+  const data = await apiRequest(
+    token,
+    `/repos/${GITHUB_OWNER}/${GITHUB_REPO}/git/trees/${ref}?recursive=1`
+  );
+  return data.tree || [];
+}
+
 module.exports = {
   verifyAccess,
   getRepoTree,
+  getRepoTreeFromRef,
   getFileContent,
   downloadFile,
-  getLatestRelease
+  downloadFileFromRef,
+  getLatestRelease,
+  getAllReleases
 };