primo-cli 0.1.5 → 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/commands/pull-library.d.ts

@@ -1,6 +1,6 @@
 interface PullLibraryOptions {
     server?: string;
-    output: string;
+    output?: string;
     token?: string;
 }
 export declare function pull_library(options: PullLibraryOptions): Promise<void>;

package/dist/commands/pull-library.js

@@ -40,7 +40,7 @@ export async function pull_library(options) {
         if (token) {
             headers.Authorization = `Bearer ${token}`;
         }
-        const output_dir = path.resolve(options.output);
+        const output_dir = path.resolve(options.output || '.');
         await fs.mkdir(output_dir, { recursive: true });
         spinner.text = 'Exporting library...';
         const response = await fetch(`${server}/api/palacms/export-library`, {

package/dist/commands/pull.d.ts

@@ -1,6 +1,6 @@
 interface PullOptions {
     server?: string;
-    output: string;
+    output?: string;
     token?: string;
 }
 export declare function pull_site(options: PullOptions): Promise<void>;

package/dist/commands/pull.js

@@ -6,7 +6,7 @@ import extract from 'extract-zip';
 import { dump as dump_yaml, load as load_yaml } from 'js-yaml';
 import { get_auth_token } from '../utils/auth.js';
 import { write_site_config } from '../utils/site-config.js';
-import { write_server_config } from '../utils/server-config.js';
+import { read_server_config, write_server_config } from '../utils/server-config.js';
 async function detect_server() {
     const ports = [3000, 8080, 5173];
     for (const port of ports) {
@@ -36,19 +36,40 @@ function server_folder_name(server) {
         return 'primo-server';
     }
 }
+async function read_configured_server(dir) {
+    const config = await read_configured_server_config(dir);
+    return config?.server || null;
+}
+async function read_configured_server_config(dir) {
+    try {
+        return await read_server_config(dir);
+    }
+    catch {
+        return null;
+    }
+}
 export async function pull_site(options) {
     const spinner = ora('Connecting...').start();
     try {
-        // Resolve server (flag > local detect)
+        // Resolve server (flag > server.yaml in cwd > local detect)
         let server;
+        let used_configured = false;
         if (options.server) {
             server = options.server.replace(/\/+$/, '');
         }
         else {
-            spinner.text = 'Looking for local server...';
-            const detected = await detect_server();
-            server = (detected || 'http://localhost:3000').replace(/\/+$/, '');
-            spinner.text = `Using ${server}`;
+            const configured = await read_configured_server(process.cwd());
+            if (configured) {
+                server = configured;
+                used_configured = true;
+                spinner.text = `Using ${server}`;
+            }
+            else {
+                spinner.text = 'Looking for local server...';
+                const detected = await detect_server();
+                server = (detected || 'http://localhost:3000').replace(/\/+$/, '');
+                spinner.text = `Using ${server}`;
+            }
         }
         // Auth (optional for local)
         const token = options.token || await get_auth_token(server);
@@ -56,11 +77,13 @@ export async function pull_site(options) {
         if (token) {
             headers['Authorization'] = `Bearer ${token}`;
         }
-        // Decide root dir: if --output is default ('.'), nest under server hostname.
-        // Otherwise use --output verbatim.
-        const root_dir = options.output === '.'
-            ? path.resolve(server_folder_name(server))
-            : path.resolve(options.output);
+        // Decide root dir: explicit --output wins; if cwd already has a configured
+        // server.yaml, pull in place; otherwise nest under server hostname.
+        const root_dir = options.output
+            ? path.resolve(options.output)
+            : used_configured
+                ? process.cwd()
+                : path.resolve(server_folder_name(server));
         await fs.mkdir(root_dir, { recursive: true });
         // List all sites
         spinner.text = 'Fetching sites...';
@@ -104,10 +127,13 @@ export async function pull_site(options) {
         }
         // Fetch site groups so server.yaml has them
         const site_groups = await fetch_site_groups(server, headers);
-        // Write minimal server.yaml so MCP registration + dev work at the root
+        // Preserve any existing server.yaml (port, format, server URL) and just
+        // refresh site_groups from the source of truth.
+        const existing = await read_configured_server_config(root_dir);
         await write_server_config(root_dir, {
-            port: 3000,
-            site_groups: site_groups.length > 0 ? site_groups : undefined
+            ...existing,
+            port: existing?.port ?? 3000,
+            site_groups: site_groups.length > 0 ? site_groups : existing?.site_groups
         });
         spinner.succeed(`Server pulled to ${chalk.cyan(root_dir)}`);
         console.log('');

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.
@@ -91,22 +96,28 @@ ${chalk.bold('See also')}
 `)
     .action((server, options) => push_site({ ...options, server: server || options.server }));
 program
-    .command('pull [server]')
-    .description('Pull entire server (all sites + library) to local files')
+    .command('pull [server] [dir]')
+    .description('Pull entire server (all sites + library) to local files (defaults to ./<server-hostname>)')
     .option('-s, --server <url>', 'Server URL (auto-detects local)')
-    .option('-o, --output <dir>', 'Output directory (defaults to ./<server-hostname>)', '.')
     .option('-t, --token <token>', 'Auth token')
-    .action((server, options) => pull_site({ ...options, server: server || options.server }));
+    .action((server, dir, options) => pull_site({
+    ...options,
+    server: server || options.server,
+    output: dir
+}));
 const library = program
     .command('library')
     .description('Manage shared block library');
 library
-    .command('pull [server]')
+    .command('pull [server] [dir]')
     .description('Pull shared library to local files')
     .option('-s, --server <url>', 'Server URL (auto-detects local)')
-    .option('-o, --output <dir>', 'Output directory', '.')
     .option('-t, --token <token>', 'Auth token')
-    .action((server, options) => pull_library({ ...options, server: server || options.server }));
+    .action((server, dir, options) => pull_library({
+    ...options,
+    server: server || options.server,
+    output: dir
+}));
 library
     .command('push [server]')
     .description('Push local shared library to hosted CMS')

package/package.json

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