@blocofy/cli 0.6.0 → 0.7.0

package/README.md

@@ -24,6 +24,8 @@ blocofy theme push [dir]  # Write the local theme to a DRAFT by default (create/
                           # 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).
+                          # --prune also removes target files deleted locally (lists them
+                          # first; on the live theme asks to confirm — --yes for CI).
 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`.
@@ -33,6 +35,15 @@ blocofy --help
 
 ## Changelog
 
+- **0.7.0** — `theme push --prune`: files that exist on the platform but no longer exist locally are
+  removed. Until now a push merged remote-only files back into the upload, so a file deleted locally
+  stayed on the theme forever. The list is printed before anything is written; pruning the LIVE theme
+  (`--live`, or `--instance` pointing at the live theme) asks for confirmation or `--yes`, and a
+  non-interactive shell without `--yes` exits without writing. Removal goes through the platform's atomic
+  deploy, so it is revision-tracked. A draft push also no longer creates a draft as a side effect of its
+  pre-push remote read: the CLI probes the existing CLI draft by handle and skips the probe when there is
+  none. Previously a failure during that read left an empty draft behind and printed a bare `HTTP 500`.
+
 - **0.6.0** — `theme dev`'s local view finally shows what you are working on. It used to render your
   DRAFT theme against the site's LIVE page content, so draft page documents were invisible; each render
   now carries the draft theme instance and the platform resolves that instance's pages. Three failures

package/bin/blocofy.mjs

@@ -35,7 +35,7 @@ const args = process.argv.slice(2);
 const KNOWN = {
   login: ["url", "token"],
   themePull: ["draft", "instance"],
-  themePush: ["diff", "draft", "instance", "name", "live", "yes", "confirm", "dry-run", "validate", "idempotency-key"],
+  themePush: ["diff", "draft", "instance", "name", "live", "yes", "confirm", "dry-run", "validate", "idempotency-key", "prune"],
   themeDev: ["port", "dry", "no-sync", "name"],
   themePublish: ["instance"],
   themeRename: ["name"],
@@ -81,7 +81,7 @@ Usage
         --instance <handle>  pull a specific theme by its handle (from the admin
                              panel theme card, or \`blocofy status\`)
 
-  blocofy theme push [dir] [--live] [--yes] [--instance <handle>]
+  blocofy theme push [dir] [--live] [--yes] [--instance <handle>] [--prune]
       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'.
@@ -96,6 +96,8 @@ Usage
         --validate   alias for --dry-run (validate only, nothing written)
         --diff       show what a push WOULD change vs the target (read-only), then stop
         --idempotency-key <k>  attach an idempotency key so a retried push is not double-applied
+        --prune      also REMOVE target files that no longer exist locally (lists them first;
+                     on the live theme asks to confirm — non-interactive shells must add --yes)
 
   blocofy theme rename <handle> <new name>
       Rename a theme (the name is just a label). Works on any of your themes,
@@ -261,7 +263,7 @@ async function themePush(rest) {
     }
     for (const k of d.added) console.log(`  + ${k}`);
     for (const k of d.changed) console.log(`  ~ ${k}`);
-    for (const k of d.removed) console.log(`  - ${k} (present on target, absent locally — push does not delete)`);
+    for (const k of d.removed) console.log(`  - ${k} (present on target, absent locally — ${flags.prune ? "--prune removes it" : "push does not delete"})`);
     console.log(`\n${d.added.length} added, ${d.changed.length} changed, ${d.removed.length} remote-only.`);
     return;
   }
@@ -279,8 +281,10 @@ async function themePush(rest) {
   // 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;
+  let whoami = null;
   try {
-    site = (await fetchWhoami({ url: creds.url, token: creds.token })).site;
+    whoami = await fetchWhoami({ url: creds.url, token: creds.token });
+    site = whoami.site;
   } catch {
     /* best-effort */
   }
@@ -322,6 +326,34 @@ async function themePush(rest) {
     }
   }
 
+  // PS-13 `--prune`: canlı temadan dosya SİLER. Hedef canlıysa (`--live` ya da canlı temanın handle'ı
+  // verilmiş `--instance`; whoami çözülemediyse canlı sayılır) canlı-push onay kuralı aynen uygulanır:
+  // `--yes`/`--confirm` → onaylı, TTY → liste basıldıktan sonra y/N, non-TTY → yazımsız çıkış.
+  const prune = Boolean(flags.prune) && !dryRun;
+  const liveTarget = mode === "live" || (mode === "instance" && (whoami == null || String(instance) === String(whoami.liveThemeId)));
+  const pruneDecision = livePushDecision({
+    draft: !prune || !liveTarget,
+    yes: Boolean(flags.yes),
+    confirm: Boolean(flags.confirm),
+    isTTY: Boolean(process.stdin.isTTY),
+  });
+  if (pruneDecision.mustAbort) {
+    console.error(`⚠ 'theme push --prune' removes files from the LIVE theme of ${target}.`);
+    console.error(`  Non-interactive shell: pass --prune --yes to confirm. Nothing was written.`);
+    process.exit(1);
+  }
+  const confirmPrune = async (keys) => {
+    console.log(`--prune will remove ${keys.length} file(s) absent locally:`);
+    for (const k of keys) console.log(`  - ${k}`);
+    if (!pruneDecision.needsPrompt) return true;
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    try {
+      return isAffirmative(await rl.question(`⚠ Remove these files from the LIVE theme of ${target}? [y/N] `));
+    } finally {
+      rl.close();
+    }
+  };
+
   // `--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") {
@@ -351,6 +383,8 @@ async function themePush(rest) {
       dryRun,
       idempotencyKey,
       onRetry: (info) => console.error(retryNotice(info)),
+      prune,
+      confirmPrune,
     });
   } catch (error) {
     if (error?.code === "cli_upgrade_required") {
@@ -367,6 +401,11 @@ async function themePush(rest) {
     throw error;
   }
 
+  if (result.aborted) {
+    console.error("Aborted. Nothing was written.");
+    process.exit(1);
+  }
+
   // --dry-run / --validate: the server validated without writing. Report and stop.
   if (result.dryRun) {
     const warnings = Array.isArray(result.warnings) ? result.warnings : [];
@@ -380,6 +419,9 @@ async function themePush(rest) {
     if (Array.isArray(result.remoteOnlyKept) && result.remoteOnlyKept.length) {
       console.log(`  (kept ${result.remoteOnlyKept.length} remote-only file(s) — push does not delete)`);
     }
+    if (Array.isArray(result.remoteOnlyRemoved) && result.remoteOnlyRemoved.length) {
+      console.log(`  (removed ${result.remoteOnlyRemoved.length} file(s) absent locally — --prune)`);
+    }
     console.log(`✓ Deployed atomically: deployment #${result.deploymentId}, revision #${result.sourceRevisionId}, pointer v${result.pointerVersion}.`);
     if (mode === "draft") {
       console.log("Preview & publish it in the admin panel: Theme -> Theme library -> \"Open in editor\".");

package/lib/theme-sync.mjs

@@ -183,11 +183,12 @@ export async function fetchDevSession({ url, token, name = null }) {
  * 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, name = null, dryRun = false, idempotencyKey = null, onRetry = null }) {
+export async function pushTheme({ dir, url, token, draft = false, instance = null, name = null, dryRun = false, idempotencyKey = null, onRetry = null, prune = false, confirmPrune = null }) {
   const base = url.replace(/\/+$/, "");
   const files = readLocalTemplates(dir);
   const headersFor = (extra = {}) => canonicalHeaders({ authorization: `Bearer ${token}`, ...extra });
   const remoteOnlyKept = [];
+  const remoteOnlyRemoved = [];
   if (idempotencyKey && !dryRun) {
     // 0.5.0 kanonik push üç aşamadır (denetim düzeltmeleri):
     //  1) PREFLIGHT dry-run POST (yalnız yerel küme): 422/426 sınıfı hatalar SUNUCUDA HİÇBİR ŞEY
@@ -195,8 +196,12 @@ export async function pushTheme({ dir, url, token, draft = false, instance = nul
     //     arkada instance + sayfa klonu bırakıyordu.
     //  2) MERGE PROBE GET: "push silmez" garantisi — uzakta olup yerelde olmayan, kapı-kabul-eden
     //     dosyalar payload'a aynen eklenir; kapı-dışı satırları (README.md vb.) sunucunun
-    //     retained-rows kuralı korur. Taslak hedefte `?name=` taşınır: adsız probe taslağı
-    //     `CLI Draft — <tarih>` olarak yaratır ve POST'un --name'i reuse yolunda yok sayılırdı.
+    //     retained-rows kuralı korur. `--prune` bu dosyaları EKLEMEZ (kanonik deploy klasörleri
+    //     atomik değiştirir → silinirler) ve yazımdan ÖNCE `confirmPrune(liste)`'ye bildirir.
+    //     PS-09: taslak hedefte taslak-bayraklı GET KULLANILMAZ — sunucuda taslak provizyonlar (yan
+    //     etki; yarıda kalırsa boş taslak bırakırdı). Mevcut CLI taslağı `/api/dev/site`'tan
+    //     (`source === "import"`, sunucunun ensureDraftInstance seçimiyle aynı: id sıralı ilk) bulunup
+    //     `?instance=` ile yoklanır; yoksa yoklanacak uzak dosya da yoktur → probe atlanır.
     //  3) Gerçek POST. Dev-sync key göndermediği için bu aşamaların hiçbirini ödemez.
     const pre = await fetchWithRetry(
       `${base}/api/dev/theme`,
@@ -205,25 +210,37 @@ export async function pushTheme({ dir, url, token, draft = false, instance = nul
     );
     if (!pre.ok) throw await httpError(pre);
 
-    const query = instance
-      ? `?instance=${encodeURIComponent(instance)}`
-      : draft
-        ? `?draft=1${name ? `&name=${encodeURIComponent(name)}` : ""}`
-        : "";
-    const probe = await fetch(`${base}/api/dev/theme${query}`, { headers: headersFor() });
-    if (!probe.ok) throw await httpError(probe);
-    const { files: remote = {} } = await probe.json();
+    let probeInstance = instance;
+    if (!instance && draft) {
+      const status = await fetchSiteStatus({ url, token });
+      probeInstance = (status?.drafts ?? []).find((d) => d.source === "import")?.id ?? null;
+    }
+    let remote = {};
+    if (probeInstance || !draft) {
+      const query = probeInstance ? `?instance=${encodeURIComponent(probeInstance)}` : "";
+      const probe = await fetch(`${base}/api/dev/theme${query}`, { headers: headersFor() });
+      if (!probe.ok) throw await httpError(probe);
+      remote = (await probe.json()).files ?? {};
+    }
     for (const [key, content] of Object.entries(remote)) {
       if (key in files) continue;
       const top = key.split("/")[0] ?? "";
       // Sunucu kapı-kabul kümesinin birebir aynası: THEME_DIRS altı ÇOK-SEGMENTLİ path'ler + tek
       // config istisnası (çıplak `layout` gibi slash'sız bir uzak anahtar sunucuda 422 olurdu).
       if ((key.includes("/") && THEME_DIRS.has(top)) || key === "config/settings_schema.json") {
-        files[key] = typeof content === "string" ? content : "";
-        remoteOnlyKept.push(key);
+        if (prune) {
+          remoteOnlyRemoved.push(key);
+        } else {
+          files[key] = typeof content === "string" ? content : "";
+          remoteOnlyKept.push(key);
+        }
       }
     }
     remoteOnlyKept.sort();
+    remoteOnlyRemoved.sort();
+    if (remoteOnlyRemoved.length && confirmPrune && !(await confirmPrune(remoteOnlyRemoved))) {
+      return { aborted: true, remoteOnlyRemoved };
+    }
   }
   const target = instance ? { files, instance } : name ? { files, draft, name } : { files, draft };
   // dryRun asks the server to validate (auth + snapshot + hostile-Liquid worker) WITHOUT writing.
@@ -237,7 +254,11 @@ export async function pushTheme({ dir, url, token, draft = false, instance = nul
   );
   if (!res.ok) throw await httpError(res);
   const json = await res.json();
-  return remoteOnlyKept.length ? { ...json, remoteOnlyKept } : json;
+  return {
+    ...json,
+    ...(remoteOnlyKept.length ? { remoteOnlyKept } : {}),
+    ...(remoteOnlyRemoved.length ? { remoteOnlyRemoved } : {}),
+  };
 }
 
 /**

package/package.json

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