@blocofy/cli 0.1.10 → 0.1.14

package/bin/blocofy.mjs

@@ -12,18 +12,25 @@ import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 
-import { pushContent } from "../lib/content-sync.mjs";
+import { pullContent, pushContent } from "../lib/content-sync.mjs";
 import { credentialsPath, loadCredentials, saveCredentials } from "../lib/credentials.mjs";
 import { startDevServer } from "../lib/dev-server.mjs";
 import { readLocalTemplates } from "../lib/local-theme.mjs";
 import { githubNote, statusLine, syncScopeNote } from "../lib/messages.mjs";
-import { fetchDevSession, pullTheme, pushTheme } from "../lib/theme-sync.mjs";
+import { fetchDevSession, fetchSiteStatus, fetchWhoami, publishInstance, pullTheme, pushTheme } from "../lib/theme-sync.mjs";
+import { isAffirmative, livePushDecision } from "../lib/confirm.mjs";
 import { hyperlink, openUrl } from "../lib/term.mjs";
 import { isValidToken, isValidUrl, normalizeUrl } from "../lib/validate.mjs";
 
-const VERSION = "0.1.10";
+const VERSION = "0.1.14";
 const args = process.argv.slice(2);
 
+/** Human label for a resolved site: "Name (slug)" or just the slug. */
+function siteLabel(site) {
+  if (!site) return "";
+  return site.name ? `${site.name} (${site.slug})` : site.slug;
+}
+
 /** Parse `--key value` and `--flag` (boolean) arguments. */
 function parseFlags(rest) {
   const flags = {};
@@ -55,7 +62,8 @@ Usage
   blocofy theme dev [dir] [--port <n>] [--no-sync]
       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. (dir defaults to cwd)
+      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)
 
@@ -63,16 +71,30 @@ Usage
       Download the live theme to disk. (dir defaults to cwd)
         --draft      pull the draft theme (what 'theme dev' syncs into) instead of live
 
-  blocofy theme push [dir] [--draft]
-      Write the local theme to the site (create/update; no delete).
-        --draft      write to a draft theme — preview & publish it from the admin panel
+  blocofy theme push [dir] [--draft] [--yes]
+      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 publish [--instance <id>]
+      Publish a draft theme to the LIVE site. With no flag, publishes the draft that
+      'theme dev' / 'theme push --draft' writes into. The server refuses to publish a
+      theme that has no pages (it would 404) — so publishing is always safe.
+        --instance <id>   publish a specific theme instance
+
+  blocofy status
+      Show the live theme, page distribution per instance, drafts, and a health flag
+      (ok / live_instance_empty / pages_split). Run before/after publishing.
 
-  blocofy pages push [dir]
-      Push local pages/*.json to the site. Updates EXISTING pages only —
-      never creates or deletes a page. Unchanged pages are skipped.
+  blocofy pages pull [dir] / pages push [dir]
+      pull: download published pages → pages/<slug>.json.
+      push: write pages/*.json to the site. Updates EXISTING pages only —
+            never creates or deletes a page; unchanged pages are skipped.
 
-  blocofy settings push [dir]
-      Push local config/settings.json (theme tokens/settings + color schemes).
+  blocofy settings pull [dir] / settings push [dir]
+      Download / upload config/settings.json (theme tokens/settings + color schemes).
 
   blocofy --version
   blocofy --help
@@ -80,7 +102,8 @@ Usage
 Examples
   blocofy login --url https://store.myblocofy.com --token bcf_xxxxxxxx
   blocofy theme pull && blocofy theme dev
-  blocofy theme push --draft
+  blocofy theme push --draft && blocofy theme publish
+  blocofy status
 
 Auth: ~/.blocofy/credentials.json (from \`login\`), or BLOCOFY_URL + BLOCOFY_TOKEN env vars.
 The CLI does not build assets — bring your own (npm/Vite/Tailwind); the platform serves
@@ -143,6 +166,16 @@ async function login(rest) {
 
   saveCredentials({ url, token });
   console.log(`✓ Saved credentials → ${credentialsPath()}`);
+
+  // Token'ın GERÇEK site'ını göster — site sunucuda TOKEN'dan çözülür, URL kozmetik.
+  // Yanlış tenant'ın token'ıyla login olduysan ("klarosa URL + ksc token") hemen
+  // görürsün. whoami yoksa/erişilemezse sessiz geç.
+  try {
+    const who = await fetchWhoami({ url, token });
+    if (who?.site) console.log(`  Site: ${siteLabel(who.site)} — your theme commands target this tenant.`);
+  } catch {
+    /* best-effort */
+  }
   console.log(`Next: cd into your theme directory, then run  blocofy theme dev`);
 }
 
@@ -176,6 +209,48 @@ async function themePush(rest) {
   }
   const creds = requireCreds();
   const draft = Boolean(flags.draft);
+
+  // 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
+  // yoksa/erişilemezse sessiz geç; etiketi confirmation mesajlarında da kullan.
+  let site = null;
+  try {
+    site = (await fetchWhoami({ url: creds.url, token: creds.token })).site;
+  } catch {
+    /* 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}`);
+  }
+
+  // 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).
+  const decision = livePushDecision({
+    draft,
+    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.`);
+    process.exit(1);
+  }
+  if (decision.needsPrompt) {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    let answer;
+    try {
+      answer = await rl.question(`⚠ Push to the LIVE theme of ${target}? Immediate, no preview. [y/N] `);
+    } finally {
+      rl.close();
+    }
+    if (!isAffirmative(answer)) {
+      console.error("Aborted. Use `--draft` to push to a draft, or `--yes` to confirm the live push.");
+      process.exit(1);
+    }
+  }
+
   const result = await pushTheme({ dir, url: creds.url, token: creds.token, draft });
   if (result.draft) {
     console.log(`Pushed to draft theme #${result.instanceId} (${result.created} created, ${result.updated} updated).`);
@@ -210,6 +285,14 @@ async function contentPush(scope, rest) {
   }
 }
 
+async function contentPull(scope, rest) {
+  const positional = rest.filter((a) => !a.startsWith("--"));
+  const dir = resolve(positional[0] ?? process.cwd());
+  const creds = requireCreds();
+  const { count } = await pullContent({ dir, url: creds.url, token: creds.token, scope });
+  console.log(`Downloaded ${count} ${scope === "settings" ? "settings" : "page"} file(s) → ${dir}`);
+}
+
 async function themeDev(rest) {
   const flags = parseFlags(rest);
   const positional = rest.filter((a) => !a.startsWith("--"));
@@ -241,7 +324,9 @@ async function themeDev(rest) {
   const previewUrl = session ? `${session.previewUrl}&hr=${port}` : null;
   const editorUrl = session ? `${session.editorUrl}&hr=${port}` : null;
 
-  console.log(`\nblocofy theme dev — ${creds.url} (token ${creds.token.slice(0, 8)}…)\n`);
+  // Çözülen site'ı göster (session TOKEN'dan çözer) → hangi tenant'ı düzenlediğin belli olsun.
+  const siteLine = session?.site ? `${siteLabel(session.site)} · ` : "";
+  console.log(`\nblocofy theme dev — ${siteLine}${creds.url} (token ${creds.token.slice(0, 8)}…)\n`);
   console.log(`  (l) Local      ${hyperlink(localUrl)}`);
   if (previewUrl) console.log(`  (p) Preview    ${hyperlink(previewUrl)}`);
   if (editorUrl) console.log(`  (e) Editor     ${hyperlink(editorUrl)}`);
@@ -348,6 +433,45 @@ async function themeDev(rest) {
   }
 }
 
+async function themePublish(rest) {
+  const flags = parseFlags(rest);
+  const creds = requireCreds();
+  let instanceId = Number(flags.instance);
+  if (!Number.isInteger(instanceId) || instanceId <= 0) {
+    // Belirtilmediyse: `theme dev` / `theme push --draft`'ın yazdığı taslağı yayınla.
+    const session = await fetchDevSession({ url: creds.url, token: creds.token });
+    instanceId = session.draftInstanceId;
+  }
+  const result = await publishInstance({ url: creds.url, token: creds.token, instanceId });
+  console.log(
+    `✓ Theme #${result.published} is now LIVE${result.cloned ? " (pages cloned from the previous live theme)" : ""}.`,
+  );
+}
+
+async function status() {
+  const creds = requireCreds();
+  const s = await fetchSiteStatus({ url: creds.url, token: creds.token });
+  const live = s.live_theme_instance;
+  console.log(`\nSite: ${s.site.slug} (id ${s.site.id})`);
+  console.log(
+    live
+      ? `Live theme: #${live.id}${live.name ? ` ${live.name}` : ""} — ${live.template_count} files, ${s.pages_on_live} pages`
+      : `Live theme: none`,
+  );
+  console.log(`Health: ${s.health}`);
+  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 (Array.isArray(s.drafts) && s.drafts.length > 0) {
+    console.log(`Drafts: ${s.drafts.map((d) => `#${d.id}${d.name ? ` ${d.name}` : ""}`).join(", ")}`);
+  }
+  console.log("");
+}
+
 const [first, ...rest] = args;
 
 if (first === "--version" || first === "-v") {
@@ -374,11 +498,31 @@ if (first === "--version" || first === "-v") {
     console.error(error?.message ?? error);
     process.exit(1);
   });
+} else if (first === "theme" && rest[0] === "publish") {
+  themePublish(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);
+    process.exit(1);
+  });
+} else if (first === "pages" && rest[0] === "pull") {
+  contentPull("pages", rest.slice(1)).catch((error) => {
+    console.error(error?.message ?? error);
+    process.exit(1);
+  });
 } else if (first === "pages" && rest[0] === "push") {
   contentPush("pages", rest.slice(1)).catch((error) => {
     console.error(error?.message ?? error);
     process.exit(1);
   });
+} else if (first === "settings" && rest[0] === "pull") {
+  contentPull("settings", rest.slice(1)).catch((error) => {
+    console.error(error?.message ?? error);
+    process.exit(1);
+  });
 } else if (first === "settings" && rest[0] === "push") {
   contentPush("settings", rest.slice(1)).catch((error) => {
     console.error(error?.message ?? error);

package/lib/confirm.mjs

@@ -0,0 +1,22 @@
+/**
+ * Canlı `theme push` onay kararı (#431 L2). `theme push` (flag'siz) site'in CANLI
+ * temasına ANINDA yazar (önizleme yok) — bir agent/CI kazara canlı temayı bozabilir.
+ * Bu yüzden canlı push açık onay ister:
+ *   - `--draft`  → onay gerekmez (zaten canlıya yazmaz, taslağa yazar).
+ *   - `--yes` / `--confirm` → açık onay (CI/agent için).
+ *   - interaktif TTY → y/N sorulur.
+ *   - non-TTY (script/agent) + onay yok → ABORT (sessizce canlıya basılmaz).
+ *
+ * Saf karar (yan etkisiz, test edilebilir): { autoApproved, needsPrompt, mustAbort }.
+ */
+export function livePushDecision({ draft, yes, confirm, isTTY }) {
+  if (draft || yes || confirm) return { autoApproved: true, needsPrompt: false, mustAbort: false };
+  if (!isTTY) return { autoApproved: false, needsPrompt: false, mustAbort: true };
+  return { autoApproved: false, needsPrompt: true, mustAbort: false };
+}
+
+/** y/N yanıtını yorumla (yes/y → onay). */
+export function isAffirmative(answer) {
+  const a = String(answer ?? "").trim().toLowerCase();
+  return a === "y" || a === "yes";
+}

package/lib/content-sync.mjs

@@ -1,11 +1,12 @@
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
-import { join, relative, sep } from "node:path";
+import { existsSync, mkdirSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
+import { dirname, join, relative, sep } from "node:path";
 
 /**
- * `blocofy pages push` / `settings push` (#119). CLI'nın yerel içerik dosyalarını
- * (`pages/<slug>.json` + `config/settings.json`) platformun `/api/dev/content`
- * endpoint'ine gönderir. Tema KODU `theme push`'a gider; bu yalnız içerik+ayar.
- * Güvenlik platformda: yalnız mevcut sayfayı günceller, yeni oluşturmaz, silmez.
+ * `blocofy pages pull/push` + `settings pull/push` (#119). CLI'nın yerel içerik
+ * dosyalarını (`pages/<slug>.json` + `config/settings.json`) platformun
+ * `/api/dev/content` endpoint'iyle çeker/gönderir. Tema KODU `theme pull/push`'a
+ * gider; bu yalnız içerik+ayar. Güvenlik platformda: push yalnız mevcut sayfayı
+ * günceller, yeni oluşturmaz, silmez.
  */
 
 async function errorText(res) {
@@ -56,3 +57,21 @@ export async function pushContent({ dir, url, token, scope }) {
   if (!res.ok) throw new Error(await errorText(res));
   return { ...(await res.json()), fileCount: Object.keys(files).length };
 }
+
+/** Site içeriğini diske çek (pull). scope "pages" | "settings" | "all". Yazılan dosya sayısı. */
+export async function pullContent({ dir, url, token, scope }) {
+  const base = url.replace(/\/+$/, "");
+  const res = await fetch(`${base}/api/dev/content?scope=${encodeURIComponent(scope)}`, {
+    headers: { authorization: `Bearer ${token}` },
+  });
+  if (!res.ok) throw new Error(await errorText(res));
+  const { files } = await res.json();
+  let count = 0;
+  for (const [path, content] of Object.entries(files ?? {})) {
+    const full = join(dir, ...path.split("/"));
+    mkdirSync(dirname(full), { recursive: true });
+    writeFileSync(full, typeof content === "string" ? content : "");
+    count += 1;
+  }
+  return { count };
+}

package/lib/theme-sync.mjs

@@ -40,6 +40,21 @@ export async function pullTheme({ dir, url, token, draft = false }) {
   return { count };
 }
 
+/**
+ * Token'ın GERÇEK site'ını çözer (`GET /api/dev/whoami`). Site sunucuda TOKEN'dan
+ * çözülür — login URL'i kozmetik. CLI bunu `login`'de (doğrula+göster) ve `push`
+ * öncesi (hedef tenant'ı yaz) çağırır; yanlış-tenant'a yazımı görünür kılar.
+ * `{ site: { id, slug, name }, liveThemeId }`.
+ */
+export async function fetchWhoami({ url, token }) {
+  const base = url.replace(/\/+$/, "");
+  const res = await fetch(`${base}/api/dev/whoami`, {
+    headers: { authorization: `Bearer ${token}` },
+  });
+  if (!res.ok) throw new Error(await errorText(res));
+  return res.json();
+}
+
 /**
  * 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 }`.
@@ -69,3 +84,30 @@ export async function pushTheme({ dir, url, token, draft = false }) {
   if (!res.ok) throw new Error(await errorText(res));
   return res.json();
 }
+
+/**
+ * Bir taslak tema instance'ını CANLIYA al (`POST /api/dev/publish`). Sunucu guard'ı
+ * içi-sayfasız bir instance'ı reddeder ya da canlının sayfalarını klonlar (#431) —
+ * yayın sonrası site asla 404'e düşmez. `{ ok, published, cloned }` döner.
+ */
+export async function publishInstance({ url, token, instanceId }) {
+  const base = url.replace(/\/+$/, "");
+  const res = await fetch(`${base}/api/dev/publish`, {
+    method: "POST",
+    headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
+    body: JSON.stringify({ instanceId }),
+  });
+  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.
+ */
+export async function fetchSiteStatus({ url, token }) {
+  const base = url.replace(/\/+$/, "");
+  const res = await fetch(`${base}/api/dev/site`, { headers: { authorization: `Bearer ${token}` } });
+  if (!res.ok) throw new Error(await errorText(res));
+  return res.json();
+}

package/package.json

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