@unisonlabs/sixminute-admin 0.1.1144-next → 0.1.1145-next

package/dist/sixminute-admin.mjs

@@ -21,7 +21,7 @@ import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
 
 // tools/admin/src/build-info.ts
-var BUILT = { version: "0.1.1144-next", commit: "8353d196401b6a3fafb8f7f3f3c6a32a5561f04b", surface: "05ec6b71af5f095b" };
+var BUILT = { version: "0.1.1145-next", commit: "b155ebc295291194b2091be2b28e563dc7a43eaa", surface: "05ec6b71af5f095b" };
 
 // tools/admin/src/run.ts
 import { rmSync as rmSync3 } from "node:fs";
@@ -5096,9 +5096,25 @@ var EntrySplitResponseSchema = exports_external.object({ first: EntrySchema, sec
 });
 var EntryMergeRequestSchema = exports_external.object({
   matter_id: MatterIdSchema.nullable().optional(),
-  with: EntryIdSchema,
+  with: EntryIdSchema.optional(),
+  with_all: exports_external.array(EntryIdSchema).min(1).max(49).optional(),
   narrative: ConfirmedNarrativeSchema,
   attributes: EntryAttributesSchema
+}).superRefine((body, ctx) => {
+  if (body.with === undefined === (body.with_all === undefined)) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["with_all"],
+      message: "a merge names the rows that follow in `with` or in `with_all`, and in exactly " + "one of them: `with` is one row, `with_all` is the list"
+    });
+  }
+  if (body.with_all !== undefined && new Set(body.with_all).size !== body.with_all.length) {
+    ctx.addIssue({
+      code: exports_external.ZodIssueCode.custom,
+      path: ["with_all"],
+      message: "a merge names each row once: an id is in `with_all` twice"
+    });
+  }
 });
 var EntryBatchItemSchema = exports_external.object({
   entry: JudgedEntrySchema,
@@ -5974,13 +5990,13 @@ var LocalAcceptedSchema = exports_external.object({ accepted: exports_external.l
 var LocalProposeKeptReasonSchema = exports_external.enum(["no_cells", "not_signed_in", "refused", "offline"]);
 var LocalProposeRequestSchema = exports_external.discriminatedUnion("kind", [
   exports_external.object({ kind: exports_external.literal("split"), id: EntryIdSchema, at: TimestampSchema }),
-  exports_external.object({ kind: exports_external.literal("merge"), first: EntryIdSchema, second: EntryIdSchema })
+  exports_external.object({ kind: exports_external.literal("merge"), entries: exports_external.array(EntryIdSchema).min(2).max(50) })
 ]).superRefine((ask, ctx) => {
-  if (ask.kind === "merge" && ask.first === ask.second) {
+  if (ask.kind === "merge" && new Set(ask.entries).size !== ask.entries.length) {
     ctx.addIssue({
       code: exports_external.ZodIssueCode.custom,
-      path: ["second"],
-      message: "a merge joins two rows: name the one that follows, not the one that starts it"
+      path: ["entries"],
+      message: "a merge joins different rows: an id is in `entries` twice"
     });
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unisonlabs/sixminute-admin",
-  "version": "0.1.1144-next",
+  "version": "0.1.1145-next",
   "description": "Sixminute operator tool: the admin commands of the Sixminute API, run with your own operator sign-in.",
   "license": "UNLICENSED",
   "repository": {