@warmhub/cli 0.84.3 → 0.86.0

package/dist/wh.js

@@ -4092,11 +4092,11 @@ var require_util2 = __commonJS((exports, module) => {
   var { isUint8Array } = __require("node:util/types");
   var { webidl } = require_webidl();
   var supportedHashes = [];
-  var crypto2;
+  var crypto;
   try {
-    crypto2 = __require("node:crypto");
+    crypto = __require("node:crypto");
     const possibleRelevantHashes = ["sha256", "sha384", "sha512"];
-    supportedHashes = crypto2.getHashes().filter((hash) => possibleRelevantHashes.includes(hash));
+    supportedHashes = crypto.getHashes().filter((hash) => possibleRelevantHashes.includes(hash));
   } catch {}
   function responseURL(response) {
     const urlList = response.urlList;
@@ -4355,7 +4355,7 @@ var require_util2 = __commonJS((exports, module) => {
     }
   }
   function bytesMatch(bytes, metadataList) {
-    if (crypto2 === undefined) {
+    if (crypto === undefined) {
       return true;
     }
     const parsedMetadata = parseMetadata(metadataList);
@@ -4370,7 +4370,7 @@ var require_util2 = __commonJS((exports, module) => {
     for (const item of metadata) {
       const algorithm = item.algo;
       const expectedValue = item.hash;
-      let actualValue = crypto2.createHash(algorithm).update(bytes).digest("base64");
+      let actualValue = crypto.createHash(algorithm).update(bytes).digest("base64");
       if (actualValue[actualValue.length - 1] === "=") {
         if (actualValue[actualValue.length - 2] === "=") {
           actualValue = actualValue.slice(0, -2);
@@ -5355,8 +5355,8 @@ var require_body = __commonJS((exports, module) => {
   var { multipartFormDataParser } = require_formdata_parser();
   var random;
   try {
-    const crypto2 = __require("node:crypto");
-    random = (max) => crypto2.randomInt(0, max);
+    const crypto = __require("node:crypto");
+    random = (max) => crypto.randomInt(0, max);
   } catch {
     random = (max) => Math.floor(Math.random(max));
   }
@@ -16107,13 +16107,13 @@ var require_util7 = __commonJS((exports, module) => {
 var require_frame = __commonJS((exports, module) => {
   var { maxUnsigned16Bit } = require_constants5();
   var BUFFER_SIZE = 16386;
-  var crypto2;
+  var crypto;
   var buffer = null;
   var bufIdx = BUFFER_SIZE;
   try {
-    crypto2 = __require("node:crypto");
+    crypto = __require("node:crypto");
   } catch {
-    crypto2 = {
+    crypto = {
       randomFillSync: function randomFillSync(buffer2, _offset, _size) {
         for (let i = 0;i < buffer2.length; ++i) {
           buffer2[i] = Math.random() * 255 | 0;
@@ -16125,7 +16125,7 @@ var require_frame = __commonJS((exports, module) => {
   function generateMask() {
     if (bufIdx === BUFFER_SIZE) {
       bufIdx = 0;
-      crypto2.randomFillSync(buffer ??= Buffer.allocUnsafe(BUFFER_SIZE), 0, BUFFER_SIZE);
+      crypto.randomFillSync(buffer ??= Buffer.allocUnsafe(BUFFER_SIZE), 0, BUFFER_SIZE);
     }
     return [buffer[bufIdx++], buffer[bufIdx++], buffer[bufIdx++], buffer[bufIdx++]];
   }
@@ -16193,9 +16193,9 @@ var require_connection = __commonJS((exports, module) => {
   var { Headers: Headers2, getHeadersList } = require_headers();
   var { getDecodeSplit } = require_util2();
   var { WebsocketFrameSend } = require_frame();
-  var crypto2;
+  var crypto;
   try {
-    crypto2 = __require("node:crypto");
+    crypto = __require("node:crypto");
   } catch {}
   function establishWebSocketConnection(url, protocols, client, ws, onEstablish, options) {
     const requestURL = url;
@@ -16214,7 +16214,7 @@ var require_connection = __commonJS((exports, module) => {
       const headersList = getHeadersList(new Headers2(options.headers));
       request.headersList = headersList;
     }
-    const keyValue = crypto2.randomBytes(16).toString("base64");
+    const keyValue = crypto.randomBytes(16).toString("base64");
     request.headersList.append("sec-websocket-key", keyValue);
     request.headersList.append("sec-websocket-version", "13");
     for (const protocol of protocols) {
@@ -16244,7 +16244,7 @@ var require_connection = __commonJS((exports, module) => {
           return;
         }
         const secWSAccept = response.headersList.get("Sec-WebSocket-Accept");
-        const digest2 = crypto2.createHash("sha1").update(keyValue + uid).digest("base64");
+        const digest2 = crypto.createHash("sha1").update(keyValue + uid).digest("base64");
         if (secWSAccept !== digest2) {
           failWebsocketConnection(ws, "Incorrect hash received in Sec-WebSocket-Accept header.");
           return;
@@ -19146,31 +19146,6 @@ var import_usingCtx = __toESM(require_usingCtx(), 1);
 var import_awaitAsyncGenerator = __toESM(require_awaitAsyncGenerator(), 1);
 var import_wrapAsyncGenerator = __toESM(require_wrapAsyncGenerator(), 1);
 var import_objectSpread29 = __toESM(require_objectSpread2(), 1);
-// ../../packages/rules/src/authority-coverage.ts
-var EMPTY_COVERAGE = Object.freeze({
-  include: Object.freeze([])
-});
-var FULL_REPO_COVERAGE = Object.freeze({
-  include: Object.freeze(["**"])
-});
-var EMPTY_COVERAGE_SET = Object.freeze([]);
-var FULL_REPO_COVERAGE_SET = Object.freeze([
-  Object.freeze([FULL_REPO_COVERAGE])
-]);
-// ../../packages/rules/src/stable-json.ts
-function stableJson(value) {
-  if (!value || typeof value !== "object") {
-    return JSON.stringify(value);
-  }
-  if (Array.isArray(value)) {
-    return `[${value.map((entry) => stableJson(entry)).join(",")}]`;
-  }
-  const record = value;
-  return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${stableJson(record[key])}`).join(",")}}`;
-}
-function stableJsonEquals(left, right) {
-  return stableJson(left) === stableJson(right);
-}
 // ../../packages/rules/src/builtin-shapes.ts
 var BUILTIN_SHAPE_NAMES = [
   "Arc",
@@ -19399,6 +19374,21 @@ function resolveComponentTemplate(value, ctx) {
   });
 }
 
+// ../../packages/rules/src/stable-json.ts
+function stableJson(value) {
+  if (!value || typeof value !== "object") {
+    return JSON.stringify(value);
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map((entry) => stableJson(entry)).join(",")}]`;
+  }
+  const record = value;
+  return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${stableJson(record[key])}`).join(",")}}`;
+}
+function stableJsonEquals(left, right) {
+  return stableJson(left) === stableJson(right);
+}
+
 // ../../packages/rules/src/org-activity-events.ts
 var ORG_MEMBER_ADDED_EVENT_TYPE = "org.member_added";
 var ORG_REPO_CREATED_EVENT_TYPE = "org.repo_created";
@@ -20410,7 +20400,304 @@ function joinFieldIdentityPath(...segments) {
 function joinFieldPathWithEscaper(escapeSegment, segments) {
   return segments.map((segment) => typeof segment === "number" ? `[${segment}]` : escapeSegment(segment)).join(".").replace(/\.\[/g, "[");
 }
+// ../../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, options);
+  illegalOpSequences(operations, errors, options?.checkAddAdd ?? true, options);
+  return errors;
+}
+function sourceOperationIndex(filteredIndex, options) {
+  return options?.sourceOperationIndexes?.[filteredIndex] ?? filteredIndex;
+}
+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, options) {
+  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: sourceOperationIndex(i, options),
+          message: COMMIT_TOKEN_SYNTAX_REMOVED_MESSAGE
+        });
+        break;
+      }
+    }
+  }
+}
+function illegalOpSequences(operations, errors, checkAddAdd, options) {
+  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: sourceOperationIndex(i, options)
+    });
+    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 = ["arc", "bond", "set", "list", "pair"];
+var canonicalCollectionTypes = ["arc", "bond", "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":"arc","name":"a-to-b","members":["A","B"]},{"operation":"add","kind":"assertion","about":"Arc/a-to-b","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));
+  errors.push(...contentNameGuard(op, operationIndex));
+  errors.push(...plusSignGuard(op, operationIndex));
+  errors.push(...validateCollectionAbouts(op, operationIndex));
+  errors.push(...validateCollectionOps(op, operationIndex));
+  return errors;
+}
+function builtinShapeGuard(op, operationIndex) {
+  const errors = [];
+  const name = op.name;
+  const isShapeRename = op.operation === "rename" && (op.kind === "shape" || op.name !== undefined && !splitLocalPath(op.name));
+  const reservedSourcePassThrough = isShapeRename && name !== undefined && isRenameableSquattedShape(name) && op.newName !== undefined && !isReservedCollectionShape(op.newName) && !isBuiltinShape(op.newName);
+  if (name && isRetiredCollectionShape(name) && !reservedSourcePassThrough) {
+    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 {
+    const builtinShapeName = name && isBuiltinShape(name) && !reservedSourcePassThrough ? name : isShapeRename && op.newName && isBuiltinShape(op.newName) ? op.newName : undefined;
+    if (builtinShapeName && (isShapeRename || op.operation !== "retract" && op.kind === "shape")) {
+      const action = op.operation === "add" ? "created" : op.operation === "rename" ? "renamed" : "revised";
+      errors.push({
+        code: "RESERVED_NAME",
+        operationIndex,
+        message: `Shape "${builtinShapeName}" is a built-in shape and cannot be ${action} manually`
+      });
+    }
+  }
+  if (name) {
+    const local = splitLocalPath(name);
+    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,
+        message
+      });
+    }
+  }
+  return errors;
+}
+function contentNameGuard(op, operationIndex) {
+  if (op.kind !== "thing" || !op.name)
+    return [];
+  const local = splitLocalPath(op.name);
+  if (!local || !isContentShape(local.shapePrefix))
+    return [];
+  const bareName = local.bareName;
+  if (isSynthesizedContentName(bareName)) {
+    return [
+      {
+        code: "READ_ONLY_BUILTIN_CONTENT",
+        operationIndex,
+        message: `${local.shapePrefix}/${bareName} is synthesized; writes are not allowed`
+      }
+    ];
+  }
+  if (!isStoredContentName(bareName)) {
+    return [
+      {
+        code: "UNKNOWN_CONTENT_NAME",
+        operationIndex,
+        message: `${local.shapePrefix}/${bareName} is not a recognized well-known content name`
+      }
+    ];
+  }
+  return [];
+}
+function plusSignGuard(op, operationIndex) {
+  const errors = [];
+  const name = op.name;
+  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 && isReservedCollectionShape(local.shapePrefix))
+      return errors;
+    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;
+}
+function validateCollectionAbouts(op, operationIndex) {
+  const errors = [];
+  if (!op.about || typeof op.about === "string")
+    return errors;
+  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: COLLECTION_CREATE_REQUIRES_NAME_MESSAGE
+    });
+  }
+  if (!op.type || !collectionTypes.includes(op.type)) {
+    errors.push({
+      code: "VALIDATION_ERROR",
+      operationIndex,
+      message: `Collection "type" is invalid. Use one of: ${canonicalCollectionTypes.join(", ")}. 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) {
+      errors.push({
+        code: "VALIDATION_ERROR",
+        operationIndex,
+        message: arityError
+      });
+    }
+  }
+  return errors;
+}
+function collectionArityError(tag, members) {
+  switch (tag) {
+    case "arc":
+      return members.length !== 2 ? `Arc requires exactly 2 members, got ${members.length}` : null;
+    case "bond":
+      return members.length !== 2 ? `Bond requires exactly 2 members, got ${members.length}` : null;
+    case "pair":
+      return members.length !== 2 ? `Pair requires exactly 2 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/shape-types.ts
 var BASE_PRIMITIVE_TYPES = [
   "number",
@@ -20608,6 +20895,14 @@ function displayFieldEntry(fieldType) {
     return { type, description };
   return type;
 }
+// ../../packages/rules/src/shape-field-key.ts
+function foldFieldName(name) {
+  const stripped = name.endsWith("?") ? name.slice(0, -1) : name;
+  return stripped.toLowerCase();
+}
+function foldFieldPath(path) {
+  return path.split(".").map((segment) => foldFieldName(segment)).join(".");
+}
 
 // ../../node_modules/.bun/re2js@2.8.3/node_modules/re2js/build/index.js
 /*!
@@ -27102,372 +27397,7 @@ function normalizeOptionalTypeSpec(spec) {
   }
   return { spec, optionalByType: false };
 }
-// ../../packages/rules/src/external-contract.ts
-var FORBIDDEN_EXTERNAL_FIELDS = new Set([
-  "_id",
-  "_creationTime",
-  "repoId",
-  "orgId",
-  "thingId",
-  "shapeThingId",
-  "aboutThingId",
-  "currentVersionId",
-  "createdInCommitId",
-  "validatedShapeVersionId"
-]);
-// ../../packages/rules/src/name-charset.ts
-var RESERVED_NAME_SEGMENT_CHARS = ["?", "#", "@", ":", "$"];
-function escapeForCharClass(char) {
-  return char.replace(/[\\\]^-]/g, "\\$&");
-}
-var RESERVED_CLASS_BODY = RESERVED_NAME_SEGMENT_CHARS.map(escapeForCharClass).join("");
-var NAME_SEGMENT_FORBIDDEN_RE = new RegExp(`[${RESERVED_CLASS_BODY}\\s]`);
-var PATH_SEGMENT_FORBIDDEN_RE = new RegExp(`[/${RESERVED_CLASS_BODY}\\s]`);
-// ../../packages/rules/src/permission-scopes.ts
-var PUBLIC_ORG_PERMISSIONS = new Set([
-  "org:read",
-  "components:read"
-]);
-// ../../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, options);
-  illegalOpSequences(operations, errors, options?.checkAddAdd ?? true, options);
-  return errors;
-}
-function sourceOperationIndex(filteredIndex, options) {
-  return options?.sourceOperationIndexes?.[filteredIndex] ?? filteredIndex;
-}
-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, options) {
-  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: sourceOperationIndex(i, options),
-          message: COMMIT_TOKEN_SYNTAX_REMOVED_MESSAGE
-        });
-        break;
-      }
-    }
-  }
-}
-function illegalOpSequences(operations, errors, checkAddAdd, options) {
-  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: sourceOperationIndex(i, options)
-    });
-    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 = ["arc", "bond", "set", "list", "pair"];
-var canonicalCollectionTypes = ["arc", "bond", "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":"arc","name":"a-to-b","members":["A","B"]},{"operation":"add","kind":"assertion","about":"Arc/a-to-b","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));
-  errors.push(...contentNameGuard(op, operationIndex));
-  errors.push(...plusSignGuard(op, operationIndex));
-  errors.push(...validateCollectionAbouts(op, operationIndex));
-  errors.push(...validateCollectionOps(op, operationIndex));
-  return errors;
-}
-function builtinShapeGuard(op, operationIndex) {
-  const errors = [];
-  const name = op.name;
-  const isShapeRename = op.operation === "rename" && (op.kind === "shape" || op.name !== undefined && !splitLocalPath(op.name));
-  const reservedSourcePassThrough = isShapeRename && name !== undefined && isRenameableSquattedShape(name) && op.newName !== undefined && !isReservedCollectionShape(op.newName) && !isBuiltinShape(op.newName);
-  if (name && isRetiredCollectionShape(name) && !reservedSourcePassThrough) {
-    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 {
-    const builtinShapeName = name && isBuiltinShape(name) && !reservedSourcePassThrough ? name : isShapeRename && op.newName && isBuiltinShape(op.newName) ? op.newName : undefined;
-    if (builtinShapeName && (isShapeRename || op.operation !== "retract" && op.kind === "shape")) {
-      const action = op.operation === "add" ? "created" : op.operation === "rename" ? "renamed" : "revised";
-      errors.push({
-        code: "RESERVED_NAME",
-        operationIndex,
-        message: `Shape "${builtinShapeName}" is a built-in shape and cannot be ${action} manually`
-      });
-    }
-  }
-  if (name) {
-    const local = splitLocalPath(name);
-    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,
-        message
-      });
-    }
-  }
-  return errors;
-}
-function contentNameGuard(op, operationIndex) {
-  if (op.kind !== "thing" || !op.name)
-    return [];
-  const local = splitLocalPath(op.name);
-  if (!local || !isContentShape(local.shapePrefix))
-    return [];
-  const bareName = local.bareName;
-  if (isSynthesizedContentName(bareName)) {
-    return [
-      {
-        code: "READ_ONLY_BUILTIN_CONTENT",
-        operationIndex,
-        message: `${local.shapePrefix}/${bareName} is synthesized; writes are not allowed`
-      }
-    ];
-  }
-  if (!isStoredContentName(bareName)) {
-    return [
-      {
-        code: "UNKNOWN_CONTENT_NAME",
-        operationIndex,
-        message: `${local.shapePrefix}/${bareName} is not a recognized well-known content name`
-      }
-    ];
-  }
-  return [];
-}
-function plusSignGuard(op, operationIndex) {
-  const errors = [];
-  const name = op.name;
-  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 && isReservedCollectionShape(local.shapePrefix))
-      return errors;
-    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;
-}
-function validateCollectionAbouts(op, operationIndex) {
-  const errors = [];
-  if (!op.about || typeof op.about === "string")
-    return errors;
-  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: COLLECTION_CREATE_REQUIRES_NAME_MESSAGE
-    });
-  }
-  if (!op.type || !collectionTypes.includes(op.type)) {
-    errors.push({
-      code: "VALIDATION_ERROR",
-      operationIndex,
-      message: `Collection "type" is invalid. Use one of: ${canonicalCollectionTypes.join(", ")}. 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) {
-      errors.push({
-        code: "VALIDATION_ERROR",
-        operationIndex,
-        message: arityError
-      });
-    }
-  }
-  return errors;
-}
-function collectionArityError(tag, members) {
-  switch (tag) {
-    case "arc":
-      return members.length !== 2 ? `Arc requires exactly 2 members, got ${members.length}` : null;
-    case "bond":
-      return members.length !== 2 ? `Bond requires exactly 2 members, got ${members.length}` : null;
-    case "pair":
-      return members.length !== 2 ? `Pair requires exactly 2 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/read-limits.ts
-var MAX_GET_MANY_WREFS = 500;
-// ../../packages/rules/src/reserved-orgs.ts
-var RESERVED_RAW_CONTENT_TOP_LEVEL_NAMES = [
-  "_app",
-  "_static",
-  "api",
-  "health",
-  "healthz",
-  "mcp",
-  "readyz",
-  "robots.txt",
-  "sse",
-  "trpc",
-  "version"
-];
-var RESERVED_ORG_NAMES = [
-  ...RESERVED_RAW_CONTENT_TOP_LEVEL_NAMES,
-  "admin",
-  "billing",
-  "blog",
-  "docs",
-  "help",
-  "login",
-  "public",
-  "settings",
-  "signup",
-  "status",
-  "support",
-  "system",
-  "warmhub",
-  "www"
-];
-var RESERVED_ORG_NAME_SET = new Set(RESERVED_ORG_NAMES);
-// ../../packages/rules/src/shape-field-key.ts
-function foldFieldName(name) {
-  const stripped = name.endsWith("?") ? name.slice(0, -1) : name;
-  return stripped.toLowerCase();
-}
-function foldFieldPath(path) {
-  return path.split(".").map((segment) => foldFieldName(segment)).join(".");
-}
 // ../../packages/rules/src/shape-validation-runtime.ts
 function validatePersistedStringFieldLimits(value, typeDef, errors, path) {
   const normalized = normalizeOptionalTypeSpec(typeDef).spec;
@@ -28063,8 +27993,8 @@ function normalizeOptionalName(value) {
 
 // ../../packages/sdk-ts/src/operation-normalize.ts
 function toBackendStreamOperation(operation) {
-  if (operation.expectedVersion !== undefined && operation.operation !== "revise") {
-    throw new Error("expectedVersion is only valid on revise operations — set operation: 'revise'");
+  if (operation.expectedVersion !== undefined && operation.operation !== "revise" && operation.operation !== "retract") {
+    throw new Error("expectedVersion is only valid on revise or retract operations — set an explicit operation discriminator");
   }
   if (operation.operation === "retract") {
     return {
@@ -28072,6 +28002,7 @@ function toBackendStreamOperation(operation) {
       name: operation.name,
       ...operation.kind ? { kind: operation.kind } : {},
       ...operation.reason ? { reason: operation.reason } : {},
+      ...operation.expectedVersion !== undefined ? { expectedVersion: operation.expectedVersion } : {},
       ...operation.leaseId ? { leaseId: operation.leaseId } : {}
     };
   }
@@ -28167,13 +28098,19 @@ class PartialStreamSubmissionError extends Error {
   code = "PARTIAL_STREAM_SUBMISSION";
   completedOperations;
   acknowledgedOperationCount;
+  lastAcknowledgedRepoSeq;
+  attemptedAppendOutcome;
   cause;
   constructor(input) {
-    super("Stream submission failed. A timed-out append may already have landed, so inspect repository state before sending any further operations.");
+    super("Stream submission outcome is incomplete or unknown. Stop sending writes; once any outstanding append can no longer apply, obtain a later verified checkpoint and reconcile before replanning.");
     this.name = "WarmHubError";
     this.cause = input.cause;
     this.completedOperations = input.completedOperations;
     this.acknowledgedOperationCount = input.acknowledgedOperationCount ?? input.completedOperations.length;
+    this.attemptedAppendOutcome = input.attemptedAppendOutcome;
+    if (input.lastAcknowledgedRepoSeq !== undefined) {
+      this.lastAcknowledgedRepoSeq = input.lastAcknowledgedRepoSeq;
+    }
   }
 }
 
@@ -28330,6 +28267,9 @@ function isTransientStreamFailure(cause) {
 function isFetchNetworkTypeError(cause) {
   return cause instanceof TypeError && /fetch/i.test(cause.message);
 }
+function isReplaySafeOperation(operation) {
+  return operation.operation !== "revise" || operation.expectedVersion !== undefined;
+}
 function computeBackoffDelayMs(attempt, policy) {
   const exponential = policy.baseDelayMs * 2 ** Math.max(0, attempt - 1);
   const jitter = Math.random() * policy.baseDelayMs;
@@ -28379,7 +28319,8 @@ async function submitOperationsViaStream(client, args) {
   for (const { operations: chunk, start: chunkStart } of chunkOperations(operations, chunkSize)) {
     let attempt = 1;
     let priorAttemptAmbiguous = false;
-    const chunkIsAtomic = chunk.length === 1;
+    const chunkIsSingleOperation = chunk.length === 1;
+    const chunkIsReplaySafe = chunk.every(isReplaySafeOperation);
     while (true) {
       try {
         const appendResult = await client.stream.append({
@@ -28407,7 +28348,7 @@ async function submitOperationsViaStream(client, args) {
         if (acknowledgedOperationCount === 0 && !priorAttemptAmbiguous && isDefiniteClientError(cause)) {
           throw cause;
         }
-        if (acknowledgedOperationCount === 0 && chunkIsAtomic && policy !== false && attempt < policy.maxAttempts && isTransientStreamFailure(cause)) {
+        if (acknowledgedOperationCount === 0 && chunkIsSingleOperation && chunkIsReplaySafe && policy !== false && attempt < policy.maxAttempts && isTransientStreamFailure(cause)) {
           await sleep2(computeBackoffDelayMs(attempt, policy));
           attempt += 1;
           priorAttemptAmbiguous = true;
@@ -28422,7 +28363,9 @@ async function submitOperationsViaStream(client, args) {
         throw new PartialStreamSubmissionError({
           cause,
           completedOperations,
-          acknowledgedOperationCount
+          acknowledgedOperationCount,
+          lastAcknowledgedRepoSeq: repoSeq,
+          attemptedAppendOutcome: !priorAttemptAmbiguous && isDefiniteClientError(cause) ? "not_applied" : "unknown"
         });
       }
     }
@@ -28436,7 +28379,9 @@ async function submitOperationsViaStream(client, args) {
       throw new PartialStreamSubmissionError({
         cause: failure,
         completedOperations: completedOperationsFrom(result),
-        acknowledgedOperationCount
+        acknowledgedOperationCount,
+        lastAcknowledgedRepoSeq: repoSeq,
+        attemptedAppendOutcome: "unknown"
       });
     }
     throw failure;
@@ -28550,7 +28495,7 @@ function dedupeDeprecationsByShape(results) {
 // ../../packages/sdk-ts/package.json
 var package_default = {
   name: "@warmhub/sdk-ts",
-  version: "0.82.3",
+  version: "0.84.0",
   private: false,
   type: "module",
   description: "The TypeScript SDK for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -28705,40 +28650,64 @@ function assertPaginatedCursorAdvanced(cursor, nextCursor, seenCursors) {
     throw new WarmHubError("VALIDATION_ERROR", "Paginated result cursor did not advance");
   }
 }
-async function* paginate(fetchPage, extractItems, initialCursor) {
+function assertIncrementalLowerBound(sinceRepoSeq) {
+  if (sinceRepoSeq === undefined) {
+    throw new WarmHubError("VALIDATION_ERROR", "sinceRepoSeq is required for an incremental read");
+  }
+}
+async function* paginatePages(fetchPage, initialCursor) {
   let cursor = initialCursor;
   const seenCursors = new Set;
   for (;; ) {
     if (cursor)
       seenCursors.add(cursor);
     const page = await fetchPage(cursor);
-    for (const item of extractItems(page)) {
-      yield item;
-    }
+    yield page;
     if (!page.nextCursor)
       return;
     assertPaginatedCursorAdvanced(cursor, page.nextCursor, seenCursors);
     cursor = page.nextCursor;
   }
 }
+async function* paginate(fetchPage, extractItems, initialCursor) {
+  for await (const page of paginatePages(fetchPage, initialCursor)) {
+    yield* extractItems(page);
+  }
+}
 async function collectPaginatedPages(fetchPage, extractItems, max, initialCursor) {
   if (max !== undefined && (!Number.isFinite(max) || Math.trunc(max) !== max || max < 0)) {
     throw new WarmHubError("VALIDATION_ERROR", "max must be a nonnegative integer");
   }
   const items = [];
-  let cursor = initialCursor;
+  for await (const page of paginatePages(fetchPage, initialCursor)) {
+    const pageItems = extractItems(page);
+    if (max !== undefined && items.length + pageItems.length > max) {
+      throw new WarmHubError("VALIDATION_ERROR", `Paginated result exceeded max=${max}`);
+    }
+    items.push(...pageItems);
+  }
+  return items;
+}
+function assertRepoExploreBrowseMode(opts) {
+  if (opts?.slugs !== undefined) {
+    throw new WarmHubError("VALIDATION_ERROR", "repo.explore pagination helpers do not support slugs mode");
+  }
+}
+async function collectIncrementalPages(fetchPage) {
+  const items = [];
+  let cursor;
   const seenCursors = new Set;
   for (;; ) {
     if (cursor)
       seenCursors.add(cursor);
     const page = await fetchPage(cursor);
-    const pageItems = extractItems(page);
-    if (max !== undefined && items.length + pageItems.length > max) {
-      throw new WarmHubError("VALIDATION_ERROR", `Paginated result exceeded max=${max}`);
+    items.push(...page.items);
+    if (!page.nextCursor) {
+      if (page.repoSeq === undefined) {
+        throw new WarmHubError("VALIDATION_ERROR", "Incremental read completed without repoSeq");
+      }
+      return { items, repoSeq: page.repoSeq };
     }
-    items.push(...pageItems);
-    if (!page.nextCursor)
-      return items;
     assertPaginatedCursorAdvanced(cursor, page.nextCursor, seenCursors);
     cursor = page.nextCursor;
   }
@@ -28755,6 +28724,9 @@ function chunkArray(items, chunkSize) {
   }
   return chunks;
 }
+function narrowKind(kind) {
+  return kind !== undefined && COMMIT_OPERATION_KINDS.includes(kind) ? kind : undefined;
+}
 function toSubscriptionRef(args) {
   const [first, repoName, name] = args;
   return typeof first === "string" ? { orgName: first, repoName, name } : first;
@@ -29141,6 +29113,13 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    listIter: (orgName, repoName, opts) => {
+      return paginate((cursor) => this.component.list(orgName, repoName, { ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    listAll: async (orgName, repoName, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.component.list(orgName, repoName, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
+    },
     search: async (query, opts) => {
       try {
         return await this.trpc.component.search.query({
@@ -29152,6 +29131,13 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    searchIter: (query, opts) => {
+      return paginate((cursor) => this.component.search(query, { ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    searchAll: async (query, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.component.search(query, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
+    },
     get: async (orgName, repoName, componentRef) => {
       try {
         return await this.trpc.component.get.query({
@@ -29531,6 +29517,13 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    listIter: (orgName, opts) => {
+      return paginate((cursor) => this.repo.list(orgName, { ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    listAll: async (orgName, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.repo.list(orgName, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
+    },
     search: async (query, opts) => {
       try {
         return await this.trpc.repo.search.query({
@@ -29542,6 +29535,13 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    searchIter: (query, opts) => {
+      return paginate((cursor) => this.repo.search(query, { ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    searchAll: async (query, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.repo.search(query, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
+    },
     create: async (orgName, repoName, description, visibility, displayName) => {
       try {
         return await this.trpc.repo.create.mutate({
@@ -29651,6 +29651,13 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    listPageIter: (orgName, opts) => {
+      return paginate((cursor) => this.repo.listPage(orgName, { ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    listPageAll: async (orgName, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.repo.listPage(orgName, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
+    },
     listForCaller: async (opts) => {
       try {
         return await this.trpc.repo.listForCaller.query({
@@ -29678,6 +29685,15 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    exploreIter: (opts) => {
+      assertRepoExploreBrowseMode(opts);
+      return paginate((cursor) => this.repo.explore({ ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    exploreAll: async (opts) => {
+      assertRepoExploreBrowseMode(opts);
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.repo.explore({ ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
+    },
     getReadme: async (orgName, repoName) => {
       try {
         return await this.trpc.repo.getReadme.query({
@@ -29866,6 +29882,13 @@ class WarmHubClient {
       } catch (error) {
         throw toWarmHubError(error);
       }
+    },
+    historyIter: (orgName, repoName, name, opts = {}) => {
+      return paginate((cursor) => this.shape.history(orgName, repoName, name, { ...opts, cursor }), (page) => page.versions, opts.cursor);
+    },
+    historyAll: async (orgName, repoName, name, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.shape.history(orgName, repoName, name, { ...pageOpts, cursor }), (page) => page.versions, max, pageOpts.cursor);
     }
   };
   subscription = {
@@ -30024,11 +30047,25 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    liveFeedIter: (orgName, repoName, subscriptionName, opts) => {
+      return paginate((cursor) => this.action.liveFeed(orgName, repoName, subscriptionName, {
+        ...opts,
+        cursor
+      }), (page) => page.items, opts?.cursor);
+    },
+    liveFeedAll: async (orgName, repoName, subscriptionName, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.action.liveFeed(orgName, repoName, subscriptionName, {
+        ...pageOpts,
+        cursor
+      }), (page) => page.items, max, pageOpts.cursor);
+    },
     listRuns: async (orgName, repoName, opts) => {
       try {
         return await this.trpc.action.listRuns.query({
           orgName,
           repoName,
+          runId: opts?.runId,
           subscriptionName: opts?.subscriptionName,
           status: opts?.status,
           outcome: opts?.outcome,
@@ -30040,6 +30077,21 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    listRunsIter: (orgName, repoName, opts) => {
+      return paginate((cursor) => this.action.listRuns(orgName, repoName, {
+        ...opts,
+        since: cursor === undefined ? opts?.since : undefined,
+        cursor
+      }), (page) => page.items, opts?.cursor);
+    },
+    listRunsAll: async (orgName, repoName, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.action.listRuns(orgName, repoName, {
+        ...pageOpts,
+        since: cursor === undefined ? pageOpts.since : undefined,
+        cursor
+      }), (page) => page.items, max, pageOpts.cursor);
+    },
     latestRuns: async (orgName, repoName) => {
       try {
         return await this.trpc.action.latestRuns.query({ orgName, repoName });
@@ -30224,12 +30276,11 @@ class WarmHubClient {
   thing = {
     head: async (orgName, repoName, opts) => {
       try {
-        const kind = opts?.kind === "shape" || opts?.kind === "thing" || opts?.kind === "assertion" || opts?.kind === "collection" ? opts.kind : undefined;
         return await this.trpc.thing.head.query({
           orgName,
           repoName,
           shape: opts?.shape,
-          kind,
+          kind: narrowKind(opts?.kind),
           match: opts?.match,
           dataMode: opts?.dataMode,
           includeRetracted: opts?.includeRetracted,
@@ -30238,7 +30289,8 @@ class WarmHubClient {
           componentRef: opts?.componentRef,
           excludeComponents: opts?.excludeComponents,
           excludeInfraShapes: opts?.excludeInfraShapes,
-          where: opts?.where
+          where: opts?.where,
+          sinceRepoSeq: opts?.sinceRepoSeq
         });
       } catch (error) {
         throw toWarmHubError(error);
@@ -30251,6 +30303,14 @@ class WarmHubClient {
       const { max, ...pageOpts } = opts ?? {};
       return await collectPaginatedPages((cursor) => this.thing.head(orgName, repoName, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
     },
+    headChanges: async (orgName, repoName, opts) => {
+      assertIncrementalLowerBound(opts?.sinceRepoSeq);
+      return await collectIncrementalPages((cursor) => this.thing.head(orgName, repoName, {
+        ...opts,
+        includeRetracted: true,
+        cursor
+      }));
+    },
     get: async (orgName, repoName, wref, version, opts) => {
       try {
         return await this.trpc.thing.get.query({
@@ -30394,6 +30454,13 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    historyIter: (orgName, repoName, opts) => {
+      return paginate((cursor) => this.thing.history(orgName, repoName, { ...opts, cursor }), (page) => page.versions, opts.cursor);
+    },
+    historyAll: async (orgName, repoName, opts) => {
+      const { max, ...pageOpts } = opts;
+      return await collectPaginatedPages((cursor) => this.thing.history(orgName, repoName, { ...pageOpts, cursor }), (page) => page.versions, max, pageOpts.cursor);
+    },
     rename: async (orgName, repoName, shapeName, oldName, newName) => {
       try {
         return await this.trpc.thing.rename.mutate({
@@ -30447,13 +30514,12 @@ class WarmHubClient {
     },
     query: async (orgName, repoName, opts) => {
       try {
-        const kind = opts?.kind === "shape" || opts?.kind === "thing" || opts?.kind === "assertion" || opts?.kind === "collection" ? opts.kind : undefined;
         return await this.trpc.thing.query.query({
           orgName,
           repoName,
           shape: opts?.shape,
           about: opts?.about,
-          kind,
+          kind: narrowKind(opts?.kind),
           match: opts?.match,
           includeRetracted: opts?.includeRetracted,
           resolveCollections: opts?.resolveCollections,
@@ -30463,7 +30529,8 @@ class WarmHubClient {
           componentRef: opts?.componentRef,
           excludeComponents: opts?.excludeComponents,
           excludeInfraShapes: opts?.excludeInfraShapes,
-          where: opts?.where
+          where: opts?.where,
+          sinceRepoSeq: opts?.sinceRepoSeq
         });
       } catch (error) {
         throw toWarmHubError(error);
@@ -30476,16 +30543,23 @@ class WarmHubClient {
       const { max, ...pageOpts } = opts ?? {};
       return await collectPaginatedPages((cursor) => this.thing.query(orgName, repoName, { ...pageOpts, cursor }), (page) => page.items, max, pageOpts.cursor);
     },
+    queryChanges: async (orgName, repoName, opts) => {
+      assertIncrementalLowerBound(opts?.sinceRepoSeq);
+      return await collectIncrementalPages((cursor) => this.thing.query(orgName, repoName, {
+        ...opts,
+        includeRetracted: true,
+        cursor
+      }));
+    },
     search: async (orgName, repoName, query, opts) => {
       try {
-        const kind = opts?.kind === "shape" || opts?.kind === "thing" || opts?.kind === "assertion" || opts?.kind === "collection" ? opts.kind : undefined;
         return await this.trpc.thing.search.query({
           orgName,
           repoName,
           query,
           shape: opts?.shape,
           about: opts?.about,
-          kind,
+          kind: narrowKind(opts?.kind),
           match: opts?.match,
           includeRetracted: opts?.includeRetracted,
           resolveCollections: opts?.resolveCollections,
@@ -30501,22 +30575,32 @@ class WarmHubClient {
         throw toWarmHubError(error);
       }
     },
+    searchIter: (orgName, repoName, query, opts) => {
+      return paginate((cursor) => this.thing.search(orgName, repoName, query, { ...opts, cursor }), (page) => page.items, opts?.cursor);
+    },
+    searchAll: async (orgName, repoName, query, opts) => {
+      const { max, ...pageOpts } = opts ?? {};
+      return await collectPaginatedPages((cursor) => this.thing.search(orgName, repoName, query, {
+        ...pageOpts,
+        cursor
+      }), (page) => page.items, max, pageOpts.cursor);
+    },
     count: async (orgName, repoName, opts) => {
       try {
-        const kind = opts?.kind === "shape" || opts?.kind === "thing" || opts?.kind === "assertion" || opts?.kind === "collection" ? opts.kind : undefined;
         return await this.trpc.thing.count.query({
           orgName,
           repoName,
           shape: opts?.shape,
           about: opts?.about,
-          kind,
+          kind: narrowKind(opts?.kind),
           match: opts?.match,
           includeRetracted: opts?.includeRetracted,
           resolveCollections: opts?.resolveCollections,
           componentRef: opts?.componentRef,
           excludeComponents: opts?.excludeComponents,
           excludeInfraShapes: opts?.excludeInfraShapes,
-          where: opts?.where
+          where: opts?.where,
+          sinceRepoSeq: opts?.sinceRepoSeq
         });
       } catch (error) {
         throw toWarmHubError(error);
@@ -31044,6 +31128,7 @@ var _orgActivityNeedsNoFilter = ["org.member_added", "org.repo_created", "org.re
 }));
 
 // ../../packages/warmhub-cli/src/errors-classification.ts
+var INCREMENTAL_READ_UNAVAILABLE_GUIDANCE = "Retry the same incremental request after incremental reads are enabled, or simplify the query to a supported form. Do not fall back to a full read.";
 function unauthenticatedHint(message) {
   if (message.includes("Authentication required")) {
     return "Not logged in. Run `wh auth login` to authenticate.";
@@ -31070,6 +31155,8 @@ function classifyConflict(message, code) {
       return "pending-delete";
     case "LEASE_UNAVAILABLE":
       return "lease-held";
+    case "INCREMENTAL_READ_UNAVAILABLE":
+      return "incremental-read-unavailable";
     default:
       break;
   }
@@ -31103,6 +31190,8 @@ function conflictHint(message, code) {
       return "Repo is being deleted. Wait for the delete to finish or cancel it before retrying.";
     case "lease-held":
       return "This thing is leased by another holder. Back off until the lease expires (see leaseExpiresAt / retryAfter), then retry.";
+    case "incremental-read-unavailable":
+      return INCREMENTAL_READ_UNAVAILABLE_GUIDANCE;
     case "other":
       return "Resolve the conflicting existing state and try again.";
   }
@@ -31130,7 +31219,8 @@ var CONFLICT_SHAPED_CODES = new Set([
   "HAS_INBOUND_REFS",
   "REPO_PENDING_DELETE",
   "ALREADY_RETRACTED",
-  "LEASE_UNAVAILABLE"
+  "LEASE_UNAVAILABLE",
+  "INCREMENTAL_READ_UNAVAILABLE"
 ]);
 
 // ../../packages/warmhub-cli/src/errors-types.ts
@@ -31140,20 +31230,101 @@ class CliError extends Error {
   cause;
   hint;
   backendCode;
+  recovery;
   context;
-  constructor(code, kind, message, cause, hint, context, backendCode) {
+  constructor(code, kind, message, cause, hint, context, backendCode, recovery) {
     super(message);
     this.code = code;
     this.kind = kind;
     this.cause = cause;
     this.hint = hint;
     this.backendCode = backendCode;
+    this.recovery = recovery;
     this.context = context;
   }
   get errorCode() {
     return this.backendCode;
   }
 }
+
+// ../../packages/warmhub-cli/src/stream-recovery.ts
+function failureCode(error) {
+  if (typeof error !== "object" || error === null)
+    return;
+  const typed = error;
+  if (typeof typed.errorCode === "string")
+    return typed.errorCode;
+  if (typeof typed.backendCode === "string")
+    return typed.backendCode;
+  if (typeof typed.data?.warmhub?.code === "string") {
+    return typed.data.warmhub.code;
+  }
+  if (typeof typed.data?.code === "string")
+    return typed.data.code;
+  return failureCode(typed.cause);
+}
+function failureStatus(error) {
+  if (typeof error !== "object" || error === null)
+    return;
+  const typed = error;
+  if (typeof typed.status === "number")
+    return typed.status;
+  if (typeof typed.data?.warmhub?.status === "number") {
+    return typed.data.warmhub.status;
+  }
+  if (typeof typed.data?.status === "number")
+    return typed.data.status;
+  if (typeof typed.data?.httpStatus === "number") {
+    return typed.data.httpStatus;
+  }
+  return failureStatus(typed.cause);
+}
+function streamAppendWasExplicitlyRejected(cause) {
+  const normalized = toWarmHubError(cause);
+  const code = failureCode(cause) ?? normalized.errorCode ?? normalized.code;
+  if (code === "COMMIT_OUTCOME_UNKNOWN")
+    return false;
+  const status = failureStatus(cause) ?? normalized.status;
+  return status !== undefined && status >= 400 && status < 500 && status !== 408;
+}
+function streamFailureCode(cause) {
+  const normalized = toWarmHubError(cause);
+  const wireCode = failureCode(cause) ?? normalized.errorCode;
+  if (wireCode !== undefined)
+    return wireCode;
+  return normalized.status !== undefined && normalized.code !== "BACKEND" ? normalized.code : undefined;
+}
+function buildStreamRecoveryReceipt(args) {
+  const {
+    acknowledgedOperationCount,
+    lastAcknowledgedRepoSeq,
+    cause,
+    attemptedAppendOutcome
+  } = args;
+  const sequenceReceipt = lastAcknowledgedRepoSeq === undefined ? "" : ` Last acknowledged repo sequence: ${lastAcknowledgedRepoSeq}.`;
+  const errorCode = streamFailureCode(cause);
+  const backendSuffix = errorCode ? ` (backend: ${errorCode})` : "";
+  const recovery = {
+    acknowledgedOperationCount,
+    ...lastAcknowledgedRepoSeq === undefined ? {} : { lastAcknowledgedRepoSeq },
+    attemptedAppendOutcome
+  };
+  if (attemptedAppendOutcome === "unknown") {
+    return {
+      message: `Stream append outcome is unknown after ${acknowledgedOperationCount} acknowledged operation(s).${sequenceReceipt}${backendSuffix}`,
+      hint: "Stop submitting writes. The attempted append may have landed after the last acknowledgement; once it can no longer apply, obtain and verify a later checkpoint, then reconcile the attempted append and unsent work.",
+      errorCode,
+      recovery
+    };
+  }
+  const causeMessage = cause instanceof Error ? cause.message : String(cause);
+  return {
+    message: `${causeMessage} (${acknowledgedOperationCount} earlier operation(s) already acknowledged before this failure).${sequenceReceipt}${backendSuffix}`,
+    hint: "The failed input or rejected append was not applied. Keep the acknowledged prefix receipt, then correct or replan the rejected and unsent operations.",
+    errorCode,
+    recovery
+  };
+}
 // ../../packages/warmhub-cli/src/errors-logging.ts
 function shouldLogToErrorTier(err) {
   switch (err.kind) {
@@ -31274,6 +31445,11 @@ function generateSuggestions(code, message, context, errorCode) {
           action: "Another holder leased this thing. Back off until the lease expires (leaseExpiresAt / retryAfter), then retry"
         });
         break;
+      case "incremental-read-unavailable":
+        suggestions.push({
+          action: INCREMENTAL_READ_UNAVAILABLE_GUIDANCE
+        });
+        break;
       case "other":
         suggestions.push({
           action: "Resolve the conflicting existing state and retry"
@@ -31373,7 +31549,8 @@ function printCliError(err, errWriter, opts = {}) {
         message: err.message,
         ...err.hint ? { hint: err.hint } : {},
         ...suggestions.length > 0 ? { suggestions } : {},
-        ...err.context ? { context: err.context } : {}
+        ...err.context ? { context: err.context } : {},
+        ...err.recovery ? { recovery: err.recovery } : {}
       }
     };
     errWriter(JSON.stringify(envelope));
@@ -31413,8 +31590,13 @@ function toCliError(err) {
     return cliErrorFromAllFailed(err.operations);
   }
   if (err instanceof PartialStreamSubmissionError) {
-    const hint = err.cause instanceof Error ? err.cause.message : err.cause === undefined ? undefined : String(err.cause);
-    return new CliError(4 /* Backend */, "BACKEND", err.message, err, hint);
+    const receipt = buildStreamRecoveryReceipt({
+      acknowledgedOperationCount: err.acknowledgedOperationCount,
+      lastAcknowledgedRepoSeq: err.lastAcknowledgedRepoSeq,
+      cause: err.cause,
+      attemptedAppendOutcome: err.attemptedAppendOutcome
+    });
+    return new CliError(4 /* Backend */, "BACKEND", receipt.message, err, receipt.hint, undefined, receipt.errorCode, receipt.recovery);
   }
   if (err instanceof WarmHubError) {
     if (err.code === "CURSOR_EPOCH_INVALID" || err.errorCode === "CURSOR_EPOCH_INVALID") {
@@ -34886,6 +35068,7 @@ function pageEnvelope(items, opts) {
   const nextCursor = opts.nextCursor ?? null;
   return {
     items,
+    ...opts.repoSeq === undefined ? {} : { repoSeq: opts.repoSeq },
     page: {
       limit: opts.limit,
       count: items.length,
@@ -35038,6 +35221,9 @@ var reviseFlags = {
 };
 var retractFlags = {
   reason: flag.string({ description: "Reason for retraction (<=500 chars)" }),
+  "expected-version": flag.number({
+    description: "only retract if the target is still at this version (optimistic concurrency)"
+  }),
   message: flag.string({ short: "m", description: "Commit message" }),
   committer: flag.string({
     description: "Committer wref (shape or shaped thing; e.g. Agent/bot-1)"
@@ -35072,15 +35258,17 @@ var handleRevise = async (ctx, { flags, args }) => {
 var handleRetract = async (ctx, { flags, args }) => {
   const name = args[0];
   if (!name) {
-    usageError("Usage: wh assertion retract <wref> -m <message>", 'wh assertion retract Belief/cave-safe -m "withdraw claim"');
+    usageError("Usage: wh assertion retract <wref> -m <message> [--expected-version <n>]", 'wh assertion retract Belief/cave-safe -m "withdraw claim"');
   }
   const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
+  const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh assertion retract Belief/cave-safe --expected-version 3");
   const result = await ctx.client.commit.apply(org, repo, flags.message ?? `retract ${name}`, [
     {
       operation: "retract",
       kind: "assertion",
       name,
-      ...flags.reason ? { reason: flags.reason } : {}
+      ...flags.reason ? { reason: flags.reason } : {},
+      ...expectedVersion !== undefined ? { expectedVersion } : {}
     }
   ], {
     committer: flags.committer
@@ -35155,6 +35343,47 @@ function parseCollectionRoleFlag(value, example) {
     return value;
   usageError("Invalid --role. Expected from, to, or ends.", example);
 }
+function parseSinceRepoSeqFlag(value) {
+  if (value === undefined)
+    return;
+  if (Number.isSafeInteger(value) && value >= -1)
+    return value;
+  usageError("--since-repo-seq must be -1 or a nonnegative safe integer.", "wh thing list --since-repo-seq -1 --all --format json");
+}
+function requireIncrementalCheckpoint(repoSeq, required) {
+  if (required && repoSeq === undefined) {
+    throw new CliError(4 /* Backend */, "BACKEND", "Incremental read completed without repoSeq", undefined, "Retry the read. If the checkpoint remains absent, report a backend incremental-read contract violation.");
+  }
+}
+async function collectThingPages(args) {
+  const items = [];
+  let cursor = args.initialCursor;
+  const seenCursors = new Set(cursor ? [cursor] : []);
+  while (true) {
+    const page = await args.fetchPage(cursor);
+    const pageItems = page.items ?? [];
+    if (args.onPage) {
+      if (!await args.onPage(pageItems)) {
+        return { items, nextCursor: undefined };
+      }
+    } else {
+      items.push(...pageItems);
+    }
+    if (!page.nextCursor) {
+      requireIncrementalCheckpoint(page.repoSeq, args.requireRepoSeq);
+      return {
+        items,
+        nextCursor: undefined,
+        ...page.repoSeq === undefined ? {} : { repoSeq: page.repoSeq }
+      };
+    }
+    if (seenCursors.has(page.nextCursor)) {
+      throw new CliError(4 /* Backend */, "BACKEND", `${args.title} pagination cursor repeated; aborting --all to avoid an infinite loop.`, undefined, "Retry without --all to fetch one page and inspect page.nextCursor. If cursors repeat, report this as a backend pagination issue.");
+    }
+    seenCursors.add(page.nextCursor);
+    cursor = page.nextCursor;
+  }
+}
 async function handleCount(ctx, org, repo, opts) {
   const result = await ctx.client.thing.count(org, repo, opts);
   writeOutput(ctx, result, () => ctx.out(`${result.count}`));
@@ -36110,6 +36339,9 @@ var headFlags = {
     description: "Max items per page (default: 50, max: 500)"
   }),
   cursor: flag.string({ description: "Opaque pagination cursor" }),
+  "since-repo-seq": flag.number({
+    description: "Return identities changed after this repository sequence"
+  }),
   all: flag.boolean({ description: "Fetch all pages" }),
   match: flag.string({ description: "Filter by wref glob pattern" }),
   count: flag.boolean({ description: "Return count of matching items" }),
@@ -36133,15 +36365,19 @@ var handleHead = async (ctx, { flags, args }) => {
   const kind = validateKind(flags.kind);
   const limit = flags.limit;
   const cursor = flags.cursor;
+  const sinceRepoSeq = parseSinceRepoSeqFlag(flags["since-repo-seq"]);
   const all = flags.all;
   const match = flags.match;
   const count = flags.count;
   const includeRetracted = flags["include-retracted"];
   const whereRaw = flags.where ?? [];
   const where = whereRaw.map(parseWhereFlag);
+  if (ctx.liveMode && sinceRepoSeq !== undefined) {
+    usageError("--since-repo-seq cannot be used with --live.", "wh thing list --since-repo-seq 42 --all --format json");
+  }
   if (count) {
     if (cursor || all || limit || ctx.liveMode) {
-      usageError("Usage: wh thing list --count [--shape SHAPE] [--kind KIND] [--match PATTERN]", "wh thing list --shape Player --count");
+      usageError("Usage: wh thing list --count [--shape SHAPE] [--kind KIND] [--match PATTERN] [--since-repo-seq N]", "wh thing list --shape Player --count --since-repo-seq 42");
     }
     const componentRef2 = flags.component;
     const strictExclude2 = !!flags["exclude-components"];
@@ -36154,7 +36390,8 @@ var handleHead = async (ctx, { flags, args }) => {
       componentRef: componentRef2,
       excludeComponents: strictExclude2,
       excludeInfraShapes: !strictExclude2 && !shape,
-      where: where.length > 0 ? where : undefined
+      where: where.length > 0 ? where : undefined,
+      ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
     });
   }
   if (cursor && !limit) {
@@ -36181,7 +36418,8 @@ var handleHead = async (ctx, { flags, args }) => {
     componentRef,
     excludeComponents,
     excludeInfraShapes,
-    where: where.length > 0 ? where : undefined
+    where: where.length > 0 ? where : undefined,
+    ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
   };
   if (ctx.liveMode) {
     await runLive({
@@ -36214,7 +36452,8 @@ var handleHead = async (ctx, { flags, args }) => {
     componentRef,
     excludeComponents,
     excludeInfraShapes,
-    where: where.length > 0 ? where : undefined
+    where: where.length > 0 ? where : undefined,
+    ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
   }, streamJsonl ? async (items) => {
     writePageOutput(ctx, items, { limit: pageLimit }, () => {});
     return await ctx.flushOut?.() ?? true;
@@ -36228,23 +36467,25 @@ var handleHead = async (ctx, { flags, args }) => {
     componentRef,
     excludeComponents,
     excludeInfraShapes,
-    where: where.length > 0 ? where : undefined
+    where: where.length > 0 ? where : undefined,
+    ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
   });
   if (streamJsonl)
     return;
+  requireIncrementalCheckpoint(result.repoSeq, sinceRepoSeq !== undefined && !result.nextCursor);
   if (!all && result.nextCursor) {
     emitPartialPageHint(ctx, (result.items ?? []).length, result.nextCursor, boundedLimit);
   }
   writePageOutput(ctx, result.items ?? [], {
     limit: all ? pageLimit : boundedLimit,
-    nextCursor: result.nextCursor ?? null
+    nextCursor: result.nextCursor ?? null,
+    ...result.repoSeq === undefined ? {} : { repoSeq: result.repoSeq }
   }, () => renderHead(ctx.out, ctx.colors, ctx.chars, result, org, repo, shape, kind));
 };
 async function fetchAllHeadPages(ctx, org, repo, opts, onPage) {
-  const items = [];
-  let cursor = opts.cursor;
-  while (true) {
-    const page = await ctx.client.thing.head(org, repo, {
+  return collectThingPages({
+    initialCursor: opts.cursor,
+    fetchPage: (cursor) => ctx.client.thing.head(org, repo, {
       shape: opts.shape,
       kind: opts.kind,
       match: opts.match,
@@ -36254,20 +36495,13 @@ async function fetchAllHeadPages(ctx, org, repo, opts, onPage) {
       componentRef: opts.componentRef,
       excludeComponents: opts.excludeComponents,
       excludeInfraShapes: opts.excludeInfraShapes,
-      where: opts.where
-    });
-    const pageItems = page.items ?? [];
-    if (onPage) {
-      if (!await onPage(pageItems))
-        break;
-    } else {
-      items.push(...pageItems);
-    }
-    if (!page.nextCursor)
-      break;
-    cursor = page.nextCursor;
-  }
-  return { items, nextCursor: undefined };
+      where: opts.where,
+      ...opts.sinceRepoSeq === undefined ? {} : { sinceRepoSeq: opts.sinceRepoSeq }
+    }),
+    onPage,
+    requireRepoSeq: opts.sinceRepoSeq !== undefined,
+    title: "Thing list"
+  });
 }
 
 // ../../packages/warmhub-cli/src/domains/thing/query.ts
@@ -36279,6 +36513,9 @@ var queryFlags = {
     description: "Max results per page (default: 50, max: 500)"
   }),
   cursor: flag.string({ description: "Opaque pagination cursor" }),
+  "since-repo-seq": flag.number({
+    description: "Return identities changed after this repository sequence"
+  }),
   all: flag.boolean({ description: "Fetch all pages" }),
   match: flag.string({ description: "Filter by wref glob pattern" }),
   count: flag.boolean({ description: "Return count of matching items" }),
@@ -36309,6 +36546,7 @@ var handleQuery = async (ctx, { flags }) => {
   const kind = validateKind(flags.kind);
   const limit = flags.limit;
   const cursor = flags.cursor;
+  const sinceRepoSeq = parseSinceRepoSeqFlag(flags["since-repo-seq"]);
   const all = flags.all;
   const match = flags.match;
   const count = flags.count;
@@ -36324,9 +36562,12 @@ var handleQuery = async (ctx, { flags }) => {
   const c = ctx.colors;
   const whereRaw = flags.where ?? [];
   const where = whereRaw.map(parseWhereFlag);
+  if (ctx.liveMode && sinceRepoSeq !== undefined) {
+    usageError("--since-repo-seq cannot be used with --live.", "wh thing query --since-repo-seq 42 --all --format json");
+  }
   if (count) {
     if (cursor || all || limit || ctx.liveMode || role) {
-      usageError("Usage: wh thing query --count [--shape SHAPE] [--about WREF] [--kind KIND] [--match PATTERN]", "wh thing query --kind assertion --about Player/alice --count");
+      usageError("Usage: wh thing query --count [--shape SHAPE] [--about WREF] [--kind KIND] [--match PATTERN] [--since-repo-seq N]", "wh thing query --kind assertion --about Player/alice --count --since-repo-seq 42");
     }
     return handleCount(ctx, org, repo, {
       shape,
@@ -36338,7 +36579,8 @@ var handleQuery = async (ctx, { flags }) => {
       componentRef,
       excludeComponents,
       excludeInfraShapes,
-      where: where.length > 0 ? where : undefined
+      where: where.length > 0 ? where : undefined,
+      ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
     });
   }
   if (role && (!about || !resolveCollections)) {
@@ -36365,7 +36607,8 @@ var handleQuery = async (ctx, { flags }) => {
     componentRef,
     excludeComponents,
     excludeInfraShapes,
-    where: where.length > 0 ? where : undefined
+    where: where.length > 0 ? where : undefined,
+    ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
   };
   if (ctx.liveMode) {
     await runLive({
@@ -36401,7 +36644,8 @@ var handleQuery = async (ctx, { flags }) => {
     componentRef,
     excludeComponents,
     excludeInfraShapes,
-    where: where.length > 0 ? where : undefined
+    where: where.length > 0 ? where : undefined,
+    ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
   }, streamJsonl ? async (items) => {
     writePageOutput(ctx, items, { limit: pageLimit }, () => {});
     return await ctx.flushOut?.() ?? true;
@@ -36418,23 +36662,25 @@ var handleQuery = async (ctx, { flags }) => {
     componentRef,
     excludeComponents,
     excludeInfraShapes,
-    where: where.length > 0 ? where : undefined
+    where: where.length > 0 ? where : undefined,
+    ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
   });
   if (streamJsonl)
     return;
+  requireIncrementalCheckpoint(result.repoSeq, sinceRepoSeq !== undefined && !result.nextCursor);
   if (!all && result.nextCursor) {
     emitPartialPageHint(ctx, (result.items ?? []).length, result.nextCursor, boundedLimit);
   }
   writePageOutput(ctx, result.items ?? [], {
     limit: all ? pageLimit : boundedLimit,
-    nextCursor: result.nextCursor ?? null
+    nextCursor: result.nextCursor ?? null,
+    ...result.repoSeq === undefined ? {} : { repoSeq: result.repoSeq }
   }, () => renderQueryResults(ctx.out, c, result));
 };
 async function fetchAllQueryPages(ctx, org, repo, opts, onPage) {
-  const items = [];
-  let cursor = opts.cursor;
-  while (true) {
-    const page = await ctx.client.thing.query(org, repo, {
+  return collectThingPages({
+    initialCursor: opts.cursor,
+    fetchPage: (cursor) => ctx.client.thing.query(org, repo, {
       shape: opts.shape,
       about: opts.about,
       kind: opts.kind,
@@ -36447,20 +36693,13 @@ async function fetchAllQueryPages(ctx, org, repo, opts, onPage) {
       componentRef: opts.componentRef,
       excludeComponents: opts.excludeComponents,
       excludeInfraShapes: opts.excludeInfraShapes,
-      where: opts.where
-    });
-    const pageItems = page.items ?? [];
-    if (onPage) {
-      if (!await onPage(pageItems))
-        break;
-    } else {
-      items.push(...pageItems);
-    }
-    if (!page.nextCursor)
-      break;
-    cursor = page.nextCursor;
-  }
-  return { items, nextCursor: undefined };
+      where: opts.where,
+      ...opts.sinceRepoSeq === undefined ? {} : { sinceRepoSeq: opts.sinceRepoSeq }
+    }),
+    onPage,
+    requireRepoSeq: opts.sinceRepoSeq !== undefined,
+    title: "Thing query"
+  });
 }
 function renderQueryResults(out, c, result) {
   const items = result.items ?? [];
@@ -36629,6 +36868,9 @@ var retractFlags2 = {
     description: "Optional safety check: thing|assertion|shape|collection (errors on mismatch)"
   }),
   reason: flag.string({ description: "Reason for retraction (<=500 chars)" }),
+  "expected-version": flag.number({
+    description: "only retract if the target is still at this version (optimistic concurrency)"
+  }),
   message: flag.string({ short: "m", description: "Commit message" }),
   committer: flag.string({
     description: "Committer wref (shape or shaped thing; e.g. Agent/bot-1)"
@@ -36640,13 +36882,14 @@ var retractFlags2 = {
 var handleThingRetract = async (ctx, { flags, args }) => {
   const name = args[0];
   if (!name) {
-    usageError("Usage: wh thing retract <wref> -m <message> [--reason <text>] [--kind thing|assertion|shape|collection]", 'wh thing retract Measurement/m1 -m "cleanup" --reason "bad source"');
+    usageError("Usage: wh thing retract <wref> -m <message> [--reason <text>] [--kind thing|assertion|shape|collection] [--expected-version <n>]", 'wh thing retract Measurement/m1 -m "cleanup" --reason "bad source"');
   }
   const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
   const committer = flags.committer;
   const message = flags.message;
   const kind = flags.kind;
   const reason = flags.reason;
+  const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh thing retract Player/alice --expected-version 3");
   const leaseId = requireLeaseIdFlag(flags["lease-id"], "wh thing retract Player/alice --lease-id <id>");
   const c = ctx.colors;
   const result = await ctx.client.commit.apply(org, repo, message ?? `retract ${name}`, [
@@ -36655,6 +36898,7 @@ var handleThingRetract = async (ctx, { flags, args }) => {
       name,
       ...kind ? { kind } : {},
       ...reason ? { reason } : {},
+      ...expectedVersion !== undefined ? { expectedVersion } : {},
       ...leaseId ? { leaseId } : {}
     }
   ], { committer });
@@ -36842,6 +37086,9 @@ async function fetchAllSearchPages(ctx, org, repo, queryText, opts) {
 // ../../packages/warmhub-cli/src/domains/thing/view.ts
 import { readFileSync as readFileSync7 } from "node:fs";
 
+// ../../packages/rules/src/read-limits.ts
+var MAX_GET_MANY_WREFS2 = 500;
+
 // ../../packages/warmhub-cli/src/io.ts
 function isBrokenPipe(error) {
   return error instanceof Error && "code" in error && error.code === "EPIPE";
@@ -37078,8 +37325,8 @@ var handleView = async (ctx, { flags, args, terminator }) => {
   if (wrefs.length === 0) {
     throw new CliError(2 /* UserInput */, "USER_INPUT", "Missing required <wref>. Pass a wref as a positional arg, via --file <path>, or pipe newline-delimited wrefs on stdin.", undefined, "Example: wh thing view Game/base --depth 2");
   }
-  if (wrefs.length > MAX_GET_MANY_WREFS) {
-    throw new CliError(2 /* UserInput */, "USER_INPUT", `Too many wrefs: ${wrefs.length} (max ${MAX_GET_MANY_WREFS} per call).`, undefined, `Split your input into chunks of ${MAX_GET_MANY_WREFS} or fewer.`);
+  if (wrefs.length > MAX_GET_MANY_WREFS2) {
+    throw new CliError(2 /* UserInput */, "USER_INPUT", `Too many wrefs: ${wrefs.length} (max ${MAX_GET_MANY_WREFS2} per call).`, undefined, `Split your input into chunks of ${MAX_GET_MANY_WREFS2} or fewer.`);
   }
   const isBatch = wrefs.length > 1 || flags.file !== undefined;
   if (isBatch && flags.depth !== undefined) {
@@ -39236,7 +39483,7 @@ var createFlags3 = {
     description: "collection members (comma-separated wrefs)"
   }),
   "expected-version": flag.number({
-    description: "Only apply if the --revise target is still at this version (optimistic concurrency). Requires --revise."
+    description: "only apply if the --revise or single --retract target is still at this version (optimistic concurrency)."
   }),
   "lease-id": flag.string({
     description: "read-lease token from `wh thing lease`, bound to --revise or one --retract target (auto-released on success)"
@@ -39499,7 +39746,7 @@ function buildAddOperations(input) {
   });
 }
 function buildRetractOperations(input) {
-  const { retractNames, kinds, reasons, leaseId } = input;
+  const { retractNames, kinds, reasons, expectedVersion, leaseId } = input;
   if (leaseId !== undefined && retractNames.length !== 1) {
     throw new CliError(2 /* UserInput */, "USER_INPUT", `--lease-id requires exactly one --retract target; received ${retractNames.length}.`, undefined, "wh commit submit --retract Player/alice --lease-id lease-xyz --repo acme/world");
   }
@@ -39529,6 +39776,7 @@ function buildRetractOperations(input) {
       name,
       ...kind ? { kind } : {},
       ...reason ? { reason } : {},
+      ...expectedVersion !== undefined ? { expectedVersion } : {},
       ...leaseId ? { leaseId } : {}
     };
   });
@@ -39628,15 +39876,14 @@ import { createInterface as createInterface2 } from "node:readline";
 class JsonlPartialSubmissionError extends CliError {
 }
 function jsonlPartialSubmissionError(args) {
-  const { acknowledgedOperationCount, cause } = args;
-  if (args.failedAppendMayHaveLanded === true) {
-    const backendCode = toWarmHubError(cause).backendCode;
-    const suffix = backendCode ? ` (backend: ${backendCode})` : "";
-    return new JsonlPartialSubmissionError(4 /* Backend */, "BACKEND", `Stream append failed after ${acknowledgedOperationCount} acknowledged operation(s).${suffix}`, cause, "The failed append may also have landed; inspect repository state before submitting any remaining JSONL operations.", undefined, backendCode);
-  }
-  const message = cause instanceof Error ? cause.message : String(cause);
-  const causeHint = cause instanceof CliError && cause.hint ? `${cause.hint} ` : "";
-  return new JsonlPartialSubmissionError(4 /* Backend */, "BACKEND", `${message} (${acknowledgedOperationCount} earlier operation(s) already acknowledged by the server before this input failure).`, cause, `${causeHint}Earlier chunks have landed; inspect repository state before submitting any remaining JSONL operations.`);
+  const receipt = buildStreamRecoveryReceipt({
+    acknowledgedOperationCount: args.acknowledgedOperationCount,
+    lastAcknowledgedRepoSeq: args.lastAcknowledgedRepoSeq,
+    cause: args.cause,
+    attemptedAppendOutcome: args.failedAppendMayHaveLanded === true ? "unknown" : "not_applied"
+  });
+  const causeHint = args.cause instanceof CliError && args.cause.hint ? `${args.cause.hint} ` : "";
+  return new JsonlPartialSubmissionError(4 /* Backend */, "BACKEND", receipt.message, args.cause, `${causeHint}${receipt.hint}`, undefined, receipt.errorCode, receipt.recovery);
 }
 
 // ../../packages/warmhub-cli/src/domains/commit-submit-utils.ts
@@ -39721,50 +39968,6 @@ function toCommitSubmitResult(args) {
     operations
   };
 }
-function backendErrorCode(error) {
-  if (typeof error !== "object" || error === null) {
-    return;
-  }
-  const typed = error;
-  if (typeof typed.data === "object" && typed.data !== null) {
-    const data = typed.data;
-    if (typeof data.code === "string") {
-      return data.code;
-    }
-  }
-  const causeCode = backendErrorCode(typed.cause);
-  if (causeCode !== undefined) {
-    return causeCode;
-  }
-  return typeof typed.code === "string" ? typed.code : undefined;
-}
-function backendErrorStatus(error) {
-  if (typeof error !== "object" || error === null) {
-    return;
-  }
-  const typed = error;
-  if (typeof typed.status === "number") {
-    return typed.status;
-  }
-  if (typeof typed.data === "object" && typed.data !== null) {
-    const data = typed.data;
-    if (typeof data.status === "number") {
-      return data.status;
-    }
-    if (typeof data.httpStatus === "number") {
-      return data.httpStatus;
-    }
-    if (typeof data.warmhub?.status === "number") {
-      return data.warmhub.status;
-    }
-  }
-  return backendErrorStatus(typed.cause);
-}
-function firstJsonlAppendErrorMayHaveCommitted(error) {
-  const errorCode = backendErrorCode(error);
-  const errorStatus = backendErrorStatus(error);
-  return errorCode === undefined || errorCode === "COMMIT_OUTCOME_UNKNOWN" || errorCode === "INTERNAL_ERROR" || errorCode === "NETWORK" || errorCode === "SERVICE_UNAVAILABLE" || errorCode === "BACKEND" && errorStatus !== undefined && errorStatus >= 500;
-}
 
 // ../../packages/warmhub-cli/src/domains/stream-progress.ts
 import { createReadStream } from "node:fs";
@@ -39949,12 +40152,12 @@ async function applyJsonlCommit(ctx, args) {
   const tAppendStart = performance.now();
   progress.start(t0);
   let opCount = 0;
+  let repoSeq;
   try {
     const operations = [];
     const submittedOperations = [];
     let allocatedTokenRanges = [];
     let createdByEmail;
-    let repoSeq;
     let parsedOpCount = 0;
     let chunk = [];
     let lineNumber = 0;
@@ -39977,11 +40180,13 @@ async function applyJsonlCommit(ctx, args) {
         });
       } catch (cause) {
         const completed = opCount;
-        if (opCount > 0 || firstJsonlAppendErrorMayHaveCommitted(cause)) {
+        const failedAppendMayHaveLanded = !streamAppendWasExplicitlyRejected(cause);
+        if (opCount > 0 || failedAppendMayHaveLanded) {
           throw jsonlPartialSubmissionError({
             acknowledgedOperationCount: completed,
             cause,
-            failedAppendMayHaveLanded: true
+            failedAppendMayHaveLanded,
+            lastAcknowledgedRepoSeq: repoSeq
           });
         }
         throw cause;
@@ -40176,7 +40381,8 @@ async function applyJsonlCommit(ctx, args) {
     }
     throw jsonlPartialSubmissionError({
       acknowledgedOperationCount: opCount,
-      cause: error
+      cause: error,
+      lastAcknowledgedRepoSeq: repoSeq
     });
   }
 }
@@ -40246,9 +40452,10 @@ var handleSubmit = async (ctx, { flags, args }) => {
   const abouts = flags.about ?? [];
   const reasons = flags.reason ?? [];
   const kinds = flags.kind ?? [];
-  const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh commit submit --revise Player/alice --data '{...}' --expected-version 3");
-  if (expectedVersion !== undefined && !reviseName) {
-    usageError("--expected-version requires --revise", "wh commit submit --revise Player/alice --data '{...}' --expected-version 3");
+  const expectedVersionExample = retractNames.length > 0 ? "wh commit submit --retract Player/alice --expected-version 3" : "wh commit submit --revise Player/alice --data '{...}' --expected-version 3";
+  const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", expectedVersionExample);
+  if (expectedVersion !== undefined && reviseName === undefined && retractNames.length !== 1) {
+    usageError("--expected-version requires --revise or exactly one --retract", "wh commit submit --retract Player/alice --expected-version 3");
   }
   const leaseIdFlag = requireLeaseIdFlag(flags["lease-id"], `wh commit submit --revise Player/alice --data '{"score":2}' --lease-id <id>`);
   if (leaseIdFlag !== undefined && reviseName === undefined && retractNames.length === 0) {
@@ -40372,6 +40579,7 @@ var handleSubmit = async (ctx, { flags, args }) => {
       retractNames,
       kinds,
       reasons,
+      expectedVersion,
       leaseId: leaseIdFlag
     });
   } else if (operationSource === "--revise") {
@@ -44293,7 +44501,7 @@ var ORG_DOMAIN = defineDomain({
 });
 
 // ../../packages/warmhub-cli/src/domains/prime-content.md
-var prime_content_default = "# WarmHub CLI Context\n> **Context Recovery**: Run `wh prime` after compaction or new session\n\n## Environment\n{{REPO_LINE}}\n\n## Core Concepts\n- **Thing**: A named entity versioned by writes. **Assertion**: A thing that makes a shape-validated claim about another thing.\n- **Shape**: A thing defining data structure; every other thing has one. **Write**: One or more add/revise/retract operations with per-operation results.\n- **wref**: A reference to a thing. Local: `Player` (the shape) or `Player/alice` (a thing with that shape). Cross-repo: `wh:org/repo/Shape` or `wh:org/repo/Shape/name`.\n\n## Versioned Wrefs\n- `Shape` addresses the shape itself; `Shape/name` addresses a thing with that shape. `@vN` pins either.\n- Floating write refs to retracted targets fail; existing pinned versions remain valid.\n- Rename invalidates old spellings, including `@vN`; the new name resolves history.\n- Untyped wrefs accept any thing. `wref<T>` requires the target's shape to be `T`; a shape has no shape, so never satisfies it. `wref?` coalesces only `thing_absent`, never a missing shape.\n\n## Key Workflows\n\n**Write data** (discover shapes → scaffold ops → submit):\n```bash\nwh shape list --repo org/repo                             # list available shapes\nwh shape view ShapeName --repo org/repo                   # inspect fields\nwh shape template ShapeName -o ops.json --repo org/repo   # scaffold write ops (supports --kind assertion)\n# edit ops.json — fill FILL_IN placeholders — then:\nwh commit submit --file ops.json -m \"msg\" --repo org/repo  # submit operations (bare `wh commit` also works)\n# or single assertion (no file needed):\nwh assertion create --shape ShapeName --about Target/name --name my-assertion --data '{\"field\":1}' --repo org/repo\n# Relay failed operation details when present. Never hand-guess ops JSON — use `wh shape template <Shape>`.\n```\n\n**Read data:**\n```bash\nwh thing list --repo org/repo                 # all things at HEAD\nwh thing view Shape/name --repo org/repo      # inspect a thing\nwh thing query --shape MyShape --repo org/repo  # find things by shape\nwh thing about Shape --repo org/repo          # assertions about a shape\nwh assertion list --repo org/repo             # all assertions at HEAD\nwh thing history Shape/name --repo org/repo   # version history\n\n# Batch read — wh thing view is variadic (max 500 wrefs/call):\nwh thing view Player/alice Player/bob               # variadic positionals\nwh thing view --file wrefs.txt --json               # one wref per line\ncat wrefs.txt | wh thing view --format jsonl        # one JSON line per *deduped* requested wref\n```\n\n## Wref Quick Reference\n\nWrites use explicit names and wrefs. Untyped fields, collection members,\nassertion `about`, and committers accept any thing. Create a deterministic\ntarget before referencing it in the same commit.\n\n## Command Reference\n\n**Global flags**: `--repo`, `--format`, `--json`, `--live`\n### thing — Thing operations\n- `wh thing list [--shape] [--kind] [--match] [--include-retracted]` — Current HEAD state\n- `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.\n- `wh thing history [wref] [--shape] [--about] [--include-retracted]` — Version history\n- `wh thing resolve <wref>` — Resolve a wref to its canonical thing identity\n- `wh thing create <name|Shape/name> (--data|--file) [--shape]` — Create\n- `wh thing revise <name> [--data] [--message] [--committer] [--expected-version]` — Revise (CONFLICT if HEAD≠n)\n- `wh thing retract <wref> -m <message> [--reason] [--kind]` — Retract\n- `wh thing query [--shape] [--kind] [--about] [--match]` — Query by filters\n- `wh thing search <query> [--shape] [--kind] [--about] [--mode]` — Search text\n- `wh thing rename <Shape/oldName> <newName>` — Rename\n- `wh thing refs <wref> [--inbound] [--outbound] [--field]` — Show field references; use `wh thing about` for assertions about the target thing\n- `wh thing about <wref> [--shape] [--match] [--depth] [--resolve-collections] [--role from|to|ends] [--limit] [--include-retracted]` — Show assertions about the target identity; `--resolve-collections` expands bare/@HEAD/@ALL members, `--role` filters direction; not pinned @vN\n\n### commit — Write operations\n- `wh commit submit [--ops|--file|--add|--revise|--retract] [--kind] [--data] [--reason] [--expected-version] [--chunk-size] [--skip-existing] [--progress] [--stream-id]` — Submit operations (bare `wh commit` is equivalent). Use `--file ops.jsonl --stream-id <id> --chunk-size 5000 --skip-existing` for bulk ingest.\n- `wh shape template <shape> [shape2 ...] [--kind] [--operation add|revise|retract] [-o file]` — Generate sample ops\n\n### assertion — Assertion operations\n- `wh assertion list [--about wref] [--shape] [--match] [--include-retracted]` — Browse assertions\n- `wh assertion view <wref> [--version] [--include-retracted]` — Assertion details\n- `wh assertion create --shape <s> --name <n> --about <wref> [--data] [-m] [--committer]` — Create assertion\n- `wh assertion revise <wref> --data <json> [--message] [--committer]` — Revise assertion\n- `wh assertion retract <wref> -m <message> [--reason] [--committer]` — Retract assertion\n- `wh assertion history <wref> [--include-retracted]` — Assertion history\n\n### shape — Shape management\n- `wh shape list [--match] [--include-retracted]` — List all shapes\n- `wh shape view <name> [--include-retracted]` — Shape details\n- `wh shape revise <name> (--fields|--file)`\n- `wh shape create <name> (--fields|--file)`\n- `wh shape retract <name> -m <message> [--reason]` — Retract shape\n- `wh shape history <name> [--include-retracted]` — Shape history\n- `wh shape rename <oldName> <newName>` — Rename shape\n\n### repo — Repository management\n- `wh repo create <org/name> [--display-name] [--description] [--visibility]` — Create repo\n- `wh repo list [org]` — List repos\n- `wh repo view [org/repo]` — Repo details\n\n### org — Organization management\n- `wh org create <name> [--display-name]` — Create a new organization\n- `wh org view <name>` — View organization details (alias: info)\n- `wh org list` — List all organizations\n\n### sub — Subscription management\n- `wh sub create <name> [flags]` — Create a subscription\n- `wh sub view <name>` — View subscription details\n- `wh sub list` — List all subscriptions\n- `wh sub log <name>` — Tail subscription delivery feed\n- `wh sub attempts <runId>` — Show attempt history for a run\n- `wh sub pause <name>` — Pause a subscription\n- `wh sub resume <name>` — Resume a paused subscription\n- `wh sub bind <name> [--credentials]` — Bind a credential set to a subscription for webhook auth\n- `wh sub unbind <name>` — Remove credential binding from a subscription\n- `wh sub delete <name>` — Delete a subscription\n\n### notifications — Action notification listing\n- `wh notifications [--limit] [--since]` — List repo-scoped action notifications\n\n### credential — Credential set management\n- `wh credential create <name> [--repo org/repo | --org org] [--scope] [--description]` — Create an empty credential set\n- `wh credential list [--repo org/repo | --org org]` — List credential sets accessible from a repo or org\n- `wh credential view <name> [--repo org/repo | --org org]` — View a credential set (key names only, no values)\n- `wh credential delete <name> [--repo org/repo | --org org]` — Delete a credential set and its Vault object\n- `wh credential set <setName> [<keyName>] [--repo org/repo | --org org] [--value]` — Set credential key(s). With `<keyName>`: single-key form (reads value from `--value` or stdin). Without `<keyName>`: batch form (reads JSON object from stdin, e.g. `{\"KEY\":\"val\"}`)\n- `wh credential unset <setName> <keyName> [--repo org/repo | --org org]` — Remove a key from a credential set\n- `wh credential audit <setName> [--repo org/repo | --org org]` — View audit log for a credential set\n- `wh credential revoke <setName> [--repo org/repo | --org org] [--reason]` — Revoke a credential set (blocks new binds and stops bound webhook deliveries)\n\n### component — Component management\n- `wh component validate <path>` — Validate package\n- `wh component install <org/name>` — Install a registered component\n- `wh component register <name> --org <org> --manifest <path> [flags]` — Register component identity\n- `wh component unregister <org/name>` — Remove a registered component identity\n- `wh component registry list --org <org>` — List registered components\n- `wh component registry view <org/name>` — View a registered component\n- `wh component registry update <org/name> [flags]` — Update a registered component\n- `wh component list` — List installed components\n- `wh component update <org/name>` — Update installed component\n- `wh component view <org/name>` — Show component details (alias: show)\n- `wh component doctor <org/name>` — Run component health checks\n- `wh component teardown <org/name>` — Pause component subscriptions\n\n### Getting More Info\n- `wh help` — help overview\n- `wh <domain>` — domain verbs\n- `wh <domain> <verb> --help` — verb flags and examples\n- `wh help --format json` — `CliSpecV2` (`schemaVersion: 2`): global/contextual/root tables and command overrides\n\n## Common Workflows\n\n**Explore a repo:**\n```bash\nwh thing list --repo org/repo             # see all things in HEAD\nwh thing view Shape/name --repo org/repo  # inspect a specific thing\nwh thing history Shape/name --repo org/repo # inspect version history\nwh thing about Shape/name                 # assertions about thing/shape\n```\n\n**Create an assertion** (most common write):\n```bash\n# --about takes an untyped target wref: Shape or Shape/name.\nwh assertion create --shape MyShape --about TargetShape/target-name \\\n  --name my-assertion --data '{\"field_a\":1,\"field_b\":\"value\"}' --repo org/repo\n# Output includes per-operation status; relay failures when present.\n```\n\n**Create via write entrypoint** (alternative, supports batches and streams):\n```bash\nwh commit submit --add my-item --shape MyShape --kind assertion \\\n  --about TargetShape/target-name --data '{\"field_a\":1}' --repo org/repo\n```\n\n**Batch write via file** (generate template → edit → submit):\n```bash\nwh shape template Hypothesis Evidence -o ops.json    # add --kind assertion --about TargetShape/name for assertions\n# edit ops.json — fill FILL_IN placeholders\nwh commit submit --file ops.json -m \"batch update\"   # submit all operations (bare `wh commit` is equivalent)\n# --file format: docs.warmhub.ai/cli-reference/commit-operations\n```\n\n**Bulk write (JSONL stream, >1k ops)** — one chunked stream beats per-record commits (~60× faster):\n```bash\nwh shape template MyShape -o ops.jsonl                          # one op per line (.jsonl)\nID=\"bulk-$(date +%s)\"   # caller id for chunk correlation\nwh commit submit --file ops.jsonl --stream-id \"$ID\" --chunk-size 5000 \\\n  --skip-existing --progress -m \"bulk ingest\" --repo org/repo\n# --chunk-size: ops per append chunk (default 1000, max 10000); chunk≈1 is ~60× slower\n# --skip-existing: skips already-written add ops (drops per-row read-before-write)\n# Add-only restart: rerun the WHOLE file. --skip-existing makes fixed-name adds\n# idempotent; --stream-id only identifies the submission. Mid-stream resume is\n# not a CLI mode. Revise/retract JSONL is not full-rerun safe after an ambiguous\n# append; inspect repo state and reconcile.\n```\n\n**Create collections:**\n```bash\nwh commit submit --type arc --name route --members Location/a,Location/b --repo org/repo\nwh assertion create --shape Supports --name route-support --about Arc/route --data '{\"confidence\":0.8}' --repo org/repo\n```\n\n**Modify data:**\n```bash\nwh thing revise Shape/name --data '{\"x\":5,\"y\":3}' -m \"update\" --repo org/repo\nwh thing retract Shape/old-item -m \"withdrawn\" --reason \"data feed contaminated\" --repo org/repo\n```\n\n**Query and filter:**\n```bash\nwh thing query --shape MyShape                       # by shape\nwh thing query --kind assertion --about Shape/name   # by kind + target\nwh thing history Shape/name --limit 10               # version history\n```\n\n## Built-in Content shape\n\nWarmHub repos expose three well-known content wrefs:\n- `Content/Readme`  — stored markdown for humans\n- `Content/Agents`  — stored markdown guidance for AI agents\n- `Content/LlmsTxt` — synthesized per-request sitemap (read-only)\n\nFetch via `wh repo content get --kind readme|agents|llms-txt`,\n`client.repo.getReadme/getAgents/getLlmsTxt`, MCP `warmhub_repo_content_get`,\nor raw HTTP `GET /{org}/{repo}/readme.md|agents.md|llms.txt`.\nSee `wh repo describe` → `additionalInformation` for the discovery field.\n\n## Query Discipline\n- Plan the repo, shapes, and wrefs you need before the first query.\n- Gather the needed facts from one repo before switching to another.\n- Do the queries first, then write one complete answer.\n\n## Agent Tips\n- **Always run commands for live data** — this context describes the CLI, not repo contents\n- **Before writing, discover wrefs** — run `wh thing list` or `wh shape list`\n- **Shape field types**: `string`, `number`, `boolean`, `wref`, arrays, optionals, nested objects\n- **Write commands return per-operation results** — relay failures and affected wrefs to the user\n- **Pass data inline** with `--data '{...}'` — do NOT create temp files\n- Add `--json` to any command for machine-readable JSON output\n- **Aliases teach canonical commands** — executing aliases emit a status hint; misleading lifecycle aliases reject and point to `retract`\n- Writes go through `wh commit submit` (or bare `wh commit`) or wrappers (`create`, `revise`, `retract`, `assertion create`). `retract` irreversibly withdraws an identity and creates a history entry.\n- Use `wh doctor` to check environment health\n";
+var prime_content_default = "# WarmHub CLI Context\n> **Context Recovery**: Run `wh prime` after compaction or new session\n\n## Environment\n{{REPO_LINE}}\n\n## Core Concepts\n- **Thing**: A named entity versioned by writes. **Assertion**: A thing that makes a shape-validated claim about another thing.\n- **Shape**: A thing defining data structure; every other thing has one. **Write**: One or more add/revise/retract operations with per-operation results.\n- **wref**: A reference to a thing. Local: `Player` (the shape) or `Player/alice` (a thing with that shape). Cross-repo: `wh:org/repo/Shape` or `wh:org/repo/Shape/name`.\n\n## Versioned Wrefs\n- `Shape` addresses the shape itself; `Shape/name` addresses a thing with that shape. `@vN` pins either.\n- Floating write refs to retracted targets fail; existing pinned versions remain valid.\n- Rename invalidates old spellings, including `@vN`; the new name resolves history.\n- Untyped wrefs accept any thing. `wref<T>` requires the target's shape to be `T`; a shape has no shape, so never satisfies it. `wref?` coalesces only `thing_absent`, never a missing shape.\n\n## Key Workflows\n\n**Write data** (discover shapes → scaffold ops → submit):\n```bash\nwh shape list --repo org/repo                             # list available shapes\nwh shape view ShapeName --repo org/repo                   # inspect fields\nwh shape template ShapeName -o ops.json --repo org/repo   # scaffold write ops (supports --kind assertion)\n# edit ops.json — fill FILL_IN placeholders — then:\nwh commit submit --file ops.json -m \"msg\" --repo org/repo  # submit operations (bare `wh commit` also works)\n# or single assertion (no file needed):\nwh assertion create --shape ShapeName --about Target/name --name my-assertion --data '{\"field\":1}' --repo org/repo\n# Relay failed operation details when present. Never hand-guess ops JSON — use `wh shape template <Shape>`.\n```\n\n**Read data:**\n```bash\nwh thing list --repo org/repo                 # all things at HEAD\nwh thing view Shape/name --repo org/repo      # inspect a thing\nwh thing query --shape MyShape --repo org/repo  # find things by shape\nwh thing about Shape --repo org/repo          # assertions about a shape\nwh assertion list --repo org/repo             # all assertions at HEAD\nwh thing history Shape/name --repo org/repo   # version history\n\n# Batch read — wh thing view is variadic (max 500 wrefs/call):\nwh thing view Player/alice Player/bob               # variadic positionals\nwh thing view --file wrefs.txt --json               # one wref per line\ncat wrefs.txt | wh thing view --format jsonl        # one JSON line per *deduped* requested wref\n```\n\n## Wref Quick Reference\n\nWrites use explicit names and wrefs. Untyped fields, collection members,\nassertion `about`, and committers accept any thing. Create a deterministic\ntarget before referencing it in the same commit.\n\n## Command Reference\n\n**Global flags**: `--repo`, `--format`, `--json`, `--live`\n### thing — Thing operations\n- `wh thing list [--shape] [--kind] [--match] [--include-retracted]` — Current HEAD state\n- `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.\n- `wh thing history [wref] [--shape] [--about] [--include-retracted]` — Version history\n- `wh thing resolve <wref>` — Resolve a wref to its canonical thing identity\n- `wh thing create <name|Shape/name> (--data|--file) [--shape]` — Create\n- `wh thing revise <name> [--data] [--message] [--committer] [--expected-version]` — Revise (CONFLICT if HEAD≠n)\n- `wh thing retract <wref> -m <message> [--reason] [--kind] [--expected-version]` — Retract\n- `wh thing query [--shape] [--kind] [--about] [--match]` — Query by filters\n- `wh thing search <query> [--shape] [--kind] [--about] [--mode]` — Search text\n- `wh thing rename <Shape/oldName> <newName>` — Rename\n- `wh thing refs <wref> [--inbound] [--outbound] [--field]` — Show field references; use `wh thing about` for assertions about the target thing\n- `wh thing about <wref> [--shape] [--match] [--depth] [--resolve-collections] [--role from|to|ends] [--limit] [--include-retracted]` — Show assertions about the target identity; `--resolve-collections` expands bare/@HEAD/@ALL members, `--role` filters direction; not pinned @vN\n\n### commit — Write operations\n- `wh commit submit [--ops|--file|--add|--revise|--retract] [--kind] [--data] [--reason] [--expected-version] [--chunk-size] [--skip-existing] [--progress] [--stream-id]` — Submit operations (bare `wh commit` is equivalent). Use `--file ops.jsonl --stream-id <id> --chunk-size 5000 --skip-existing` for bulk ingest.\n- `wh shape template <shape> [shape2 ...] [--kind] [--operation add|revise|retract] [-o file]` — Generate sample ops\n\n### assertion — Assertion operations\n- `wh assertion list [--about wref] [--shape] [--match] [--include-retracted]` — Browse assertions\n- `wh assertion view <wref> [--version] [--include-retracted]` — Assertion details\n- `wh assertion create --shape <s> --name <n> --about <wref> [--data] [-m] [--committer]` — Create assertion\n- `wh assertion revise <wref> --data <json> [--message] [--committer]` — Revise assertion\n- `wh assertion retract <wref> -m <message> [--reason] [--committer] [--expected-version]` — Retract assertion\n- `wh assertion history <wref> [--include-retracted]` — Assertion history\n\n### shape — Shape management\n- `wh shape list [--match] [--include-retracted]` — List all shapes\n- `wh shape view <name> [--include-retracted]` — Shape details\n- `wh shape revise <name> (--fields|--file)`\n- `wh shape create <name> (--fields|--file)`\n- `wh shape retract <name> -m <message> [--reason] [--expected-version]` — Retract shape\n- `wh shape history <name> [--include-retracted]` — Shape history\n- `wh shape rename <oldName> <newName>` — Rename shape\n\n### repo — Repository management\n- `wh repo create <org/name> [--display-name] [--description] [--visibility]` — Create repo\n- `wh repo list [org]` — List repos\n- `wh repo view [org/repo]` — Repo details\n\n### org — Organization management\n- `wh org create <name> [--display-name]` — Create a new organization\n- `wh org view <name>` — View organization details (alias: info)\n- `wh org list` — List all organizations\n\n### sub — Subscription management\n- `wh sub create <name> [flags]` — Create a subscription\n- `wh sub view <name>` — View subscription details\n- `wh sub list` — List all subscriptions\n- `wh sub log <name>` — Tail subscription delivery feed\n- `wh sub attempts <runId>` — Show attempt history for a run\n- `wh sub pause <name>` — Pause a subscription\n- `wh sub resume <name>` — Resume a paused subscription\n- `wh sub bind <name> [--credentials]` — Bind a credential set to a subscription for webhook auth\n- `wh sub unbind <name>` — Remove credential binding from a subscription\n- `wh sub delete <name>` — Delete a subscription\n\n### notifications — Action notification listing\n- `wh notifications [--limit] [--since]` — List repo-scoped action notifications\n\n### credential — Credential set management\n- `wh credential create <name> [--repo org/repo | --org org] [--scope] [--description]` — Create an empty credential set\n- `wh credential list [--repo org/repo | --org org]` — List credential sets accessible from a repo or org\n- `wh credential view <name> [--repo org/repo | --org org]` — View a credential set (key names only, no values)\n- `wh credential delete <name> [--repo org/repo | --org org]` — Delete a credential set and its Vault object\n- `wh credential set <setName> [<keyName>] [--repo org/repo | --org org] [--value]` — Set credential key(s). With `<keyName>`: single-key form (reads value from `--value` or stdin). Without `<keyName>`: batch form (reads JSON object from stdin, e.g. `{\"KEY\":\"val\"}`)\n- `wh credential unset <setName> <keyName> [--repo org/repo | --org org]` — Remove a key from a credential set\n- `wh credential audit <setName> [--repo org/repo | --org org]` — View audit log for a credential set\n- `wh credential revoke <setName> [--repo org/repo | --org org] [--reason]` — Revoke a credential set (blocks new binds and stops bound webhook deliveries)\n\n### component — Component management\n- `wh component validate <path>` — Validate package\n- `wh component install <org/name>` — Install a registered component\n- `wh component register <name> --org <org> --manifest <path> [flags]` — Register component identity\n- `wh component unregister <org/name>` — Remove a registered component identity\n- `wh component registry list --org <org>` — List registered components\n- `wh component registry view <org/name>` — View a registered component\n- `wh component registry update <org/name> [flags]` — Update a registered component\n- `wh component list` — List installed components\n- `wh component update <org/name>` — Update installed component\n- `wh component view <org/name>` — Show component details (alias: show)\n- `wh component doctor <org/name>` — Run component health checks\n- `wh component teardown <org/name>` — Pause component subscriptions\n\n### Getting More Info\n- `wh help` — help overview\n- `wh <domain>` — domain verbs\n- `wh <domain> <verb> --help` — verb flags and examples\n- `wh help --format json` — `CliSpecV2` (`schemaVersion: 2`): global/contextual/root tables and command overrides\n\n## Common Workflows\n\n**Explore a repo:**\n```bash\nwh thing list --repo org/repo             # see all things in HEAD\nwh thing view Shape/name --repo org/repo  # inspect a specific thing\nwh thing history Shape/name --repo org/repo # inspect version history\nwh thing about Shape/name                 # assertions about thing/shape\n```\n\n**Create an assertion** (most common write):\n```bash\n# --about takes an untyped target wref: Shape or Shape/name.\nwh assertion create --shape MyShape --about TargetShape/target-name \\\n  --name my-assertion --data '{\"field_a\":1,\"field_b\":\"value\"}' --repo org/repo\n# Output includes per-operation status; relay failures when present.\n```\n\n**Create via write entrypoint** (alternative, supports batches and streams):\n```bash\nwh commit submit --add my-item --shape MyShape --kind assertion \\\n  --about TargetShape/target-name --data '{\"field_a\":1}' --repo org/repo\n```\n\n**Batch write via file** (generate template → edit → submit):\n```bash\nwh shape template Hypothesis Evidence -o ops.json    # add --kind assertion --about TargetShape/name for assertions\n# edit ops.json — fill FILL_IN placeholders\nwh commit submit --file ops.json -m \"batch update\"   # submit all operations (bare `wh commit` is equivalent)\n# --file format: docs.warmhub.ai/cli-reference/commit-operations\n```\n\n**Bulk write (JSONL stream, >1k ops)** — one chunked stream beats per-record commits (~60× faster):\n```bash\nwh shape template MyShape -o ops.jsonl                          # one op per line (.jsonl)\nID=\"bulk-$(date +%s)\"   # caller id for chunk correlation\nwh commit submit --file ops.jsonl --stream-id \"$ID\" --chunk-size 5000 \\\n  --skip-existing --progress -m \"bulk ingest\" --repo org/repo\n# --chunk-size: ops per append chunk (default 1000, max 10000); chunk≈1 is ~60× slower\n# --skip-existing: skips already-written add ops (drops per-row read-before-write)\n# --stream-id identifies the submission but provides no receipt or resume.\n# After an outcome-unknown append, stop writes and reconcile attempted + unsent\n# work from a later verified checkpoint; never blindly replay revise/retract.\n```\n\n**Create collections:**\n```bash\nwh commit submit --type arc --name route --members Location/a,Location/b --repo org/repo\nwh assertion create --shape Supports --name route-support --about Arc/route --data '{\"confidence\":0.8}' --repo org/repo\n```\n\n**Modify data:**\n```bash\nwh thing revise Shape/name --data '{\"x\":5,\"y\":3}' -m \"update\" --repo org/repo\nwh thing retract Shape/old-item -m \"withdrawn\" --reason \"data feed contaminated\" --repo org/repo\n```\n\n**Query and filter:**\n```bash\nwh thing query --shape MyShape                       # by shape\nwh thing query --kind assertion --about Shape/name   # by kind + target\nwh thing history Shape/name --limit 10               # version history\n```\n\n## Built-in Content shape\n\nWarmHub repos expose three well-known content wrefs:\n- `Content/Readme`  — stored markdown for humans\n- `Content/Agents`  — stored markdown guidance for AI agents\n- `Content/LlmsTxt` — synthesized per-request sitemap (read-only)\n\nFetch via `wh repo content get --kind readme|agents|llms-txt`,\n`client.repo.getReadme/getAgents/getLlmsTxt`, MCP `warmhub_repo_content_get`,\nor raw HTTP `GET /{org}/{repo}/readme.md|agents.md|llms.txt`.\nSee `wh repo describe` → `additionalInformation` for the discovery field.\n\n## Query Discipline\n- Plan the repo, shapes, and wrefs you need before the first query.\n- Gather the needed facts from one repo before switching to another.\n- Do the queries first, then write one complete answer.\n\n## Agent Tips\n- **Always run commands for live data** — this context describes the CLI, not repo contents\n- **Before writing, discover wrefs** — run `wh thing list` or `wh shape list`\n- **Shape field types**: `string`, `number`, `boolean`, `wref`, arrays, optionals, nested objects\n- **Write commands return per-operation results** — relay failures and affected wrefs to the user\n- **Pass data inline** with `--data '{...}'` — do NOT create temp files\n- Add `--json` to any command for machine-readable JSON output\n- **Aliases teach canonical commands** — executing aliases emit a status hint; misleading lifecycle aliases reject and point to `retract`\n- Writes go through `wh commit submit` (or bare `wh commit`) or wrappers (`create`, `revise`, `retract`, `assertion create`). `retract` irreversibly withdraws an identity and creates a history entry.\n- Use `wh doctor` to check environment health\n";
 
 // ../../packages/warmhub-cli/src/domains/prime.ts
 function buildMarkdown(config) {
@@ -45522,6 +45730,9 @@ function renderShapeFieldDiff(out, diff) {
 }
 var retractFlags3 = {
   reason: flag.string({ description: "Reason for retraction (<=500 chars)" }),
+  "expected-version": flag.number({
+    description: "only retract if the target is still at this version (optimistic concurrency)"
+  }),
   message: flag.string({ short: "m", description: "Commit message" }),
   committer: flag.string({
     description: "Committer wref (shape or shaped thing; e.g. Agent/bot-1)"
@@ -45598,16 +45809,18 @@ var handleRevise3 = async (ctx, { flags, args }) => {
 var handleRetract2 = async (ctx, { flags, args }) => {
   const shapeName = args[0];
   if (!shapeName) {
-    usageError("Usage: wh shape retract <name>", "wh shape retract Location");
+    usageError("Usage: wh shape retract <name> [--expected-version <n>]", "wh shape retract Location");
   }
   const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
+  const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh shape retract Location --expected-version 3");
   const c = ctx.colors;
   const result = await ctx.client.commit.apply(org, repo, flags.message ?? `retract shape ${shapeName}`, [
     {
       operation: "retract",
       kind: "shape",
       name: shapeName,
-      ...flags.reason ? { reason: flags.reason } : {}
+      ...flags.reason ? { reason: flags.reason } : {},
+      ...expectedVersion !== undefined ? { expectedVersion } : {}
     }
   ], { committer: flags.committer });
   assertSingleOpSuccess(result);
@@ -49120,7 +49333,7 @@ function resolveLogLevel(flagLevel, env) {
 // package.json
 var package_default3 = {
   name: "@warmhub/cli",
-  version: "0.84.3",
+  version: "0.86.0",
   private: false,
   type: "module",
   description: "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -49737,5 +49950,5 @@ process.exitCode = interceptedExitCode === undefined ? await runPreparedCli(laun
   version: package_default3.version
 }) : interceptedExitCode;
 
-//# debugId=5B259BBB96D29C3364756E2164756E21
-//# warmhub-cli-build-info {"cliVersion":"0.84.3","sdkVersion":"0.82.3"}
+//# debugId=864ACFE03DA5766664756E2164756E21
+//# warmhub-cli-build-info {"cliVersion":"0.86.0","sdkVersion":"0.84.0"}