primo-cli 0.1.8 → 0.1.9

package/dist/commands/deploy.js

@@ -221,11 +221,11 @@ async function check_provider_auth(provider) {
         return false;
     }
 }
-// Pinned to the upstream-published image. palacms's main.yml workflow
+// Pinned to the upstream-published image. primocms's main.yml workflow
 // publishes branch tags for whitelisted prefixes (main, feature/**, rc/**),
 // with slashes slugified to dashes (feature/local-dev-cli → :feature-local-dev-cli).
-// Bump to a release tag (:v3.0.0) when palacms cuts a stable release.
-const PRIMO_SERVER_IMAGE = 'ghcr.io/palacms/palacms:feature-local-dev-cli';
+// 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
     // unchanged. Workspace data (server.yaml, sites/, library/) is uploaded

package/dist/commands/dev.js

@@ -36,8 +36,12 @@ let site_sync_baselines = new Map();
 // the same conflict block every pull cycle when palacms'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
-// Map of filepath -> mtime (ms) when we wrote it
+// Track files written by sync to prevent watcher from re-pushing them.
+// Keyed by absolute path; value is the SHA-256 of the content we wrote.
+// We compare against the file's *current* hash in the watcher, so a user
+// edit that happens within the polling cycle is detected by content
+// divergence rather than mtime±tolerance (which used to drop edits made
+// within 3 seconds of a sync-write).
 const synced_files = new Map();
 const synced_deleted_paths = new Map();
 const warned_empty_schema_writebacks = new Set();
@@ -49,11 +53,25 @@ const MCP_CONFIG_FILE = '.mcp.json';
 const SITE_SYNC_DIRS = ['blocks', 'page-types', 'pages', 'site'];
 const LOCAL_PUSH_DEBOUNCE_MS = 150;
 const LOCAL_ZIP_COMPRESSION_LEVEL = 0;
-// Tolerance for matching a file mtime against the synced_files map to decide
-// whether an fs.watch event was caused by our own sync-write. Wider values
-// trade duplicate push work for safety against slow I/O and flaky watchers
-// (macOS fs.watch fires inconsistently for recursive writes).
-const SYNC_MTIME_TOLERANCE_MS = 3000;
+function hash_content(content) {
+    return createHash('sha256').update(content).digest('hex');
+}
+// Returns true iff the file at `full_path` still has the exact content
+// we last synced to it. Used by watcher event handlers to ignore their
+// own writes without the old mtime-tolerance race that swallowed user
+// edits made within seconds of a sync-write.
+async function event_matches_synced_write(full_path) {
+    const expected_hash = synced_files.get(full_path);
+    if (!expected_hash)
+        return false;
+    try {
+        const current = await fs.readFile(full_path);
+        return hash_content(current) === expected_hash;
+    }
+    catch {
+        return false;
+    }
+}
 // When the user writes a file locally, suppress CMS->local pulls for this
 // long to prevent a pull that was in-flight before the watcher fired from
 // stomping the just-written content on arrival.
@@ -636,8 +654,11 @@ export async function dev_server(options) {
         if (sites.length > 0 || !is_server_mode) {
             console.log('');
         }
-        // Start watching for file changes
-        const dirs_to_watch = ['blocks', 'page-types', 'pages', 'site'];
+        // Start watching for file changes. `uploads` is included so dropping
+        // an image into uploads/ triggers a push — the server-side reconcile
+        // creates a site_uploads record for it and the writeback renames
+        // the local file to the canonical (suffixed) name.
+        const dirs_to_watch = ['blocks', 'page-types', 'pages', 'site', 'uploads'];
         const known_sites = new Set(sites.map(s => s.dir));
         if (is_server_mode) {
             const library_path = path.join(base_dir, LIBRARY_DIR);
@@ -676,16 +697,18 @@ export async function dev_server(options) {
                 const on_event = (full_path) => {
                     if (should_skip_synced_delete(full_path))
                         return;
-                    const synced_mtime = synced_files.get(full_path);
-                    if (synced_mtime) {
-                        // Our own sync-write — skip.
-                        fs.stat(full_path)
-                            .then(stat => {
-                            if (Math.abs(stat.mtimeMs - synced_mtime) < SYNC_MTIME_TOLERANCE_MS) {
-                                synced_files.delete(full_path);
-                                return;
-                            }
+                    if (synced_files.has(full_path)) {
+                        // We last wrote this file from a CMS pull. If the
+                        // content on disk still matches our write, the
+                        // chokidar event is just our own write echoing
+                        // back — drop it. If it differs, the user edited
+                        // the file (possibly very shortly after our pull
+                        // landed) and we must push.
+                        event_matches_synced_write(full_path)
+                            .then(matches => {
                             synced_files.delete(full_path);
+                            if (matches)
+                                return;
                             push_or_ignore_library_change(full_path);
                         })
                             .catch(() => {
@@ -818,7 +841,16 @@ export async function dev_server(options) {
                         }
                         console.log(chalk.dim(`  ${site.config.name}: normalize ${normalize_ms}ms, zip ${import_timings.zip_ms}ms, ${import_timings.mode} ${import_timings.request_ms}ms${reload_ms ? `, reload ${reload_ms}ms` : ''}`));
                         console.log(chalk.green(`  ✓ ${site.config.name} pushed`));
-                        await write_sync_status(site.dir, { ok: true });
+                        if (import_timings.warning_count > 0) {
+                            await write_sync_status(site.dir, {
+                                ok: true,
+                                warnings: import_timings.warning_count,
+                                warned_at: new Date().toISOString()
+                            });
+                        }
+                        else {
+                            await write_sync_status(site.dir, { ok: true });
+                        }
                     }
                     catch (err) {
                         const message = err instanceof Error ? err.message : String(err);
@@ -880,15 +912,20 @@ export async function dev_server(options) {
                     const on_event = (full_path) => {
                         if (should_skip_synced_delete(full_path))
                             return;
-                        const synced_mtime = synced_files.get(full_path);
-                        if (synced_mtime) {
-                            fs.stat(full_path)
-                                .then(stat => {
-                                if (Math.abs(stat.mtimeMs - synced_mtime) < SYNC_MTIME_TOLERANCE_MS) {
-                                    synced_files.delete(full_path);
-                                    return;
-                                }
+                        if (synced_files.has(full_path)) {
+                            // We last wrote this file from a CMS pull. Compare
+                            // the file's *current* content against the hash we
+                            // stored: if identical, this watcher event is the
+                            // echo of our own write and must be ignored; if
+                            // different, the user edited the file (possibly
+                            // within ms of our pull) and the edit must push,
+                            // which is exactly the case the old mtime-tolerance
+                            // check used to swallow for site/head.svelte.
+                            event_matches_synced_write(full_path)
+                                .then(matches => {
                                 synced_files.delete(full_path);
+                                if (matches)
+                                    return;
                                 push_or_ignore_file_change(full_path);
                             })
                                 .catch(() => {
@@ -1273,15 +1310,8 @@ function track_duplicate(duplicates, category, id, occurrence) {
     existing.push(occurrence);
     by_id.set(id, existing);
 }
-async function mark_written_file(file_path) {
-    synced_files.set(file_path, Date.now());
-    try {
-        const stat = await fs.stat(file_path);
-        synced_files.set(file_path, stat.mtimeMs);
-    }
-    catch {
-        // Ignore files that disappeared
-    }
+function mark_written_file(file_path, content) {
+    synced_files.set(file_path, hash_content(content));
 }
 function mark_deleted_path(file_path) {
     synced_deleted_paths.set(file_path, Date.now());
@@ -1831,8 +1861,10 @@ async function import_site_files(site_dir, api_url, config, port, server_config,
     const zip_started = Date.now();
     const zip_buffer = await create_site_zip(site_dir, preparation.excluded_paths);
     const zip_ms = Date.now() - zip_started;
-    // Always use a localhost-style host in dev — the production host stays in
-    // site.yaml for push, but local routing must hit *.localhost
+    // Dev sites route via *.localhost. The host is computed from name+port
+    // here and passed only to bootstrap (which seeds new sites with this
+    // routing host); site.yaml does not carry host at all, and the regular
+    // import path never sets host — so dashboard-managed routing is safe.
     const host = local_dev_host(config.name || path.basename(site_dir), port);
     if (!use_bootstrap) {
         const import_form = new FormData();
@@ -2103,18 +2135,7 @@ async function create_site_zip(dir, excluded_paths = new Set()) {
                 }
                 const site_json = path.join(dir, SITE_CONFIG_FILE);
                 if (!is_excluded_path(SITE_CONFIG_FILE, excluded_paths)) {
-                    // Strip `host` if present — `site.yaml` no longer carries it,
-                    // but older dirs pulled by previous CLI versions still do,
-                    // and the local CMS's /import endpoint persists whatever
-                    // host the zipped yaml declares, overwriting bootstrap's
-                    // *.localhost value and breaking preview routing.
-                    const sanitized = await read_site_yaml_without_host(site_json);
-                    if (sanitized !== null) {
-                        archive.append(sanitized, { name: SITE_CONFIG_FILE });
-                    }
-                    else {
-                        archive.file(site_json, { name: SITE_CONFIG_FILE });
-                    }
+                    archive.file(site_json, { name: SITE_CONFIG_FILE });
                 }
                 await archive.finalize();
             }
@@ -2124,22 +2145,6 @@ async function create_site_zip(dir, excluded_paths = new Set()) {
         })();
     });
 }
-async function read_site_yaml_without_host(site_yaml_path) {
-    try {
-        const raw = await fs.readFile(site_yaml_path, 'utf-8');
-        const parsed = load_yaml(raw);
-        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
-            return null;
-        const data = parsed;
-        if (!('host' in data))
-            return null;
-        const { host: _, ...rest } = data;
-        return dump_yaml(rest, { lineWidth: -1, noRefs: true });
-    }
-    catch {
-        return null;
-    }
-}
 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);
     if (!response.ok)
@@ -2321,13 +2326,12 @@ async function sync_directory(src, dest, relative_path = '', options = {}) {
                         console.log(chalk.dim(`  trash failed for ${file_relative}`));
                     }
                 }
-                // Track this file BEFORE writing to avoid race with watcher
-                // Use current time as estimate, watcher allows 1 second tolerance
-                synced_files.set(dest_path, Date.now());
+                // Track this file's content hash BEFORE writing so the
+                // chokidar event our own write produces can be matched
+                // against `synced_files` and dropped, while a genuine user
+                // edit (different content) still falls through and pushes.
+                synced_files.set(dest_path, hash_content(src_content));
                 await fs.writeFile(dest_path, src_content);
-                // Update with actual mtime after write
-                const stat = await fs.stat(dest_path);
-                synced_files.set(dest_path, stat.mtimeMs);
                 // Surface shrinkage on the change line itself so a user
                 // scanning the dev log notices when a YAML list silently
                 // loses entries (the failure mode reported during the
@@ -2392,6 +2396,14 @@ async function has_library_content(library_dir) {
 }
 async function write_created_ids(site_dir, created_ids, server_config, workspace_dir) {
     const format_options = resolve_format_options(server_config);
+    // Upload writeback is special: rename local files and rewrite any yaml
+    // that still references symbolic paths. Surfaced under a non-standard
+    // `_uploads` key in created_ids["uploads/.manifest.json"] so the rest of
+    // this loop's `_id`/`sections` logic doesn't get confused by it.
+    const uploads_payload = created_ids['uploads/.manifest.json'];
+    if (uploads_payload && typeof uploads_payload._uploads === 'object' && uploads_payload._uploads !== null) {
+        await write_upload_writeback(site_dir, uploads_payload._uploads, server_config, workspace_dir);
+    }
     for (const [relative_path, id_data] of Object.entries(created_ids)) {
         if (!id_data._id && !Array.isArray(id_data.sections))
             continue;
@@ -2427,7 +2439,7 @@ async function write_created_ids(site_dir, created_ids, server_config, workspace
                 const raw = dump_yaml(data, { lineWidth: -1 });
                 const formatted = await format_file_contents(file_path, raw, workspace_dir, format_options);
                 await fs.writeFile(file_path, formatted, 'utf-8');
-                await mark_written_file(file_path);
+                mark_written_file(file_path, formatted);
             }
         }
         catch {
@@ -2435,3 +2447,148 @@ async function write_created_ids(site_dir, created_ids, server_config, workspace
         }
     }
 }
+// write_upload_writeback reconciles the local uploads/ folder and yaml refs
+// with what the server actually stored on the latest push.
+//
+// For each entry `symbolic -> {id, canonical}`:
+//   - If canonical != symbolic, rename uploads/<symbolic> to uploads/<canonical>
+//     on disk so subsequent pulls/pushes round-trip without churn.
+//   - Rewrite any yaml file that still says `upload: "uploads/<symbolic>"` to
+//     the record id, matching what the server stored. This converges the local
+//     copy with the server's canonical content shape without needing a pull.
+//
+// The watcher is told about each rename and rewrite via mark_written_file /
+// mark_deleted_path so it doesn't echo our own writes back as user edits.
+async function write_upload_writeback(site_dir, uploads_map, server_config, workspace_dir) {
+    // Build a symbolic -> record-id map for the yaml rewrite pass. Skip
+    // malformed entries instead of failing the whole writeback so a partial
+    // server response can still rename what it can.
+    const symbolic_to_id = new Map();
+    const renames = [];
+    for (const [symbolic, raw_entry] of Object.entries(uploads_map)) {
+        if (!raw_entry || typeof raw_entry !== 'object')
+            continue;
+        const entry = raw_entry;
+        const id = typeof entry.id === 'string' ? entry.id : '';
+        const canonical = typeof entry.canonical === 'string' ? entry.canonical : '';
+        if (!id)
+            continue;
+        symbolic_to_id.set(symbolic, id);
+        if (canonical && canonical !== symbolic) {
+            renames.push({ symbolic, canonical });
+        }
+    }
+    // Rename the on-disk files. Best-effort: if the symbolic file is missing
+    // (already renamed by a prior push, or removed by the user) we silently
+    // move on — the yaml rewrite still keeps content consistent.
+    const uploads_dir = path.join(site_dir, 'uploads');
+    for (const { symbolic, canonical } of renames) {
+        const from = path.join(uploads_dir, symbolic);
+        const to = path.join(uploads_dir, canonical);
+        try {
+            await fs.rename(from, to);
+            mark_deleted_path(from);
+            mark_written_file(to, await fs.readFile(to));
+        }
+        catch {
+            // missing source or permission issue — skip
+        }
+    }
+    // Rewrite symbolic upload references across all yaml under the site dir.
+    // Walking the tree is bounded by site size and only re-marshals files
+    // that mention `uploads/` literally, so the cost is small even on large
+    // sites. Restricting to known sync subdirs avoids touching artifacts in
+    // dot-directories or build output.
+    if (symbolic_to_id.size === 0)
+        return;
+    const format_options = resolve_format_options(server_config);
+    for (const subdir of SITE_SYNC_DIRS) {
+        const root = path.join(site_dir, subdir);
+        const files = await walk_yaml_files(root).catch(() => []);
+        for (const file_path of files) {
+            try {
+                const content = await fs.readFile(file_path, 'utf-8');
+                if (!content.includes('uploads/'))
+                    continue;
+                const parsed = load_yaml(content);
+                if (!parsed || typeof parsed !== 'object')
+                    continue;
+                const { value: rewritten, changed } = rewrite_symbolic_upload_refs(parsed, symbolic_to_id);
+                if (!changed)
+                    continue;
+                const raw = dump_yaml(rewritten, { lineWidth: -1 });
+                const formatted = await format_file_contents(file_path, raw, workspace_dir, format_options);
+                await fs.writeFile(file_path, formatted, 'utf-8');
+                mark_written_file(file_path, formatted);
+            }
+            catch {
+                // skip unreadable / unparseable file
+            }
+        }
+    }
+}
+async function walk_yaml_files(root) {
+    const out = [];
+    const stack = [root];
+    while (stack.length > 0) {
+        const dir = stack.pop();
+        let entries;
+        try {
+            entries = await fs.readdir(dir, { withFileTypes: true });
+        }
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            if (entry.name.startsWith('.'))
+                continue;
+            const full = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                stack.push(full);
+            }
+            else if (entry.isFile() && entry.name.endsWith('.yaml')) {
+                out.push(full);
+            }
+        }
+    }
+    return out;
+}
+// rewrite_symbolic_upload_refs is the CLI mirror of the server's rewriteUploadRefs.
+// Walking on the CLI side handles the case where the server's in-zip rewrite
+// updated the imported content but the source files on disk still reference
+// the symbolic path. Without this pass, the next push would resend the
+// symbolic ref and force the server to re-resolve every time.
+function rewrite_symbolic_upload_refs(value, map) {
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+        const obj = value;
+        let changed = false;
+        const result = {};
+        for (const [k, v] of Object.entries(obj)) {
+            if (k === 'upload' && typeof v === 'string' && v.startsWith('uploads/')) {
+                const filename = v.substring('uploads/'.length);
+                const id = map.get(filename);
+                if (id) {
+                    result[k] = id;
+                    changed = true;
+                    continue;
+                }
+            }
+            const child = rewrite_symbolic_upload_refs(v, map);
+            result[k] = child.value;
+            if (child.changed)
+                changed = true;
+        }
+        return { value: result, changed };
+    }
+    if (Array.isArray(value)) {
+        let changed = false;
+        const result = value.map(item => {
+            const child = rewrite_symbolic_upload_refs(item, map);
+            if (child.changed)
+                changed = true;
+            return child.value;
+        });
+        return { value: result, changed };
+    }
+    return { value, changed: false };
+}

package/package.json

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