cskit-cli 1.0.26 → 1.0.28

package/package.json

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

package/src/commands/init.js

@@ -67,6 +67,7 @@ class Timeline {
     this.currentStep = -1;
     this.lastLineCount = 0;
     this.isFirstRender = true;
+    this.isPaused = false;
   }
 
   addStep(name) {
@@ -103,15 +104,28 @@ class Timeline {
 
   // Call before any external output (prompts, logs, etc.)
   pause() {
+    // Don't update in-place after external output - just continue below
     this.lastLineCount = 0;
+    this.isPaused = true;
   }
 
   // Re-render timeline after external output
   resume() {
+    if (this.isPaused) {
+      // Print separator and continue fresh (no in-place update)
+      console.log(chalk.dim('  ─'.repeat(20)));
+      this.isPaused = false;
+    }
     this.isFirstRender = true;
     this.render();
   }
 
+  // Print final summary (no in-place update)
+  printSummary() {
+    this.lastLineCount = 0; // Disable in-place update
+    this.render();
+  }
+
   render() {
     // Build output lines
     const lines = [];
@@ -125,22 +139,25 @@ class Timeline {
 
       lines.push(`  ${symbol} ${num} ${name}${msg}`);
 
-      // Show children (files, etc.)
-      for (let j = 0; j < step.children.length; j++) {
-        const child = step.children[j];
-        const isLast = j === step.children.length - 1;
-        const branch = isLast ? SYMBOLS.branchLast : SYMBOLS.branch;
-        const prefix = child.type === 'new' ? chalk.green('+') :
-                       child.type === 'update' ? chalk.blue('~') :
-                       child.type === 'skip' ? chalk.yellow('!') :
-                       child.type === 'delete' ? chalk.red('-') :
-                       chalk.dim('•');
-        lines.push(`  ${SYMBOLS.indent}${branch} ${prefix} ${child.text}`);
+      // Show children only for active or done steps (not pending)
+      if (step.status !== 'pending') {
+        for (let j = 0; j < step.children.length; j++) {
+          const child = step.children[j];
+          const isLast = j === step.children.length - 1;
+          const branch = isLast ? SYMBOLS.branchLast : SYMBOLS.branch;
+          const prefix = child.type === 'new' ? chalk.green('+') :
+                         child.type === 'update' ? chalk.blue('~') :
+                         child.type === 'skip' ? chalk.yellow('!') :
+                         child.type === 'delete' ? chalk.red('-') :
+                         chalk.dim('•');
+          lines.push(`  ${SYMBOLS.indent}${branch} ${prefix} ${child.text}`);
+        }
       }
     }
 
     // Clear previous output (move cursor up and clear lines)
-    if (!this.isFirstRender && this.lastLineCount > 0) {
+    // Only do in-place update when not paused and have previous output
+    if (!this.isFirstRender && this.lastLineCount > 0 && !this.isPaused) {
       // Move cursor up and clear each line
       process.stdout.write(`\x1b[${this.lastLineCount}A`);
       for (let i = 0; i < this.lastLineCount; i++) {
@@ -360,20 +377,54 @@ async function installPackages(libPythonDir, packages, timeline, stepIndex, pyth
     }
   }
 
-  // Install packages
+  // Get currently installed packages (to avoid reinstalling)
+  let installedPkgs = new Set();
+  try {
+    const freeze = execSync(`"${pipPath}" freeze`, { stdio: 'pipe' }).toString();
+    freeze.split('\n').forEach(line => {
+      const match = line.match(/^([^=]+)==/);
+      if (match) installedPkgs.add(match[1].toLowerCase());
+    });
+  } catch {}
+
+  // Install/update packages
   let success = true;
+  let installed = 0, skipped = 0, failed = 0;
+
   for (const pkg of packages) {
+    const pkgName = pkg.name.toLowerCase();
     const pkgSpec = pkg.required || pkg.name;
+
+    // Check if already installed (skip unless it's an update)
+    if (installedPkgs.has(pkgName) && !pkg.current) {
+      timeline.addChild(stepIndex, `${pkg.name} (already installed)`, 'info');
+      skipped++;
+      continue;
+    }
+
     try {
-      execSync(`"${pipPath}" install "${pkgSpec}" -q`, {
+      execSync(`"${pipPath}" install "${pkgSpec}" -q --upgrade`, {
         stdio: 'pipe',
         cwd: libPythonDir,
         timeout: 120000
       });
-      timeline.addChild(stepIndex, `${pkg.name}`, 'new');
+      if (pkg.current) {
+        timeline.addChild(stepIndex, `${pkg.name} (${pkg.current} → updated)`, 'update');
+      } else {
+        timeline.addChild(stepIndex, `${pkg.name}`, 'new');
+      }
+      installed++;
     } catch (error) {
-      timeline.addChild(stepIndex, `${pkg.name} (failed)`, 'skip');
-      success = false;
+      // Check if it was actually installed despite error
+      try {
+        const check = execSync(`"${pipPath}" show ${pkgName}`, { stdio: 'pipe' });
+        timeline.addChild(stepIndex, `${pkg.name} (already installed)`, 'info');
+        skipped++;
+      } catch {
+        timeline.addChild(stepIndex, `${pkg.name} (failed)`, 'skip');
+        failed++;
+        success = false;
+      }
     }
   }
 
@@ -639,45 +690,47 @@ async function initCommand(options) {
 
     const pkgStatus = checkPythonPackages(libPythonDir);
 
+    // Show Python version in timeline
+    timeline.addChild(6, `Python ${pythonCmd === 'python3' ? pythonInfo.version : '3.x'} (${pythonCmd})`, 'update');
+
+    // Show already installed count
     if (pkgStatus.installed.length > 0) {
-      console.log(chalk.dim('\n  Already installed:'));
-      for (const pkg of pkgStatus.installed.slice(0, 5)) {
-        console.log(chalk.dim(`    ✓ ${pkg.name} (${pkg.version})`));
-      }
-      if (pkgStatus.installed.length > 5) {
-        console.log(chalk.dim(`    ... and ${pkgStatus.installed.length - 5} more\n`));
-      }
+      timeline.addChild(6, `${pkgStatus.installed.length} packages already installed`, 'info');
     }
 
     const allToInstall = [...pkgStatus.toInstall, ...pkgStatus.toUpdate];
 
     if (allToInstall.length === 0) {
-      timeline.complete(6, 'All packages ready');
+      timeline.complete(6, `${pkgStatus.installed.length} packages ready`);
       return;
     }
 
+    // Show what needs to be installed/updated
     console.log(chalk.cyan('\n  Packages to install/update:\n'));
-    for (const pkg of allToInstall) {
+    for (const pkg of allToInstall.slice(0, 10)) {
       if (pkg.current) {
-        console.log(`    ${pkg.name}: ${pkg.current} → ${pkg.required}`);
+        console.log(`    ~ ${pkg.name}: ${pkg.current} → ${pkg.required}`);
       } else {
-        console.log(`    ${pkg.name}: ${pkg.required || 'latest'}`);
+        console.log(`    + ${pkg.name}: ${pkg.required || 'latest'}`);
       }
     }
+    if (allToInstall.length > 10) {
+      console.log(chalk.dim(`    ... and ${allToInstall.length - 10} more`));
+    }
     console.log('');
 
     timeline.pause();
     const { confirmPkgs } = await inquirer.prompt([{
       type: 'confirm',
       name: 'confirmPkgs',
-      message: `Install ${allToInstall.length} packages?`,
+      message: `Install/update ${allToInstall.length} packages?`,
       default: true
     }]);
     timeline.resume();
 
     if (confirmPkgs) {
       await installPackages(libPythonDir, allToInstall, timeline, 6, pythonCmd);
-      timeline.complete(6, `${allToInstall.length} packages`);
+      timeline.complete(6, `${pkgStatus.installed.length + allToInstall.length} packages`);
     } else {
       timeline.skip(6, 'User skipped');
     }