@warmhub/cli 0.91.1 → 0.93.0

package/dist/wh.js

@@ -42746,6 +42746,197 @@ function shapeDefinitionPreflightError(name, data, verb) {
   return `Invalid shape definition for "${name}": ${result.errors.join("; ")}`;
 }
 
+// ../../packages/sdk-ts/src/stream-submit-utils.ts
+function streamAppendResultStatus(result) {
+  const status = "status" in result ? result.status : undefined;
+  if (status === "failed") {
+    return "error";
+  }
+  return status === "noop" || result.operation === "noop" ? "noop" : "applied";
+}
+var DEFAULT_RETRY_POLICY = {
+  maxAttempts: 3,
+  baseDelayMs: 250,
+  maxDelayMs: 8000
+};
+var MAX_ATTEMPTS_HARD_CAP = 10;
+var MAX_DELAY_HARD_CAP_MS = 60000;
+function resolveRetryPolicy(retry) {
+  if (retry === false)
+    return false;
+  const overrides = {};
+  if (retry !== undefined) {
+    if (Number.isFinite(retry.maxAttempts))
+      overrides.maxAttempts = retry.maxAttempts;
+    if (Number.isFinite(retry.baseDelayMs))
+      overrides.baseDelayMs = retry.baseDelayMs;
+    if (Number.isFinite(retry.maxDelayMs))
+      overrides.maxDelayMs = retry.maxDelayMs;
+  }
+  const merged = { ...DEFAULT_RETRY_POLICY, ...overrides };
+  return {
+    maxAttempts: Math.min(MAX_ATTEMPTS_HARD_CAP, Math.max(1, Math.trunc(merged.maxAttempts))),
+    baseDelayMs: Math.min(MAX_DELAY_HARD_CAP_MS, Math.max(0, Math.trunc(merged.baseDelayMs))),
+    maxDelayMs: Math.min(MAX_DELAY_HARD_CAP_MS, Math.max(0, Math.trunc(merged.maxDelayMs)))
+  };
+}
+var DEFINITE_CLIENT_REJECT_CODES = new Set([
+  "BAD_REQUEST",
+  "METHOD_NOT_SUPPORTED",
+  "PARSE_ERROR",
+  "PAYLOAD_TOO_LARGE",
+  "PRECONDITION_FAILED",
+  "UNAUTHORIZED",
+  "UNPROCESSABLE_CONTENT",
+  "UNSUPPORTED_MEDIA_TYPE",
+  "UNAUTHENTICATED",
+  "FORBIDDEN",
+  "VALIDATION_ERROR",
+  "SHAPE_MISMATCH",
+  "RESERVED_NAME",
+  "ILLEGAL_OP_SEQUENCE",
+  "NOT_FOUND",
+  "KIND_MISMATCH",
+  "CONFLICT",
+  "ALREADY_RETRACTED",
+  "ARCHIVED",
+  "RATE_LIMITED",
+  "TOO_MANY_REQUESTS",
+  "UNRESOLVED_TOKEN"
+]);
+var TERMINAL_AMBIGUOUS_CODES = new Set(["COMMIT_OUTCOME_UNKNOWN"]);
+function extractErrorCode(cause) {
+  if (!cause || typeof cause !== "object")
+    return;
+  const direct = cause.code;
+  if (typeof direct === "string")
+    return direct;
+  const data = cause.data;
+  const wh = data?.warmhub?.code;
+  if (typeof wh === "string")
+    return wh;
+  const dc = data?.code;
+  if (typeof dc === "string")
+    return dc;
+  return;
+}
+function extractHttpStatus(cause) {
+  if (!cause || typeof cause !== "object")
+    return;
+  const status = cause.data?.httpStatus;
+  if (typeof status === "number")
+    return status;
+  const warmhubStatus = cause.data?.warmhub?.status;
+  if (typeof warmhubStatus === "number")
+    return warmhubStatus;
+  const direct = cause.status;
+  return typeof direct === "number" ? direct : undefined;
+}
+function isDefiniteClientRejectionStatus(status) {
+  return status !== undefined && status >= 400 && status < 500 && status !== 408;
+}
+function isTerminalAmbiguousError(cause) {
+  const code = extractErrorCode(cause);
+  return code !== undefined && TERMINAL_AMBIGUOUS_CODES.has(code);
+}
+function isDefiniteStreamAppendRejection(cause) {
+  if (isTerminalAmbiguousError(cause))
+    return false;
+  const code = extractErrorCode(cause);
+  return code !== undefined && DEFINITE_CLIENT_REJECT_CODES.has(code) || isDefiniteClientRejectionStatus(extractHttpStatus(cause));
+}
+function isTransientStreamFailure(cause) {
+  if (isTerminalAmbiguousError(cause))
+    return false;
+  if (isDefiniteStreamAppendRejection(cause))
+    return false;
+  if (isFetchNetworkTypeError(cause))
+    return true;
+  if (cause instanceof TypeError)
+    return false;
+  if (cause instanceof SyntaxError)
+    return false;
+  const inner = cause?.cause;
+  if (isFetchNetworkTypeError(inner))
+    return true;
+  if (inner instanceof TypeError)
+    return false;
+  if (inner instanceof SyntaxError)
+    return false;
+  return true;
+}
+function isFetchNetworkTypeError(cause) {
+  return cause instanceof TypeError && /fetch/i.test(cause.message);
+}
+function computeBackoffDelayMs(attempt, policy) {
+  const exponential = policy.baseDelayMs * 2 ** Math.max(0, attempt - 1);
+  const jitter = Math.random() * policy.baseDelayMs;
+  return Math.min(policy.maxDelayMs, exponential + jitter);
+}
+function sleep2(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+// ../../packages/sdk-ts/src/stream-submit-aggregate.ts
+function toSubmittedOperation(result, opIndex, status, submittedName) {
+  const row = {
+    opIndex,
+    name: result.name ?? "",
+    operation: result.operation === "revise" || result.operation === "retract" || result.operation === "reaffirm" || result.operation === "rename" || result.operation === "noop" ? result.operation : "add",
+    dataHash: result.dataHash ?? "",
+    version: result.version ?? 0,
+    status,
+    error: result.error
+  };
+  if (result.affirmations)
+    row.affirmations = result.affirmations;
+  if (result.status === "failed" && submittedName !== undefined) {
+    row.submittedName = submittedName;
+  }
+  if (result.resolvedName !== undefined)
+    row.resolvedName = result.resolvedName;
+  if (result.retryable !== undefined)
+    row.retryable = result.retryable;
+  if (result.warnings)
+    row.warnings = result.warnings;
+  return row;
+}
+
+class StreamSubmissionAggregator {
+  receipts = [];
+  operations = [];
+  statusCounts = { applied: 0, noop: 0, error: 0 };
+  get allFailed() {
+    return this.operations.length > 0 && this.statusCounts.error === this.operations.length;
+  }
+  addChunk(input) {
+    input.results.forEach((result, position) => {
+      const local = result.opIndex ?? position;
+      const status = streamAppendResultStatus(result);
+      this.statusCounts[status]++;
+      this.operations.push(toSubmittedOperation(result, input.chunkStart + local, status, input.submittedNames?.[local]?.name));
+    });
+  }
+  addReceipt(receipt) {
+    this.receipts.push(receipt);
+  }
+  completedOperations() {
+    return this.operations.filter((operation) => operation.status !== "error");
+  }
+  toResult(meta3) {
+    const partial2 = this.statusCounts.error > 0;
+    return {
+      ...meta3.committer !== undefined ? { committer: meta3.committer } : {},
+      ...meta3.createdByEmail !== undefined ? { createdByEmail: meta3.createdByEmail } : {},
+      message: meta3.message,
+      operationCount: this.operations.length,
+      ...meta3.repoSeq !== undefined ? { repoSeq: meta3.repoSeq } : {},
+      ...partial2 ? { partial: partial2, statusCounts: { ...this.statusCounts } } : {},
+      operations: this.operations,
+      receipts: this.receipts
+    };
+  }
+}
 // ../../packages/sdk-ts/src/operation-event-identity.ts
 var STREAM_CHUNK_NAMESPACE = "003e7e6c-2f1e-53ea-9dfa-627edd04a8cc";
 var CANONICAL_UUID = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/;
@@ -43114,148 +43305,6 @@ class AllStreamOperationsFailedError extends Error {
   }
 }
 
-// ../../packages/sdk-ts/src/stream-submit-utils.ts
-function streamAppendResultStatus(result) {
-  const status = "status" in result ? result.status : undefined;
-  if (status === "failed") {
-    return "error";
-  }
-  return status === "noop" || result.operation === "noop" ? "noop" : "applied";
-}
-function countStreamAppendResultStatuses(results) {
-  const statusCounts = {
-    applied: 0,
-    noop: 0,
-    error: 0
-  };
-  for (const result of results) {
-    statusCounts[streamAppendResultStatus(result)]++;
-  }
-  return statusCounts;
-}
-var DEFAULT_RETRY_POLICY = {
-  maxAttempts: 3,
-  baseDelayMs: 250,
-  maxDelayMs: 8000
-};
-var MAX_ATTEMPTS_HARD_CAP = 10;
-var MAX_DELAY_HARD_CAP_MS = 60000;
-function resolveRetryPolicy(retry) {
-  if (retry === false)
-    return false;
-  const overrides = {};
-  if (retry !== undefined) {
-    if (Number.isFinite(retry.maxAttempts))
-      overrides.maxAttempts = retry.maxAttempts;
-    if (Number.isFinite(retry.baseDelayMs))
-      overrides.baseDelayMs = retry.baseDelayMs;
-    if (Number.isFinite(retry.maxDelayMs))
-      overrides.maxDelayMs = retry.maxDelayMs;
-  }
-  const merged = { ...DEFAULT_RETRY_POLICY, ...overrides };
-  return {
-    maxAttempts: Math.min(MAX_ATTEMPTS_HARD_CAP, Math.max(1, Math.trunc(merged.maxAttempts))),
-    baseDelayMs: Math.min(MAX_DELAY_HARD_CAP_MS, Math.max(0, Math.trunc(merged.baseDelayMs))),
-    maxDelayMs: Math.min(MAX_DELAY_HARD_CAP_MS, Math.max(0, Math.trunc(merged.maxDelayMs)))
-  };
-}
-var DEFINITE_CLIENT_REJECT_CODES = new Set([
-  "BAD_REQUEST",
-  "METHOD_NOT_SUPPORTED",
-  "PARSE_ERROR",
-  "PAYLOAD_TOO_LARGE",
-  "PRECONDITION_FAILED",
-  "UNAUTHORIZED",
-  "UNPROCESSABLE_CONTENT",
-  "UNSUPPORTED_MEDIA_TYPE",
-  "UNAUTHENTICATED",
-  "FORBIDDEN",
-  "VALIDATION_ERROR",
-  "SHAPE_MISMATCH",
-  "RESERVED_NAME",
-  "ILLEGAL_OP_SEQUENCE",
-  "NOT_FOUND",
-  "KIND_MISMATCH",
-  "CONFLICT",
-  "ALREADY_RETRACTED",
-  "ARCHIVED",
-  "RATE_LIMITED",
-  "TOO_MANY_REQUESTS",
-  "UNRESOLVED_TOKEN"
-]);
-var TERMINAL_AMBIGUOUS_CODES = new Set(["COMMIT_OUTCOME_UNKNOWN"]);
-function extractErrorCode(cause) {
-  if (!cause || typeof cause !== "object")
-    return;
-  const direct = cause.code;
-  if (typeof direct === "string")
-    return direct;
-  const data = cause.data;
-  const wh = data?.warmhub?.code;
-  if (typeof wh === "string")
-    return wh;
-  const dc = data?.code;
-  if (typeof dc === "string")
-    return dc;
-  return;
-}
-function extractHttpStatus(cause) {
-  if (!cause || typeof cause !== "object")
-    return;
-  const status = cause.data?.httpStatus;
-  if (typeof status === "number")
-    return status;
-  const warmhubStatus = cause.data?.warmhub?.status;
-  if (typeof warmhubStatus === "number")
-    return warmhubStatus;
-  const direct = cause.status;
-  return typeof direct === "number" ? direct : undefined;
-}
-function isDefiniteClientRejectionStatus(status) {
-  return status !== undefined && status >= 400 && status < 500 && status !== 408;
-}
-function isTerminalAmbiguousError(cause) {
-  const code = extractErrorCode(cause);
-  return code !== undefined && TERMINAL_AMBIGUOUS_CODES.has(code);
-}
-function isDefiniteStreamAppendRejection(cause) {
-  if (isTerminalAmbiguousError(cause))
-    return false;
-  const code = extractErrorCode(cause);
-  return code !== undefined && DEFINITE_CLIENT_REJECT_CODES.has(code) || isDefiniteClientRejectionStatus(extractHttpStatus(cause));
-}
-function isTransientStreamFailure(cause) {
-  if (isTerminalAmbiguousError(cause))
-    return false;
-  if (isDefiniteStreamAppendRejection(cause))
-    return false;
-  if (isFetchNetworkTypeError(cause))
-    return true;
-  if (cause instanceof TypeError)
-    return false;
-  if (cause instanceof SyntaxError)
-    return false;
-  const inner = cause?.cause;
-  if (isFetchNetworkTypeError(inner))
-    return true;
-  if (inner instanceof TypeError)
-    return false;
-  if (inner instanceof SyntaxError)
-    return false;
-  return true;
-}
-function isFetchNetworkTypeError(cause) {
-  return cause instanceof TypeError && /fetch/i.test(cause.message);
-}
-function computeBackoffDelayMs(attempt, policy) {
-  const exponential = policy.baseDelayMs * 2 ** Math.max(0, attempt - 1);
-  const jitter = Math.random() * policy.baseDelayMs;
-  return Math.min(policy.maxDelayMs, exponential + jitter);
-}
-function sleep2(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 // ../../packages/sdk-ts/src/stream-submit-submit.ts
 class StreamValidationError extends Error {
   code;
@@ -43266,115 +43315,156 @@ class StreamValidationError extends Error {
     this.name = "WarmHubError";
   }
 }
-async function submitOperationsViaStream(client, args) {
-  if (args.operations.length === 0) {
-    throw new StreamValidationError("At least one operation is required for stream submission.");
+
+class OperationSourceError extends Error {
+  reason;
+  constructor(reason) {
+    super("operation source failed");
+    this.reason = reason;
   }
-  const operations = args.operations.map((operation, index) => {
-    let streamOperation;
-    try {
-      streamOperation = toBackendStreamOperation(operation);
-    } catch (cause) {
-      const message = cause instanceof Error ? cause.message : String(cause);
-      throw new StreamValidationError(`Invalid operation at index ${index}: ${message}`);
-    }
-    if (args.skipExisting === true && streamOperation.operation === "add") {
-      return { ...streamOperation, skipExisting: true };
-    }
-    return streamOperation;
-  });
-  validateNormalizedOperations(operations);
+}
+async function submitOperationsViaStream(client, args) {
   const chunkSize = normalizeChunkSize(args.chunkSize);
   const submissionId = args.submissionId ?? createOperationEventSubmissionId();
   const streamId = args.streamId ?? submissionId;
   const policy = resolveRetryPolicy(args.retry);
+  const aggregate = new StreamSubmissionAggregator;
   let allocatedTokenRanges = [];
   let createdByEmail;
   let repoSeq;
-  const chunkResults = [];
-  const receipts = [];
   let acknowledgedOperationCount = 0;
   let lastAcknowledgedRepoSeq;
-  for (const [chunkOrdinal, chunk] of chunkOperations(operations, chunkSize).entries()) {
-    const eventRequestId = operationEventStreamRequestId(submissionId, chunkOrdinal);
-    let attempt = 1;
-    let priorAttemptAmbiguous = false;
-    while (true) {
-      try {
-        const appendResult = await client.stream.append({
-          allocatedTokenRanges,
-          chunkOrdinal,
-          orgName: args.orgName,
-          repoName: args.repoName,
-          streamId,
-          submissionId,
-          componentRef: args.componentRef,
-          committer: args.committer,
-          message: args.message,
-          ...args.returnRepoSeq !== undefined ? { returnRepoSeq: args.returnRepoSeq } : {},
-          operations: chunk.operations
-        });
-        const receipt = appendResult.receipt;
-        receipts.push(receipt);
-        allocatedTokenRanges = appendResult.allocatedTokenRanges;
-        createdByEmail = appendResult.createdByEmail ?? createdByEmail;
-        repoSeq = appendResult.repoSeq ?? repoSeq;
-        chunkResults.push(...offsetChunkResultIndexes(appendResult.results, chunk.start));
-        acknowledgedOperationCount += chunk.operations.length;
-        const acknowledgedRepoSeq = receiptRepoSeq(receipt);
-        if (acknowledgedRepoSeq !== undefined) {
-          lastAcknowledgedRepoSeq = acknowledgedRepoSeq;
-        }
-        break;
-      } catch (cause) {
-        const definiteFailure = isDefiniteStreamAppendRejection(cause);
-        if (receipts.length === 0 && !priorAttemptAmbiguous && definiteFailure) {
-          throw cause;
-        }
-        if (policy !== false && attempt < policy.maxAttempts && isTransientStreamFailure(cause)) {
-          await sleep2(computeBackoffDelayMs(attempt, policy));
-          attempt += 1;
-          priorAttemptAmbiguous = true;
-          continue;
-        }
-        const pendingOutcome = priorAttemptAmbiguous || !definiteFailure ? "unknown" : "absent";
-        throw new PartialStreamSubmissionError({
-          cause,
-          completedReceipts: receipts,
-          completedOperations: completedOperationsFrom(aggregateSubmittedStreamResult({
+  let chunkOrdinal = 0;
+  const partialSubmission = (input) => new PartialStreamSubmissionError({
+    cause: input.cause,
+    completedReceipts: aggregate.receipts,
+    completedOperations: aggregate.completedOperations(),
+    acknowledgedOperationCount,
+    lastAcknowledgedRepoSeq,
+    attemptedAppendOutcome: input.pendingOutcome === "absent" ? "not_applied" : "unknown",
+    submissionId,
+    eventRequestId: operationEventStreamRequestId(submissionId, chunkOrdinal),
+    chunkOrdinal,
+    pendingOutcome: input.pendingOutcome
+  });
+  try {
+    for await (const chunk of normalizedChunks(args.operations, chunkSize, args.skipExisting === true)) {
+      let attempt = 1;
+      let priorAttemptAmbiguous = false;
+      while (true) {
+        try {
+          const appendResult = await client.stream.append({
+            allocatedTokenRanges,
+            chunkOrdinal,
+            orgName: args.orgName,
+            repoName: args.repoName,
+            streamId,
+            submissionId,
+            componentRef: args.componentRef,
             committer: args.committer,
-            createdByEmail,
             message: args.message,
-            operations,
-            repoSeq,
-            receipts,
-            results: chunkResults
-          })),
-          acknowledgedOperationCount,
-          lastAcknowledgedRepoSeq,
-          attemptedAppendOutcome: pendingOutcome === "absent" ? "not_applied" : "unknown",
-          submissionId,
-          eventRequestId,
-          chunkOrdinal,
-          pendingOutcome
-        });
+            ...args.returnRepoSeq !== undefined ? { returnRepoSeq: args.returnRepoSeq } : {},
+            operations: chunk.operations
+          });
+          aggregate.addReceipt(appendResult.receipt);
+          allocatedTokenRanges = appendResult.allocatedTokenRanges;
+          createdByEmail = appendResult.createdByEmail ?? createdByEmail;
+          repoSeq = appendResult.repoSeq ?? repoSeq;
+          aggregate.addChunk({
+            results: appendResult.results,
+            chunkStart: chunk.start,
+            submittedNames: chunk.operations
+          });
+          acknowledgedOperationCount += chunk.operations.length;
+          const acknowledgedRepoSeq = receiptRepoSeq(appendResult.receipt);
+          if (acknowledgedRepoSeq !== undefined) {
+            lastAcknowledgedRepoSeq = acknowledgedRepoSeq;
+          }
+          break;
+        } catch (cause) {
+          const definiteFailure = isDefiniteStreamAppendRejection(cause);
+          if (aggregate.receipts.length === 0 && !priorAttemptAmbiguous && definiteFailure) {
+            throw cause;
+          }
+          if (policy !== false && attempt < policy.maxAttempts && isTransientStreamFailure(cause)) {
+            await sleep2(computeBackoffDelayMs(attempt, policy));
+            attempt += 1;
+            priorAttemptAmbiguous = true;
+            continue;
+          }
+          throw partialSubmission({
+            cause,
+            pendingOutcome: priorAttemptAmbiguous || !definiteFailure ? "unknown" : "absent"
+          });
+        }
       }
+      chunkOrdinal += 1;
     }
+  } catch (error51) {
+    if (!(error51 instanceof OperationSourceError))
+      throw error51;
+    if (aggregate.receipts.length === 0)
+      throw error51.reason;
+    throw partialSubmission({ cause: error51.reason, pendingOutcome: "absent" });
+  }
+  if (chunkOrdinal === 0) {
+    throw new StreamValidationError("At least one operation is required for stream submission.");
   }
-  const result = aggregateSubmittedStreamResult({
+  const result = aggregate.toResult({
     committer: args.committer,
     createdByEmail,
     message: args.message,
-    operations,
-    repoSeq,
-    receipts,
-    results: chunkResults
+    repoSeq
   });
-  if (result.operations.length > 0 && result.operations.every((operation) => operation.status === "error")) {
+  if (aggregate.allFailed) {
     throw new AllStreamOperationsFailedError(result);
   }
   return result;
 }
+async function* normalizedChunks(source, chunkSize, skipExisting) {
+  try {
+    if (Array.isArray(source)) {
+      const operations = source.map((operation, index) => normalizeOperation(operation, index, skipExisting));
+      validateNormalizedOperations(operations, 0);
+      for (let start = 0;start < operations.length; start += chunkSize) {
+        yield { operations: operations.slice(start, start + chunkSize), start };
+      }
+      return;
+    }
+    let normalizedCount = 0;
+    let buffer = [];
+    for await (const operation of source) {
+      buffer.push(normalizeOperation(operation, normalizedCount, skipExisting));
+      normalizedCount += 1;
+      if (buffer.length < chunkSize)
+        continue;
+      yield preflightedChunk(buffer, normalizedCount);
+      buffer = [];
+    }
+    if (buffer.length > 0)
+      yield preflightedChunk(buffer, normalizedCount);
+  } catch (cause) {
+    throw new OperationSourceError(cause);
+  }
+}
+function preflightedChunk(operations, normalizedCount) {
+  const start = normalizedCount - operations.length;
+  validateNormalizedOperations(operations, start);
+  return { operations, start };
+}
+function normalizeOperation(operation, index, skipExisting) {
+  let streamOperation;
+  try {
+    streamOperation = toBackendStreamOperation(operation);
+  } catch (cause) {
+    const message = cause instanceof Error ? cause.message : String(cause);
+    throw new StreamValidationError(`Invalid operation at index ${index}: ${message}`);
+  }
+  if (skipExisting && streamOperation.operation === "add") {
+    return { ...streamOperation, skipExisting: true };
+  }
+  return streamOperation;
+}
 function receiptRepoSeq(receipt) {
   const repoSeq = receipt.event?.repoSeq;
   if (repoSeq === undefined)
@@ -43382,12 +43472,11 @@ function receiptRepoSeq(receipt) {
   const parsed = Number(repoSeq);
   return Number.isSafeInteger(parsed) ? parsed : undefined;
 }
-function validateNormalizedOperations(operations) {
-  const diagnostics = preflightCommitDiagnostics2(operations).filter((diagnostic) => !isServerAuthoritativeSequenceDiagnostic(diagnostic));
-  const firstDiagnostic = diagnostics[0];
+function validateNormalizedOperations(operations, indexOffset) {
+  const firstDiagnostic = preflightCommitDiagnostics2(operations).find((diagnostic) => !isServerAuthoritativeSequenceDiagnostic(diagnostic));
   if (!firstDiagnostic)
     return;
-  throw new StreamValidationError(`Invalid operation at index ${firstDiagnostic.operationIndex}: ${firstDiagnostic.message}`, firstDiagnostic.code);
+  throw new StreamValidationError(`Invalid operation at index ${indexOffset + firstDiagnostic.operationIndex}: ${firstDiagnostic.message}`, firstDiagnostic.code);
 }
 function isServerAuthoritativeSequenceDiagnostic(diagnostic) {
   return diagnostic.code === "ILLEGAL_OP_SEQUENCE" && diagnostic.message.includes("Cannot revise then add ");
@@ -43397,56 +43486,10 @@ function normalizeChunkSize(chunkSize) {
     return DEFAULT_STREAM_CHUNK_SIZE;
   return Math.max(1, Math.min(MAX_STREAM_APPEND_OPERATION_COUNT2, Math.trunc(chunkSize)));
 }
-function chunkOperations(operations, chunkSize) {
-  const chunks = [];
-  for (let start = 0;start < operations.length; start += chunkSize) {
-    chunks.push({
-      operations: operations.slice(start, start + chunkSize),
-      start
-    });
-  }
-  return chunks;
-}
-function offsetChunkResultIndexes(results, chunkStart) {
-  return results.map((result, index) => ({
-    ...result,
-    opIndex: chunkStart + (result.opIndex ?? index)
-  }));
-}
-function aggregateSubmittedStreamResult(input) {
-  const statusCounts = countStreamAppendResultStatuses(input.results);
-  const partial2 = statusCounts.error > 0;
-  return {
-    ...input.committer !== undefined ? { committer: input.committer } : {},
-    ...input.createdByEmail !== undefined ? { createdByEmail: input.createdByEmail } : {},
-    message: input.message,
-    operationCount: input.results.length,
-    ...input.repoSeq !== undefined ? { repoSeq: input.repoSeq } : {},
-    ...partial2 ? { partial: partial2, statusCounts } : {},
-    operations: input.results.map((result) => ({
-      ...result.opIndex !== undefined ? { opIndex: result.opIndex } : {},
-      name: result.name ?? "",
-      operation: result.operation === "revise" || result.operation === "retract" || result.operation === "reaffirm" || result.operation === "rename" || result.operation === "noop" ? result.operation : "add",
-      dataHash: result.dataHash ?? "",
-      version: result.version ?? 0,
-      status: streamAppendResultStatus(result),
-      error: result.error,
-      ...result.affirmations ? { affirmations: result.affirmations } : {},
-      ...result.status === "failed" && result.opIndex !== undefined && input.operations[result.opIndex]?.name !== undefined ? { submittedName: input.operations[result.opIndex]?.name } : {},
-      ...result.resolvedName !== undefined ? { resolvedName: result.resolvedName } : {},
-      ...result.retryable !== undefined ? { retryable: result.retryable } : {},
-      ...result.warnings ? { warnings: result.warnings } : {}
-    })),
-    receipts: input.receipts
-  };
-}
-function completedOperationsFrom(result) {
-  return result.operations.filter((operation) => operation.status !== "error");
-}
 // ../../packages/sdk-ts/package.json
 var package_default = {
   name: "@warmhub/sdk-ts",
-  version: "0.89.0",
+  version: "0.91.0",
   private: false,
   type: "module",
   description: "The TypeScript SDK for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -45633,6 +45676,7 @@ class WarmHubClient {
           query,
           shape: opts?.shape,
           about: opts?.about,
+          affirmedAbout: opts?.affirmedAbout,
           kind: narrowKind(opts?.kind),
           match: opts?.match,
           includeRetracted: opts?.includeRetracted,
@@ -50198,6 +50242,18 @@ function emitPartialPageHint(ctx, count, _nextCursor, _limit) {
   ctx.status(`${c.yellow}${count} shown; more available${c.reset}. Use ${c.cyan}--all${c.reset} to fetch every page.`);
 }
 
+// ../../packages/warmhub-cli/src/domains/commit-output-contract-id.ts
+var COMMIT_SUBMIT_OUTPUT_SCHEMA_ID = "wh.commit.submit.result/v0.1";
+function identifyCommitSubmitOutput(value) {
+  if ("schema" in value) {
+    if (value.schema === COMMIT_SUBMIT_OUTPUT_SCHEMA_ID) {
+      return value;
+    }
+    throw new Error("Commit submit output already defines a schema field");
+  }
+  return { schema: COMMIT_SUBMIT_OUTPUT_SCHEMA_ID, ...value };
+}
+
 // ../../packages/warmhub-cli/src/domains/assertion/shared.ts
 var COLLECTION_TAGS = ["arc", "bond", "pair", "set", "list"];
 function parseAbout(raw) {
@@ -50371,7 +50427,7 @@ var handleRevise = async (ctx, { flags, args }) => {
   if (data === undefined) {
     usageError("--data is required for revise", `wh assertion revise Belief/cave-safe --data '{"confidence":0.9}'`);
   }
-  const commitResult = await ctx.client.commit.apply(org, repo, flags.message ?? `revise ${name}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, flags.message ?? `revise ${name}`, [
     {
       operation: "revise",
       kind: "assertion",
@@ -50379,7 +50435,7 @@ var handleRevise = async (ctx, { flags, args }) => {
       data,
       ...flags.affirm && flags.affirm.length > 0 ? { affirmedTargets: flags.affirm } : {}
     }
-  ], { committer: flags.committer });
+  ], { committer: flags.committer }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => renderSingleOpSuccess(ctx.out, c, ctx.chars, result, {
     marker: "~",
@@ -50394,7 +50450,7 @@ var handleRetract = async (ctx, { flags, args }) => {
   }
   const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
   const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh assertion retract Belief/cave-safe --expected-version 3");
-  const commitResult = await ctx.client.commit.apply(org, repo, flags.message ?? `retract ${name}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, flags.message ?? `retract ${name}`, [
     {
       operation: "retract",
       kind: "assertion",
@@ -50404,7 +50460,7 @@ var handleRetract = async (ctx, { flags, args }) => {
     }
   ], {
     committer: flags.committer
-  });
+  }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => {
     renderCommitterEcho(ctx.out, ctx.colors, flags.committer);
@@ -50423,7 +50479,7 @@ var handleReaffirm = async (ctx, { flags, args }) => {
     usageError("Reaffirm requires at least one --add or --remove target", "wh assertion reaffirm Belief/cave-safe --add Location/cave@v3 --expected-version 2");
   }
   const { org, repo } = parseOrgRepo(getRepoRef(ctx), ctx.config);
-  const commitResult = await ctx.client.commit.apply(org, repo, flags.message ?? `reaffirm ${name}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, flags.message ?? `reaffirm ${name}`, [
     {
       operation: "reaffirm",
       kind: "assertion",
@@ -50432,7 +50488,7 @@ var handleReaffirm = async (ctx, { flags, args }) => {
       ...add.length > 0 ? { add } : {},
       ...remove.length > 0 ? { remove } : {}
     }
-  ], { committer: flags.committer });
+  ], { committer: flags.committer }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => {
     const c = ctx.colors;
@@ -50477,7 +50533,7 @@ var handleCreate = async (ctx, { flags, args }) => {
       ...affirmedTargets.length > 0 ? { affirmedTargets } : {}
     }
   ];
-  const commitResult = await ctx.client.commit.apply(org, repo, message ?? `assert ${shape}`, operations, { committer });
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, message ?? `assert ${shape}`, operations, { committer }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => renderSingleOpSuccess(ctx.out, c, ctx.chars, result, {
     marker: "+",
@@ -50780,14 +50836,14 @@ var handleCreate2 = async (ctx, { flags, args }) => {
   });
   const name = shape ? `${shape}/${rawName}` : rawName;
   const c = ctx.colors;
-  const commitResult = await ctx.client.commit.apply(org, repo, message ?? `create ${name}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, message ?? `create ${name}`, [
     {
       operation: "add",
       kind: "thing",
       name,
       data
     }
-  ], { committer });
+  ], { committer }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => renderSingleOpSuccess(ctx.out, c, ctx.chars, result, {
     marker: "+",
@@ -51762,9 +51818,6 @@ var handleQuery = async (ctx, { flags }) => {
   if (ctx.liveMode && sinceRepoSeq !== undefined) {
     usageError("--since-repo-seq cannot be used with --live.", "wh thing query --since-repo-seq 42 --all --format json");
   }
-  if (affirmedAbout && match) {
-    usageError("--affirmed-about is PG-served per exact pinned version; it cannot be combined with --match.", "wh thing query --affirmed-about Location/cave@v3");
-  }
   if (count) {
     if (cursor || all || limit || ctx.liveMode || role) {
       usageError("Usage: wh thing query --count [--shape SHAPE] [--about WREF] [--kind KIND] [--match PATTERN] [--since-repo-seq N]", "wh thing query --kind assertion --about Player/alice --count --since-repo-seq 42");
@@ -52105,7 +52158,7 @@ var handleThingRetract = async (ctx, { flags, args }) => {
   const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh thing retract Player/alice --expected-version 3");
   const leaseId = requireLeaseIdFlag(flags["lease-id"], "wh thing retract Player/alice --lease-id <id>");
   const c = ctx.colors;
-  const commitResult = await ctx.client.commit.apply(org, repo, message ?? `retract ${name}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, message ?? `retract ${name}`, [
     {
       operation: "retract",
       name,
@@ -52114,7 +52167,7 @@ var handleThingRetract = async (ctx, { flags, args }) => {
       ...expectedVersion !== undefined ? { expectedVersion } : {},
       ...leaseId ? { leaseId } : {}
     }
-  ], { committer });
+  ], { committer }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => {
     renderCommitterEcho(ctx.out, c, committer);
@@ -52151,7 +52204,7 @@ var handleRevise2 = async (ctx, { flags, args }) => {
   if (data === undefined) {
     usageError("--data is required for revise", `wh thing revise Location/player --data '{"x":1}'`);
   }
-  const commitResult = await ctx.client.commit.apply(org, repo, message ?? `revise ${name}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, message ?? `revise ${name}`, [
     {
       operation: "revise",
       kind: "thing",
@@ -52160,7 +52213,7 @@ var handleRevise2 = async (ctx, { flags, args }) => {
       ...expectedVersion !== undefined ? { expectedVersion } : {},
       ...leaseId ? { leaseId } : {}
     }
-  ], { committer });
+  ], { committer }));
   const result = requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => renderSingleOpSuccess(ctx.out, c, ctx.chars, result, {
     marker: "~",
@@ -52174,6 +52227,9 @@ var searchFlags = {
   shape: flag.string({ description: "Filter by shape" }),
   kind: flag.string({ description: "Filter by kind" }),
   about: flag.string({ description: "Filter by about wref" }),
+  "affirmed-about": flag.string({
+    description: "Only assertions whose current version affirms exactly this pinned target (Shape/name@vN)"
+  }),
   mode: flag.string({
     description: "Search mode: text (default), vector, or hybrid"
   }),
@@ -52238,6 +52294,7 @@ var handleSearch = async (ctx, { flags, args }) => {
     shape: flags.shape,
     kind,
     about: flags.about,
+    affirmedAbout: flags["affirmed-about"],
     includeRetracted: flags["include-retracted"],
     resolveCollections,
     limit: pageLimit,
@@ -52249,6 +52306,7 @@ var handleSearch = async (ctx, { flags, args }) => {
     shape: flags.shape,
     kind,
     about: flags.about,
+    affirmedAbout: flags["affirmed-about"],
     includeRetracted: flags["include-retracted"],
     resolveCollections,
     limit: boundedTextLimit,
@@ -52278,6 +52336,7 @@ async function fetchAllSearchPages(ctx, org, repo, queryText, opts) {
       shape: opts.shape,
       kind: opts.kind,
       about: opts.about,
+      affirmedAbout: opts.affirmedAbout,
       includeRetracted: opts.includeRetracted,
       resolveCollections: opts.resolveCollections,
       limit: opts.limit,
@@ -54831,7 +54890,7 @@ function renderOperationEventReceipt(ctx, receipt) {
   writeOutput(ctx, receipt, () => renderPrettyReceipt(ctx, receipt));
 }
 function renderSubmittedStreamResult(ctx, result, options) {
-  writeOutput(ctx, result, () => renderPrettyReceipts(ctx, result.receipts, options));
+  writeOutput(ctx, identifyCommitSubmitOutput(result), () => renderPrettyReceipts(ctx, result.receipts, options));
 }
 function renderPartialStreamSubmission(ctx, error51, options) {
   const noop3 = error51.completedOperations.filter((operation) => operation.status === "noop").length;
@@ -54851,7 +54910,7 @@ function renderPartialStreamSubmission(ctx, error51, options) {
     eventRequestId: error51.eventRequestId,
     chunkOrdinal: error51.chunkOrdinal
   };
-  writeOutput(ctx, payload, () => renderPrettyReceipts(ctx, error51.completedReceipts, options));
+  writeOutput(ctx, identifyCommitSubmitOutput(payload), () => renderPrettyReceipts(ctx, error51.completedReceipts, options));
 }
 function renderPrettyReceipts(ctx, receipts, options) {
   for (const [index, receipt] of receipts.entries()) {
@@ -55620,22 +55679,11 @@ async function applyJsonlCommit(ctx, args) {
   const tAppendStart = performance.now();
   progress.start(t0);
   let opCount = 0;
-  const receipts = [];
-  const chunkResults = [];
-  const submittedNames = [];
+  const aggregate = new StreamSubmissionAggregator;
   let chunkCount = 0;
   let lastAcknowledgedRepoSeq;
   let repoSeq;
   let createdByEmail;
-  const aggregateSoFar = () => aggregateSubmittedStreamResult({
-    ...args.committer !== undefined ? { committer: args.committer } : {},
-    ...createdByEmail !== undefined ? { createdByEmail } : {},
-    message: args.message,
-    operations: submittedNames,
-    ...repoSeq !== undefined ? { repoSeq } : {},
-    receipts,
-    results: chunkResults
-  });
   try {
     let parsedOpCount = 0;
     let chunk = [];
@@ -55664,16 +55712,20 @@ async function applyJsonlCommit(ctx, args) {
         receipt = appendResult.receipt;
         createdByEmail = appendResult.createdByEmail ?? createdByEmail;
         repoSeq = appendResult.repoSeq ?? repoSeq;
-        chunkResults.push(...offsetChunkResultIndexes(appendResult.results, chunkStart));
+        aggregate.addChunk({
+          results: appendResult.results,
+          chunkStart,
+          submittedNames: operationsChunk
+        });
       } catch (cause) {
         const pendingOutcome = isDefiniteStreamAppendRejection(cause) ? "absent" : "unknown";
-        if (receipts.length === 0 && pendingOutcome === "absent") {
+        if (aggregate.receipts.length === 0 && pendingOutcome === "absent") {
           throw cause;
         }
         throw new PartialStreamSubmissionError({
           cause,
-          completedReceipts: receipts,
-          completedOperations: completedOperationsFrom(aggregateSoFar()),
+          completedReceipts: aggregate.receipts,
+          completedOperations: aggregate.completedOperations(),
           submissionId: args.submissionId,
           eventRequestId,
           chunkOrdinal,
@@ -55683,7 +55735,7 @@ async function applyJsonlCommit(ctx, args) {
           ...lastAcknowledgedRepoSeq === undefined ? {} : { lastAcknowledgedRepoSeq }
         });
       }
-      receipts.push(receipt);
+      aggregate.addReceipt(receipt);
       const parsedRepoSeq = Number(receipt.event?.repoSeq);
       if (Number.isSafeInteger(parsedRepoSeq) && parsedRepoSeq >= 0) {
         lastAcknowledgedRepoSeq = parsedRepoSeq;
@@ -55714,9 +55766,6 @@ async function applyJsonlCommit(ctx, args) {
           assertNoNulBytes("data" in operation ? operation.data : undefined, `${args.lineLabel} JSONL line ${lineNumber}`);
         }
         parsedOpCount += 1;
-        submittedNames.push({
-          name: operation.name
-        });
         chunk.push(withSkipExisting(operation, args.skipExisting === true));
         if (chunk.length < chunkSize)
           continue;
@@ -55778,7 +55827,12 @@ async function applyJsonlCommit(ctx, args) {
         ctx.err(`  warn: failed to write timing sidecar: ${String(err)}`);
       }
     }
-    return aggregateSoFar();
+    return aggregate.toResult({
+      committer: args.committer,
+      createdByEmail,
+      message: args.message,
+      repoSeq
+    });
   } catch (error51) {
     progress.onError();
     if (error51 instanceof PartialStreamSubmissionError || opCount === 0) {
@@ -55786,8 +55840,8 @@ async function applyJsonlCommit(ctx, args) {
     }
     throw new PartialStreamSubmissionError({
       cause: error51,
-      completedReceipts: receipts,
-      completedOperations: completedOperationsFrom(aggregateSoFar()),
+      completedReceipts: aggregate.receipts,
+      completedOperations: aggregate.completedOperations(),
       submissionId: args.submissionId,
       eventRequestId: operationEventStreamRequestId(args.submissionId, chunkCount),
       chunkOrdinal: chunkCount,
@@ -56078,12 +56132,12 @@ var handleSubmit = async (ctx, { flags, args }) => {
       streamId,
       submissionId,
       allowNulBytes
-    }) : await ctx.client.commit.apply(org, repo, message, operations, {
+    }) : identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo, message, operations, {
       committer,
       skipExisting,
       submissionId,
       ...returnRepoSeq === true ? { returnRepoSeq: true } : {}
-    });
+    }));
   } catch (error51) {
     if (error51 instanceof AllStreamOperationsFailedError) {
       renderSubmittedStreamResult(ctx, error51.result);
@@ -62807,7 +62861,7 @@ var handleRetract2 = async (ctx, { flags, args }) => {
   const { org, repo: repo2 } = parseOrgRepo(getRepoRef(ctx), ctx.config);
   const expectedVersion = parsePositiveIntFlag(flags["expected-version"], "--expected-version", "wh shape retract Location --expected-version 3");
   const c = ctx.colors;
-  const commitResult = await ctx.client.commit.apply(org, repo2, flags.message ?? `retract shape ${shapeName}`, [
+  const commitResult = identifyCommitSubmitOutput(await ctx.client.commit.apply(org, repo2, flags.message ?? `retract shape ${shapeName}`, [
     {
       operation: "retract",
       kind: "shape",
@@ -62815,7 +62869,7 @@ var handleRetract2 = async (ctx, { flags, args }) => {
       ...flags.reason ? { reason: flags.reason } : {},
       ...expectedVersion !== undefined ? { expectedVersion } : {}
     }
-  ], { committer: flags.committer });
+  ], { committer: flags.committer }));
   requireSingleOpSuccess(commitResult);
   writeOutput(ctx, commitResult, () => {
     renderCommitterEcho(ctx.out, c, flags.committer);
@@ -66388,7 +66442,7 @@ function resolveLogLevel(flagLevel, env) {
 // package.json
 var package_default3 = {
   name: "@warmhub/cli",
-  version: "0.91.1",
+  version: "0.93.0",
   private: false,
   type: "module",
   description: "The wh CLI for WarmHub — create repos, commit and query data, and compound knowledge with your AI agents.",
@@ -67007,5 +67061,5 @@ process.exitCode = interceptedExitCode === undefined ? await runPreparedCli(laun
   version: package_default3.version
 }) : interceptedExitCode;
 
-//# debugId=875DDB608AC3D57A64756E2164756E21
-//# warmhub-cli-build-info {"cliVersion":"0.91.1","sdkVersion":"0.89.0"}
+//# debugId=A6E050347C8F0F7D64756E2164756E21
+//# warmhub-cli-build-info {"cliVersion":"0.93.0","sdkVersion":"0.91.0"}

package/package.json

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