@warmhub/cli 0.67.0 → 0.68.0

package/dist/wh.js

@@ -18478,10 +18478,21 @@ var import_awaitAsyncGenerator = __toESM(require_awaitAsyncGenerator(), 1);
 var import_wrapAsyncGenerator = __toESM(require_wrapAsyncGenerator(), 1);
 var import_objectSpread29 = __toESM(require_objectSpread2(), 1);
 // ../../packages/rules/src/builtin-shapes.ts
-var BUILTIN_SHAPE_NAMES = ["Pair", "Triple", "Set", "List"];
+var BUILTIN_SHAPE_NAMES = ["Pair", "Set", "List"];
+var RETIRED_COLLECTION_SHAPE_NAMES = ["Triple"];
+var RESERVED_COLLECTION_SHAPE_NAMES = [
+  ...BUILTIN_SHAPE_NAMES,
+  ...RETIRED_COLLECTION_SHAPE_NAMES
+];
 function isBuiltinCollectionShape(name) {
   return BUILTIN_SHAPE_NAMES.includes(name);
 }
+function isRetiredCollectionShape(name) {
+  return RETIRED_COLLECTION_SHAPE_NAMES.includes(name);
+}
+function isReservedCollectionShape(name) {
+  return RESERVED_COLLECTION_SHAPE_NAMES.includes(name);
+}
 var BUILTIN_CONTENT_SHAPE_NAMES = ["Content"];
 var STORED_CONTENT_NAMES = ["Readme", "Agents"];
 var SYNTHESIZED_CONTENT_NAMES = ["LlmsTxt"];
@@ -18499,14 +18510,6 @@ var BUILTIN_SHAPE_DEFS = {
     },
     description: "An ordered pair of two things"
   },
-  Triple: {
-    fields: {
-      first: { type: "wref", description: "First member of the triple" },
-      second: { type: "wref", description: "Second member of the triple" },
-      third: { type: "wref", description: "Third member of the triple" }
-    },
-    description: "An ordered triple of three things"
-  },
   Set: {
     fields: {
       members: [{ type: "wref", description: "Members of the set" }]
@@ -18553,36 +18556,6 @@ var COMMIT_OPERATION_KINDS = [
   "assertion",
   "collection"
 ];
-function isCollectionAbout(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value))
-    return false;
-  const record = value;
-  const keys = Object.keys(record);
-  if (keys.length !== 1)
-    return false;
-  const key = keys[0];
-  if (key !== "pair" && key !== "triple" && key !== "set" && key !== "list")
-    return false;
-  return Array.isArray(record[key]);
-}
-function collectionAboutType(about) {
-  if ("pair" in about)
-    return "pair";
-  if ("triple" in about)
-    return "triple";
-  if ("set" in about)
-    return "set";
-  return "list";
-}
-function collectionAboutMembers(about) {
-  if ("pair" in about)
-    return about.pair;
-  if ("triple" in about)
-    return about.triple;
-  if ("set" in about)
-    return about.set;
-  return about.list;
-}
 function splitLocalPath(name) {
   const idx = name.indexOf("/");
   if (idx === -1)
@@ -19949,9 +19922,99 @@ var PLATFORM_STATUS_PROBE_ARTIFACT_FIELDS = {
     description: "Optional URL associated with this artifact."
   }
 };
+// ../../packages/rules/src/tokens.ts
+var COMMIT_TOKEN_SYNTAX_REMOVED_MESSAGE = "$N/#N commit-token syntax is no longer supported. Use explicit names and explicit wrefs. For assertions about newly created things, create the thing with a deterministic name and set about to that wref in the same commit.";
+var ANY_TOKEN_RE = /[$#]\d+/;
+function hasAnyTokens(s) {
+  return ANY_TOKEN_RE.test(s);
+}
+
+// ../../packages/rules/src/preflight-commit.ts
+function preflightCommitDiagnostics(operations, options) {
+  const errors = [];
+  rejectCommitTokenSyntax(operations, errors);
+  illegalOpSequences(operations, errors, options?.checkAddAdd ?? true);
+  return errors;
+}
+function getOpName(op) {
+  return op.name;
+}
+function tokenStringFields(op) {
+  const fields = [getOpName(op), op.newName];
+  if (typeof op.about === "string") {
+    fields.push(op.about);
+  }
+  if (op.members) {
+    fields.push(...op.members);
+  }
+  return fields;
+}
+function rejectCommitTokenSyntax(operations, errors) {
+  for (let i = 0;i < operations.length; i++) {
+    const op = operations[i];
+    if (!op)
+      continue;
+    for (const field of tokenStringFields(op)) {
+      if (field && hasAnyTokens(field)) {
+        errors.push({
+          code: "COMMIT_TOKEN_SYNTAX_REMOVED",
+          operationIndex: i,
+          message: COMMIT_TOKEN_SYNTAX_REMOVED_MESSAGE
+        });
+        break;
+      }
+    }
+  }
+}
+function illegalOpSequences(operations, errors, checkAddAdd) {
+  const opHistory = new Map;
+  for (let i = 0;i < operations.length; i++) {
+    const op = operations[i];
+    if (!op)
+      continue;
+    const name = getOpName(op);
+    if (!name)
+      continue;
+    if (hasAnyTokens(name))
+      continue;
+    const kind = inferOperationKind({ ...op, name });
+    const qualName = kind === "shape" ? `shape:${name}` : `thing:${name}`;
+    const history = opHistory.get(qualName) ?? [];
+    history.push({ operation: op.operation, index: i });
+    opHistory.set(qualName, history);
+  }
+  for (const [qualName, history] of opHistory) {
+    if (history.length < 2)
+      continue;
+    for (let i = 1;i < history.length; i++) {
+      const prev = history[i - 1];
+      const curr = history[i];
+      if (!prev || !curr)
+        continue;
+      const pair = `${prev.operation}+${curr.operation}`;
+      if (checkAddAdd && pair === "add+add") {
+        errors.push({
+          code: "ILLEGAL_OP_SEQUENCE",
+          operationIndex: curr.index,
+          message: `Cannot add "${qualName}" twice in the same commit`
+        });
+      }
+      if (pair === "revise+add") {
+        errors.push({
+          code: "ILLEGAL_OP_SEQUENCE",
+          operationIndex: curr.index,
+          message: `Cannot revise then add "${qualName}" in the same commit`
+        });
+      }
+    }
+  }
+}
+
 // ../../packages/rules/src/preflight-operation.ts
-var collectionTypes = ["pair", "triple", "set", "list"];
+var collectionTypes = ["pair", "set", "list"];
 var collectionOps = ["add", "revise"];
+var COLLECTION_CREATE_REQUIRES_NAME_MESSAGE = "Collection create requires a name. Collections are ordinary named things (ADR 0004).";
+var COLLECTION_ABOUT_REMOVED_MESSAGE = 'about accepts a wref. Create the collection as its own named operation, then point the assertion at it. Prefer deterministic relationship names, for example: [{"operation":"add","kind":"collection","type":"pair","name":"a-b-relationship","members":["A","B"]},{"operation":"add","kind":"assertion","about":"Pair/a-b-relationship","name":"Assertion/example","data":{}}]. For CLI usage, use wh commit submit --file with the two operations.';
 function preflightOpDiagnostics(op, operationIndex) {
   const errors = [];
   errors.push(...builtinShapeGuard(op, operationIndex));
@@ -19964,17 +20027,36 @@ function preflightOpDiagnostics(op, operationIndex) {
 function builtinShapeGuard(op, operationIndex) {
   const errors = [];
   const name = op.name;
-  if (op.kind === "shape" && name && isBuiltinShape(name)) {
+  if (name && isRetiredCollectionShape(name)) {
+    errors.push({
+      code: "RESERVED_NAME",
+      operationIndex,
+      message: `Shape "${name}" is a retired collection shape and cannot be written manually`
+    });
+  }
+  if (op.operation === "rename" && (op.kind === "shape" || op.name !== undefined && !splitLocalPath(op.name)) && op.newName && isRetiredCollectionShape(op.newName)) {
+    errors.push({
+      code: "RESERVED_NAME",
+      operationIndex,
+      message: `Shape "${op.newName}" is a retired collection shape and cannot be written manually`
+    });
+  } else if (op.operation !== "retract" && op.kind === "shape" && name && isBuiltinShape(name)) {
     errors.push({
       code: "RESERVED_NAME",
       operationIndex,
       message: `Shape "${name}" is a built-in shape and cannot be ${op.operation === "add" ? "created" : "revised"} manually`
     });
   }
-  if (op.kind === "thing" && name) {
+  if (name) {
     const local = splitLocalPath(name);
-    if (local && isBuiltinCollectionShape(local.shapePrefix)) {
-      const message = op.operation === "add" ? `Cannot add kind="thing" under built-in shape "${local.shapePrefix}". Use kind="collection" or the about sugar instead.` : `Cannot revise kind="thing" under built-in shape "${local.shapePrefix}". Collections are immutable.`;
+    if (local && isRetiredCollectionShape(local.shapePrefix)) {
+      errors.push({
+        code: "VALIDATION_ERROR",
+        operationIndex,
+        message: `Cannot ${op.operation} under retired collection shape "${local.shapePrefix}". Triple is read-only and retired for new collection writes.`
+      });
+    } else if (op.kind === "thing" && local && isBuiltinCollectionShape(local.shapePrefix)) {
+      const message = op.operation === "add" ? `Cannot add kind="thing" under built-in shape "${local.shapePrefix}". Use kind="collection" instead.` : `Cannot revise kind="thing" under built-in shape "${local.shapePrefix}". Use kind="collection" to revise a collection.`;
       errors.push({
         code: "VALIDATION_ERROR",
         operationIndex,
@@ -20014,16 +20096,32 @@ function contentNameGuard(op, operationIndex) {
 function plusSignGuard(op, operationIndex) {
   const errors = [];
   const name = op.name;
-  if (op.kind === "collection")
+  if (op.newName?.includes("+")) {
+    errors.push({
+      code: "VALIDATION_ERROR",
+      operationIndex,
+      message: `Name "${op.newName}" contains reserved character "+". The "+" character is reserved for the historical collection auto-name namespace and is not allowed in user-supplied names.`
+    });
     return errors;
+  }
   if (name?.includes("+")) {
+    if (op.kind === "collection" && op.operation === "add") {
+      errors.push({
+        code: "VALIDATION_ERROR",
+        operationIndex,
+        message: `Name "${name}" contains reserved character "+". The "+" character is reserved for the historical collection auto-name namespace and is not allowed in user-supplied names.`
+      });
+      return errors;
+    }
+    if (op.kind === "collection")
+      return errors;
     const local = splitLocalPath(name);
-    if (local && isBuiltinCollectionShape(local.shapePrefix))
+    if (local && isReservedCollectionShape(local.shapePrefix))
       return errors;
     errors.push({
       code: "VALIDATION_ERROR",
       operationIndex,
-      message: `Name "${name}" contains reserved character "+". The "+" character is reserved for collection names.`
+      message: `Name "${name}" contains reserved character "+". The "+" character is reserved for the historical collection auto-name namespace and is not allowed in user-supplied names.`
     });
   }
   return errors;
@@ -20032,102 +20130,79 @@ function validateCollectionAbouts(op, operationIndex) {
   const errors = [];
   if (!op.about || typeof op.about === "string")
     return errors;
-  if (!isCollectionAbout(op.about)) {
-    const keys = typeof op.about === "object" && op.about !== null ? Object.keys(op.about) : [];
+  errors.push({
+    code: "VALIDATION_ERROR",
+    operationIndex,
+    message: COLLECTION_ABOUT_REMOVED_MESSAGE
+  });
+  return errors;
+}
+function validateCollectionOps(op, operationIndex) {
+  const errors = [];
+  if (op.kind !== "collection")
+    return errors;
+  if (!collectionOps.includes(op.operation)) {
+    return errors;
+  }
+  if (op.operation === "add" && !op.name) {
     errors.push({
       code: "VALIDATION_ERROR",
       operationIndex,
-      message: `Structured about must have exactly one key: pair, triple, set, or list. Got: ${keys.join(", ") || typeof op.about}`
+      message: COLLECTION_CREATE_REQUIRES_NAME_MESSAGE
     });
-    return errors;
-  }
-  const tag = collectionAboutType(op.about);
-  const members = collectionAboutMembers(op.about);
-  for (let i = 0;i < members.length; i++) {
-    if (typeof members[i] !== "string") {
-      errors.push({
-        code: "VALIDATION_ERROR",
-        operationIndex,
-        message: `Collection member at index ${i} must be a string, got ${typeof members[i]}`
-      });
-    }
   }
-  const arityError = collectionArityError(tag, members);
-  if (arityError) {
+  if (!op.type || !collectionTypes.includes(op.type)) {
     errors.push({
       code: "VALIDATION_ERROR",
       operationIndex,
-      message: arityError
+      message: `Collection "type" must be one of: pair, set, list. Got: "${op.type ?? ""}"`
     });
   }
-  return errors;
-}
-function validateCollectionOps(op, operationIndex) {
-  const errors = [];
-  if (op.kind !== "collection")
-    return errors;
-  if (!collectionOps.includes(op.operation)) {
+  if (!op.members || !Array.isArray(op.members)) {
     errors.push({
       code: "VALIDATION_ERROR",
       operationIndex,
-      message: `Collection kind only supports "add" or "revise" operation, got "${op.operation}"`
+      message: 'Collection requires a "members" array'
     });
-    return errors;
-  }
-  if (op.operation === "add") {
-    if (!op.type || !collectionTypes.includes(op.type)) {
-      errors.push({
-        code: "VALIDATION_ERROR",
-        operationIndex,
-        message: `Collection "type" must be one of: pair, triple, set, list. Got: "${op.type ?? ""}"`
-      });
-    }
-    if (!op.members || !Array.isArray(op.members)) {
-      errors.push({
-        code: "VALIDATION_ERROR",
-        operationIndex,
-        message: 'Collection requires a "members" array'
-      });
-    } else {
-      for (let i = 0;i < op.members.length; i++) {
-        if (typeof op.members[i] !== "string") {
-          errors.push({
-            code: "VALIDATION_ERROR",
-            operationIndex,
-            message: `Collection member at index ${i} must be a string`
-          });
-        }
-      }
-    }
-    if (op.type && op.members) {
-      const arityError = collectionArityError(op.type, op.members);
-      if (arityError) {
+  } else {
+    for (let i = 0;i < op.members.length; i++) {
+      if (typeof op.members[i] !== "string") {
         errors.push({
           code: "VALIDATION_ERROR",
           operationIndex,
-          message: arityError
+          message: `Collection member at index ${i} must be a string`
         });
       }
     }
   }
+  if (op.type && op.members) {
+    const arityError = collectionArityError(op.type, op.members);
+    if (arityError) {
+      errors.push({
+        code: "VALIDATION_ERROR",
+        operationIndex,
+        message: arityError
+      });
+    }
+  }
   return errors;
 }
 function collectionArityError(tag, members) {
   switch (tag) {
     case "pair":
       return members.length !== 2 ? `Pair requires exactly 2 members, got ${members.length}` : null;
-    case "triple":
-      return members.length !== 3 ? `Triple requires exactly 3 members, got ${members.length}` : null;
     case "set":
     case "list":
       return members.length < 1 ? `${tag === "set" ? "Set" : "List"} requires at least 1 member, got 0` : null;
   }
 }
-
 // ../../packages/rules/src/preflight.ts
 function preflightOpDiagnostics2(op, operationIndex) {
   return preflightOpDiagnostics(op, operationIndex);
 }
+function preflightCommitDiagnostics2(operations, options) {
+  return preflightCommitDiagnostics(operations, options);
+}
 // ../../packages/rules/src/reserved-orgs.ts
 var RESERVED_RAW_CONTENT_TOP_LEVEL_NAMES = [
   "_app",
@@ -27352,7 +27427,7 @@ function findSystemComponent(componentId) {
 // ../../packages/sdk-ts/package.json
 var package_default = {
   name: "@warmhub/sdk-ts",
-  version: "0.66.0",
+  version: "0.67.0",
   private: false,
   type: "module",
   description: "The TypeScript SDK for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -27460,16 +27535,38 @@ function shapeDefinitionPreflightError(name, data, verb) {
 }
 
 // ../../packages/sdk-ts/src/collection-operation-normalize.ts
-var collectionTypes2 = new Set([
-  "pair",
-  "triple",
-  "set",
-  "list"
-]);
+var collectionTypes2 = new Set(["pair", "set", "list"]);
 function normalizeBackendCollectionAdd(operation, source) {
-  const diagnostics = preflightOpDiagnostics2({
+  const normalized = normalizeCollectionWrite(operation, source, "add");
+  return {
     operation: "add",
     kind: "collection",
+    name: normalized.name,
+    type: normalized.type,
+    members: normalized.members,
+    ...operation.skipExisting === true ? { skipExisting: true } : {}
+  };
+}
+function normalizeBackendCollectionRevise(operation, source) {
+  const normalized = normalizeCollectionWrite(operation, source, "revise");
+  if (!normalized.name) {
+    throw new Error(`${source}: collection revise requires a target name`);
+  }
+  return {
+    operation: "revise",
+    kind: "collection",
+    name: normalized.name,
+    type: normalized.type,
+    members: normalized.members,
+    ...typeof operation.expectedVersion === "number" ? { expectedVersion: operation.expectedVersion } : {},
+    ...typeof operation.leaseId === "string" && operation.leaseId.length > 0 ? { leaseId: operation.leaseId } : {}
+  };
+}
+function normalizeCollectionWrite(operation, source, writeOperation) {
+  const diagnostics = preflightOpDiagnostics2({
+    operation: writeOperation,
+    kind: "collection",
+    name: typeof operation.name === "string" ? operation.name : undefined,
     type: typeof operation.type === "string" ? operation.type : undefined,
     members: Array.isArray(operation.members) ? operation.members : undefined
   }, 0);
@@ -27478,29 +27575,32 @@ function normalizeBackendCollectionAdd(operation, source) {
   }
   const type = normalizeCollectionType(operation.type);
   if (!type) {
-    throw new Error(`${source}: collection add requires 'type' to be one of: pair, triple, set, list`);
+    throw new Error(`${source}: collection ${writeOperation} requires 'type' to be one of: pair, set, list`);
   }
   if (!Array.isArray(operation.members)) {
-    throw new Error(`${source}: collection add requires a 'members' array`);
+    throw new Error(`${source}: collection ${writeOperation} requires a 'members' array`);
   }
   const name = normalizeOptionalName(operation.name);
-  if (operation.name !== undefined && !name) {
-    throw new Error(`${source}: collection add name must be a non-empty string when provided`);
+  if (!name) {
+    throw new Error(`${source}: collection ${writeOperation} name must be a non-empty string`);
   }
-  assertNoUnsupportedCollectionAddFields(operation, source);
+  assertNoUnsupportedCollectionFields(operation, source, writeOperation);
   return {
-    operation: "add",
-    kind: "collection",
-    ...name ? { name } : {},
+    name,
     type,
-    members: operation.members,
-    ...operation.skipExisting === true ? { skipExisting: true } : {}
+    members: operation.members
   };
 }
-function assertNoUnsupportedCollectionAddFields(operation, source) {
-  const unsupportedFields = ["about", "aboutWref", "shapeWref", "data"].filter((field) => operation[field] !== undefined);
+function assertNoUnsupportedCollectionFields(operation, source, writeOperation) {
+  const unsupportedFields = [
+    "about",
+    "aboutWref",
+    "shapeWref",
+    "data",
+    ...writeOperation === "revise" ? ["skipExisting"] : []
+  ].filter((field) => operation[field] !== undefined);
   if (unsupportedFields.length > 0) {
-    throw new Error(`${source}: collection add does not support ${unsupportedFields.map((field) => `'${field}'`).join(", ")}`);
+    throw new Error(`${source}: collection ${writeOperation} does not support ${unsupportedFields.map((field) => `'${field}'`).join(", ")}`);
   }
 }
 function normalizeCollectionType(value) {
@@ -27550,12 +27650,12 @@ function toBackendStreamOperation(operation) {
     if (Object.hasOwn(operation, "active")) {
       throw new Error(`${kind2} revise operation no longer supports 'active' — use retract('${name}') instead`);
     }
+    if (kind2 === "collection") {
+      return normalizeBackendCollectionRevise(operation, "commit.apply");
+    }
     if (operation.data === undefined) {
       throw new Error(`${kind2} revise operation requires 'data'`);
     }
-    if (kind2 === "collection") {
-      throw new Error(`collection revise is no longer supported — use retract('${name}') instead`);
-    }
     if (kind2 === "assertion") {
       return {
         operation: "revise",
@@ -27590,6 +27690,9 @@ function toBackendStreamOperation(operation) {
     if (!("about" in operation) || operation.about === undefined) {
       throw new Error("assertion add operation requires 'about'");
     }
+    if (typeof operation.about !== "string") {
+      throw new Error(COLLECTION_ABOUT_REMOVED_MESSAGE);
+    }
     if (operation.data === undefined) {
       throw new Error("assertion add operation requires 'data'");
     }
@@ -27782,34 +27885,14 @@ function computeBackoffDelayMs(attempt, policy) {
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-var TOKEN_REF_REGEX = /[$#]\d+/;
-function stringHasTokenRef(value) {
-  return typeof value === "string" && TOKEN_REF_REGEX.test(value);
-}
-function structuralValueHasTokenRef(value, seen = new WeakSet) {
-  if (stringHasTokenRef(value))
-    return true;
-  if (value !== null && typeof value === "object") {
-    if (seen.has(value))
-      return false;
-    seen.add(value);
-    if (Array.isArray(value)) {
-      return value.some((entry) => structuralValueHasTokenRef(entry, seen));
-    }
-    return Object.values(value).some((entry) => structuralValueHasTokenRef(entry, seen));
-  }
-  return false;
-}
-function opUsesTokens(op) {
-  return stringHasTokenRef(op.name) || stringHasTokenRef(op.wref) || structuralValueHasTokenRef(op.about) || stringHasTokenRef(op.aboutWref) || structuralValueHasTokenRef(op.members) || structuralValueHasTokenRef(op.data);
-}
 
 // ../../packages/sdk-ts/src/stream-submit-submit.ts
 class StreamValidationError extends Error {
-  code = "VALIDATION_ERROR";
+  code;
   status = 400;
-  constructor(message) {
+  constructor(message, code = "VALIDATION_ERROR") {
     super(message);
+    this.code = code;
     this.name = "WarmHubError";
   }
 }
@@ -27830,6 +27913,7 @@ async function submitOperationsViaStream(client, args) {
     }
     return streamOperation;
   });
+  validateNormalizedOperations(operations);
   const chunkSize = normalizeChunkSize(args.chunkSize);
   let streamId = args.streamId ?? createStreamId();
   const policy = args.streamId !== undefined ? false : resolveRetryPolicy(args.retry);
@@ -27841,7 +27925,6 @@ async function submitOperationsViaStream(client, args) {
     let attempt = 1;
     let priorAttemptAmbiguous = false;
     const chunkIsAtomic = chunk.length === 1;
-    const chunkUsesTokens = chunk.some(opUsesTokens);
     while (true) {
       try {
         const appendResult = await client.stream.append({
@@ -27864,7 +27947,7 @@ async function submitOperationsViaStream(client, args) {
         if (chunkResults.length === 0 && !priorAttemptAmbiguous && isDefiniteClientError(cause)) {
           throw cause;
         }
-        if (chunkResults.length === 0 && chunkIsAtomic && !chunkUsesTokens && policy !== false && attempt < policy.maxAttempts && isTransientStreamFailure(cause)) {
+        if (chunkResults.length === 0 && chunkIsAtomic && policy !== false && attempt < policy.maxAttempts && isTransientStreamFailure(cause)) {
           await sleep2(computeBackoffDelayMs(attempt, policy));
           attempt += 1;
           priorAttemptAmbiguous = true;
@@ -27898,6 +27981,16 @@ async function submitOperationsViaStream(client, args) {
   }
   return result;
 }
+function validateNormalizedOperations(operations) {
+  const diagnostics = preflightCommitDiagnostics2(operations).filter((diagnostic) => !isServerAuthoritativeSequenceDiagnostic(diagnostic));
+  const firstDiagnostic = diagnostics[0];
+  if (!firstDiagnostic)
+    return;
+  throw new StreamValidationError(`Invalid operation at index ${firstDiagnostic.operationIndex}: ${firstDiagnostic.message}`, firstDiagnostic.code);
+}
+function isServerAuthoritativeSequenceDiagnostic(diagnostic) {
+  return diagnostic.code === "ILLEGAL_OP_SEQUENCE" && diagnostic.message.includes("Cannot revise then add ");
+}
 function isAllSubmittedOperationsFailed(result, submittedOperationCount) {
   if (submittedOperationCount <= 0) {
     return false;
@@ -28098,6 +28191,35 @@ function sanitizeSubscriptionUpdateInput(input) {
   } = input;
   return supported;
 }
+function hasCollectionQuerySource(source) {
+  return !!source && (!!source.shape || !!source.kind || !!source.about || !!source.match || !!source.componentRef || source.excludeComponents === true || (source.where?.length ?? 0) > 0);
+}
+function hasCollectionSelectorAnchor(source) {
+  return !!source && (!!source.shape || !!source.about || !!source.match || !!source.componentRef || (source.where?.length ?? 0) > 0);
+}
+function hasExplicitCollectionMembers(opts) {
+  const members = opts.members;
+  return Array.isArray(members) && members.length > 0;
+}
+function collectionTypeFromWref(wref) {
+  const local = wref.replace(/^wh:[^/]+\/[^/]+\//, "").replace(/@(?:HEAD|ALL|v\d+)$/, "");
+  const shape = local.split("/")[0]?.toLowerCase();
+  return shape === "pair" || shape === "set" || shape === "list" ? shape : undefined;
+}
+function assertSelectorBackedCollectionType(type, opts) {
+  if (hasCollectionQuerySource(opts.query) && !hasCollectionSelectorAnchor(opts.query)) {
+    throw new WarmHubError("VALIDATION_ERROR", "Selector-backed collection sources require shape, about, match, componentRef, or where; kind and excludeComponents only narrow an existing selector.");
+  }
+  if (opts.sourceRepo && !hasCollectionSelectorAnchor(opts.query)) {
+    throw new WarmHubError("VALIDATION_ERROR", "sourceRepo requires a selector-backed collection query");
+  }
+  if (opts.sourceRepo && hasExplicitCollectionMembers(opts)) {
+    throw new WarmHubError("VALIDATION_ERROR", "sourceRepo cannot be combined with explicit members; use canonical wh:org/repo/... member wrefs or omit sourceRepo.");
+  }
+  if (hasCollectionQuerySource(opts.query) && type !== "set") {
+    throw new WarmHubError("VALIDATION_ERROR", "Selector-backed collection sources are only supported for set collections");
+  }
+}
 function trpcClientCodeToWarmHubCode(code) {
   switch (code) {
     case "BAD_REQUEST":
@@ -29319,6 +29441,144 @@ class WarmHubClient {
       }
     }
   };
+  collection = {
+    create: async (orgName, repoName, opts) => {
+      try {
+        assertSelectorBackedCollectionType(opts.type, opts);
+        return await this.trpc.collection.create.mutate({
+          orgName,
+          repoName,
+          type: opts.type,
+          name: opts.name,
+          members: opts.members,
+          from: opts.from,
+          add: opts.add,
+          remove: opts.remove,
+          replaceMembers: opts.replaceMembers,
+          query: opts.query,
+          sourceOrgName: opts.sourceRepo?.orgName,
+          sourceRepoName: opts.sourceRepo?.repoName,
+          skipExisting: opts.skipExisting,
+          message: opts.message,
+          committer: opts.committer
+        });
+      } catch (error) {
+        throw toWarmHubError(error);
+      }
+    },
+    members: async (orgName, repoName, wref, opts) => {
+      try {
+        return await this.trpc.collection.members.query({
+          orgName,
+          repoName,
+          wref,
+          version: opts?.version,
+          limit: opts?.limit,
+          cursor: opts?.cursor
+        });
+      } catch (error) {
+        throw toWarmHubError(error);
+      }
+    },
+    membersIter: (orgName, repoName, wref, opts) => {
+      let snapshotVersion = opts?.version;
+      return paginate(async (cursor) => {
+        const page = await this.collection.members(orgName, repoName, wref, {
+          ...opts,
+          version: snapshotVersion,
+          cursor
+        });
+        snapshotVersion ??= page.version;
+        return page;
+      }, (page) => page.items, opts?.cursor);
+    },
+    membersAll: async (orgName, repoName, wref, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      let snapshotVersion = pageOpts.version;
+      return await collectPaginatedPages(async (cursor) => {
+        const page = await this.collection.members(orgName, repoName, wref, {
+          ...pageOpts,
+          version: snapshotVersion,
+          cursor
+        });
+        snapshotVersion ??= page.version;
+        return page;
+      }, (page) => page.items, max, pageOpts.cursor);
+    },
+    contains: async (orgName, repoName, wref, members, opts) => {
+      try {
+        return await this.trpc.collection.contains.query({
+          orgName,
+          repoName,
+          wref,
+          version: opts?.version,
+          members,
+          position: opts?.position
+        });
+      } catch (error) {
+        throw toWarmHubError(error);
+      }
+    },
+    diff: async (orgName, repoName, leftWref, rightWref, opts) => {
+      try {
+        return await this.trpc.collection.diff.query({
+          orgName,
+          repoName,
+          leftWref,
+          rightWref,
+          leftVersion: opts?.leftVersion,
+          rightVersion: opts?.rightVersion,
+          mode: opts?.mode
+        });
+      } catch (error) {
+        throw toWarmHubError(error);
+      }
+    },
+    revise: async (orgName, repoName, wref, opts) => {
+      try {
+        const targetType = collectionTypeFromWref(wref);
+        if (hasCollectionQuerySource(opts.query) && !hasCollectionSelectorAnchor(opts.query)) {
+          throw new WarmHubError("VALIDATION_ERROR", "Selector-backed collection sources require shape, about, match, componentRef, or where; kind and excludeComponents only narrow an existing selector.");
+        }
+        if (opts.sourceRepo && !hasCollectionSelectorAnchor(opts.query)) {
+          throw new WarmHubError("VALIDATION_ERROR", "sourceRepo requires a selector-backed collection query");
+        }
+        if (opts.sourceRepo && hasExplicitCollectionMembers(opts)) {
+          throw new WarmHubError("VALIDATION_ERROR", "sourceRepo cannot be combined with explicit members; use canonical wh:org/repo/... member wrefs or omit sourceRepo.");
+        }
+        if (hasCollectionQuerySource(opts.query) && targetType && targetType !== "set") {
+          throw new WarmHubError("VALIDATION_ERROR", "Selector-backed revise requires a Set/<name> target wref");
+        }
+        return await this.trpc.collection.revise.mutate({
+          orgName,
+          repoName,
+          wref,
+          members: opts.members,
+          add: opts.add,
+          remove: opts.remove,
+          query: opts.query,
+          sourceOrgName: opts.sourceRepo?.orgName,
+          sourceRepoName: opts.sourceRepo?.repoName,
+          message: opts.message,
+          committer: opts.committer
+        });
+      } catch (error) {
+        throw toWarmHubError(error);
+      }
+    },
+    stats: async (orgName, repoName, wref, opts) => {
+      try {
+        return await this.trpc.collection.stats.query({
+          orgName,
+          repoName,
+          wref,
+          version: opts?.version
+        });
+      } catch (error) {
+        throw toWarmHubError(error);
+      }
+    }
+  };
   thing = {
     head: async (orgName, repoName, opts) => {
       try {
@@ -29356,7 +29616,8 @@ class WarmHubClient {
           repoName,
           wref,
           version,
-          includeRetracted: opts?.includeRetracted
+          includeRetracted: opts?.includeRetracted,
+          dataMode: opts?.dataMode
         });
       } catch (error) {
         throw toWarmHubError(error);
@@ -29417,7 +29678,8 @@ class WarmHubClient {
             repoName,
             wrefs: chunkWrefs,
             version,
-            includeRetracted: opts?.includeRetracted
+            includeRetracted: opts?.includeRetracted,
+            dataMode: opts?.dataMode
           });
         };
         if (wrefs.length <= chunkSize) {
@@ -32882,7 +33144,7 @@ function emitPartialPageHint(ctx, count, _nextCursor, _limit) {
 }
 
 // ../../packages/warmhub-cli/src/domains/assertion/shared.ts
-var COLLECTION_TAGS = ["pair", "triple", "set", "list"];
+var COLLECTION_TAGS = ["pair", "set", "list"];
 function parseAbout(raw) {
   const colonIdx = raw.indexOf(":");
   if (colonIdx === -1) {
@@ -32892,32 +33154,7 @@ function parseAbout(raw) {
   if (!COLLECTION_TAGS.includes(tag)) {
     return raw;
   }
-  const membersStr = raw.slice(colonIdx + 1);
-  const members = membersStr.split(",").map((m) => m.trim()).filter(Boolean);
-  switch (tag) {
-    case "pair":
-      if (members.length !== 2) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", `pair requires exactly 2 members, got ${members.length}`, undefined, "Example: --about pair:Location/a,Location/b");
-      }
-      return { pair: members };
-    case "triple":
-      if (members.length !== 3) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", `triple requires exactly 3 members, got ${members.length}`, undefined, "Example: --about triple:Location/a,Location/b,Location/c");
-      }
-      return { triple: members };
-    case "set":
-      if (members.length === 0) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", "set requires at least 1 member", undefined, "Example: --about set:Location/a,Location/b");
-      }
-      return { set: members };
-    case "list":
-      if (members.length === 0) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", "list requires at least 1 member", undefined, "Example: --about list:Location/a,Location/b");
-      }
-      return { list: members };
-    default:
-      return raw;
-  }
+  throw new CliError(2 /* UserInput */, "USER_INPUT", COLLECTION_ABOUT_REMOVED_MESSAGE, undefined, "Use wh commit submit --file with a named collection add followed by an assertion add.");
 }
 function renderAbout(out, c, result) {
   const target = result.target;
@@ -33015,7 +33252,7 @@ var createFlags = {
   name: flag.string({ description: "Assertion name" }),
   shape: flag.string({ description: "Shape for assertion (required)" }),
   data: flag.string({ description: "Data payload (JSON)" }),
-  about: flag.string({ description: "Target wref or collection (pair:a,b)" }),
+  about: flag.string({ description: "Target wref" }),
   message: flag.string({ short: "m", description: "Commit message" }),
   committer: flag.string({
     description: "Committer thing wref (e.g. Agent/bot-1)"
@@ -33374,6 +33611,9 @@ function renderThing(out, c, result) {
       out(`  ${c.dim}revisedOn:${c.reset}  ${formatTime(meta.revisedOn, now)}`);
     }
   }
+  if (result.collection) {
+    renderCollectionSummary(out, c, result.collection);
+  }
   const fields = shapeName && result.data ? collectionFields(shapeName, result.data) : null;
   if (fields) {
     for (const field of fields) {
@@ -33396,6 +33636,21 @@ function renderThing(out, c, result) {
     }
   }
 }
+function renderCollectionSummary(out, c, collection) {
+  out(`  ${c.dim}collection:${c.reset} ${collection.type}`);
+  out(`  ${c.dim}members:${c.reset}    ${collection.memberCount}`);
+  if (collection.fullData)
+    return;
+  const limit = collection.inlineLimit ? ` > ${collection.inlineLimit}` : " above inline limit";
+  out(`  ${c.dim}data:${c.reset}       elided (${collection.memberCount}${limit}; use --data-mode full)`);
+  const preview = collection.preview ?? [];
+  if (preview.length === 0)
+    return;
+  out(`  ${c.dim}preview:${c.reset}`);
+  for (const wref of preview) {
+    out(`    ${pinnedWref(c, wref)}`);
+  }
+}
 function renderDataBlock(out, data, indent) {
   const lines = JSON.stringify(data, null, 2).split(`
 `);
@@ -33587,7 +33842,7 @@ var historyFlags = {
     description: "Allow retracted shape/about targets to resolve"
   }),
   "resolve-collections": flag.boolean({
-    description: "Include assertions about collections (Pair/Triple/Set/List) containing the target. Only applies with --about."
+    description: "Include assertions about collections (Pair/Set/List) containing the target. Only applies with --about."
   })
 };
 var handleHistory = async (ctx, { flags, args }) => {
@@ -33978,7 +34233,7 @@ var queryFlags = {
     description: "Include retracted things"
   }),
   "resolve-collections": flag.boolean({
-    description: "Include assertions about collections (Pair/Triple/Set/List) containing the target. Only applies with --about."
+    description: "Include assertions about collections (Pair/Set/List) containing the target. Only applies with --about."
   }),
   component: flag.string({
     description: "Filter to things owned by this component (Org/Name ref)"
@@ -34391,7 +34646,7 @@ var searchFlags = {
     description: "Include retracted things"
   }),
   "resolve-collections": flag.boolean({
-    description: "Include assertions about collections (Pair/Triple/Set/List) containing the target. Only applies with --about."
+    description: "Include assertions about collections (Pair/Set/List) containing the target. Only applies with --about."
   }),
   limit: flag.number({ description: "Max results (default: 25, max: 500)" }),
   cursor: flag.string({ description: "Opaque pagination cursor (text mode)" }),
@@ -34554,6 +34809,9 @@ var viewFlags = {
   }),
   file: flag.string({
     description: "Read additional wrefs from <path>, one per line. Use `--file=-` for stdin (the `=` form is required) or pass bare `-` as a positional. Lines starting with '#' and blank lines are ignored; lines are not split on any other character."
+  }),
+  "data-mode": flag.string({
+    description: "Collection data mode: auto (default) or full. Use full to force large collection bodies into thing view output."
   })
 };
 var MAX_GET_MANY_WREFS = 500;
@@ -34568,6 +34826,13 @@ async function readStreamUtf8(input) {
 function parseLineList(text) {
   return text.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#"));
 }
+function validateDataMode(value) {
+  if (value === undefined)
+    return;
+  if (value === "auto" || value === "full")
+    return value;
+  usageError("--data-mode must be auto or full", "wh thing view Set/wake-voters --data-mode full");
+}
 async function collectWrefs(opts) {
   const dashPositional = opts.positionals.includes("-");
   const cleanPositionals = opts.positionals.filter((a) => a !== "-");
@@ -34606,12 +34871,16 @@ async function runSingleView(ctx, wref, flags) {
   const depth = flags.depth;
   const { org, repo } = looksLikeDurableId(wref) && depth === undefined ? parseOrgRepoOptional(getRepoRef(ctx), ctx.config) : parseOrgRepo(getRepoRef(ctx), ctx.config);
   const includeRetracted = flags["include-retracted"] || version !== undefined;
+  const dataMode = validateDataMode(flags["data-mode"]);
   if (depth !== undefined && (depth < 1 || depth > 5)) {
     usageError("Usage: wh thing view <wref> --depth <1-5>", "wh thing view Game/base --depth 2");
   }
   if (depth !== undefined && ctx.liveMode) {
     usageError("--depth is not supported with --live", "wh thing view Game/base --depth 2");
   }
+  if (depth !== undefined && dataMode !== undefined) {
+    usageError("--data-mode cannot be combined with --depth on `view` (graph reads use a separate payload shape).", "wh thing view Set/wake-voters --data-mode full");
+  }
   if (depth !== undefined && (flags["include-retracted"] || version !== undefined)) {
     usageError("--depth cannot be combined with --include-retracted or --version on `view` (graph reads are active-only). Use `wh thing graph` for version-pinned graph reads.", "wh thing view Game/base --depth 2");
   }
@@ -34619,7 +34888,8 @@ async function runSingleView(ctx, wref, flags) {
     await runLive({
       apiUrl: ctx.config.apiUrl,
       poll: (c) => c.thing.get(org, repo, wref, version, {
-        includeRetracted
+        includeRetracted,
+        dataMode
       }),
       render: (r) => renderThing(ctx.out, ctx.colors, r),
       out: ctx.out,
@@ -34644,7 +34914,8 @@ async function runSingleView(ctx, wref, flags) {
     return;
   }
   const result = await ctx.client.thing.get(org, repo, wref, version, {
-    includeRetracted
+    includeRetracted,
+    dataMode
   });
   writeOutput(ctx, result, () => renderThing(ctx.out, ctx.colors, result));
 }
@@ -34652,7 +34923,8 @@ async function runBatchView(ctx, wrefs, flags) {
   const allDurable = wrefs.length > 0 && wrefs.every(looksLikeDurableId);
   const { org, repo } = allDurable ? parseOrgRepoOptional(getRepoRef(ctx), ctx.config) : parseOrgRepo(getRepoRef(ctx), ctx.config);
   const includeRetracted = flags["include-retracted"] || flags.version !== undefined;
-  const result = await ctx.client.thing.getMany(org, repo, wrefs, flags.version, { includeRetracted });
+  const dataMode = validateDataMode(flags["data-mode"]);
+  const result = await ctx.client.thing.getMany(org, repo, wrefs, flags.version, { includeRetracted, dataMode });
   if (ctx.format === "jsonl") {
     for (const event of walkBatchResult(wrefs, result, flags.version)) {
       if (event.kind === "miss") {
@@ -34995,7 +35267,9 @@ var handleHistory2 = async (ctx, { flags, args }) => {
   writePageOutput(ctx, result.versions, { limit, nextCursor: result.nextCursor ?? null }, () => renderHistory(ctx.out, ctx.colors, result));
 };
 var listFlags = {
-  about: flag.string({ description: "Target thing wref (required)" }),
+  about: flag.string({
+    description: "Target wref (thing or shape, required)"
+  }),
   shape: flag.string({ description: "Filter by shape" }),
   depth: flag.number({ description: "Assertion depth" }),
   limit: flag.number({
@@ -35006,7 +35280,7 @@ var listFlags = {
   count: flag.boolean({ description: "Return count of matching assertions" }),
   match: flag.string({ description: "Filter by wref glob pattern" }),
   "resolve-collections": flag.boolean({
-    description: "Include assertions about collections (Pair/Triple/Set/List) containing the target."
+    description: "Include assertions about collections (Pair/Set/List) containing the target."
   }),
   "include-retracted": flag.boolean({
     description: "Include retracted assertions"
@@ -35189,7 +35463,7 @@ var ASSERTION_DOMAIN = defineDomain({
       flags: createFlags,
       examples: [
         `wh assertion create --shape belief --about player --data '{"confidence":0.8}'`,
-        `wh assertion create --shape Distance --about pair:Location/a,Location/b --data '{"value":5}'`
+        `wh assertion create --shape Distance --about Pair/location-distance --data '{"value":5}'`
       ],
       handler: handleCreate
     },
@@ -36580,6 +36854,693 @@ var CHANNEL_DOMAIN = defineDomain({
   handler: handleChannel
 });
 
+// ../../packages/warmhub-cli/src/domains/collection-helpers.ts
+import { readFileSync as readFileSync6 } from "node:fs";
+function parseMemberList(values) {
+  return (values ?? []).flatMap((value) => value.split(",")).map((value) => value.trim()).filter(Boolean);
+}
+async function readMembersFromSources(ctx, opts) {
+  const field = opts.wrefField ?? "wref";
+  const members = [
+    ...opts.positionals ?? [],
+    ...parseMemberList(opts.members)
+  ];
+  const fileIsStdin = opts.file === "-";
+  if ((opts.stdin || fileIsStdin) && isTTY(ctx.stdin ?? process.stdin)) {
+    throw new CliError(2 /* UserInput */, "USER_INPUT", "Stdin requested but stdin is a terminal. Pipe input or remove the stdin flag.", undefined, "Example: wh collection create --type set --name audited --stdin");
+  }
+  if (opts.file && !fileIsStdin) {
+    let raw;
+    try {
+      raw = readFileSync6(opts.file, "utf8");
+    } catch (error) {
+      const code = error.code;
+      throw new CliError(2 /* UserInput */, "USER_INPUT", `Cannot read ${opts.file}${code ? ` (${code})` : ""}.`, error, "Check the path or use --file - to read collection members from stdin.");
+    }
+    members.push(...parseMembersPayload(raw, opts.label ?? "--file", field));
+  }
+  if (opts.stdin || fileIsStdin) {
+    const raw = await readStreamUtf82(ctx.stdin ?? process.stdin);
+    members.push(...parseMembersPayload(raw, opts.label ?? "stdin", field));
+  }
+  return members;
+}
+function hasCollectionQuerySource2(source) {
+  return !!source.shape || !!source.kind || !!source.about || !!source.match || !!source.componentRef || source.excludeComponents === true || (source.where?.length ?? 0) > 0;
+}
+function hasCollectionSelectorAnchor2(source) {
+  return !!source.shape || !!source.about || !!source.match || !!source.componentRef || (source.where?.length ?? 0) > 0;
+}
+function requireMembers(members, example) {
+  if (members.length === 0) {
+    usageError("At least one collection member is required", example);
+  }
+}
+function renderMutation(ctx, result) {
+  const c = ctx.colors;
+  const action = result.status === "noop" ? "=" : "+";
+  const color = result.status === "noop" ? c.dim : c.green;
+  ctx.out(`${color}${action}${c.reset} ${displayName(c, result.wref)} ${c.dim}${result.type} ${result.memberCount} members${c.reset}`);
+}
+function renderMembers(ctx, result) {
+  const c = ctx.colors;
+  if (result.items.length === 0) {
+    ctx.out(`${c.dim}No members${c.reset}`);
+    return;
+  }
+  for (const item of result.items) {
+    const position = item.position ?? 0;
+    ctx.out(`${String(position).padStart(4, " ")}  ${pinnedWref(c, item.wref)}`);
+  }
+}
+function renderContains(ctx, result) {
+  const c = ctx.colors;
+  for (const item of result.results) {
+    const marker = item.contains ? ctx.chars.check : ctx.chars.cross;
+    const color = item.contains ? c.green : c.red;
+    const at = item.positions === undefined || item.positions.length === 0 ? "" : ` ${c.dim}@${item.positions.join(",")}${c.reset}`;
+    ctx.out(`${color}${marker}${c.reset} ${pinnedWref(c, item.member)}${at}`);
+  }
+}
+function renderDiff(ctx, result) {
+  const c = ctx.colors;
+  if (result.mode === "ordered") {
+    if (result.changed.length === 0) {
+      ctx.out(`${c.dim}No ordered differences${c.reset}`);
+      return;
+    }
+    for (const item of result.changed) {
+      const left = item.left?.wref ?? `${c.dim}(none)${c.reset}`;
+      const right = item.right?.wref ?? `${c.dim}(none)${c.reset}`;
+      ctx.out(`${String(item.position).padStart(4, " ")}  ${left} -> ${right}`);
+    }
+    return;
+  }
+  if (result.added.length === 0 && result.removed.length === 0) {
+    ctx.out(`${c.dim}No membership differences${c.reset}`);
+    return;
+  }
+  for (const member of result.added) {
+    ctx.out(`${c.green}+${c.reset} ${member.wref}`);
+  }
+  for (const member of result.removed) {
+    ctx.out(`${c.red}-${c.reset} ${member.wref}`);
+  }
+}
+function renderStats(ctx, result) {
+  const c = ctx.colors;
+  ctx.out(`${pinnedWref(c, result.wref)} ${c.dim}${result.type}${c.reset}`);
+  ctx.out(`members: ${result.memberCount}`);
+  ctx.out(`unique:  ${result.uniqueMemberCount}`);
+}
+function memberFromUnknown(value, field, label) {
+  if (typeof value === "string" && value.trim().length > 0) {
+    return value.trim();
+  }
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    const raw = value[field];
+    if (typeof raw === "string" && raw.trim().length > 0) {
+      return raw.trim();
+    }
+  }
+  throw new CliError(2 /* UserInput */, "USER_INPUT", `Invalid member entry in ${label}. Expected a string wref or an object with "${field}".`, undefined, `Use string wrefs or objects like {"${field}":"Shape/name"}.`);
+}
+function parseMembersPayload(raw, label, field = "wref") {
+  const trimmed = raw.trim();
+  if (!trimmed)
+    return [];
+  if (trimmed.startsWith("[")) {
+    const parsed = safeParseJson(trimmed, label);
+    if (!Array.isArray(parsed)) {
+      throw new CliError(2 /* UserInput */, "USER_INPUT", `Invalid ${label}. Expected a JSON array.`, undefined, `Use a JSON array of string wrefs or objects with "${field}".`);
+    }
+    return parsed.map((entry) => memberFromUnknown(entry, field, label));
+  }
+  if (trimmed.startsWith("{")) {
+    let objectParseError;
+    try {
+      const parsed = safeParseJson(trimmed, label);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && Array.isArray(parsed.members)) {
+        return parsed.members.map((entry) => memberFromUnknown(entry, field, label));
+      }
+      return [memberFromUnknown(parsed, field, label)];
+    } catch (error) {
+      objectParseError = error;
+    }
+    const lines = trimmed.split(/\r?\n/).filter((line) => line.trim());
+    if (lines.length > 1) {
+      return lines.map((line) => memberFromUnknown(safeParseJson(line, label), field, label));
+    }
+    throw objectParseError;
+  }
+  return trimmed.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#"));
+}
+async function readStreamUtf82(input) {
+  let data = "";
+  input.setEncoding?.("utf8");
+  for await (const chunk of input) {
+    data += typeof chunk === "string" ? chunk : chunk.toString("utf8");
+  }
+  return data;
+}
+
+// ../../packages/warmhub-cli/src/domains/collection.ts
+var COLLECTION_TYPES = ["pair", "set", "list"];
+var commonWriteFlags = {
+  message: flag.string({ short: "m", description: "Commit message" }),
+  committer: flag.string({
+    description: "Committer thing wref (e.g. Agent/bot-1)"
+  })
+};
+var collectionInputFlags = {
+  members: flag.string({
+    multiple: true,
+    description: "Collection member wrefs. May be repeated; comma-separated values are also accepted."
+  }),
+  file: flag.string({
+    description: "Read member wrefs from a file. Supports newline text, JSON array, JSON object with members, or JSONL. Use --file=- for stdin."
+  }),
+  stdin: flag.boolean({
+    description: "Read member wrefs from stdin. Supports newline text, JSON array, JSON object with members, or JSONL."
+  }),
+  "wref-field": flag.string({
+    description: "Object field to read when --file/--stdin contains JSON objects (default: wref)."
+  })
+};
+var collectionQueryFlags = {
+  shape: flag.string({ description: "Select set members by shape" }),
+  kind: flag.string({ description: "Select set members by kind" }),
+  about: flag.string({ description: "Select set members by about wref" }),
+  match: flag.string({
+    description: "Select set members by the same name pattern accepted by wh thing query --match"
+  }),
+  component: flag.string({
+    description: "Select set members owned by this component (Org/Name ref)"
+  }),
+  "exclude-components": flag.boolean({
+    description: "Exclude component-owned records from selector-backed sets"
+  }),
+  where: flag.string({
+    multiple: true,
+    description: `Select set members by field-value WHERE predicate (repeatable). Same syntax as wh thing query --where; in:[...] accepts at most ${MAX_WHERE_IN_VALUES} values.`
+  }),
+  "source-repo": flag.string({
+    description: "Read selector-backed set members from this source repo (org/repo). The collection is written to the target repo."
+  })
+};
+var collectionCreateFlags = {
+  type: flag.string({
+    description: "Collection type: pair, set, or list"
+  }),
+  name: flag.string({
+    description: "Collection local name. Collections are ordinary named things."
+  }),
+  "skip-existing": flag.boolean({
+    description: "No-op if a named collection already exists. Only valid with --name."
+  }),
+  from: flag.string({
+    description: "Initialize from an existing collection wref"
+  }),
+  add: flag.string({
+    multiple: true,
+    description: "With --from, member wrefs to add. May be repeated; comma-separated values are also accepted."
+  }),
+  remove: flag.string({
+    multiple: true,
+    description: "With --from, member wrefs to remove. May be repeated; comma-separated values are also accepted."
+  }),
+  "replace-file": flag.string({
+    description: "With --from, replace membership from a file. Supports newline text, JSON array, JSON object with members, or JSONL."
+  }),
+  "replace-stdin": flag.boolean({
+    description: "With --from, replace membership from stdin. Supports newline text, JSON array, JSON object with members, or JSONL."
+  }),
+  ...collectionInputFlags,
+  ...collectionQueryFlags,
+  ...commonWriteFlags
+};
+var collectionMembersFlags = {
+  limit: flag.number({
+    description: "Max members per page (default: 50, max: 500)"
+  }),
+  cursor: flag.string({ description: "Opaque pagination cursor" }),
+  all: flag.boolean({ description: "Fetch all pages" }),
+  version: flag.number({ description: "Specific version number" })
+};
+var collectionContainsFlags = {
+  position: flag.number({
+    description: "For list checks, require the member at this zero-based index"
+  }),
+  version: flag.number({
+    description: "Specific collection version number. Member inputs are still pinned before comparison; use pinned @vN members for historical membership checks."
+  }),
+  ...collectionInputFlags
+};
+var collectionDiffFlags = {
+  mode: flag.string({
+    description: "Diff mode: auto, membership, or ordered"
+  }),
+  "left-version": flag.number({
+    description: "Specific left collection version"
+  }),
+  "right-version": flag.number({
+    description: "Specific right collection version"
+  })
+};
+var collectionReviseFlags = {
+  add: flag.string({
+    multiple: true,
+    description: "For set collections, member wrefs to add. May be repeated; comma-separated values are also accepted."
+  }),
+  remove: flag.string({
+    multiple: true,
+    description: "For set collections, member wrefs to remove. May be repeated; comma-separated values are also accepted."
+  }),
+  ...collectionInputFlags,
+  ...collectionQueryFlags,
+  ...commonWriteFlags
+};
+var collectionStatsFlags = {
+  version: flag.number({ description: "Specific collection version number" })
+};
+function validateCollectionType(value) {
+  if (!value || !COLLECTION_TYPES.includes(value)) {
+    usageError("Usage: wh collection create --type <pair|set|list> --members <wref...>", 'wh collection create --type set --name audited --members Location/a,Location/b -m "audit snapshot"');
+  }
+  return value;
+}
+function validateDiffMode(value) {
+  if (value === undefined)
+    return;
+  if (value === "auto" || value === "membership" || value === "ordered") {
+    return value;
+  }
+  usageError("--mode must be one of: auto, membership, ordered", "wh collection diff Set/a Set/b --mode membership");
+}
+function collectionQuerySourceFromFlags(flags) {
+  const where = (flags.where ?? []).map(parseWhereFlag);
+  const kind = validateKind(flags.kind);
+  return {
+    ...flags.shape ? { shape: flags.shape } : {},
+    ...kind ? { kind } : {},
+    ...flags.about ? { about: flags.about } : {},
+    ...flags.match ? { match: flags.match } : {},
+    ...flags.component ? { componentRef: flags.component } : {},
+    ...flags["exclude-components"] ? { excludeComponents: flags["exclude-components"] } : {},
+    ...where.length > 0 ? { where } : {}
+  };
+}
+function parseSourceRepoFlag(value) {
+  if (!value)
+    return;
+  const parsed = splitRepoSlug(value);
+  if (!parsed) {
+    usageError("--source-repo must be an org/repo slug", "wh collection create --type set --name wake-voters --source-repo data/nc-voters --shape Voter --where county=Wake");
+  }
+  return { orgName: parsed.org, repoName: parsed.repo };
+}
+function requireQuerySourceForSourceRepo(sourceRepo, querySource, example) {
+  if (!sourceRepo || hasCollectionSelectorAnchor2(querySource))
+    return;
+  usageError("--source-repo requires a selector source", example);
+}
+function requireSelectorAnchorForQuerySource(querySource, example) {
+  if (!hasCollectionQuerySource2(querySource) || hasCollectionSelectorAnchor2(querySource)) {
+    return;
+  }
+  usageError("Selector-backed collection sources require shape, about, match, componentRef, or where; kind and exclude-components only narrow an existing selector.", example);
+}
+function requireSetForQuerySource(type, source, example) {
+  if (!hasCollectionQuerySource2(source) || type === "set")
+    return;
+  usageError("Selector-backed collection sources are only supported for set collections", example);
+}
+function normalizeCreateMembers(type, members) {
+  return type === "set" ? Array.from(new Set(members)) : members;
+}
+function hasDeferredMemberSource(flags) {
+  return !!flags.file || !!flags.stdin;
+}
+function isMissingCollectionMemberError(error) {
+  const candidate = error;
+  const code = candidate.code ?? candidate.kind;
+  return code === "VALIDATION_ERROR" && /requires (?:at least|exactly) \d+ member/.test(candidate.message ?? "");
+}
+function collectionTypeFromWref2(wref) {
+  const local = wref.replace(/^wh:[^/]+\/[^/]+\//, "").replace(/@(?:HEAD|ALL|v\d+)$/, "");
+  const shape = local.split("/")[0]?.toLowerCase();
+  return COLLECTION_TYPES.includes(shape) ? shape : undefined;
+}
+function parseCollectionReadRepo(ctx, wrefs) {
+  const allDurable = wrefs.length > 0 && wrefs.every(looksLikeDurableId);
+  return allDurable ? parseOrgRepoOptional(getRepoRef(ctx), ctx.config) : parseOrgRepo(getRepoRef(ctx), ctx.config);
+}
+var handleCollectionCreate = async (ctx, { flags, args }) => {
+  if (args.length > 0) {
+    usageError(`Unexpected argument: '${args[0]}'`, "Use --members for explicit collection members: wh collection create --type set --name audited --members Location/a,Location/b");
+  }
+  const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
+  const type = validateCollectionType(flags.type);
+  const querySource = collectionQuerySourceFromFlags(flags);
+  const sourceRepo = parseSourceRepoFlag(flags["source-repo"]);
+  const add = parseMemberList(flags.add);
+  const remove = parseMemberList(flags.remove);
+  requireQuerySourceForSourceRepo(sourceRepo, querySource, "wh collection create --type set --name wake-voters --source-repo data/nc-voters --shape Voter --where county=Wake");
+  requireSelectorAnchorForQuerySource(querySource, 'wh collection create --type set --name voters --match "Voter/*" -m "snapshot"');
+  requireSetForQuerySource(type, querySource, 'wh collection create --type set --name voters --match "Voter/*" -m "snapshot"');
+  if (flags.from && hasCollectionQuerySource2(querySource)) {
+    usageError("--from cannot be combined with selector flags", 'wh collection create --type set --name today --from Set/yesterday --add Location/c -m "delta"');
+  }
+  if (flags.from && sourceRepo) {
+    usageError("--from cannot be combined with --source-repo", 'wh collection create --type set --name today --from Set/yesterday --add Location/c -m "delta"');
+  }
+  if (flags.from && (flags.members || flags.file || flags.stdin)) {
+    usageError("--from cannot be combined with --members, --file, or --stdin; use --add/--remove for set deltas or --replace-file/--replace-stdin for full replacement", 'wh collection create --type set --name today --from Set/yesterday --add Location/c -m "delta"');
+  }
+  if ((flags["replace-file"] || flags["replace-stdin"]) && (add.length > 0 || remove.length > 0)) {
+    usageError("--replace-file/--replace-stdin cannot be combined with --add or --remove", 'wh collection create --type set --name today --from Set/yesterday --replace-file members.txt -m "snapshot copy"');
+  }
+  if (!flags.from && (add.length > 0 || remove.length > 0 || flags["replace-file"] || flags["replace-stdin"])) {
+    usageError("--add, --remove, --replace-file, and --replace-stdin require --from", 'wh collection create --type set --name today --from Set/yesterday --add Location/c -m "delta"');
+  }
+  if (!flags.name) {
+    usageError("Collection create requires --name", 'wh collection create --type set --name audited --members Location/a,Location/b -m "audit snapshot"');
+  }
+  if (flags["skip-existing"] && !flags.name) {
+    usageError("--skip-existing requires --name", "wh collection create --type set --name voters --members Voter/a --skip-existing");
+  }
+  const queryBacked = hasCollectionQuerySource2(querySource);
+  const replaceMembers = flags.from && (flags["replace-file"] || flags["replace-stdin"]) ? await readMembersFromSources(ctx, {
+    file: flags["replace-file"],
+    stdin: flags["replace-stdin"],
+    wrefField: flags["wref-field"],
+    label: "replacement members"
+  }) : undefined;
+  const inlineMembers = normalizeCreateMembers(type, parseMemberList(flags.members));
+  if (flags["skip-existing"] && flags.name && !queryBacked && inlineMembers.length === 0 && hasDeferredMemberSource(flags)) {
+    try {
+      const result2 = await ctx.client.collection.create(org, repo, {
+        type,
+        name: flags.name,
+        members: [],
+        skipExisting: true,
+        message: flags.message,
+        committer: flags.committer
+      });
+      writeOutput(ctx, result2, () => renderMutation(ctx, result2));
+      return;
+    } catch (error) {
+      if (!isMissingCollectionMemberError(error)) {
+        throw error;
+      }
+    }
+  }
+  const explicitMembers = await readMembersFromSources(ctx, {
+    members: flags.members,
+    file: flags.from ? undefined : flags.file,
+    stdin: flags.from ? undefined : flags.stdin,
+    wrefField: flags["wref-field"],
+    label: "collection members"
+  });
+  const members = normalizeCreateMembers(type, explicitMembers);
+  if (sourceRepo && members.length > 0) {
+    usageError("--source-repo cannot be combined with explicit members; use canonical wh:org/repo/... member wrefs or omit --source-repo.", "wh collection create --type set --name wake-voters --source-repo data/nc-voters --shape Voter --where county=Wake");
+  }
+  if (!queryBacked && !flags.from) {
+    requireMembers(members, 'wh collection create --type set --name audited --members Location/a,Location/b -m "audit snapshot"');
+  }
+  const result = queryBacked ? sourceRepo ? await ctx.client.collection.create(org, repo, {
+    type,
+    name: flags.name,
+    ...flags.from ? { from: flags.from } : {},
+    ...add.length > 0 ? { add } : {},
+    ...remove.length > 0 ? { remove } : {},
+    ...replaceMembers ? { replaceMembers } : {},
+    query: querySource,
+    sourceRepo,
+    skipExisting: flags["skip-existing"],
+    message: flags.message,
+    committer: flags.committer
+  }) : await ctx.client.collection.create(org, repo, {
+    type,
+    name: flags.name,
+    members,
+    ...flags.from ? { from: flags.from } : {},
+    ...add.length > 0 ? { add } : {},
+    ...remove.length > 0 ? { remove } : {},
+    ...replaceMembers ? { replaceMembers } : {},
+    query: querySource,
+    skipExisting: flags["skip-existing"],
+    message: flags.message,
+    committer: flags.committer
+  }) : await ctx.client.collection.create(org, repo, {
+    type,
+    name: flags.name,
+    members,
+    ...flags.from ? { from: flags.from } : {},
+    ...add.length > 0 ? { add } : {},
+    ...remove.length > 0 ? { remove } : {},
+    ...replaceMembers ? { replaceMembers } : {},
+    skipExisting: flags["skip-existing"],
+    message: flags.message,
+    committer: flags.committer
+  });
+  writeOutput(ctx, result, () => renderMutation(ctx, result));
+};
+var handleCollectionMembers = async (ctx, { flags, args }) => {
+  const wref = args[0];
+  if (!wref) {
+    usageError("Usage: wh collection members <wref> [--limit N] [--cursor TOKEN] [--all]", "wh collection members Set/audited --all");
+  }
+  if (flags.cursor && !flags.limit) {
+    usageError("Usage: wh collection members <wref> --limit N --cursor TOKEN", "wh collection members Set/audited --limit 50 --cursor <token>");
+  }
+  const { org, repo } = parseCollectionReadRepo(ctx, [wref]);
+  const boundedLimit = Math.min(flags.limit ?? DEFAULT_PAGE_LIMIT, MAX_PAGE_LIMIT);
+  const pageLimit = flags.all ? Math.min(flags.limit ?? AUTO_PAGE_LIMIT, MAX_PAGE_LIMIT) : boundedLimit;
+  if (flags.all) {
+    const items = [];
+    let cursor = flags.cursor;
+    let snapshotVersion = flags.version;
+    let firstPage;
+    while (true) {
+      const page = await ctx.client.collection.members(org, repo, wref, {
+        version: snapshotVersion,
+        limit: pageLimit,
+        cursor
+      });
+      firstPage ??= {
+        type: page.type,
+        wref: page.wref,
+        version: page.version
+      };
+      items.push(...page.items);
+      snapshotVersion ??= page.version;
+      if (!page.nextCursor)
+        break;
+      cursor = page.nextCursor;
+    }
+    writeCollectionMembersOutput(ctx, {
+      type: firstPage?.type ?? "set",
+      wref: firstPage?.wref ?? wref,
+      version: snapshotVersion ?? firstPage?.version ?? flags.version ?? 1,
+      items,
+      nextCursor: undefined
+    }, { limit: pageLimit, nextCursor: null });
+    return;
+  }
+  const result = await ctx.client.collection.members(org, repo, wref, {
+    version: flags.version,
+    limit: boundedLimit,
+    cursor: flags.cursor
+  });
+  if (result.nextCursor) {
+    emitPartialPageHint(ctx, result.items.length, result.nextCursor, boundedLimit);
+  }
+  writeCollectionMembersOutput(ctx, result, {
+    limit: boundedLimit,
+    nextCursor: result.nextCursor ?? null
+  });
+};
+function writeCollectionMembersOutput(ctx, result, page) {
+  if (ctx.format === "json") {
+    const envelope = pageEnvelope(result.items, page);
+    printJson(ctx.out, {
+      type: result.type,
+      wref: result.wref,
+      version: result.version,
+      items: result.items,
+      page: envelope.page
+    });
+    return;
+  }
+  if (ctx.format === "jsonl") {
+    printJsonl(ctx.out, result.items);
+    return;
+  }
+  renderMembers(ctx, result);
+}
+var handleCollectionContains = async (ctx, { flags, args }) => {
+  const wref = args[0];
+  if (!wref) {
+    usageError("Usage: wh collection contains <wref> <member...>", "wh collection contains Set/audited Location/a Location/b");
+  }
+  const members = await readMembersFromSources(ctx, {
+    positionals: args.slice(1),
+    members: flags.members,
+    file: flags.file,
+    stdin: flags.stdin,
+    wrefField: flags["wref-field"],
+    label: "collection contains members"
+  });
+  requireMembers(members, "wh collection contains Set/audited Location/a Location/b");
+  const { org, repo } = parseCollectionReadRepo(ctx, [wref]);
+  const result = await ctx.client.collection.contains(org, repo, wref, members, {
+    version: flags.version,
+    position: flags.position
+  });
+  writeOutput(ctx, result, () => renderContains(ctx, result));
+};
+var handleCollectionDiff = async (ctx, { flags, args }) => {
+  const [leftWref, rightWref] = args;
+  if (!leftWref || !rightWref) {
+    usageError("Usage: wh collection diff <left-wref> <right-wref> [--mode auto|membership|ordered]", "wh collection diff Set/yesterday Set/today --mode membership");
+  }
+  const { org, repo } = parseCollectionReadRepo(ctx, [leftWref, rightWref]);
+  const result = await ctx.client.collection.diff(org, repo, leftWref, rightWref, {
+    leftVersion: flags["left-version"],
+    rightVersion: flags["right-version"],
+    mode: validateDiffMode(flags.mode)
+  });
+  writeOutput(ctx, result, () => renderDiff(ctx, result));
+};
+var handleCollectionRevise = async (ctx, { flags, args }) => {
+  const wref = args[0];
+  if (!wref) {
+    usageError('Usage: wh collection revise <named-wref> --file members.txt -m "message"', 'wh collection revise Set/audited --file members.txt -m "refresh audit set"');
+  }
+  const add = parseMemberList(flags.add);
+  const remove = parseMemberList(flags.remove);
+  if ((add.length > 0 || remove.length > 0) && (flags.members || flags.file || flags.stdin)) {
+    usageError("--add/--remove cannot be combined with replacement members or selector flags", 'wh collection revise Set/audited --add Location/c --remove Location/a -m "delta"');
+  }
+  const members = await readMembersFromSources(ctx, {
+    members: flags.members,
+    file: add.length > 0 || remove.length > 0 ? undefined : flags.file,
+    stdin: add.length > 0 || remove.length > 0 ? undefined : flags.stdin,
+    wrefField: flags["wref-field"],
+    label: "replacement members"
+  });
+  const querySource = collectionQuerySourceFromFlags(flags);
+  const sourceRepo = parseSourceRepoFlag(flags["source-repo"]);
+  requireQuerySourceForSourceRepo(sourceRepo, querySource, 'wh collection revise Set/audited --source-repo data/nc-voters --shape Voter -m "refresh audit set"');
+  requireSelectorAnchorForQuerySource(querySource, 'wh collection revise Set/audited --match "Location/*" -m "refresh audit set"');
+  if (sourceRepo && members.length > 0) {
+    usageError("--source-repo cannot be combined with explicit members; use canonical wh:org/repo/... member wrefs or omit --source-repo.", 'wh collection revise Set/audited --source-repo data/nc-voters --shape Voter -m "refresh audit set"');
+  }
+  if ((add.length > 0 || remove.length > 0) && (members.length > 0 || hasCollectionQuerySource2(querySource))) {
+    usageError("--add/--remove cannot be combined with replacement members or selector flags", 'wh collection revise Set/audited --add Location/c --remove Location/a -m "delta"');
+  }
+  const targetType = collectionTypeFromWref2(wref);
+  if (hasCollectionQuerySource2(querySource) && targetType && targetType !== "set") {
+    usageError("Selector-backed revise requires a Set/<name> target wref", 'wh collection revise Set/audited --match "Location/*" -m "refresh audit set"');
+  }
+  const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
+  const queryBacked = hasCollectionQuerySource2(querySource);
+  if (!queryBacked && add.length === 0 && remove.length === 0) {
+    requireMembers(members, 'wh collection revise Set/audited --file members.txt -m "refresh audit set"');
+  }
+  const result = queryBacked ? sourceRepo ? await ctx.client.collection.revise(org, repo, wref, {
+    query: querySource,
+    sourceRepo,
+    message: flags.message,
+    committer: flags.committer
+  }) : await ctx.client.collection.revise(org, repo, wref, {
+    members,
+    query: querySource,
+    message: flags.message,
+    committer: flags.committer
+  }) : await ctx.client.collection.revise(org, repo, wref, {
+    members,
+    ...add.length > 0 ? { add } : {},
+    ...remove.length > 0 ? { remove } : {},
+    message: flags.message,
+    committer: flags.committer
+  });
+  writeOutput(ctx, result, () => renderMutation(ctx, result));
+};
+var handleCollectionStats = async (ctx, { flags, args }) => {
+  const wref = args[0];
+  if (!wref) {
+    usageError("Usage: wh collection stats <wref>", "wh collection stats Set/audited");
+  }
+  const { org, repo } = parseCollectionReadRepo(ctx, [wref]);
+  const result = await ctx.client.collection.stats(org, repo, wref, {
+    version: flags.version
+  });
+  writeOutput(ctx, result, () => renderStats(ctx, result));
+};
+var COLLECTION_DOMAIN = defineDomain({
+  name: "collection",
+  summary: "Create, inspect, compare, and revise WarmHub collections (Pair, Set, List).",
+  group: "resource",
+  verbs: {
+    create: {
+      summary: "Create a collection thing from explicit members or a set selector",
+      args: "",
+      flags: collectionCreateFlags,
+      examples: [
+        'wh collection create --type set --name audited --members Location/a,Location/b -m "audit snapshot"',
+        'wh collection create --type set --name voters --match "Voter/*" -m "voter snapshot"',
+        'wh collection create --type set --name wake-voters --shape Voter --where state=NC --where county=Wake -m "snapshot Wake County voters"',
+        'wh collection create --type set --name today --from Set/yesterday --add Location/c --remove Location/a -m "delta"'
+      ],
+      handler: handleCollectionCreate
+    },
+    revise: {
+      summary: "Revise a named collection by replacement, selector, or set delta",
+      args: "<named-wref>",
+      flags: collectionReviseFlags,
+      examples: [
+        'wh collection revise Set/audited --file members.txt -m "refresh audit set"',
+        'wh collection revise Set/audited --match "Location/*" -m "refresh audit set"',
+        'wh collection revise Set/audited --add Location/c --remove Location/a -m "delta"'
+      ],
+      handler: handleCollectionRevise
+    },
+    members: {
+      summary: "List collection members with pagination",
+      args: "<wref>",
+      flags: collectionMembersFlags,
+      examples: ["wh collection members Set/audited --all"],
+      handler: handleCollectionMembers
+    },
+    contains: {
+      summary: "Check collection membership for one or more wrefs",
+      args: "<wref> <member...>",
+      flags: collectionContainsFlags,
+      examples: ["wh collection contains Set/audited Location/a Location/b"],
+      handler: handleCollectionContains
+    },
+    diff: {
+      summary: "Compare two collections by membership or order",
+      args: "<left-wref> <right-wref>",
+      flags: collectionDiffFlags,
+      examples: [
+        "wh collection diff Set/yesterday Set/today --mode membership"
+      ],
+      handler: handleCollectionDiff
+    },
+    stats: {
+      summary: "Summarize collection size and identity",
+      args: "<wref>",
+      flags: collectionStatsFlags,
+      examples: ["wh collection stats Set/audited"],
+      handler: handleCollectionStats
+    }
+  }
+});
+
 // ../../packages/warmhub-cli/src/domains/commit-submit-flags.ts
 var createFlags3 = {
   ops: flag.string({
@@ -36644,7 +37605,10 @@ var createFlags3 = {
     multiple: true
   }),
   type: flag.string({
-    description: "Collection type: pair, triple, set, list"
+    description: "Collection type: pair, set, list"
+  }),
+  name: flag.string({
+    description: "Collection name for --type shorthand"
   }),
   members: flag.string({
     description: "Collection members (comma-separated wrefs)"
@@ -36789,32 +37753,12 @@ function emitTemplateHint(ctx, operationType) {
   const assertionArgs = operationType === "add" ? "--kind assertion --about <Target/FILL_IN>" : "--kind assertion";
   ctx.err(`Template note: shapes define payload fields. To scaffold an assertion, rerun with ${assertionArgs}.`);
 }
-var COLLECTION_ABOUT_PREFIX_RE = /^(pair|triple|set|list):(.*)$/;
+var COLLECTION_ABOUT_PREFIX_RE = /^(pair|set|list):(.*)$/;
 function parseCollectionAboutFlag(raw) {
   const match = COLLECTION_ABOUT_PREFIX_RE.exec(raw);
   if (!match)
     return raw;
-  const tag = match[1];
-  const members = match[2].split(",").map((m) => m.trim()).filter(Boolean);
-  switch (tag) {
-    case "pair":
-      if (members.length !== 2) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", `pair requires exactly 2 members, got ${members.length}`, undefined, "Example: --about pair:Location/a,Location/b");
-      }
-      break;
-    case "triple":
-      if (members.length !== 3) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", `triple requires exactly 3 members, got ${members.length}`, undefined, "Example: --about triple:Location/a,Location/b,Location/c");
-      }
-      break;
-    case "set":
-    case "list":
-      if (members.length === 0) {
-        throw new CliError(2 /* UserInput */, "USER_INPUT", `${tag} requires at least 1 member`, undefined, `Example: --about ${tag}:Location/a,Location/b`);
-      }
-      break;
-  }
-  return { [tag]: members };
+  throw new CliError(2 /* UserInput */, "USER_INPUT", COLLECTION_ABOUT_REMOVED_MESSAGE, undefined, "Use wh commit submit --file with a named collection add followed by an assertion add.");
 }
 var handleTemplate = async (ctx, { flags, args }) => {
   const shapeNames = args;
@@ -37618,7 +38562,7 @@ var handleSubmit = async (ctx, { flags, args }) => {
       throw new CliError(2 /* UserInput */, "USER_INPUT", `Invalid --kind "${k}". Must be one of: ${validKinds.join(", ")}`);
     }
   }
-  const validCollectionTypes = ["pair", "triple", "set", "list"];
+  const validCollectionTypes = ["pair", "set", "list"];
   if (flags.type && !validCollectionTypes.includes(flags.type)) {
     throw new CliError(2 /* UserInput */, "USER_INPUT", `Invalid --type "${flags.type}". Must be one of: ${validCollectionTypes.join(", ")}`);
   }
@@ -37650,11 +38594,14 @@ var handleSubmit = async (ctx, { flags, args }) => {
   if (streamInput) {
     operations = [];
   } else if (collectionType) {
+    if (!flags.name) {
+      usageError("Usage: wh commit submit --type <pair|set|list> --name <collection-name> --members <wref1,wref2,...>", "wh commit submit --type pair --name location-distance --members Location/a,Location/b");
+    }
     if (!flags.members) {
-      usageError("Usage: wh commit submit --type <pair|triple|set|list> --members <wref1,wref2,...>", "wh commit submit --type pair --members Location/a,Location/b");
+      usageError("Usage: wh commit submit --type <pair|set|list> --name <collection-name> --members <wref1,wref2,...>", "wh commit submit --type pair --name location-distance --members Location/a,Location/b");
     }
     const members = flags.members.split(",").map((m) => m.trim()).filter(Boolean);
-    const arityMap = { pair: 2, triple: 3 };
+    const arityMap = { pair: 2 };
     const expected = arityMap[collectionType];
     if (expected && members.length !== expected) {
       throw new CliError(2 /* UserInput */, "USER_INPUT", `${collectionType} requires exactly ${expected} members, got ${members.length}`);
@@ -37667,6 +38614,7 @@ var handleSubmit = async (ctx, { flags, args }) => {
         operation: "add",
         kind: "collection",
         type: collectionType,
+        name: flags.name,
         members
       }
     ];
@@ -37817,8 +38765,8 @@ var COMMIT_DOMAIN = defineDomain({
         `printf '%s\\n' '{"operation":"add","kind":"thing","name":"Player/alice","data":{"score":1}}' | wh commit submit --stream --stream-id bulk-2026-06-04 --skip-existing --repo acme/world -m "stdin stream"`,
         'wh commit submit --file dataset.jsonl --stream-id bulk-2026-06-04 --skip-existing --progress -m "bulk stream"',
         "wh shape template Session HypothesisCandidate -o ops.json",
-        "wh commit submit --type pair --members Location/a,Location/b",
-        'wh commit submit --type set --members Location/a,Location/b,Location/c -m "Create location set"'
+        "wh commit submit --type pair --name location-distance --members Location/a,Location/b",
+        'wh commit submit --type set --name active-locations --members Location/a,Location/b,Location/c -m "Create location set"'
       ],
       notes: [
         "Need to build an ops file? Run `wh shape template <Shape>` to scaffold the JSON from a shape definition, edit the FILL_IN placeholders, then pass it to `--file`.",
@@ -37832,7 +38780,7 @@ var COMMIT_DOMAIN = defineDomain({
 import {
   existsSync as existsSync7,
   mkdirSync as mkdirSync6,
-  readFileSync as readFileSync6,
+  readFileSync as readFileSync7,
   renameSync as renameSync3,
   rmSync as rmSync4,
   writeFileSync as writeFileSync6
@@ -37868,7 +38816,7 @@ function loadInstallSnapshotCacheRaw(repoSlug) {
   if (!path2 || !existsSync7(path2))
     return null;
   try {
-    const raw = readFileSync6(path2, "utf-8");
+    const raw = readFileSync7(path2, "utf-8");
     return JSON.parse(raw);
   } catch {
     return null;
@@ -38638,7 +39586,7 @@ function formatReservedNameWarning(name) {
 }
 
 // ../../packages/warmhub-cli/src/manifest/parser.ts
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync8 } from "node:fs";
 import { resolve } from "node:path";
 function parseComponentPackage(dirPath) {
   const rootDir = resolve(dirPath);
@@ -38651,7 +39599,7 @@ function parseComponentPackage(dirPath) {
   }
   let componentRaw;
   try {
-    componentRaw = JSON.parse(readFileSync7(componentJsonPath, "utf-8"));
+    componentRaw = JSON.parse(readFileSync8(componentJsonPath, "utf-8"));
   } catch (err) {
     errors.push(`Failed to parse warmhub/component.json: ${err instanceof Error ? err.message : String(err)}`);
     return { ok: false, errors, warnings };
@@ -38666,7 +39614,7 @@ function parseComponentPackage(dirPath) {
   }
   let manifestRaw;
   try {
-    manifestRaw = JSON.parse(readFileSync7(manifestJsonPath, "utf-8"));
+    manifestRaw = JSON.parse(readFileSync8(manifestJsonPath, "utf-8"));
   } catch (err) {
     errors.push(`Failed to parse warmhub/manifest.json: ${err instanceof Error ? err.message : String(err)}`);
     return { ok: false, errors, warnings };
@@ -38867,7 +39815,7 @@ function formatLifecycleUrl(url, colors) {
 }
 
 // ../../packages/warmhub-cli/src/domains/component-utils.ts
-import { readFileSync as readFileSync8 } from "node:fs";
+import { readFileSync as readFileSync9 } from "node:fs";
 function isRegisteredComponentSource(source) {
   return /^[a-z0-9-]+\/[a-z0-9-]+$/.test(source);
 }
@@ -38907,7 +39855,7 @@ function resolveMintedTokensFlag(args) {
 function readManifestArg(path2) {
   let raw;
   try {
-    raw = readFileSync8(path2, "utf8");
+    raw = readFileSync9(path2, "utf8");
   } catch {
     throw new CliError(2 /* UserInput */, "USER_INPUT", `Cannot read manifest file: ${path2}`, undefined, "Pass --manifest <path to warmhub/manifest.json>");
   }
@@ -41526,7 +42474,7 @@ wh assertion create --shape ShapeName --about Target/name --name my-assertion --
 wh thing list --repo org/repo                 # all things at HEAD
 wh thing view Shape/name --repo org/repo      # inspect a thing
 wh thing query --shape MyShape --repo org/repo  # find things by shape
-wh thing about Shape/name --repo org/repo     # assertions about a thing
+wh thing about Shape/name --repo org/repo     # assertions about thing/shape
 wh assertion list --repo org/repo             # all assertions at HEAD
 wh thing history Shape/name --repo org/repo   # version history
 
@@ -41538,17 +42486,16 @@ cat wrefs.txt | wh thing view --format jsonl        # one JSON line per *deduped
 
 ## Wref Quick Reference
 
-**Batch tokens** (in write operations):
-- \`$N\` in last segment of ADD name — generates an opaque stream-scoped identifier
-- \`#N\` anywhere — references value allocated by \`$N\`
-- Example: \`Player/player-$1\` + about \`Player/player-#1\` → \`Player/player-a1b2c3d4e5f6a7b8\`
+Write operations use explicit names and explicit wrefs. To connect operations
+inside one commit, create the first thing with a deterministic name and point
+later operations at that wref.
 
 ## Command Reference
 
 **Global flags**: \`--repo\`, \`--format\`, \`--json\`, \`--live\`
 ### thing — Thing operations
 - \`wh thing list [--shape] [--kind] [--match] [--include-retracted]\` — Current HEAD state
-- \`wh thing view [<wref>...] [--file <path>] [--version] [--depth] [--include-retracted]\` — Thing details. Variadic: singleton routes to \`thing.get\`; multiple wrefs or \`--file\` routes to batch fetch (max 500). Wrefs from positionals, \`--file <path>\` (use \`--file=-\` for stdin), bare \`-\` positional (stdin), or piped stdin when no other source given. Explicit positionals never implicitly consume stdin. \`--version\` implies \`--include-retracted\`. Batch returns \`{ requested, items, missing }\` in \`--json\`; \`--format jsonl\` emits one record per deduped requested wref.
+- \`wh thing view [<wref>...] [--file <path>] [--version] [--depth] [--include-retracted] [--data-mode auto|full]\` — Thing details. Variadic (max 500). \`--version\` implies \`--include-retracted\`. Batch JSON returns \`{ requested, items, missing }\`; jsonl emits one row per deduped requested wref. Large Set/List bodies summarize by default; use \`--data-mode full\` for canonical collection JSON.
 - \`wh thing history [wref] [--shape] [--about] [--include-retracted]\` — Version history
 - \`wh thing resolve <wref>\` — Resolve wref
 - \`wh thing create <name|Shape/name> --data <json-object> [--shape] [--message] [--committer]\` — Create
@@ -41557,7 +42504,7 @@ cat wrefs.txt | wh thing view --format jsonl        # one JSON line per *deduped
 - \`wh thing query [--shape] [--kind] [--about] [--match]\` — Query by filters
 - \`wh thing search <query> [--shape] [--kind] [--about] [--mode]\` — Search text
 - \`wh thing rename <Shape/oldName> <newName>\` — Rename
-- \`wh thing refs <wref> [--inbound] [--outbound] [--field]\` — Show field references; use \`wh thing about\` for assertions about a thing
+- \`wh thing refs <wref> [--inbound] [--outbound] [--field]\` — Show field references; use \`wh thing about\` for assertions about things/shapes
 - \`wh thing about <wref> [--shape] [--match] [--depth] [--resolve-collections] [--limit] [--include-retracted]\` — Show assertions about the target identity; \`--resolve-collections\` expands collection members for bare/@HEAD/@ALL inputs, not pinned @vN
 
 ### commit — Write operations
@@ -41643,12 +42590,12 @@ cat wrefs.txt | wh thing view --format jsonl        # one JSON line per *deduped
 wh thing list --repo org/repo             # see all things in HEAD
 wh thing view Shape/name --repo org/repo  # inspect a specific thing
 wh thing history Shape/name --repo org/repo # inspect version history
-wh thing about Shape/name                 # assertions about a thing
+wh thing about Shape/name                 # assertions about thing/shape
 \`\`\`
 
 **Create an assertion** (most common write):
 \`\`\`bash
-# --about takes a wref (Shape/name). Use \`wh thing list\` to find valid wrefs.
+# --about takes a target wref: Shape/name thing, or Shape itself.
 wh assertion create --shape MyShape --about TargetShape/target-name \\
   --name my-assertion --data '{"field_a":1,"field_b":"value"}' --repo org/repo
 # Output includes per-operation status; relay failures when present.
@@ -41677,17 +42624,15 @@ wh commit submit --file ops.jsonl --stream-id "$ID" --chunk-size 5000 \\
 # --chunk-size: ops per append chunk (default 1000, max 10000); chunk≈1 is ~60× slower
 # --skip-existing: skips already-written add ops (drops per-row read-before-write)
 # Add-stream restart: rerun the WHOLE file with the SAME --stream-id.
-# Fixed-name adds are idempotent via --skip-existing; tokenized ($N/#N) names
-# derive from streamId, so rerun rebuilds token state. Omitting --stream-id is
-# rejected because reruns must reuse the same token namespace. Mid-stream resume
-# is not a CLI mode. Mixed revise/retract JSONL streams are not full-rerun safe
-# after an ambiguous append; inspect repo state and reconcile explicitly.
+# Fixed-name adds are idempotent via --skip-existing. Mid-stream resume is not
+# a CLI mode. Mixed revise/retract JSONL streams are not full-rerun safe after
+# an ambiguous append; inspect repo state and reconcile explicitly.
 \`\`\`
 
 **Create collections:**
 \`\`\`bash
-wh commit submit --type pair --members Location/a,Location/b --repo org/repo
-wh assertion create --shape Distance --about pair:Location/a,Location/b --data '{"value":5}' --repo org/repo
+wh commit submit --type pair --name location-distance --members Location/a,Location/b --repo org/repo
+wh assertion create --shape Distance --about Pair/location-distance --data '{"value":5}' --repo org/repo
 \`\`\`
 
 **Modify data:**
@@ -41777,8 +42722,7 @@ var wrefSyntax = {
     "GameState/round-1/state"
   ],
   canonicalFormat: "wh:org/repo/Shape/name",
-  versionModifiers: ["@HEAD", "@vN", "@ALL"],
-  batchTokens: { allocate: "$N", reference: "#N" }
+  versionModifiers: ["@HEAD", "@vN", "@ALL"]
 };
 var handlePrime = async (ctx) => {
   writeOutput(ctx, {
@@ -44102,7 +45046,7 @@ var TOKEN_DOMAIN = defineDomain({
 });
 
 // ../../packages/warmhub-cli/src/update-check-cache.ts
-import { mkdirSync as mkdirSync7, readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "node:fs";
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync7 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { dirname as dirname7, resolve as resolve3 } from "node:path";
 
@@ -44171,7 +45115,7 @@ var WH_CACHE_PACKAGE_NAME = WH_CLI_PACKAGE_NAME;
 var cachePath = (homePath) => resolve3(homePath, ".warmhub", "cli", "update-check.json");
 var readCache = (homePath) => {
   try {
-    return JSON.parse(readFileSync9(cachePath(homePath), "utf8"));
+    return JSON.parse(readFileSync10(cachePath(homePath), "utf8"));
   } catch {
     return;
   }
@@ -44195,7 +45139,7 @@ var markUpdateNoticeShown = ({
 
 // ../../packages/warmhub-cli/src/domains/update-install.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync10, realpathSync } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync11, realpathSync } from "node:fs";
 import { homedir as homedir6 } from "node:os";
 import { dirname as dirname8, resolve as resolve4 } from "node:path";
 var DEV_INSTALL_PACKAGE_SEARCH_DEPTH = 8;
@@ -44345,7 +45289,7 @@ var isDevInstall = (scriptPath) => {
   for (let i = 0;i < DEV_INSTALL_PACKAGE_SEARCH_DEPTH; i += 1) {
     const pkgPath = resolve4(dir, "package.json");
     try {
-      const pkg = JSON.parse(readFileSync10(pkgPath, "utf8"));
+      const pkg = JSON.parse(readFileSync11(pkgPath, "utf8"));
       if (pkg.name === "@warmhub/cli") {
         if (pkg.private === true)
           return true;
@@ -44631,6 +45575,7 @@ function registerAllDomains(registry2) {
   registry2.register(INIT_DOMAIN);
   registry2.register(REPO_DOMAIN);
   registry2.register(THING_DOMAIN);
+  registry2.register(COLLECTION_DOMAIN);
   registry2.register(COMMIT_DOMAIN);
   registry2.register(ASSERTION_DOMAIN);
   registry2.register(SHAPE_DOMAIN);
@@ -45753,7 +46698,7 @@ function resolveLogLevel(flags, env) {
 // package.json
 var package_default3 = {
   name: "@warmhub/cli",
-  version: "0.67.0",
+  version: "0.68.0",
   private: false,
   type: "module",
   description: "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -46408,4 +47353,4 @@ if (!updateCheckSuppressedByArgv && shouldRunUpdateCheck(updateEligibility)) {
 var interceptedExitCode = await maybeHandleComponentShellBoundary(dispatchArgv);
 process.exitCode = interceptedExitCode === undefined ? await runCli(dispatchArgv, { version: package_default3.version }) : interceptedExitCode;
 
-//# debugId=F47337F68EA6DF1364756E2164756E21
+//# debugId=201635543D774B8564756E2164756E21