@warmhub/cli 0.137.0 → 0.139.0

package/dist/wh.js

@@ -18164,7 +18164,8 @@ var COMMIT_OPERATIONS = [
   "revise",
   "retract",
   "reaffirm",
-  "rename"
+  "rename",
+  "remove"
 ];
 var COMMIT_OPERATION_KINDS = [
   "shape",
@@ -43665,7 +43666,11 @@ function normalizeCommitValidationOperations(operations, skipExisting) {
   return operations.map((operation, index) => {
     let normalized;
     try {
-      normalized = toBackendStreamOperation(operation);
+      normalized = operation.operation === "remove" ? {
+        operation: "remove",
+        name: operation.name,
+        expectedVersion: operation.expectedVersion
+      } : toBackendStreamOperation(operation);
     } catch (error51) {
       const message = error51 instanceof Error ? error51.message : String(error51);
       throw new CommitValidationInputError(`Invalid operation at index ${index}: ${message}`);
@@ -44526,7 +44531,7 @@ class PartialStreamSubmissionError extends Error {
 }
 
 class AllStreamOperationsFailedError extends Error {
-  code = "STREAM_ALL_OPERATIONS_FAILED";
+  code;
   receipts;
   result;
   operations;
@@ -44536,6 +44541,7 @@ class AllStreamOperationsFailedError extends Error {
     const primaryFailure = result.operations.find((operation) => operation.status === "error")?.errors[0];
     super(primaryFailure ? `All ${result.operationCount} stream operations failed: ${primaryFailure.message}` : `All ${result.operationCount} stream operations failed.`);
     this.name = "WarmHubError";
+    this.code = primaryFailure && result.operations.every((operation) => operation.status === "error" && operation.errors.length > 0 && operation.errors.every((error51) => error51.code === primaryFailure.code)) ? primaryFailure.code : "STREAM_ALL_OPERATIONS_FAILED";
     this.cause = primaryFailure;
     this.result = result;
     this.receipts = result.receipts;
@@ -44594,6 +44600,7 @@ var DEFINITE_CLIENT_REJECT_CODES = new Set([
   "KIND_MISMATCH",
   "CONFLICT",
   "NAME_TAKEN",
+  "TARGET_REMOVED",
   "ALREADY_RETRACTED",
   "ARCHIVED",
   "RATE_LIMITED",
@@ -44999,6 +45006,11 @@ var currentErrorDetailsSchema = exports_external.discriminatedUnion("reason", [
     name: exports_external.string().min(1),
     takenBy: exports_external.object({ shape: exports_external.string().min(1), durableId: exports_external.string().min(1) }).loose().optional(),
     suggestedName: exports_external.string().min(1).optional()
+  }).loose(),
+  exports_external.object({
+    reason: exports_external.literal("target_removed"),
+    targetDurableId: exports_external.string().min(1),
+    fieldPath: exports_external.string().optional()
   }).loose()
 ]);
 var currentBaseShape = {
@@ -45489,7 +45501,7 @@ function createStreamingSubmissionHandle(input, deps) {
 // ../../packages/sdk-ts/package.json
 var package_default = {
   name: "@warmhub/sdk-ts",
-  version: "0.135.0",
+  version: "0.137.0",
   private: false,
   type: "module",
   description: "The TypeScript SDK for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -45989,7 +46001,11 @@ function toWarmHubError(error51) {
   if (error51 instanceof Error) {
     const warmhubLike = error51;
     if (error51.name === "WarmHubError" && typeof warmhubLike.code === "string") {
-      return new WarmHubError(warmhubLike.code, sanitizeErrorMessage(error51.message), typeof warmhubLike.status === "number" ? warmhubLike.status : undefined, typeof warmhubLike.hint === "string" ? warmhubLike.hint : undefined, typeof warmhubLike.retryAfter === "number" ? warmhubLike.retryAfter : undefined, typeof warmhubLike.errorCode === "string" ? warmhubLike.errorCode : typeof warmhubLike.backendCode === "string" ? warmhubLike.backendCode : undefined, warmhubLike.details);
+      const mapped = new WarmHubError(warmhubLike.code, sanitizeErrorMessage(error51.message), typeof warmhubLike.status === "number" ? warmhubLike.status : undefined, typeof warmhubLike.hint === "string" ? warmhubLike.hint : undefined, typeof warmhubLike.retryAfter === "number" ? warmhubLike.retryAfter : undefined, typeof warmhubLike.errorCode === "string" ? warmhubLike.errorCode : typeof warmhubLike.backendCode === "string" ? warmhubLike.backendCode : undefined, warmhubLike.details);
+      if (isAllFailedStreamError(error51)) {
+        Object.defineProperty(mapped, ALL_OPERATIONS_FAILED, { value: true });
+      }
+      return mapped;
     }
     if (error51.name === "AbortError") {
       return new WarmHubError("CANCELLED", error51.message);
@@ -46001,6 +46017,15 @@ function toWarmHubError(error51) {
   }
   return new WarmHubError("BACKEND", "Unknown SDK error");
 }
+var ALL_OPERATIONS_FAILED = Symbol.for("@warmhub/sdk-ts:allStreamOperationsFailed");
+function isAllFailedStreamError(error51) {
+  if (error51 instanceof AllStreamOperationsFailedError)
+    return true;
+  if (!(error51 instanceof Error))
+    return false;
+  const shape = error51;
+  return shape[ALL_OPERATIONS_FAILED] === true || shape.name === "WarmHubError" && Array.isArray(shape.receipts) && Array.isArray(shape.operations);
+}
 function isWarmHubError(error51) {
   return error51 instanceof WarmHubError;
 }
@@ -46953,7 +46978,8 @@ class WarmHubClient {
           orgName,
           repoName,
           shapeName,
-          includeRetracted: opts?.includeRetracted
+          includeRetracted: opts?.includeRetracted,
+          includeComposition: opts?.includeComposition
         });
       } catch (error51) {
         throw toWarmHubError(error51);
@@ -47672,6 +47698,19 @@ class WarmHubClient {
         throw toWarmHubError(error51);
       }
     },
+    remove: async (orgName, repoName, wref, opts) => {
+      try {
+        return await this.trpc.thing.remove.mutate({
+          orgName,
+          repoName,
+          wref,
+          expectedVersion: opts.expectedVersion,
+          eventRequestId: opts.eventRequestId
+        });
+      } catch (error51) {
+        throw toWarmHubError(error51);
+      }
+    },
     resolve: async (orgName, repoName, wref) => {
       try {
         return await this.trpc.thing.resolve.query({
@@ -48410,6 +48449,8 @@ function classifyConflict(message, code) {
       return "incremental-read-unavailable";
     case "NAME_TAKEN":
       return "name-taken";
+    case "TARGET_REMOVED":
+      return "target-removed";
     case undefined:
     default:
       break;
@@ -48450,6 +48491,8 @@ function conflictHint(message, code) {
       const suggested = /for example "([^"]+)"/.exec(message)?.[1];
       return suggested ? `Another Thing in this repository holds this name. Use "${suggested}" or another free name; retrying the same name cannot succeed.` : "Another Thing in this repository holds this name. Choose another name; retrying the same name cannot succeed.";
     }
+    case "target-removed":
+      return "The referenced Thing was removed and cannot be referenced again. Point the reference at another Thing or drop it; retrying cannot succeed.";
     case "other":
     default:
       return "Resolve the conflicting existing state and try again.";
@@ -48474,6 +48517,7 @@ var TOP_LEVEL_USER_INPUT_CODES = new Set([
 var CONFLICT_SHAPED_CODES = new Set([
   "CONFLICT",
   "NAME_TAKEN",
+  "TARGET_REMOVED",
   "ALREADY_EXISTS",
   "BUILTIN_SHAPE_CONFLICT",
   "ARCHIVED",
@@ -48691,6 +48735,11 @@ function generateSuggestions(code, message, context, errorCode) {
           action: "Choose a name no other Thing in the repository holds (use details.suggestedName when the error carries one)"
         });
         break;
+      case "target-removed":
+        suggestions.push({
+          action: "The referenced Thing was removed (details.targetDurableId names it). Reference another Thing or drop the reference"
+        });
+        break;
       case "lease-held":
         suggestions.push({
           action: "Another holder leased this thing. Back off until the lease expires (leaseExpiresAt / retryAfter), then retry"
@@ -52584,7 +52633,7 @@ function emitPartialPageHint(ctx, count, _nextCursor, _limit) {
 }
 
 // ../../packages/warmhub-cli/src/domains/commit-output-contract-id.ts
-var COMMIT_SUBMIT_OUTPUT_SCHEMA_ID = "wh.commit.submit.result/v0.5";
+var COMMIT_SUBMIT_OUTPUT_SCHEMA_ID = "wh.commit.submit.result/v0.6";
 function identifyCommitSubmitOutput(value) {
   if ("schema" in value) {
     if (value.schema === COMMIT_SUBMIT_OUTPUT_SCHEMA_ID) {
@@ -54439,6 +54488,119 @@ var handleReleaseLease = async (ctx, { flags, args }) => {
   });
 };
 
+// ../../packages/warmhub-cli/src/domains/commit-validation-render.ts
+function renderCommitValidation(ctx, result) {
+  if (ctx.format === "json") {
+    ctx.out(JSON.stringify(result));
+  } else if (ctx.format === "jsonl") {
+    for (const operation of result.operations) {
+      ctx.out(JSON.stringify({ type: "operation", ...operation }));
+    }
+    const { operations: _operations, ...summary } = result;
+    ctx.out(JSON.stringify({ type: "summary", ...summary }));
+  } else {
+    renderPrettyValidation(ctx, result);
+  }
+  const error51 = containedDiagnosticError(validationDiagnostics(result));
+  if (error51)
+    ctx.requestedExitCode = error51.code;
+}
+function renderPrettyValidation(ctx, result) {
+  const c = ctx.colors;
+  const baseline = result.baseline.kind === "repo_seq" ? `repo sequence ${result.baseline.repoSeq}` : "withheld";
+  ctx.out(`${c.dim}validation baseline${c.reset} ${baseline}`);
+  for (const caveat of result.caveats) {
+    ctx.out(`  ${ctx.chars.warn} ${c.dim}${caveat.code}${c.reset} ${caveat.message}`);
+  }
+  for (const operation of result.operations) {
+    const marker = markerFor(operation.status, ctx);
+    ctx.out(`${marker} [${operation.opIndex}] ${operation.operation} ${displayName(c, operation.name)} ${operation.status}`);
+    renderDiagnostics(ctx, operation.status === "error" ? operation.errors : undefined);
+    for (const effect of operation.effects ?? []) {
+      renderEffect(ctx, effect);
+    }
+  }
+  ctx.out(`${c.bold}${result.canCommit ? "can commit" : "cannot commit"}${c.reset} — ${result.counts.wouldApply} would apply, ${result.counts.noop} noop, ${result.counts.error} error`);
+}
+function renderEffect(ctx, effect) {
+  ctx.out(`    ${markerFor(effect.status, ctx)} effect ${effect.effectIndex}: ${effect.operation} ${displayName(ctx.colors, effect.name)} ${effect.status}`);
+  renderDiagnostics(ctx, "errors" in effect ? effect.errors : undefined, 6);
+}
+function renderDiagnostics(ctx, diagnostics, indent = 4) {
+  for (const diagnostic of diagnostics ?? []) {
+    ctx.out(`${" ".repeat(indent)}${diagnostic.code}: ${diagnostic.message}`);
+  }
+}
+function markerFor(status, ctx) {
+  if (status === "error" || status === "discarded")
+    return ctx.chars.cross;
+  if (status === "noop")
+    return ctx.chars.warn;
+  return ctx.chars.check;
+}
+function validationDiagnostics(result) {
+  const diagnostics = [];
+  for (const operation of result.operations) {
+    if (operation.status === "error")
+      diagnostics.push(...operation.errors);
+    for (const effect of operation.effects ?? []) {
+      if ("errors" in effect)
+        diagnostics.push(...effect.errors);
+    }
+  }
+  return diagnostics;
+}
+
+// ../../packages/warmhub-cli/src/domains/thing/remove.ts
+var USAGE = "Usage: wh thing remove <wref|durableId> [--expected-version <n>] [--yes]";
+var EXAMPLE = "wh thing remove Location/cave --yes";
+var removeFlags = {
+  "expected-version": flag.number({
+    description: "only remove if the Thing is still at this version (default: the version read before removing)"
+  }),
+  yes: flag.boolean({ short: "y", description: "Skip confirmation prompt" }),
+  "event-request-id": operationEventRequestIdFlag
+};
+var handleThingRemove = async (ctx, { flags, args }) => {
+  const target = args[0];
+  if (!target)
+    usageError(USAGE, EXAMPLE);
+  const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
+  const c = ctx.colors;
+  let expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh thing remove Location/cave --expected-version 3");
+  let label = target;
+  if (expectedVersion === undefined || !flags.yes && !ctx.dryRun) {
+    const thing = await ctx.client.thing.get(org, repo, target, undefined, {
+      includeRetracted: true
+    });
+    expectedVersion ??= thing.version;
+    label = `${thing.wref} (${thing.metadata?.durableId ?? target})`;
+  }
+  if (ctx.dryRun) {
+    const validation = await ctx.client.commit.validate(org, repo, [
+      { operation: "remove", name: target, expectedVersion }
+    ]);
+    renderCommitValidation(ctx, validation);
+    return;
+  }
+  if (!flags.yes) {
+    const confirmed = await ctx.confirm?.(`Permanently remove ${label} at v${expectedVersion}? This deletes the Thing and all its versions.`);
+    if (!confirmed) {
+      ctx.status("Cancelled");
+      return;
+    }
+  }
+  const eventRequestId = flags["event-request-id"] ?? createOperationEventRequestId();
+  ctx.status(`Operation event request: ${eventRequestId}`);
+  const receipt = await ctx.client.thing.remove(org, repo, target, {
+    eventRequestId,
+    expectedVersion
+  });
+  writeOutput(ctx, receipt, () => {
+    ctx.out(`${c.green}Removed${c.reset} ${displayName(c, label)}`);
+  });
+};
+
 // ../../packages/warmhub-cli/src/domains/thing/rename.ts
 var renameFlags = {
   "event-request-id": operationEventRequestIdFlag
@@ -55115,6 +55277,19 @@ var THING_DOMAIN = defineDomain({
       ],
       handler: handleThingRetract
     },
+    remove: {
+      prime: false,
+      summary: "Permanently delete a thing and all its versions (needs things:delete)",
+      args: "<wref|durableId>",
+      flags: removeFlags,
+      dryRunBehavior: "execute",
+      examples: [
+        "wh thing remove Location/cave --dry-run",
+        "wh thing remove Location/cave --yes",
+        "wh thing remove 040T1QCTF2Y79... --expected-version 3 --yes"
+      ],
+      handler: handleThingRemove
+    },
     query: {
       prime: true,
       summary: "Query things by filters",
@@ -57645,7 +57820,7 @@ var createFlags3 = {
 };
 
 // ../../packages/warmhub-cli/src/domains/commit-stream-output-contract-id.ts
-var COMMIT_SUBMIT_STREAM_ROW_SCHEMA_ID = "wh.commit.submit.stream.row/v0.4";
+var COMMIT_SUBMIT_STREAM_ROW_SCHEMA_ID = "wh.commit.submit.stream.row/v0.5";
 function identify(row) {
   if ("schema" in row) {
     throw new Error("Streaming submission row already defines a schema field");
@@ -57661,12 +57836,68 @@ function identifyCommitSubmitStreamRow(row) {
 
 // ../../packages/warmhub-cli/src/domains/commit-submit-template.ts
 import { writeFile } from "node:fs/promises";
+
+// ../../packages/warmhub-cli/src/domains/shape/composition.ts
+function capturedShapeMembers(shape) {
+  const data = shape.version?.data;
+  if (Array.isArray(data?.composes) && data.composes.length > 0 && !shape.composition) {
+    throw new CliError(4 /* Backend */, "BACKEND", "The server did not return this Shape’s captured composition. Update the server before scaffolding or displaying inherited fields.");
+  }
+  return shape.composition ?? [];
+}
+function effectiveShapeFields(shape) {
+  const data = shape.version?.data;
+  const own = isPlainObject(data?.fields) ? data.fields : {};
+  const fields = structuredClone(own);
+  for (const member of capturedShapeMembers(shape)) {
+    mergeFields(fields, member.fields);
+  }
+  return fields;
+}
+function mergeFields(target, source) {
+  for (const [name, spec] of Object.entries(source)) {
+    const bare = name.endsWith("?") ? name.slice(0, -1) : name;
+    if (name.endsWith("?") && Object.hasOwn(target, bare)) {
+      const required2 = target[bare];
+      if (isPlainObject(required2) && !isTypeSpecObject(required2) && isPlainObject(spec) && !isTypeSpecObject(spec)) {
+        mergeFields(required2, spec);
+      }
+      continue;
+    }
+    const optionalName = `${name}?`;
+    if (!name.endsWith("?") && Object.hasOwn(target, optionalName)) {
+      const optional2 = target[optionalName];
+      delete target[optionalName];
+      Object.defineProperty(target, name, {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: isPlainObject(optional2) && !isTypeSpecObject(optional2) && isPlainObject(spec) && !isTypeSpecObject(spec) ? optional2 : spec
+      });
+    }
+    const current = Object.hasOwn(target, name) ? target[name] : undefined;
+    if (isPlainObject(current) && !isTypeSpecObject(current) && isPlainObject(spec) && !isTypeSpecObject(spec)) {
+      mergeFields(current, spec);
+    } else if (current === undefined) {
+      Object.defineProperty(target, name, {
+        configurable: true,
+        enumerable: true,
+        writable: true,
+        value: spec
+      });
+    }
+  }
+}
+
+// ../../packages/warmhub-cli/src/domains/commit-submit-template.ts
 var WRITE_TEMPLATE_KINDS = ["thing", "assertion"];
-function composesLocalAssertion(shapeData, org, repo) {
+function composesLocalAssertion(shapeData, org, repo, captured = []) {
   const composes = shapeData?.composes;
-  if (!Array.isArray(composes))
-    return false;
-  return composes.some((entry) => {
+  const candidates = [
+    ...Array.isArray(composes) ? composes : [],
+    ...captured.map((entry) => entry.wref)
+  ];
+  return candidates.some((entry) => {
     if (typeof entry !== "string")
       return false;
     const unversioned = entry.replace(/@(HEAD|v\d+)$/i, "");
@@ -57675,7 +57906,9 @@ function composesLocalAssertion(shapeData, org, repo) {
 }
 async function readTemplateShape(ctx, org, repo, shapeName) {
   try {
-    const shape = await ctx.client.shape.get(org, repo, shapeName);
+    const shape = await ctx.client.shape.get(org, repo, shapeName, {
+      includeComposition: true
+    });
     if ((shapeName === "Set" || shapeName === "List") && shape.componentRef !== "warmhub/system") {
       return;
     }
@@ -57722,21 +57955,15 @@ function zeroValueForField(fieldSpec) {
     }
   }
   if (isPlainObject(fieldSpec)) {
-    const result = {};
-    for (const [key, value] of Object.entries(fieldSpec)) {
-      result[key] = zeroValueForField(value);
-    }
-    return result;
+    return buildTemplateData(fieldSpec);
   }
   return null;
 }
 function buildTemplateData(fields) {
-  const data = {};
-  for (const [fieldName, fieldSpec] of Object.entries(fields)) {
-    const key = fieldName.endsWith("?") ? fieldName.slice(0, -1) : fieldName;
-    data[key] = zeroValueForField(fieldSpec);
-  }
-  return data;
+  return Object.fromEntries(Object.entries(fields).map(([fieldName, fieldSpec]) => [
+    fieldName.endsWith("?") ? fieldName.slice(0, -1) : fieldName,
+    zeroValueForField(fieldSpec)
+  ]));
 }
 var templateFlags = {
   operation: flag.string({
@@ -57817,12 +58044,12 @@ var handleTemplate = async (ctx, { flags, args }) => {
     }
     const shapeVersion = shape.version;
     const shapeData = shapeVersion?.data;
-    const fields = shapeData?.fields ?? {};
+    const fields = effectiveShapeFields(shape);
     let aboutPlaceholder;
     if (templateKind === "assertion") {
       aboutPlaceholder = flags.about ? parseCollectionAboutFlag(flags.about) : "Shape/FILL_IN";
     }
-    const composesAssertion = composesLocalAssertion(shapeData, org, repo);
+    const composesAssertion = composesLocalAssertion(shapeData, org, repo, shape.composition);
     const emittedKind = templateKind === "assertion" && composesAssertion ? "thing" : templateKind;
     const data = buildTemplateData(fields);
     const emittedData = aboutPlaceholder && emittedKind === "thing" ? { ...data, about: aboutPlaceholder } : data;
@@ -57963,7 +58190,8 @@ function rejectLegacyLifecycleOperations(operations) {
   if (!legacy)
     return;
   const target = legacy.name ? ` ${legacy.name}` : "";
-  throw new CliError(2 /* UserInput */, "USER_INPUT", `Commit operation "${legacy.operation}" is not supported.`, undefined, `Use {"operation":"retract","name":"${legacy.name ?? "<wref>"}"} or \`wh commit submit --retract${target}\`.`);
+  const retract = `Use {"operation":"retract","name":"${legacy.name ?? "<wref>"}"} or \`wh commit submit --retract${target}\``;
+  throw new CliError(2 /* UserInput */, "USER_INPUT", `Commit operation "${legacy.operation}" is not supported.`, undefined, legacy.operation === "remove" ? `To delete the Thing permanently, use \`wh thing remove${target || " <wref>"}\`. To withdraw it, ${retract.charAt(0).toLowerCase()}${retract.slice(1)}.` : `${retract}.`);
 }
 function synthesizeCommitMessage(operations) {
   if (operations.length === 0)
@@ -58666,69 +58894,6 @@ function createBoundedCommitValidateInput(org, repo, operations, options) {
   return input;
 }
 
-// ../../packages/warmhub-cli/src/domains/commit-validation-render.ts
-function renderCommitValidation(ctx, result) {
-  if (ctx.format === "json") {
-    ctx.out(JSON.stringify(result));
-  } else if (ctx.format === "jsonl") {
-    for (const operation of result.operations) {
-      ctx.out(JSON.stringify({ type: "operation", ...operation }));
-    }
-    const { operations: _operations, ...summary } = result;
-    ctx.out(JSON.stringify({ type: "summary", ...summary }));
-  } else {
-    renderPrettyValidation(ctx, result);
-  }
-  const error51 = containedDiagnosticError(validationDiagnostics(result));
-  if (error51)
-    ctx.requestedExitCode = error51.code;
-}
-function renderPrettyValidation(ctx, result) {
-  const c = ctx.colors;
-  const baseline = result.baseline.kind === "repo_seq" ? `repo sequence ${result.baseline.repoSeq}` : "withheld";
-  ctx.out(`${c.dim}validation baseline${c.reset} ${baseline}`);
-  for (const caveat of result.caveats) {
-    ctx.out(`  ${ctx.chars.warn} ${c.dim}${caveat.code}${c.reset} ${caveat.message}`);
-  }
-  for (const operation of result.operations) {
-    const marker = markerFor(operation.status, ctx);
-    ctx.out(`${marker} [${operation.opIndex}] ${operation.operation} ${displayName(c, operation.name)} ${operation.status}`);
-    renderDiagnostics(ctx, operation.status === "error" ? operation.errors : undefined);
-    for (const effect of operation.effects ?? []) {
-      renderEffect(ctx, effect);
-    }
-  }
-  ctx.out(`${c.bold}${result.canCommit ? "can commit" : "cannot commit"}${c.reset} — ${result.counts.wouldApply} would apply, ${result.counts.noop} noop, ${result.counts.error} error`);
-}
-function renderEffect(ctx, effect) {
-  ctx.out(`    ${markerFor(effect.status, ctx)} effect ${effect.effectIndex}: ${effect.operation} ${displayName(ctx.colors, effect.name)} ${effect.status}`);
-  renderDiagnostics(ctx, "errors" in effect ? effect.errors : undefined, 6);
-}
-function renderDiagnostics(ctx, diagnostics, indent = 4) {
-  for (const diagnostic of diagnostics ?? []) {
-    ctx.out(`${" ".repeat(indent)}${diagnostic.code}: ${diagnostic.message}`);
-  }
-}
-function markerFor(status, ctx) {
-  if (status === "error" || status === "discarded")
-    return ctx.chars.cross;
-  if (status === "noop")
-    return ctx.chars.warn;
-  return ctx.chars.check;
-}
-function validationDiagnostics(result) {
-  const diagnostics = [];
-  for (const operation of result.operations) {
-    if (operation.status === "error")
-      diagnostics.push(...operation.errors);
-    for (const effect of operation.effects ?? []) {
-      if ("errors" in effect)
-        diagnostics.push(...effect.errors);
-    }
-  }
-  return diagnostics;
-}
-
 // ../../packages/warmhub-cli/src/domains/commit-validation-execute.ts
 async function executeCommitValidation(ctx, args) {
   const options = {
@@ -59695,7 +59860,7 @@ function bindComponentMethodArgs(invocation, method) {
 }
 
 // ../../packages/warmhub-cli/src/component-exec.ts
-var USAGE = "wh component exec <component> <method> [args] --repo org/repo";
+var USAGE2 = "wh component exec <component> <method> [args] --repo org/repo";
 function methodHelpHint(componentName, methodName, installRepo) {
   return `wh component exec ${componentName} ${methodName} --help --repo ${installRepo}`;
 }
@@ -59749,7 +59914,7 @@ var handleComponentExec = async (ctx, _domain) => {
   const helpRequested = invocation.help;
   const dryRun = invocation.flags["dry-run"] === true;
   if (!invocation.component)
-    usageError("Component name is required", USAGE);
+    usageError("Component name is required", USAGE2);
   const componentName = invocation.component;
   const methodName = invocation.method;
   const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
@@ -66264,7 +66429,8 @@ var handleView7 = async (ctx, { flags, args }) => {
   const { org, repo: repo2 } = parseOrgRepo(getRepoRef(ctx), ctx.config);
   const c = ctx.colors;
   const result = await ctx.client.shape.get(org, repo2, shapeName, {
-    includeRetracted: flags["include-retracted"]
+    includeRetracted: flags["include-retracted"],
+    includeComposition: ctx.format === "pretty"
   });
   writeOutput(ctx, result, () => {
     const shapeVersion = result.version;
@@ -66281,15 +66447,26 @@ var handleView7 = async (ctx, { flags, args }) => {
       ctx.out(`  ${c.dim}owner:${c.reset} ${c.yellow}${componentRef}${c.reset}`);
     }
     const fields = shapeData?.fields;
-    if (fields) {
-      ctx.out(`  ${c.dim}fields:${c.reset}`);
-      for (const [fieldName, fieldType] of Object.entries(fields)) {
+    const composes = shapeData?.composes;
+    if (Array.isArray(composes) && composes.length > 0) {
+      ctx.out(`  ${c.dim}composes:${c.reset} ${composes.map((name) => escapeTerminalTextForDisplay(String(name))).join(", ")}`);
+    }
+    const printFields = (entries) => {
+      for (const [fieldName, fieldType] of Object.entries(entries)) {
         const typeStr = displayFieldType(fieldType);
         const fieldDesc = fieldDescriptionFromSpec(fieldType);
         const descSuffix = fieldDesc ? `  ${c.dim}${escapeTerminalTextForDisplay(fieldDesc)}${c.reset}` : "";
         const safeFieldName = escapeFieldNameForDisplay(fieldName);
         ctx.out(`    ${c.cyan}${safeFieldName}${c.reset}: ${c.dim}${typeStr}${c.reset}${descSuffix}`);
       }
+    };
+    if (fields && Object.keys(fields).length > 0) {
+      ctx.out(`  ${c.dim}fields:${c.reset}`);
+      printFields(fields);
+    }
+    for (const member of capturedShapeMembers(result)) {
+      ctx.out(`  ${c.dim}inherited from ${escapeTerminalTextForDisplay(member.wref)}:${c.reset}`);
+      printFields(member.fields);
     }
     ctx.out("");
     ctx.out(`  ${c.dim}Scaffold a write ops file for this shape:${c.reset} ${c.cyan}wh shape template ${result.name ?? shapeName}${c.reset}`);
@@ -70075,7 +70252,7 @@ function resolveLogLevel(flagLevel, env) {
 // package.json
 var package_default3 = {
   name: "@warmhub/cli",
-  version: "0.137.0",
+  version: "0.139.0",
   private: false,
   type: "module",
   description: "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -70700,5 +70877,5 @@ process.exitCode = interceptedExitCode === undefined ? await runPreparedCli(laun
   version: package_default3.version
 }) : interceptedExitCode;
 
-//# debugId=9B1B476B36DD254E64756E2164756E21
-//# warmhub-cli-build-info {"cliVersion":"0.137.0","sdkVersion":"0.135.0"}
+//# debugId=07DF6F73C022E9A064756E2164756E21
+//# warmhub-cli-build-info {"cliVersion":"0.139.0","sdkVersion":"0.137.0"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@warmhub/cli",
-  "version": "0.137.0",
+  "version": "0.139.0",
   "private": false,
   "type": "module",
   "description": "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",