@koda-sl/baker-cli 0.367.0-dev.e10535428 → 0.368.0

package/dist/cli.js

@@ -69,7 +69,7 @@ import {
   validateCanvasDeep,
   withoutCastName,
   ytDlpBlockSignal
-} from "./chunk-K2IKLMCM.js";
+} from "./chunk-AI4HWQVN.js";
 import {
   csvOrJson,
   daysAgoIso,
@@ -9829,7 +9829,7 @@ import { defineCommand as defineCommand19 } from "citty";
 function listed(resources) {
   return resources.map((resource) => resource.label ? `${resource.id} (${resource.label})` : resource.id).join("; ");
 }
-function connectedResourceHints({ plural, singular, flag, resources }) {
+function connectedResourceHints({ plural: plural2, singular, flag, resources }) {
   if (resources.length === 0) {
     return [];
   }
@@ -9837,7 +9837,7 @@ function connectedResourceHints({ plural, singular, flag, resources }) {
     return [`This company connected one ${singular}: ${listed(resources)}. Commands use it unless you pass ${flag}.`];
   }
   return [
-    `This company connected ${resources.length} ${plural}: ${listed(resources)}. Each command works on one, so pass ${flag} \u2014 nothing is picked for you. A question about the whole business covers all ${resources.length}: answering from one and reporting it as the total is wrong.`
+    `This company connected ${resources.length} ${plural2}: ${listed(resources)}. Each command works on one, so pass ${flag} \u2014 nothing is picked for you. A question about the whole business covers all ${resources.length}: answering from one and reporting it as the total is wrong.`
   ];
 }
 
@@ -27041,11 +27041,114 @@ Examples:
 
 // src/commands/ads/meta/draft.ts
 import { defineCommand as defineCommand65 } from "citty";
-async function listDraft2(chat) {
+
+// src/commands/ads/meta/draft-status.ts
+var STATUS_HEADINGS = {
+  active: "staged",
+  publishing: "publishing",
+  applied: "published",
+  partial: "published with failures",
+  discarded: "discarded",
+  none: "none"
+};
+function plural(count2, word) {
+  return `${count2} ${word}${count2 === 1 ? "" : "s"}`;
+}
+function headingLine(draft) {
+  const heading = STATUS_HEADINGS[draft.status];
+  if (draft.status === "active" || draft.status === "discarded") {
+    return `Meta Ads \u2014 ${plural(draft.count, "change")} ${heading} \xB7 ${draft.mode}`;
+  }
+  const counts = /* @__PURE__ */ new Map();
+  for (const op of draft.ops) {
+    const status = op.result?.status ?? "pending";
+    counts.set(status, (counts.get(status) ?? 0) + 1);
+  }
+  const summary = [...counts].map(([status, count2]) => `${count2} ${status}`).join(", ");
+  return `Meta Ads \u2014 ${heading} \xB7 ${summary} \xB7 ${draft.mode}`;
+}
+function resultPart(op) {
+  const result = op.result;
+  if (!result) {
+    return void 0;
+  }
+  if (result.status === "failed") {
+    return `\u2717 failed: ${result.error ?? "no reason recorded"}`;
+  }
+  if (result.status === "skipped") {
+    const because = result.skippedBecause;
+    if (because && op.dependsOn.includes(because)) {
+      return `\u2717 skipped: ${because} did not apply`;
+    }
+    return `\u2717 skipped: ${because ?? "a change it needs did not apply"}`;
+  }
+  const id = result.id ?? result.hash;
+  const applied = `\u2713 ${result.status}${id ? ` \u2192 ${id}` : ""}`;
+  const verification = result.verification;
+  if (verification && verification.status !== "confirmed") {
+    return `${applied} (read-back ${verification.status}${verification.note ? `: ${verification.note}` : ""})`;
+  }
+  return applied;
+}
+function opLine(op, showAccount) {
+  const parts = [op.ref, op.kind, op.summary];
+  if (op.target && op.target !== op.ref) {
+    parts.push(`target ${op.target}`);
+  }
+  if (showAccount) {
+    parts.push(`account ${op.accountId}`);
+  }
+  if (op.dependsOn.length > 0) {
+    parts.push(`after ${op.dependsOn.join(", ")}`);
+  }
+  const result = resultPart(op);
+  if (result) {
+    parts.push(result);
+  }
+  return `  ${parts.join(" \xB7 ").replace(/[\r\n]+/g, " ")}`;
+}
+function renderDraftStatus3(draft) {
+  if (draft.status === "none" || draft.count === 0) {
+    return "No staged Meta changes on this chat.";
+  }
+  const lines = [headingLine(draft)];
+  if (draft.status === "active") {
+    lines.push("Publishing makes every change real on the ad account.");
+  }
+  lines.push("");
+  const showAccount = new Set(draft.ops.map((op) => op.accountId)).size > 1;
+  for (const op of draft.ops) {
+    lines.push(opLine(op, showAccount));
+  }
+  if (draft.advisories.length > 0) {
+    lines.push("", "Advisories");
+    for (const advisory of draft.advisories) {
+      lines.push(`  ! ${advisory.ref}: ${advisory.message}`);
+    }
+  }
+  lines.push("", "Full staged payload for one op: baker ads meta draft show <ref> \xB7 raw envelope: --json");
+  return lines.join("\n");
+}
+
+// src/commands/ads/meta/draft.ts
+registerSchema({
+  command: "ads.meta.draft",
+  description: "Review every Meta op staged on this chat, one line each: ref \xB7 kind \xB7 summary \xB7 what it waits on, and after a publish \u2713 applied \u2192 id or \u2717 failed: <error>. `draft show <ref>` prints one op's full payload.",
+  args: {
+    json: { type: "boolean", description: "Raw JSON envelope instead of the readable list", required: false },
+    chat: { type: "string", description: "Read another chat's draft instead of this one", required: false }
+  }
+});
+async function listDraft2(json, chat) {
   try {
     const chatId = resolveChatId(chat);
     const response = await apiPost("/api/ads/meta/draft", { chatId });
-    writeJsonEnvelope(response);
+    if (json || !response.ok || !response.data) {
+      writeJsonEnvelope(response);
+      return;
+    }
+    process.stdout.write(`${renderDraftStatus3(response.data)}
+`);
   } catch (err) {
     handleMetaError(err);
   }
@@ -27053,11 +27156,14 @@ async function listDraft2(chat) {
 var listCommand10 = defineCommand65({
   meta: {
     name: "list",
-    description: "Show every Meta write op staged in this chat, its dependencies, and post-publish results. Publishing reaches the real ad account, so review this before you finish. Example: baker ads meta draft"
+    description: "Show every Meta write op staged in this chat, one line each (ref \xB7 kind \xB7 summary \xB7 dependencies \xB7 post-publish result); --json for the raw envelope. Publishing reaches the real ad account, so review this before you finish. Example: baker ads meta draft"
+  },
+  args: {
+    json: { type: "boolean", description: "Print the raw JSON envelope instead of the readable list" },
+    chat: CHAT_READ_ARG
   },
-  args: { chat: CHAT_READ_ARG },
   run: async ({ args: args5 }) => {
-    await listDraft2(args5.chat);
+    await listDraft2(args5.json === true, args5.chat);
   }
 });
 var showCommand2 = defineCommand65({
@@ -27127,7 +27233,10 @@ var metaDraftCommand = defineCommand65({
   },
   // Declared on the parent too: `default: "list"` dispatches the bare `draft --chat <id>` form, and
   // citty prints help for a flag the parent does not know instead of forwarding it.
-  args: { chat: CHAT_READ_ARG },
+  args: {
+    json: { type: "boolean", description: "Print the raw JSON envelope instead of the readable list" },
+    chat: CHAT_READ_ARG
+  },
   subCommands: { list: listCommand10, show: showCommand2, remove: removeCommand3, clear: clearCommand3 },
   // `default` (not `run`) dispatches the bare invocation: citty falls through to `run`
   // after dispatching a subcommand, so a `run` here would list the draft a second time
@@ -28940,7 +29049,7 @@ function renderNode3(node, depth, showAccount, out) {
   }
 }
 var NO_CHANGES = "No X Ads changes staged";
-var STATUS_HEADINGS = {
+var STATUS_HEADINGS2 = {
   active: "staged",
   publishing: "publishing",
   applied: "published",
@@ -28952,8 +29061,8 @@ function didNotApply(op) {
 function didApply(op) {
   return op.result?.status === "applied" || op.result?.status === "simulated";
 }
-function headingLine(draft) {
-  const heading = STATUS_HEADINGS[draft.status] ?? draft.status;
+function headingLine2(draft) {
+  const heading = STATUS_HEADINGS2[draft.status] ?? draft.status;
   if (draft.status !== "applied" && draft.status !== "publishing") {
     return `X Ads: ${draft.count} change${draft.count === 1 ? "" : "s"} ${heading}`;
   }
@@ -28967,11 +29076,11 @@ function problemLines(draft) {
     return `\u2717 ${op.summary} \u2014 failed: ${reason}`;
   });
 }
-function renderDraftStatus3(draft) {
+function renderDraftStatus4(draft) {
   if (draft.status === "none" || draft.count === 0) {
     return NO_CHANGES;
   }
-  const out = [headingLine(draft), ""];
+  const out = [headingLine2(draft), ""];
   const tree = draft.tree ?? [];
   const showAccount = accountsInTree3(tree).size > 1;
   for (const node of tree) {
@@ -29009,7 +29118,7 @@ async function listDraft3(json, chat) {
       writeJsonEnvelope(response);
       return;
     }
-    process.stdout.write(`${renderDraftStatus3(response.data)}
+    process.stdout.write(`${renderDraftStatus4(response.data)}
 `);
   } catch (err) {
     handleDraftError(err);
@@ -64311,9 +64420,26 @@ function matchesTrigger(kind, query) {
   const family = query.replace(/\.?\*?$/, "");
   return kind === query || kind.startsWith(`${family}.`);
 }
-function shapeTriggerCatalog(catalog, filter) {
+function shapeTriggerCatalog(response, filter) {
   const { trigger, group } = filter;
-  if (!trigger && !group && !filter.full) {
+  const unfiltered = trigger === void 0 && group === void 0;
+  if (unfiltered && filter.full) return { ok: true, data: response };
+  const parsed = triggerCatalogSchema.safeParse(response);
+  if (!parsed.success) {
+    return {
+      ok: false,
+      error: {
+        code: "INTERNAL_ERROR",
+        message: "The trigger list came back in a shape this version of the CLI cannot read.",
+        fix: {
+          action: "run `baker scheduled-agents triggers --full`",
+          explanation: "--full prints the whole list as the server sent it, without reading it."
+        }
+      }
+    };
+  }
+  const catalog = parsed.data;
+  if (unfiltered) {
     return {
       ok: true,
       data: {
@@ -64328,12 +64454,17 @@ function shapeTriggerCatalog(catalog, filter) {
       ]
     };
   }
-  const groups = catalog.groups.filter((entry) => !group || entry.group === group).map((entry) => ({
+  const groups = catalog.groups.filter((entry) => group === void 0 || entry.group === group).map((entry) => ({
     ...entry,
-    triggers: entry.triggers.filter((t) => !trigger || matchesTrigger(t.kind, trigger))
+    triggers: entry.triggers.filter(
+      (t) => trigger === void 0 || matchesTrigger(t.kind, trigger)
+    )
   })).filter((entry) => entry.triggers.length > 0);
   if (groups.length === 0) {
-    const asked = [trigger ? `--trigger ${trigger}` : null, group ? `--group ${group}` : null].filter(Boolean);
+    const asked = [
+      trigger === void 0 ? null : `--trigger "${trigger}"`,
+      group === void 0 ? null : `--group "${group}"`
+    ].filter(Boolean);
     return {
       ok: false,
       error: {
@@ -64368,8 +64499,7 @@ Full guide: __tooling__/docs/tools/baker/scheduled-agents.md`
   run: async ({ args: args5 }) => {
     try {
       const response = await apiPost("/api/scheduled-agents/triggers", {});
-      const catalog = triggerCatalogSchema.parse(response.data);
-      const shaped = shapeTriggerCatalog(catalog, { trigger: args5.trigger, group: args5.group, full: args5.full });
+      const shaped = shapeTriggerCatalog(response.data, { trigger: args5.trigger, group: args5.group, full: args5.full });
       writeJson(shaped);
       if (!shaped.ok) process.exit(1);
     } catch (err) {