stigmergy 1.2.12 → 1.3.2-beta.0

package/src/core/installer.js

@@ -6,9 +6,11 @@ const inquirer = require('inquirer');
 const SmartRouter = require('./smart_router');
 const { errorHandler } = require('./error_handler');
 const MemoryManager = require('./memory_manager');
+const EnhancedCLIInstaller = require('./enhanced_cli_installer');
 
-class StigmergyInstaller {
-  constructor() {
+class StigmergyInstaller extends EnhancedCLIInstaller {
+  constructor(options = {}) {
+    super(options);
     this.router = new SmartRouter();
     this.memory = new MemoryManager();
     this.configDir = path.join(os.homedir(), '.stigmergy');
@@ -48,36 +50,38 @@ class StigmergyInstaller {
             codexPath.endsWith('/codex') ||
             codexPath.endsWith('\\codex')
           ) {
-            // Read the script to find the JS file path
-            const fsSync = require('fs');
-            const scriptContent = fsSync.readFileSync(codexPath, 'utf8');
-
-            // Look for JS file reference in the script
-            const jsFileMatch = scriptContent.match(
-              /(["'])(.*?codex\.js.*?)\1/,
-            );
-            if (jsFileMatch) {
-              const jsFilePath = jsFileMatch[2];
-              // Check if JS file exists and is not empty
-              if (fsSync.existsSync(jsFilePath)) {
-                const stats = fsSync.statSync(jsFilePath);
-                if (stats.size === 0) {
-                  console.log(
-                    '[DEBUG] Codex JS file is empty, marking as unavailable',
-                  );
-                  return false;
+            // Try to verify JS file, but don't fail if we can't
+            // The actual --version test below is more reliable
+            try {
+              const fsSync = require('fs');
+              const scriptContent = fsSync.readFileSync(codexPath, 'utf8');
+
+              // Look for JS file reference in the script
+              // Match node_modules/@openai/codex/bin/codex.js pattern
+              const jsFileMatch = scriptContent.match(/node_modules\/@openai\/codex\/bin\/codex\.js/);
+              if (jsFileMatch) {
+                // Construct actual path based on npm global directory
+                const npmGlobalDir = require('path').dirname(codexPath);
+                const jsFilePath = require('path').join(npmGlobalDir, jsFileMatch[0]);
+
+                if (fsSync.existsSync(jsFilePath)) {
+                  const stats = fsSync.statSync(jsFilePath);
+                  if (stats.size === 0) {
+                    console.log('[DEBUG] Codex JS file is empty, marking as unavailable');
+                    return false;
+                  }
+                  // File exists and has content - continue to version check
+                } else {
+                  console.log('[DEBUG] Codex JS file not found at expected path, will try version check');
                 }
-              } else {
-                console.log(
-                  '[DEBUG] Codex JS file does not exist, marking as unavailable',
-                );
-                return false;
               }
+            } catch (scriptError) {
+              console.log(`[DEBUG] Could not verify codex script: ${scriptError.message}`);
+              // Continue anyway - the version check below is more reliable
             }
           }
 
-          // If we got here, the codex command exists and seems valid
-          // Continue with normal checks below
+          // If we got here, the codex command exists - continue with normal checks below
         } else {
           // Codex command doesn't exist
           return false;
@@ -109,8 +113,9 @@ class StigmergyInstaller {
         };
 
         // Additional protection for codex
+        // Note: codex requires shell=true on Windows to work properly
         if (toolName === 'codex') {
-          testOptions.shell = false;
+          // Keep shell=true for codex (don't override)
           testOptions.windowsHide = true;
           testOptions.detached = false;
         }
@@ -132,6 +137,7 @@ class StigmergyInstaller {
     // Special handling for codex to avoid opening files
     if (toolName === 'codex') {
       // For codex, only try --help and --version with extra precautions
+      // Note: codex requires shell=true on Windows
       const codexChecks = [
         { args: ['--help'], expected: 0 },
         { args: ['--version'], expected: 0 },
@@ -143,7 +149,7 @@ class StigmergyInstaller {
             encoding: 'utf8',
             timeout: 10000,
             stdio: ['pipe', 'pipe', 'pipe'], // Ensure all IO is piped
-            shell: false, // Don't use shell to avoid extra window opening
+            shell: true, // Use shell for codex compatibility
             windowsHide: true, // Hide console window on Windows
             detached: false, // Don't detach process
           });
@@ -305,53 +311,28 @@ class StigmergyInstaller {
 
   /**
    * Install selected CLI tools
+   * 统一调用父类EnhancedCLIInstaller的实现
    */
   async installTools(selectedTools, missingTools) {
-    const chalk = require('chalk');
-    let successCount = 0;
-
-    for (const toolName of selectedTools) {
-      const toolInfo = missingTools[toolName];
-      if (!toolInfo) continue;
-
-      console.log(`\n[INSTALL] Installing ${toolInfo.name}...`);
-      console.log(chalk.yellow(`Command: ${toolInfo.install}`));
-
-      try {
-        // Parse the install command
-        const [command, ...args] = toolInfo.install.split(' ');
-
-        // Execute the installation command
-        const result = spawnSync(command, args, {
-          stdio: 'inherit',  // Show output in real-time
-          shell: true,       // Use shell for npm commands
-          encoding: 'utf-8'
-        });
-
-        if (result.status === 0) {
-          console.log(chalk.green(`[OK] Successfully installed ${toolInfo.name}`));
-          successCount++;
-        } else {
-          console.log(chalk.red(`[ERROR] Failed to install ${toolInfo.name}. Exit code: ${result.status}`));
-          // Continue with other tools
+    // 调用父类的增强安装功能
+    const result = await super.installTools(selectedTools, missingTools);
+
+    // 保留StigmergyInstaller的特有功能：生成cross-CLI hooks
+    if (result && result.successful > 0) {
+      console.log('\n[HOOKS] Generating cross-CLI integration hooks...');
+      for (const toolName of selectedTools) {
+        const toolInfo = missingTools[toolName];
+        if (toolInfo && this.results.installations[toolName]?.success) {
+          try {
+            await this.generateToolHook(toolName, toolInfo);
+          } catch (error) {
+            console.log(`[WARN] Failed to generate hook for ${toolName}: ${error.message}`);
+          }
         }
-      } catch (error) {
-        console.log(chalk.red(`[ERROR] Installation failed for ${toolInfo.name}: ${error.message}`));
-        // Continue with other tools
       }
     }
 
-    if (successCount > 0) {
-      console.log(chalk.green(`\n[INSTALL] Successfully installed ${successCount}/${selectedTools.length} tools`));
-
-      // Add a short delay to ensure installations are complete
-      await new Promise(resolve => setTimeout(resolve, 2000));
-
-      return true;
-    } else {
-      console.log(chalk.red('[INSTALL] No tools were successfully installed'));
-      return false;
-    }
+    return result;
   }
 
   /**