primo-cli 0.1.4 → 0.1.6

package/dist/commands/login.js

@@ -21,7 +21,7 @@ export async function login(options) {
     if (!server_url) {
         console.log('');
         console.log(chalk.red('Server URL required.'));
-        console.log(chalk.dim('  Pass -s <url>, or run from a workspace whose server.yaml has a `server:` field.'));
+        console.log(chalk.dim('  Pass it as the first argument, use -s <url>, or run from a workspace whose server.yaml has a `server:` field.'));
         console.log('');
         process.exit(1);
     }

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...';
@@ -75,7 +98,7 @@ export async function pull_site(options) {
         const sites = sites_data.items || [];
         if (sites.length === 0) {
             if (!token) {
-                spinner.fail(`Not authenticated. Run \`primo login --server ${server}\` first.`);
+                spinner.fail(`Not authenticated. Run \`primo login ${server}\` first.`);
             }
             else {
                 spinner.fail('No sites visible — your token may be expired. Try `primo login` again.');
@@ -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

@@ -91,22 +91,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')
@@ -115,11 +121,11 @@ library
     .option('-t, --token <token>', 'Auth token')
     .action((server, options) => push_library({ ...options, server: server || options.server }));
 program
-    .command('login')
+    .command('login [server]')
     .description('Login to hosted CMS')
     .option('-s, --server <url>', 'Server URL (defaults to `server:` in server.yaml)')
     .option('-e, --email <email>', 'Email')
-    .action(login);
+    .action((server, options) => login({ ...options, server: server || options.server }));
 program
     .command('validate')
     .description('Validate site structure')

package/package.json

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