projax 1.0.0 → 1.0.2

package/dist/electron/main.js

@@ -492,33 +492,56 @@ electron_1.ipcMain.handle('open-in-editor', async (_, projectPath) => {
 });
 // Get settings
 electron_1.ipcMain.handle('get-settings', async () => {
-    // Try bundled path first (when bundled in CLI: dist/electron/main.js -> dist/core)
-    // Then try local dev path (packages/electron/dist/main.js -> packages/core/dist)
-    const bundledCorePath = path.join(__dirname, '..', 'core');
-    const localCorePath = path.join(__dirname, '..', '..', '..', 'core', 'dist');
-    let corePath;
-    if (fs.existsSync(bundledCorePath)) {
-        corePath = bundledCorePath;
+    try {
+        // Use the same import pattern as other handlers
+        let settingsModule;
+        try {
+            // Try relative import first (when bundled in CLI: dist/electron/main.js -> dist/core)
+            settingsModule = require('../core');
+        }
+        catch {
+            try {
+                // Try alternative path (local development: packages/electron/dist/main.js -> packages/cli/dist/core)
+                settingsModule = require('../../cli/dist/core');
+            }
+            catch {
+                // Fallback to package import
+                settingsModule = require('@projax/core');
+            }
+        }
+        const { getAppSettings } = settingsModule;
+        return getAppSettings();
     }
-    else {
-        corePath = localCorePath;
+    catch (error) {
+        console.error('Error getting settings:', error);
+        throw error;
     }
-    const { getAppSettings } = await Promise.resolve(`${corePath}`).then(s => __importStar(require(s)));
-    return getAppSettings();
 });
 // Save settings
 electron_1.ipcMain.handle('save-settings', async (_, settings) => {
-    // Try bundled path first (when bundled in CLI: dist/electron/main.js -> dist/core)
-    // Then try local dev path (packages/electron/dist/main.js -> packages/core/dist)
-    const bundledCorePath = path.join(__dirname, '..', 'core');
-    const localCorePath = path.join(__dirname, '..', '..', '..', 'core', 'dist');
-    let corePath;
-    if (fs.existsSync(bundledCorePath)) {
-        corePath = bundledCorePath;
+    try {
+        // Use the same import pattern as other handlers
+        let settingsModule;
+        try {
+            // Try relative import first (when bundled in CLI: dist/electron/main.js -> dist/core)
+            settingsModule = require('../core');
+        }
+        catch {
+            try {
+                // Try alternative path (local development: packages/electron/dist/main.js -> packages/cli/dist/core)
+                settingsModule = require('../../cli/dist/core');
+            }
+            catch {
+                // Fallback to package import
+                settingsModule = require('@projax/core');
+            }
+        }
+        const { setAppSettings } = settingsModule;
+        setAppSettings(settings);
+        console.log('Settings saved successfully');
     }
-    else {
-        corePath = localCorePath;
+    catch (error) {
+        console.error('Error saving settings:', error);
+        throw error;
     }
-    const { setAppSettings } = await Promise.resolve(`${corePath}`).then(s => __importStar(require(s)));
-    setAppSettings(settings);
 });

package/dist/electron/script-runner.js

@@ -577,39 +577,59 @@ function updateProcessUrls(pid, urls) {
 async function stopScript(pid) {
     try {
         const processes = loadProcesses();
-        const process = processes.find(p => p.pid === pid);
-        if (!process) {
+        const processInfo = processes.find(p => p.pid === pid);
+        if (!processInfo) {
             return false;
         }
-        // Try to kill the process (cross-platform)
-        // Use os.platform() since 'process' variable shadows Node's process
-        if (os.platform() === 'win32') {
-            try {
+        // Check if process is still running before trying to kill it
+        let processExists = false;
+        try {
+            if (os.platform() === 'win32') {
                 const { exec } = require('child_process');
                 const { promisify } = require('util');
                 const execAsync = promisify(exec);
-                await execAsync(`taskkill /F /PID ${pid}`);
-            }
-            catch {
-                // Process may already be dead
+                await execAsync(`tasklist /FI "PID eq ${pid}" /FO CSV /NH`);
+                processExists = true;
             }
-        }
-        else {
-            try {
+            else {
                 const { exec } = require('child_process');
                 const { promisify } = require('util');
                 const execAsync = promisify(exec);
-                await execAsync(`kill -9 ${pid}`);
+                await execAsync(`ps -p ${pid} -o pid=`);
+                processExists = true;
             }
-            catch {
-                // Process may already be dead
+        }
+        catch {
+            // Process doesn't exist anymore
+            processExists = false;
+        }
+        // Try to kill the process (cross-platform)
+        if (processExists) {
+            try {
+                if (os.platform() === 'win32') {
+                    const { exec } = require('child_process');
+                    const { promisify } = require('util');
+                    const execAsync = promisify(exec);
+                    await execAsync(`taskkill /F /PID ${pid}`);
+                }
+                else {
+                    const { exec } = require('child_process');
+                    const { promisify } = require('util');
+                    const execAsync = promisify(exec);
+                    await execAsync(`kill -9 ${pid}`);
+                }
+            }
+            catch (error) {
+                // Process may have already exited
+                console.error(`Error killing process ${pid}:`, error);
             }
         }
-        // Remove from tracking
+        // Remove from tracking regardless of whether kill succeeded
         removeProcess(pid);
         return true;
     }
     catch (error) {
+        console.error(`Error stopping script ${pid}:`, error);
         return false;
     }
 }

package/dist/index.js

@@ -42,21 +42,21 @@ const script_runner_1 = require("./script-runner");
 const port_scanner_1 = require("./port-scanner");
 // Read version from package.json
 const packageJson = require('../package.json');
-// ASCII logo for projax
+// ASCII logo for projax - using a clearer style that shows all 6 letters
 function displayLogo() {
     return `
-╔═══════════════════════════════════════╗
-║                                       ║
-║    ██████╗ ██████╗  ██████╗ ██╗  ██╗  ║
-║    ██╔══██╗██╔══██╗██╔═══██╗╚██╗██╔╝  ║
-║    ██████╔╝██████╔╝██║   ██║ ╚███╔╝   ║
-║    ██╔═══╝ ██╔══██╗██║   ██║ ██╔██╗   ║
-║    ██║     ██║  ██║╚██████╔╝██╔╝ ██╗  ║
-║    ╚═╝     ╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═╝  ║
-║                                       ║
-║         Project Management CLI        ║
-║                                       ║
-╚═══════════════════════════════════════╝
+╔═══════════════════════════════════════════════════════╗
+║                                                       ║
+║     ██████╗ ██████╗  ██████╗      ██╗  ██╗ █████╗ ██╗  ║
+║     ██╔══██╗██╔══██╗██╔═══██╗     ██║  ██║██╔══██╗╚██╗ ║
+║     ██████╔╝██████╔╝██║   ██║     ███████║╚█████╔╝ ╚██║ ║
+║     ██╔═══╝ ██╔══██╗██║   ██║██   ██╔══██║██╔══██╗ ██║ ║
+║     ██║     ██║  ██║╚██████╔╝╚█████╔╝██║╚█████╔╝ ██║ ║
+║     ╚═╝     ╚═╝  ╚═╝ ╚═════╝  ╚════╝ ╚═╝ ╚════╝  ╚═╝ ║
+║                                                       ║
+║              Version ${packageJson.version}              ║
+║                                                       ║
+╚═══════════════════════════════════════════════════════╝
 `;
 }
 const program = new commander_1.Command();
@@ -985,12 +985,6 @@ program
         }
     }
     // If we get here, proceed with normal command parsing
-    // Check if no arguments provided - show help with logo
-    if (args.length === 0) {
-        console.log(displayLogo());
-        program.help();
-    }
-    else {
-        program.parse();
-    }
+    // Don't show logo twice - it's already in addHelpText
+    program.parse();
 })();

package/dist/script-runner.js

@@ -577,39 +577,59 @@ function updateProcessUrls(pid, urls) {
 async function stopScript(pid) {
     try {
         const processes = loadProcesses();
-        const process = processes.find(p => p.pid === pid);
-        if (!process) {
+        const processInfo = processes.find(p => p.pid === pid);
+        if (!processInfo) {
             return false;
         }
-        // Try to kill the process (cross-platform)
-        // Use os.platform() since 'process' variable shadows Node's process
-        if (os.platform() === 'win32') {
-            try {
+        // Check if process is still running before trying to kill it
+        let processExists = false;
+        try {
+            if (os.platform() === 'win32') {
                 const { exec } = require('child_process');
                 const { promisify } = require('util');
                 const execAsync = promisify(exec);
-                await execAsync(`taskkill /F /PID ${pid}`);
-            }
-            catch {
-                // Process may already be dead
+                await execAsync(`tasklist /FI "PID eq ${pid}" /FO CSV /NH`);
+                processExists = true;
             }
-        }
-        else {
-            try {
+            else {
                 const { exec } = require('child_process');
                 const { promisify } = require('util');
                 const execAsync = promisify(exec);
-                await execAsync(`kill -9 ${pid}`);
+                await execAsync(`ps -p ${pid} -o pid=`);
+                processExists = true;
             }
-            catch {
-                // Process may already be dead
+        }
+        catch {
+            // Process doesn't exist anymore
+            processExists = false;
+        }
+        // Try to kill the process (cross-platform)
+        if (processExists) {
+            try {
+                if (os.platform() === 'win32') {
+                    const { exec } = require('child_process');
+                    const { promisify } = require('util');
+                    const execAsync = promisify(exec);
+                    await execAsync(`taskkill /F /PID ${pid}`);
+                }
+                else {
+                    const { exec } = require('child_process');
+                    const { promisify } = require('util');
+                    const execAsync = promisify(exec);
+                    await execAsync(`kill -9 ${pid}`);
+                }
+            }
+            catch (error) {
+                // Process may have already exited
+                console.error(`Error killing process ${pid}:`, error);
             }
         }
-        // Remove from tracking
+        // Remove from tracking regardless of whether kill succeeded
         removeProcess(pid);
         return true;
     }
     catch (error) {
+        console.error(`Error stopping script ${pid}:`, error);
         return false;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projax",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "CLI tool for managing local development projects",
   "main": "dist/index.js",
   "bin": {
@@ -12,7 +12,7 @@
     "copy:electron": "mkdir -p dist/electron && cp -r ../electron/dist/* dist/electron/ && cp dist/script-runner.* dist/electron/ && cp dist/port-*.* dist/electron/",
     "build:all": "npm run build && npm run build:electron && npm run copy:electron",
     "clean": "rm -rf dist",
-    "prepublishOnly": "npm run build:all",
+    "prepublishOnly": "npm run build",
     "postinstall": "node rebuild-sqlite.js || true",
     "rebuild:electron": "node rebuild-sqlite.js"
   },