@zalify/cli 0.20.0 → 0.22.0

package/README.md

@@ -102,6 +102,9 @@ its new home under `shop`.
 | `ads create <dir>` | Provision an Autopilot brand-instance GitHub repo (POST `/api/repos`, GitHub App), scaffold the starter locally (`identity.yaml`, `brand.yaml`, `policy/`, `campaigns/`, `media-plans/`, `signals/`, `decisions/`), and push with a short-lived repo-scoped token. Writes `.zalify/brand-repo.json` so later commands run arg-free. The directory name becomes the slug — use the workspace's store slug so the service's digest writer can find the repo |
 | `ads` / `ads list` | List the workspace's brand instances and their provisioning status |
 | `ads new <name> [--objective] [--budget] [--country] [--link]` | Scaffold a campaign FOLDER — the drag-and-drop form: `campaign.yaml` for budget/audience/copy defaults, `creatives/` for the files that become ads. Three questions when interactive, flags otherwise. `cp -r` an existing folder to duplicate a campaign |
+| `ads pull [--account <act_id>] [--days <n>] [--force]` | The existing account as files: every ingested campaign lands as `campaigns/<slug>.yaml` (imported form — names in `label:`, budgets, statuses, core audience) plus `campaigns/.bindings.json` mapping YAML nodes to platform ids. A hash ledger protects local edits: unedited files fast-forward, edited ones are kept and named, deletions never happen automatically |
+| `ads diff` | Desired (your campaign files) vs actual (the ingested account), keyed through bindings: bound nodes compare budget/status, unbound nodes become creations. Read-only |
+| `ads apply [-y] [--activate]` | Execute the diff after showing it and asking. Creations land **PAUSED** — always; budget edits apply to bound entities; `paused→active` is refused without `--activate` (turning spend on is said twice; `active→paused` always executes). Created ids merge into the bindings ledger |
 | `ads remove <slug>` | Deprecate a brand instance — soft-deletes the record (drops out of `ads list` and the service's repo-token minting; survives for history). The GitHub repo is deliberately untouched: deleting real campaign intent is a human-on-GitHub decision |
 | `ads status` | The instance at a glance: brand + consent, platform access and credential expiry, ingestion freshness (with per-account failures), first-party join coverage, plan and pending-proposal counts. Exits non-zero when the service reports problems |
 | `ads report [--date <YYYY-MM-DD>] [--platform <all\|meta\|google>]` | The daily report in the terminal — totals vs the day before, where the money moved, what changed in the account |

package/dist/cli.js

@@ -18234,7 +18234,7 @@ function updateNotifier(options) {
 
 // src/cli.ts
 import { createRequire as createRequire2 } from "node:module";
-import { dirname as dirname2, join as join11 } from "node:path";
+import { dirname as dirname3, join as join13 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
 // src/auth.ts
@@ -20338,10 +20338,10 @@ async function adsList() {
   }
 }
 
-// src/ads-read.ts
-import { spawn as spawn4 } from "node:child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
+// src/ads-diff.ts
+import { existsSync as existsSync9, readdirSync as readdirSync3, readFileSync as readFileSync7, writeFileSync as writeFileSync8 } from "node:fs";
 import { join as join9, resolve as resolve7 } from "node:path";
+import { createInterface as createInterface2 } from "node:readline/promises";
 
 // node_modules/yaml/dist/index.js
 var composer = require_composer();
@@ -20389,7 +20389,256 @@ var $stringify = publicApi.stringify;
 var $visit = visit.visit;
 var $visitAsync = visit.visitAsync;
 
+// src/ads-diff.ts
+function root() {
+  const cwd = resolve7(".");
+  if (existsSync9(join9(cwd, ".zalify", "brand-repo.json")) || existsSync9(join9(cwd, "campaigns"))) {
+    return cwd;
+  }
+  throw new Error("Not inside a brand-instance checkout — run from the repo `zalify ads create` made.");
+}
+function collect(base) {
+  const dir2 = join9(base, "campaigns");
+  if (!existsSync9(dir2))
+    return { files: [], folders: 0 };
+  const files = [];
+  let folders = 0;
+  for (const entry of readdirSync3(dir2, { withFileTypes: true })) {
+    if (entry.isDirectory()) {
+      if (existsSync9(join9(dir2, entry.name, "campaign.yaml")))
+        folders += 1;
+      continue;
+    }
+    if (!entry.name.endsWith(".yaml") || entry.name.endsWith(".copy.yaml")) {
+      continue;
+    }
+    const path9 = `campaigns/${entry.name}`;
+    try {
+      files.push({ path: path9, doc: $parse(readFileSync7(join9(base, path9), "utf8")) });
+    } catch (err) {
+      throw new Error(`${path9} is not valid YAML: ${String(err).slice(0, 120)}`);
+    }
+  }
+  return { files, folders };
+}
+function ledger(base) {
+  const path9 = join9(base, "campaigns", ".bindings.json");
+  if (!existsSync9(path9))
+    return { nodes: {}, pulled: {} };
+  const raw = JSON.parse(readFileSync7(path9, "utf8"));
+  return { nodes: raw.nodes ?? {}, pulled: raw.pulled ?? {} };
+}
+async function post(auth, path9, payload) {
+  const res = await fetch(`${auth.appUrl}/api/autopilot/${path9}`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${auth.key}`,
+      "x-zalify-workspace-id": auth.workspaceId,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(payload)
+  });
+  const json = await res.json().catch(() => ({}));
+  if (!res.ok)
+    throw new Error(`${path9}: ${res.status} ${json.error ?? ""}`.trim());
+  return json;
+}
+function renderPlan(result, folders) {
+  for (const f of result.issues) {
+    console.log(`✗ ${f.file}`);
+    for (const i of f.issues)
+      console.log(`    ${i.path} — ${i.message}`);
+  }
+  for (const e of result.plan) {
+    if (e.action === "create_campaign") {
+      console.log(`+ campaign "${e.name}"  (${e.adSets} ad sets, ${e.ads} ads)  ${e.file}`);
+    } else if (e.action === "create_ad_set") {
+      console.log(`+ ad set "${e.name}"  (${e.ads} ads)  ${e.file}`);
+    } else if (e.action === "create_ad") {
+      console.log(`+ ad "${e.name}"  ${e.file}`);
+    } else if (e.action === "set_budget") {
+      console.log(`~ ${e.kind} "${e.name}": budget ${e.from ?? "—"} → ${e.to}`);
+    } else if (e.action === "set_status") {
+      console.log(`~ ${e.kind} "${e.name}": status ${e.from ?? "—"} → ${e.to}`);
+    }
+  }
+  const s = result.summary;
+  console.log(`
+${s.creates} to create, ${s.updates} to update, ${s.unchanged} unchanged` + `${result.issues.length ? `, ${result.issues.length} files invalid` : ""}` + `${folders ? `  (${folders} folder campaigns skipped — sync is coming)` : ""}`);
+}
+async function adsDiff() {
+  const auth = requireActive();
+  const base = root();
+  const { files, folders } = collect(base);
+  if (files.length === 0 && folders === 0) {
+    console.log("No campaign files — `zalify ads pull` or `zalify ads new` first.");
+    return;
+  }
+  const led = ledger(base);
+  const result = await post(auth, "ads-code/diff", {
+    files,
+    bindings: led.nodes
+  });
+  renderPlan(result, folders);
+  if (result.issues.length > 0)
+    process.exitCode = 1;
+}
+async function adsApply(opts) {
+  const auth = requireActive();
+  const base = root();
+  const { files, folders } = collect(base);
+  if (files.length === 0) {
+    console.log("No campaign files — `zalify ads pull` or `zalify ads new` first.");
+    return;
+  }
+  const led = ledger(base);
+  const diff = await post(auth, "ads-code/diff", {
+    files,
+    bindings: led.nodes
+  });
+  renderPlan(diff, folders);
+  if (diff.issues.length > 0) {
+    throw new Error("Fix the invalid files before applying.");
+  }
+  if (diff.plan.length === 0) {
+    console.log("Nothing to apply.");
+    return;
+  }
+  if (!opts.yes) {
+    if (!process.stdin.isTTY) {
+      throw new Error("Not a terminal — pass -y to apply without the prompt.");
+    }
+    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    const answer = (await rl.question(`
+Apply? [y/N]: `)).trim().toLowerCase();
+    rl.close();
+    if (answer !== "y" && answer !== "yes") {
+      console.log("Nothing applied.");
+      return;
+    }
+  }
+  const result = await post(auth, "ads-code/apply", {
+    files,
+    bindings: led.nodes,
+    activate: Boolean(opts.activate)
+  });
+  for (const r of result.receipts) {
+    console.log(`${r.ok ? "✓" : "✗"} ${r.action.replaceAll("_", " ")}  ${r.name}` + `${r.id ? `  (${r.id})` : ""}${r.error ? `  — ${r.error}` : ""}`);
+  }
+  if (result.refusedActivations > 0) {
+    console.log(`
+${result.refusedActivations} activation${result.refusedActivations > 1 ? "s" : ""} refused — turning spend on needs --activate.`);
+  }
+  if (Object.keys(result.newBindings).length > 0) {
+    Object.assign(led.nodes, result.newBindings);
+    writeFileSync8(join9(base, "campaigns", ".bindings.json"), `${JSON.stringify(led, null, 2)}
+`);
+    console.log(`
+${Object.keys(result.newBindings).length} new bindings recorded — everything created is PAUSED.`);
+  }
+  if (result.receipts.some((r) => !r.ok))
+    process.exitCode = 1;
+}
+
+// src/ads-pull.ts
+import { createHash as createHash2 } from "node:crypto";
+import {
+  existsSync as existsSync10,
+  mkdirSync as mkdirSync4,
+  readFileSync as readFileSync8,
+  writeFileSync as writeFileSync9
+} from "node:fs";
+import { dirname as dirname2, join as join10, resolve as resolve8 } from "node:path";
+var sha = (s) => createHash2("sha256").update(s).digest("hex");
+function checkoutRoot() {
+  const cwd = resolve8(".");
+  if (existsSync10(join10(cwd, ".zalify", "brand-repo.json")) || existsSync10(join10(cwd, "campaigns"))) {
+    return cwd;
+  }
+  throw new Error("Not inside a brand-instance checkout — run from the repo `zalify ads create` made.");
+}
+function readBindings(root2) {
+  const path9 = join10(root2, "campaigns", ".bindings.json");
+  if (!existsSync10(path9))
+    return { nodes: {}, pulled: {} };
+  const raw = JSON.parse(readFileSync8(path9, "utf8"));
+  return { nodes: raw.nodes ?? {}, pulled: raw.pulled ?? {} };
+}
+async function adsPull(opts) {
+  const auth = requireActive();
+  const root2 = checkoutRoot();
+  const params = new URLSearchParams;
+  if (opts.account)
+    params.set("account", opts.account);
+  if (opts.days)
+    params.set("days", opts.days);
+  const q = params.toString();
+  const res = await fetch(`${auth.appUrl}/api/autopilot/ads-code/export${q ? `?${q}` : ""}`, {
+    headers: {
+      Authorization: `Bearer ${auth.key}`,
+      "x-zalify-workspace-id": auth.workspaceId
+    }
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({}));
+    throw new Error(`export failed (${res.status}): ${body.error ?? ""}`);
+  }
+  const result = await res.json();
+  const bindings = readBindings(root2);
+  let written = 0;
+  let unchanged = 0;
+  const skipped = [];
+  for (const f of result.files) {
+    const abs = join10(root2, f.path);
+    const nextHash = sha(f.yaml);
+    const lastPulled = bindings.pulled[f.path];
+    if (existsSync10(abs)) {
+      const current = readFileSync8(abs, "utf8");
+      if (sha(current) === nextHash) {
+        unchanged += 1;
+        bindings.pulled[f.path] = nextHash;
+        continue;
+      }
+      const locallyEdited = lastPulled !== undefined && sha(current) !== lastPulled;
+      if (locallyEdited && !opts.force) {
+        skipped.push(f.path);
+        continue;
+      }
+    }
+    mkdirSync4(dirname2(abs), { recursive: true });
+    writeFileSync9(abs, f.yaml);
+    bindings.pulled[f.path] = nextHash;
+    written += 1;
+  }
+  Object.assign(bindings.nodes, result.bindings);
+  const bindingsPath = join10(root2, "campaigns", ".bindings.json");
+  mkdirSync4(dirname2(bindingsPath), { recursive: true });
+  writeFileSync9(bindingsPath, `${JSON.stringify(bindings, null, 2)}
+`);
+  const exported = new Set(result.files.map((f) => f.path));
+  const gone = Object.keys(bindings.pulled).filter((p) => !exported.has(p) && existsSync10(join10(root2, p)));
+  const s = result.summary;
+  console.log(`pulled ${s.campaigns} campaigns (${s.adSets} ad sets, ${s.ads} ads): ` + `${written} written, ${unchanged} unchanged, ${skipped.length} kept (locally edited)`);
+  for (const p of skipped)
+    console.log(`  kept  ${p}  (edited — --force overwrites)`);
+  if (gone.length > 0) {
+    console.log(`${gone.length} file${gone.length > 1 ? "s" : ""} no longer upstream (left in place):`);
+    for (const p of gone.slice(0, 10))
+      console.log(`  gone  ${p}`);
+    if (gone.length > 10)
+      console.log(`  … and ${gone.length - 10} more`);
+  }
+  if (s.invalid.length > 0) {
+    console.log(`${s.invalid.length} campaigns failed export-side validation — report this; they were not written.`);
+  }
+  console.log(`
+Review with git diff; commit when it reads right.`);
+}
+
 // src/ads-read.ts
+import { spawn as spawn4 } from "node:child_process";
+import { existsSync as existsSync11, readFileSync as readFileSync9 } from "node:fs";
+import { join as join11, resolve as resolve9 } from "node:path";
 async function serviceGet(auth, path9) {
   const res = await fetch(`${auth.appUrl}/api/autopilot/${path9}`, {
     headers: {
@@ -20477,12 +20726,12 @@ account changes: not tracked for this platform yet` : `
 account changes: ${a.byPerson} by people, ${a.byMeta} automated`);
 }
 function adsDigest(dir2) {
-  const root = resolve7(dir2 ?? ".");
-  const path9 = join9(root, "signals", "latest.json");
-  if (!existsSync9(path9)) {
+  const root2 = resolve9(dir2 ?? ".");
+  const path9 = join11(root2, "signals", "latest.json");
+  if (!existsSync11(path9)) {
     throw new Error("signals/latest.json not found — run from a brand-instance checkout " + "(and pull: the service commits a digest daily).");
   }
-  const d = JSON.parse(readFileSync7(path9, "utf8"));
+  const d = JSON.parse(readFileSync9(path9, "utf8"));
   console.log(`digest of ${d.window.days} days (${d.window.first_date ?? "—"} … ${d.window.last_date ?? "—"}), generated ${when(d.generated_at)}`);
   const t = d.totals;
   console.log(`  spend ${money(t.spend)}  purchases ${num(t.purchases)}  roas ${t.platform_roas ?? "—"}`);
@@ -20521,26 +20770,26 @@ function adsOpen() {
 }
 async function adsDoctor(dir2) {
   const auth = requireActive();
-  const root = resolve7(dir2 ?? ".");
+  const root2 = resolve9(dir2 ?? ".");
   let failed = 0;
   const ok = (msg) => console.log(`  ✓ ${msg}`);
   const bad = (msg) => {
     console.log(`  ✗ ${msg}`);
     failed += 1;
   };
-  const linkPath = join9(root, ".zalify", "brand-repo.json");
+  const linkPath = join11(root2, ".zalify", "brand-repo.json");
   let link = null;
-  if (existsSync9(linkPath)) {
-    link = JSON.parse(readFileSync7(linkPath, "utf8"));
+  if (existsSync11(linkPath)) {
+    link = JSON.parse(readFileSync9(linkPath, "utf8"));
     ok(`checkout linked to ${link?.repo} (slug ${link?.slug})`);
   } else {
     console.log("  - not inside a brand-instance checkout (repo checks only)");
   }
   let identity2 = null;
-  const identityPath = join9(root, "identity.yaml");
-  if (existsSync9(identityPath)) {
+  const identityPath = join11(root2, "identity.yaml");
+  if (existsSync11(identityPath)) {
     try {
-      identity2 = $parse(readFileSync7(identityPath, "utf8"));
+      identity2 = $parse(readFileSync9(identityPath, "utf8"));
       ok("identity.yaml parses");
       if (identity2?.workspace_id && identity2.workspace_id !== auth.workspaceId) {
         bad(`identity.yaml workspace_id (${identity2.workspace_id}) ≠ active workspace (${auth.workspaceId}) — is the CLI on the right workspace?`);
@@ -20606,8 +20855,8 @@ ${failed} problem${failed > 1 ? "s" : ""}.`);
 }
 
 // src/brand.ts
-import { existsSync as existsSync10, mkdirSync as mkdirSync4, readdirSync as readdirSync3, readFileSync as readFileSync8, writeFileSync as writeFileSync8 } from "node:fs";
-import { basename as basename5, join as join10, resolve as resolve8 } from "node:path";
+import { existsSync as existsSync12, mkdirSync as mkdirSync5, readdirSync as readdirSync4, readFileSync as readFileSync10, writeFileSync as writeFileSync10 } from "node:fs";
+import { basename as basename5, join as join12, resolve as resolve10 } from "node:path";
 var AUTHORING_MD = `# Brand authoring guide
 
 The rules for filling in this folder. An author — human or AI agent —
@@ -20908,19 +21157,19 @@ var MANIFEST_JSON = JSON.stringify({
 }, null, 2) + `
 `;
 function brandInit(dir2 = ".", opts = {}) {
-  const target = resolve8(dir2);
+  const target = resolve10(dir2);
   const slug = basename5(target).toLowerCase().replaceAll(/[^a-z0-9-]+/g, "-").replaceAll(/^-+|-+$/g, "");
-  if (existsSync10(target) && readdirSync3(target).length > 0) {
+  if (existsSync12(target) && readdirSync4(target).length > 0) {
     throw new Error(`${dir2} already exists and is not empty`);
   }
   const name = opts.name ?? slug.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
   const currency = (opts.currency ?? "USD").toUpperCase();
-  mkdirSync4(join10(target, "images"), { recursive: true });
-  writeFileSync8(join10(target, "AUTHORING.md"), AUTHORING_MD);
-  writeFileSync8(join10(target, "brand.md"), BRAND_MD(name));
-  writeFileSync8(join10(target, "store.json"), STORE_JSON(name, slug, opts.vertical ?? "<vertical>", currency));
-  writeFileSync8(join10(target, "catalog.json"), CATALOG_JSON(name, currency));
-  writeFileSync8(join10(target, "images", "manifest.json"), MANIFEST_JSON);
+  mkdirSync5(join12(target, "images"), { recursive: true });
+  writeFileSync10(join12(target, "AUTHORING.md"), AUTHORING_MD);
+  writeFileSync10(join12(target, "brand.md"), BRAND_MD(name));
+  writeFileSync10(join12(target, "store.json"), STORE_JSON(name, slug, opts.vertical ?? "<vertical>", currency));
+  writeFileSync10(join12(target, "catalog.json"), CATALOG_JSON(name, currency));
+  writeFileSync10(join12(target, "images", "manifest.json"), MANIFEST_JSON);
   console.log(`Scaffolded brand data in ${dir2}:`);
   for (const f of ["AUTHORING.md", "brand.md", "store.json", "catalog.json", "images/manifest.json"]) {
     console.log(`  + ${f}`);
@@ -20931,23 +21180,23 @@ Author in this order: brand.md → catalog.json → images/manifest.json` + `
 }
 var MANIFEST_SIZES = new Set(["1024x1024", "1536x1024", "1024x1536"]);
 function brandValidate(dir2 = ".") {
-  const target = resolve8(dir2);
+  const target = resolve10(dir2);
   const problems = [];
   const warnings = [];
   const readJson2 = (rel) => {
-    const path9 = join10(target, rel);
-    if (!existsSync10(path9)) {
+    const path9 = join12(target, rel);
+    if (!existsSync12(path9)) {
       problems.push(`missing ${rel}`);
       return null;
     }
     try {
-      return JSON.parse(readFileSync8(path9, "utf8"));
+      return JSON.parse(readFileSync10(path9, "utf8"));
     } catch (err) {
       problems.push(`${rel}: invalid JSON — ${err instanceof Error ? err.message : err}`);
       return null;
     }
   };
-  if (!existsSync10(join10(target, "brand.md")))
+  if (!existsSync12(join12(target, "brand.md")))
     problems.push("missing brand.md");
   const store = readJson2("store.json");
   if (store && (!store.name || !store.slug))
@@ -21121,9 +21370,9 @@ function brandValidate(dir2 = ".") {
 }
 
 // src/cli.ts
-var __dirname4 = dirname2(fileURLToPath3(import.meta.url));
+var __dirname4 = dirname3(fileURLToPath3(import.meta.url));
 var require2 = createRequire2(import.meta.url);
-var pkg = require2(join11(__dirname4, "..", "package.json"));
+var pkg = require2(join13(__dirname4, "..", "package.json"));
 try {
   updateNotifier({ pkg }).notify({
     isGlobal: true,
@@ -21208,6 +21457,15 @@ ads.command("remove <slug>").description("Deprecate a brand instance (record sof
 ads.command("new <name>").description("Scaffold a campaign folder — drop images into creatives/, then sync").option("--objective <o>", "sales | leads | traffic | awareness").option("--budget <b>", '"$60/day" or "$900 total"').option("--country <cc>", "comma-separated ISO codes, e.g. US,CA").option("--link <url>", "destination URL for creative_defaults").action(async (name, options) => {
   await adsNew(name, options);
 });
+ads.command("pull").description("The existing account as files — campaigns/<slug>.yaml + bindings, from what the service has ingested").option("--account <act_id>", "one ad account only").option("--days <n>", "ads seen in the trailing window (default 30)").option("--force", "overwrite locally edited files").action(async (options) => {
+  await adsPull(options);
+});
+ads.command("diff").description("Desired (your files) vs actual (the ingested account) — what apply would do").action(async () => {
+  await adsDiff();
+});
+ads.command("apply").description("Execute the diff: creations land PAUSED; budget edits apply; activation needs --activate").option("--activate", "allow paused → active status changes (turning spend ON)").option("-y, --yes", "skip the confirmation prompt").action(async (options) => {
+  await adsApply(options);
+});
 ads.command("status").description("The brand instance at a glance: access, ingestion freshness, plans, pending proposals").action(async () => {
   await adsStatus();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zalify/cli",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "description": "Zalify CLI - command-line interface for Zalify",
   "type": "module",
   "main": "dist/cli.js",