@blocofy/cli 0.2.4 → 0.4.0

package/README.md

@@ -17,13 +17,29 @@ blocofy login [--url <url>] [--token <bcf_…>]
                           # Save your platform URL + dev token (~/.blocofy/credentials.json, 0600).
 blocofy theme dev [dir]   # Local dev server. Prints 3 views — local preview, a live-domain
                           # preview link, and the theme editor — all auto-reloading on save.
-                          # --port <n> (default 3030), --no-sync (local preview only)
+                          # --port <n> (default 3030), --no-sync (local preview only),
+                          # --name <name> (name the draft when first created)
 blocofy theme pull [dir]  # Download the live theme to disk.
-blocofy theme push [dir]  # Write the local theme to the live site (create/update; no delete).
+blocofy theme push [dir]  # Write the local theme to a DRAFT by default (create/update; no
+                          # delete) — preview & publish from the admin panel. --live writes
+                          # to the live site immediately (asks to confirm; add --yes for CI).
+                          # --name <name> names the new draft (draft mode only).
+blocofy theme rename <handle> <new name>
+                          # Rename a theme (label only). Works on any theme, live included.
+                          # Handle from the panel theme card or `blocofy status`.
 blocofy --version
 blocofy --help
 ```
 
+## Changelog
+
+- **0.4.0** — `theme push` / `theme dev` accept `--name <name>` to name a new draft (applied
+  only when the draft is first created; reuse ignores it). New `theme rename <handle> <new name>`
+  renames a theme (the name is a label; works on any theme, including the live one).
+- **0.3.0** — `theme push` now writes to a **draft** by default; use `--live` for the old
+  immediate-live behavior (with a confirmation prompt; `--yes` to skip it in CI). `blocofy
+  status` now names the exact pages at 404 risk when a theme's pages are split off the live theme.
+
 ## How it works
 
 `theme dev` starts a local HTTP server. For each page request it reads your local theme

package/bin/blocofy.mjs

@@ -19,8 +19,8 @@ import { credentialsPath, loadCredentials, saveCredentials } from "../lib/creden
 import { startDevServer } from "../lib/dev-server.mjs";
 import { readLocalTemplates } from "../lib/local-theme.mjs";
 import { githubNote, retryNotice, statusLine, syncScopeNote } from "../lib/messages.mjs";
-import { fetchDevSession, fetchSiteStatus, fetchWhoami, publishInstance, pullTheme, pushTheme } from "../lib/theme-sync.mjs";
-import { isAffirmative, livePushDecision } from "../lib/confirm.mjs";
+import { fetchDevSession, fetchSiteStatus, fetchWhoami, publishInstance, pullTheme, pushTheme, renameInstance } from "../lib/theme-sync.mjs";
+import { isAffirmative, livePushDecision, resolvePushMode } from "../lib/confirm.mjs";
 import { hyperlink, openUrl } from "../lib/term.mjs";
 import { isValidToken, isValidUrl, normalizeUrl } from "../lib/validate.mjs";
 
@@ -43,13 +43,14 @@ Usage
       Save your platform URL + dev token to ~/.blocofy/credentials.json.
       Get a token from the admin panel → Settings → Theme CLI tokens.
 
-  blocofy theme dev [dir] [--port <n>] [--no-sync]
+  blocofy theme dev [dir] [--port <n>] [--no-sync] [--name <name>]
       Start a dev server and print 3 auto-reloading views — Local, live-domain
       Preview, and the theme Editor. Press l / p / e to open each, q to quit.
       Edit a file and save → every open view reloads. Saves sync to a DRAFT theme
       only (never the live site). (dir defaults to cwd)
         --port <n>   local port (default 3030)
         --no-sync    local preview only (skip draft sync + remote views)
+        --name <name>  name the draft when it is first created (ignored if it already exists)
 
   blocofy theme pull [dir] [--draft] [--instance <handle>]
       Download the live theme to disk. (dir defaults to cwd)
@@ -57,14 +58,21 @@ Usage
         --instance <handle>  pull a specific theme by its handle (from the admin
                              panel theme card, or \`blocofy status\`)
 
-  blocofy theme push [dir] [--draft] [--yes] [--instance <handle>]
-      Write the local theme to the LIVE site IMMEDIATELY (create/update; no delete,
-      no preview). Asks for confirmation first; non-interactive shells must pass --yes.
-        --draft      write to a draft theme instead — preview & publish it from the
-                     admin panel (recommended; never touches the live site)
-        --yes        confirm the live push without prompting (for CI / agents)
+  blocofy theme push [dir] [--live] [--yes] [--instance <handle>]
+      By DEFAULT writes to a DRAFT theme (create/update; no delete) — preview & publish
+      it from the admin panel, never touching the live site. Publish it with
+      'blocofy theme publish'.
+        --live       write to the LIVE site IMMEDIATELY (no preview). Asks for
+                     confirmation first; non-interactive shells must add --yes.
+        --draft      explicit draft (same as the default; safe)
+        --yes        confirm a --live push without prompting (for CI / agents)
         --instance <handle>  push to a specific theme by its handle (safe targeted
                              write — no live-confirmation prompt)
+        --name <name>  name the NEW draft (draft mode only; ignored on --live/--instance)
+
+  blocofy theme rename <handle> <new name>
+      Rename a theme (the name is just a label). Works on any of your themes,
+      including the live one. Handle comes from the panel theme card or 'blocofy status'.
 
   blocofy theme publish [--instance <handle>]
       Publish a draft theme to the LIVE site. With no flag, publishes the draft that
@@ -90,7 +98,7 @@ Usage
 Examples
   blocofy login --url https://store.myblocofy.com --token bcf_xxxxxxxx
   blocofy theme pull && blocofy theme dev
-  blocofy theme push --draft && blocofy theme publish
+  blocofy theme push && blocofy theme publish
   blocofy status
 
 Auth: ~/.blocofy/credentials.json (from \`login\`), or BLOCOFY_URL + BLOCOFY_TOKEN env vars.
@@ -196,8 +204,17 @@ async function themePush(rest) {
     process.exit(1);
   }
   const creds = requireCreds();
-  const draft = Boolean(flags.draft);
-  const instance = typeof flags.instance === "string" ? flags.instance : null;
+  const instanceFlag = typeof flags.instance === "string" ? flags.instance : null;
+  const name = typeof flags.name === "string" ? flags.name : null;
+
+  // Yeni varsayılan hedef: DRAFT (güvenli). `--live` eski anında-canlı davranışını
+  // açıkça geri getirir; `--instance` belirli bir temayı adresler. Sadece "live"
+  // modu canlıya yazar ve onay gerektirir.
+  const { mode, instance } = resolvePushMode({
+    live: Boolean(flags.live),
+    draft: Boolean(flags.draft),
+    instance: instanceFlag,
+  });
 
   // Hedef tenant'ı çöz ve GÖSTER — site sunucuda TOKEN'dan çözülür (URL kozmetik),
   // yanlış-tenant'a yazımı görünür kılar ("klarosa sandım, ksc'ye yazdım"). whoami
@@ -209,21 +226,26 @@ async function themePush(rest) {
     /* best-effort */
   }
   const target = site ? siteLabel(site) : creds.url;
-  if (site) {
-    console.log(`→ ${draft ? "Pushing to a draft" : "Pushing to the LIVE theme"} of ${target}`);
+  if (mode === "instance") {
+    console.log(`→ Pushing to theme ${instance}${site ? ` of ${target}` : ""}`);
+  } else if (mode === "live") {
+    console.log(`→ Pushing to the LIVE theme of ${target}`);
+  } else {
+    console.log(`→ Pushing to a draft${site ? ` of ${target}` : ""}`);
   }
 
-  // Canlı push (flag'siz) ANINDA canlı temayı değiştirir (önizleme yok). Agent/CI
-  // kazara canlıya basmasın diye açık onay şart (#431 L2).
+  // Canlı push (`--live`) ANINDA canlı temayı değiştirir (önizleme yok). Agent/CI
+  // kazara canlıya basmasın diye açık onay şart (#431 L2). Draft/instance modu
+  // güvenli → otomatik onay (prompt yok).
   const decision = livePushDecision({
-    draft: draft || Boolean(instance),
+    draft: mode !== "live",
     yes: Boolean(flags.yes),
     confirm: Boolean(flags.confirm),
     isTTY: Boolean(process.stdin.isTTY),
   });
   if (decision.mustAbort) {
-    console.error(`⚠ 'theme push' writes to the LIVE theme of ${target} immediately (no preview).`);
-    console.error(`  Non-interactive shell: pass --yes to confirm, or use --draft for a safe draft.`);
+    console.error(`⚠ 'theme push --live' writes to the LIVE theme of ${target} immediately (no preview).`);
+    console.error(`  Non-interactive shell: pass --live --yes to confirm, or omit --live to push to a safe draft.`);
     process.exit(1);
   }
   if (decision.needsPrompt) {
@@ -235,22 +257,40 @@ async function themePush(rest) {
       rl.close();
     }
     if (!isAffirmative(answer)) {
-      console.error("Aborted. Use `--draft` to push to a draft, or `--yes` to confirm the live push.");
+      console.error("Aborted. Omit `--live` to push to a safe draft, or pass `--live --yes` to confirm.");
       process.exit(1);
     }
   }
 
+  // `--name` yalnızca YENİ taslak yaratırken (draft modu) anlamlı — canlıya/mevcut
+  // instance'a yazarken ad kaydedilmez, sessizce kaybolmasın diye açıkça uyar.
+  if (name && mode !== "draft") {
+    console.error("Note: --name yalnız yeni taslak yaratırken (varsayılan push) geçerli, yok sayıldı.");
+  }
+
   const result = await pushTheme({
     dir,
     url: creds.url,
     token: creds.token,
-    draft,
-    instance,
+    draft: mode === "draft",
+    instance: mode === "instance" ? instance : null,
+    name: mode === "draft" ? name : null,
     onRetry: (info) => console.error(retryNotice(info)),
   });
+
+  // Sunucu canlı-yazımı bildirdiyse (yeni alan; eski sunucuda yok) belirgin uyar.
+  if (result.warning === "live_write" && result.message) {
+    console.error(`\n⚠ ${result.message}\n`);
+  }
+
   if (result.instanceId) {
     console.log(`Pushed to theme ${result.instanceId} (${result.created} created, ${result.updated} updated).`);
-    console.log(`Preview & publish it in the admin panel: Theme → Theme library → "Open in editor".`);
+    if (mode === "draft") {
+      console.log(`Preview & publish it in the admin panel: Theme → Theme library → "Open in editor".`);
+      console.log(`Publish it live with:  blocofy theme publish`);
+    } else {
+      console.log(`Preview & publish it in the admin panel: Theme → Theme library → "Open in editor".`);
+    }
   } else {
     const extra = result.skippedDeletes
       ? `, ${result.skippedDeletes} remote file(s) absent locally (not deleted)`
@@ -306,7 +346,8 @@ async function themeDev(rest) {
   let session = null;
   if (!flags["no-sync"]) {
     try {
-      session = await fetchDevSession({ url: creds.url, token: creds.token });
+      const name = typeof flags.name === "string" ? flags.name : null;
+      session = await fetchDevSession({ url: creds.url, token: creds.token, name });
     } catch (error) {
       console.warn(
         `Warning: dev session unavailable (${error?.message ?? error}). ` +
@@ -444,6 +485,20 @@ async function themePublish(rest) {
   );
 }
 
+async function themeRename(rest) {
+  const { flags, positionals } = parseArgs(rest);
+  const handle = positionals[0];
+  const name = positionals.slice(1).join(" ") || (typeof flags.name === "string" ? flags.name : null);
+  if (!handle || !name) {
+    console.error("Usage: blocofy theme rename <handle> <new name>");
+    console.error("  Rename a theme (handle from the panel theme card or `blocofy status`).");
+    process.exit(1);
+  }
+  const creds = requireCreds();
+  const result = await renameInstance({ url: creds.url, token: creds.token, instance: handle, name });
+  console.log(`✓ Renamed to "${result.name}" (${result.id}).`);
+}
+
 async function status() {
   const creds = requireCreds();
   const s = await fetchSiteStatus({ url: creds.url, token: creds.token });
@@ -455,12 +510,23 @@ async function status() {
       : `Live theme: none`,
   );
   console.log(`Health: ${s.health}`);
+  // orphan_missing_slugs yeni sunucu alanı (PR #661). Eski/deploy-edilmemiş sunucuda
+  // yok → null; o durumda eski (yumuşatılmış) sayaç satırına düş.
+  const missing = Array.isArray(s.orphan_missing_slugs) ? s.orphan_missing_slugs : null;
   if (s.health === "live_instance_empty") {
     console.error(
       `  ⚠ The live theme has no pages — the site will 404. Publish a theme with content:  blocofy theme publish`,
     );
   } else if (s.health === "pages_split") {
-    console.warn(`  ⚠ ${s.orphaned_pages} page(s) live on a non-live instance (orphan).`);
+    if (missing && missing.length) {
+      console.warn(
+        `  ⚠ These pages are published only on a non-live theme, so visitors can't reach them (404 risk): ` +
+          `${missing.join(", ")}\n` +
+          `  Fix: publish the theme that has them —  blocofy theme publish`,
+      );
+    } else {
+      console.warn(`  ⚠ ${s.orphaned_pages} page(s) published on a non-live theme.`);
+    }
   }
   if (Array.isArray(s.drafts) && s.drafts.length > 0) {
     console.log(`Drafts: ${s.drafts.map((d) => `${d.id}${d.name ? ` ${d.name}` : ""}`).join(", ")}`);
@@ -499,6 +565,11 @@ if (first === "--version" || first === "-v") {
     console.error(error?.message ?? error);
     process.exit(1);
   });
+} else if (first === "theme" && rest[0] === "rename") {
+  themeRename(rest.slice(1)).catch((error) => {
+    console.error(error?.message ?? error);
+    process.exit(1);
+  });
 } else if (first === "status") {
   status().catch((error) => {
     console.error(error?.message ?? error);

package/lib/args.mjs

@@ -5,7 +5,7 @@
  */
 
 /** Sonraki token'ı değer olarak almayan flag'ler. */
-const BOOLEAN_FLAGS = new Set(["draft", "yes", "confirm", "no-sync", "dry", "help", "version"]);
+const BOOLEAN_FLAGS = new Set(["draft", "live", "yes", "confirm", "no-sync", "dry", "help", "version"]);
 
 export function parseArgs(rest) {
   const flags = {};

package/lib/confirm.mjs

@@ -15,6 +15,22 @@ export function livePushDecision({ draft, yes, confirm, isTTY }) {
   return { autoApproved: false, needsPrompt: true, mustAbort: false };
 }
 
+/**
+ * `theme push` hedefini seç (saf, yan etkisiz). Yeni varsayılan: DRAFT (güvenli).
+ * `--live` eski "anında canlı" davranışını açıkça geri getirir.
+ *   - `instance` verilmişse → { mode: "instance", instance } (açık-hedef; `--live`
+ *     olsa bile instance KAZANIR — kullanıcı belirli bir temayı adresledi).
+ *   - `--live` (instance yok) → { mode: "live" } (onay gerektiren tek yol).
+ *   - aksi halde → { mode: "draft" } (varsayılan; açık `--draft` dahil).
+ *   - `--live` + `--draft` birlikte → draft (güvenli olan kazanır).
+ */
+export function resolvePushMode({ live, draft, instance } = {}) {
+  if (instance) return { mode: "instance", instance };
+  if (draft) return { mode: "draft" };
+  if (live) return { mode: "live" };
+  return { mode: "draft" };
+}
+
 /** y/N yanıtını yorumla (yes/y → onay). */
 export function isAffirmative(answer) {
   const a = String(answer ?? "").trim().toLowerCase();

package/lib/theme-sync.mjs

@@ -103,9 +103,10 @@ export async function fetchWhoami({ url, token }) {
  * Dev session bilgisi (#119 `theme dev`): platform draft instance'ı hazırlar ve
  * 3 görünümün URL'lerini döner — `{ draftInstanceId, previewUrl, editorUrl, site }`.
  */
-export async function fetchDevSession({ url, token }) {
+export async function fetchDevSession({ url, token, name = null }) {
   const base = url.replace(/\/+$/, "");
-  const res = await fetch(`${base}/api/dev/session`, {
+  const query = name ? `?name=${encodeURIComponent(name)}` : "";
+  const res = await fetch(`${base}/api/dev/session${query}`, {
     headers: { authorization: `Bearer ${token}` },
   });
   if (!res.ok) throw new Error(await errorText(res));
@@ -117,10 +118,10 @@ export async function fetchDevSession({ url, token }) {
  * writes to a draft theme instance instead of the live theme — preview & publish
  * it from the admin panel without affecting the live site.
  */
-export async function pushTheme({ dir, url, token, draft = false, instance = null, onRetry = null }) {
+export async function pushTheme({ dir, url, token, draft = false, instance = null, name = null, onRetry = null }) {
   const base = url.replace(/\/+$/, "");
   const files = readLocalTemplates(dir);
-  const payload = instance ? { files, instance } : { files, draft };
+  const payload = instance ? { files, instance } : name ? { files, draft, name } : { files, draft };
   const res = await fetchWithRetry(
     `${base}/api/dev/theme`,
     {
@@ -150,6 +151,22 @@ export async function publishInstance({ url, token, instanceId }) {
   return res.json();
 }
 
+/**
+ * Bir tema instance'ının adını değiştir (`POST /api/dev/theme/rename`). Ad yalnızca
+ * bir etiket — canlı instance dahil sahip olunan her instance yeniden adlandırılabilir.
+ * `{ ok, id, name }` döner.
+ */
+export async function renameInstance({ url, token, instance, name }) {
+  const base = url.replace(/\/+$/, "");
+  const res = await fetch(`${base}/api/dev/theme/rename`, {
+    method: "POST",
+    headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
+    body: JSON.stringify({ instance, name }),
+  });
+  if (!res.ok) throw new Error(await errorText(res));
+  return res.json();
+}
+
 /**
  * Site sağlık/durum özeti (`GET /api/dev/site`) — `blocofy status`. Canlı tema instance'ı,
  * instance-başına sayfa dağılımı, taslaklar ve health döner.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocofy/cli",
-  "version": "0.2.4",
+  "version": "0.4.0",
   "description": "Develop your Blocofy theme locally against live data with instant preview — login, theme dev, pull, push.",
   "type": "module",
   "license": "MIT",