primo-cli 0.1.6 → 0.1.7

package/dist/commands/dev.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { createHash, randomInt } from 'crypto';
 import chalk from 'chalk';
 import ora from 'ora';
-import { spawn } from 'child_process';
+import { spawn, execFileSync } from 'child_process';
 import archiver from 'archiver';
 import extract from 'extract-zip';
 import { dump as dump_yaml, load as load_yaml } from 'js-yaml';
@@ -420,18 +420,51 @@ async function kill_port(port) {
                 resolve(false);
                 return;
             }
+            // Don't kill ourselves or our ancestors — lsof returns every PID
+            // holding the port, which on macOS includes parent processes that
+            // inherited the fd. SIGKILL'ing them takes this CLI down too.
+            const self_ancestry = get_self_ancestry();
+            let killed_any = false;
             for (const pid of pid_list) {
+                const pid_num = parseInt(pid, 10);
+                if (self_ancestry.has(pid_num))
+                    continue;
                 try {
-                    process.kill(parseInt(pid, 10), 'SIGKILL');
+                    process.kill(pid_num, 'SIGKILL');
+                    killed_any = true;
                 }
                 catch {
                     // Process may have already exited
                 }
             }
-            resolve(true);
+            resolve(killed_any);
         });
     });
 }
+function get_self_ancestry() {
+    const ancestry = new Set();
+    let pid = process.pid;
+    while (pid && pid > 1) {
+        ancestry.add(pid);
+        pid = get_parent_pid(pid);
+        if (pid && ancestry.has(pid))
+            break;
+    }
+    return ancestry;
+}
+function get_parent_pid(pid) {
+    try {
+        const result = execFileSync('ps', ['-o', 'ppid=', '-p', String(pid)], {
+            encoding: 'utf-8',
+            stdio: ['ignore', 'pipe', 'ignore']
+        });
+        const parsed = parseInt(String(result).trim(), 10);
+        return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 // Fetch with timeout helper
 async function fetch_with_timeout(url, options = {}, timeout_ms = 10000) {
     const controller = new AbortController();
@@ -970,8 +1003,12 @@ export async function dev_server(options) {
         console.log(chalk.dim('  Press Ctrl+C to stop'));
         // Handle cleanup
         const cleanup = async () => {
-            if (is_cleaning_up)
-                return;
+            if (is_cleaning_up) {
+                // Second Ctrl-C while we're still cleaning up — bail immediately
+                // so the user isn't stuck waiting on an in-flight push/sync.
+                console.log(chalk.dim('\n  Force exit'));
+                process.exit(130);
+            }
             is_cleaning_up = true;
             console.log(chalk.dim('\n  Shutting down...'));
             for (const watcher of watchers) {

package/dist/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { Command } from 'commander';
 import chalk from 'chalk';
 import { init_workspace } from './commands/init.js';
@@ -12,11 +15,13 @@ import { login } from './commands/login.js';
 import { validate_site } from './commands/validate.js';
 import { deploy } from './commands/deploy.js';
 import { build_site } from './commands/build.js';
+const pkg_path = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+const pkg_version = JSON.parse(fs.readFileSync(pkg_path, 'utf-8')).version;
 const program = new Command();
 program
     .name('primo')
     .description('Build sites visually, edit them anywhere')
-    .version('0.1.3');
+    .version(pkg_version);
 // Top-level help: prepend a Deploy-vs-build-vs-push decision tree so first-time
 // users can pick a command without reading every description. Use 'before' so
 // it only renders for the root program, not subcommand help.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primo-cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Local development CLI for Primo",
   "type": "module",
   "bin": {