@koda-sl/baker-cli 0.342.0-dev.ee2d2f03a → 0.343.0-dev.4845130c3

package/README.md

@@ -118,12 +118,14 @@ Use `--output` to change format:
 
 | Format  | Description                        | Best for           | Available on |
 |---------|------------------------------------|--------------------|--------------|
-| `json`  | Structured JSON envelope (default) | AI agents          | every command |
-| `files` | Tab-separated, one row per result  | Piping / shell     | every command |
-| `md`    | Markdown table                     | Human reading      | every command |
+| `json`  | Structured JSON envelope (default) | AI agents          | every command that prints the envelope |
+| `files` | Tab-separated, one row per result  | Piping / shell     | commands whose `baker schema` lists `output` |
+| `md`    | Markdown table                     | Human reading      | commands whose `baker schema` lists `output` |
 | `csv`   | RFC 4180 comma-separated values    | Analysis tools     | `baker research …` only |
 | `jsonl` | One JSON object per line           | Streaming/appending | `baker research …` only |
 
+`--output json` is accepted even by a command that declares no `--output`: the envelope is already what it prints, and on a command whose default is a readable view (`baker tags list`, the `draft` commands) it becomes that command's `--json`. The few commands that print only text — `baker analytics sending-events`, `baker canvas run` and `rerun` — refuse it, as a command without its own `--output` refuses `md` and `files`.
+
 `csv` and `jsonl` are implemented by the research family alone. Asking any other command for them — or for a format that does not exist — falls back to the JSON envelope and says so on stderr, rather than printing nothing and exiting 0.
 
 `files` and `md` print rows and nothing else, so any `hints` or data-quality note the envelope carries is written to **stderr** instead. Reading stdout alone still gives you clean, parseable rows.
@@ -609,11 +611,16 @@ baker ads google keywords update <criterion-id> --customer-id 1234567890 --clear
 baker ads google ads create --customer-id 1234567890 --ad-group-ref g_temp_<adgroup> \
   --headlines "Fast Widgets,Buy Online,Free Shipping" --descriptions "Best widgets around.,Ships tomorrow." \
   --final-url https://example.com
+# Copy with commas in it — repeat the flag once per item (or quote the item: '"Fast, free quotes",Book today')
+baker ads google ads create --customer-id 1234567890 --ad-group-ref g_temp_<adgroup> \
+  --headlines "Fast Widgets,Buy Online,Free Shipping" \
+  --descriptions "Calls, messages and bookings in one place." --descriptions "Ships tomorrow, free." \
+  --final-url https://example.com
 # Responsive display ad — images are fields on the ad; register each image as an asset first (returns a g_temp_* ref)
 baker ads google assets create --customer-id 1234567890 --file '{"type":"image","imageId":"<baker_image_id>","name":"Hero"}'
 baker ads google ads create --customer-id 1234567890 --ad-group-ref g_temp_<adgroup> --format responsiveDisplay \
   --headlines "Come back and save" --long-headline "Finish signing up and get 20% off" \
-  --descriptions "Fast setup, no card required" --business-name "Acme" --final-url https://example.com \
+  --descriptions '"Fast setup, no card required"' --business-name "Acme" --final-url https://example.com \
   --marketing-images g_temp_<img_landscape> --square-marketing-images g_temp_<img_square> --logo-images g_temp_<img_logo>
 # Video ad — the YouTube video is its own asset first, then referenced by --video-assets
 baker ads google assets create --customer-id 1234567890 --file '{"type":"youtubeVideo","youtubeVideoId":"dQw4w9WgXcQ"}'

package/canvas/end-card-composition/meta.json

@@ -8,11 +8,7 @@
   "default_duration": 3,
   "inputs": {},
   "params": {
-    "logo_svg": {
-      "kind": "string",
-      "default": "",
-      "description": "Raw inline <svg>…</svg> wordmark with fill set to text_color (optional)."
-    },
+    "logo_svg": { "kind": "string", "default": "", "description": "Raw inline <svg>…</svg> wordmark with fill set to text_color (optional)." },
     "headline": { "kind": "string", "required": true, "description": "Closing line." },
     "cta_text": { "kind": "string", "default": "", "description": "Call-to-action pill label (optional)." },
     "bg_color": { "kind": "color", "default": "#0b1020" },

package/canvas/feature-reveal-composition/meta.json

@@ -9,20 +9,10 @@
   "inputs": {},
   "params": {
     "title": { "kind": "string", "default": "", "description": "Optional heading above the list." },
-    "features": {
-      "kind": "json",
-      "required": true,
-      "description": "Array of 1–6 short labels, e.g. [\"No setup fees\", \"Cancel anytime\"]."
-    },
+    "features": { "kind": "json", "required": true, "description": "Array of 1–6 short labels, e.g. [\"No setup fees\", \"Cancel anytime\"]." },
     "text_color": { "kind": "color", "default": "#0b1020" },
     "accent_color": { "kind": "color", "default": "#1f9d57", "description": "Check-circle fill." },
     "check_color": { "kind": "color", "default": "#ffffff", "description": "The check mark inside the circle." },
-    "stagger_s": {
-      "kind": "number",
-      "default": 0.18,
-      "min": 0.02,
-      "max": 1,
-      "description": "Seconds between each item."
-    }
+    "stagger_s": { "kind": "number", "default": 0.18, "min": 0.02, "max": 1, "description": "Seconds between each item." }
   }
 }

package/canvas/lower-third-composition/meta.json

@@ -13,12 +13,6 @@
     "bar_color": { "kind": "color", "default": "#0b1020" },
     "text_color": { "kind": "color", "default": "#ffffff" },
     "accent_color": { "kind": "color", "default": "#5b8cff", "description": "The leading accent block." },
-    "from_bottom_px": {
-      "kind": "integer",
-      "default": 220,
-      "min": 0,
-      "max": 1600,
-      "description": "Distance of the bar from the bottom edge."
-    }
+    "from_bottom_px": { "kind": "integer", "default": 220, "min": 0, "max": 1600, "description": "Distance of the bar from the bottom edge." }
   }
 }

package/canvas/video-call-composition/meta.json

@@ -15,34 +15,12 @@
     }
   },
   "params": {
-    "headline": {
-      "kind": "string",
-      "default": "",
-      "description": "Big line on the content stage (what the presenter is showing)."
-    },
-    "claim": {
-      "kind": "string",
-      "default": "",
-      "description": "Short proof/claim on the floating glass card (optional)."
-    },
+    "headline": { "kind": "string", "default": "", "description": "Big line on the content stage (what the presenter is showing)." },
+    "claim": { "kind": "string", "default": "", "description": "Short proof/claim on the floating glass card (optional)." },
     "caption": { "kind": "string", "default": "", "description": "A caption line in the lower band (optional)." },
-    "pip_at_s": {
-      "kind": "number",
-      "default": 2,
-      "min": 0,
-      "max": 30,
-      "description": "When the presenter shrinks to the corner pill."
-    },
-    "bg_color": {
-      "kind": "color",
-      "default": "#0b1020",
-      "description": "Content-stage background (behind the presenter)."
-    },
+    "pip_at_s": { "kind": "number", "default": 2, "min": 0, "max": 30, "description": "When the presenter shrinks to the corner pill." },
+    "bg_color": { "kind": "color", "default": "#0b1020", "description": "Content-stage background (behind the presenter)." },
     "text_color": { "kind": "color", "default": "#ffffff" },
-    "accent_color": {
-      "kind": "color",
-      "default": "#5b8cff",
-      "description": "Headline accent + caption underline + pill ring tint."
-    }
+    "accent_color": { "kind": "color", "default": "#5b8cff", "description": "Headline accent + caption underline + pill ring tint." }
   }
 }

package/dist/cli.js

@@ -17043,6 +17043,113 @@ Examples:
 // src/commands/ads/google/write-commands.ts
 import { defineCommand as defineCommand31 } from "citty";
 
+// src/commands/ads/google/ad-copy-flags.ts
+var AD_COPY_LIST_FLAGS = ["headlines", "descriptions", "long-headlines"];
+var AD_COPY_LIST_USAGE = `repeat the flag once per item, or pass one comma-separated list and wrap an item that contains a comma in double quotes: '"Fast, free quotes",Book today'. A flag given once is read as a list, so a lone item with a comma needs its double quotes too: '"Fast, free quotes"'`;
+function skipBlanks(value, at) {
+  let i = at;
+  while (value[i] === " " || value[i] === "	") i++;
+  return i;
+}
+function readQuotedField(value, open, flag) {
+  let text2 = "";
+  let j = open + 1;
+  while (!(value[j] === '"' && value[j + 1] !== '"')) {
+    if (j >= value.length) {
+      failWriteValidation(`--${flag} has a quote with no closing quote: ${value} \u2014 ${AD_COPY_LIST_USAGE}`);
+    }
+    text2 += value[j];
+    j += value[j] === '"' ? 2 : 1;
+  }
+  const after = skipBlanks(value, j + 1);
+  if (after < value.length && value[after] !== ",") {
+    failWriteValidation(
+      `--${flag}: text follows the closing quote of "${text2}" \u2014 a quoted item must end at a comma. To put a quote inside an item, double it ("") or ${AD_COPY_LIST_USAGE}`
+    );
+  }
+  return { text: text2, next: after + 1 };
+}
+function splitQuotedList(value, flag) {
+  const fields = [];
+  let i = 0;
+  while (i <= value.length) {
+    const start = skipBlanks(value, i);
+    if (value[start] === '"') {
+      const { text: text2, next } = readQuotedField(value, start, flag);
+      fields.push({ text: text2, quoted: true });
+      i = next;
+    } else {
+      const comma = value.indexOf(",", start);
+      const end = comma === -1 ? value.length : comma;
+      fields.push({ text: value.slice(start, end), quoted: false });
+      i = end + 1;
+    }
+  }
+  const several = fields.length > 1;
+  return fields.map((field) => ({ text: field.text.trim(), splitAtComma: several && !field.quoted }));
+}
+function jsonStringArray(value) {
+  if (!value.startsWith("[")) return void 0;
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) && parsed.every((v) => typeof v === "string") ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function parseCopyList(value, flag) {
+  let items;
+  if (Array.isArray(value)) {
+    items = value.filter((v) => typeof v === "string").map((v) => ({ text: v.trim(), splitAtComma: false }));
+  } else if (typeof value === "string") {
+    const trimmed = value.trim();
+    const json = jsonStringArray(trimmed);
+    items = json ? json.map((v) => ({ text: v.trim(), splitAtComma: false })) : splitQuotedList(trimmed, flag);
+  } else {
+    return void 0;
+  }
+  const kept = items.filter((item) => item.text.length > 0);
+  return kept.length > 0 ? kept : void 0;
+}
+function copyListFlag(value, flag) {
+  return parseCopyList(value, flag)?.map((item) => item.text);
+}
+function refuseDashLedValue(rawArgs, flag) {
+  for (let i = 0; i < rawArgs.length - 1; i++) {
+    if (rawArgs[i] === "--") return;
+    const value = rawArgs[i + 1];
+    if (rawArgs[i] === `--${flag}` && value?.startsWith("-")) {
+      failWriteValidation(
+        `--${flag} is followed by "${value}", which starts with a dash and is read as another flag, not as copy. Join copy that starts with a dash to its flag with =: --${flag}="${value}"`
+      );
+    }
+  }
+}
+function withRepeatedCopyFlags(args5, rawArgs) {
+  const out = { ...args5 };
+  for (const flag of AD_COPY_LIST_FLAGS) {
+    refuseDashLedValue(rawArgs ?? [], flag);
+    const values = repeatedFlagValues(rawArgs ?? [], flag);
+    if (values.length > 1) {
+      out[flag] = values;
+    }
+  }
+  return out;
+}
+function copyListSplitHints(args5) {
+  const hints2 = [];
+  for (const flag of AD_COPY_LIST_FLAGS) {
+    const items = parseCopyList(args5[flag], flag) ?? [];
+    const fragments = items.filter((item, index) => index > 0 && item.splitAtComma && new RegExp("^\\p{Ll}", "u").test(item.text));
+    if (fragments.length > 0) {
+      hints2.push(
+        `--${flag}: ${fragments.map((f) => `"${f.text}"`).join(", ")} starts in lowercase \u2014 it looks like the end of one item cut at a comma. Check the staged copy; if it was one item, fix this op in place with \`draft amend <ref>\` (the ref this response returned) rather than staging it again, which would leave the cut copy staged too \u2014 ${AD_COPY_LIST_USAGE}.`
+      );
+    }
+  }
+  return hints2;
+}
+
 // src/commands/ads/google/conversion-upload-command.ts
 import { readFileSync as readFileSync4 } from "fs";
 import { defineCommand as defineCommand30 } from "citty";
@@ -18098,10 +18205,10 @@ var keywordListsCommand = defineCommand31({
   }
 });
 function rsaContentFromFlags(args5) {
-  const headlines = listFlag(args5.headlines);
-  const descriptions = listFlag(args5.descriptions);
+  const headlines = copyListFlag(args5.headlines, "headlines");
+  const descriptions = copyListFlag(args5.descriptions, "descriptions");
   if (!headlines || !descriptions) {
-    failWriteValidation("responsive search ads need --headlines and --descriptions (comma-separated), or use --file");
+    failWriteValidation("responsive search ads need --headlines and --descriptions, or use --file");
   }
   const finalUrls = listFlag(args5["final-url"]);
   if (!finalUrls) {
@@ -18121,11 +18228,11 @@ function rdaContentFromFlags(args5, base) {
     format: "responsiveDisplay",
     ...base !== null && typeof base === "object" && !Array.isArray(base) ? base : {}
   };
-  const headlines = listFlag(args5.headlines);
+  const headlines = copyListFlag(args5.headlines, "headlines");
   if (headlines) {
     content.headlines = headlines.map((text2) => ({ text: text2 }));
   }
-  const descriptions = listFlag(args5.descriptions);
+  const descriptions = copyListFlag(args5.descriptions, "descriptions");
   if (descriptions) {
     content.descriptions = descriptions.map((text2) => ({ text: text2 }));
   }
@@ -18176,11 +18283,11 @@ function demandGenContentFromFlags(args5, base) {
   if (typeof args5["ad-name"] === "string") {
     content.name = args5["ad-name"];
   }
-  const headlines = listFlag(args5.headlines);
+  const headlines = copyListFlag(args5.headlines, "headlines");
   if (headlines) {
     content.headlines = headlines.map((text2) => ({ text: text2 }));
   }
-  const descriptions = listFlag(args5.descriptions);
+  const descriptions = copyListFlag(args5.descriptions, "descriptions");
   if (descriptions) {
     content.descriptions = descriptions.map((text2) => ({ text: text2 }));
   }
@@ -18213,15 +18320,15 @@ function demandGenVideoContentFromFlags(args5, base) {
   if (typeof args5["ad-name"] === "string") {
     content.name = args5["ad-name"];
   }
-  const headlines = listFlag(args5.headlines);
+  const headlines = copyListFlag(args5.headlines, "headlines");
   if (headlines) {
     content.headlines = headlines.map((text2) => ({ text: text2 }));
   }
-  const longHeadlines = listFlag(args5["long-headlines"]);
+  const longHeadlines = copyListFlag(args5["long-headlines"], "long-headlines");
   if (longHeadlines) {
     content.longHeadlines = longHeadlines.map((text2) => ({ text: text2 }));
   }
-  const descriptions = listFlag(args5.descriptions);
+  const descriptions = copyListFlag(args5.descriptions, "descriptions");
   if (descriptions) {
     content.descriptions = descriptions.map((text2) => ({ text: text2 }));
   }
@@ -18251,11 +18358,11 @@ function appContentFromFlags(args5, base) {
     format: "app",
     ...base !== null && typeof base === "object" && !Array.isArray(base) ? base : {}
   };
-  const headlines = listFlag(args5.headlines);
+  const headlines = copyListFlag(args5.headlines, "headlines");
   if (headlines) {
     content.headlines = headlines.map((text2) => ({ text: text2 }));
   }
-  const descriptions = listFlag(args5.descriptions);
+  const descriptions = copyListFlag(args5.descriptions, "descriptions");
   if (descriptions) {
     content.descriptions = descriptions.map((text2) => ({ text: text2 }));
   }
@@ -18357,10 +18464,13 @@ var adContentArgs = {
     type: "string",
     description: "responsiveSearch (default) | responsiveDisplay | call | app | video | demandGen | demandGenVideo"
   },
-  headlines: { type: "string", description: "Comma-separated headlines (RSA/RDA/demandGen/demandGenVideo/app)" },
+  headlines: {
+    type: "string",
+    description: `Headlines (RSA/RDA/demandGen/demandGenVideo/app) \u2014 ${AD_COPY_LIST_USAGE}`
+  },
   descriptions: {
     type: "string",
-    description: "Comma-separated descriptions (RSA/RDA/demandGen/demandGenVideo/app)"
+    description: `Descriptions (RSA/RDA/demandGen/demandGenVideo/app) \u2014 ${AD_COPY_LIST_USAGE}`
   },
   path1: { type: "string" },
   path2: { type: "string" },
@@ -18371,7 +18481,7 @@ var adContentArgs = {
   },
   "long-headlines": {
     type: "string",
-    description: "Comma-separated long headlines, up to 5 of 90 chars (demandGenVideo \u2014 no other format has them)"
+    description: `Long headlines, up to 5 of 90 chars (demandGenVideo \u2014 no other format has them) \u2014 ${AD_COPY_LIST_USAGE}`
   },
   "business-name": { type: "string", description: "Business name (responsiveDisplay/demandGen/demandGenVideo)" },
   "marketing-images": {
@@ -18422,16 +18532,22 @@ var adsCommand = defineCommand31({
         ...adContentArgs,
         status: { type: "string" }
       },
-      run: async ({ args: args5 }) => {
+      run: async ({ args: parsedArgs, rawArgs }) => {
+        const args5 = withRepeatedCopyFlags(parsedArgs, rawArgs);
         const customerId = requireCustomerId(args5);
         const file = loadJsonFileArg(args5.file);
         const format = args5.format ?? "responsiveSearch";
         const content = adContentFromFlags(args5, format, file.content);
-        await stageCreate("google.ad.create", customerId, {
-          adGroup: requireStringFlag(args5["ad-group-ref"] ?? file.adGroup, "--ad-group-ref"),
-          status: args5.status ?? file.status,
-          content
-        });
+        await stageCreate(
+          "google.ad.create",
+          customerId,
+          {
+            adGroup: requireStringFlag(args5["ad-group-ref"] ?? file.adGroup, "--ad-group-ref"),
+            status: args5.status ?? file.status,
+            content
+          },
+          copyListSplitHints(args5)
+        );
       }
     }),
     update: defineCommand31({
@@ -18440,7 +18556,8 @@ var adsCommand = defineCommand31({
         description: "Stage an ad update. Any content change needs --format plus EVERY required field of that format (or --file with the complete content) \u2014 a field you send replaces its current value wholesale, so a list you pass must already include the entries you want to keep. Optional asset lists you omit entirely are left untouched on the ad. Status-only changes need neither --format nor content flags."
       },
       args: { ...customerIdArg, ...fileArg, ...adContentArgs, status: { type: "string" } },
-      run: async ({ args: args5 }) => {
+      run: async ({ args: parsedArgs, rawArgs }) => {
+        const args5 = withRepeatedCopyFlags(parsedArgs, rawArgs);
         const customerId = requireCustomerId(args5);
         const file = loadJsonFileArg(args5.file);
         const format = args5.format;
@@ -18454,7 +18571,8 @@ var adsCommand = defineCommand31({
         await stageUpdate("google.ad.update", customerId, requireTarget(args5, "ad"), payload, [
           ...payload.content !== void 0 ? [
             "Each content field you sent replaces its current value wholesale at publish \u2014 re-check that every headline, description, final URL and asset you want to KEEP is in this payload, not just the ones you changed."
-          ] : []
+          ] : [],
+          ...format ? copyListSplitHints(args5) : []
         ]);
       }
     }),
@@ -18483,9 +18601,9 @@ var assetGroupsCommand = defineCommand31({
         },
         name: { type: "string", description: "Asset group name" },
         "final-urls": { type: "string", description: "Comma-separated final URLs" },
-        headlines: { type: "string", description: "Comma-separated headlines (3\u201315, \u226430 chars)" },
-        "long-headlines": { type: "string", description: "Comma-separated long headlines (1\u20135, \u226490 chars)" },
-        descriptions: { type: "string", description: "Comma-separated descriptions (2\u20135, \u226490 chars)" },
+        headlines: { type: "string", description: `Headlines (3\u201315, \u226430 chars) \u2014 ${AD_COPY_LIST_USAGE}` },
+        "long-headlines": { type: "string", description: `Long headlines (1\u20135, \u226490 chars) \u2014 ${AD_COPY_LIST_USAGE}` },
+        descriptions: { type: "string", description: `Descriptions (2\u20135, \u226490 chars) \u2014 ${AD_COPY_LIST_USAGE}` },
         "business-name": { type: "string" },
         "image-assets": { type: "string", description: "Comma-separated marketing image asset refs (1.91:1)" },
         "square-image-assets": {
@@ -18499,11 +18617,12 @@ var assetGroupsCommand = defineCommand31({
         "logo-assets": { type: "string", description: "Comma-separated logo image asset refs" },
         status: { type: "string", description: "ENABLED | PAUSED (default PAUSED)" }
       },
-      run: async ({ args: args5 }) => {
+      run: async ({ args: parsedArgs, rawArgs }) => {
+        const args5 = withRepeatedCopyFlags(parsedArgs, rawArgs);
         const customerId = requireCustomerId(args5);
-        const headlines = listFlag(args5.headlines);
-        const longHeadlines = listFlag(args5["long-headlines"]);
-        const descriptions = listFlag(args5.descriptions);
+        const headlines = copyListFlag(args5.headlines, "headlines");
+        const longHeadlines = copyListFlag(args5["long-headlines"], "long-headlines");
+        const descriptions = copyListFlag(args5.descriptions, "descriptions");
         const payload = mergePayload(loadJsonFileArg(args5.file), {
           campaign: args5["campaign-ref"],
           name: args5.name,
@@ -18518,7 +18637,7 @@ var assetGroupsCommand = defineCommand31({
           logoAssets: listFlag(args5["logo-assets"]),
           status: args5.status
         });
-        await stageCreate("google.assetGroup.create", customerId, payload);
+        await stageCreate("google.assetGroup.create", customerId, payload, copyListSplitHints(args5));
       }
     }),
     update: defineCommand31({
@@ -67574,6 +67693,7 @@ function commandFor(root, argv) {
   const { command, resolved } = resolveCommand2(root, argv);
   return resolved ? command : null;
 }
+var OUTPUT_EXPLANATION = "This command has no --output option: `--output json` is accepted by every command that prints the JSON envelope, and md or files only where `baker schema` lists `output`. Drop the option and read the default output. ";
 function unknownFlagEnvelope(unknown, commandPath, suggestion, hasSchema) {
   const list = unknown.join(", ");
   return {
@@ -67583,7 +67703,7 @@ function unknownFlagEnvelope(unknown, commandPath, suggestion, hasSchema) {
       message: `${list} ${unknown.length > 1 ? "are not options" : "is not an option"} of \`baker ${commandPath}\`.`,
       fix: {
         action: hasSchema ? "check_schema" : "check_help",
-        explanation: (suggestion ? `Did you mean ${suggestion}? ` : "") + `Run \`${hasSchema ? `baker schema ${commandPath}` : `baker ${commandPath} --help`}\` to see every option this command takes. Do not re-run the same call: until this version an unrecognised option was accepted and ignored, so a command that looked like it had filtered or narrowed the result was in fact answering the unfiltered question.`
+        explanation: (unknown.some((flag) => flag === "--output" || flag.startsWith("--output=")) ? OUTPUT_EXPLANATION : "") + (suggestion ? `Did you mean ${suggestion}? ` : "") + `Run \`${hasSchema ? `baker schema ${commandPath}` : `baker ${commandPath} --help`}\` to see every option this command takes. Do not re-run the same call: until this version an unrecognised option was accepted and ignored, so a command that looked like it had filtered or narrowed the result was in fact answering the unfiltered question.`
       },
       retryable: false
     }
@@ -67622,6 +67742,53 @@ function refuseUnknownFlags(root, argv) {
   process.exit(1);
 }
 
+// src/output-flag.ts
+var FLAG = "--output";
+var ENVELOPE = "json";
+var PRINTS_NO_ENVELOPE = /* @__PURE__ */ new Set(["analytics sending-events", "canvas run", "canvas rerun"]);
+function declaredArg(command, name) {
+  const args5 = command.args;
+  if (!args5 || typeof args5 !== "object" || !(name in args5)) {
+    return null;
+  }
+  const def = args5[name];
+  return def && typeof def === "object" ? def : {};
+}
+function envelopeRequests(argv) {
+  const end = argv.indexOf("--");
+  const limit = end === -1 ? argv.length : end;
+  const found = [];
+  for (let index = 0; index < limit; index++) {
+    const token = argv[index];
+    if (token === `${FLAG}=${ENVELOPE}`) {
+      found.push({ index, length: 1 });
+    } else if (token === FLAG && argv[index + 1] === ENVELOPE && index + 1 < limit) {
+      found.push({ index, length: 2 });
+      index++;
+    }
+  }
+  return found;
+}
+function outputFlagForCommand(root, argv) {
+  const requests = envelopeRequests(argv);
+  if (requests.length === 0) {
+    return argv;
+  }
+  const command = commandFor(root, argv);
+  if (!command || declaredArg(command, "output") || PRINTS_NO_ENVELOPE.has(commandPathOf(root, argv))) {
+    return argv;
+  }
+  const jsonSwitch = declaredArg(command, "json")?.type === "boolean";
+  const dropped = new Set(requests.flatMap(({ index, length }) => length === 2 ? [index, index + 1] : [index]));
+  const first = requests[0]?.index;
+  return argv.flatMap((token, index) => {
+    if (!dropped.has(index)) {
+      return [token];
+    }
+    return jsonSwitch && index === first ? ["--json"] : [];
+  });
+}
+
 // src/version.ts
 import { readFileSync as readFileSync21 } from "fs";
 function packageJsonUrl() {
@@ -67648,7 +67815,7 @@ var main = defineCommand245({
 Auth: Set BAKER_API_KEY (starts with bk_) and BAKER_API_URL environment variables.
 Chat: Set BAKER_CHAT_ID for action and scheduled-action commands that stage changes against a chat.
 Output: All commands return JSON envelopes: { ok: true, data: ... } or { ok: false, error: { code, message } }.
-Formats: Use --output json|files|md to control output format. Default: json. (The research commands additionally accept csv and jsonl.)
+Formats: --output json works on every command that prints the envelope. --output md|files only where 'baker schema <command>' lists output. (The research commands additionally accept csv and jsonl.)
 Introspection: Run 'baker schema <command>' to inspect argument schemas.`
   },
   subCommands: {
@@ -67686,6 +67853,7 @@ process.argv = [...process.argv.slice(0, 2), ...normalizeCacheFlag(process.argv.
 installStreamTaps();
 logInvocation(process.argv.slice(2));
 installExitRecord();
+process.argv = [...process.argv.slice(0, 2), ...outputFlagForCommand(main, process.argv.slice(2))];
 refuseUnknownFlags(main, process.argv.slice(2));
 process.argv = [...process.argv.slice(0, 2), ...cacheFlagForParser(process.argv.slice(2))];
 runMain(main);