@zalify/cli 0.23.0 → 0.24.1

package/README.md

@@ -101,8 +101,8 @@ 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 new <name> [--account <folder>] [--objective] [--budget] [--country] [--link]` | Scaffold a campaign FOLDER at `accounts/<account>/<name>/` (account inferred when only one exists): `campaign.yaml` for budget/audience/copy defaults, `creatives/` for the files that become ads. `cp -r` an existing folder to duplicate a campaign |
+| `ads pull [--account <act_id>] [--days <n>] [--force]` | The existing accounts as a tree: every ingested campaign lands as `accounts/<account-name>/<campaign>/campaign.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 creative generate <campaign> --prompt <text> [--orientation] [--ref <url...>] [--name]` | One image through the canvas pipeline (safe zones, product fidelity with refs), downloaded INTO the campaign's `creatives/` and recorded in its `assets.json` — the filesystem stays the interface, and the asset is stored once |
 | `ads diff` | Desired (your campaign files) vs actual (the ingested account), keyed through bindings: bound nodes compare budget/status, unbound nodes become creations. Folder campaigns upload their `creatives/` first (presign + checksum dedup — the `brand images push` machinery) and derive server-side. Read-only against the platform |
 | `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 |

package/dist/cli.js

@@ -20144,8 +20144,8 @@ async function shopifyUploadImages(storeDir, options = {}) {
 
 // src/ads.ts
 import { spawnSync as spawnSync4 } from "node:child_process";
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, writeFileSync as writeFileSync7 } from "node:fs";
-import { basename as basename4, join as join8, resolve as resolve6 } from "node:path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync3, readdirSync as readdirSync3, writeFileSync as writeFileSync7 } from "node:fs";
+import { basename as basename4, join as join8, relative, resolve as resolve6 } from "node:path";
 import { createInterface } from "node:readline/promises";
 function apiError3(status, json) {
   if (json.code === "SLUG_TAKEN") {
@@ -20283,14 +20283,22 @@ Next steps:
 ` + `  - the Autopilot service picks the instance up from there`);
 }
 var CAMPAIGN_NAME_RE = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
-function campaignsDir() {
+function campaignParent(account) {
   const cwd = resolve6(".");
-  if (existsSync8(join8(cwd, "campaigns")))
-    return join8(cwd, "campaigns");
-  if (existsSync8(join8(cwd, ".zalify", "brand-repo.json"))) {
-    return join8(cwd, "campaigns");
-  }
-  throw new Error("Not inside a brand-instance checkout — run from the repo `zalify ads create` made.");
+  const inCheckout = existsSync8(join8(cwd, ".zalify", "brand-repo.json")) || existsSync8(join8(cwd, "accounts"));
+  if (!inCheckout) {
+    throw new Error("Not inside a brand-instance checkout — run from the repo `zalify ads create` made.");
+  }
+  const accountsDir = join8(cwd, "accounts");
+  if (account)
+    return join8(accountsDir, account);
+  const dirs = existsSync8(accountsDir) ? readdirSync3(accountsDir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name) : [];
+  if (dirs.length === 1)
+    return join8(accountsDir, dirs[0]);
+  if (dirs.length === 0) {
+    throw new Error("No account folders yet — `zalify ads pull` once, or pass --account <folder>.");
+  }
+  throw new Error(`Several accounts (${dirs.join(", ")}) — pass --account <folder>.`);
 }
 async function ask(question, fallback) {
   if (!process.stdin.isTTY)
@@ -20304,9 +20312,10 @@ async function adsNew(name, opts) {
   if (!CAMPAIGN_NAME_RE.test(name) || name.length > 63) {
     throw new Error(`"${name}" — campaign names are lowercase letters, digits, and inner hyphens.`);
   }
-  const dir2 = join8(campaignsDir(), name);
+  const parent = campaignParent(opts.account);
+  const dir2 = join8(parent, name);
   if (existsSync8(dir2))
-    throw new Error(`campaigns/${name}/ already exists.`);
+    throw new Error(`${dir2} already exists.`);
   const objective = opts.objective ?? await ask("objective (sales/leads/traffic/awareness)", "sales");
   const budget = opts.budget ?? await ask("budget", "$20/day");
   const country = opts.country ?? await ask("country", "US");
@@ -20333,7 +20342,7 @@ ad_sets:
       age: 18-65
       advantage: true
 `);
-  console.log(`✓ campaigns/${name}/ is ready`);
+  console.log(`✓ ${relative(resolve6("."), dir2)}/ is ready`);
   console.log("  1. drag images into creatives/");
   console.log("  2. fill primary_text and link in campaign.yaml");
   console.log("  3. `zalify ads sync` when it lands — validate, diff, apply");
@@ -20365,7 +20374,13 @@ async function adsList() {
 }
 
 // src/ads-diff.ts
-import { existsSync as existsSync10, readdirSync as readdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync9 } from "node:fs";
+import {
+  existsSync as existsSync10,
+  mkdirSync as mkdirSync4,
+  readdirSync as readdirSync5,
+  readFileSync as readFileSync8,
+  writeFileSync as writeFileSync9
+} from "node:fs";
 import { join as join10, resolve as resolve7 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline/promises";
 
@@ -20416,11 +20431,36 @@ var $visit = visit.visit;
 var $visitAsync = visit.visitAsync;
 
 // src/ads-sync.ts
-import { existsSync as existsSync9, readdirSync as readdirSync3, readFileSync as readFileSync7, writeFileSync as writeFileSync8 } from "node:fs";
+import { existsSync as existsSync9, readdirSync as readdirSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync8 } from "node:fs";
 import { join as join9 } from "node:path";
 var CREATIVE_EXT = /\.(png|jpe?g|webp)$/i;
-async function collectFolder(base, name) {
-  const dir2 = join9(base, "campaigns", name);
+function campaignDirs(base) {
+  const found = [];
+  const accounts = join9(base, "accounts");
+  if (existsSync9(accounts)) {
+    for (const acct of readdirSync4(accounts, { withFileTypes: true })) {
+      if (!acct.isDirectory())
+        continue;
+      const acctDir = join9(accounts, acct.name);
+      for (const c of readdirSync4(acctDir, { withFileTypes: true })) {
+        if (c.isDirectory() && existsSync9(join9(acctDir, c.name, "campaign.yaml"))) {
+          found.push(`accounts/${acct.name}/${c.name}`);
+        }
+      }
+    }
+  }
+  const legacy = join9(base, "campaigns");
+  if (existsSync9(legacy)) {
+    for (const e of readdirSync4(legacy, { withFileTypes: true })) {
+      if (e.isDirectory() && existsSync9(join9(legacy, e.name, "campaign.yaml"))) {
+        found.push(`campaigns/${e.name}`);
+      }
+    }
+  }
+  return found;
+}
+async function collectFolder(base, rel) {
+  const dir2 = join9(base, rel);
   const doc = $parse(readFileSync7(join9(dir2, "campaign.yaml"), "utf8"));
   const creativesDir = join9(dir2, "creatives");
   const sources = [];
@@ -20428,7 +20468,7 @@ async function collectFolder(base, name) {
     const abs = join9(creativesDir, sub);
     if (!existsSync9(abs))
       return;
-    const entries = readdirSync3(abs, { withFileTypes: true });
+    const entries = readdirSync4(abs, { withFileTypes: true });
     const hasImages = entries.some((e) => e.isFile() && CREATIVE_EXT.test(e.name));
     const index = hasImages ? await pushImagesIn(abs) : {};
     for (const e of entries) {
@@ -20448,19 +20488,20 @@ async function collectFolder(base, name) {
     }
   };
   await gather("", "");
-  return { path: `campaigns/${name}/campaign.yaml`, doc, sources };
-}
-function folderCampaigns(base) {
-  const dir2 = join9(base, "campaigns");
-  if (!existsSync9(dir2))
-    return [];
-  return readdirSync3(dir2, { withFileTypes: true }).filter((e) => e.isDirectory() && existsSync9(join9(dir2, e.name, "campaign.yaml"))).map((e) => e.name);
+  return { path: `${rel}/campaign.yaml`, doc, sources };
 }
 async function adsCreativeGenerate(opts) {
   const auth = requireActive();
-  const dir2 = join9(".", "campaigns", opts.campaign, "creatives");
+  const matches = campaignDirs(".").filter((rel) => rel.split("/").pop() === opts.campaign);
+  if (matches.length === 0) {
+    throw new Error(`No campaign folder "${opts.campaign}" — \`zalify ads new ${opts.campaign}\` first.`);
+  }
+  if (matches.length > 1) {
+    throw new Error(`"${opts.campaign}" exists under several accounts: ${matches.join(", ")} — cd closer or rename.`);
+  }
+  const dir2 = join9(".", matches[0], "creatives");
   if (!existsSync9(dir2)) {
-    throw new Error(`campaigns/${opts.campaign}/creatives/ not found — \`zalify ads new ${opts.campaign}\` first.`);
+    throw new Error(`${matches[0]}/creatives/ not found.`);
   }
   console.log("Generating (the canvas pipeline: safe zones + product fidelity)…");
   const res = await fetch(`${auth.appUrl}/api/autopilot/ads-code/creative`, {
@@ -20509,34 +20550,41 @@ function root() {
   throw new Error("Not inside a brand-instance checkout — run from the repo `zalify ads create` made.");
 }
 async function collect(base) {
-  const dir2 = join10(base, "campaigns");
-  if (!existsSync10(dir2))
-    return { files: [] };
   const files = [];
-  for (const entry of readdirSync4(dir2, { withFileTypes: true })) {
-    if (entry.isDirectory())
-      continue;
-    if (!entry.name.endsWith(".yaml") || entry.name.endsWith(".copy.yaml")) {
-      continue;
-    }
-    const path9 = `campaigns/${entry.name}`;
-    try {
-      files.push({ path: path9, doc: $parse(readFileSync8(join10(base, path9), "utf8")) });
-    } catch (err) {
-      throw new Error(`${path9} is not valid YAML: ${String(err).slice(0, 120)}`);
+  const legacy = join10(base, "campaigns");
+  if (existsSync10(legacy)) {
+    for (const entry of readdirSync5(legacy, { withFileTypes: true })) {
+      if (entry.isDirectory())
+        continue;
+      if (!entry.name.endsWith(".yaml") || entry.name.endsWith(".copy.yaml")) {
+        continue;
+      }
+      const path9 = `campaigns/${entry.name}`;
+      try {
+        files.push({ path: path9, doc: $parse(readFileSync8(join10(base, path9), "utf8")) });
+      } catch (err) {
+        throw new Error(`${path9} is not valid YAML: ${String(err).slice(0, 120)}`);
+      }
     }
   }
-  for (const name of folderCampaigns(base)) {
-    files.push(await collectFolder(base, name));
+  for (const rel of campaignDirs(base)) {
+    const payload = await collectFolder(base, rel);
+    const imported = typeof payload.doc === "object" && payload.doc !== null && payload.doc.imported === true;
+    files.push(imported ? { path: payload.path, doc: payload.doc } : payload);
   }
   return { files };
 }
+function ledgerPath(base) {
+  return join10(base, "accounts", ".bindings.json");
+}
 function ledger(base) {
-  const path9 = join10(base, "campaigns", ".bindings.json");
-  if (!existsSync10(path9))
-    return { nodes: {}, pulled: {} };
-  const raw = JSON.parse(readFileSync8(path9, "utf8"));
-  return { nodes: raw.nodes ?? {}, pulled: raw.pulled ?? {} };
+  for (const path9 of [ledgerPath(base), join10(base, "campaigns", ".bindings.json")]) {
+    if (existsSync10(path9)) {
+      const raw = JSON.parse(readFileSync8(path9, "utf8"));
+      return { nodes: raw.nodes ?? {}, pulled: raw.pulled ?? {} };
+    }
+  }
+  return { nodes: {}, pulled: {} };
 }
 async function post(auth, path9, payload) {
   const res = await fetch(`${auth.appUrl}/api/autopilot/${path9}`, {
@@ -20644,7 +20692,8 @@ ${result.refusedActivations} activation${result.refusedActivations > 1 ? "s" : "
   }
   if (Object.keys(result.newBindings).length > 0) {
     Object.assign(led.nodes, result.newBindings);
-    writeFileSync9(join10(base, "campaigns", ".bindings.json"), `${JSON.stringify(led, null, 2)}
+    mkdirSync4(join10(base, "accounts"), { recursive: true });
+    writeFileSync9(ledgerPath(base), `${JSON.stringify(led, null, 2)}
 `);
     console.log(`
 ${Object.keys(result.newBindings).length} new bindings recorded — everything created is PAUSED.`);
@@ -20657,7 +20706,7 @@ ${Object.keys(result.newBindings).length} new bindings recorded — everything c
 import { createHash as createHash2 } from "node:crypto";
 import {
   existsSync as existsSync11,
-  mkdirSync as mkdirSync4,
+  mkdirSync as mkdirSync5,
   readFileSync as readFileSync9,
   writeFileSync as writeFileSync10
 } from "node:fs";
@@ -20665,17 +20714,22 @@ import { dirname as dirname2, join as join11, resolve as resolve8 } from "node:p
 var sha = (s) => createHash2("sha256").update(s).digest("hex");
 function checkoutRoot() {
   const cwd = resolve8(".");
-  if (existsSync11(join11(cwd, ".zalify", "brand-repo.json")) || existsSync11(join11(cwd, "campaigns"))) {
+  if (existsSync11(join11(cwd, ".zalify", "brand-repo.json")) || existsSync11(join11(cwd, "accounts")) || existsSync11(join11(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 = join11(root2, "campaigns", ".bindings.json");
-  if (!existsSync11(path9))
-    return { nodes: {}, pulled: {} };
-  const raw = JSON.parse(readFileSync9(path9, "utf8"));
-  return { nodes: raw.nodes ?? {}, pulled: raw.pulled ?? {} };
+  for (const path9 of [
+    join11(root2, "accounts", ".bindings.json"),
+    join11(root2, "campaigns", ".bindings.json")
+  ]) {
+    if (existsSync11(path9)) {
+      const raw = JSON.parse(readFileSync9(path9, "utf8"));
+      return { nodes: raw.nodes ?? {}, pulled: raw.pulled ?? {} };
+    }
+  }
+  return { nodes: {}, pulled: {} };
 }
 async function adsPull(opts) {
   const auth = requireActive();
@@ -20698,10 +20752,22 @@ async function adsPull(opts) {
   }
   const result = await res.json();
   const bindings = readBindings(root2);
+  const ownedElsewhere = new Map;
+  for (const [key, v] of Object.entries(bindings.nodes)) {
+    if (v.kind === "campaign")
+      ownedElsewhere.set(v.id, key.split("#")[0]);
+  }
   let written = 0;
   let unchanged = 0;
+  let owned = 0;
   const skipped = [];
   for (const f of result.files) {
+    const campaignId = result.bindings[`${f.path}#campaign`]?.id;
+    const owner = campaignId ? ownedElsewhere.get(campaignId) : undefined;
+    if (owner && owner !== f.path) {
+      owned += 1;
+      continue;
+    }
     const abs = join11(root2, f.path);
     const nextHash = sha(f.yaml);
     const lastPulled = bindings.pulled[f.path];
@@ -20712,26 +20778,33 @@ async function adsPull(opts) {
         bindings.pulled[f.path] = nextHash;
         continue;
       }
-      const locallyEdited = lastPulled !== undefined && sha(current) !== lastPulled;
+      const locallyEdited = lastPulled === undefined || sha(current) !== lastPulled;
       if (locallyEdited && !opts.force) {
         skipped.push(f.path);
         continue;
       }
     }
-    mkdirSync4(dirname2(abs), { recursive: true });
+    mkdirSync5(dirname2(abs), { recursive: true });
     writeFileSync10(abs, f.yaml);
     bindings.pulled[f.path] = nextHash;
     written += 1;
   }
-  Object.assign(bindings.nodes, result.bindings);
-  const bindingsPath = join11(root2, "campaigns", ".bindings.json");
-  mkdirSync4(dirname2(bindingsPath), { recursive: true });
+  for (const [key, v] of Object.entries(result.bindings)) {
+    const file2 = key.split("#")[0];
+    const campaignId = result.bindings[`${file2}#campaign`]?.id;
+    const owner = campaignId ? ownedElsewhere.get(campaignId) : undefined;
+    if (owner && owner !== file2)
+      continue;
+    bindings.nodes[key] = v;
+  }
+  const bindingsPath = join11(root2, "accounts", ".bindings.json");
+  mkdirSync5(dirname2(bindingsPath), { recursive: true });
   writeFileSync10(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) && existsSync11(join11(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)`);
+  console.log(`pulled ${s.campaigns} campaigns (${s.adSets} ad sets, ${s.ads} ads): ` + `${written} written, ${unchanged} unchanged, ${skipped.length} kept (locally edited)` + `${owned ? `, ${owned} owned by authored files` : ""}`);
   for (const p of skipped)
     console.log(`  kept  ${p}  (edited — --force overwrites)`);
   if (gone.length > 0) {
@@ -20968,7 +21041,7 @@ ${failed} problem${failed > 1 ? "s" : ""}.`);
 }
 
 // src/brand.ts
-import { existsSync as existsSync13, mkdirSync as mkdirSync5, readdirSync as readdirSync5, readFileSync as readFileSync11, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync6, readdirSync as readdirSync6, readFileSync as readFileSync11, writeFileSync as writeFileSync11 } from "node:fs";
 import { basename as basename5, join as join13, resolve as resolve10 } from "node:path";
 var AUTHORING_MD = `# Brand authoring guide
 
@@ -21272,12 +21345,12 @@ var MANIFEST_JSON = JSON.stringify({
 function brandInit(dir2 = ".", opts = {}) {
   const target = resolve10(dir2);
   const slug = basename5(target).toLowerCase().replaceAll(/[^a-z0-9-]+/g, "-").replaceAll(/^-+|-+$/g, "");
-  if (existsSync13(target) && readdirSync5(target).length > 0) {
+  if (existsSync13(target) && readdirSync6(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();
-  mkdirSync5(join13(target, "images"), { recursive: true });
+  mkdirSync6(join13(target, "images"), { recursive: true });
   writeFileSync11(join13(target, "AUTHORING.md"), AUTHORING_MD);
   writeFileSync11(join13(target, "brand.md"), BRAND_MD(name));
   writeFileSync11(join13(target, "store.json"), STORE_JSON(name, slug, opts.vertical ?? "<vertical>", currency));
@@ -21567,7 +21640,7 @@ ads.command("list", { isDefault: true }).description("List the workspace's brand
 ads.command("remove <slug>").description("Deprecate a brand instance (record soft-deleted; the GitHub repo is left untouched)").action(async (slug) => {
   await adsRemove(slug);
 });
-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) => {
+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").option("--account <folder>", "account folder under accounts/ (inferred when only one)").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) => {

package/package.json

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