@cleocode/cleo 2026.9.4 → 2026.9.6

package/dist/cli/index.js

@@ -20948,11 +20948,30 @@ var init_caamp_markers = __esm({
 });
 
 // packages/contracts/src/collection-keys.ts
-var COLLECTION_KEYS;
+var COLLECTION_KEYS, COLLECTION_IDENTITY_FIELDS, DEFAULT_IDENTITY_FIELD;
 var init_collection_keys = __esm({
   "packages/contracts/src/collection-keys.ts"() {
     "use strict";
-    COLLECTION_KEYS = ["tasks", "items", "results", "suggestions"];
+    COLLECTION_KEYS = [
+      "tasks",
+      "items",
+      "results",
+      "suggestions",
+      // gh#1402 / gh#1405 — instances 4, 5 and 6 of the defect this file documents.
+      // `saga list` emits `sagas` and `--output id` returned an EMPTY STREAM against
+      // 58 rows; `backup list` emits `backups`; `worktree list` emits `worktrees`
+      // and, carrying no `total`/`count` sibling, reported `--output count` = 0
+      // against 9 records — so both projection modes agreed on a wrong answer and
+      // the cross-check that caught the other two was absent.
+      "sagas",
+      "backups",
+      "worktrees"
+    ];
+    COLLECTION_IDENTITY_FIELDS = {
+      worktrees: "path",
+      backups: "backupId"
+    };
+    DEFAULT_IDENTITY_FIELD = "id";
   }
 });
 
@@ -21022,6 +21041,7 @@ __export(src_exports, {
   CHANNEL_BOUNDARY_REGISTRY: () => CHANNEL_BOUNDARY_REGISTRY,
   CLEO_CONFIG_MANIFEST: () => CLEO_CONFIG_MANIFEST,
   CLI_CATEGORY_ORDER: () => CLI_CATEGORY_ORDER,
+  COLLECTION_IDENTITY_FIELDS: () => COLLECTION_IDENTITY_FIELDS,
   COLLECTION_KEYS: () => COLLECTION_KEYS,
   CONFIG_MANIFEST_ENTRIES: () => CONFIG_MANIFEST_ENTRIES,
   ChangesetEntrySchema: () => ChangesetEntrySchema,
@@ -21032,6 +21052,7 @@ __export(src_exports, {
   ClassifierUnregisteredAgentError: () => ClassifierUnregisteredAgentError,
   DAEMON_IPC_PROTOCOL_VERSION: () => SUPERVISOR_IPC_PROTOCOL_VERSION,
   DB_INVENTORY: () => DB_INVENTORY,
+  DEFAULT_IDENTITY_FIELD: () => DEFAULT_IDENTITY_FIELD,
   DEFAULT_RESOURCE_RETRY_AFTER_MS: () => DEFAULT_RESOURCE_RETRY_AFTER_MS,
   DOCS_LIFECYCLE_STATUSES: () => DOCS_LIFECYCLE_STATUSES,
   DOC_LIFECYCLE_STATUSES: () => DOC_LIFECYCLE_STATUSES,
@@ -21738,13 +21759,31 @@ var init_normalizer = __esm({
 
 // packages/cleo/src/cli/renderers/output-mode.ts
 import { truncateString } from "@cleocode/core";
-function pickCollection(rec) {
+function pickCollectionEntry(rec) {
   for (const key of COLLECTION_KEYS2) {
     const value = rec[key];
-    if (Array.isArray(value)) return value;
+    if (Array.isArray(value)) return { key, rows: value };
+  }
+  const candidates = Object.entries(rec).filter(
+    ([, value]) => Array.isArray(value) && value.length > 0 && value.every((row) => row !== null && typeof row === "object" && !Array.isArray(row))
+  );
+  if (candidates.length === 1) {
+    const [key, value] = candidates[0];
+    return { key, rows: value };
   }
   return void 0;
 }
+function pickCollection(rec) {
+  return pickCollectionEntry(rec)?.rows;
+}
+function identityFieldFor(key) {
+  return COLLECTION_IDENTITY_FIELDS[key] ?? DEFAULT_IDENTITY_FIELD;
+}
+function identityOf(row, key) {
+  if (row === null || typeof row !== "object") return void 0;
+  const value = row[identityFieldFor(key)];
+  return typeof value === "string" ? value : void 0;
+}
 function extractIds(data) {
   if (data === null || typeof data !== "object") return [];
   const rec = data;
@@ -21753,9 +21792,9 @@ function extractIds(data) {
     const id2 = task["id"];
     if (typeof id2 === "string") return [id2];
   }
-  const collection = pickCollection(rec);
-  if (collection) {
-    return collection.map((t) => t && typeof t === "object" ? t["id"] : void 0).filter((id2) => typeof id2 === "string");
+  const entry = pickCollectionEntry(rec);
+  if (entry) {
+    return entry.rows.map((row) => identityOf(row, entry.key)).filter((id2) => id2 !== void 0);
   }
   const id = rec["id"];
   if (typeof id === "string") return [id];
@@ -21776,11 +21815,11 @@ function extractCount(data) {
   if (typeof rec["id"] === "string") return 1;
   return 0;
 }
-function renderTableList(tasks) {
+function renderTableList(tasks, identityField = DEFAULT_IDENTITY_FIELD) {
   if (tasks.length === 0) return "";
   const COL_TITLE_MAX = 60;
   const rows = tasks.map((t) => ({
-    id: typeof t["id"] === "string" ? t["id"] : "",
+    id: typeof t[identityField] === "string" ? t[identityField] : "",
     status: typeof t["status"] === "string" ? t["status"] : "",
     priority: typeof t["priority"] === "string" ? t["priority"] : "",
     title: truncateString(typeof t["title"] === "string" ? t["title"] : "", COL_TITLE_MAX)
@@ -21835,9 +21874,9 @@ function renderSummary2(data) {
     return { text: "", emptyReason: "no-renderable-records" };
   }
   const rec = data;
-  const collection = pickCollection(rec);
-  if (collection) {
-    return renderSummaryList(collection);
+  const entry = pickCollectionEntry(rec);
+  if (entry) {
+    return renderSummaryList(entry.rows, identityFieldFor(entry.key));
   }
   const task = rec["task"];
   if (task && typeof task === "object") {
@@ -21848,20 +21887,20 @@ function renderSummary2(data) {
   }
   return { text: "", emptyReason: "no-renderable-records" };
 }
-function renderSummaryRow(record) {
-  const id = typeof record["id"] === "string" ? record["id"] : "";
+function renderSummaryRow(record, identityField = DEFAULT_IDENTITY_FIELD) {
+  const id = typeof record[identityField] === "string" ? record[identityField] : "";
   const status = typeof record["status"] === "string" ? record["status"] : "";
   const title = truncateString(typeof record["title"] === "string" ? record["title"] : "", 60);
   return `${id} [${status}] ${title}`;
 }
-function renderSummaryList(rows) {
+function renderSummaryList(rows, identityField = DEFAULT_IDENTITY_FIELD) {
   if (rows.length === 0) return { text: "", emptyReason: "no-renderable-records" };
   const lines = [];
   for (const row of rows) {
     if (!row || typeof row !== "object") continue;
     const rec = row;
-    if (typeof rec["id"] !== "string") continue;
-    lines.push(renderSummaryRow(rec));
+    if (typeof rec[identityField] !== "string") continue;
+    lines.push(renderSummaryRow(rec, identityField));
   }
   return lines.length === 0 ? { text: "", emptyReason: "no-renderable-records" } : { text: lines.join("\n") };
 }
@@ -21900,7 +21939,19 @@ function renderOutputMode(mode, data) {
   switch (mode) {
     case "id": {
       const ids = extractIds(data);
-      return ids.length === 0 ? { text: "", emptyReason: "no-renderable-ids" } : { text: ids.join("\n") };
+      if (ids.length > 0) return { text: ids.join("\n") };
+      const entry = data && typeof data === "object" ? pickCollectionEntry(data) : void 0;
+      if (entry && entry.rows.length > 0) {
+        return {
+          text: null,
+          refusal: {
+            code: "E_OUTPUT_IDENTITY_UNDECLARED",
+            message: `--output id cannot project the ${entry.rows.length} record(s) under "${entry.key}": no record carries "${identityFieldFor(entry.key)}". Refusing to emit an empty stream, which would be indistinguishable from a result set with no rows.`,
+            fix: `Declare the identity for "${entry.key}" in COLLECTION_IDENTITY_FIELDS (packages/contracts/src/collection-keys.ts), or use --field /data/${entry.key} to project the field you need.`
+          }
+        };
+      }
+      return { text: "", emptyReason: "no-renderable-ids" };
     }
     case "count": {
       return { text: String(extractCount(data)) };
@@ -21908,9 +21959,12 @@ function renderOutputMode(mode, data) {
     case "table": {
       if (data && typeof data === "object") {
         const rec = data;
-        const collection = pickCollection(rec);
-        if (collection) {
-          const text = renderTableList(collection);
+        const entry = pickCollectionEntry(rec);
+        if (entry) {
+          const text = renderTableList(
+            entry.rows,
+            identityFieldFor(entry.key)
+          );
           return text.length === 0 ? { text: "", emptyReason: "no-renderable-records" } : { text };
         }
         return { text: renderTableGeneric(rec) };
@@ -22088,6 +22142,17 @@ function cliOutput(data, opts) {
   const summary = getSummaryMode();
   if (outputMode !== "envelope" && !fieldCtx.field) {
     const out = renderOutputMode(outputMode, data);
+    if (out.refusal) {
+      cliError(
+        out.refusal.message,
+        2,
+        { name: out.refusal.code, fix: out.refusal.fix },
+        {
+          operation: opts.operation ?? opts.command
+        }
+      );
+      process.exit(2);
+    }
     if (out.text !== null) {
       writeMachineOutput(out.text, out.emptyReason);
     }
@@ -22122,6 +22187,13 @@ function cliOutput(data, opts) {
         action: `extract ${pointer2}`,
         command: `cleo ${opts.command} --field ${pointer2}`
       })) : void 0;
+      if (opts.responseMeta?.gateway === "mutate") {
+        process.stderr.write(
+          `E_FIELD_NOT_FOUND: pointer "${fieldCtx.field}" did not resolve. The ${opts.operation ?? "operation"} itself SUCCEEDED \u2014 do not retry it. ${fix}
+`
+        );
+        return;
+      }
       cliError(`Pointer "${fieldCtx.field}" did not resolve`, 4, {
         name: "E_FIELD_NOT_FOUND",
         fix,