@koda-sl/baker-cli 0.343.0-dev.c28f2e0b3 → 0.344.0-dev.1f4f1c4b7

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.

package/dist/cli.js

@@ -17114,9 +17114,21 @@ function parseCopyList(value, flag) {
 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;
@@ -67681,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 {
@@ -67690,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
     }
@@ -67729,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", "canvas sync-definition"]);
+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() {
@@ -67755,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: {
@@ -67793,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);