shiply-cli 0.15.0 → 0.17.0

package/dist/confetti.js

@@ -26,3 +26,8 @@ export function confetti(message = '⛵  SITE IS LIVE  ⛵') {
     }
     return out;
 }
+/** Celebrate only on an interactive terminal and only when not opted out.
+ *  Piped / redirected stdout (agents, CI, scrapers) never gets ANSI confetti. */
+export function shouldCelebrate(noConfetti, isTty = process.stdout.isTTY) {
+    return !noConfetti && isTty === true;
+}

package/dist/email.js

@@ -0,0 +1,147 @@
+/** `shiply email <subcommand>` — agent email send + inbox.
+ *
+ *  Pattern mirrors functions.ts: readFlags helper, exported runEmail
+ *  entry point, individual async command functions. Top-level flags
+ *  (--base / --key) are forwarded from index.ts via InheritedFlags. */
+import { loadApiKey } from './config.js';
+import { api, resolveBase } from './publish.js';
+function readFlags(argv, inherited = {}) {
+    const raw = {};
+    const rest = [];
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i];
+        if (a.startsWith('--')) {
+            const eq = a.indexOf('=');
+            if (eq >= 0) {
+                raw[a.slice(2, eq)] = a.slice(eq + 1);
+            }
+            else {
+                const next = argv[i + 1];
+                if (next !== undefined && !next.startsWith('--')) {
+                    raw[a.slice(2)] = next;
+                    i++;
+                }
+                else {
+                    raw[a.slice(2)] = true;
+                }
+            }
+        }
+        else {
+            rest.push(a);
+        }
+    }
+    // For each field: local argv flag takes precedence, then fall back to the
+    // value forwarded from index.ts parseArgs via inherited (the top-level
+    // parseArgs consumed these flags before argv reached us).
+    const flags = {
+        base: (typeof raw.base === 'string' ? raw.base : undefined) ?? inherited.base,
+        key: (typeof raw.key === 'string' ? raw.key : undefined) ?? inherited.key,
+        site: (typeof raw.site === 'string' ? raw.site : undefined) ?? inherited.site,
+        to: (typeof raw.to === 'string' ? raw.to : undefined) ?? inherited.to,
+        subject: (typeof raw.subject === 'string' ? raw.subject : undefined) ?? inherited.subject,
+        html: (typeof raw.html === 'string' ? raw.html : undefined) ?? inherited.html,
+        text: (typeof raw.text === 'string' ? raw.text : undefined) ?? inherited.text,
+    };
+    return { rest, flags };
+}
+const headers = (apiKey) => ({
+    'content-type': 'application/json',
+    authorization: `Bearer ${apiKey}`,
+});
+async function getApiKey(flags, what) {
+    const k = flags.key ?? (await loadApiKey());
+    if (!k)
+        throw new Error(`${what} commands need an API key — run \`shiply login\` first`);
+    return k;
+}
+const EMAIL_USAGE = [
+    'Usage: shiply email <send|inbox>',
+    '       shiply email send --site <slug> --to <addr> --subject <s> --html <h> [--text <t>]',
+    '       shiply email inbox [--site <slug>]',
+].join('\n');
+export async function runEmail(argv, inherited = {}) {
+    const action = argv[0];
+    const rest = argv.slice(1);
+    switch (action) {
+        case 'send':
+            return emailSendCmd(rest, inherited);
+        case 'inbox':
+            return emailInboxCmd(rest, inherited);
+        default:
+            console.error(EMAIL_USAGE);
+            process.exit(1);
+    }
+}
+async function emailSendCmd(argv, inherited) {
+    const { flags } = readFlags(argv, inherited);
+    if (!flags.site) {
+        console.error('--site <slug> is required');
+        console.error(EMAIL_USAGE);
+        process.exit(1);
+    }
+    if (!flags.to) {
+        console.error('--to <addr> is required');
+        console.error(EMAIL_USAGE);
+        process.exit(1);
+    }
+    if (!flags.subject) {
+        console.error('--subject <s> is required');
+        console.error(EMAIL_USAGE);
+        process.exit(1);
+    }
+    if (!flags.html) {
+        console.error('--html <h> is required');
+        console.error(EMAIL_USAGE);
+        process.exit(1);
+    }
+    const apiKey = await getApiKey(flags, 'email');
+    const base = resolveBase(flags.base);
+    const body = {
+        slug: flags.site,
+        to: flags.to,
+        subject: flags.subject,
+        html: flags.html,
+    };
+    if (flags.text)
+        body.text = flags.text;
+    const r = await api(`${base}/api/v1/email/send`, {
+        method: 'POST',
+        headers: headers(apiKey),
+        body: JSON.stringify(body),
+    });
+    console.log(`✔ sent`);
+    console.log(`  messageId: ${r.messageId}`);
+}
+async function emailInboxCmd(argv, inherited) {
+    const { flags } = readFlags(argv, inherited);
+    const apiKey = await getApiKey(flags, 'email');
+    const base = resolveBase(flags.base);
+    const qs = flags.site ? `?slug=${encodeURIComponent(flags.site)}` : '';
+    const r = await api(`${base}/api/v1/email/inbox${qs}`, {
+        headers: headers(apiKey),
+    });
+    if (!r.threads.length) {
+        console.log('No threads yet.');
+        return;
+    }
+    // Compact table: ID | SITE | FROM | SUBJECT | LAST
+    const cols = r.threads.map((t) => ({
+        id: t.id,
+        site: t.siteSlug ?? '',
+        from: t.from ?? '',
+        subject: t.subject ?? '',
+        last: t.lastAt ?? '',
+        count: String(t.messageCount ?? 1),
+    }));
+    const w = {
+        id: Math.max('ID'.length, ...cols.map((c) => c.id.length)),
+        site: Math.max('SITE'.length, ...cols.map((c) => c.site.length)),
+        from: Math.max('FROM'.length, ...cols.map((c) => c.from.length)),
+        subject: Math.max('SUBJECT'.length, ...cols.map((c) => c.subject.length)),
+        count: Math.max('#'.length, ...cols.map((c) => c.count.length)),
+    };
+    console.log(`${'ID'.padEnd(w.id)}  ${'SITE'.padEnd(w.site)}  ${'FROM'.padEnd(w.from)}  ${'SUBJECT'.padEnd(w.subject)}  ${'#'.padEnd(w.count)}  LAST`);
+    for (const c of cols) {
+        console.log(`${c.id.padEnd(w.id)}  ${c.site.padEnd(w.site)}  ${c.from.padEnd(w.from)}  ${c.subject.padEnd(w.subject)}  ${c.count.padEnd(w.count)}  ${c.last}`);
+    }
+}

package/dist/ignore.js

@@ -0,0 +1,65 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+function globBody(glob, anchored) {
+    // Escape regex specials, but keep * and / for glob expansion.
+    let g = glob.replace(/[.+^${}()|[\]\\]/g, '\\$&');
+    g = g
+        .replace(/\*\*\//g, '(?:.+/)?') // **/ → any number of leading dirs
+        .replace(/\*\*/g, '.*') // ** → anything, crosses slashes
+        .replace(/\*/g, '[^/]*'); // * → anything but a slash
+    return anchored ? `^${g}` : `(?:^|/)${g}`;
+}
+function parseRule(raw) {
+    let pattern = raw.trim();
+    const negate = pattern.startsWith('!');
+    if (negate)
+        pattern = pattern.slice(1);
+    const dirOnly = pattern.endsWith('/');
+    if (dirOnly)
+        pattern = pattern.slice(0, -1);
+    const anchored = pattern.startsWith('/');
+    if (anchored)
+        pattern = pattern.slice(1);
+    const body = globBody(pattern, anchored);
+    // re: matches the path itself OR anything beneath it.
+    // descendantRe: matches ONLY things strictly beneath the named path. A
+    // dir-only rule uses re for directories (and their subtrees) but descendantRe
+    // for files, so a FILE that merely shares the dir's name is kept.
+    return {
+        re: new RegExp(`${body}(?:/|$)`),
+        descendantRe: new RegExp(`${body}/`),
+        negate,
+        dirOnly,
+    };
+}
+/** Compile .shiplyignore lines (a documented gitignore subset) into a matcher.
+ *  Supported: # comments, blank lines, trailing-slash dir-only rules,
+ *  leading-slash root anchoring, * and ** globs, and ! negation. Last match wins. */
+export function compileIgnore(lines) {
+    const rules = lines
+        .map((l) => l.replace(/\r$/, ''))
+        .filter((l) => l.trim() !== '' && !l.trimStart().startsWith('#'))
+        .map(parseRule);
+    return (relPath, isDir) => {
+        let excluded = false;
+        for (const r of rules) {
+            // A dir-only rule excludes the directory itself (and its subtree) but, for
+            // a plain file, only when that file lives BENEATH the named directory —
+            // never a file that merely shares the directory's name.
+            const re = r.dirOnly && !isDir ? r.descendantRe : r.re;
+            if (re.test(relPath))
+                excluded = !r.negate;
+        }
+        return excluded;
+    };
+}
+/** Load `.shiplyignore` from the publish root; null when absent. */
+export async function loadIgnore(dir) {
+    try {
+        const raw = await readFile(join(dir, '.shiplyignore'), 'utf8');
+        return compileIgnore(raw.split('\n'));
+    }
+    catch {
+        return null;
+    }
+}

package/dist/index.js

@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path';
 import { createInterface } from 'node:readline/promises';
 import { fileURLToPath } from 'node:url';
 import { parseArgs } from 'node:util';
-import { confetti } from './confetti.js';
+import { confetti, shouldCelebrate } from './confetti.js';
 import { runDetect } from './detect.js';
 import { resolvePayloadDir } from './framework.js';
 import { runClaimVerify } from './claim.js';
@@ -16,13 +16,18 @@ import { runListing } from './listings.js';
 import { runSendingDomain } from './sending-domains.js';
 import { contractAmend, contractDraft, contractList, contractPdf, contractRetract, contractSend, contractShow, } from './contract.js';
 import { runCron, runFunction, runSecret } from './functions.js';
+import { runEmail } from './email.js';
+import { runMailbox } from './mailbox.js';
 import { loadApiKey, saveApiKey } from './config.js';
 import { loginViaDeviceFlow } from './login.js';
 import { api, ApiError, DEFAULT_BASE, publish, resolveBase } from './publish.js';
 import { installSkill } from './skill.js';
 import { readState, writeState } from './state.js';
+import { readPreview, writePreview } from './previews.js';
 import { checkReadiness, targetToHostname } from './status.js';
 import { runStatus } from './status-cmd.js';
+import { sitesLs, sitesPromote, sitesRm, sitesRollback } from './sites.js';
+import { verifySite } from './verify.js';
 // Resolve the package.json beside the compiled dist/ so `shiply --version`
 // can print the running CLI version (works in dev tsc output + npm install).
 const HERE = dirname(fileURLToPath(import.meta.url));
@@ -45,10 +50,13 @@ const HELP = `shiply — instant static hosting for agents (https://shiply.now)
 Usage:
   shiply publish <dir> [options]              Publish a directory, print the live URL.
                                               Re-running UPDATES the same site (state in .shiply.json)
+  shiply publish <dir> --as <name>            Stable preview: reuse the same URL across iterations
   shiply update <dir>                         Same as publish when .shiply.json exists
   shiply status <slug-or-domain> [--wait]     SSL + readiness check (agent-friendly output)
                                               (no arg → account/plan status, see below)
   shiply duplicate <slug>                     Server-side copy of an owned site → new URL
+  shiply promote <preview-slug> --to <dest-slug>
+                                              Copy the exact previewed bytes into a production site (no rebuild)
   shiply detect [dir]                         Diagnose: print framework + dir that would upload
                                               (no upload — use --framework=<name> to test an override)
   shiply drive <ls|put|get|rm|publish>        Private cloud storage (drive publish → live site)
@@ -94,6 +102,16 @@ Usage:
                                               pdf <contract-id> -o file.pdf — signed PDF download
                                               amend <id> --scope "…" [--fee-delta N] [--target-date YYYY-MM-DD]
                                               retract <id> [--keep-as-draft] — undo a sent contract
+  shiply email send --site <slug> --to <addr> --subject <s> --html <h> [--text <t>]
+                                              Send a transactional email from a site's inbox address
+  shiply email inbox [--site <slug>]          List email threads (optionally filtered by site)
+  shiply mailbox set <slug> <collection> [--confirm] [--no-confirm] [--notify] [--no-notify]
+                            [--notify-to <email>] [--from <sendingDomainId>]
+                                              Update mailbox settings (double-opt-in, owner notifications…)
+  shiply mailbox broadcast <slug> <collection> --subject <s> --html <h> [--text <t>]
+                                              Send a broadcast to all contacts in a mailbox collection
+  shiply mailbox contacts <slug> <collection> [--status <signed_up|confirmed|unsubscribed>]
+                                              List contacts in a mailbox collection
   shiply data init [dir]                      Scaffold a starter .shiply/data.json in <dir> (default cwd)
   shiply data list <slug>                     List collections on a site with counts
   shiply data query <slug> <coll> [--limit N] [--cursor C] [--where '<json>']
@@ -128,11 +146,13 @@ Options:
   --base <url>           API origin (default: ${DEFAULT_BASE})
   --wait                 (status) poll until the site is ready
   --timeout <seconds>    (status --wait) give up after this long (default 300)
+  --json                 (publish/update) print one JSON line {slug,siteUrl,…}, no decoration
   --json <body>          (data insert) JSON object to insert
   --limit <N>            (data query) max records to return (default 50)
   --cursor <iso>         (data query) pagination cursor from previous response
   --where <json>         (data query) client-side filter, e.g. '{"email":"a@b.co"}'
   --yes                  (data wipe-collection) skip the safety prompt
+  --as <name>            (publish) stable named preview — same URL every iteration
   --no-confetti          Celebrate quietly
 
 \`shiply status\` prints stable machine-readable markers for agents:
@@ -161,7 +181,7 @@ async function reportReadiness(host, celebrate) {
     else {
         console.log(`✖ site: not ready${r.http.status ? ` (HTTP ${r.http.status})` : r.http.error ? ` — ${r.http.error}` : ''}`);
     }
-    if (r.ready && celebrate)
+    if (r.ready && celebrate && shouldCelebrate(false))
         console.log(confetti());
     return r.ready;
 }
@@ -171,12 +191,17 @@ async function main() {
     // Detect the bare flag in raw argv BEFORE parseArgs sees it; strip the
     // token so the parser doesn't complain about a missing string value.
     const rawArgv = process.argv.slice(2);
-    const statusJsonFlag = rawArgv[0] === 'status' && rawArgv.includes('--json') &&
+    // `--json` is a STRING option (data-insert body). For commands where it's a
+    // boolean flag (status/publish/update), detect a BARE --json (no following
+    // value) in raw argv and strip it before parseArgs sees it.
+    const BARE_JSON_CMDS = new Set(['status', 'publish', 'update']);
+    const bareJsonFlag = BARE_JSON_CMDS.has(rawArgv[0]) && rawArgv.includes('--json') &&
         !rawArgv.some((a, i) => a === '--json' && typeof rawArgv[i + 1] === 'string' && !rawArgv[i + 1].startsWith('-'));
-    if (statusJsonFlag) {
+    if (bareJsonFlag) {
         const idx = rawArgv.indexOf('--json');
         rawArgv.splice(idx, 1);
     }
+    const statusJsonFlag = bareJsonFlag && rawArgv[0] === 'status';
     const { values, positionals } = parseArgs({
         args: rawArgv,
         allowPositionals: true,
@@ -189,6 +214,7 @@ async function main() {
             base: { type: 'string' },
             email: { type: 'string' },
             name: { type: 'string' },
+            as: { type: 'string' },
             wait: { type: 'boolean' },
             'new-site': { type: 'boolean' },
             project: { type: 'boolean' },
@@ -211,6 +237,17 @@ async function main() {
             'fee-delta': { type: 'string' },
             'target-date': { type: 'string' },
             'keep-as-draft': { type: 'boolean' },
+            to: { type: 'string' },
+            subject: { type: 'string' },
+            html: { type: 'string' },
+            text: { type: 'string' },
+            status: { type: 'string' },
+            confirm: { type: 'boolean' },
+            'no-confirm': { type: 'boolean' },
+            notify: { type: 'boolean' },
+            'no-notify': { type: 'boolean' },
+            'notify-to': { type: 'string' },
+            from: { type: 'string' },
             help: { type: 'boolean', short: 'h' },
             version: { type: 'boolean', short: 'v' },
         },
@@ -236,13 +273,18 @@ async function main() {
             // pre-built fallback like dist/).
             const { dir: publishDir, hint } = await resolvePayloadDir(dir, { framework: values.framework });
             const spa = values.spa ?? (hint?.spa ? true : undefined);
-            if (hint && publishDir !== dir) {
+            if (hint && publishDir !== dir && !bareJsonFlag) {
                 console.log(`✔ ${hint.framework} project detected — publishing ${publishDir}${hint.spa ? ' with SPA mode' : ''}`);
             }
             // same command, same URL: reuse this directory's site automatically
             const state = await readState(publishDir);
-            let claimToken = values['claim-token'] ?? state?.claimToken;
-            let slug = state?.owned && apiKey ? state.slug : undefined;
+            // --as <name>: a stable named preview. The alias registry remembers which
+            // slug this name last published to, so the URL is reused every iteration —
+            // independent of which directory the bytes came from.
+            const aliasName = values.as;
+            const alias = aliasName ? await readPreview(aliasName) : null;
+            let claimToken = values['claim-token'] ?? alias?.claimToken ?? state?.claimToken;
+            let slug = (alias?.owned && apiKey ? alias.slug : undefined) ?? (state?.owned && apiKey ? state.slug : undefined);
             if (values['new-site']) {
                 claimToken = values['claim-token'];
                 slug = undefined;
@@ -277,6 +319,28 @@ async function main() {
                 owned: !res.anonymous,
                 ...(state?.databaseId ? { databaseId: state.databaseId } : {}),
             });
+            if (aliasName) {
+                await writePreview(aliasName, {
+                    slug: res.slug,
+                    owned: !res.anonymous,
+                    ...(res.siteId ? { siteId: res.siteId } : {}),
+                    ...(res.claimToken ? { claimToken: res.claimToken } : alias?.claimToken ? { claimToken: alias.claimToken } : {}),
+                });
+            }
+            if (bareJsonFlag) {
+                // Single-line machine output — no banners, no confetti, no readiness chatter.
+                process.stdout.write(`${JSON.stringify({
+                    slug: res.slug,
+                    siteUrl: res.siteUrl,
+                    siteId: res.siteId ?? null,
+                    uploaded: res.uploaded,
+                    skipped: res.skipped,
+                    anonymous: res.anonymous,
+                    expiresAt: res.expiresAt,
+                    updated: updating,
+                })}\n`);
+                return;
+            }
             const skipped = res.skipped > 0 ? ` (${res.skipped} unchanged, skipped)` : '';
             console.log(`✔ ${updating ? `updated ${res.slug} in place` : 'published'} — ${res.uploaded} file${res.uploaded === 1 ? '' : 's'}${skipped}`);
             console.log(`\n  ${res.siteUrl}\n`);
@@ -287,7 +351,7 @@ async function main() {
                 void live.body?.cancel();
                 if (live.status < 400) {
                     console.log(`SITE_READY url=${res.siteUrl} status=${live.status}`);
-                    if (!values['no-confetti'])
+                    if (shouldCelebrate(Boolean(values['no-confetti'])))
                         console.log(confetti(`⛵  ${host} IS LIVE  ⛵`));
                 }
             }
@@ -355,6 +419,50 @@ async function main() {
             console.log(`\n  ${out.siteUrl}\n`);
             return;
         }
+        case 'ls': {
+            const apiKey = values.key ?? (await loadApiKey());
+            if (!apiKey)
+                throw new Error('ls needs an API key — run `shiply login` first');
+            await sitesLs({ base: values.base, apiKey });
+            return;
+        }
+        case 'rm': {
+            if (!dir)
+                throw new Error('usage: shiply rm <slug> --yes');
+            const apiKey = values.key ?? (await loadApiKey());
+            if (!apiKey)
+                throw new Error('rm needs an API key — run `shiply login` first');
+            await sitesRm({ base: values.base, apiKey }, dir, { yes: Boolean(values.yes) });
+            return;
+        }
+        case 'rollback': {
+            if (!dir)
+                throw new Error('usage: shiply rollback <slug> [versionId]  (omit versionId to list versions)');
+            const apiKey = values.key ?? (await loadApiKey());
+            if (!apiKey)
+                throw new Error('rollback needs an API key — run `shiply login` first');
+            await sitesRollback({ base: values.base, apiKey }, dir, positionals[2]);
+            return;
+        }
+        case 'verify': {
+            if (!dir)
+                throw new Error('usage: shiply verify <slug>');
+            // exit 0 when LIVE, 1 when PENDING — same contract as `status`, so an agent
+            // can chain `shiply verify <slug> && <next step>` safely.
+            const ready = await verifySite({ base: values.base }, dir);
+            process.exitCode = ready ? 0 : 1;
+            return;
+        }
+        case 'promote': {
+            const dest = values.to;
+            if (!dir || !dest)
+                throw new Error('usage: shiply promote <preview-slug> --to <dest-slug>');
+            const apiKey = values.key ?? (await loadApiKey());
+            if (!apiKey)
+                throw new Error('promote needs an API key — run `shiply login` first');
+            await sitesPromote({ base: values.base, apiKey }, dir, dest);
+            return;
+        }
         case 'detect': {
             await runDetect(dir ?? '.', { framework: values.framework });
             return;
@@ -666,6 +774,44 @@ async function main() {
                     throw new Error('usage: shiply contract <list|draft|show|send|pdf|amend|retract>');
             }
         }
+        case 'email': {
+            await runEmail(positionals.slice(1), {
+                base: values.base,
+                key: values.key,
+                site: values.site,
+                to: values.to,
+                subject: values.subject,
+                html: values.html,
+                text: values.text,
+            });
+            break;
+        }
+        case 'mailbox': {
+            // Resolve tri-state for confirm/notify:
+            //   --confirm        → true   (values.confirm === true)
+            //   --no-confirm     → false  (values['no-confirm'] === true)
+            //   neither provided → undefined (omit from PATCH body)
+            const confirmValue = values.confirm === true ? true :
+                values['no-confirm'] === true ? false :
+                    undefined;
+            const notifyValue = values.notify === true ? true :
+                values['no-notify'] === true ? false :
+                    undefined;
+            await runMailbox(positionals.slice(1), {
+                base: values.base,
+                key: values.key,
+                site: values.site,
+                subject: values.subject,
+                html: values.html,
+                text: values.text,
+                status: values.status,
+                ...(confirmValue !== undefined ? { confirm: confirmValue } : {}),
+                ...(notifyValue !== undefined ? { notify: notifyValue } : {}),
+                'notify-to': values['notify-to'],
+                from: values.from,
+            });
+            break;
+        }
         case 'claim': {
             if (dir !== 'verify') {
                 console.error('Usage: shiply claim verify <SHIPLY-XXXXXXXX>');

package/dist/mailbox.js

@@ -0,0 +1,199 @@
+/** `shiply mailbox <subcommand>` — mailbox settings, broadcasts, contacts.
+ *
+ *  Pattern mirrors functions.ts: readFlags helper, exported runMailbox
+ *  entry point, individual async command functions. Top-level flags
+ *  (--base / --key) are forwarded from index.ts via InheritedFlags. */
+import { loadApiKey } from './config.js';
+import { api, resolveBase } from './publish.js';
+function readFlags(argv, inherited = {}) {
+    const raw = {};
+    const rest = [];
+    for (let i = 0; i < argv.length; i++) {
+        const a = argv[i];
+        if (a.startsWith('--no-')) {
+            // --no-confirm, --no-notify → store as false
+            raw[a.slice(5)] = false;
+        }
+        else if (a.startsWith('--')) {
+            const eq = a.indexOf('=');
+            if (eq >= 0) {
+                raw[a.slice(2, eq)] = a.slice(eq + 1);
+            }
+            else {
+                const next = argv[i + 1];
+                if (next !== undefined && !next.startsWith('--')) {
+                    raw[a.slice(2)] = next;
+                    i++;
+                }
+                else {
+                    raw[a.slice(2)] = true;
+                }
+            }
+        }
+        else {
+            rest.push(a);
+        }
+    }
+    // For each field: local argv flag takes precedence, then fall back to the
+    // value forwarded from index.ts parseArgs via inherited (the top-level
+    // parseArgs consumed these flags before argv reached us).
+    const flags = {
+        base: (typeof raw.base === 'string' ? raw.base : undefined) ?? inherited.base,
+        key: (typeof raw.key === 'string' ? raw.key : undefined) ?? inherited.key,
+        from: (typeof raw.from === 'string' ? raw.from : undefined) ?? inherited.from,
+        'notify-to': (typeof raw['notify-to'] === 'string' ? raw['notify-to'] : undefined) ?? inherited['notify-to'],
+        subject: (typeof raw.subject === 'string' ? raw.subject : undefined) ?? inherited.subject,
+        html: (typeof raw.html === 'string' ? raw.html : undefined) ?? inherited.html,
+        text: (typeof raw.text === 'string' ? raw.text : undefined) ?? inherited.text,
+        status: (typeof raw.status === 'string' ? raw.status : undefined) ?? inherited.status,
+    };
+    // Boolean toggles — only set when the flag was explicitly provided (local
+    // argv), or when index.ts forwarded a parsed value via inherited.
+    if ('confirm' in raw) {
+        flags.confirm = Boolean(raw.confirm);
+    }
+    else if (inherited.confirm !== undefined) {
+        flags.confirm = inherited.confirm;
+    }
+    if ('notify' in raw) {
+        flags.notify = Boolean(raw.notify);
+    }
+    else if (inherited.notify !== undefined) {
+        flags.notify = inherited.notify;
+    }
+    return { rest, flags };
+}
+const headers = (apiKey) => ({
+    'content-type': 'application/json',
+    authorization: `Bearer ${apiKey}`,
+});
+async function getApiKey(flags, what) {
+    const k = flags.key ?? (await loadApiKey());
+    if (!k)
+        throw new Error(`${what} commands need an API key — run \`shiply login\` first`);
+    return k;
+}
+const MAILBOX_USAGE = [
+    'Usage: shiply mailbox <set|broadcast|contacts>',
+    '       shiply mailbox set <slug> <collection> [--confirm] [--no-confirm] [--notify] [--no-notify] [--notify-to <email>] [--from <sendingDomainId>]',
+    '       shiply mailbox broadcast <slug> <collection> --subject <s> --html <h> [--text <t>]',
+    '       shiply mailbox contacts <slug> <collection> [--status <signed_up|confirmed|unsubscribed>]',
+].join('\n');
+export async function runMailbox(argv, inherited = {}) {
+    const action = argv[0];
+    const rest = argv.slice(1);
+    switch (action) {
+        case 'set':
+            return mailboxSetCmd(rest, inherited);
+        case 'broadcast':
+            return mailboxBroadcastCmd(rest, inherited);
+        case 'contacts':
+            return mailboxContactsCmd(rest, inherited);
+        default:
+            console.error(MAILBOX_USAGE);
+            process.exit(1);
+    }
+}
+async function mailboxSetCmd(argv, inherited) {
+    const { rest, flags } = readFlags(argv, inherited);
+    const [slug, collection] = rest;
+    if (!slug || !collection) {
+        console.error('usage: shiply mailbox set <slug> <collection> [options]');
+        console.error(MAILBOX_USAGE);
+        process.exit(1);
+    }
+    const apiKey = await getApiKey(flags, 'mailbox');
+    const base = resolveBase(flags.base);
+    // Only include fields that were explicitly provided
+    const body = {};
+    if (flags.confirm !== undefined)
+        body.doubleOptIn = flags.confirm;
+    if (flags.notify !== undefined)
+        body.notifyOwner = flags.notify;
+    if (flags['notify-to'] !== undefined)
+        body.notifyTo = flags['notify-to'];
+    if (flags.from !== undefined)
+        body.sendingDomainId = flags.from;
+    const r = await api(`${base}/api/v1/publishes/${encodeURIComponent(slug)}/mailboxes/${encodeURIComponent(collection)}`, {
+        method: 'PATCH',
+        headers: headers(apiKey),
+        body: JSON.stringify(body),
+    });
+    console.log(`✔ mailbox updated for ${slug}/${collection}`);
+    if (r.doubleOptIn !== undefined)
+        console.log(`  doubleOptIn: ${r.doubleOptIn}`);
+    if (r.notifyOwner !== undefined)
+        console.log(`  notifyOwner: ${r.notifyOwner}`);
+    if (r.notifyTo !== undefined && r.notifyTo !== null)
+        console.log(`  notifyTo: ${r.notifyTo}`);
+    if (r.sendingDomainId !== undefined && r.sendingDomainId !== null)
+        console.log(`  sendingDomainId: ${r.sendingDomainId}`);
+}
+async function mailboxBroadcastCmd(argv, inherited) {
+    const { rest, flags } = readFlags(argv, inherited);
+    const [slug, collection] = rest;
+    if (!slug || !collection) {
+        console.error('usage: shiply mailbox broadcast <slug> <collection> --subject <s> --html <h>');
+        console.error(MAILBOX_USAGE);
+        process.exit(1);
+    }
+    if (!flags.subject) {
+        console.error('--subject <s> is required');
+        console.error(MAILBOX_USAGE);
+        process.exit(1);
+    }
+    if (!flags.html) {
+        console.error('--html <h> is required');
+        console.error(MAILBOX_USAGE);
+        process.exit(1);
+    }
+    const apiKey = await getApiKey(flags, 'mailbox');
+    const base = resolveBase(flags.base);
+    const body = {
+        subject: flags.subject,
+        html: flags.html,
+    };
+    if (flags.text)
+        body.text = flags.text;
+    const r = await api(`${base}/api/v1/publishes/${encodeURIComponent(slug)}/mailboxes/${encodeURIComponent(collection)}/broadcast`, {
+        method: 'POST',
+        headers: headers(apiKey),
+        body: JSON.stringify(body),
+    });
+    console.log(`✔ broadcast queued`);
+    console.log(`  broadcastId: ${r.broadcastId}`);
+    console.log(`  recipientCount: ${r.recipientCount}`);
+}
+async function mailboxContactsCmd(argv, inherited) {
+    const { rest, flags } = readFlags(argv, inherited);
+    const [slug, collection] = rest;
+    if (!slug || !collection) {
+        console.error('usage: shiply mailbox contacts <slug> <collection> [--status <...>]');
+        console.error(MAILBOX_USAGE);
+        process.exit(1);
+    }
+    const apiKey = await getApiKey(flags, 'mailbox');
+    const base = resolveBase(flags.base);
+    const qs = flags.status ? `?status=${encodeURIComponent(flags.status)}` : '';
+    const r = await api(`${base}/api/v1/publishes/${encodeURIComponent(slug)}/mailboxes/${encodeURIComponent(collection)}/contacts${qs}`, { headers: headers(apiKey) });
+    if (!r.contacts.length) {
+        console.log(`No contacts in ${slug}/${collection}${flags.status ? ` (status: ${flags.status})` : ''} yet.`);
+        return;
+    }
+    // Compact table: EMAIL | STATUS | CONFIRMED | CREATED
+    const cols = r.contacts.map((c) => ({
+        email: c.email,
+        status: c.status ?? '',
+        confirmed: c.confirmedAt ?? '',
+        created: c.createdAt ?? '',
+    }));
+    const w = {
+        email: Math.max('EMAIL'.length, ...cols.map((c) => c.email.length)),
+        status: Math.max('STATUS'.length, ...cols.map((c) => c.status.length)),
+        confirmed: Math.max('CONFIRMED'.length, ...cols.map((c) => c.confirmed.length)),
+    };
+    console.log(`${'EMAIL'.padEnd(w.email)}  ${'STATUS'.padEnd(w.status)}  ${'CONFIRMED'.padEnd(w.confirmed)}  CREATED`);
+    for (const c of cols) {
+        console.log(`${c.email.padEnd(w.email)}  ${c.status.padEnd(w.status)}  ${c.confirmed.padEnd(w.confirmed)}  ${c.created}`);
+    }
+}

package/dist/manifest.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { readdir, readFile } from 'node:fs/promises';
 import { extname, join } from 'node:path';
+import { loadIgnore } from './ignore.js';
 const MIME = {
     '.html': 'text/html',
     '.htm': 'text/html',
@@ -40,22 +41,30 @@ const SKIP_DIRS = new Set(['node_modules']);
  *  config directory (proxy.json, data.json), which the server consumes. */
 export async function buildManifest(dir) {
     const out = [];
-    await walk(dir, '', out);
+    const ignore = await loadIgnore(dir);
+    await walk(dir, '', out, ignore);
     return out.sort((a, b) => a.path.localeCompare(b.path));
 }
-async function walk(abs, rel, out) {
+async function walk(abs, rel, out, ignore) {
     const entries = await readdir(abs, { withFileTypes: true });
     for (const e of entries) {
         if (e.name === '.shiply' && e.isDirectory() && rel === '') {
-            await walk(join(abs, e.name), '.shiply', out);
+            // The .shiply/ config dir (proxy.json, data.json) is fully exempt from
+            // .shiplyignore — the server needs it, and a broad user rule like
+            // `*.json` must not be able to silently drop the site's own config.
+            // Pass a null matcher so nothing under .shiply/ is ignore-filtered.
+            await walk(join(abs, e.name), '.shiply', out, null);
             continue;
         }
         if (e.name.startsWith('.') || SKIP_DIRS.has(e.name))
             continue;
         const childAbs = join(abs, e.name);
         const childRel = rel ? `${rel}/${e.name}` : e.name;
+        // .shiplyignore: skip matched paths (and whole subtrees for dir matches).
+        if (ignore?.(childRel, e.isDirectory()))
+            continue;
         if (e.isDirectory()) {
-            await walk(childAbs, childRel, out);
+            await walk(childAbs, childRel, out, ignore);
         }
         else if (e.isFile()) {
             const buf = await readFile(childAbs);

package/dist/previews.js

@@ -0,0 +1,26 @@
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+const registryPath = (home) => join(home, '.shiply', 'previews.json');
+async function readAll(home) {
+    try {
+        return JSON.parse(await readFile(registryPath(home), 'utf8'));
+    }
+    catch {
+        return {};
+    }
+}
+/** Look up the slug/credentials previously bound to a `--as <name>` alias. */
+export async function readPreview(name, home = homedir()) {
+    const all = await readAll(home);
+    return all[name] ?? null;
+}
+/** Remember the slug a `--as <name>` alias published to, so the next publish
+ *  with the same name UPDATES the same URL (stable preview). */
+export async function writePreview(name, entry, home = homedir()) {
+    const all = await readAll(home);
+    all[name] = entry;
+    const path = registryPath(home);
+    await mkdir(dirname(path), { recursive: true });
+    await writeFile(path, `${JSON.stringify(all, null, 2)}\n`);
+}

package/dist/sites.js

@@ -0,0 +1,70 @@
+import { api, resolveBase } from './publish.js';
+const headers = (apiKey) => ({
+    'content-type': 'application/json',
+    authorization: `Bearer ${apiKey}`,
+});
+export async function sitesLs(ctx) {
+    const base = resolveBase(ctx.base);
+    const { sites } = await api(`${base}/api/v1/publishes`, {
+        headers: headers(ctx.apiKey),
+    });
+    if (sites.length === 0) {
+        console.log('  no sites yet — run `shiply publish <dir>` to create one');
+        return;
+    }
+    for (const s of sites) {
+        const title = s.title ? `  ${s.title}` : '';
+        console.log(`  ${s.slug}  [${s.status}]  https://${s.slug}.shiply.now${title}`);
+    }
+}
+export async function sitesRm(ctx, slug, opts) {
+    if (!opts.yes) {
+        console.error(`  refusing — \`shiply rm\` PERMANENTLY deletes ${slug} and its files. Re-run with --yes to confirm.`);
+        return;
+    }
+    const base = resolveBase(ctx.base);
+    await api(`${base}/api/v1/publish/${slug}`, {
+        method: 'DELETE',
+        headers: headers(ctx.apiKey),
+    });
+    console.log(`✔ deleted ${slug}`);
+}
+export async function sitesRollback(ctx, slug, versionId) {
+    const base = resolveBase(ctx.base);
+    // No versionId → print the version history so the agent can pick one.
+    if (!versionId) {
+        const detail = await api(`${base}/api/v1/publish/${slug}`, { headers: headers(ctx.apiKey) });
+        const finalized = detail.versions.filter((v) => v.status === 'finalized');
+        if (finalized.length === 0) {
+            console.log('  no finalized versions to roll back to');
+            return;
+        }
+        console.log(`  versions for ${slug} (newest first):`);
+        for (const v of finalized) {
+            const mark = v.id === detail.currentVersionId ? '  ← current (live)' : '';
+            console.log(`    ${v.id}  ${v.fileCount} files  ${v.finalizedAt ?? ''}${mark}`);
+        }
+        console.log(`\n  roll back with: shiply rollback ${slug} <versionId>`);
+        return;
+    }
+    const res = await api(`${base}/api/v1/publish/${slug}/rollback`, {
+        method: 'POST',
+        headers: headers(ctx.apiKey),
+        body: JSON.stringify({ versionId }),
+    });
+    if (!res.changed) {
+        console.log(`  ${slug} is already serving ${versionId} — nothing to do`);
+        return;
+    }
+    console.log(`✔ rolled ${res.slug} to ${res.currentVersionId} — live now`);
+}
+export async function sitesPromote(ctx, srcSlug, destSlug) {
+    const base = resolveBase(ctx.base);
+    const r = await api(`${base}/api/v1/publish/${srcSlug}/promote`, {
+        method: 'POST',
+        headers: headers(ctx.apiKey),
+        body: JSON.stringify({ destSlug }),
+    });
+    console.log(`✔ promoted ${r.sourceSlug} → ${r.slug} (${r.filesCount} files) — live now`);
+    console.log(`\n  https://${r.slug}.shiply.now\n`);
+}

package/dist/verify.js

@@ -0,0 +1,26 @@
+// packages/cli/src/verify.ts
+import { api, resolveBase } from './publish.js';
+/** Edge-check a shiply slug: SSL, HTTP reachability, and a rendered thumbnail.
+ *  Headless agents use this to confirm what they shipped is actually serving.
+ *  Returns true when LIVE, false when PENDING — the caller sets the exit code
+ *  (0 / 1) so `shiply verify <slug> && <next>` only proceeds once it's serving. */
+export async function verifySite(ctx, slug) {
+    if (slug.includes('.')) {
+        throw new Error(`verify takes a shiply slug, not a hostname — for custom domains use \`shiply status ${slug}\``);
+    }
+    const base = resolveBase(ctx.base);
+    const r = await api(`${base}/api/v1/sites/${slug}/verify`, {
+        headers: { 'content-type': 'application/json' },
+    });
+    const sslLine = r.ssl.valid
+        ? `valid${r.ssl.issuer ? ` (${r.ssl.issuer}` : ''}${r.ssl.daysLeft !== undefined ? `, ${r.ssl.daysLeft}d left)` : r.ssl.issuer ? ')' : ''}`
+        : `not ready${r.ssl.error ? ` — ${r.ssl.error}` : ''}`;
+    console.log(`${r.status === 'LIVE' ? '✔' : '…'} ${slug}.shiply.now — ${r.status}`);
+    console.log(`  ssl:  ${sslLine}`);
+    console.log(`  http: ${r.http.ok ? `ok (HTTP ${r.http.status})` : `not ready${r.http.status ? ` (HTTP ${r.http.status})` : r.http.error ? ` — ${r.http.error}` : ''}`}`);
+    if (r.thumbnailUrl)
+        console.log(`  shot: ${r.thumbnailUrl}`);
+    // Stable machine marker for agents/scrapers (mirrors SITE_READY in `status`).
+    console.log(`VERIFY status=${r.status} http=${r.http.status ?? 0} ssl=${r.ssl.valid ? 'valid' : 'pending'}${r.thumbnailUrl ? ` thumb=${r.thumbnailUrl}` : ''}`);
+    return r.status === 'LIVE';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shiply-cli",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Publish static sites to shiply.now from the command line — instant web hosting for agents.",
   "license": "MIT",
   "type": "module",

package/skill/SKILL.md

@@ -18,7 +18,7 @@ description: Publish static sites to the web instantly with shiply.now and manag
 > fresh — your cached copy may be missing features like databases, projects,
 > marketplace, or sending domains.
 >
-> **Last updated: 2026-06-21**
+> **Last updated: 2026-06-23**
 
 ---
 
@@ -144,6 +144,47 @@ so repeat publishes reuse the URL automatically. `--new-site` opts out.
 Gitignore `.shiply.json` in public repos. Parse `SITE_READY` / `SSL_READY`
 lines for automation; exit code 0 = ready.
 
+## Manage & verify sites (CLI)
+
+List, delete, roll back, verify, and promote owned sites — all over the same
+Bearer API key. Great for agents that ship iteratively and need to keep their
+subdomains tidy.
+
+```bash
+shiply ls                                   # list your sites: slug, status, URL
+shiply rm <slug> --yes                      # PERMANENTLY delete a site + its files (--yes required)
+shiply rollback <slug>                      # list finalized versions (current one marked)
+shiply rollback <slug> <versionId>          # re-point the site to that version — live instantly
+shiply verify <slug>                        # edge SSL + HTTP + thumbnail readiness check
+shiply publish <dir> --as <name>            # STABLE preview: same URL every iteration (local alias)
+shiply promote <preview-slug> --to <dest-slug>   # copy the preview's exact live bytes onto a prod site
+shiply publish <dir> --json                 # one machine-readable JSON line, no confetti/banners
+```
+
+- **`shiply verify <slug>`** prints a human report PLUS a stable machine marker
+  line `VERIFY status=LIVE http=200 ssl=valid thumb=…` (or `status=PENDING`).
+  Headless agents should parse that `VERIFY status=…` line — it's the
+  contract, like `SITE_READY` in `status`.
+- **`shiply publish <dir> --as <name>`** gives a stable preview URL that the
+  next publish with the same `--as <name>` reuses — no more changing URLs or
+  orphaned scratch sites across iterations, independent of the source dir.
+- **`shiply promote <preview-slug> --to <dest-slug>`** copies the *exact bytes*
+  you previewed onto an existing owned destination site (keeps its slug,
+  domains, access) — atomic preview→production, no rebuild.
+- **`--json`** on `publish`/`update` emits a single JSON line
+  `{slug,siteUrl,siteId,uploaded,skipped,anonymous,expiresAt,updated}` and
+  suppresses all human output + confetti — use it in scripts/agents.
+- **`.shiplyignore`** in the publish root excludes files from upload
+  (documented gitignore subset: `# comments`, `secret.txt`, `internal/`,
+  `*.log`, `/anchored`, `**` globs, `!negation`). Keep `.env`, notes, and
+  internal files out of the published bytes.
+
+To verify captured signups/form data without the dashboard, the data
+subcommands already exist: `shiply data list <slug>` (collections + counts),
+`shiply data query <slug> <coll> [--limit N] [--where '<json>']`, and
+`shiply data export <slug> <coll> [--out file.ndjson]`. Confetti is
+suppressed automatically on non-TTY stdout; `--no-confetti` forces it off.
+
 ### 3. Raw HTTP (no installs)
 ```
 1. POST https://shiply.now/api/v1/publish
@@ -154,6 +195,8 @@ lines for automation; exit code 0 = ready.
    (+ "Authorization: Bearer shp_…" for permanent owned sites)
 2. PUT each file's bytes to response upload.uploads[].url
 3. POST upload.finalizeUrl with {"versionId":"..."}
+   → both the publish and finalize responses include a "toUpdate" string: the
+     exact call to update THIS site next time. Follow it — never create a new one.
 ```
 
 **ALWAYS include `agentName` on anonymous publishes.** The response then
@@ -164,9 +207,11 @@ poll `poll_url` every `interval` seconds with the `device_code`, and on
 is claimed in the same Allow click. Without `agentName` the user has to
 do a separate manual claim step every time.
 
-**Updates:** anonymous → include `"claimToken":"..."` (returned ONCE by the
-first publish — save it); owned → include `"slug":"..."`. Hashes make updates
-cheap: unchanged files are skipped server-side.
+**Updates (the response tells you how):** every publish/finalize response
+includes a `toUpdate` string with the exact call — follow it verbatim. In short:
+anonymous → include `"claimToken":"..."` (returned ONCE by the first publish —
+save it); owned → include `"slug":"..."`. Hashes make updates cheap: unchanged
+files are skipped server-side.
 
 ## The lifecycle to explain to users
 - Anonymous site: live instantly, expires in 24 h. Give the user the
@@ -265,6 +310,98 @@ validated server-side; the owner reads them in the dashboard (Data section,
 CSV export) or GET /api/v1/publishes/<slug>/data/<collection> with a Bearer
 key. Owned sites only. Docs: /docs/site-data
 
+## Agent Email — inbox, send, capture, broadcast (built into every owned site)
+
+Every owned site has a real email address and can send, receive, capture signups,
+and broadcast — in one line. Like AgentMail, built into the site.
+
+### Capture (public, zero-config)
+```
+POST /.shiply/email  { "email": "user@example.com", ...anyExtraFields }
+```
+No manifest needed. Works on the **relative path** from the published page.
+On success: record lands in the site inbox + owner gets a notification ping +
+a double-opt-in confirmation email goes to the visitor (all on by default).
+**Owned sites only** — anonymous sites get `403 email_requires_account` (claim
+the site first). A non-empty `company` field is treated as a honeypot (bot
+submissions are silently dropped). Caps: 16 KB body, 30 fields max.
+
+### Send (authenticated — Bearer key only)
+The public page can NEVER send; only authenticated calls can.
+```
+POST https://shiply.now/api/v1/email/send
+Authorization: Bearer shp_…
+{ "slug": "my-site", "to": "user@example.com", "subject": "Hi", "html": "<p>Hi</p>", "text": "Hi" }
+→ { "messageId": "..." }
+```
+
+### Read inbox
+```
+GET https://shiply.now/api/v1/email/inbox          # all sites
+GET https://shiply.now/api/v1/email/inbox?slug=my-site
+Authorization: Bearer shp_…
+```
+
+### Typed upgrade (optional)
+Declare an `email` block on a `.shiply/data.json` collection for typed fields +
+fine-grained control:
+```json
+{
+  "collections": {
+    "signups": {
+      "fields": { "email": { "type": "email", "required": true } },
+      "email": {
+        "emailField": "email",
+        "confirm": true,
+        "notify": true,
+        "audience": true
+      }
+    }
+  }
+}
+```
+All three flags default to `true`. With this manifest, POST to
+`/.shiply/data/signups` as usual — the `email` block activates the email
+layer on that collection.
+
+### Confirm / unsubscribe (public — in the confirmation email)
+```
+GET /api/email/<slug>/<collection>/confirm?token=<token>
+GET /api/email/<slug>/<collection>/unsubscribe?email=<address>
+```
+
+### Audience + broadcast
+Confirmed (double-opt-in) signups form a list. Broadcast to them:
+```
+POST /api/v1/publishes/<slug>/mailboxes/<collection>/broadcast
+Authorization: Bearer shp_…
+{ "subject": "Launch day", "html": "<p>We're live!</p>" }
+```
+Spam-checked before send; unsubscribe footer is auto-added; requires ≥1
+confirmed subscriber.
+
+Configure a mailbox: `GET/PATCH /api/v1/publishes/<slug>/mailboxes/<collection>`
+List contacts: `GET /api/v1/publishes/<slug>/mailboxes/<collection>/contacts?status=confirmed`
+
+### MCP tools
+| Tool | Purpose |
+|---|---|
+| `send_email` | Send transactional email from a site (Bearer) |
+| `list_site_inbox` | Read the inbox (all threads or filter by slug) |
+| `set_mailbox` | Configure a collection's mailbox settings |
+| `list_mailbox_contacts` | List audience contacts (filter by status) |
+| `send_mailbox_broadcast` | Broadcast to confirmed audience (spam-checked) |
+
+### CLI
+```bash
+shiply email send --site <slug> --to <address> --subject <subject> --html <html>
+shiply email inbox [--site <slug>]
+shiply mailbox set <slug> <collection> [--confirm] [--notify] [--from <domain>]
+shiply mailbox broadcast <slug> <collection> --subject <subject> --html <html>
+```
+
+Docs: https://shiply.now/docs/agent-email
+
 ## SQL databases (Cloudflare D1 + Neon Postgres)
 Two engines, same CLI/REST/MCP surface. **D1 (SQLite at the edge)** is
 free on every plan and queryable from the browser via a built-in fetch