primo-cli 0.1.9 → 0.1.11

package/dist/commands/deploy.d.ts

@@ -1,6 +1,7 @@
 interface DeployOptions {
     provider?: string;
     dryRun?: boolean;
+    push?: boolean;
 }
 export declare function deploy(options: DeployOptions): Promise<void>;
 export {};

package/dist/commands/deploy.js

@@ -2,10 +2,11 @@ import fs from 'fs/promises';
 import path from 'path';
 import chalk from 'chalk';
 import ora from 'ora';
-import { select } from '@inquirer/prompts';
+import { select, confirm } from '@inquirer/prompts';
 import { execSync, spawn } from 'child_process';
 import { read_server_config, write_server_config, get_server_config_path, SERVER_CONFIG_FILE } from '../utils/server-config.js';
 import { read_site_config, get_site_config_path } from '../utils/site-config.js';
+import { push_site } from './push.js';
 async function path_exists(p) {
     try {
         await fs.access(p);
@@ -135,11 +136,13 @@ export async function deploy(options) {
             await generate_fly_toml(inventory);
         }
         spinner.succeed('Deployment files generated');
+        // commander's --no-push sets push:false; treat anything else as opt-in.
+        const auto_push = options.push !== false;
         if (provider === 'railway') {
-            await deploy_to_railway(inventory);
+            await deploy_to_railway(inventory, auto_push);
         }
         else {
-            await deploy_to_fly(inventory);
+            await deploy_to_fly(inventory, auto_push);
         }
     }
     catch (error) {
@@ -163,7 +166,7 @@ function print_dry_run(inventory, provider) {
     }
     console.log(`    ${chalk.green('+')} Dockerfile in this workspace`);
     console.log('');
-    console.log(chalk.bold('  Will be uploaded after first boot via primo push:'));
+    console.log(chalk.bold('  Will be uploaded automatically once the server is online:'));
     console.log(`    ${chalk.dim('—')} ${SERVER_CONFIG_FILE}`);
     if (inventory.has_library) {
         console.log(`    ${chalk.dim('—')} library/`);
@@ -278,7 +281,7 @@ primary_region = "sjc"
 `;
     await fs.writeFile(path.join(inventory.root_dir, 'fly.toml'), fly_toml);
 }
-async function deploy_to_railway(inventory) {
+async function deploy_to_railway(inventory, auto_push) {
     console.log('');
     console.log(chalk.cyan('Deploying to Railway...'));
     const spinner = ora('Setting up Railway project...').start();
@@ -320,11 +323,44 @@ async function deploy_to_railway(inventory) {
             if (url) {
                 await record_workspace_server(inventory.root_dir, url);
             }
-            print_post_deploy_next_steps('railway', url);
+            // Railway needs a manual volume mount before the server can persist
+            // /app/pb_data. Print the instructions, wait for the user, then poll
+            // readiness and push. If anything in that chain fails we fall back
+            // to the old "next steps" message so the user can finish by hand.
+            const pushed = url
+                ? await finish_railway_deploy(inventory, url, auto_push)
+                : false;
+            print_post_deploy_next_steps('railway', url, { auto_push, pushed });
             resolve();
         });
     });
 }
+async function finish_railway_deploy(inventory, url, auto_push) {
+    console.log('');
+    console.log(chalk.bold('  One manual step on Railway'));
+    console.log(chalk.dim('    Open the project in the Railway dashboard, then:'));
+    console.log(chalk.dim('      Settings → Volumes → mount on /app/pb_data (size 1GB+)'));
+    console.log('');
+    if (!auto_push)
+        return false;
+    let confirmed = false;
+    try {
+        confirmed = await confirm({
+            message: 'Mounted the volume? (press enter to upload your workspace)',
+            default: true
+        });
+    }
+    catch {
+        // Ctrl+C / non-interactive — bail out, user can run primo push later.
+        return false;
+    }
+    if (!confirmed)
+        return false;
+    const ready = await wait_for_ready(url);
+    if (!ready)
+        return false;
+    return await run_auto_push(inventory);
+}
 async function try_railway_domain(cwd) {
     try {
         const out = execSync('railway domain --json', { cwd, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
@@ -351,28 +387,93 @@ async function record_workspace_server(root_dir, url) {
         // the server URL manually.
     }
 }
-function print_post_deploy_next_steps(provider, url) {
+function print_post_deploy_next_steps(provider, url, ctx) {
     console.log('');
-    console.log(chalk.green('✓ Deployment started'));
+    if (ctx.pushed) {
+        console.log(chalk.green('✓ Deployment complete — your workspace is live'));
+    }
+    else {
+        console.log(chalk.green('✓ Server provisioned'));
+    }
     console.log('');
     if (url) {
         console.log(chalk.bold('  URL: ') + chalk.cyan(url));
         console.log(chalk.dim('  (saved as `server:` in server.yaml — primo push/login pick it up automatically)'));
         console.log('');
     }
+    if (ctx.pushed) {
+        console.log(chalk.bold('Next steps'));
+        console.log('');
+        console.log(chalk.dim('  Open the URL above and create your editor account.'));
+        console.log(chalk.dim('  Future edits: `primo push` to upload, `primo pull` to fetch.'));
+        console.log('');
+        return;
+    }
     console.log(chalk.bold('Next steps'));
     console.log('');
-    if (provider === 'railway') {
+    if (provider === 'railway' && !ctx.auto_push) {
+        // User passed --no-push; remind them about the volume since we
+        // skipped the prompt that would normally cover it.
         console.log(chalk.dim('  Railway needs one manual setting the CLI can\'t set for you:'));
         console.log(chalk.dim('    Settings → Volumes → mount on /app/pb_data (size 1GB+)'));
         console.log('');
     }
-    console.log(chalk.dim('  Then upload your workspace into the deployed server:'));
+    console.log(chalk.dim('  Upload your workspace into the deployed server:'));
     console.log(chalk.dim(`    primo push${url ? '' : ' -s <url>'}`));
     console.log(chalk.dim('  (first push bootstraps the sites; later pushes update them incrementally)'));
     console.log('');
 }
-async function deploy_to_fly(inventory) {
+// Poll the deployed server until it answers /api/health with HTTP 200. The
+// timeout is generous because Railway's first build can be slow and the user
+// may have just mounted the volume which forces a restart.
+async function wait_for_ready(url) {
+    const health_url = `${url.replace(/\/+$/, '')}/api/health`;
+    const deadline = Date.now() + 5 * 60 * 1000;
+    const spinner = ora(`Waiting for ${url} to come online...`).start();
+    let attempt = 0;
+    while (Date.now() < deadline) {
+        attempt += 1;
+        try {
+            const controller = new AbortController();
+            const timer = setTimeout(() => controller.abort(), 5000);
+            const response = await fetch(health_url, { signal: controller.signal });
+            clearTimeout(timer);
+            if (response.ok) {
+                spinner.succeed('Server is online');
+                return true;
+            }
+        }
+        catch {
+            // not ready yet — keep polling
+        }
+        spinner.text = `Waiting for ${url} to come online... (attempt ${attempt})`;
+        await new Promise((r) => setTimeout(r, 3000));
+    }
+    spinner.fail(`Server did not respond at ${health_url} within 5 minutes`);
+    console.log('');
+    console.log(chalk.dim('  The server may still be starting (or the volume is not mounted yet).'));
+    console.log(chalk.dim('  Once the URL above loads in a browser, run `primo push` to upload.'));
+    return false;
+}
+// Run the equivalent of `primo push` against the local workspace. push_site
+// resolves the server URL from server.yaml (which we just wrote), so no extra
+// flags are needed. We surface failures but don't re-throw — the deploy already
+// succeeded and the user can rerun push manually.
+async function run_auto_push(inventory) {
+    console.log('');
+    console.log(chalk.cyan('Uploading your workspace...'));
+    try {
+        await push_site({ dir: inventory.root_dir });
+        return true;
+    }
+    catch (error) {
+        console.log('');
+        console.log(chalk.yellow(`Auto-push failed: ${error instanceof Error ? error.message : error}`));
+        console.log(chalk.dim('  Your server is live — rerun `primo push` once the issue is sorted.'));
+        return false;
+    }
+}
+async function deploy_to_fly(inventory, auto_push) {
     console.log('');
     console.log(chalk.cyan('Deploying to Fly.io...'));
     const app_name = workspace_app_name(inventory.root_dir);
@@ -406,7 +507,15 @@ async function deploy_to_fly(inventory) {
             }
             const url = `https://${app_name}.fly.dev`;
             await record_workspace_server(inventory.root_dir, url);
-            print_post_deploy_next_steps('fly', url);
+            // Fly's CLI provisions the volume for us, so we can go straight to
+            // readiness + push. No interactive prompt required.
+            let pushed = false;
+            if (auto_push) {
+                const ready = await wait_for_ready(url);
+                if (ready)
+                    pushed = await run_auto_push(inventory);
+            }
+            print_post_deploy_next_steps('fly', url, { auto_push, pushed });
             resolve();
         });
     });

package/dist/commands/push.js

@@ -15,6 +15,30 @@ async function path_exists(p) {
         return false;
     }
 }
+// Look up the display name for a group ID by walking up from the site dir
+// to find a workspace server.yaml. site.yaml only stores the group ID, so
+// without this the server has nothing to label the group with on first push
+// and falls back to humanizing the random ID ("8Y17hao5jt2xmd8").
+async function resolve_group_name(site_dir, group_id) {
+    if (!group_id)
+        return undefined;
+    // Typical layout: <workspace>/sites/<slug>/site.yaml — server.yaml lives two levels up.
+    const candidates = [path.dirname(path.dirname(site_dir)), path.dirname(site_dir), site_dir];
+    for (const dir of candidates) {
+        if (!(await path_exists(get_server_config_path(dir))))
+            continue;
+        try {
+            const cfg = await read_server_config(dir);
+            const match = cfg.site_groups?.find((g) => g.id === group_id);
+            if (match?.name)
+                return match.name;
+        }
+        catch {
+            // ignore — bad server.yaml shouldn't block the push
+        }
+    }
+    return undefined;
+}
 export async function push_site(options) {
     const root_dir = path.resolve(options.dir);
     const has_site_yaml = await path_exists(get_site_config_path(root_dir));
@@ -230,6 +254,7 @@ async function push_single_site(site_dir, options, spinner) {
     const token = options.token || await get_auth_token(server);
     spinner.text = 'Packaging files...';
     const zip_buffer = await create_zip(site_dir);
+    const group_name = await resolve_group_name(site_dir, config?.group);
     // If the user isn't logged in yet, skip the import attempt and try
     // bootstrap directly. Bootstrap doesn't require auth (only allowed when
     // the server has zero sites), so it's the right path for first-time
@@ -239,7 +264,7 @@ async function push_single_site(site_dir, options, spinner) {
             throw new Error('Authentication required for --preview. Run `primo login` first.');
         }
         spinner.text = 'No auth token — attempting bootstrap...';
-        const bootstrap_result = await try_bootstrap_site(server, undefined, zip_buffer, config, site_id);
+        const bootstrap_result = await try_bootstrap_site(server, undefined, zip_buffer, config, site_id, group_name);
         if (bootstrap_result.ok) {
             spinner.succeed(`Bootstrapped ${config?.name || path.basename(site_dir)}`);
             console.log('');
@@ -255,6 +280,8 @@ async function push_single_site(site_dir, options, spinner) {
     spinner.text = options.preview ? 'Previewing changes...' : 'Pushing changes...';
     const form_data = new FormData();
     form_data.append('file', new Blob([zip_buffer]), 'site.zip');
+    if (group_name)
+        form_data.append('group_name', group_name);
     const response = await fetch(endpoint, {
         method: 'POST',
         headers: { 'Authorization': `Bearer ${token}` },
@@ -267,7 +294,7 @@ async function push_single_site(site_dir, options, spinner) {
     // new sites must be created via the dashboard UI.
     if (response.status === 404 && !options.preview) {
         spinner.text = 'Site not found on server — bootstrapping...';
-        const bootstrap_result = await try_bootstrap_site(server, token, zip_buffer, config, site_id);
+        const bootstrap_result = await try_bootstrap_site(server, token, zip_buffer, config, site_id, group_name);
         if (bootstrap_result.ok) {
             spinner.succeed(`Bootstrapped ${config?.name || path.basename(site_dir)}`);
             console.log('');
@@ -295,13 +322,23 @@ async function push_single_site(site_dir, options, spinner) {
         print_diff(result.diff);
     }
 }
-async function try_bootstrap_site(server, token, zip_buffer, config, site_id) {
+async function try_bootstrap_site(server, token, zip_buffer, config, site_id, group_name) {
     const form = new FormData();
     form.append('site_id', site_id);
     if (config?.name)
         form.append('name', config.name);
     if (config?.group)
         form.append('group', config.group);
+    if (group_name)
+        form.append('group_name', group_name);
+    // Register the site against the deploy URL's host so the first visit to
+    // that domain finds a matching site instead of dropping into CreateSite.
+    try {
+        form.append('host', new URL(server).host);
+    }
+    catch {
+        // Malformed server URL — let the server fall back to its own default.
+    }
     form.append('file', new Blob([zip_buffer]), 'site.zip');
     const headers = {};
     if (token)

package/dist/index.js

@@ -56,6 +56,7 @@ program
     .command('deploy')
     .description('Deploy this workspace (all sites) with editable CMS (Railway, Fly)')
     .option('-p, --provider <provider>', 'Provider: railway | fly')
+    .option('--no-push', 'Skip uploading the workspace after provisioning (you can run `primo push` later)')
     .option('--dry-run', 'Show what would be deployed without doing anything')
     .addHelpText('after', `
 ${chalk.bold('Supported providers')}

package/dist/utils/binary.js

@@ -10,7 +10,7 @@ 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.1.0'; // matches palacms releases
+const VERSION = '3.2.0'; // matches palacms 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');
@@ -47,8 +47,7 @@ function get_platform() {
     return { os: osName, arch: archName, ext };
 }
 function get_download_url(platform) {
-    // TODO: Update to actual GitHub releases URL
-    const base = 'https://github.com/palacms/palacms/releases/download';
+    const base = 'https://github.com/primocms/primo/releases/download';
     const filename = `palacms_${platform.os}_${platform.arch}${platform.ext}`;
     return `${base}/v${VERSION}/${filename}`;
 }
@@ -109,7 +108,7 @@ 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/palacms/palacms/releases'));
+        console.log(chalk.dim('  1. Download palacms 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('');

package/package.json

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