@warmhub/cli 0.136.0 → 0.138.0

package/dist/wh.js

@@ -26272,6 +26272,9 @@ var RESERVED_THING_ROOT_PREFIX = `${RESERVED_THING_ROOT}/`;
 function isReservedThingRoot(name) {
   return name === RESERVED_THING_ROOT || name.startsWith(RESERVED_THING_ROOT_PREFIX);
 }
+function isReservedShapeName(name) {
+  return name === RESERVED_THING_ROOT;
+}
 function reservedThingRootMessage(name) {
   return `Name "${name}" is under the reserved root "${RESERVED_THING_ROOT_PREFIX}"; only Shapes live there, as ${RESERVED_THING_ROOT_PREFIX}shapes/<Name>`;
 }
@@ -26354,8 +26357,9 @@ function reservedRootRefusal(name, operationIndex) {
   };
 }
 function reservedRootGuard(op, operationIndex) {
-  if (op.kind === "shape")
-    return [];
+  if (op.operation === "add" && op.kind === "shape") {
+    return op.name && isReservedShapeName(op.name) ? [reservedRootRefusal(op.name, operationIndex)] : [];
+  }
   if (op.operation === "add" && op.name) {
     const stored = op.kind === "collection" ? op.name : splitLocalPath2(op.name)?.bareName;
     if (stored !== undefined && isReservedThingRoot(stored)) {
@@ -26363,8 +26367,8 @@ function reservedRootGuard(op, operationIndex) {
     }
     return [];
   }
-  const isShapeRename = op.name !== undefined && splitLocalPath2(op.name) === null;
-  if (op.operation === "rename" && !isShapeRename && op.newName !== undefined && isReservedThingRoot(op.newName)) {
+  const isShapeRename = op.kind === "shape" || op.name !== undefined && splitLocalPath2(op.name) === null;
+  if (op.operation === "rename" && op.newName !== undefined && (isShapeRename ? isReservedShapeName(op.newName) : isReservedThingRoot(op.newName))) {
     return [reservedRootRefusal(op.newName, operationIndex)];
   }
   return [];
@@ -44522,7 +44526,7 @@ class PartialStreamSubmissionError extends Error {
 }
 
 class AllStreamOperationsFailedError extends Error {
-  code = "STREAM_ALL_OPERATIONS_FAILED";
+  code;
   receipts;
   result;
   operations;
@@ -44532,6 +44536,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;
@@ -44589,6 +44594,7 @@ var DEFINITE_CLIENT_REJECT_CODES = new Set([
   "NOT_FOUND",
   "KIND_MISMATCH",
   "CONFLICT",
+  "NAME_TAKEN",
   "ALREADY_RETRACTED",
   "ARCHIVED",
   "RATE_LIMITED",
@@ -44988,7 +44994,13 @@ var currentErrorDetailsSchema = exports_external.discriminatedUnion("reason", [
   exports_external.object({
     reason: exports_external.literal("dependency_failed"),
     producerOpIndexes: exports_external.array(exports_external.number().int().nonnegative()).min(1)
-  }).strict()
+  }).strict(),
+  exports_external.object({
+    reason: exports_external.literal("name_taken"),
+    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()
 ]);
 var currentBaseShape = {
   ...positionShape,
@@ -45478,7 +45490,7 @@ function createStreamingSubmissionHandle(input, deps) {
 // ../../packages/sdk-ts/package.json
 var package_default = {
   name: "@warmhub/sdk-ts",
-  version: "0.134.0",
+  version: "0.136.0",
   private: false,
   type: "module",
   description: "The TypeScript SDK for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -46942,7 +46954,8 @@ class WarmHubClient {
           orgName,
           repoName,
           shapeName,
-          includeRetracted: opts?.includeRetracted
+          includeRetracted: opts?.includeRetracted,
+          includeComposition: opts?.includeComposition
         });
       } catch (error51) {
         throw toWarmHubError(error51);
@@ -48397,6 +48410,8 @@ function classifyConflict(message, code) {
       return "lease-held";
     case "INCREMENTAL_READ_UNAVAILABLE":
       return "incremental-read-unavailable";
+    case "NAME_TAKEN":
+      return "name-taken";
     case undefined:
     default:
       break;
@@ -48433,6 +48448,10 @@ function conflictHint(message, code) {
       return "This thing is leased by another holder. Back off until the lease expires (see leaseExpiresAt / retryAfter), then retry.";
     case "incremental-read-unavailable":
       return INCREMENTAL_READ_UNAVAILABLE_GUIDANCE;
+    case "name-taken": {
+      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 "other":
     default:
       return "Resolve the conflicting existing state and try again.";
@@ -48456,6 +48475,7 @@ var TOP_LEVEL_USER_INPUT_CODES = new Set([
 ]);
 var CONFLICT_SHAPED_CODES = new Set([
   "CONFLICT",
+  "NAME_TAKEN",
   "ALREADY_EXISTS",
   "BUILTIN_SHAPE_CONFLICT",
   "ARCHIVED",
@@ -48668,6 +48688,11 @@ function generateSuggestions(code, message, context, errorCode) {
           action: "Wait for the repo delete to finish or cancel it before retrying"
         });
         break;
+      case "name-taken":
+        suggestions.push({
+          action: "Choose a name no other Thing in the repository holds (use details.suggestedName when the error carries one)"
+        });
+        break;
       case "lease-held":
         suggestions.push({
           action: "Another holder leased this thing. Back off until the lease expires (leaseExpiresAt / retryAfter), then retry"
@@ -52561,7 +52586,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.4";
+var COMMIT_SUBMIT_OUTPUT_SCHEMA_ID = "wh.commit.submit.result/v0.5";
 function identifyCommitSubmitOutput(value) {
   if ("schema" in value) {
     if (value.schema === COMMIT_SUBMIT_OUTPUT_SCHEMA_ID) {
@@ -57622,7 +57647,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.3";
+var COMMIT_SUBMIT_STREAM_ROW_SCHEMA_ID = "wh.commit.submit.stream.row/v0.4";
 function identify(row) {
   if ("schema" in row) {
     throw new Error("Streaming submission row already defines a schema field");
@@ -57638,12 +57663,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, "");
@@ -57652,7 +57733,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;
     }
@@ -57699,21 +57782,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({
@@ -57794,12 +57871,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;
@@ -66241,7 +66318,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;
@@ -66258,15 +66336,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}`);
@@ -70052,7 +70141,7 @@ function resolveLogLevel(flagLevel, env) {
 // package.json
 var package_default3 = {
   name: "@warmhub/cli",
-  version: "0.136.0",
+  version: "0.138.0",
   private: false,
   type: "module",
   description: "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -70677,5 +70766,5 @@ process.exitCode = interceptedExitCode === undefined ? await runPreparedCli(laun
   version: package_default3.version
 }) : interceptedExitCode;
 
-//# debugId=17E23D79103C8D1164756E2164756E21
-//# warmhub-cli-build-info {"cliVersion":"0.136.0","sdkVersion":"0.134.0"}
+//# debugId=34AED26DA6FD886964756E2164756E21
+//# warmhub-cli-build-info {"cliVersion":"0.138.0","sdkVersion":"0.136.0"}

package/package.json

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