primo-cli 0.1.11 → 0.1.13

package/dist/commands/deploy.js

@@ -230,10 +230,10 @@ async function check_provider_auth(provider) {
 // Bump to a release tag (:v3.0.0) when primocms cuts a stable release.
 const PRIMO_SERVER_IMAGE = 'ghcr.io/primocms/primo:main';
 async function generate_dockerfile(inventory) {
-    // One-line Dockerfile: pull the published palacms image and run it
+    // One-line Dockerfile: pull the published primo image and run it
     // unchanged. Workspace data (server.yaml, sites/, library/) is uploaded
-    // after deploy via `primo push`, which calls /api/palacms/bootstrap on
-    // first push (server with no sites) and /api/palacms/import/<id> on
+    // after deploy via `primo push`, which calls /api/primo/bootstrap on
+    // first push (server with no sites) and /api/primo/import/<id> on
     // subsequent pushes. The volume mounted at /app/pb_data persists the
     // SQLite database between restarts.
     void inventory;
@@ -255,7 +255,7 @@ EXPOSE 8080
 }
 async function generate_fly_toml(inventory) {
     const app_name = workspace_app_name(inventory.root_dir);
-    // palacms binds 0.0.0.0:8080 in its CMD; mount /app/pb_data on a persistent
+    // primo binds 0.0.0.0:8080 in its CMD; mount /app/pb_data on a persistent
     // volume so the SQLite db + uploads survive restarts. Auto-start/stop keeps
     // the small instance free-tier-friendly.
     const fly_toml = `app = "${app_name}"

package/dist/commands/dev.js

@@ -33,7 +33,7 @@ let is_importing_library = false;
 let has_pending_library_local_changes = false;
 let site_sync_baselines = new Map();
 // Tracks the last set of conflict paths logged per site so we don't reprint
-// the same conflict block every pull cycle when palacms's serialization
+// the same conflict block every pull cycle when primo's serialization
 // keeps producing the same divergence (e.g. data-key mangling, key reorder).
 const last_logged_conflicts = new Map();
 // Track files written by sync to prevent watcher from re-pushing them.
@@ -254,7 +254,7 @@ function hash_snapshot_content(contents) {
 function snapshot_value(snapshot, file_path) {
     return snapshot.has(file_path) ? snapshot.get(file_path) : null;
 }
-// Reads a file but treats ENOENT as a soft miss — palacms' export step can
+// Reads a file but treats ENOENT as a soft miss — primo' export step can
 // reshape the on-disk layout (e.g. promoting pages/foo.yaml to
 // pages/foo/index.yaml when a child route is added) between when a directory
 // listing is captured and when each file is read. The vanished file isn't an
@@ -273,7 +273,7 @@ async function read_file_or_vanish(full_path, label) {
 }
 // A path is "in conflict" when local has content that differs from CMS AND
 // the local content represents a real user change — not just CMS-side
-// serialization noise (palacms re-emits YAML with normalized key order,
+// serialization noise (primo re-emits YAML with normalized key order,
 // ISO-coerced dates, etc., so the CMS export legitimately differs from a
 // freshly-scaffolded file forever, and we don't want to scream about that
 // every pull cycle).
@@ -369,7 +369,7 @@ async function collect_directory_snapshot(current_dir, relative_dir, snapshot, o
     }
 }
 async function fetch_cms_site_snapshot(site_dir, api_url, config, server_config, workspace_dir, temp_name) {
-    const response = await fetch_with_timeout(`${api_url}/api/palacms/export/${config.site_id}`, {}, 15000);
+    const response = await fetch_with_timeout(`${api_url}/api/primo/export/${config.site_id}`, {}, 15000);
     if (!response.ok)
         return null;
     const temp_dir = path.join(site_dir, '.primo', temp_name);
@@ -572,19 +572,19 @@ export async function dev_server(options) {
             }
         }
         // Ensure binary is installed
-        spinner.text = 'Checking palacms...';
+        spinner.text = 'Checking primo...';
         const binary_path = await ensure_binary();
         // Create data directory in project folder
         const data_dir = await ensure_data_dir(base_dir);
         spinner.text = 'Starting CMS...';
         // Start the CMS binary with dev mode enabled. PRIMO_AUTHOR_MODE
-        // tells palacms which sync mode the CLI is running in so the CMS
+        // tells primo which sync mode the CLI is running in so the CMS
         // UI can gate its editable surfaces accordingly (read-only when
         // the CLI is in --author files, since CMS edits would be discarded
         // before they ever round-trip to disk).
         cms_process = spawn(binary_path, ['serve', '--http', `127.0.0.1:${port}`, '--dir', data_dir], {
             stdio: ['pipe', 'pipe', 'pipe'],
-            env: { ...process.env, PALA_DEV_MODE: '1', PRIMO_AUTHOR_MODE: sync_policy.mode }
+            env: { ...process.env, PRIMO_DEV_MODE: '1', PRIMO_AUTHOR_MODE: sync_policy.mode }
         });
         // Capture stderr for errors
         let stderr_output = '';
@@ -1119,11 +1119,11 @@ async function register_primo_mcp_server(base_dir) {
     if (mcp_servers.primo !== undefined) {
         return null;
     }
-    const local_mcp = process.env.PRIMO_MCP_LOCAL
-        ?? '/Users/mateo/Desktop/primo/primo-mcp/dist/index.js';
+    // Default to the published package; PRIMO_MCP_LOCAL opts into a local dist build.
+    const local_mcp = process.env.PRIMO_MCP_LOCAL;
     mcp_servers.primo = local_mcp
         ? { command: 'node', args: [local_mcp] }
-        : { command: 'npx', args: ['-y', '@primo/mcp'] };
+        : { command: 'npx', args: ['-y', 'primo-mcp'] };
     config.mcpServers = mcp_servers;
     // Claude Code reads project-root .mcp.json. .primo/ is gitignored local
     // state, so the discoverable root file is the right registration target.
@@ -1251,7 +1251,7 @@ function change_requires_reload(_dir, _filename) {
     return true;
 }
 async function request_browser_reload(api_url) {
-    await fetch_with_timeout(`${api_url}/api/palacms/dev/reload`, {
+    await fetch_with_timeout(`${api_url}/api/primo/dev/reload`, {
         method: 'POST'
     }, 5000);
 }
@@ -1870,7 +1870,7 @@ async function import_site_files(site_dir, api_url, config, port, server_config,
         const import_form = new FormData();
         import_form.append('file', new Blob([zip_buffer]), 'site.zip');
         const request_started = Date.now();
-        const import_response = await fetch_with_timeout(`${api_url}/api/palacms/import/${site_id}`, {
+        const import_response = await fetch_with_timeout(`${api_url}/api/primo/import/${site_id}`, {
             method: 'POST',
             body: import_form
         }, 300000);
@@ -1912,7 +1912,7 @@ async function import_site_files(site_dir, api_url, config, port, server_config,
         form_data.append('file', new Blob([zip_buffer]), 'site.zip');
         try {
             const bootstrap_started = Date.now();
-            const bootstrap_response = await fetch_with_timeout(`${api_url}/api/palacms/bootstrap`, {
+            const bootstrap_response = await fetch_with_timeout(`${api_url}/api/primo/bootstrap`, {
                 method: 'POST',
                 body: form_data
             }, 300000); // 300s timeout for imports
@@ -1944,7 +1944,7 @@ async function import_site_files(site_dir, api_url, config, port, server_config,
             const import_form = new FormData();
             import_form.append('file', new Blob([zip_buffer]), 'site.zip');
             const import_started = Date.now();
-            const import_response = await fetch_with_timeout(`${api_url}/api/palacms/import/${site_id}`, {
+            const import_response = await fetch_with_timeout(`${api_url}/api/primo/import/${site_id}`, {
                 method: 'POST',
                 body: import_form
             }, 300000); // 300s timeout for imports
@@ -2016,13 +2016,13 @@ async function import_library_files(base_dir, api_url, delete_group_ids = [], de
         }));
     }
     const request_started = Date.now();
-    const response = await fetch_with_timeout(`${api_url}/api/palacms/import-library`, {
+    const response = await fetch_with_timeout(`${api_url}/api/primo/import-library`, {
         method: 'POST',
         body: form_data
     }, 120000);
     const request_ms = Date.now() - request_started;
     if (response.status === 404) {
-        throw new Error('Shared library sync is not supported by the current palacms binary/server. Rebuild or update palacms to use library sync.');
+        throw new Error('Shared library sync is not supported by the current primo binary/server. Rebuild or update primo to use library sync.');
     }
     if (!response.ok) {
         const error_text = await response.text();
@@ -2146,7 +2146,7 @@ async function create_site_zip(dir, excluded_paths = new Set()) {
     });
 }
 async function sync_from_cms(site_dir, api_url, config, server_config, workspace_dir, sync_policy = { mode: 'both' }) {
-    const response = await fetch_with_timeout(`${api_url}/api/palacms/export/${config.site_id}`, {}, 15000);
+    const response = await fetch_with_timeout(`${api_url}/api/primo/export/${config.site_id}`, {}, 15000);
     if (!response.ok)
         return;
     const zip_data = await response.arrayBuffer();
@@ -2240,9 +2240,9 @@ async function sync_from_cms(site_dir, api_url, config, server_config, workspace
     }
 }
 async function sync_library_from_cms(base_dir, api_url) {
-    const response = await fetch_with_timeout(`${api_url}/api/palacms/export-library`, {}, 15000);
+    const response = await fetch_with_timeout(`${api_url}/api/primo/export-library`, {}, 15000);
     if (response.status === 404) {
-        throw new Error('Shared library sync is not supported by the current palacms binary/server. Rebuild or update palacms to use library sync.');
+        throw new Error('Shared library sync is not supported by the current primo binary/server. Rebuild or update primo to use library sync.');
     }
     if (!response.ok)
         return;

package/dist/commands/new.js

@@ -107,10 +107,14 @@ allowed_blocks:
 `);
         await fs.writeFile(path.join(site_dir, 'page-types', 'default', 'fields.yaml'), '[]\n');
         await fs.writeFile(path.join(site_dir, 'page-types', 'default', 'layout.yaml'), `# Sections shared by every page of this type. Add blocks here to render
-# the same header/footer across all pages of this type.
+# the same header/footer across all pages of this type. Body sections are
+# seeded onto each newly created page of this type (and locked when the type
+# has no allowed_blocks).
 #
 # header:
 #   - block: site-header
+# body:
+#   - block: hero
 # footer:
 #   - block: site-footer
 `);

package/dist/commands/pull-library.js

@@ -43,11 +43,11 @@ export async function pull_library(options) {
         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`, {
+        const response = await fetch(`${server}/api/primo/export-library`, {
             headers
         });
         if (response.status === 404) {
-            spinner.fail('Shared library sync is not supported by this palacms server. Update the server before using `primo library pull`.');
+            spinner.fail('Shared library sync is not supported by this primo server. Update the server before using `primo library pull`.');
             process.exit(1);
         }
         if (!response.ok) {

package/dist/commands/pull.js

@@ -183,7 +183,7 @@ export async function pull_site(options) {
 async function pull_one_site(server, headers, site, site_dir, spinner) {
     await fs.mkdir(site_dir, { recursive: true });
     spinner.text = `Exporting ${site.name}...`;
-    const response = await fetch(`${server}/api/palacms/export/${site.id}`, { headers });
+    const response = await fetch(`${server}/api/primo/export/${site.id}`, { headers });
     if (!response.ok) {
         const error = await response.text();
         throw new Error(`Export failed for ${site.name}: ${error}`);
@@ -205,7 +205,7 @@ async function pull_one_site(server, headers, site, site_dir, spinner) {
 }
 async function pull_library_into(server, headers, root_dir, spinner) {
     spinner.start('Pulling library...');
-    const response = await fetch(`${server}/api/palacms/export-library`, { headers });
+    const response = await fetch(`${server}/api/primo/export-library`, { headers });
     if (response.status === 404) {
         spinner.warn('Library export not supported by this server — skipping');
         return false;

package/dist/commands/push-library.js

@@ -47,13 +47,13 @@ export async function push_library(options) {
         if (token) {
             headers.Authorization = `Bearer ${token}`;
         }
-        const response = await fetch(`${server}/api/palacms/import-library`, {
+        const response = await fetch(`${server}/api/primo/import-library`, {
             method: 'POST',
             headers,
             body: form_data
         });
         if (response.status === 404) {
-            spinner.fail('Shared library sync is not supported by this palacms server. Update the server before using `primo library push`.');
+            spinner.fail('Shared library sync is not supported by this primo server. Update the server before using `primo library push`.');
             process.exit(1);
         }
         if (!response.ok) {

package/dist/commands/push.js

@@ -275,8 +275,8 @@ async function push_single_site(site_dir, options, spinner) {
         throw new Error(bootstrap_result.error);
     }
     const endpoint = options.preview
-        ? `${server}/api/palacms/import/${site_id}/preview`
-        : `${server}/api/palacms/import/${site_id}`;
+        ? `${server}/api/primo/import/${site_id}/preview`
+        : `${server}/api/primo/import/${site_id}`;
     spinner.text = options.preview ? 'Previewing changes...' : 'Pushing changes...';
     const form_data = new FormData();
     form_data.append('file', new Blob([zip_buffer]), 'site.zip');
@@ -288,7 +288,7 @@ async function push_single_site(site_dir, options, spinner) {
         body: form_data
     });
     // 404 from import means the site doesn't exist on the server yet. On a
-    // freshly-deployed server we can fall back to /api/palacms/bootstrap,
+    // freshly-deployed server we can fall back to /api/primo/bootstrap,
     // which creates the site and ingests the zip in one shot. Bootstrap is
     // only available when the server has zero sites — past the first site,
     // new sites must be created via the dashboard UI.
@@ -343,7 +343,7 @@ async function try_bootstrap_site(server, token, zip_buffer, config, site_id, gr
     const headers = {};
     if (token)
         headers['Authorization'] = `Bearer ${token}`;
-    const response = await fetch(`${server}/api/palacms/bootstrap`, {
+    const response = await fetch(`${server}/api/primo/bootstrap`, {
         method: 'POST',
         headers,
         body: form
@@ -399,7 +399,7 @@ async function push_library_dir(root_dir, options, spinner) {
     spinner.text = 'Pushing library...';
     const form_data = new FormData();
     form_data.append('file', new Blob([zip_buffer]), 'library.zip');
-    const response = await fetch(`${server}/api/palacms/import-library`, {
+    const response = await fetch(`${server}/api/primo/import-library`, {
         method: 'POST',
         headers: { 'Authorization': `Bearer ${token}` },
         body: form_data

package/dist/commands/validate.js

@@ -456,7 +456,7 @@ async function validate_page_types(site_dir) {
             }
         }
         // layout.yaml is required — comment-only stub is fine, but the file
-        // must exist so the page type's shared header/footer slots are
+        // must exist so the page type's header/body/footer slots are
         // discoverable.
         try {
             await fs.access(layout_path);
@@ -464,7 +464,7 @@ async function validate_page_types(site_dir) {
         catch {
             errors.push({
                 file: `page-types/${page_type_name}/layout.yaml`,
-                message: 'Missing layout.yaml. Each page type needs one (use the comment-only stub if there are no shared header/footer sections yet).',
+                message: 'Missing layout.yaml. Each page type needs one (use the comment-only stub if there are no shared header/body/footer sections yet).',
                 severity: 'error'
             });
         }

package/dist/utils/binary.js

@@ -9,11 +9,10 @@ import ora from 'ora';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const PRIMO_HOME = path.join(os.homedir(), '.primo');
 const BIN_DIR = path.join(PRIMO_HOME, 'bin');
-const DATA_DIR = path.join(PRIMO_HOME, 'data');
-const VERSION = '3.2.0'; // matches palacms releases
+const VERSION = '3.2.1'; // matches primo releases
 // Path to locally built binary (for development)
-// The binary is at palacms/palacms (inside the palacms repo directory)
-const LOCAL_BINARY = path.resolve(__dirname, '..', '..', '..', 'palacms', 'palacms');
+// The binary is at primo/primo (inside the primo repo directory)
+const LOCAL_BINARY = path.resolve(__dirname, '..', '..', '..', 'primo', 'primo');
 function get_platform() {
     const platform = os.platform();
     const arch = os.arch();
@@ -48,11 +47,34 @@ function get_platform() {
 }
 function get_download_url(platform) {
     const base = 'https://github.com/primocms/primo/releases/download';
-    const filename = `palacms_${platform.os}_${platform.arch}${platform.ext}`;
+    const filename = `primo_${platform.os}_${platform.arch}${platform.ext}`;
     return `${base}/v${VERSION}/${filename}`;
 }
+// Extract a bare semver (e.g. "3.2.1") from a binary's --version output.
+// The server prints a build banner first, then "<name> version vX.Y.Z", so we
+// scan for the semver rather than trusting the whole string. Returns null when
+// no semver is present (e.g. a "dev" build), which callers treat as a mismatch.
+function parse_semver(output) {
+    if (!output)
+        return null;
+    const match = output.match(/\bv?(\d+\.\d+\.\d+)\b/);
+    return match ? match[1] : null;
+}
 export async function get_binary_path() {
-    // Check for locally built binary first (development)
+    // Explicit override wins — layout-independent, the way to point at a
+    // local server build regardless of where this CLI lives on disk.
+    const override = process.env.PRIMO_BINARY;
+    if (override) {
+        try {
+            await fs.access(override, fs.constants.X_OK);
+            return override;
+        }
+        catch {
+            throw new Error(`PRIMO_BINARY is set to "${override}" but it is not an executable file`);
+        }
+    }
+    // Otherwise prefer a sibling dev build (only resolves when running from
+    // source next to a `primo` checkout), then fall back to the download.
     try {
         await fs.access(LOCAL_BINARY, fs.constants.X_OK);
         return LOCAL_BINARY;
@@ -60,7 +82,7 @@ export async function get_binary_path() {
     catch { }
     // Fall back to downloaded binary
     const platform = get_platform();
-    return path.join(BIN_DIR, `palacms${platform.ext}`);
+    return path.join(BIN_DIR, `primo${platform.ext}`);
 }
 export async function ensure_data_dir(base_dir) {
     const data_dir = path.join(base_dir, '.primo');
@@ -78,29 +100,55 @@ export async function is_binary_installed() {
     }
 }
 export async function ensure_binary() {
-    if (await is_binary_installed()) {
+    // If PRIMO_BINARY is set, honor it exclusively — surface a bad override
+    // rather than silently downloading a release binary behind the user's back.
+    if (process.env.PRIMO_BINARY) {
         return await get_binary_path();
     }
+    // A sibling dev build (running from source next to a `primo` checkout) is
+    // developer-chosen — never replace it with a download, even if its version
+    // differs from the pinned release.
+    try {
+        await fs.access(LOCAL_BINARY, fs.constants.X_OK);
+        return LOCAL_BINARY;
+    }
+    catch { }
+    // A managed binary already on disk is reused only when it matches the pinned
+    // version. A stale binary (older release, or a pre-rename "palacms" build
+    // reporting a different version) is re-downloaded so fixes actually reach
+    // users who already have a binary installed.
+    let updating_from = null;
+    if (await is_binary_installed()) {
+        if (await is_binary_current()) {
+            return await get_binary_path();
+        }
+        updating_from = await get_binary_version();
+    }
     // Need to download - get the target path
     const platform = get_platform();
-    const binary_path = path.join(BIN_DIR, `palacms${platform.ext}`);
-    const spinner = ora('Setting up Pala...').start();
+    const binary_path = path.join(BIN_DIR, `primo${platform.ext}`);
+    const spinner = ora(updating_from
+        ? `Updating primo ${updating_from} → ${VERSION}...`
+        : 'Setting up Primo...').start();
     try {
         // Create directories
         await fs.mkdir(BIN_DIR, { recursive: true });
         const url = get_download_url(platform);
-        spinner.text = `Downloading palacms for ${platform.os}/${platform.arch}...`;
-        // Download binary
+        spinner.text = `Downloading primo for ${platform.os}/${platform.arch}...`;
+        // Download binary. Stream to a temp path and rename into place so an
+        // interrupted download can't leave a half-written binary that later
+        // looks "installed". rename() is atomic within the same directory.
         const response = await fetch(url);
         if (!response.ok) {
             throw new Error(`Download failed: ${response.status} ${response.statusText}`);
         }
-        // Save to file
-        const file_stream = createWriteStream(binary_path);
+        const tmp_path = `${binary_path}.download`;
+        const file_stream = createWriteStream(tmp_path);
         await pipeline(response.body, file_stream);
-        // Make executable
-        await fs.chmod(binary_path, 0o755);
-        spinner.succeed('Pala setup complete');
+        // Make executable, then atomically replace any existing binary.
+        await fs.chmod(tmp_path, 0o755);
+        await fs.rename(tmp_path, binary_path);
+        spinner.succeed(updating_from ? `Primo updated to ${VERSION}` : 'Primo setup complete');
         return binary_path;
     }
     catch (error) {
@@ -108,21 +156,33 @@ export async function ensure_binary() {
         // Provide manual instructions
         console.log('');
         console.log(chalk.yellow('To install manually:'));
-        console.log(chalk.dim('  1. Download palacms from https://github.com/primocms/primo/releases'));
+        console.log(chalk.dim('  1. Download primo from https://github.com/primocms/primo/releases'));
         console.log(chalk.dim(`  2. Place it in ${BIN_DIR}`));
-        console.log(chalk.dim('  3. Make it executable: chmod +x palacms'));
+        console.log(chalk.dim('  3. Make it executable: chmod +x primo'));
         console.log('');
         throw error;
     }
 }
+// Return the installed binary's semver (e.g. "3.2.1"), or null if it can't be
+// determined (missing binary, dev build, or unparseable output).
 export async function get_binary_version() {
     try {
-        const binary_path = get_binary_path();
-        const { execSync } = await import('child_process');
-        const output = execSync(`"${binary_path}" --version`, { encoding: 'utf-8' });
-        return output.trim();
+        const binary_path = await get_binary_path();
+        const { execFileSync } = await import('child_process');
+        // execFile (not execSync) avoids shell quoting issues with the path, and
+        // the timeout prevents a wedged binary from hanging CLI startup.
+        const output = execFileSync(binary_path, ['--version'], { encoding: 'utf-8', timeout: 5000 });
+        return parse_semver(output);
     }
     catch {
         return null;
     }
 }
+// Whether the installed binary matches the version this CLI pins. A dev/unknown
+// version (null) counts as not-current so we refresh to a known-good release.
+// Skipped when PRIMO_BINARY or a sibling dev build is in use — those are
+// developer-chosen and must not be clobbered by a download.
+async function is_binary_current() {
+    const installed = await get_binary_version();
+    return installed === VERSION;
+}

package/package.json

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