cskit-cli 1.0.38 → 1.0.41

package/package.json

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

package/src/commands/init.js

@@ -45,129 +45,67 @@ const {
 // Timeline Display
 // =============================================================================
 
-const SYMBOLS = {
-  pending: chalk.dim('◇'),
-  active: chalk.cyan('◈'),
-  done: chalk.green('◆'),
-  error: chalk.red('◆'),
-  skip: chalk.yellow('◇'),
-  file: chalk.dim('│  '),
-  fileNew: chalk.green('│  + '),
-  fileUpdate: chalk.blue('│  ~ '),
-  fileSkip: chalk.yellow('│  ! '),
-  fileDel: chalk.red('│  - '),
-  branch: chalk.dim('├──'),
-  branchLast: chalk.dim('└──'),
-  indent: '   ',
-};
-
+/**
+ * Linear Timeline - shows progress step by step
+ * Each step prints its header, then children as they happen
+ */
 class Timeline {
   constructor() {
     this.steps = [];
     this.currentStep = -1;
-    this.lastLineCount = 0;
-    this.paused = false;  // After prompt, stop full re-renders
   }
 
   addStep(name) {
     this.steps.push({ name, status: 'pending', children: [] });
   }
 
+  // Print step header when starting
   start(stepIndex) {
     this.currentStep = stepIndex;
     this.steps[stepIndex].status = 'active';
-    this.render();
+    const num = chalk.dim(`${stepIndex + 1}.`);
+    const name = chalk.cyan(this.steps[stepIndex].name);
+    console.log(`\n  ${num} ${name}`);
   }
 
+  // Print completion message
   complete(stepIndex, message = null) {
     this.steps[stepIndex].status = 'done';
-    if (message) this.steps[stepIndex].message = message;
-    this.render();
+    if (message) {
+      console.log(`     ${chalk.dim('└──')} ${chalk.green('✓')} ${chalk.dim(message)}`);
+    } else {
+      console.log(`     ${chalk.dim('└──')} ${chalk.green('✓')} Done`);
+    }
   }
 
+  // Print error message
   error(stepIndex, message) {
     this.steps[stepIndex].status = 'error';
-    this.steps[stepIndex].message = message;
-    this.render();
+    console.log(`     ${chalk.dim('└──')} ${chalk.red('✗')} ${message}`);
   }
 
+  // Print skip message
   skip(stepIndex, message) {
     this.steps[stepIndex].status = 'skip';
-    this.steps[stepIndex].message = message;
-    this.render();
+    console.log(`     ${chalk.dim('└──')} ${chalk.yellow('○')} ${message}`);
   }
 
+  // Print child item immediately
   addChild(stepIndex, text, type = 'info') {
     this.steps[stepIndex].children.push({ text, type });
-  }
-
-  // Call before any prompt - stops full re-renders
-  pause() {
-    this.paused = true;
-    this.lastLineCount = 0;
-  }
-
-  // Resume after prompt - no separator needed, step headers are enough
-  resume() {
-    console.log('');
-  }
-
-  buildStatusLine(stepIndex) {
-    const step = this.steps[stepIndex];
-    const symbol = SYMBOLS[step.status];
-    const num = chalk.dim(`${stepIndex + 1}.`);
-    const name = step.status === 'active' ? chalk.cyan(step.name) : step.name;
-    const msg = step.message ? chalk.dim(` (${step.message})`) : '';
-    return `  ${symbol} ${num} ${name}${msg}`;
-  }
-
-  render() {
-    // After pause, only print current step status (no full timeline)
-    if (this.paused) {
-      console.log(this.buildStatusLine(this.currentStep));
-      return;
-    }
-
-    const lines = [];
-    for (let i = 0; i < this.steps.length; i++) {
-      lines.push(this.buildStatusLine(i));
-
-      const step = this.steps[i];
-      // Children for non-pending steps
-      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('-') :
-                         child.type === 'info' ? chalk.cyan('i') :
-                         chalk.dim('•');
-          lines.push(`  ${SYMBOLS.indent}${branch} ${prefix} ${child.text}`);
-        }
-      }
-    }
-
-    // In-place update if have previous output
-    if (this.lastLineCount > 0) {
-      process.stdout.write(`\x1b[${this.lastLineCount}A`);
-      for (let i = 0; i < this.lastLineCount; i++) {
-        process.stdout.write('\x1b[2K\n');
-      }
-      process.stdout.write(`\x1b[${this.lastLineCount}A`);
-    } else {
-      console.log('');
-    }
-
-    for (const line of lines) {
-      console.log(line);
-    }
-    console.log('');
-
-    this.lastLineCount = lines.length + 1;
-  }
+    const prefix = type === 'new' ? chalk.green('+') :
+                   type === 'update' ? chalk.blue('~') :
+                   type === 'skip' ? chalk.yellow('!') :
+                   type === 'delete' ? chalk.red('-') :
+                   type === 'info' ? chalk.cyan('i') :
+                   chalk.dim('•');
+    console.log(`     ${chalk.dim('├──')} ${prefix} ${text}`);
+  }
+
+  // No-op for compatibility
+  pause() {}
+  resume() { console.log(''); }
+  render() {}
 }
 
 // =============================================================================
@@ -439,7 +377,8 @@ async function initCommand(options) {
   timeline.addStep('Scan changes');
   timeline.addStep('Confirm changes');
   timeline.addStep('Apply changes');
-  timeline.addStep('Setup dependencies');
+  timeline.addStep('Check dependencies');
+  timeline.addStep('Install packages');
 
   // Step 1: Authenticate
   timeline.start(0);
@@ -608,6 +547,7 @@ async function initCommand(options) {
       timeline.skip(4, 'User cancelled');
       timeline.skip(5, 'Skipped');
       timeline.skip(6, 'Skipped');
+      timeline.skip(7, 'Skipped');
 
       // Cleanup
       fs.rmSync(tempDir, { recursive: true, force: true });
@@ -669,111 +609,43 @@ async function initCommand(options) {
 
   timeline.complete(5, `${applied} files`);
 
-  // Step 7: Setup dependencies
+  // Step 7: Check dependencies
   timeline.start(6);
 
   const libPythonDir = path.join(projectDir, 'lib', 'python');
 
-  // Helper function to install Python packages
-  async function handlePythonPackages(pythonCmd) {
-    if (!fs.existsSync(libPythonDir)) {
-      timeline.skip(6, 'No lib/python folder');
-      return;
-    }
-
-    timeline.pause();
-    const { installAdvanced } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'installAdvanced',
-      message: 'Install Python dependencies?',
-      default: true
-    }]);
-
-    if (!installAdvanced) {
-      timeline.resume();
-      timeline.skip(6, 'Skipped by user');
-      return;
-    }
-    timeline.resume();
-
-    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) {
-      timeline.addChild(6, `${pkgStatus.installed.length} packages already installed`, 'info');
-    }
-
-    const allToInstall = [...pkgStatus.toInstall, ...pkgStatus.toUpdate];
-
-    if (allToInstall.length === 0) {
-      timeline.complete(6, `${pkgStatus.installed.length} packages ready`);
-      return;
-    }
-
-    // Show what needs to be installed/updated with tree connector
-    console.log(`\n  ${pipe}`);
-    console.log(`  ${branch} ${chalk.cyan('Packages to install/update:')}`);
-
-    const showPkgs = allToInstall.slice(0, 10);
-    const hasMore = allToInstall.length > 10;
-
-    for (let i = 0; i < showPkgs.length; i++) {
-      const pkg = showPkgs[i];
-      const isLast = i === showPkgs.length - 1 && !hasMore;
-      const prefix = isLast ? corner : branch;
-      if (pkg.current) {
-        console.log(`  ${pipe}   ${prefix} ${chalk.blue('~')} ${pkg.name}: ${pkg.current} → ${pkg.required}`);
-      } else {
-        console.log(`  ${pipe}   ${prefix} ${chalk.green('+')} ${pkg.name}: ${pkg.required || 'latest'}`);
-      }
-    }
-    if (hasMore) {
-      console.log(`  ${pipe}   ${corner} ${chalk.dim(`... and ${allToInstall.length - 10} more`)}`);
-    }
-    console.log(`  ${pipe}`);
-
-    timeline.pause();
-    const { confirmPkgs } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'confirmPkgs',
-      message: `Install/update ${allToInstall.length} packages?`,
-      default: true
-    }]);
-    timeline.resume();
-
-    if (confirmPkgs) {
-      await installPackages(libPythonDir, allToInstall, timeline, 6, pythonCmd);
-      timeline.complete(6, `${pkgStatus.installed.length + allToInstall.length} packages`);
-    } else {
-      timeline.skip(6, 'User skipped');
-    }
-  }
-
-  // Check Python availability first
+  // Check if lib/python exists
+  if (!fs.existsSync(libPythonDir)) {
+    timeline.addChild(6, 'No lib/python folder', 'skip');
+    timeline.complete(6, 'Skipped');
+    timeline.skip(7, 'No dependencies');
+
+    // Cleanup and finish
+    try { fs.rmSync(tempDir, { recursive: true, force: true }); } catch {}
+    const ver = selectedVersion.replace(/^v/, '');
+    console.log(chalk.green(`\n  ✓ CSK v${ver} ${isUpdate ? 'updated' : 'installed'} successfully!\n`));
+    console.log(chalk.cyan('  Quick Start\n'));
+    console.log(chalk.dim('  1. Open Claude Code:'));
+    console.log(`     ${chalk.white('claude')}\n`);
+    console.log(chalk.dim('  2. Start with CSK:'));
+    console.log(`     ${chalk.white('/csk')}\n`);
+    return;
+  }
+
+  // Check Python availability
   let pythonInfo = detectPython();
   let pythonReady = false;
 
   if (!pythonInfo.found) {
-    console.log('');
-    console.log(chalk.yellow('  Python not found on this system.'));
-    console.log(chalk.dim('  Python is required for:'));
-    console.log(chalk.dim('    - Data fetching and analysis'));
-    console.log(chalk.dim('    - Chart generation'));
-    console.log(chalk.dim('    - MCP server tools'));
-    console.log('');
+    timeline.addChild(6, 'Python not found', 'skip');
 
     // Check if we can auto-install
     const autoInstall = canAutoInstall();
 
     if (autoInstall.canInstall) {
+      console.log('');
+      console.log(chalk.yellow('  Python not found on this system.'));
       console.log(chalk.cyan(`  Auto-install available via ${autoInstall.manager}`));
-      if (autoInstall.needsSudo) {
-        console.log(chalk.dim('  (requires sudo password)'));
-      }
-      console.log(chalk.dim(`  Command: ${autoInstall.command}`));
       console.log('');
 
       timeline.pause();
@@ -786,11 +658,9 @@ async function initCommand(options) {
       timeline.resume();
 
       if (doInstall) {
-        console.log('');
         timeline.addChild(6, `Installing via ${autoInstall.manager}...`, 'update');
-
         const result = await installPython((msg) => {
-          console.log(chalk.dim(`  ${msg}`));
+          console.log(chalk.dim(`     ${msg}`));
         });
 
         if (result.success) {
@@ -798,43 +668,85 @@ async function initCommand(options) {
           timeline.addChild(6, `Python ${result.version} installed`, 'new');
           pythonReady = true;
         } else {
-          console.log('');
-          console.log(chalk.red(`  ${result.error}`));
-          console.log(chalk.dim('  You may need to restart your terminal after installation.'));
-          console.log('');
-          timeline.skip(6, 'Installation failed');
+          timeline.addChild(6, 'Installation failed', 'skip');
+          timeline.complete(6, 'Failed');
+          timeline.skip(7, 'No Python');
         }
       } else {
-        timeline.skip(6, 'User declined install');
+        timeline.complete(6, 'Skipped');
+        timeline.skip(7, 'No Python');
       }
     } else {
-      // No package manager - show manual instructions
+      // Show manual instructions
       const instructions = getInstallInstructions();
-      console.log(chalk.bold(`  Install via ${instructions.method}:\n`));
-      for (const cmd of instructions.commands.slice(0, 4)) {
-        if (cmd.startsWith('#')) {
-          console.log(chalk.dim(`  ${cmd}`));
-        } else if (cmd !== '') {
-          console.log(chalk.cyan(`    ${cmd}`));
-        }
-      }
       console.log('');
-      timeline.skip(6, 'Python not installed');
+      console.log(chalk.yellow('  Python not found. Install via:'));
+      console.log(chalk.cyan(`    ${instructions.commands[0]}`));
+      console.log('');
+      timeline.complete(6, 'Python needed');
+      timeline.skip(7, 'No Python');
     }
   } else if (!pythonInfo.meetsMinimum) {
-    console.log('');
-    console.log(chalk.yellow(`  Python ${pythonInfo.version} found, but 3.8+ required.`));
-    console.log(chalk.dim('  Please upgrade Python to use advanced features.'));
-    console.log('');
-    timeline.skip(6, `Python ${pythonInfo.version} too old`);
+    timeline.addChild(6, `Python ${pythonInfo.version} (need 3.8+)`, 'skip');
+    timeline.complete(6, 'Upgrade needed');
+    timeline.skip(7, 'Python too old');
   } else {
     pythonReady = true;
+    timeline.addChild(6, `Python ${pythonInfo.version}`, 'info');
+  }
+
+  // If Python not ready, exit early
+  if (!pythonReady) {
+    try { fs.rmSync(tempDir, { recursive: true, force: true }); } catch {}
+    const ver = selectedVersion.replace(/^v/, '');
+    console.log(chalk.green(`\n  ✓ CSK v${ver} ${isUpdate ? 'updated' : 'installed'} successfully!\n`));
+    console.log(chalk.dim('  Note: Python dependencies not installed.\n'));
+    return;
   }
 
-  // Install packages if Python is ready
-  if (pythonReady && pythonInfo.meetsMinimum) {
-    timeline.addChild(6, `Python ${pythonInfo.version} (${pythonInfo.command})`, 'update');
-    await handlePythonPackages(pythonInfo.command);
+  // Check packages
+  const pkgStatus = checkPythonPackages(libPythonDir);
+  const allToInstall = [...pkgStatus.toInstall, ...pkgStatus.toUpdate];
+
+  if (pkgStatus.installed.length > 0) {
+    timeline.addChild(6, `${pkgStatus.installed.length} packages OK`, 'info');
+  }
+
+  if (allToInstall.length === 0) {
+    timeline.complete(6, 'All ready');
+    timeline.skip(7, 'Nothing to install');
+  } else {
+    // Show packages to install/update
+    for (const pkg of allToInstall.slice(0, 5)) {
+      if (pkg.current) {
+        timeline.addChild(6, `${pkg.name}: ${pkg.current} → ${pkg.required}`, 'update');
+      } else {
+        timeline.addChild(6, `${pkg.name}: ${pkg.required || 'latest'}`, 'new');
+      }
+    }
+    if (allToInstall.length > 5) {
+      timeline.addChild(6, `... and ${allToInstall.length - 5} more`, 'info');
+    }
+    timeline.complete(6, `${allToInstall.length} to install`);
+
+    // Step 8: Install packages
+    timeline.start(7);
+
+    timeline.pause();
+    const { confirmPkgs } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'confirmPkgs',
+      message: `Install ${allToInstall.length} packages?`,
+      default: true
+    }]);
+    timeline.resume();
+
+    if (confirmPkgs) {
+      await installPackages(libPythonDir, allToInstall, timeline, 7, pythonInfo.command);
+      timeline.complete(7, `${pkgStatus.installed.length + allToInstall.length} packages`);
+    } else {
+      timeline.skip(7, 'Skipped');
+    }
   }
 
   // Cleanup temp files