@blocofy/cli 0.1.11 → 0.2.0

package/bin/blocofy.mjs

@@ -12,34 +12,24 @@ import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 
+import { parseArgs } from "../lib/args.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.11";
+const VERSION = "0.1.14";
 const args = process.argv.slice(2);
 
-/** Parse `--key value` and `--flag` (boolean) arguments. */
-function parseFlags(rest) {
-  const flags = {};
-  for (let i = 0; i < rest.length; i++) {
-    const arg = rest[i];
-    if (!arg.startsWith("--")) continue;
-    const key = arg.slice(2);
-    const next = rest[i + 1];
-    if (next && !next.startsWith("--")) {
-      flags[key] = next;
-      i++;
-    } else {
-      flags[key] = true;
-    }
-  }
-  return flags;
+/** 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;
 }
 
 function printHelp() {
@@ -55,17 +45,35 @@ 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)
 
   blocofy theme pull [dir] [--draft]
       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
+        --instance <handle>  pull a specific theme by its handle (from the admin
+                             panel theme card, or \`blocofy status\`)
+
+  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)
+        --instance <handle>  push to a specific theme by its handle (safe targeted
+                             write — no live-confirmation prompt)
+
+  blocofy theme publish [--instance <handle>]
+      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 <handle>  publish a specific theme (handle from the panel / status)
+
+  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 pull [dir] / pages push [dir]
       pull: download published pages → pages/<slug>.json.
@@ -81,7 +89,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
@@ -100,7 +109,7 @@ async function promptValid(rl, question, normalize, valid, hint, tries = 3) {
 }
 
 async function login(rest) {
-  const flags = parseFlags(rest);
+  const { flags } = parseArgs(rest);
   let url = typeof flags.url === "string" ? normalizeUrl(flags.url) : "";
   let token = typeof flags.token === "string" ? flags.token.trim() : "";
 
@@ -144,6 +153,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`);
 }
 
@@ -158,28 +177,71 @@ function requireCreds() {
 }
 
 async function themePull(rest) {
-  const flags = parseFlags(rest);
-  const positional = rest.filter((a) => !a.startsWith("--"));
-  const dir = resolve(positional[0] ?? process.cwd());
+  const { flags, positionals } = parseArgs(rest);
+  const dir = resolve(positionals[0] ?? process.cwd());
   const creds = requireCreds();
   const draft = Boolean(flags.draft);
-  const { count } = await pullTheme({ dir, url: creds.url, token: creds.token, draft });
-  console.log(`Downloaded ${count} ${draft ? "draft" : "live"} theme files → ${dir}`);
+  const instance = typeof flags.instance === "string" ? flags.instance : null;
+  const { count } = await pullTheme({ dir, url: creds.url, token: creds.token, draft, instance });
+  const what = instance ? `instance ${instance}` : draft ? "draft" : "live";
+  console.log(`Downloaded ${count} ${what} theme files → ${dir}`);
 }
 
 async function themePush(rest) {
-  const flags = parseFlags(rest);
-  const positional = rest.filter((a) => !a.startsWith("--"));
-  const dir = resolve(positional[0] ?? process.cwd());
+  const { flags, positionals } = parseArgs(rest);
+  const dir = resolve(positionals[0] ?? process.cwd());
   if (!existsSync(dir)) {
     console.error(`Theme directory not found: ${dir}`);
     process.exit(1);
   }
   const creds = requireCreds();
   const draft = Boolean(flags.draft);
-  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).`);
+  const instance = typeof flags.instance === "string" ? flags.instance : null;
+
+  // 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: draft || Boolean(instance),
+    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, instance });
+  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".`);
   } else {
     const extra = result.skippedDeletes
@@ -190,8 +252,8 @@ async function themePush(rest) {
 }
 
 async function contentPush(scope, rest) {
-  const positional = rest.filter((a) => !a.startsWith("--"));
-  const dir = resolve(positional[0] ?? process.cwd());
+  const { positionals } = parseArgs(rest);
+  const dir = resolve(positionals[0] ?? process.cwd());
   if (!existsSync(dir)) {
     console.error(`Directory not found: ${dir}`);
     process.exit(1);
@@ -212,17 +274,16 @@ 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 { positionals } = parseArgs(rest);
+  const dir = resolve(positionals[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("--"));
-  const themeDir = resolve(positional[0] ?? process.cwd());
+  const { flags, positionals } = parseArgs(rest);
+  const themeDir = resolve(positionals[0] ?? process.cwd());
 
   if (!existsSync(themeDir)) {
     console.error(`Theme directory not found: ${themeDir}`);
@@ -250,7 +311,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)}`);
@@ -357,6 +420,45 @@ async function themeDev(rest) {
   }
 }
 
+async function themePublish(rest) {
+  const { flags } = parseArgs(rest);
+  const creds = requireCreds();
+  let instance = typeof flags.instance === "string" ? flags.instance : null;
+  if (!instance) {
+    // Belirtilmediyse: `theme dev` / `theme push --draft`'ın yazdığı taslağı yayınla.
+    const session = await fetchDevSession({ url: creds.url, token: creds.token });
+    instance = session.draftInstanceId;
+  }
+  const result = await publishInstance({ url: creds.url, token: creds.token, instanceId: instance });
+  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} · ${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") {
@@ -383,6 +485,16 @@ 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);

package/lib/args.mjs

@@ -0,0 +1,33 @@
+/**
+ * Birleşik arg tokenizer. Tek geçişte hem flag'leri hem positional'ları çıkarır —
+ * böylece bir flag DEĞERİ (örn. `--port 3035`'in `3035`'i) yanlışlıkla positional
+ * (tema dizini) sanılmaz. Boolean flag'ler sonraki token'ı YUTMAZ.
+ */
+
+/** Sonraki token'ı değer olarak almayan flag'ler. */
+const BOOLEAN_FLAGS = new Set(["draft", "yes", "confirm", "no-sync", "dry", "help", "version"]);
+
+export function parseArgs(rest) {
+  const flags = {};
+  const positionals = [];
+  for (let i = 0; i < rest.length; i++) {
+    const arg = rest[i];
+    if (!arg.startsWith("--")) {
+      positionals.push(arg);
+      continue;
+    }
+    const key = arg.slice(2);
+    if (BOOLEAN_FLAGS.has(key)) {
+      flags[key] = true;
+      continue;
+    }
+    const next = rest[i + 1];
+    if (next !== undefined && !next.startsWith("--")) {
+      flags[key] = next;
+      i++;
+    } else {
+      flags[key] = true;
+    }
+  }
+  return { flags, positionals };
+}

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/messages.mjs

@@ -26,8 +26,8 @@ export function syncScopeNote() {
  */
 export function statusLine(session) {
   if (!session) return null;
-  const draft = session.draftInstanceId != null ? `#${session.draftInstanceId}` : "—";
-  const live = session.liveThemeId != null ? `#${session.liveThemeId}` : "(none)";
+  const draft = session.draftInstanceId != null ? session.draftInstanceId : "—";
+  const live = session.liveThemeId != null ? session.liveThemeId : "(none)";
   return `Local files → Draft theme ${draft}    ·    Live theme → ${live}`;
 }
 

package/lib/theme-sync.mjs

@@ -23,9 +23,10 @@ async function errorText(res) {
  * With `draft`, pulls the "CLI Draft" instance (what `theme dev` syncs into)
  * instead of the live theme — symmetric with `push --draft`.
  */
-export async function pullTheme({ dir, url, token, draft = false }) {
+export async function pullTheme({ dir, url, token, draft = false, instance = null }) {
   const base = url.replace(/\/+$/, "");
-  const res = await fetch(`${base}/api/dev/theme${draft ? "?draft=1" : ""}`, {
+  const query = instance ? `?instance=${encodeURIComponent(instance)}` : draft ? "?draft=1" : "";
+  const res = await fetch(`${base}/api/dev/theme${query}`, {
     headers: { authorization: `Bearer ${token}` },
   });
   if (!res.ok) throw new Error(await errorText(res));
@@ -40,6 +41,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 }`.
@@ -58,14 +74,42 @@ 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 }) {
+export async function pushTheme({ dir, url, token, draft = false, instance = null }) {
   const base = url.replace(/\/+$/, "");
   const files = readLocalTemplates(dir);
+  const payload = instance ? { files, instance } : { files, draft };
   const res = await fetch(`${base}/api/dev/theme`, {
     method: "POST",
     headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
-    body: JSON.stringify({ files, draft }),
+    body: JSON.stringify(payload),
+  });
+  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.11",
+  "version": "0.2.0",
   "description": "Develop your Blocofy theme locally against live data with instant preview — login, theme dev, pull, push.",
   "type": "module",
   "license": "MIT",