cskit-cli 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cskit-cli",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Content Suite Kit CLI - Download and manage CSK skills from private repository",
   "main": "src/index.js",
   "bin": {

package/src/commands/init.js

@@ -92,60 +92,69 @@ async function setupPythonEnv(projectDir, spinner) {
       execSync(`python3 -m venv "${venvPath}"`, { stdio: 'pipe', cwd: libPythonDir });
     }
 
-    // Install requirements with error handling
-    spinner.text = 'Installing Python packages...';
+    // Parse requirements.txt
     const pipPath = path.join(venvPath, 'bin', 'pip');
+    const requirements = fs.readFileSync(requirementsFile, 'utf8')
+      .split('\n')
+      .map(line => line.trim())
+      .filter(line => line && !line.startsWith('#'));
 
-    try {
-      execSync(`"${pipPath}" install -r requirements.txt`, {
-        stdio: 'pipe',
-        cwd: libPythonDir
-      });
-      spinner.succeed(`Python environment ready (${pythonVersion})`);
+    if (requirements.length === 0) {
+      spinner.succeed('No packages to install');
       return { success: true, version: pythonVersion };
-    } catch (pipError) {
-      // Extract failed packages from error output
-      const errorOutput = pipError.stderr ? pipError.stderr.toString() : pipError.message;
-      const failedPackages = [];
-
-      // Parse error output for specific package failures
-      const lines = errorOutput.split('\n');
-      for (const line of lines) {
-        if (line.includes('No matching distribution') || line.includes('Could not find')) {
-          const match = line.match(/for\s+(\S+)/);
-          if (match) failedPackages.push(match[1]);
-        }
-        if (line.includes('ERROR:')) {
-          const pkgMatch = line.match(/ERROR:.*?(\S+>=[\d.]+)/);
-          if (pkgMatch) failedPackages.push(pkgMatch[1]);
-        }
-      }
+    }
+
+    // Upgrade pip first (silent)
+    spinner.text = 'Upgrading pip...';
+    try {
+      execSync(`"${pipPath}" install --upgrade pip -q`, { stdio: 'pipe', cwd: libPythonDir });
+    } catch { /* ignore pip upgrade errors */ }
+
+    // Install packages one by one with progress
+    spinner.stop();
+    console.log(chalk.dim(`\n  Installing ${requirements.length} packages:\n`));
+
+    const installed = [];
+    const failed = [];
+
+    for (let i = 0; i < requirements.length; i++) {
+      const pkg = requirements[i];
+      const pkgName = pkg.split(/[>=<\[]/)[0]; // Extract package name
+      const progress = `[${i + 1}/${requirements.length}]`;
+
+      process.stdout.write(`  ${chalk.dim(progress)} ${pkgName}... `);
 
-      // Try installing without failed packages
-      spinner.text = 'Retrying with core packages...';
       try {
-        execSync(`"${pipPath}" install numpy pandas scipy pydantic rich click -q`, {
+        execSync(`"${pipPath}" install "${pkg}" -q`, {
           stdio: 'pipe',
-          cwd: libPythonDir
+          cwd: libPythonDir,
+          timeout: 120000 // 2 min timeout per package
         });
-
-        // Show specific failures
-        if (failedPackages.length > 0) {
-          spinner.warn(`Partial install - failed packages:`);
-          console.log(chalk.yellow(`\n  Failed: ${failedPackages.join(', ')}`));
-          console.log(chalk.dim(`  Run manually: ${pipPath} install <package>\n`));
-        } else {
-          spinner.warn('Partial install - some optional packages failed');
-          console.log(chalk.dim(`\n  Error: ${errorOutput.slice(0, 200)}...\n`));
-        }
-
-        return { success: true, partial: true, version: pythonVersion, failed: failedPackages };
-      } catch {
-        spinner.fail('Python setup failed');
-        console.log(chalk.red(`\n  ${errorOutput.slice(0, 500)}\n`));
-        return { success: false, error: errorOutput.slice(0, 200) };
+        console.log(chalk.green('✓'));
+        installed.push(pkgName);
+      } catch (err) {
+        console.log(chalk.red('✗'));
+        const errMsg = err.stderr ? err.stderr.toString().split('\n')[0] : err.message;
+        console.log(chalk.dim(`       ${errMsg.slice(0, 60)}`));
+        failed.push(pkgName);
       }
     }
+
+    console.log('');
+
+    // Summary
+    if (failed.length === 0) {
+      spinner.succeed(`Python ready: ${installed.length} packages (${pythonVersion})`);
+      return { success: true, version: pythonVersion };
+    } else if (installed.length > 0) {
+      spinner.warn(`Partial: ${installed.length} ok, ${failed.length} failed`);
+      console.log(chalk.yellow(`  Failed: ${failed.join(', ')}`));
+      console.log(chalk.dim(`  Run manually: ${pipPath} install <package>\n`));
+      return { success: true, partial: true, version: pythonVersion, failed };
+    } else {
+      spinner.fail('All packages failed');
+      return { success: false, error: 'All packages failed to install' };
+    }
   } catch (error) {
     spinner.warn(`Python setup failed: ${error.message}`);
     return { success: false, error: error.message };
@@ -241,11 +250,13 @@ async function initCommand(options) {
     spinner.succeed(`Found ${releases.length} release(s)`);
   }
 
-  // Version selection
+  // Version selection (show max 5 recent releases)
   let selectedVersion = 'main';
+  const maxVersions = 5;
 
   if (releases.length > 0 && !options.latest) {
-    const choices = releases.map((r, i) => ({
+    const recentReleases = releases.slice(0, maxVersions);
+    const choices = recentReleases.map((r, i) => ({
       name: `${r.tag}${i === 0 ? chalk.green(' (latest)') : ''} - ${formatDate(r.published)}`,
       value: r.tag
     }));