primo-cli 0.1.3 → 0.1.5

package/dist/commands/new.js

@@ -4,15 +4,43 @@ import chalk from 'chalk';
 import ora from 'ora';
 import inquirer from 'inquirer';
 import { dev_server } from './dev.js';
+import { SITE_CONFIG_FILE, write_site_config } from '../utils/site-config.js';
+import { SERVER_CONFIG_FILE, read_server_config, write_server_config } from '../utils/server-config.js';
 export async function new_site(options) {
     const base_dir = process.cwd();
-    const server_config_path = path.join(base_dir, 'server.json');
-    // Auto-create server.json if it doesn't exist
+    const server_config_path = path.join(base_dir, SERVER_CONFIG_FILE);
+    const site_config_path = path.join(base_dir, SITE_CONFIG_FILE);
+    const sites_dir = path.join(base_dir, 'sites');
+    const library_dir = path.join(base_dir, 'library');
+    try {
+        await fs.access(site_config_path);
+        console.log(chalk.red(`Found ${SITE_CONFIG_FILE} in the current directory.`));
+        console.log(chalk.red('Run `primo new` from a workspace root, not inside a site directory.'));
+        process.exit(1);
+    }
+    catch {
+        // Not inside a site directory, continue.
+    }
+    // Require an initialized workspace
     try {
         await fs.access(server_config_path);
     }
     catch {
-        await fs.writeFile(server_config_path, JSON.stringify({ port: 3000 }, null, 2) + '\n');
+        console.log(chalk.red(`No ${SERVER_CONFIG_FILE} found in the current directory.`));
+        console.log(chalk.dim('Run `primo init [name]` first to create a workspace.'));
+        process.exit(1);
+    }
+    await fs.mkdir(sites_dir, { recursive: true });
+    await fs.mkdir(library_dir, { recursive: true });
+    const server_config = await read_server_config(base_dir);
+    const site_groups = server_config.site_groups ?? [];
+    if (!site_groups.some((group) => group.id === 'default')) {
+        site_groups.push({
+            id: 'default',
+            name: 'Default',
+            index: site_groups.length
+        });
+        await write_server_config(base_dir, { ...server_config, site_groups });
     }
     let site_name = options.name;
     // Prompt for name if not provided
@@ -32,8 +60,8 @@ export async function new_site(options) {
             }]);
         site_name = name;
     }
-    // Always create site in subdirectory
-    const site_dir = path.join(base_dir, site_name);
+    // Always create site in sites/<name>
+    const site_dir = path.join(sites_dir, site_name);
     // Check if directory exists
     try {
         await fs.access(site_dir);
@@ -51,8 +79,7 @@ export async function new_site(options) {
         await fs.mkdir(path.join(site_dir, 'pages'), { recursive: true });
         await fs.mkdir(path.join(site_dir, 'page-types', 'default'), { recursive: true });
         await fs.mkdir(path.join(site_dir, 'site'), { recursive: true });
-        await fs.mkdir(path.join(site_dir, 'uploads'), { recursive: true });
-        // Create primo.json
+        // Create site config
         // If name has dots (hostname), use first part capitalized as display name
         const display_name = site_name.includes('.')
             ? site_name.split('.')[0].charAt(0).toUpperCase() + site_name.split('.')[0].slice(1)
@@ -62,20 +89,36 @@ export async function new_site(options) {
             site_id: generate_id(),
             // Leave host empty for local dev - dev.ts will generate coffee-shop.localhost:3000
             // Only set host if it looks like a real domain (has a dot)
-            host: site_name.includes('.') ? site_name : ''
+            host: site_name.includes('.') ? site_name : '',
+            group: 'default'
         };
-        await fs.writeFile(path.join(site_dir, 'primo.json'), JSON.stringify(config, null, 2) + '\n');
-        // Create default page type config
+        await write_site_config(site_dir, config);
+        // Create default page type config + sibling fields.yaml
         const page_type_config = {
-            id: generate_id(),
+            _id: generate_id(),
             name: 'Default',
             icon: 'mdi:file-document-outline',
-            allowed_blocks: ['hero'],
-            fields: []
+            color: '#2B407D',
+            allowed_blocks: ['hero']
         };
-        await fs.writeFile(path.join(site_dir, 'page-types', 'default', 'config.json'), JSON.stringify(page_type_config, null, 2) + '\n');
+        await fs.writeFile(path.join(site_dir, 'page-types', 'default', 'config.yaml'), `_id: ${page_type_config._id}
+name: ${page_type_config.name}
+icon: ${page_type_config.icon}
+color: "${page_type_config.color}"
+allowed_blocks:
+  - hero
+`);
+        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.
+#
+# header:
+#   - block: site-header
+# footer:
+#   - block: site-footer
+`);
         // Create site fields (empty array)
-        await fs.writeFile(path.join(site_dir, 'site', 'fields.json'), '[]\n');
+        await fs.writeFile(path.join(site_dir, 'site', 'fields.yaml'), '[]\n');
         // Create site content (empty)
         await fs.writeFile(path.join(site_dir, 'site', 'content.yaml'), '# Site-wide content\n');
         // Create site head with CSS variables
@@ -94,18 +137,24 @@ export async function new_site(options) {
 }
 </style>
 `);
-        // Create starter hero block
+        // Create starter hero block (4 files: config + fields + content + component)
         await fs.mkdir(path.join(site_dir, 'blocks', 'hero'), { recursive: true });
-        const hero_fields = {
-            id: generate_id(),
-            name: 'Hero',
-            fields: [
-                { id: generate_id(), name: 'headline', label: 'Headline', type: 'text', options: null },
-                { id: generate_id(), name: 'subheadline', label: 'Subheadline', type: 'text', options: null },
-                { id: generate_id(), name: 'cta', label: 'Call to Action', type: 'link', options: null }
-            ]
-        };
-        await fs.writeFile(path.join(site_dir, 'blocks', 'hero', 'fields.json'), JSON.stringify(hero_fields, null, 2) + '\n');
+        await fs.writeFile(path.join(site_dir, 'blocks', 'hero', 'config.yaml'), `_id: ${generate_id()}
+name: Hero
+`);
+        await fs.writeFile(path.join(site_dir, 'blocks', 'hero', 'fields.yaml'), `- _id: ${generate_id()}
+  name: headline
+  label: Headline
+  type: text
+- _id: ${generate_id()}
+  name: subheadline
+  label: Subheadline
+  type: text
+- _id: ${generate_id()}
+  name: cta
+  label: Call to Action
+  type: link
+`);
         await fs.writeFile(path.join(site_dir, 'blocks', 'hero', 'component.svelte'), `<section class="hero">
 	<div class="container">
 		<h1>{headline}</h1>
@@ -174,13 +223,14 @@ cta:
 `);
         // Create index page
         const page_id = generate_id();
-        await fs.writeFile(path.join(site_dir, 'pages', 'index.yaml'), `id: ${page_id}
+        const section_id = generate_id();
+        await fs.writeFile(path.join(site_dir, 'pages', 'index.yaml'), `_id: ${page_id}
 name: Home
-slug: index
 page_type: default
 fields: {}
 sections:
-  - block: hero
+  - _id: ${section_id}
+    block: hero
     content:
       headline: Welcome to ${display_name}
       subheadline: Edit this content in your local files or CMS
@@ -188,8 +238,16 @@ sections:
         label: Get Started
         url: "#"
 `);
-        // Create AGENT.md
-        await fs.writeFile(path.join(site_dir, 'AGENT.md'), generate_agent_md(display_name));
+        // Create workspace-level AGENTS.md if it doesn't already exist.
+        // Per-site AGENTS.md is generated by `export.go` for portable exports;
+        // in a workspace, one root-level file covers all sites.
+        const workspace_agents_path = path.join(base_dir, 'AGENTS.md');
+        try {
+            await fs.access(workspace_agents_path);
+        }
+        catch {
+            await fs.writeFile(workspace_agents_path, generate_agent_md());
+        }
         spinner.succeed(`Site created: ${chalk.cyan(site_dir)}`);
         // Check if server is already running
         const port = 3000;
@@ -245,263 +303,92 @@ async function is_server_running(port) {
         return false;
     }
 }
-function generate_agent_md(site_name) {
-    return `# ${site_name}
-
-Pala site for local development.
-
-## Structure
-
-\`\`\`
-blocks/           # Svelte components with content fields
-  {name}/
-    component.svelte
-    fields.json
-    content.yaml  # Default field values (optional)
-page-types/       # Page templates
-  {name}/
-    config.json
-pages/            # Page content (YAML)
-  index.yaml      # Homepage
-  contact.yaml    # Leaf page (/contact)
-  about/          # Section with children
-    index.yaml    # /about
-    team.yaml     # /about/team
-site/             # Site-wide settings
-  fields.json
-  content.yaml
-  head.svelte     # Injected into <head>
-.primo/           # Internal metadata
-\`\`\`
-
-## Creating Blocks
-
-Each block needs two files:
-
-**component.svelte** - Svelte 5 component:
-\`\`\`svelte
-<h1>{headline}</h1>
-{#if image?.url}
-  <img src={image.url} alt={image.alt} />
-{/if}
+function generate_agent_md() {
+    return `# Primo workspace
 
-<style>
-  h1 { font-size: 2rem; }
-</style>
-\`\`\`
-
-**Note:** Props are auto-injected from fields.json. No need to declare \`$props()\` - just use the field names directly in your template.
-
-**fields.json** - Field definitions:
-\`\`\`json
-{
-  "name": "Hero",
-  "fields": [
-    { "name": "headline", "label": "Headline", "type": "text" },
-    { "name": "image", "label": "Image", "type": "image" }
-  ]
-}
-\`\`\`
-
-## Field Types
-
-### text
-Single-line text input.
-\`\`\`svelte
-<h1>{headline}</h1>
-\`\`\`
-
-### rich-text
-WYSIWYG editor. Outputs HTML.
-\`\`\`svelte
-{@html content}
-\`\`\`
-
-### markdown
-Markdown editor. Outputs HTML.
-\`\`\`svelte
-{@html body}
-\`\`\`
-
-### image
-Image upload. Returns \`{ url, alt, width, height }\`.
-\`\`\`svelte
-{#if image?.url}
-  <img src={image.url} alt={image.alt} />
-{/if}
-\`\`\`
-
-### link
-URL with label. Returns \`{ url, label }\`.
-\`\`\`svelte
-{#if cta?.url}
-  <a href={cta.url}>{cta.label}</a>
-{/if}
-\`\`\`
-
-### url
-Plain URL string.
-\`\`\`svelte
-<a href={website_url}>Visit</a>
-\`\`\`
-
-### icon
-Icon picker. Returns SVG string.
-\`\`\`svelte
-{@html icon}
-\`\`\`
-
-### number
-Numeric input.
-\`\`\`json
-{ "name": "columns", "type": "number", "options": { "min": 1, "max": 6 } }
-\`\`\`
-
-### switch
-Boolean toggle.
-\`\`\`svelte
-{#if show_title}<h1>{title}</h1>{/if}
-\`\`\`
-
-### select
-Dropdown selection.
-\`\`\`json
-{ "name": "align", "type": "select", "options": { "choices": ["left", "center", "right"] } }
-\`\`\`
-\`\`\`svelte
-<div class="text-{align}">{content}</div>
-\`\`\`
-
-### repeater
-List of items with nested fields.
-\`\`\`json
-{
-  "name": "features",
-  "type": "repeater",
-  "options": {
-    "fields": [
-      { "name": "title", "type": "text" },
-      { "name": "description", "type": "text" }
-    ]
-  }
-}
-\`\`\`
-\`\`\`svelte
-{#each features as feature}
-  <div>
-    <h3>{feature.title}</h3>
-    <p>{feature.description}</p>
-  </div>
-{/each}
-\`\`\`
-
-### group
-Nested object of fields.
-\`\`\`json
-{
-  "name": "author",
-  "type": "group",
-  "options": {
-    "fields": [
-      { "name": "name", "type": "text" },
-      { "name": "avatar", "type": "image" }
-    ]
-  }
-}
-\`\`\`
-\`\`\`svelte
-<div>{author.name}</div>
-{#if author.avatar?.url}<img src={author.avatar.url} />{/if}
-\`\`\`
-
-### page
-Reference to another page. Returns page data with \`_meta.url\`.
-\`\`\`json
-{ "name": "featured_post", "type": "page", "options": { "page_type": "blog-post" } }
-\`\`\`
-
-### page-list
-All pages of a type.
-\`\`\`json
-{ "name": "posts", "type": "page-list", "options": { "page_type": "blog-post" } }
-\`\`\`
-
-### page-field
-Reference a field from the current page type.
-
-### site-field
-Reference a site-wide field.
-
-### slider
-Range slider for numeric values.
-\`\`\`json
-{ "name": "opacity", "type": "slider", "options": { "min": 0, "max": 100, "step": 10 } }
-\`\`\`
-
-### date
-Date picker.
-
-### info
-Display-only text for editors (not rendered in component).
-
-## Svelte 5 Syntax
-
-Components use Svelte 5:
-- \`$state()\` for reactive variables
-- \`$derived()\` for computed values
-- \`$effect()\` for side effects
-- \`onclick={handler}\` not \`on:click={handler}\`
-
-## Editor Context
-
-Check if component is running in the CMS editor:
-\`\`\`svelte
-let is_editor = $state(false)
-
-if (typeof window !== 'undefined') {
-	is_editor = window.__PALA_CONTEXT__?.environment === 'editor'
-}
-\`\`\`
+Primo workspace for local development. Each subdirectory under \`sites/\` is an independent Primo site.
+
+The Primo MCP server (\`primo\`) is the source of truth, when present, for schema, validation, field types, and inline editing. Call \`list_docs\` first to see what's documented.
+
+Without the MCP server, read \`sites/*/blocks/*/fields.yaml\` and \`sites/*/page-types/*/fields.yaml\` to infer schemas, and treat \`sites/*/pages/*.yaml\` page/section \`content:\` as the source of truth for rendered content (block \`content.yaml\` files are defaults only).
+
+## Layout
+
+- \`server.yaml\` — workspace config and site groups
+- \`sites/<name>/\` — individual sites (\`site.yaml\`, \`site/\`, \`blocks/\`, \`page-types/\`, \`pages/\`, \`.primo/\`)
+- \`library/\` — shared library content
 
-Use this for:
-- Disabling fixed/sticky positioning
-- Skipping scroll/resize listeners
-- Showing placeholder content
+## Setup
 
-## This Site
+- \`primo dev\` — start the local CMS and dev server. Run from the workspace root.
+- \`primo new [name]\` — scaffold a new site under \`sites/\`.
+- File edits sync automatically while \`primo dev\` is running. Structural changes (block schema, component) may trigger a browser reload.
 
-### Blocks
+## Source of truth
 
-- \`hero\` - Hero
+- Editable source lives in \`sites/<name>/site.yaml\`, \`site/\`, \`blocks/\`, \`page-types/\`, and \`pages/\`.
+- \`.primo/\` is generated local state (SQLite + uploads). Do not edit, do not commit.
+- Do not patch the SQLite DB to fix schema or content issues. Edit the source files; the dev server reimports.
+- If local state seems wrong, delete \`.primo/\` and let the dev server reimport from files.
 
-### Page Types
+## Recovering overwritten files
 
-- \`default\` - Default
+When \`primo dev\` syncs CMS changes to disk, the prior file content is copied to \`.primo/trash/\` before the overwrite or delete. Entries are kept for 7 days.
 
-## Best Practices
+If a file appears to have lost content after a sync (deleted entries, shrunken YAML lists, missing sections, removed files), check \`.primo/trash/\` for the most recent copy and restore with \`cp\`. The dev server also annotates the change log when a synced file shrinks or is deleted.
 
-### Safe Field Access
+## IDs
 
-Always handle potentially undefined fields:
-\`\`\`svelte
-<!-- Images -->
-{#if hero_image?.url}
-  <img src={hero_image.url} alt={hero_image.alt} />
-{/if}
+- Top-level entities use system-owned \`_id\` keys (pages, sections, blocks, page types, fields).
+- For blocks, \`_id\` lives in \`blocks/<key>/config.yaml\`. For page types, in \`page-types/<key>/config.yaml\`. The folder name is the stable reference key — editing \`name\` in \`config.yaml\` only changes the editor display label.
+- When creating a new entity, omit the ID. The dev server generates and writes it back on first sync.
+- Do not invent or hand-author IDs. Keep existing IDs stable when editing.
+- Duplicate IDs are treated as conflicts; affected files may be skipped.
 
-<!-- Links -->
-<a href={cta?.url || '#'}>{cta?.label || 'Learn More'}</a>
+## Routing
 
-<!-- Repeaters -->
-{#each features || [] as feature}
-  <div>{feature.title}</div>
-{/each}
-\`\`\`
+- Page slugs come from the file path under \`pages/\`, not a \`slug:\` key.
+- \`pages/index.yaml\` → \`/\`, \`pages/about.yaml\` → \`/about\`, \`pages/about/team.yaml\` → \`/about/team\`.
+- Do not add \`slug:\` to page files. It is ignored.
 
 ## Workflow
 
-1. Run \`primo dev\` to start the local preview server
-2. Edit blocks, pages, or site settings - changes auto-sync to dev server
-3. Run \`primo push\` to deploy changes to a live server (if connected)
+- When building out a new site, call \`get_docs('recommended-defaults')\` first for baseline fields and the wiring checklist.
+- After editing a block file, call \`validate_block\`.
+- After editing a page or page-type file, call \`validate_page\`.
+- When creating a new block or page type, prefer \`scaffold_block\` / \`scaffold_page_type\`.
+- When you create a reusable block, add its folder name to the relevant page type's \`allowed_blocks\` — otherwise it won't appear in the editor sidebar.
+- For everything else, call \`get_docs\` with the relevant section.
+- Block components are Svelte 5. If the Svelte MCP server is available, use \`mcp__svelte__svelte-autofixer\` after editing \`.svelte\` files.
+
+## Permission prompts
+
+Your MCP client may prompt before each Primo tool call. All Primo MCP tools are read-only or return scaffolds — they don't modify your files. To skip the prompts, allowlist the \`primo\` server in your client's MCP settings (mechanism varies by client).
+
+---
+
+# Project preferences
+
+Fill in the sections below to give agents project-specific direction. Anything left blank is treated as "no preference."
+
+## Design direction
+
+<!-- e.g. warm earth tones, generous whitespace, system fonts, minimal animation -->
+
+## Voice & tone
+
+<!-- e.g. friendly but not casual, second-person, short sentences -->
+
+## SEO preferences
+
+<!-- e.g. always mention city in seo_description, target ~150 chars, prefer action verbs in titles -->
+
+## Content guidelines
+
+<!-- e.g. real customer names ok, no stock photos, prefer specific numbers over vague claims -->
+
+## Other
+
+<!-- e.g. accessibility targets, performance budgets, browser support, anything else agents should know -->
 `;
 }

package/dist/commands/pull-library.d.ts

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

package/dist/commands/pull-library.js

@@ -0,0 +1,92 @@
+import fs from 'fs/promises';
+import path from 'path';
+import chalk from 'chalk';
+import ora from 'ora';
+import extract from 'extract-zip';
+import { get_auth_token } from '../utils/auth.js';
+async function detect_server() {
+    const ports = [3000, 8080, 5173];
+    for (const port of ports) {
+        try {
+            const url = `http://127.0.0.1:${port}`;
+            const response = await fetch(`${url}/api/health`, {
+                signal: AbortSignal.timeout(500)
+            });
+            if (response.ok) {
+                return url;
+            }
+        }
+        catch {
+            // Not running on this port
+        }
+    }
+    return null;
+}
+export async function pull_library(options) {
+    const spinner = ora('Connecting...').start();
+    try {
+        let server;
+        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 token = options.token || await get_auth_token(server);
+        const headers = {};
+        if (token) {
+            headers.Authorization = `Bearer ${token}`;
+        }
+        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`, {
+            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`.');
+            process.exit(1);
+        }
+        if (!response.ok) {
+            const error = await response.text();
+            spinner.fail(`Export failed: ${error}`);
+            process.exit(1);
+        }
+        const zip_data = await response.arrayBuffer();
+        const temp_zip = path.join(output_dir, '.primo-library-export.zip');
+        await fs.writeFile(temp_zip, Buffer.from(zip_data));
+        spinner.text = 'Extracting library...';
+        await extract(temp_zip, { dir: output_dir });
+        await fs.unlink(temp_zip);
+        const summary = await count_library(path.join(output_dir, 'library'));
+        spinner.succeed(`Library exported to ${chalk.cyan(path.join(output_dir, 'library'))}`);
+        console.log('');
+        console.log(chalk.dim('  Library exported:'));
+        console.log(chalk.dim(`    groups/ ${summary.groups}`));
+        console.log(chalk.dim(`    blocks/ ${summary.blocks}`));
+    }
+    catch (error) {
+        spinner.fail(`Export failed: ${error instanceof Error ? error.message : error}`);
+        process.exit(1);
+    }
+}
+async function count_library(library_dir) {
+    const counts = { groups: 0, blocks: 0 };
+    try {
+        const entries = await fs.readdir(library_dir, { withFileTypes: true });
+        const groups = entries.filter((entry) => entry.isDirectory());
+        counts.groups = groups.length;
+        for (const group of groups) {
+            const group_dir = path.join(library_dir, group.name);
+            const block_entries = await fs.readdir(group_dir, { withFileTypes: true });
+            counts.blocks += block_entries.filter((entry) => entry.isDirectory()).length;
+        }
+    }
+    catch {
+        // No library directory exported
+    }
+    return counts;
+}

package/dist/commands/pull.d.ts

@@ -1,6 +1,5 @@
 interface PullOptions {
     server?: string;
-    site?: string;
     output: string;
     token?: string;
 }