@warmhub/cli 0.99.0 → 0.101.0

package/dist/wh.js

@@ -20466,6 +20466,56 @@ function validateManifestSemantics(manifest) {
   }
   return findings;
 }
+// ../../packages/rules/src/external-contract.ts
+var FORBIDDEN_EXTERNAL_FIELDS = new Set([
+  "_id",
+  "_creationTime",
+  "repoId",
+  "orgId",
+  "thingId",
+  "shapeThingId",
+  "aboutThingId",
+  "currentVersionId",
+  "createdInCommitId",
+  "validatedShapeVersionId"
+]);
+function isObject3(value) {
+  return typeof value === "object" && value !== null;
+}
+function findForbiddenExternalFields(value) {
+  const leaks = [];
+  const seen = new WeakSet;
+  const visit = (current, path) => {
+    if (!isObject3(current))
+      return;
+    if (seen.has(current))
+      return;
+    seen.add(current);
+    if (Array.isArray(current)) {
+      for (const [index, child] of current.entries()) {
+        visit(child, `${path}[${index}]`);
+      }
+      return;
+    }
+    for (const [key, child] of Object.entries(current)) {
+      const nextPath = path === "$" ? `$.${key}` : `${path}.${key}`;
+      if (FORBIDDEN_EXTERNAL_FIELDS.has(key)) {
+        leaks.push({ key, path: nextPath });
+      }
+      visit(child, nextPath);
+    }
+  };
+  visit(value, "$");
+  return leaks;
+}
+function assertNoForbiddenExternalFields(value, context = "external payload") {
+  const leaks = findForbiddenExternalFields(value);
+  if (leaks.length === 0)
+    return;
+  const details = leaks.slice(0, 8).map((leak) => `${leak.path} (${leak.key})`).join(", ");
+  const extra = leaks.length > 8 ? ` (+${leaks.length - 8} more)` : "";
+  throw new Error(`Forbidden external identity field leak in ${context}: ${details}${extra}`);
+}
 // ../../packages/rules/src/field-name-safety.ts
 var ESCAPE_DISPLAY_MAX_CHARS = 120;
 var DANGEROUS_FORMAT_CODEPOINTS = new Set([
@@ -21486,7 +21536,7 @@ __export(exports_util, {
   joinValues: () => joinValues,
   issue: () => issue,
   isPlainObject: () => isPlainObject,
-  isObject: () => isObject3,
+  isObject: () => isObject4,
   hexToUint8Array: () => hexToUint8Array,
   getSizableOrigin: () => getSizableOrigin,
   getParsedType: () => getParsedType,
@@ -21649,7 +21699,7 @@ function slugify(input) {
   return input.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
 }
 var captureStackTrace = "captureStackTrace" in Error ? Error.captureStackTrace : (..._args) => {};
-function isObject3(data) {
+function isObject4(data) {
   return typeof data === "object" && data !== null && !Array.isArray(data);
 }
 var allowsEval = /* @__PURE__ */ cached(() => {
@@ -21668,7 +21718,7 @@ var allowsEval = /* @__PURE__ */ cached(() => {
   }
 });
 function isPlainObject(o) {
-  if (isObject3(o) === false)
+  if (isObject4(o) === false)
     return false;
   const ctor = o.constructor;
   if (ctor === undefined)
@@ -21676,7 +21726,7 @@ function isPlainObject(o) {
   if (typeof ctor !== "function")
     return true;
   const prot = ctor.prototype;
-  if (isObject3(prot) === false)
+  if (isObject4(prot) === false)
     return false;
   if (Object.prototype.hasOwnProperty.call(prot, "isPrototypeOf") === false) {
     return false;
@@ -23885,13 +23935,13 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     }
     return propValues;
   });
-  const isObject4 = isObject3;
+  const isObject5 = isObject4;
   const catchall = def.catchall;
   let value;
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
     const input = payload.value;
-    if (!isObject4(input)) {
+    if (!isObject5(input)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
@@ -24018,7 +24068,7 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
     return (payload, ctx) => fn(shape, payload, ctx);
   };
   let fastpass;
-  const isObject4 = isObject3;
+  const isObject5 = isObject4;
   const jit = !globalConfig.jitless;
   const allowsEval2 = allowsEval;
   const fastEnabled = jit && allowsEval2.value;
@@ -24027,7 +24077,7 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
     const input = payload.value;
-    if (!isObject4(input)) {
+    if (!isObject5(input)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
@@ -24203,7 +24253,7 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
   });
   inst._zod.parse = (payload, ctx) => {
     const input = payload.value;
-    if (!isObject3(input)) {
+    if (!isObject4(input)) {
       payload.issues.push({
         code: "invalid_type",
         expected: "object",
@@ -42856,6 +42906,273 @@ function commitValidateRequestBodyBytes(input) {
   return new TextEncoder().encode(encodeCommitValidateRequestBody(input)).byteLength;
 }
 
+// ../../packages/rules/src/crockford-base32.ts
+var ALPHABET = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
+var DECODE_TABLE = new Uint8Array(256).fill(255);
+for (let i = 0;i < ALPHABET.length; i++) {
+  const ch = ALPHABET.charCodeAt(i);
+  DECODE_TABLE[ch] = i;
+  if (ch >= 65)
+    DECODE_TABLE[ch + 32] = i;
+}
+function encodeBytes(data) {
+  const bitLen = data.length * 8;
+  const charCount = Math.ceil(bitLen / 5);
+  let out = "";
+  for (let i = 0;i < charCount; i++) {
+    const bitPos = i * 5;
+    const byteIdx = bitPos >> 3;
+    const bitOff = bitPos & 7;
+    const b1 = data[byteIdx] ?? 0;
+    let val;
+    if (bitOff <= 3) {
+      val = b1 >> 3 - bitOff & 31;
+    } else {
+      const b2 = data[byteIdx + 1] ?? 0;
+      val = (b1 << bitOff - 3 | b2 >> 11 - bitOff) & 31;
+    }
+    out += ALPHABET[val];
+  }
+  return out;
+}
+function decodeBytes(encoded) {
+  const byteLen = Math.floor(encoded.length * 5 / 8);
+  const bytes = new Uint8Array(byteLen);
+  let bitBuf = 0;
+  let bitsInBuf = 0;
+  let bytePos = 0;
+  for (let i = 0;i < encoded.length; i++) {
+    const ch = encoded.charCodeAt(i);
+    const val = DECODE_TABLE[ch];
+    if (val === undefined || val === 255)
+      return null;
+    bitBuf = bitBuf << 5 | val;
+    bitsInBuf += 5;
+    if (bitsInBuf >= 8) {
+      bitsInBuf -= 8;
+      if (bytePos < byteLen) {
+        bytes[bytePos++] = bitBuf >> bitsInBuf & 255;
+      }
+    }
+  }
+  return bytes;
+}
+
+// ../../packages/rules/src/durable-id.ts
+var THING_SCHEME = 1;
+var REPO_SCHEME = 2;
+var UUID_BYTES = 16;
+var CRC_BYTES = 4;
+function encodedLengthFor(payloadLen) {
+  return Math.ceil((1 + payloadLen + CRC_BYTES) * 8 / 5);
+}
+var CRC32C_TABLE = (() => {
+  const POLY = 2197175160;
+  const table = new Uint32Array(256);
+  for (let i = 0;i < 256; i++) {
+    let crc = i;
+    for (let j = 0;j < 8; j++) {
+      crc = crc & 1 ? crc >>> 1 ^ POLY : crc >>> 1;
+    }
+    table[i] = crc >>> 0;
+  }
+  return table;
+})();
+function crc32c(data) {
+  let crc = 4294967295;
+  for (const byte of data) {
+    crc = (crc >>> 8 ^ (CRC32C_TABLE[(crc ^ byte) & 255] ?? 0)) >>> 0;
+  }
+  return (crc ^ 4294967295) >>> 0;
+}
+function bytesToUuid(bytes, offset = 0) {
+  const hex3 = Array.from(bytes.slice(offset, offset + 16)).map((b) => b.toString(16).padStart(2, "0")).join("");
+  return [
+    hex3.slice(0, 8),
+    hex3.slice(8, 12),
+    hex3.slice(12, 16),
+    hex3.slice(16, 20),
+    hex3.slice(20, 32)
+  ].join("-");
+}
+function unpackToken(scheme, token, payloadLen) {
+  const stripped = token.startsWith("wh:") ? token.slice(3) : token;
+  if (stripped.length !== encodedLengthFor(payloadLen))
+    return null;
+  const raw = decodeBytes(stripped);
+  if (!raw || raw.length !== 1 + payloadLen + CRC_BYTES)
+    return null;
+  if (raw[0] !== scheme)
+    return null;
+  const crcOffset = 1 + payloadLen;
+  const storedCrc = (raw[crcOffset] ?? 0) << 24 | (raw[crcOffset + 1] ?? 0) << 16 | (raw[crcOffset + 2] ?? 0) << 8 | (raw[crcOffset + 3] ?? 0);
+  const computedCrc = crc32c(raw.slice(0, crcOffset));
+  if (storedCrc >>> 0 !== computedCrc >>> 0)
+    return null;
+  if (encodeBytes(raw) !== stripped.toUpperCase())
+    return null;
+  return raw.slice(1, 1 + payloadLen);
+}
+function decodeDurableId(token) {
+  const payload = unpackToken(THING_SCHEME, token, UUID_BYTES * 2);
+  if (!payload)
+    return null;
+  return {
+    repoId: bytesToUuid(payload, 0),
+    thingId: bytesToUuid(payload, UUID_BYTES)
+  };
+}
+var VERSION_SELECTOR_RE = /^(?:v0*[1-9]\d*|[Hh][Ee][Aa][Dd]|[Aa][Ll][Ll])$/;
+function parseDurableReferenceToken(raw) {
+  const at = raw.lastIndexOf("@");
+  const selector = at >= 0 && VERSION_SELECTOR_RE.test(raw.slice(at + 1)) ? raw.slice(at + 1) : null;
+  const core2 = selector === null ? raw : raw.slice(0, at);
+  if (decodeDurableId(core2) === null)
+    return null;
+  const stripped = core2.startsWith("wh:") ? core2.slice(3) : core2;
+  return { durableId: stripped.toUpperCase(), selector };
+}
+function decodeRepoDurableId(token) {
+  const payload = unpackToken(REPO_SCHEME, token, UUID_BYTES);
+  if (!payload)
+    return null;
+  return { repoId: bytesToUuid(payload, 0) };
+}
+
+// ../../packages/rules/src/json-string-walk.ts
+function walkJsonStringLeaves(value, spec) {
+  const { childContext, onStringValue, onObjectKey } = spec;
+  const stack = [{ value, context: spec.rootContext }];
+  while (stack.length > 0) {
+    const { value: current, context } = stack.pop();
+    if (typeof current === "string") {
+      onStringValue(current, context);
+      continue;
+    }
+    if (Array.isArray(current)) {
+      for (let i = current.length - 1;i >= 0; i--) {
+        stack.push({ value: current[i], context: childContext(context, i) });
+      }
+      continue;
+    }
+    if (!isPlainObject2(current))
+      continue;
+    const entries = Object.entries(current).map(([key, nested]) => [key, childContext(context, key), nested]);
+    if (onObjectKey) {
+      for (const [key, keyContext] of entries) {
+        onObjectKey(key, keyContext);
+      }
+    }
+    for (let i = entries.length - 1;i >= 0; i--) {
+      const entry = entries[i];
+      if (entry)
+        stack.push({ value: entry[2], context: entry[1] });
+    }
+  }
+}
+
+// ../../packages/rules/src/durable-token-collection.ts
+function collectDurableTokens(value) {
+  const tokens = new Set;
+  walkJsonStringLeaves(value, {
+    rootContext: { key: null, parentKey: null, insideData: false },
+    childContext: (parent, key) => ({
+      key,
+      parentKey: parent.key,
+      insideData: parent.insideData || key === "data"
+    }),
+    onStringValue: (leaf, context) => {
+      if (context.key === "durableId" && context.parentKey === "metadata" && !context.insideData) {
+        return;
+      }
+      const parsed = parseDurableReferenceToken(leaf);
+      if (parsed)
+        tokens.add(parsed.durableId);
+    }
+  });
+  return tokens;
+}
+
+// ../../packages/sdk-ts/src/decoration.ts
+function buildDecorations(items) {
+  const decorations = {};
+  for (const item of items) {
+    decorations[item.durableId] = item.canonicalWref;
+  }
+  return decorations;
+}
+function isObjectPayload(data) {
+  return typeof data === "object" && data !== null && !Array.isArray(data);
+}
+function getResponseDecorations(result) {
+  if (!isObjectPayload(result))
+    return;
+  const decorations = result.decorations;
+  return isObjectPayload(decorations) ? decorations : undefined;
+}
+function markDecorationFailure(error51) {
+  const marked = error51 instanceof Error ? error51 : new Error(String(error51));
+  return Object.assign(marked, { decorationFailure: true });
+}
+function createDecorationLink(deps) {
+  return () => ({ op, next }) => {
+    if (!deps.enabled || op.type !== "query" || op.path === "thing.headVersions") {
+      return next(op);
+    }
+    return observable((observer) => {
+      let cancelled = false;
+      let upstreamDone = false;
+      let lookupInFlight = false;
+      const maybeComplete = () => {
+        if (!cancelled && upstreamDone && !lookupInFlight) {
+          observer.complete();
+        }
+      };
+      const subscription = next(op).subscribe({
+        next: (envelope) => {
+          const data = envelope.result?.data;
+          if (!isObjectPayload(data)) {
+            observer.next(envelope);
+            return;
+          }
+          const tokens = collectDurableTokens(data);
+          if (tokens.size === 0) {
+            observer.next(envelope);
+            return;
+          }
+          lookupInFlight = true;
+          deps.getClient().thing.headVersions(undefined, undefined, [...tokens]).then(({ items }) => {
+            if (cancelled)
+              return;
+            observer.next({
+              ...envelope,
+              result: {
+                ...envelope.result,
+                data: { ...data, decorations: buildDecorations(items) }
+              }
+            });
+          }).catch((error51) => {
+            if (cancelled)
+              return;
+            observer.error(TRPCClientError.from(markDecorationFailure(error51)));
+          }).finally(() => {
+            lookupInFlight = false;
+            maybeComplete();
+          });
+        },
+        error: (error51) => observer.error(error51),
+        complete: () => {
+          upstreamDone = true;
+          maybeComplete();
+        }
+      });
+      return () => {
+        cancelled = true;
+        subscription.unsubscribe();
+      };
+    });
+  };
+}
 // ../../packages/sdk-ts/src/grant-client.ts
 function createGrantClient(getTrpc, mapError) {
   return {
@@ -44164,7 +44481,7 @@ function createStreamingSubmissionHandle(input, deps) {
 // ../../packages/sdk-ts/package.json
 var package_default = {
   name: "@warmhub/sdk-ts",
-  version: "0.97.0",
+  version: "0.99.0",
   private: false,
   type: "module",
   description: "The TypeScript SDK for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -44342,15 +44659,17 @@ function isProductionApiUrl(apiUrl, productionApiUrl) {
   }
 }
 // ../../packages/sdk-ts/src/index.ts
-var WARMHUB_CLIENT_OPTION_NAMES = [
-  "apiUrl",
-  "fetch",
-  "accessToken",
-  "auth",
-  "functionLogs",
-  "client",
-  "clientFlags"
-];
+var WARMHUB_CLIENT_OPTIONS = {
+  apiUrl: true,
+  fetch: true,
+  accessToken: true,
+  auth: true,
+  functionLogs: true,
+  client: true,
+  clientFlags: true,
+  decorateResponses: true
+};
+var WARMHUB_CLIENT_OPTION_NAMES = Object.keys(WARMHUB_CLIENT_OPTIONS);
 var WARMHUB_CLIENT_OPTION_NAME_SET = new Set(WARMHUB_CLIENT_OPTION_NAMES);
 var ACCESS_TOKEN_OPTION_ALIASES = new Set(["token", "apiKey", "bearer"]);
 function validateWarmHubClientOptions(options) {
@@ -44718,6 +45037,7 @@ class WarmHubClient {
   accessToken;
   clientIdentity;
   clientFlags;
+  decorateResponses;
   functionLogMode;
   getToken;
   compatibilityCheck;
@@ -46673,6 +46993,7 @@ class WarmHubClient {
       version: options?.client?.version ?? SDK_VERSION
     };
     this.clientFlags = normalizeClientFlags(options?.clientFlags);
+    this.decorateResponses = options?.decorateResponses ?? false;
     if (typeof this.accessToken === "function") {
       const provider = this.accessToken;
       this.getToken = async () => await provider();
@@ -46686,6 +47007,10 @@ class WarmHubClient {
       value: createTRPCClient({
         links: [
           this.createCompatibilityLink(),
+          createDecorationLink({
+            enabled: this.decorateResponses,
+            getClient: () => this
+          }),
           splitLink({
             condition: (op) => UNBATCHED_TRPC_PATHS.has(op.path),
             true: httpLink({ url: url2, fetch: fetch2, methodOverride: "POST" }),
@@ -46704,7 +47029,8 @@ class WarmHubClient {
       fetch: this.fetchImpl,
       accessToken,
       client: this.clientIdentity,
-      clientFlags: this.clientFlags
+      clientFlags: this.clientFlags,
+      decorateResponses: this.decorateResponses
     });
   }
   actions = this.action;
@@ -47403,7 +47729,15 @@ function printCliError(err, errWriter, opts = {}) {
 
 // ../../packages/warmhub-cli/src/errors.ts
 function fromWh(exit, kind, err, hint = err.hint) {
-  return new CliError(exit, kind, err.message, err, hint, undefined, err.errorCode);
+  return appendDecorationHint(err, new CliError(exit, kind, err.message, err, hint, undefined, err.errorCode));
+}
+var DECORATION_FAILURE_HINT = "This failure came from the --decorate label lookup; the read itself may be fine. Retry with --no-decorate to skip decoration.";
+function appendDecorationHint(err, cliError) {
+  if (err.decorationFailure !== true)
+    return cliError;
+  const hint = cliError.hint ? `${cliError.hint}
+${DECORATION_FAILURE_HINT}` : DECORATION_FAILURE_HINT;
+  return new CliError(cliError.code, cliError.kind, cliError.message, cliError.cause, hint, cliError.context, cliError.backendCode, cliError.recovery);
 }
 function classifyAuthError(input) {
   if (input.code !== "UNAUTHENTICATED" && input.code !== "FORBIDDEN") {
@@ -47463,7 +47797,7 @@ function toCliError(err) {
       backendCode: err.errorCode
     });
     if (authError)
-      return authError;
+      return appendDecorationHint(err, authError);
     if (isFieldIndexErrorCode(err.code)) {
       const exit = err.code === "FIELD_NOT_INDEXABLE" ? 2 /* UserInput */ : 4 /* Backend */;
       return fromWh(exit, err.code, err);
@@ -48940,11 +49274,18 @@ async function modifyStore(mutator, path) {
     return result;
   });
 }
-async function saveProfileWithFlagsLocked(name, profile, flags, path) {
+async function saveProfileWithFlagsLocked(name, profile, flags, decorate, path) {
   await modifyStore((store) => {
-    const stored = hasProfile(store, name) ? store.profiles[name]?.flags : undefined;
-    const resolved = flags ?? (Array.isArray(stored) ? stored : undefined);
-    setProfile(store, name, resolved?.length ? { ...profile, flags: [...resolved] } : profile);
+    const stored = hasProfile(store, name) ? store.profiles[name] : undefined;
+    const resolvedFlags = flags ?? (Array.isArray(stored?.flags) ? stored.flags : undefined);
+    const resolvedDecorate = decorate ?? stored?.settings?.decorate;
+    const next = { ...profile };
+    if (resolvedFlags?.length)
+      next.flags = [...resolvedFlags];
+    if (resolvedDecorate !== undefined) {
+      next.settings = { decorate: resolvedDecorate };
+    }
+    setProfile(store, name, next);
   }, path);
 }
 async function deleteProfileLocked(name, path) {
@@ -49325,7 +49666,8 @@ function createClient(config2, opts = {}) {
     fetch: createBenchmarkAwareFetch(benchmarkId, opts.signal),
     functionLogs: opts.functionLogs,
     client: cliClientIdentity(),
-    clientFlags: opts.clientFlags
+    clientFlags: opts.clientFlags,
+    decorateResponses: opts.decorateResponses
   });
 }
 function createUnauthenticatedClient(config2, opts = {}) {
@@ -49335,7 +49677,8 @@ function createUnauthenticatedClient(config2, opts = {}) {
     fetch: createBenchmarkAwareFetch(benchmarkId, opts.signal),
     functionLogs: opts.functionLogs,
     client: cliClientIdentity(),
-    clientFlags: opts.clientFlags
+    clientFlags: opts.clientFlags,
+    decorateResponses: opts.decorateResponses
   });
 }
 function wantsStructuredLiveOutput(format) {
@@ -49369,7 +49712,8 @@ async function runLive(opts) {
     fetch: createBenchmarkAwareFetch(benchmarkId, controller.signal),
     functionLogs: opts.functionLogs,
     client: cliClientIdentity(),
-    clientFlags: opts.clientFlags
+    clientFlags: opts.clientFlags,
+    decorateResponses: opts.decorateResponses
   });
   if (opts.signal) {
     if (opts.signal.aborted)
@@ -49724,6 +50068,24 @@ var FLAG_CATALOG = [
       description: "Emit a dispatch plan; commit submit instead runs server validation"
     }
   },
+  {
+    scope: "global",
+    spec: {
+      long: "decorate",
+      type: "boolean",
+      description: "Resolve durable-id references to labels (default: on; adds label lookups when references are present)",
+      conflictsWith: ["no-decorate"]
+    }
+  },
+  {
+    scope: "global",
+    spec: {
+      long: "no-decorate",
+      type: "boolean",
+      description: "Render durable-id references as raw tokens (no lookup)",
+      conflictsWith: ["decorate"]
+    }
+  },
   {
     scope: "root",
     spec: {
@@ -49733,6 +50095,11 @@ var FLAG_CATALOG = [
     }
   }
 ];
+function explicitDecorateFlag(flags) {
+  if (flags["no-decorate"] === true)
+    return false;
+  return typeof flags.decorate === "boolean" ? flags.decorate : undefined;
+}
 var GLOBAL_FLAG_SPECS = FLAG_CATALOG.filter((entry) => entry.scope === "global").map((entry) => entry.spec);
 var CONTEXTUAL_CONTROL_SPECS = FLAG_CATALOG.filter((entry) => entry.scope === "contextual").map((entry) => entry.spec);
 var ROOT_CONTROL_SPECS = FLAG_CATALOG.filter((entry) => entry.scope === "root").map((entry) => entry.spec);
@@ -50251,6 +50618,23 @@ function isInstallSnapshotCacheShape(value) {
   return true;
 }
 
+// ../../packages/warmhub-cli/src/pagination.ts
+async function* paginatePages2(args) {
+  let cursor = args.initialCursor;
+  const seenCursors = new Set(cursor ? [cursor] : []);
+  while (true) {
+    const page = await args.fetchPage(cursor);
+    yield page;
+    if (!page.nextCursor)
+      return;
+    if (seenCursors.has(page.nextCursor)) {
+      throw new CliError(4 /* Backend */, "BACKEND", `${args.title} pagination cursor repeated; aborting pagination to avoid an infinite loop.`, undefined, "Retry the operation. If cursors continue to repeat, report this as a backend pagination issue.");
+    }
+    seenCursors.add(page.nextCursor);
+    cursor = page.nextCursor;
+  }
+}
+
 // ../../packages/warmhub-cli/src/install-snapshot-cache.ts
 var INSTALL_SNAPSHOT_TTL_MS = 5 * 60 * 1000;
 function loadInstallSnapshotCache(repoSlug) {
@@ -50387,15 +50771,15 @@ async function refreshFromSummaries(repoSlug, parsed, activeItems, client, now,
 }
 async function fetchAllSummaries(client, org, repo) {
   const items = [];
-  let cursor;
-  do {
-    const page = await client.component.list(org, repo, {
+  for await (const page of paginatePages2({
+    fetchPage: (cursor) => client.component.list(org, repo, {
       limit: 500,
       cursor
-    });
+    }),
+    title: "Component install snapshot"
+  })) {
     items.push(...page.items);
-    cursor = page.nextCursor;
-  } while (cursor);
+  }
   return items;
 }
 function filterActiveItems(items) {
@@ -50698,55 +51082,27 @@ function findClosest(input, candidates, maxDistance = 2) {
   return best;
 }
 
-// ../../packages/warmhub-cli/src/sanitize.ts
-var FORBIDDEN_EXTERNAL_FIELDS2 = new Set([
-  "_id",
-  "_creationTime",
-  "repoId",
-  "orgId",
-  "thingId",
-  "shapeThingId",
-  "aboutThingId",
-  "currentVersionId",
-  "createdInCommitId",
-  "validatedShapeVersionId"
-]);
-function isObject4(value) {
-  return typeof value === "object" && value !== null;
+// ../../packages/warmhub-cli/src/decorations.ts
+function rowDecorationsSubset(row, decorations) {
+  if (decorations === undefined)
+    return;
+  let subset;
+  for (const id of collectDurableTokens(row)) {
+    const label = decorations[id];
+    if (label === undefined)
+      continue;
+    subset ??= {};
+    subset[id] = label;
+  }
+  return subset;
 }
-function findForbiddenKeys(value) {
-  const leaks = [];
-  const seen = new WeakSet;
-  const visit = (current, path) => {
-    if (!isObject4(current))
-      return;
-    if (seen.has(current))
-      return;
-    seen.add(current);
-    if (Array.isArray(current)) {
-      for (const [index, child] of current.entries()) {
-        visit(child, `${path}[${index}]`);
-      }
-      return;
-    }
-    for (const [key, child] of Object.entries(current)) {
-      const nextPath = path === "$" ? `$.${key}` : `${path}.${key}`;
-      if (FORBIDDEN_EXTERNAL_FIELDS2.has(key)) {
-        leaks.push({ key, path: nextPath });
-      }
-      visit(child, nextPath);
-    }
-  };
-  visit(value, "$");
-  return leaks;
+function mergeDecorations(into, page) {
+  if (page === undefined)
+    return into;
+  return { ...into, ...page };
 }
-function assertNoForbiddenKeys(value, context = "external payload") {
-  const leaks = findForbiddenKeys(value);
-  if (leaks.length === 0)
-    return;
-  const details = leaks.slice(0, 8).map((leak) => `${leak.path} (${leak.key})`).join(", ");
-  const extra = leaks.length > 8 ? ` (+${leaks.length - 8} more)` : "";
-  throw new Error(`Forbidden external identity field leak in ${context}: ${details}${extra}`);
+function withDecorations(result, decorations) {
+  return decorations === undefined ? result : Object.assign(result, { decorations });
 }
 
 // ../../packages/warmhub-cli/src/format.ts
@@ -50791,9 +51147,6 @@ function pinnedWref(c, wref, version2) {
   const base = wref.replace(/@v\d+$/, "");
   return `${c.cyan}${escapeTerminalTextForDisplay(base)}@v${version2}${c.reset}`;
 }
-function formatAffirmedWrefs(c, wrefs) {
-  return wrefs.map((wref) => pinnedWref(c, wref)).join(`${c.dim},${c.reset} `);
-}
 function kindLabel(c, kind) {
   return `${c.dim}${kind}${c.reset}`;
 }
@@ -50934,11 +51287,11 @@ function renderSingleOpSuccess(out, c, chars, op, opts) {
   renderWarningLine(out, c, chars, op);
 }
 function printJson(out, data) {
-  assertNoForbiddenKeys(data, "CLI JSON output");
+  assertNoForbiddenExternalFields(data, "CLI JSON output");
   out(JSON.stringify(data, null, 2));
 }
 function printJsonLine(out, data) {
-  assertNoForbiddenKeys(data, "CLI JSON output");
+  assertNoForbiddenExternalFields(data, "CLI JSON output");
   out(JSON.stringify(data) ?? "null");
 }
 function printJsonl(out, data) {
@@ -50972,6 +51325,7 @@ function pageEnvelope(items, opts) {
   return {
     items,
     ...opts.repoSeq === undefined ? {} : { repoSeq: opts.repoSeq },
+    ...opts.decorations === undefined ? {} : { decorations: opts.decorations },
     page: {
       limit: opts.limit,
       count: items.length,
@@ -50986,11 +51340,22 @@ function writePageOutput(ctx, items, opts, prettyFn) {
     return;
   }
   if (ctx.format === "jsonl") {
-    printJsonl(ctx.out, items);
+    printJsonl(ctx.out, decorateJsonlRows(items, opts.decorations));
     return;
   }
   prettyFn();
 }
+function decorateJsonlRows(items, decorations) {
+  if (decorations === undefined)
+    return items;
+  return items.map((item) => {
+    if (typeof item !== "object" || item === null || Array.isArray(item)) {
+      return item;
+    }
+    const subset = rowDecorationsSubset(item, decorations);
+    return subset === undefined ? item : { ...item, decorations: subset };
+  });
+}
 function emitPartialPageHint(ctx, count, _nextCursor, _limit) {
   if (ctx.format === "json" || ctx.format === "jsonl")
     return;
@@ -51010,6 +51375,110 @@ function identifyCommitSubmitOutput(value) {
   return { schema: COMMIT_SUBMIT_OUTPUT_SCHEMA_ID, ...value };
 }
 
+// ../../packages/warmhub-cli/src/durable-id-style.ts
+var REPO_TOKEN_LEN = 34;
+var HUE_REPO = "8A7C6A";
+var HUE_TIMESTAMP = "7E9BAC";
+var HUE_ENTROPY = "E8C378";
+var HUE_CRC = "74846B";
+var THING_BANDS = [
+  { start: 0, end: 28, weight: "faint", hex: HUE_REPO },
+  { start: 28, end: 37, weight: "normal", hex: HUE_TIMESTAMP },
+  { start: 37, end: 53, weight: "bold", hex: HUE_ENTROPY },
+  { start: 53, end: 60, weight: "faint", hex: HUE_CRC }
+];
+var REPO_BANDS = [
+  { start: 0, end: 28, weight: "faint", hex: HUE_REPO },
+  { start: 28, end: 34, weight: "faint", hex: HUE_CRC }
+];
+function fg(hex3) {
+  const r = Number.parseInt(hex3.slice(0, 2), 16);
+  const g = Number.parseInt(hex3.slice(2, 4), 16);
+  const b = Number.parseInt(hex3.slice(4, 6), 16);
+  return `\x1B[38;2;${r};${g};${b}m`;
+}
+function styleBand(text, band, c) {
+  const weight = band.weight === "bold" ? c.bold : band.weight === "faint" ? c.dim : "";
+  const hue = c.truecolor ? fg(band.hex) : "";
+  const prefix = `${weight}${hue}`;
+  return prefix === "" ? text : `${prefix}${text}${c.reset}`;
+}
+function styleDurableId(token, c) {
+  if (c.reset === "")
+    return token;
+  const parsed = parseDurableReferenceToken(token);
+  if (parsed) {
+    const prefix = token.startsWith("wh:") ? "wh:" : "";
+    const selector = parsed.selector === null ? "" : token.slice(token.lastIndexOf("@"));
+    const core2 = token.slice(prefix.length, token.length - selector.length);
+    return `${dimPart(prefix, c)}${styleBands(core2, THING_BANDS, c)}${dimPart(selector, c)}`;
+  }
+  if (token.length === REPO_TOKEN_LEN && decodeRepoDurableId(token)) {
+    return styleBands(token, REPO_BANDS, c);
+  }
+  return token;
+}
+function dimPart(text, c) {
+  return text === "" ? "" : `${c.dim}${text}${c.reset}`;
+}
+function styleBands(token, bands, c) {
+  let out = "";
+  for (const band of bands) {
+    out += styleBand(token.slice(band.start, band.end), band, c);
+  }
+  return out;
+}
+
+// ../../packages/warmhub-cli/src/reference-display.ts
+function decoratedRef(c, value, decorations) {
+  const parsed = parseDurableReferenceToken(value);
+  if (!parsed)
+    return null;
+  const label = decorations?.[parsed.durableId];
+  if (label === undefined)
+    return styleDurableId(value, c);
+  return labeledRef(c, value, label);
+}
+function labeledRef(c, value, label) {
+  const parsed = parseDurableReferenceToken(value);
+  if (!parsed)
+    return null;
+  const styled = styleDurableId(value, c);
+  const pin = parsed.selector !== null && /^v/i.test(parsed.selector) ? Number.parseInt(parsed.selector.slice(1), 10) : undefined;
+  return `${pinnedWref(c, label, pin)} ${c.dim}(${c.reset}${styled}${c.dim})${c.reset}`;
+}
+function refDisplay(c, value, decorations, version2) {
+  return decoratedRef(c, value, decorations) ?? pinnedWref(c, value, version2);
+}
+function refList(c, wrefs, decorations) {
+  return wrefs.map((wref) => refDisplay(c, wref, decorations)).join(`${c.dim},${c.reset} `);
+}
+var JSON_LINE_STRING_VALUE_RE = /"([^"\\]+)",?$/;
+function jsonLineLabelSuffix(c, rawLine, decorations) {
+  if (decorations === undefined)
+    return "";
+  const match = JSON_LINE_STRING_VALUE_RE.exec(rawLine);
+  if (!match || match[1] === undefined)
+    return "";
+  const parsed = parseDurableReferenceToken(match[1]);
+  const label = parsed ? decorations[parsed.durableId] : undefined;
+  if (label === undefined)
+    return "";
+  return `  ${c.dim}← ${escapeTerminalTextForDisplay(label)}${c.reset}`;
+}
+function renderJsonDataBlock(out, c, data, indent, decorations) {
+  const lines = JSON.stringify(data, null, 2).split(`
+`);
+  for (const line of lines) {
+    out(`${indent}${escapeTerminalTextForDisplay(line)}${jsonLineLabelSuffix(c, line, decorations)}`);
+  }
+}
+function dataPreview(c, data) {
+  const preview = JSON.stringify(data);
+  const truncated = preview.length > 80 ? `${preview.slice(0, 77)}...` : preview;
+  return `${c.dim}${escapeTerminalTextForDisplay(truncated)}${c.reset}`;
+}
+
 // ../../packages/warmhub-cli/src/domains/assertion/shared.ts
 var COLLECTION_TAGS = ["arc", "bond", "pair", "set", "list"];
 function parseAbout(raw) {
@@ -51025,6 +51494,7 @@ function parseAbout(raw) {
 }
 function renderAbout(out, c, result) {
   const target = result.target;
+  const decorations = getResponseDecorations(result);
   const targetKind = target?.kind ?? "thing";
   const targetWref = target?.wref ?? target?.name ?? "(unknown)";
   out(`${c.bold}About:${c.reset} ${pinnedWref(c, targetWref, target?.version)}  ${kindLabel(c, targetKind)}`);
@@ -51040,15 +51510,11 @@ function renderAbout(out, c, result) {
     const wref = a.wref ?? a.name;
     out(`  ${pinnedWref(c, wref, a.version)}  ${kindLabel(c, a.kind ?? "assertion")}`);
     if (Array.isArray(a.affirmedWrefs) && a.affirmedWrefs.length > 0) {
-      out(`    ${c.dim}affirms:${c.reset} ${formatAffirmedWrefs(c, a.affirmedWrefs.map(String))}`);
+      out(`    ${c.dim}affirms:${c.reset} ${refList(c, a.affirmedWrefs.map(String), decorations)}`);
     }
     if (a.data && typeof a.data === "object") {
       out(`    ${c.dim}data:${c.reset}`);
-      const lines = JSON.stringify(a.data, null, 2).split(`
-`);
-      for (const line of lines) {
-        out(`      ${line}`);
-      }
+      renderJsonDataBlock(out, c, a.data, "      ", decorations);
     }
     const children = a.children;
     if (children?.length) {
@@ -51061,11 +51527,7 @@ function renderAbout(out, c, result) {
         out(`    ${c.dim}+--${c.reset} ${pinnedWref(c, childWref)}  ${childKl}`);
         if (child.data) {
           out(`        ${c.dim}data:${c.reset}`);
-          const lines = JSON.stringify(child.data, null, 2).split(`
-`);
-          for (const line of lines) {
-            out(`          ${line}`);
-          }
+          renderJsonDataBlock(out, c, child.data, "          ", decorations);
         }
       }
     }
@@ -51073,9 +51535,10 @@ function renderAbout(out, c, result) {
 }
 async function fetchAllAssertionHeadPages(ctx, org, repo, opts) {
   const items = [];
-  let cursor = opts.cursor;
-  while (true) {
-    const page = await ctx.client.thing.head(org, repo, {
+  let decorations;
+  for await (const page of paginatePages2({
+    initialCursor: opts.cursor,
+    fetchPage: (cursor) => ctx.client.thing.head(org, repo, {
       shape: opts.shape,
       kind: opts.kind,
       match: opts.match,
@@ -51083,20 +51546,21 @@ async function fetchAllAssertionHeadPages(ctx, org, repo, opts) {
       limit: opts.limit,
       cursor,
       ...opts.where ? { where: opts.where } : {}
-    });
+    }),
+    title: "Assertion list"
+  })) {
     items.push(...page.items ?? []);
-    if (!page.nextCursor)
-      break;
-    cursor = page.nextCursor;
+    decorations = mergeDecorations(decorations, getResponseDecorations(page));
   }
-  return { items, nextCursor: undefined };
+  return withDecorations({ items, nextCursor: undefined }, decorations);
 }
 async function fetchAllAssertionAboutPages(ctx, org, repo, wref, opts) {
   const assertions = [];
-  let cursor = opts.cursor;
+  let decorations;
   let target;
-  while (true) {
-    const page = await ctx.client.thing.about(org, repo, wref, {
+  for await (const page of paginatePages2({
+    initialCursor: opts.cursor,
+    fetchPage: (cursor) => ctx.client.thing.about(org, repo, wref, {
       shape: opts.shape,
       match: opts.match,
       depth: opts.depth,
@@ -51105,18 +51569,18 @@ async function fetchAllAssertionAboutPages(ctx, org, repo, wref, opts) {
       limit: opts.limit,
       cursor,
       ...opts.where ? { where: opts.where } : {}
-    });
+    }),
+    title: "Assertion about"
+  })) {
     target = page.target;
     assertions.push(...page.assertions ?? []);
-    if (!page.nextCursor)
-      break;
-    cursor = page.nextCursor;
+    decorations = mergeDecorations(decorations, getResponseDecorations(page));
   }
-  return {
+  return withDecorations({
     target,
     assertions,
     nextCursor: undefined
-  };
+  }, decorations);
 }
 
 // ../../packages/warmhub-cli/src/domains/assertion/mutators.ts
@@ -51302,7 +51766,7 @@ var handleCreate = async (ctx, { flags, args }) => {
 // ../../packages/warmhub-cli/src/domains/thing/shared.ts
 var CROCKFORD_CHARACTER_PATTERN = "0-9A-HJKMNP-TV-Za-hjkmnp-tv-z";
 var VERSION_SUFFIX_PATTERN = String.raw`(?:v0*[1-9]\d*|[Hh][Ee][Aa][Dd]|[Aa][Ll][Ll])`;
-var DURABLE_ID_PATTERN_RE = new RegExp(`^[${CROCKFORD_CHARACTER_PATTERN}]{60}(?:@${VERSION_SUFFIX_PATTERN})?$`);
+var DURABLE_ID_PATTERN_RE = new RegExp(`^(?:wh:)?[${CROCKFORD_CHARACTER_PATTERN}]{60}(?:@${VERSION_SUFFIX_PATTERN})?$`);
 var WREF_SEGMENT = String.raw`[^/?#@:\s$]+`;
 var CANONICAL_WREF_PATTERN_RE = new RegExp(`^wh:${WREF_SEGMENT}/${WREF_SEGMENT}/${WREF_SEGMENT}(?:/${WREF_SEGMENT})*(?:@${VERSION_SUFFIX_PATTERN})?$`);
 function looksLikeDurableId(wref) {
@@ -51343,32 +51807,33 @@ function requireIncrementalCheckpoint(repoSeq, required2) {
 }
 async function collectThingPages(args) {
   const items = [];
-  let cursor = args.initialCursor;
-  const seenCursors = new Set(cursor ? [cursor] : []);
-  while (true) {
-    const page = await args.fetchPage(cursor);
+  let decorations;
+  for await (const page of paginatePages2({
+    initialCursor: args.initialCursor,
+    fetchPage: args.fetchPage,
+    title: args.title
+  })) {
     const pageItems = page.items ?? [];
+    const pageDecorations = getResponseDecorations(page);
     if (args.onPage) {
-      if (!await args.onPage(pageItems)) {
+      if (!await args.onPage(pageItems, pageDecorations)) {
         return { items, nextCursor: undefined };
       }
     } else {
       items.push(...pageItems);
+      decorations = mergeDecorations(decorations, pageDecorations);
     }
     if (!page.nextCursor) {
       requireIncrementalCheckpoint(page.repoSeq, args.requireRepoSeq);
       return {
         items,
         nextCursor: undefined,
-        ...page.repoSeq === undefined ? {} : { repoSeq: page.repoSeq }
+        ...page.repoSeq === undefined ? {} : { repoSeq: page.repoSeq },
+        ...decorations === undefined ? {} : { decorations }
       };
     }
-    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;
   }
+  throw new Error("paginatePages completed without yielding a terminal page");
 }
 async function handleCount(ctx, org, repo, opts) {
   const result = await ctx.client.thing.count(org, repo, opts);
@@ -51454,33 +51919,40 @@ var handleAbout = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
   }
   if (all) {
     const assertions = [];
-    let cur = cursor;
+    let decorations;
     let target;
-    while (true) {
-      const page = await fetchPage(cur);
+    for await (const page of paginatePages2({
+      initialCursor: cursor,
+      fetchPage,
+      title: "Thing about"
+    })) {
       target = target ?? page.target;
       assertions.push(...page.assertions ?? []);
-      if (!page.nextCursor)
-        break;
-      cur = page.nextCursor;
+      decorations = mergeDecorations(decorations, getResponseDecorations(page));
     }
-    const result2 = { target, assertions, nextCursor: undefined };
-    writePageOutput(ctx, assertions, { limit: pageLimit, nextCursor: null }, () => renderAboutResult(ctx.out, ctx.colors, result2, wref));
+    const result2 = withDecorations({ target, assertions, nextCursor: undefined }, decorations);
+    writePageOutput(ctx, assertions, { limit: pageLimit, nextCursor: null, decorations }, () => renderAboutResult(ctx.out, ctx.colors, result2, wref));
     return;
   }
   const result = await fetchPage(cursor);
   if (result.nextCursor) {
     emitPartialPageHint(ctx, result.assertions.length, result.nextCursor, boundedLimit);
   }
-  writePageOutput(ctx, result.assertions, { limit: boundedLimit, nextCursor: result.nextCursor ?? null }, () => renderAboutResult(ctx.out, ctx.colors, result, wref));
+  writePageOutput(ctx, result.assertions, {
+    limit: boundedLimit,
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
+  }, () => renderAboutResult(ctx.out, ctx.colors, result, wref));
 };
 function renderAboutResult(out, c, result, wref) {
+  const decorations = getResponseDecorations(result);
   out(`${c.bold}Assertions about${c.reset} ${pinnedWref(c, wref)}  (${result.assertions.length}${result.nextCursor ? "+" : ""})`);
   if (result.assertions.length === 0) {
     out(`  ${c.dim}(no assertions found)${c.reset}`);
@@ -51490,32 +51962,31 @@ function renderAboutResult(out, c, result, wref) {
     return;
   }
   for (const a of result.assertions) {
-    renderAboutAssertion(out, c, a, "  ");
+    renderAboutAssertion(out, c, a, "  ", decorations);
   }
   if (result.nextCursor) {
     out(`${c.dim}More available. Use --all to fetch every page.${c.reset}`);
   }
 }
-function renderAboutAssertion(out, c, assertion, indent) {
+function renderAboutAssertion(out, c, assertion, indent, decorations) {
   const sname = assertion.shapeName ?? assertion.shape ?? "?";
   const aWref = assertion.wref ?? (assertion.name ? `${sname}/${assertion.name}` : "(unknown)");
   const retractedTag = assertion.active === false ? `  ${c.red}[RETRACTED]${c.reset}` : "";
   out(`${indent}${pinnedWref(c, aWref, assertion.version)}${retractedTag}`);
   if (assertion.aboutWref) {
-    out(`${indent}  ${c.dim}about:${c.reset} ${pinnedWref(c, assertion.aboutWref)}`);
+    out(`${indent}  ${c.dim}about:${c.reset} ${refDisplay(c, assertion.aboutWref, decorations)}`);
   }
   if (assertion.roles?.length) {
     out(`${indent}  ${c.dim}roles:${c.reset} ${assertion.roles.join(", ")}`);
   }
   if (assertion.data && typeof assertion.data === "object") {
-    const preview = JSON.stringify(assertion.data);
-    out(`${indent}  ${c.dim}${preview.length > 80 ? `${preview.slice(0, 77)}...` : preview}${c.reset}`);
+    out(`${indent}  ${dataPreview(c, assertion.data)}`);
   }
   const children = assertion.children;
   if (Array.isArray(children)) {
     for (const child of children) {
       if (child && typeof child === "object") {
-        renderAboutAssertion(out, c, child, `${indent}  `);
+        renderAboutAssertion(out, c, child, `${indent}  `, decorations);
       }
     }
   }
@@ -51609,183 +52080,10 @@ var handleCreate2 = async (ctx, { flags, args }) => {
   }));
 };
 
-// ../../packages/rules/src/crockford-base32.ts
-var ALPHABET = "0123456789ABCDEFGHJKMNPQRSTVWXYZ";
-var DECODE_TABLE = new Uint8Array(256).fill(255);
-for (let i = 0;i < ALPHABET.length; i++) {
-  const ch = ALPHABET.charCodeAt(i);
-  DECODE_TABLE[ch] = i;
-  if (ch >= 65)
-    DECODE_TABLE[ch + 32] = i;
-}
-function encodeBytes(data) {
-  const bitLen = data.length * 8;
-  const charCount = Math.ceil(bitLen / 5);
-  let out = "";
-  for (let i = 0;i < charCount; i++) {
-    const bitPos = i * 5;
-    const byteIdx = bitPos >> 3;
-    const bitOff = bitPos & 7;
-    const b1 = data[byteIdx] ?? 0;
-    let val;
-    if (bitOff <= 3) {
-      val = b1 >> 3 - bitOff & 31;
-    } else {
-      const b2 = data[byteIdx + 1] ?? 0;
-      val = (b1 << bitOff - 3 | b2 >> 11 - bitOff) & 31;
-    }
-    out += ALPHABET[val];
-  }
-  return out;
-}
-function decodeBytes(encoded) {
-  const byteLen = Math.floor(encoded.length * 5 / 8);
-  const bytes = new Uint8Array(byteLen);
-  let bitBuf = 0;
-  let bitsInBuf = 0;
-  let bytePos = 0;
-  for (let i = 0;i < encoded.length; i++) {
-    const ch = encoded.charCodeAt(i);
-    const val = DECODE_TABLE[ch];
-    if (val === undefined || val === 255)
-      return null;
-    bitBuf = bitBuf << 5 | val;
-    bitsInBuf += 5;
-    if (bitsInBuf >= 8) {
-      bitsInBuf -= 8;
-      if (bytePos < byteLen) {
-        bytes[bytePos++] = bitBuf >> bitsInBuf & 255;
-      }
-    }
-  }
-  return bytes;
-}
-
-// ../../packages/rules/src/durable-id.ts
-var THING_SCHEME = 1;
-var REPO_SCHEME = 2;
-var UUID_BYTES = 16;
-var CRC_BYTES = 4;
-function encodedLengthFor(payloadLen) {
-  return Math.ceil((1 + payloadLen + CRC_BYTES) * 8 / 5);
-}
-var CRC32C_TABLE = (() => {
-  const POLY = 2197175160;
-  const table = new Uint32Array(256);
-  for (let i = 0;i < 256; i++) {
-    let crc = i;
-    for (let j = 0;j < 8; j++) {
-      crc = crc & 1 ? crc >>> 1 ^ POLY : crc >>> 1;
-    }
-    table[i] = crc >>> 0;
-  }
-  return table;
-})();
-function crc32c(data) {
-  let crc = 4294967295;
-  for (const byte of data) {
-    crc = (crc >>> 8 ^ (CRC32C_TABLE[(crc ^ byte) & 255] ?? 0)) >>> 0;
-  }
-  return (crc ^ 4294967295) >>> 0;
-}
-function bytesToUuid(bytes, offset = 0) {
-  const hex3 = Array.from(bytes.slice(offset, offset + 16)).map((b) => b.toString(16).padStart(2, "0")).join("");
-  return [
-    hex3.slice(0, 8),
-    hex3.slice(8, 12),
-    hex3.slice(12, 16),
-    hex3.slice(16, 20),
-    hex3.slice(20, 32)
-  ].join("-");
-}
-function unpackToken(scheme, token, payloadLen) {
-  const stripped = token.startsWith("wh:") ? token.slice(3) : token;
-  if (stripped.length !== encodedLengthFor(payloadLen))
-    return null;
-  const raw = decodeBytes(stripped);
-  if (!raw || raw.length !== 1 + payloadLen + CRC_BYTES)
-    return null;
-  if (raw[0] !== scheme)
-    return null;
-  const crcOffset = 1 + payloadLen;
-  const storedCrc = (raw[crcOffset] ?? 0) << 24 | (raw[crcOffset + 1] ?? 0) << 16 | (raw[crcOffset + 2] ?? 0) << 8 | (raw[crcOffset + 3] ?? 0);
-  const computedCrc = crc32c(raw.slice(0, crcOffset));
-  if (storedCrc >>> 0 !== computedCrc >>> 0)
-    return null;
-  if (encodeBytes(raw) !== stripped.toUpperCase())
-    return null;
-  return raw.slice(1, 1 + payloadLen);
-}
-function decodeDurableId(token) {
-  const payload = unpackToken(THING_SCHEME, token, UUID_BYTES * 2);
-  if (!payload)
-    return null;
-  return {
-    repoId: bytesToUuid(payload, 0),
-    thingId: bytesToUuid(payload, UUID_BYTES)
-  };
-}
-function decodeRepoDurableId(token) {
-  const payload = unpackToken(REPO_SCHEME, token, UUID_BYTES);
-  if (!payload)
-    return null;
-  return { repoId: bytesToUuid(payload, 0) };
-}
-
-// ../../packages/warmhub-cli/src/durable-id-style.ts
-var THING_TOKEN_LEN = 60;
-var REPO_TOKEN_LEN = 34;
-var HUE_REPO = "8A7C6A";
-var HUE_TIMESTAMP = "7E9BAC";
-var HUE_ENTROPY = "E8C378";
-var HUE_CRC = "74846B";
-var THING_BANDS = [
-  { start: 0, end: 28, weight: "faint", hex: HUE_REPO },
-  { start: 28, end: 37, weight: "normal", hex: HUE_TIMESTAMP },
-  { start: 37, end: 53, weight: "bold", hex: HUE_ENTROPY },
-  { start: 53, end: 60, weight: "faint", hex: HUE_CRC }
-];
-var REPO_BANDS = [
-  { start: 0, end: 28, weight: "faint", hex: HUE_REPO },
-  { start: 28, end: 34, weight: "faint", hex: HUE_CRC }
-];
-function fg(hex3) {
-  const r = Number.parseInt(hex3.slice(0, 2), 16);
-  const g = Number.parseInt(hex3.slice(2, 4), 16);
-  const b = Number.parseInt(hex3.slice(4, 6), 16);
-  return `\x1B[38;2;${r};${g};${b}m`;
-}
-function bandsFor(token) {
-  if (token.length === THING_TOKEN_LEN && decodeDurableId(token)) {
-    return THING_BANDS;
-  }
-  if (token.length === REPO_TOKEN_LEN && decodeRepoDurableId(token)) {
-    return REPO_BANDS;
-  }
-  return null;
-}
-function styleBand(text, band, c) {
-  const weight = band.weight === "bold" ? c.bold : band.weight === "faint" ? c.dim : "";
-  const hue = c.truecolor ? fg(band.hex) : "";
-  const prefix = `${weight}${hue}`;
-  return prefix === "" ? text : `${prefix}${text}${c.reset}`;
-}
-function styleDurableId(token, c) {
-  if (c.reset === "")
-    return token;
-  const bands = bandsFor(token);
-  if (!bands)
-    return token;
-  let out = "";
-  for (const band of bands) {
-    out += styleBand(token.slice(band.start, band.end), band, c);
-  }
-  return out;
-}
-
 // ../../packages/warmhub-cli/src/domains/thing/render.ts
 function renderHead(out, c, chars, result, org, repo, shape, kind) {
   const items = result.items ?? [];
+  const decorations = getResponseDecorations(result);
   if (!items.length) {
     out(`${c.dim}No items in HEAD${c.reset}`);
     return;
@@ -51799,19 +52097,17 @@ function renderHead(out, c, chars, result, org, repo, shape, kind) {
     const retractedTag = item.active === false ? `  ${c.red}[RETRACTED]${c.reset}` : "";
     out(`  ${wref}  ${kl}${retractedTag}`);
     if (item.kind === "assertion" && item.aboutWref) {
-      out(`    ${c.dim}about:${c.reset} ${pinnedWref(c, item.aboutWref)}`);
+      out(`    ${c.dim}about:${c.reset} ${refDisplay(c, item.aboutWref, decorations)}`);
     }
     if (item.affirmedWrefs?.length) {
-      out(`    ${c.dim}affirms:${c.reset} ${formatAffirmedWrefs(c, item.affirmedWrefs)}`);
+      out(`    ${c.dim}affirms:${c.reset} ${refList(c, item.affirmedWrefs, decorations)}`);
     }
     const fields = shapeName && (item.kind === "thing" || item.kind === "collection") && item.data ? collectionFields(shapeName, item.data) : null;
     if (fields) {
       const allWrefs = fields.flatMap((f) => f.wrefs);
-      out(`    ${allWrefs.map((w) => pinnedWref(c, w)).join(`${c.dim},${c.reset} `)}`);
+      out(`    ${refList(c, allWrefs, decorations)}`);
     } else if (item.data && typeof item.data === "object") {
-      const preview = JSON.stringify(item.data);
-      const truncated = preview.length > 80 ? `${preview.slice(0, 77)}...` : preview;
-      out(`    ${c.dim}${escapeTerminalTextForDisplay(truncated)}${c.reset}`);
+      out(`    ${dataPreview(c, item.data)}`);
     }
     const itemMeta = item.metadata;
     if (itemMeta?.durableId) {
@@ -51821,6 +52117,7 @@ function renderHead(out, c, chars, result, org, repo, shape, kind) {
   out(`${c.dim}${items.length} item(s)${c.reset}`);
 }
 function renderThing(out, c, result) {
+  const decorations = getResponseDecorations(result);
   const wref = result.wref ?? result.name ?? "(unknown)";
   const shapeName = result.shapeName ?? result.shape;
   const displayKind = effectiveKind(result.kind ?? "thing", shapeName);
@@ -51830,14 +52127,14 @@ function renderThing(out, c, result) {
   out(`  ${c.dim}version:${c.reset}   ${result.version ?? "-"}`);
   out(`  ${c.dim}active:${c.reset}    ${String(result.active)}`);
   if (result.committerWref) {
-    out(`  ${c.dim}by:${c.reset}        ${pinnedWref(c, result.committerWref)}`);
+    out(`  ${c.dim}by:${c.reset}        ${refDisplay(c, result.committerWref, decorations)}`);
   }
   const aboutWref = result.aboutWref ?? result.about;
   if (aboutWref) {
-    out(`  ${c.dim}about:${c.reset}     ${escapeTerminalTextForDisplay(String(aboutWref))}`);
+    out(`  ${c.dim}about:${c.reset}     ${decoratedRef(c, String(aboutWref), decorations) ?? escapeTerminalTextForDisplay(String(aboutWref))}`);
   }
   if (result.affirmedWrefs?.length) {
-    out(`  ${c.dim}affirms:${c.reset}   ${formatAffirmedWrefs(c, result.affirmedWrefs)}`);
+    out(`  ${c.dim}affirms:${c.reset}   ${refList(c, result.affirmedWrefs, decorations)}`);
   }
   const meta3 = result.metadata;
   if (meta3?.durableId || meta3?.createdOn || meta3?.revisedOn) {
@@ -51853,31 +52150,27 @@ function renderThing(out, c, result) {
     }
   }
   if (result.collection) {
-    renderCollectionSummary(out, c, result.collection);
+    renderCollectionSummary(out, c, result.collection, decorations);
   }
   const fields = shapeName && result.data ? collectionFields(shapeName, result.data) : null;
   if (fields) {
     for (const field of fields) {
       if (field.wrefs.length === 1) {
         const pad = " ".repeat(Math.max(1, 9 - field.name.length));
-        out(`  ${c.dim}${escapeTerminalTextForDisplay(field.name)}:${c.reset}${pad}${pinnedWref(c, field.wrefs[0])}`);
+        out(`  ${c.dim}${escapeTerminalTextForDisplay(field.name)}:${c.reset}${pad}${refDisplay(c, field.wrefs[0] ?? "", decorations)}`);
       } else {
         out(`  ${c.dim}${escapeTerminalTextForDisplay(field.name)}:${c.reset}`);
         for (const w of field.wrefs) {
-          out(`    ${pinnedWref(c, w)}`);
+          out(`    ${refDisplay(c, w, decorations)}`);
         }
       }
     }
   } else if (result.data) {
     out(`  ${c.dim}data:${c.reset}`);
-    const lines = JSON.stringify(result.data, null, 2).split(`
-`);
-    for (const line of lines) {
-      out(`    ${escapeTerminalTextForDisplay(line)}`);
-    }
+    renderJsonDataBlock(out, c, result.data, "    ", decorations);
   }
 }
-function renderCollectionSummary(out, c, collection) {
+function renderCollectionSummary(out, c, collection, decorations) {
   out(`  ${c.dim}collection:${c.reset} ${collection.type}`);
   out(`  ${c.dim}members:${c.reset}    ${collection.memberCount}`);
   if (collection.fullData)
@@ -51889,19 +52182,12 @@ function renderCollectionSummary(out, c, collection) {
     return;
   out(`  ${c.dim}preview:${c.reset}`);
   for (const wref of preview) {
-    out(`    ${pinnedWref(c, wref)}`);
+    out(`    ${refDisplay(c, wref, decorations)}`);
   }
 }
-function renderDataBlock(out, data, indent) {
-  const lines = JSON.stringify(data, null, 2).split(`
-`);
-  for (const line of lines) {
-    out(`${indent}${escapeTerminalTextForDisplay(line)}`);
-  }
-}
-function renderGraphValue(out, c, value, indent) {
+function renderGraphValue(out, c, value, indent, decorations) {
   if (typeof value === "string") {
-    out(`${indent}${pinnedWref(c, value)}`);
+    out(`${indent}${refDisplay(c, value, decorations)}`);
     return;
   }
   if (value === null || typeof value === "number" || typeof value === "boolean") {
@@ -51910,26 +52196,26 @@ function renderGraphValue(out, c, value, indent) {
   }
   if (Array.isArray(value)) {
     for (const item of value) {
-      renderGraphValue(out, c, item, indent);
+      renderGraphValue(out, c, item, indent, decorations);
     }
     return;
   }
-  renderGraphNode(out, c, value, indent);
+  renderGraphNode(out, c, value, indent, decorations);
 }
-function renderGraphNode(out, c, result, indent = "") {
+function renderGraphNode(out, c, result, indent = "", decorations = undefined) {
   const wref = result.wref ?? result.name ?? "(unknown)";
   const shapeName = result.shapeName ?? result.shape;
   const displayKind = effectiveKind(result.kind ?? "thing", shapeName);
   out(`${indent}${pinnedWref(c, wref, result.version)}  ${kindLabel(c, displayKind)}`);
   if (result.about) {
     out(`${indent}  ${c.dim}about:${c.reset}`);
-    renderGraphValue(out, c, result.about, `${indent}    `);
+    renderGraphValue(out, c, result.about, `${indent}    `, decorations);
   } else if (result.aboutWref) {
-    out(`${indent}  ${c.dim}about:${c.reset} ${pinnedWref(c, result.aboutWref)}`);
+    out(`${indent}  ${c.dim}about:${c.reset} ${refDisplay(c, result.aboutWref, decorations)}`);
   }
   if (result.data) {
     out(`${indent}  ${c.dim}data:${c.reset}`);
-    renderDataBlock(out, result.data, `${indent}    `);
+    renderJsonDataBlock(out, c, result.data, `${indent}    `, decorations);
   }
   const resolved = result.resolved ?? {};
   const resolvedEntries = Object.entries(resolved);
@@ -51937,25 +52223,26 @@ function renderGraphNode(out, c, result, indent = "") {
     out(`${indent}  ${c.dim}resolved:${c.reset}`);
     for (const [fieldPath, value] of resolvedEntries) {
       out(`${indent}    ${c.dim}${escapeTerminalTextForDisplay(fieldPath)}:${c.reset}`);
-      renderGraphValue(out, c, value, `${indent}      `);
+      renderGraphValue(out, c, value, `${indent}      `, decorations);
     }
   }
   const assertions = result.assertions ?? [];
   if (assertions.length > 0) {
     out(`${indent}  ${c.dim}assertions:${c.reset}`);
     for (const assertion of assertions) {
-      renderGraphNode(out, c, assertion, `${indent}    `);
+      renderGraphNode(out, c, assertion, `${indent}    `, decorations);
     }
   }
 }
 function renderThingGraph(out, c, result) {
-  renderGraphNode(out, c, result);
+  renderGraphNode(out, c, result, "", getResponseDecorations(result));
   if (result.graph) {
     const truncated = result.graph.truncated ? " truncated" : "";
     out(`  ${c.dim}graph:${c.reset}     depth=${result.graph.depth} limit=${result.graph.limit}${truncated}`);
   }
 }
 function renderHistory(out, c, result) {
+  const decorations = getResponseDecorations(result);
   if (result.thing && typeof result.thing === "object") {
     const wref = result.thing.wref ?? result.thing.name ?? "(unknown)";
     out(`${c.bold}History: ${pinnedWref(c, wref)}${c.reset}  ${kindLabel(c, effectiveKind(result.thing.kind ?? "thing", result.thing.shapeName))}`);
@@ -51981,13 +52268,13 @@ function renderHistory(out, c, result) {
     const time3 = ver.createdAt ? formatTime(ver.createdAt, now) : "";
     const wref = ver.wref ?? ver.thingName;
     const wrefStr = wref ? pinnedWref(c, wref, ver.version) : "";
-    const by = ver.committerWref ? `  ${c.dim}by${c.reset} ${pinnedWref(c, ver.committerWref)}` : "";
+    const by = ver.committerWref ? `  ${c.dim}by${c.reset} ${refDisplay(c, ver.committerWref, decorations)}` : "";
     const createdOn = ver.metadata?.createdOn;
     const thingCreatedStr = createdOn ? `  ${c.dim}born:${formatTime(createdOn, now)}${c.reset}` : "";
     out(`  ${wrefStr}  ${op}  ${c.dim}${time3}${c.reset}${by}${thingCreatedStr}`);
     const affirmed = ver.affirmedWrefs;
     if (Array.isArray(affirmed) && affirmed.length > 0) {
-      out(`    ${c.dim}affirms:${c.reset} ${formatAffirmedWrefs(c, affirmed.map(String))}`);
+      out(`    ${c.dim}affirms:${c.reset} ${refList(c, affirmed.map(String), decorations)}`);
     }
   }
 }
@@ -51997,11 +52284,12 @@ function renderRefs(out, c, result, wref, direction) {
     out(`${c.dim}No ${direction} refs${c.reset}`);
     return;
   }
+  const decorations = getResponseDecorations(result);
   const label = direction === "inbound" ? "References to" : "Referenced by";
   out(`${c.bold}${label}${c.reset} ${c.cyan}${escapeTerminalTextForDisplay(wref)}${c.reset}`);
   out(`${c.dim}${"─".repeat(60)}${c.reset}`);
   for (const item of items) {
-    const refWref = pinnedWref(c, item.wref, item.version);
+    const refWref = refDisplay(c, item.wref, decorations, item.version);
     const kl = kindLabel(c, effectiveKind(item.kind ?? "thing", item.shapeName));
     const field = `${c.dim}via ${c.reset}${escapeTerminalTextForDisplay(item.fieldPath ?? "(unknown)")}`;
     out(`  ${refWref}  ${kl}  ${field}`);
@@ -52042,7 +52330,8 @@ function renderBatchView(out, c, result, wrefs, flagsVersion) {
     const base = requestedBase.length > 0 ? requestedBase : fallback.replace(/@v\d+$/, "");
     const kl = kindLabel(c, effectiveKind(item.kind ?? "thing", item.shapeName));
     const retractedTag = item.active === false ? `  ${c.red}[RETRACTED]${c.reset}` : "";
-    out(`  ${escapeTerminalTextForDisplay(base)}@v${item.version}  ${kl}${retractedTag}`);
+    const display = labeledRef(c, `${base}@v${item.version}`, fallback) ?? `${escapeTerminalTextForDisplay(base)}@v${item.version}`;
+    out(`  ${display}  ${kl}${retractedTag}`);
   }
   if (result.missing.length > 0) {
     out("Missing:");
@@ -52134,6 +52423,7 @@ var handleHistory = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -52160,15 +52450,17 @@ var handleHistory = async (ctx, { flags, args }) => {
   }
   writePageOutput(ctx, result.versions ?? [], {
     limit: all ? pageLimit : boundedLimit,
-    nextCursor: result.nextCursor ?? null
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
   }, () => renderHistory(ctx.out, ctx.colors, result));
 };
 async function fetchAllHistoryPages(ctx, org, repo, opts) {
   const versions2 = [];
-  let cursor = opts.cursor;
+  let decorations;
   let thing;
-  while (true) {
-    const page = await ctx.client.thing.history(org, repo, {
+  for await (const page of paginatePages2({
+    initialCursor: opts.cursor,
+    fetchPage: (cursor) => ctx.client.thing.history(org, repo, {
       wref: opts.wref,
       shape: opts.shape,
       about: opts.about,
@@ -52176,25 +52468,19 @@ async function fetchAllHistoryPages(ctx, org, repo, opts) {
       resolveCollections: opts.resolveCollections,
       limit: opts.limit,
       cursor
-    });
+    }),
+    title: "Thing history"
+  })) {
     if (!thing && page.thing)
       thing = page.thing;
     versions2.push(...page.versions ?? []);
-    if (!page.nextCursor)
-      break;
-    cursor = page.nextCursor;
+    decorations = mergeDecorations(decorations, getResponseDecorations(page));
   }
-  if (thing) {
-    return {
-      thing,
-      versions: versions2,
-      nextCursor: undefined
-    };
-  }
-  return {
+  return withDecorations({
+    ...thing === undefined ? {} : { thing },
     versions: versions2,
     nextCursor: undefined
-  };
+  }, decorations);
 }
 
 // ../../packages/warmhub-cli/src/domains/thing/lease.ts
@@ -52442,6 +52728,7 @@ var handleHead = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -52459,8 +52746,8 @@ var handleHead = async (ctx, { flags, args }) => {
     excludeInfraShapes,
     where: where.length > 0 ? where : undefined,
     ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
-  }, streamJsonl ? async (items) => {
-    writePageOutput(ctx, items, { limit: pageLimit }, () => {});
+  }, streamJsonl ? async (items, pageDecorations) => {
+    writePageOutput(ctx, items, { limit: pageLimit, decorations: pageDecorations }, () => {});
     return await ctx.flushOut?.() ?? true;
   } : undefined) : await ctx.client.thing.head(org, repo, {
     shape,
@@ -52484,7 +52771,8 @@ var handleHead = async (ctx, { flags, args }) => {
   writePageOutput(ctx, result.items ?? [], {
     limit: all ? pageLimit : boundedLimit,
     nextCursor: result.nextCursor ?? null,
-    ...result.repoSeq === undefined ? {} : { repoSeq: result.repoSeq }
+    ...result.repoSeq === undefined ? {} : { repoSeq: result.repoSeq },
+    decorations: getResponseDecorations(result)
   }, () => renderHead(ctx.out, ctx.colors, ctx.chars, result, org, repo, shape, kind));
 };
 async function fetchAllHeadPages(ctx, org, repo, opts, onPage) {
@@ -52638,6 +52926,7 @@ var handleQuery = async (ctx, { flags }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -52659,8 +52948,8 @@ var handleQuery = async (ctx, { flags }) => {
     excludeInfraShapes,
     where: where.length > 0 ? where : undefined,
     ...sinceRepoSeq === undefined ? {} : { sinceRepoSeq }
-  }, streamJsonl ? async (items) => {
-    writePageOutput(ctx, items, { limit: pageLimit }, () => {});
+  }, streamJsonl ? async (items, pageDecorations) => {
+    writePageOutput(ctx, items, { limit: pageLimit, decorations: pageDecorations }, () => {});
     return await ctx.flushOut?.() ?? true;
   } : undefined) : await ctx.client.thing.query(org, repo, {
     shape,
@@ -52688,7 +52977,8 @@ var handleQuery = async (ctx, { flags }) => {
   writePageOutput(ctx, result.items ?? [], {
     limit: all ? pageLimit : boundedLimit,
     nextCursor: result.nextCursor ?? null,
-    ...result.repoSeq === undefined ? {} : { repoSeq: result.repoSeq }
+    ...result.repoSeq === undefined ? {} : { repoSeq: result.repoSeq },
+    decorations: getResponseDecorations(result)
   }, () => renderQueryResults(ctx.out, c, result));
 };
 async function fetchAllQueryPages(ctx, org, repo, opts, onPage) {
@@ -52718,6 +53008,7 @@ async function fetchAllQueryPages(ctx, org, repo, opts, onPage) {
 }
 function renderQueryResults(out, c, result) {
   const items = result.items ?? [];
+  const decorations = getResponseDecorations(result);
   if (!items.length) {
     out(`${c.dim}No results${c.reset}`);
     return;
@@ -52734,11 +53025,9 @@ function renderQueryResults(out, c, result) {
     const fields = shapeName && (item.kind === "thing" || item.kind === "collection" || !item.kind) && item.data ? collectionFields(shapeName, item.data) : null;
     if (fields) {
       const allWrefs = fields.flatMap((f) => f.wrefs);
-      out(`    ${allWrefs.map((w) => pinnedWref(c, escapeTerminalTextForDisplay(w))).join(`${c.dim},${c.reset} `)}`);
+      out(`    ${refList(c, allWrefs, decorations)}`);
     } else if (item.data && typeof item.data === "object") {
-      const preview = JSON.stringify(item.data);
-      const truncated = preview.length > 80 ? `${preview.slice(0, 77)}...` : preview;
-      out(`    ${c.dim}${truncated}${c.reset}`);
+      out(`    ${dataPreview(c, item.data)}`);
     }
   }
   out(`${c.dim}${items.length} result(s)${c.reset}`);
@@ -52789,16 +53078,17 @@ var handleRefs = async (ctx, { flags, args }) => {
   });
   if (all) {
     const items = [];
-    let cur = cursor;
-    while (true) {
-      const page = await fetchPage(cur);
+    let decorations;
+    for await (const page of paginatePages2({
+      initialCursor: cursor,
+      fetchPage,
+      title: "Thing refs"
+    })) {
       items.push(...page.items ?? []);
-      if (!page.nextCursor)
-        break;
-      cur = page.nextCursor;
+      decorations = mergeDecorations(decorations, getResponseDecorations(page));
     }
-    const result2 = { items, nextCursor: undefined };
-    writePageOutput(ctx, items, { limit: pageLimit, nextCursor: null }, () => renderRefs(ctx.out, ctx.colors, result2, wref, direction));
+    const result2 = withDecorations({ items, nextCursor: undefined }, decorations);
+    writePageOutput(ctx, items, { limit: pageLimit, nextCursor: null, decorations }, () => renderRefs(ctx.out, ctx.colors, result2, wref, direction));
     maybeEmitAboutHint(ctx, direction, items.length, refsQueryIsNarrowed);
     return;
   }
@@ -52806,7 +53096,11 @@ var handleRefs = async (ctx, { flags, args }) => {
   if (result.nextCursor) {
     emitPartialPageHint(ctx, (result.items ?? []).length, result.nextCursor, boundedLimit);
   }
-  writePageOutput(ctx, result.items ?? [], { limit: boundedLimit, nextCursor: result.nextCursor ?? null }, () => renderRefs(ctx.out, ctx.colors, result, wref, direction));
+  writePageOutput(ctx, result.items ?? [], {
+    limit: boundedLimit,
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
+  }, () => renderRefs(ctx.out, ctx.colors, result, wref, direction));
   maybeEmitAboutHint(ctx, direction, result.items?.length ?? 0, refsQueryIsNarrowed);
 };
 function maybeEmitAboutHint(ctx, direction, itemCount, refsQueryIsNarrowed) {
@@ -53072,23 +53366,25 @@ var handleSearch = async (ctx, { flags, args }) => {
     excludeComponents,
     excludeInfraShapes
   });
-  const result = {
+  const result = withDecorations({
     items: rawResult.items ?? [],
     nextCursor: "nextCursor" in rawResult ? rawResult.nextCursor : undefined
-  };
+  }, getResponseDecorations(rawResult));
   if (!all && result.nextCursor) {
     emitPartialPageHint(ctx, result.items.length, result.nextCursor, boundedTextLimit);
   }
   writePageOutput(ctx, result.items, {
     limit: all ? pageLimit : boundedTextLimit,
-    nextCursor: result.nextCursor ?? null
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
   }, () => renderQueryResults(ctx.out, c, result));
 };
 async function fetchAllSearchPages(ctx, org, repo, queryText, opts) {
   const items = [];
-  let cursor = opts.cursor;
-  while (true) {
-    const page = await ctx.client.thing.search(org, repo, queryText, {
+  let decorations;
+  for await (const page of paginatePages2({
+    initialCursor: opts.cursor,
+    fetchPage: (cursor) => ctx.client.thing.search(org, repo, queryText, {
       shape: opts.shape,
       kind: opts.kind,
       about: opts.about,
@@ -53101,13 +53397,13 @@ async function fetchAllSearchPages(ctx, org, repo, queryText, opts) {
       componentRef: opts.componentRef,
       excludeComponents: opts.excludeComponents,
       excludeInfraShapes: opts.excludeInfraShapes
-    });
+    }),
+    title: "Thing search"
+  })) {
     items.push(...page.items ?? []);
-    if (!page.nextCursor)
-      break;
-    cursor = page.nextCursor;
+    decorations = mergeDecorations(decorations, getResponseDecorations(page));
   }
-  return { items, nextCursor: undefined };
+  return withDecorations({ items, nextCursor: undefined }, decorations);
 }
 
 // ../../packages/warmhub-cli/src/domains/thing/view.ts
@@ -53348,6 +53644,7 @@ async function runSingleView(ctx, wref, flags) {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -53373,6 +53670,7 @@ async function runBatchView(ctx, wrefs, flags) {
   const dataMode = validateDataMode(flags["data-mode"]);
   const result = await ctx.client.thing.getMany(org, repo, wrefs, flags.version, { includeRetracted, dataMode });
   if (ctx.format === "jsonl") {
+    const responseDecorations = getResponseDecorations(result);
     for (const event of walkBatchResult(wrefs, result, flags.version)) {
       if (event.kind === "miss") {
         ctx.out(JSON.stringify({
@@ -53384,11 +53682,13 @@ async function runBatchView(ctx, wrefs, flags) {
         ctx.out(JSON.stringify({ requested: event.requested, found: false }));
       } else {
         const { wref: itemWref, ...rest } = event.item;
+        const decorations = rowDecorationsSubset(event.item, responseDecorations);
         ctx.out(JSON.stringify({
           requested: event.requested,
           found: true,
           wref: itemWref,
-          ...rest
+          ...rest,
+          ...decorations === undefined ? {} : { decorations }
         }));
       }
     }
@@ -53633,6 +53933,7 @@ var handleView2 = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -53690,35 +53991,48 @@ var handleHistory2 = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
   }
   const versions2 = [];
-  let cursor = flags.cursor;
   let thing;
   let nextCursor;
-  do {
-    const page = await ctx.client.thing.history(org, repo, {
-      wref,
-      includeRetracted: flags["include-retracted"],
-      limit,
-      cursor
-    });
-    thing = thing ?? page.thing;
+  let decorations;
+  const fetchPage = (cursor) => ctx.client.thing.history(org, repo, {
+    wref,
+    includeRetracted: flags["include-retracted"],
+    limit,
+    cursor
+  });
+  if (flags.all) {
+    for await (const page of paginatePages2({
+      initialCursor: flags.cursor,
+      fetchPage,
+      title: "Assertion history"
+    })) {
+      thing = thing ?? page.thing;
+      versions2.push(...page.versions ?? []);
+      decorations = mergeDecorations(decorations, getResponseDecorations(page));
+      nextCursor = page.nextCursor;
+    }
+  } else {
+    const page = await fetchPage(flags.cursor);
+    thing = page.thing;
     versions2.push(...page.versions ?? []);
+    decorations = getResponseDecorations(page);
     nextCursor = page.nextCursor;
-    cursor = flags.all ? nextCursor : undefined;
-  } while (cursor);
-  const result = {
+  }
+  const result = withDecorations({
     thing,
     versions: versions2,
     nextCursor: flags.all ? undefined : nextCursor
-  };
+  }, decorations);
   if (!flags.all && result.nextCursor) {
     emitPartialPageHint(ctx, result.versions.length, result.nextCursor, limit);
   }
-  writePageOutput(ctx, result.versions, { limit, nextCursor: result.nextCursor ?? null }, () => renderHistory(ctx.out, ctx.colors, result));
+  writePageOutput(ctx, result.versions, { limit, nextCursor: result.nextCursor ?? null, decorations }, () => renderHistory(ctx.out, ctx.colors, result));
 };
 var listFlags = {
   about: flag.string({
@@ -53815,6 +54129,7 @@ var handleList = async (ctx, { flags, args }) => {
         functionLogs: ctx.functionLogMode,
         profile: ctx.profile,
         clientFlags: ctx.clientFlags,
+        decorateResponses: ctx.decorate,
         signal: ctx.signal
       });
       return;
@@ -53828,7 +54143,8 @@ var handleList = async (ctx, { flags, args }) => {
     }
     writePageOutput(ctx, result2.items ?? [], {
       limit: all ? pageLimit : boundedLimit,
-      nextCursor: result2.nextCursor ?? null
+      nextCursor: result2.nextCursor ?? null,
+      decorations: getResponseDecorations(result2)
     }, () => renderHead(ctx.out, ctx.colors, ctx.chars, result2, org, repo, shape, "assertion"));
     return;
   }
@@ -53859,6 +54175,7 @@ var handleList = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -53887,7 +54204,8 @@ var handleList = async (ctx, { flags, args }) => {
   }
   writePageOutput(ctx, result.assertions ?? [], {
     limit: all ? pageLimit : boundedLimit,
-    nextCursor: result.nextCursor ?? null
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
   }, () => renderAbout(ctx.out, ctx.colors, result));
 };
 
@@ -54043,13 +54361,15 @@ Run \`wh auth login --profile ${explicitProfile}\` to create it.`);
     process.stderr.write(`warning: ignoring malformed client flag "${token}"
 `);
   }
+  const decorate = explicitDecorateFlag(invocation.flags) ?? profileData?.settings?.decorate ?? true;
   const client = args.client ?? createClient(config2, {
     functionLogs: args.functionLogs,
     profile: effectiveProfile,
     signal: args.signal,
-    clientFlags
+    clientFlags,
+    decorateResponses: decorate
   });
-  return { config: config2, profile: effectiveProfile, client, clientFlags };
+  return { config: config2, profile: effectiveProfile, client, clientFlags, decorate };
 }
 
 // ../../packages/warmhub-cli/src/domains/auth-shared.ts
@@ -54063,10 +54383,11 @@ function clientForStoredFlags(ctx, profile) {
     functionLogs: ctx.functionLogMode,
     profile,
     signal: ctx.signal,
-    clientFlags: flags
+    clientFlags: flags,
+    decorateResponses: ctx.decorate
   });
 }
-async function loginWithToken(ctx, profile, explicitFlags) {
+async function loginWithToken(ctx, profile, explicitFlags, explicitDecorate) {
   const c = ctx.colors;
   if (process.stdin.isTTY) {
     throw new CliError(2 /* UserInput */, "USER_INPUT", "No token provided on stdin.", undefined, 'Pipe a JWT token via stdin: echo "$TOKEN" | wh auth login --with-token');
@@ -54103,7 +54424,7 @@ async function loginWithToken(ctx, profile, explicitFlags) {
       source: "token"
     },
     apiUrl: ctx.config.apiUrl
-  }, explicitFlags);
+  }, explicitFlags, explicitDecorate);
   try {
     await clientForStoredFlags(ctx, profile).auth.sync();
   } catch (err) {
@@ -54192,7 +54513,7 @@ async function pollForDeviceToken(params) {
     poll().catch(reject);
   });
 }
-function renderTokenInfo(ctx, info, profileName, apiUrl, identityWref, flags) {
+function renderTokenInfo(ctx, info, profileName, apiUrl, identityWref, flags, decorate) {
   const c = ctx.colors;
   const prefix = profileName ? `${c.bold}${profileName}${c.reset}: ` : "";
   const sourceLabel = {
@@ -54230,6 +54551,9 @@ function renderTokenInfo(ctx, info, profileName, apiUrl, identityWref, flags) {
   if (flags?.length) {
     ctx.status(`  ${c.dim}Client flags:${c.reset} ${flags.join(", ")}`);
   }
+  if (decorate !== undefined && decorate !== null) {
+    ctx.status(`  ${c.dim}Decorate:${c.reset} ${decorate ? "on" : "off"}`);
+  }
 }
 async function fetchIdentityWref(ctx) {
   if (process.env.WH_TOKEN)
@@ -54268,6 +54592,7 @@ function authStatusEntry(info, options) {
     email: info.email ?? null,
     expiresAt: info.expiresAt ?? null,
     flags: options.flags ?? [],
+    decorate: options.decorate ?? null,
     identityWref: options.identityWref ?? null,
     profile: options.profile ?? null,
     source: info.source
@@ -54295,8 +54620,9 @@ var handleLogin = async (ctx, { flags }) => {
     }
   }
   const explicitFlags = requestedFlags.length > 0 ? [...new Set(requestedFlags)].sort() : undefined;
+  const explicitDecorate = explicitDecorateFlag(flags);
   if (flags["with-token"]) {
-    return loginWithToken(ctx, profile, explicitFlags);
+    return loginWithToken(ctx, profile, explicitFlags, explicitDecorate);
   }
   const c = ctx.colors;
   let clientId;
@@ -54305,7 +54631,8 @@ var handleLogin = async (ctx, { flags }) => {
   } catch {
     clientId = await createUnauthenticatedClient(ctx.config, {
       functionLogs: ctx.functionLogMode,
-      clientFlags: ctx.clientFlags
+      clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate
     }).auth.getClientId();
   }
   if (!clientId) {
@@ -54380,7 +54707,7 @@ var handleLogin = async (ctx, { flags }) => {
       source: "device"
     },
     apiUrl: ctx.config.apiUrl
-  }, explicitFlags);
+  }, explicitFlags, explicitDecorate);
   try {
     await clientForStoredFlags(ctx, profile).auth.sync();
   } catch (err) {
@@ -54423,10 +54750,11 @@ var handleStatus = async (ctx, { flags }) => {
       active: true,
       apiUrl: prof.apiUrl,
       flags: Array.isArray(prof.flags) ? prof.flags : [],
+      decorate: prof.settings?.decorate,
       identityWref,
       profile: selectedProfile
     });
-    writeOutput(ctx, authStatusOutput(selectedProfile, [entry]), () => renderTokenInfo(ctx, info, selectedProfile, prof.apiUrl, identityWref, entry.flags));
+    writeOutput(ctx, authStatusOutput(selectedProfile, [entry]), () => renderTokenInfo(ctx, info, selectedProfile, prof.apiUrl, identityWref, entry.flags, entry.decorate));
     return;
   }
   const envToken = process.env.WH_TOKEN;
@@ -54460,10 +54788,11 @@ var handleStatus = async (ctx, { flags }) => {
         active: !envToken && name === activeProfile,
         apiUrl: prof.apiUrl,
         flags: profileFlags,
+        decorate: prof.settings?.decorate,
         identityWref,
         profile: name
       }));
-      prettyEntries.push(() => renderTokenInfo(ctx, info, name, prof.apiUrl, identityWref, profileFlags));
+      prettyEntries.push(() => renderTokenInfo(ctx, info, name, prof.apiUrl, identityWref, profileFlags, prof.settings?.decorate));
     }
   }
   writeOutput(ctx, authStatusOutput(envToken ? null : activeProfile, entries), () => {
@@ -54985,30 +55314,33 @@ function renderMembers(ctx, result) {
     ctx.out(`${c.dim}No members${c.reset}`);
     return;
   }
+  const decorations = getResponseDecorations(result);
   for (const item of result.items) {
     const position = item.position ?? 0;
-    ctx.out(`${String(position).padStart(4, " ")}  ${pinnedWref(c, item.wref)}`);
+    ctx.out(`${String(position).padStart(4, " ")}  ${refDisplay(c, item.wref, decorations)}`);
   }
 }
 function renderContains(ctx, result) {
   const c = ctx.colors;
+  const decorations = getResponseDecorations(result);
   for (const item of result.results) {
     const marker = item.contains ? ctx.chars.check : ctx.chars.cross;
     const color = item.contains ? c.green : c.red;
     const at = item.positions === undefined || item.positions.length === 0 ? "" : ` ${c.dim}@${item.positions.join(",")}${c.reset}`;
-    ctx.out(`${color}${marker}${c.reset} ${pinnedWref(c, item.member)}${at}`);
+    ctx.out(`${color}${marker}${c.reset} ${refDisplay(c, item.member, decorations)}${at}`);
   }
 }
 function renderDiff(ctx, result) {
   const c = ctx.colors;
+  const decorations = getResponseDecorations(result);
   if (result.mode === "ordered") {
     if (result.changed.length === 0) {
       ctx.out(`${c.dim}No ordered differences${c.reset}`);
       return;
     }
     for (const item of result.changed) {
-      const left = item.left?.wref ?? `${c.dim}(none)${c.reset}`;
-      const right = item.right?.wref ?? `${c.dim}(none)${c.reset}`;
+      const left = item.left?.wref ? refDisplay(c, item.left.wref, decorations) : `${c.dim}(none)${c.reset}`;
+      const right = item.right?.wref ? refDisplay(c, item.right.wref, decorations) : `${c.dim}(none)${c.reset}`;
       ctx.out(`${String(item.position).padStart(4, " ")}  ${left} -> ${right}`);
     }
     return;
@@ -55018,10 +55350,10 @@ function renderDiff(ctx, result) {
     return;
   }
   for (const member of result.added) {
-    ctx.out(`${c.green}+${c.reset} ${member.wref}`);
+    ctx.out(`${c.green}+${c.reset} ${refDisplay(c, member.wref, decorations)}`);
   }
   for (const member of result.removed) {
-    ctx.out(`${c.red}-${c.reset} ${member.wref}`);
+    ctx.out(`${c.red}-${c.reset} ${refDisplay(c, member.wref, decorations)}`);
   }
 }
 function renderStats(ctx, result) {
@@ -55412,33 +55744,34 @@ var handleCollectionMembers = async (ctx, { flags, args }) => {
   const pageLimit = flags.all ? Math.min(flags.limit ?? AUTO_PAGE_LIMIT, MAX_PAGE_LIMIT) : boundedLimit;
   if (flags.all) {
     const items = [];
-    let cursor = flags.cursor;
+    let decorations;
     let snapshotVersion = flags.version;
     let firstPage;
-    while (true) {
-      const page = await ctx.client.collection.members(org, repo, wref, {
+    for await (const page of paginatePages2({
+      initialCursor: flags.cursor,
+      fetchPage: (cursor) => ctx.client.collection.members(org, repo, wref, {
         version: snapshotVersion,
         limit: pageLimit,
         cursor
-      });
+      }),
+      title: "Collection members"
+    })) {
       firstPage ??= {
         type: page.type,
         wref: page.wref,
         version: page.version
       };
       items.push(...page.items);
+      decorations = mergeDecorations(decorations, getResponseDecorations(page));
       snapshotVersion ??= page.version;
-      if (!page.nextCursor)
-        break;
-      cursor = page.nextCursor;
     }
-    writeCollectionMembersOutput(ctx, {
+    writeCollectionMembersOutput(ctx, withDecorations({
       type: firstPage?.type ?? "set",
       wref: firstPage?.wref ?? wref,
       version: snapshotVersion ?? firstPage?.version ?? flags.version ?? 1,
       items,
       nextCursor: undefined
-    }, { limit: pageLimit, nextCursor: null });
+    }, decorations), { limit: pageLimit, nextCursor: null, decorations });
     return;
   }
   const result = await ctx.client.collection.members(org, repo, wref, {
@@ -55451,7 +55784,8 @@ var handleCollectionMembers = async (ctx, { flags, args }) => {
   }
   writeCollectionMembersOutput(ctx, result, {
     limit: boundedLimit,
-    nextCursor: result.nextCursor ?? null
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
   });
 };
 function writeCollectionMembersOutput(ctx, result, page) {
@@ -55462,12 +55796,13 @@ function writeCollectionMembersOutput(ctx, result, page) {
       wref: result.wref,
       version: result.version,
       items: result.items,
+      ...page.decorations === undefined ? {} : { decorations: page.decorations },
       page: envelope.page
     });
     return;
   }
   if (ctx.format === "jsonl") {
-    printJsonl(ctx.out, result.items);
+    printJsonl(ctx.out, decorateJsonlRows(result.items, page.decorations));
     return;
   }
   renderMembers(ctx, result);
@@ -55856,6 +56191,24 @@ function identifyCommitSubmitStreamRow(row) {
 // ../../packages/warmhub-cli/src/domains/commit-submit-template.ts
 import { writeFile } from "node:fs/promises";
 var WRITE_TEMPLATE_KINDS = ["thing", "assertion"];
+var COLLECTION_TEMPLATE_SPECS = {
+  Arc: {
+    type: "arc",
+    members: ["Shape/FILL_IN_FROM", "Shape/FILL_IN_TO"]
+  },
+  Bond: {
+    type: "bond",
+    members: ["Shape/FILL_IN_1", "Shape/FILL_IN_2"]
+  },
+  Set: { type: "set", members: ["Shape/FILL_IN"] },
+  List: { type: "list", members: ["Shape/FILL_IN"] }
+};
+function collectionTemplateSpec(shapeName) {
+  if (!isBuiltinCollectionShape(shapeName) || shapeName === "Pair") {
+    return;
+  }
+  return COLLECTION_TEMPLATE_SPECS[shapeName];
+}
 function zeroValueForField(fieldSpec) {
   if (Array.isArray(fieldSpec))
     return [];
@@ -55953,12 +56306,27 @@ var handleTemplate = async (ctx, { flags, args }) => {
   const count = Math.max(1, flags.count ?? 1);
   const operations = [];
   for (const shapeName of shapeNames) {
+    const collectionTemplate = templateKind === "thing" ? collectionTemplateSpec(shapeName) : undefined;
+    const operationKind = collectionTemplate ? "collection" : templateKind;
     if (operationType === "retract") {
       for (let i = 0;i < count; i++) {
         operations.push({
           operation: "retract",
-          kind: templateKind,
-          name: templateKind === "shape" ? shapeName : `${shapeName}/FILL_IN`
+          kind: operationKind,
+          name: operationKind === "shape" ? shapeName : `${shapeName}/FILL_IN`
+        });
+      }
+      continue;
+    }
+    const nameSuffix = count > 1 ? (i) => `my-${shapeName.toLowerCase()}-${i + 1}` : () => `my-${shapeName.toLowerCase()}`;
+    if (collectionTemplate) {
+      for (let i = 0;i < count; i++) {
+        operations.push({
+          operation: operationType,
+          kind: "collection",
+          type: collectionTemplate.type,
+          name: operationType === "add" ? nameSuffix(i) : `${shapeName}/FILL_IN`,
+          members: [...collectionTemplate.members]
         });
       }
       continue;
@@ -55972,7 +56340,6 @@ var handleTemplate = async (ctx, { flags, args }) => {
       aboutPlaceholder = flags.about ? parseCollectionAboutFlag(flags.about) : "Shape/FILL_IN";
     }
     const data = buildTemplateData(fields);
-    const nameSuffix = count > 1 ? (i) => `my-${shapeName.toLowerCase()}-${i + 1}` : () => `my-${shapeName.toLowerCase()}`;
     const affirmedTargetsPlaceholder = templateKind === "assertion" ? { affirmedTargets: [] } : {};
     for (let i = 0;i < count; i++) {
       const op = operationType === "add" ? {
@@ -58891,20 +59258,24 @@ var handleTeardown = async (ctx, { args, flags }) => {
 var DEFAULT_LIMIT = 25;
 async function runGlobalSearchCommand(ctx, args) {
   const c = ctx.colors;
-  const first = await args.fetch({ limit: args.limit, cursor: args.cursor });
-  const items = [...first.items];
-  let nextCursor = first.nextCursor;
+  const items = [];
+  let nextCursor;
   if (args.all) {
-    const seenCursors = new Set(args.cursor ? [args.cursor] : []);
-    while (nextCursor) {
-      if (seenCursors.has(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(nextCursor);
-      const page = await args.fetch({ limit: args.limit, cursor: nextCursor });
+    for await (const page of paginatePages2({
+      initialCursor: args.cursor,
+      fetchPage: (cursor) => args.fetch({ limit: args.limit, cursor }),
+      title: args.title
+    })) {
       items.push(...page.items);
       nextCursor = page.nextCursor;
     }
+  } else {
+    const page = await args.fetch({
+      limit: args.limit,
+      cursor: args.cursor
+    });
+    items.push(...page.items);
+    nextCursor = page.nextCursor;
   }
   if (!args.all && nextCursor) {
     emitPartialPageHint(ctx, items.length, nextCursor, args.limit ?? DEFAULT_LIMIT);
@@ -58928,26 +59299,22 @@ async function runGlobalSearchCommand(ctx, args) {
 
 // ../../packages/warmhub-cli/src/domains/component-list-handlers.ts
 async function fetchComponentPages(client, org, repo, opts) {
-  const firstPage = await client.component.list(org, repo, {
-    limit: opts.limit,
-    cursor: opts.cursor
-  });
-  const items = [...firstPage.items ?? []];
-  let nextCursor = firstPage.nextCursor;
+  const items = [];
+  let nextCursor;
+  const fetchPage = (cursor) => client.component.list(org, repo, { limit: opts.limit, cursor });
   if (opts.all) {
-    const seenCursors = new Set(opts.cursor ? [opts.cursor] : []);
-    while (nextCursor) {
-      if (seenCursors.has(nextCursor)) {
-        throw new CliError(4 /* Backend */, "BACKEND", "Component list 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(nextCursor);
-      const page = await client.component.list(org, repo, {
-        limit: opts.limit,
-        cursor: nextCursor
-      });
+    for await (const page of paginatePages2({
+      initialCursor: opts.cursor,
+      fetchPage,
+      title: "Component list"
+    })) {
       items.push(...page.items ?? []);
       nextCursor = page.nextCursor;
     }
+  } else {
+    const page = await fetchPage(opts.cursor);
+    items.push(...page.items ?? []);
+    nextCursor = page.nextCursor;
   }
   return { items, nextCursor };
 }
@@ -63340,23 +63707,26 @@ var handleList6 = async (ctx, { flags, args }) => {
   const c = ctx.colors;
   const all = flags.all;
   const includeArchived = flags["include-archived"];
-  const firstPage = await ctx.client.repo.list(orgName, {
+  const items = [];
+  let nextCursor;
+  const fetchPage = (cursor) => ctx.client.repo.list(orgName, {
     includeArchived,
     limit: flags.limit,
-    cursor: flags.cursor
+    cursor
   });
-  const items = [...firstPage.items];
-  let nextCursor = firstPage.nextCursor;
   if (all) {
-    while (nextCursor) {
-      const page = await ctx.client.repo.list(orgName, {
-        includeArchived,
-        limit: flags.limit,
-        cursor: nextCursor
-      });
+    for await (const page of paginatePages2({
+      initialCursor: flags.cursor,
+      fetchPage,
+      title: "Repository list"
+    })) {
       items.push(...page.items);
       nextCursor = page.nextCursor;
     }
+  } else {
+    const page = await fetchPage(flags.cursor);
+    items.push(...page.items);
+    nextCursor = page.nextCursor;
   }
   if (!all && nextCursor) {
     emitPartialPageHint(ctx, items.length, nextCursor, Math.min(flags.limit ?? DEFAULT_REPO_LIST_LIMIT, MAX_REPO_LIST_LIMIT));
@@ -63869,34 +64239,47 @@ var handleHistory3 = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
   }
   const versions2 = [];
-  let next = cursor;
   let thing;
   let nextCursor;
-  do {
-    const page = await ctx.client.shape.history(org, repo2, bareName, {
-      includeRetracted,
-      limit: pageLimit,
-      cursor: next
-    });
-    thing = thing ?? page.thing;
+  let decorations;
+  const fetchPage = (pageCursor) => ctx.client.shape.history(org, repo2, bareName, {
+    includeRetracted,
+    limit: pageLimit,
+    cursor: pageCursor
+  });
+  if (all) {
+    for await (const page of paginatePages2({
+      initialCursor: cursor,
+      fetchPage,
+      title: "Shape history"
+    })) {
+      thing = thing ?? page.thing;
+      versions2.push(...page.versions ?? []);
+      decorations = mergeDecorations(decorations, getResponseDecorations(page));
+      nextCursor = page.nextCursor;
+    }
+  } else {
+    const page = await fetchPage(cursor);
+    thing = page.thing;
     versions2.push(...page.versions ?? []);
+    decorations = getResponseDecorations(page);
     nextCursor = page.nextCursor;
-    next = all ? nextCursor : undefined;
-  } while (next);
-  const result = {
+  }
+  const result = withDecorations({
     thing,
     versions: versions2,
     nextCursor: all ? undefined : nextCursor
-  };
+  }, decorations);
   if (!all && result.nextCursor) {
     emitPartialPageHint(ctx, (result.versions ?? []).length, result.nextCursor, pageLimit);
   }
-  writePageOutput(ctx, result.versions ?? [], { limit: pageLimit, nextCursor: result.nextCursor ?? null }, () => renderHistory(ctx.out, ctx.colors, result));
+  writePageOutput(ctx, result.versions ?? [], { limit: pageLimit, nextCursor: result.nextCursor ?? null, decorations }, () => renderHistory(ctx.out, ctx.colors, result));
 };
 
 // ../../packages/warmhub-cli/src/domains/shape/list.ts
@@ -64874,6 +65257,7 @@ var handleLog = async (ctx, { flags, args }) => {
       functionLogs: ctx.functionLogMode,
       profile: ctx.profile,
       clientFlags: ctx.clientFlags,
+      decorateResponses: ctx.decorate,
       signal: ctx.signal
     });
     return;
@@ -66062,13 +66446,22 @@ var handleEvaluate = async (ctx, { args, flags }) => {
   const boundedLimit = Math.min(flags.limit ?? DEFAULT_PAGE_LIMIT, MAX_PAGE_LIMIT);
   const pageLimit = flags.all ? Math.min(flags.limit ?? AUTO_PAGE_LIMIT, MAX_PAGE_LIMIT) : boundedLimit;
   if (flags.all) {
-    const items = await ctx.client.view.evaluateAll(org, repo2, wref, {
-      limit: pageLimit,
-      cursor: flags.cursor
+    const collected = await collectThingPages({
+      initialCursor: flags.cursor,
+      fetchPage: (cursor) => ctx.client.view.evaluate(org, repo2, wref, {
+        limit: pageLimit,
+        cursor
+      }),
+      requireRepoSeq: false,
+      title: "View evaluate"
     });
-    writePageOutput(ctx, items, { limit: pageLimit, nextCursor: null }, () => {
+    writePageOutput(ctx, collected.items, {
+      limit: pageLimit,
+      nextCursor: null,
+      decorations: getResponseDecorations(collected)
+    }, () => {
       ctx.out(`${ctx.colors.bold}View ${escapeTerminalTextForDisplay(wref)}${ctx.colors.reset}`);
-      renderQueryResults(ctx.out, ctx.colors, { items });
+      renderQueryResults(ctx.out, ctx.colors, collected);
     });
     return;
   }
@@ -66079,7 +66472,11 @@ var handleEvaluate = async (ctx, { args, flags }) => {
   if (result.nextCursor) {
     emitPartialPageHint(ctx, result.items.length, result.nextCursor, boundedLimit);
   }
-  writePageOutput(ctx, result.items, { limit: boundedLimit, nextCursor: result.nextCursor ?? null }, () => {
+  writePageOutput(ctx, result.items, {
+    limit: boundedLimit,
+    nextCursor: result.nextCursor ?? null,
+    decorations: getResponseDecorations(result)
+  }, () => {
     const selected = `${result.view.wref}@v${result.view.version}`;
     ctx.out(`${ctx.colors.bold}View ${escapeTerminalTextForDisplay(selected)}${ctx.colors.reset}`);
     renderQueryResults(ctx.out, ctx.colors, result);
@@ -67613,11 +68010,12 @@ async function runPreparedCli(rawArgv, prepared, opts) {
       requestedMode: requestedFunctionLogs
     });
     const localOnlyCommand = isLocalOnlyInvocation(invocation);
-    const { config: config2, client, profile, clientFlags } = localOnlyCommand ? {
+    const { config: config2, client, profile, clientFlags, decorate } = localOnlyCommand ? {
       config: loadConfig(),
       client: createLocalOnlyClient(),
       profile: "default",
-      clientFlags: []
+      clientFlags: [],
+      decorate: true
     } : resolveCliContext({
       invocation,
       format,
@@ -67638,6 +68036,7 @@ async function runPreparedCli(rawArgv, prepared, opts) {
       invocation,
       profile,
       clientFlags,
+      decorate,
       colors,
       chars,
       format,
@@ -67756,7 +68155,7 @@ function resolveLogLevel(flagLevel, env) {
 // package.json
 var package_default3 = {
   name: "@warmhub/cli",
-  version: "0.99.0",
+  version: "0.101.0",
   private: false,
   type: "module",
   description: "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -68381,5 +68780,5 @@ process.exitCode = interceptedExitCode === undefined ? await runPreparedCli(laun
   version: package_default3.version
 }) : interceptedExitCode;
 
-//# debugId=CA32D47F32E428AA64756E2164756E21
-//# warmhub-cli-build-info {"cliVersion":"0.99.0","sdkVersion":"0.97.0"}
+//# debugId=D19F329B93F5B10164756E2164756E21
+//# warmhub-cli-build-info {"cliVersion":"0.101.0","sdkVersion":"0.99.0"}