@arcadiasystems/morse-cli 0.4.1 → 0.5.0

package/CHANGELOG.md

@@ -4,6 +4,52 @@ All notable changes to `@arcadiasystems/morse-cli` are documented here. The
 format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.0] - 2026-06-09
+
+Hardening pass from CLI testing: fail fast before paying for Walrus storage,
+clearer errors on doomed operations, and accurate listings.
+
+### Added
+
+- `revision publish-from-draft` now reuses the draft's already-uploaded content
+  by default (no re-upload, no extra WAL, and the published bytes match what was
+  reviewed). Pass `--file`/`--stdin` only to publish replacement content.
+- `entry list` / `entry scan` accept `--drafts-only` to show just entries with a
+  pending (unpublished) draft. `entry list`/`entry get` now show a draft marker /
+  `pendingDraft` line.
+- `file download --raw` writes the still-encrypted bytes when no decrypt input is
+  given.
+
+### Changed
+
+- `file download` now refuses to write ciphertext when a file has recipients and
+  no `--share`/`--prefix`+`--nonce` is given; pass `--raw` to opt in. Previously
+  it warned and wrote the raw bytes.
+- `entry add` verifies the collection exists (and is blob-mode) before uploading
+  to Walrus, so a missing or quilt collection fails without burning storage.
+- `collection delete` checks the collection is empty up front and returns a clear
+  error instead of a raw transaction abort.
+- `file list` now reconciles metadata-update and recipient events, so renames and
+  recipient counts are current without `--hydrate`.
+- `collection create --mode quilt` warns that quilt collections cannot yet be
+  populated with `entry add`.
+
+### Fixed
+
+- The `revision` commands refuse to append an unencrypted revision to an entry
+  that has encrypted revisions, instead of silently producing a mixed-encryption
+  entry.
+
+## [0.4.2] - 2026-06-05
+
+### Changed
+
+- Requires `@arcadiasystems/morse-sdk` `^0.4.2`. SDK 0.4.2 fixes a gRPC reader
+  bug (`Option<ID>` decoding) that prevented `morse file download` and `morse
+  file get` from reading a RecipientFile back. No CLI source changes; the fix is
+  internal to `RpcRecipientFilesReader.getRecipientFile`, which the CLI already
+  calls.
+
 ## [0.4.1] - 2026-06-05
 
 ### Changed

package/README.md

@@ -188,8 +188,8 @@ and `-C, --collection <name>`, both defaulting to the active context.
 | --- | --- |
 | `entry get <entryId> [-P …] [-C …]` | Fetch a single entry's metadata. |
 | `entry read <entryId> [revisionIndex] [--out <path>] [--via-aggregator] [-P …] [-C …]` | Fetch a public entry's content to stdout or a file. |
-| `entry list [-P …] [-C …]` | List entries (paginated). |
-| `entry scan [-P …] [-C …]` | List every entry (auto-paginated). |
+| `entry list [--drafts-only] [-P …] [-C …]` | List entries (paginated); `--drafts-only` shows just entries with a pending draft. |
+| `entry scan [--drafts-only] [-P …] [-C …]` | List every entry (auto-paginated). |
 | `entry add <name> --file <path> [-P …] [-C …]` | Upload content and add a new entry; prints a viewable link. |
 | `entry delete <entryId> [-P …] [-C …]` | Delete an entry. |
 | `entry add-encrypted <name> --file <path> [-P …] [-C …]` | Encrypt, upload, and add a new entry. |
@@ -212,7 +212,7 @@ commands; pure on-chain commands (publication, collection, cap) have no epochs.
 | --- | --- |
 | `revision publish-direct <entryId> --file <path> [-P …] [-C …]` | Upload content and append a public revision. |
 | `revision append-draft <entryId> --file <path> [-P …] [-C …]` | Upload content and append a draft revision. |
-| `revision publish-from-draft <entryId> <draftRevisionId> --file <path> [-P …] [-C …]` | Publish a new revision, referencing a draft. |
+| `revision publish-from-draft <entryId> <draftRevisionId> [--file <path>] [-P …] [-C …]` | Publish a draft as a new revision. Reuses the draft's content by default; pass `--file`/`--stdin` to publish replacement content. |
 
 ### cap
 
@@ -238,7 +238,7 @@ There is no separate allowlist object.
 | --- | --- |
 | `file upload <path> --name <n> (--public \| --encrypt \| -r <addr>...) [--content-type <m>] [--epochs <n>]` | Upload to Walrus and register. `--public` is world-readable; `--encrypt` (or supplying `-r`) encrypts, and the sender is always a recipient. One of the three is required. |
 | `file register --blob-id <id> --name <n> --content-type <m> --size <bytes> (--public \| --encrypted --seal-prefix <hex>) [-r <addr>...] [--blob-object-id <id>]` | Register metadata for a blob already on Walrus. |
-| `file download [file] [--out <path>] [--share <s>] [--prefix <hex> --nonce <hex>] [--via-aggregator]` | Download content; decrypts in place with a share string (or prefix + nonce). |
+| `file download [file] [--out <path>] [--share <s>] [--prefix <hex> --nonce <hex>] [--raw] [--via-aggregator]` | Download content; decrypts in place with a share string (or prefix + nonce). For an encrypted file with no decrypt input, it refuses unless `--raw` is given. |
 | `file list [--address <addr>] [--accessible] [--hydrate] [--limit <n>] [--indexer-url <url>]` | List files owned by (or, with `--accessible`, decryptable by) an address. |
 | `file get <file>` | Fetch a file's on-chain metadata and recipient list. |
 | `file update <file> --name <n> --content-type <m>` | Update name and MIME (owner only). |
@@ -311,6 +311,14 @@ to fetch the full record per file (one read each) when you need them.
   to read through the Walrus aggregator HTTP service instead: more reliable when
   storage nodes are flaky (common on testnet), at the cost of trusting the
   aggregator's bytes (no client-side verification).
+- Encrypted entries cannot be revised. The `revision` commands and `entry add`
+  only produce unencrypted content, so the CLI refuses to append to an entry that
+  already has encrypted revisions (to avoid a mixed-encryption entry). Use
+  `entry add-encrypted` for new encrypted entries.
+- `entry add` supports blob-mode collections only. Quilt collections can be
+  created but not yet populated through the CLI; `entry add` refuses them.
+- There is no command to query Walrus blob storage expiry; `--epochs` sets the
+  lease at upload time, but remaining lease time is not exposed by the SDK.
 - Mainnet is not yet deployed; use `testnet`.
 
 ## Publishing

package/dist/index.js

@@ -148,7 +148,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@arcadiasystems/morse-cli",
-  version: "0.4.1",
+  version: "0.5.0",
   description: "Command-line interface for the Morse decentralized CMS on Sui.",
   license: "MIT",
   type: "module",
@@ -203,7 +203,7 @@ var package_default = {
     prepublishOnly: "bun run check && bun run build"
   },
   dependencies: {
-    "@arcadiasystems/morse-sdk": "^0.4.1",
+    "@arcadiasystems/morse-sdk": "^0.4.2",
     "@mysten/seal": "1.1.3",
     "@mysten/sui": "2.16.2",
     "@mysten/walrus": "1.1.6",
@@ -1136,11 +1136,18 @@ function renderPublicationList(items) {
   return items.map((item) => `${item.publicationId}  (owner cap ${shortId(item.ownerCapId)})`).join(`
 `);
 }
+function hasPendingDraft(entry) {
+  if (entry.draftHead === null) {
+    return false;
+  }
+  return entry.publicHead === null || entry.draftHead > entry.publicHead;
+}
 function renderEntry(entry) {
   const lines = [
     `#${entry.id} ${entry.name}`,
-    `publicHead: ${headLabel(entry.publicHead)}  draftHead: ${headLabel(entry.draftHead)}`,
-    `revisions:  ${entry.revisions.length}`
+    `publicHead:   ${headLabel(entry.publicHead)}  draftHead: ${headLabel(entry.draftHead)}`,
+    `pendingDraft: ${hasPendingDraft(entry) ? "yes" : "no"}`,
+    `revisions:    ${entry.revisions.length}`
   ];
   for (const revision of entry.revisions) {
     lines.push(`  ${renderRevisionLine(revision)}`);
@@ -1152,7 +1159,10 @@ function renderEntryList(entries) {
   if (entries.length === 0) {
     return "No entries in this collection.";
   }
-  return entries.map((entry) => `#${entry.id} ${entry.name} (${entry.revisions.length} revisions)`).join(`
+  return entries.map((entry) => {
+    const marker = hasPendingDraft(entry) ? " [draft]" : "";
+    return `#${entry.id} ${entry.name} (${entry.revisions.length} revisions)${marker}`;
+  }).join(`
 `);
 }
 function renderFileList(items) {
@@ -1397,7 +1407,11 @@ function registerCapCommands(program) {
 }
 
 // src/commands/collection.ts
-import { createCollection, deleteCollection } from "@arcadiasystems/morse-sdk";
+import {
+  createCollection,
+  deleteCollection,
+  StorageMode as StorageMode2
+} from "@arcadiasystems/morse-sdk";
 async function runCollectionList(ctx, options) {
   const id = await resolvePublication(ctx, options.publication);
   const publication = await ctx.reader.getPublication(id, ctx.signal);
@@ -1410,6 +1424,9 @@ async function runCollectionCreate(ctx, name, options, gopts) {
   const id = await resolvePublication(ctx, options.publication);
   const storageMode = coerceStorageMode(options.mode);
   const publisherCapId = await resolvePublisherCap(ctx.reader, ctx.address, id, options.publisherCap, ctx.signal);
+  if (storageMode === StorageMode2.Quilt) {
+    ctx.output.warn("Quilt collections cannot yet be populated with `morse entry add` (only blob collections are supported).");
+  }
   ctx.output.info(`Creating collection "${name}" (${storageMode})...`);
   const result = await createCollection(ctx.adapter, ctx.config, {
     publicationId: id,
@@ -1423,6 +1440,13 @@ async function runCollectionCreate(ctx, name, options, gopts) {
 }
 async function runCollectionDelete(ctx, name, options, gopts) {
   const id = await resolvePublication(ctx, options.publication);
+  const entries = await ctx.reader.listEntries(id, name, {
+    limit: 1,
+    signal: ctx.signal
+  });
+  if (entries.results.length > 0) {
+    throw new UsageError(`Cannot delete collection "${name}": it still has entries. Delete them first.`);
+  }
   const proceed = await confirm(`Delete collection "${name}" from ${shortId(id)}? It must be empty.`, { assumeYes: Boolean(gopts.yes), signal: ctx.signal });
   if (!proceed) {
     cancelled();
@@ -1553,7 +1577,8 @@ function renderProfiles(config) {
 // src/commands/entry.ts
 import {
   addEntryFromBytes,
-  deleteEntry
+  deleteEntry,
+  StorageMode as StorageMode3
 } from "@arcadiasystems/morse-sdk";
 
 // src/cli/input.ts
@@ -1701,6 +1726,16 @@ function registerEncryptedEntryCommands(entry) {
 }
 
 // src/commands/entry.ts
+async function assertEntryAddCollection(ctx, publicationId, collection) {
+  const publication = await ctx.reader.getPublication(publicationId, ctx.signal);
+  const found = publication.collections.find((c) => c.name === collection);
+  if (found === undefined) {
+    throw new UsageError(`Publication ${shortId(publicationId)} has no collection "${collection}".`);
+  }
+  if (found.storageMode === StorageMode3.Quilt) {
+    throw new UsageError(`Collection "${collection}" uses quilt storage, which \`entry add\` does not support yet. Use a blob-mode collection.`);
+  }
+}
 async function runEntryGet(ctx, entryId, options) {
   const id = await resolvePublication(ctx, options.publication);
   const collection = resolveCollection(ctx, options.collection);
@@ -1718,8 +1753,9 @@ async function runEntryList(ctx, options) {
   if (page.nextCursor !== null) {
     ctx.output.info(`More results: pass --cursor "${page.nextCursor}"`);
   }
-  ctx.output.result(renderEntryList(page.results), {
-    results: page.results,
+  const results = options.draftsOnly ? page.results.filter(hasPendingDraft) : page.results;
+  ctx.output.result(renderEntryList(results), {
+    results,
     nextCursor: page.nextCursor
   });
 }
@@ -1730,7 +1766,9 @@ async function runEntryScan(ctx, options) {
   for await (const item of ctx.reader.scanEntries(id, collection, {
     signal: ctx.signal
   })) {
-    entries.push(item);
+    if (!options.draftsOnly || hasPendingDraft(item)) {
+      entries.push(item);
+    }
   }
   ctx.output.result(renderEntryList(entries), { results: entries });
 }
@@ -1740,6 +1778,7 @@ async function runEntryAdd(ctx, name, options) {
   const epochs = parsePositiveInt(options.epochs, "--epochs");
   const bytes = await readContentBytes(options);
   const contentType = resolveContentType(options.contentType, options.stdin ? undefined : options.file);
+  await assertEntryAddCollection(ctx, id, collection);
   const publisherCapId = await resolvePublisherCap(ctx.reader, ctx.address, id, options.publisherCap, ctx.signal);
   ctx.output.info(`Uploading ${bytes.length} bytes to Walrus...`);
   const result = await addEntryFromBytes(ctx.adapter, ctx.config, {
@@ -1819,11 +1858,11 @@ function registerEntryCommands(program) {
   collectionOption(publicationOption(get)).action(async (entryId, options, command) => {
     await runEntryGet(await buildReadContext(command), entryId, options);
   });
-  const list = entry.command("list").description("List entries in a collection").option("--limit <n>", "Maximum results per page").option("--cursor <cursor>", "Continue from a previous page cursor");
+  const list = entry.command("list").description("List entries in a collection").option("--limit <n>", "Maximum results per page").option("--cursor <cursor>", "Continue from a previous page cursor").option("--drafts-only", "Show only entries with a pending (unpublished) draft");
   collectionOption(publicationOption(list)).action(async (options, command) => {
     await runEntryList(await buildReadContext(command), options);
   });
-  const scan = entry.command("scan").description("List every entry in a collection (auto-paginated)");
+  const scan = entry.command("scan").description("List every entry in a collection (auto-paginated)").option("--drafts-only", "Show only entries with a pending (unpublished) draft");
   collectionOption(publicationOption(scan)).action(async (options, command) => {
     await runEntryScan(await buildReadContext(command), options);
   });
@@ -2178,10 +2217,16 @@ async function runFileDownload(ctx, positional, options) {
     throw new UsageError("Downloading content to stdout is not supported in --json mode; pass --out <path>.");
   }
   const target = resolveDownloadTarget(positional, options);
+  if (options.raw && target.decrypt !== undefined) {
+    ctx.output.warn("--raw is ignored because a decrypt input (--share/--prefix/--nonce) was given; decrypting.");
+  }
   const fileId = toRecipientFileId(target.fileId);
   const file = await ctx.filesReader.getRecipientFile(fileId, ctx.signal);
   if (target.decrypt === undefined && file.members.length > 0) {
-    ctx.output.warn("This file has a recipient list, so its bytes are likely encrypted. Pass --share (or --prefix and --nonce) to decrypt; writing the raw bytes as-is.");
+    if (!options.raw) {
+      throw new UsageError("This file has a recipient list, so its bytes are encrypted. Pass --share (or --prefix and --nonce) to decrypt, or --raw to write the raw ciphertext anyway.");
+    }
+    ctx.output.warn("Writing raw ciphertext (--raw); the output is unusable without decryption.");
   }
   ctx.output.info("Fetching content from Walrus...");
   const bytes = await ctx.walrusRead.readBlob(file.blobId, {
@@ -2216,6 +2261,7 @@ async function runFileList(ctx, options) {
     ctx.output.info("Fetching recipient and file events...");
     const events = await fetchEventStreams(ctx.events, [
       types.RecipientFileCreated,
+      types.RecipientFileMetadataUpdated,
       types.RecipientAdded,
       types.RecipientRemoved,
       types.RecipientFileDeleted
@@ -2225,7 +2271,10 @@ async function runFileList(ctx, options) {
     ctx.output.info("Fetching file events...");
     const events = await fetchEventStreams(ctx.events, [
       types.RecipientFileCreated,
+      types.RecipientFileMetadataUpdated,
       types.RecipientFileOwnershipTransferred,
+      types.RecipientAdded,
+      types.RecipientRemoved,
       types.RecipientFileDeleted
     ], ctx.signal);
     summaries = reconcileRecipientFilesOwnedBy(events, address, types);
@@ -2254,7 +2303,7 @@ function registerFileCommands(program) {
       indexerUrl: options.indexerUrl
     }), options);
   });
-  const download = file.command("download [file]").description("Download a file's content; decrypts in place when encrypted").option("--out <path>", "Write content to a file instead of stdout").option("--share <string>", "Share string from upload (bundles file id, prefix, nonce)").option("--prefix <hex>", "Seal prefix (with --nonce) to decrypt").option("--nonce <hex>", "Seal nonce (with --prefix) to decrypt");
+  const download = file.command("download [file]").description("Download a file's content; decrypts in place when encrypted").option("--out <path>", "Write content to a file instead of stdout").option("--share <string>", "Share string from upload (bundles file id, prefix, nonce)").option("--prefix <hex>", "Seal prefix (with --nonce) to decrypt").option("--nonce <hex>", "Seal nonce (with --prefix) to decrypt").option("--raw", "Write the raw (still-encrypted) bytes when no decrypt input is given");
   viaAggregatorOption(download).action(async (target, options, command) => {
     await runFileDownload(await buildFileDownloadContext(command, {
       viaAggregator: options.viaAggregator
@@ -2428,26 +2477,41 @@ async function resolveTarget(ctx, options) {
   const collection = resolveCollection(ctx, options.collection);
   return { publicationId, collection };
 }
-async function prepareContent(ctx, publicationId, options) {
+async function loadWritableEntry(ctx, publicationId, collection, entryId) {
+  const entry = await ctx.reader.getEntry(publicationId, collection, entryId, ctx.signal);
+  if (entry.revisions.some((revision) => revision.encrypted)) {
+    throw new UsageError(`Entry #${entryId} has encrypted revisions; the CLI cannot append an unencrypted revision to it. Encrypted revisions are not yet supported.`);
+  }
+  return entry;
+}
+async function readLocalContent(options) {
   const epochs = parsePositiveInt(options.epochs, "--epochs");
   const bytes = await readContentBytes(options);
   const contentType = resolveContentType(options.contentType, options.stdin ? undefined : options.file);
-  const publisherCapId = await resolvePublisherCap(ctx.reader, ctx.address, publicationId, options.publisherCap, ctx.signal);
-  ctx.output.info(`Uploading ${bytes.length} bytes to Walrus...`);
-  const upload = await ctx.walrus.uploadBlob(bytes, {
-    epochs,
+  return { bytes, contentType, epochs };
+}
+async function uploadLocal(ctx, local) {
+  ctx.output.info(`Uploading ${local.bytes.length} bytes to Walrus...`);
+  const upload = await ctx.walrus.uploadBlob(local.bytes, {
+    epochs: local.epochs,
     deletable: true
   });
   ctx.output.info(`Blob uploaded (${upload.blobObjectId}). Submitting transaction...`);
-  return { blobObjectId: upload.blobObjectId, contentType, publisherCapId };
+  return { blobObjectId: upload.blobObjectId, contentType: local.contentType };
+}
+function capFor(ctx, publicationId, options) {
+  return resolvePublisherCap(ctx.reader, ctx.address, publicationId, options.publisherCap, ctx.signal);
 }
 async function runRevisionPublishDirect(ctx, entryId, options) {
   const { publicationId, collection } = await resolveTarget(ctx, options);
   const numericEntryId = parseId(entryId, "entryId");
-  const prepared = await prepareContent(ctx, publicationId, options);
+  const local = await readLocalContent(options);
+  await loadWritableEntry(ctx, publicationId, collection, numericEntryId);
+  const publisherCapId = await capFor(ctx, publicationId, options);
+  const prepared = await uploadLocal(ctx, local);
   const result = await publishDirect(ctx.adapter, ctx.config, {
     publicationId,
-    publisherCapId: prepared.publisherCapId,
+    publisherCapId,
     collectionName: collection,
     entryId: numericEntryId,
     blobObjectId: prepared.blobObjectId,
@@ -2459,10 +2523,13 @@ async function runRevisionPublishDirect(ctx, entryId, options) {
 async function runRevisionAppendDraft(ctx, entryId, options) {
   const { publicationId, collection } = await resolveTarget(ctx, options);
   const numericEntryId = parseId(entryId, "entryId");
-  const prepared = await prepareContent(ctx, publicationId, options);
+  const local = await readLocalContent(options);
+  await loadWritableEntry(ctx, publicationId, collection, numericEntryId);
+  const publisherCapId = await capFor(ctx, publicationId, options);
+  const prepared = await uploadLocal(ctx, local);
   const result = await appendDraftRevision(ctx.adapter, ctx.config, {
     publicationId,
-    publisherCapId: prepared.publisherCapId,
+    publisherCapId,
     collectionName: collection,
     entryId: numericEntryId,
     blobObjectId: prepared.blobObjectId,
@@ -2471,14 +2538,31 @@ async function runRevisionAppendDraft(ctx, entryId, options) {
   });
   ctx.output.result(`Appended draft revision #${result.revisionId} on entry #${numericEntryId}. (tx: ${result.digest})`, result);
 }
+function reuseDraftBlob(entry, draftRevisionId) {
+  const draft = entry.revisions.find((r) => r.id === draftRevisionId);
+  if (draft === undefined) {
+    throw new UsageError(`Entry #${entry.id} has no revision #${draftRevisionId} to publish.`);
+  }
+  if (draft.blobRef.kind !== "blob") {
+    throw new UsageError(`Draft #${draftRevisionId} uses quilt storage, which cannot be reused; pass --file or --stdin to publish new content.`);
+  }
+  return {
+    blobObjectId: draft.blobRef.blobObjectId,
+    contentType: draft.contentType
+  };
+}
 async function runRevisionPublishFromDraft(ctx, entryId, draftRevisionId, options) {
   const { publicationId, collection } = await resolveTarget(ctx, options);
   const numericEntryId = parseId(entryId, "entryId");
   const draftId = parseId(draftRevisionId, "draftRevisionId");
-  const prepared = await prepareContent(ctx, publicationId, options);
+  const providedNewContent = options.file !== undefined || Boolean(options.stdin);
+  const local = providedNewContent ? await readLocalContent(options) : undefined;
+  const entry = await loadWritableEntry(ctx, publicationId, collection, numericEntryId);
+  const publisherCapId = await capFor(ctx, publicationId, options);
+  const prepared = local === undefined ? reuseDraftBlob(entry, draftId) : await uploadLocal(ctx, local);
   const result = await publishFromDraft(ctx.adapter, ctx.config, {
     publicationId,
-    publisherCapId: prepared.publisherCapId,
+    publisherCapId,
     collectionName: collection,
     entryId: numericEntryId,
     draftRevisionId: draftId,
@@ -2496,7 +2580,7 @@ function registerRevisionCommands(program) {
   revisionOptions(revision.command("append-draft <entryId>").description("Upload content and append it as a draft revision")).action(async (entryId, options, command) => {
     await runRevisionAppendDraft(await buildContentContext(command), entryId, options);
   });
-  revisionOptions(revision.command("publish-from-draft <entryId> <draftRevisionId>").description("Upload content and publish it as a new revision, referencing a draft")).action(async (entryId, draftRevisionId, options, command) => {
+  revisionOptions(revision.command("publish-from-draft <entryId> <draftRevisionId>").description("Publish a draft as a new revision (reuses the draft's content; pass --file/--stdin to publish replacement content)")).action(async (entryId, draftRevisionId, options, command) => {
     await runRevisionPublishFromDraft(await buildContentContext(command), entryId, draftRevisionId, options);
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@arcadiasystems/morse-cli",
-	"version": "0.4.1",
+	"version": "0.5.0",
 	"description": "Command-line interface for the Morse decentralized CMS on Sui.",
 	"license": "MIT",
 	"type": "module",
@@ -55,7 +55,7 @@
 		"prepublishOnly": "bun run check && bun run build"
 	},
 	"dependencies": {
-		"@arcadiasystems/morse-sdk": "^0.4.1",
+		"@arcadiasystems/morse-sdk": "^0.4.2",
 		"@mysten/seal": "1.1.3",
 		"@mysten/sui": "2.16.2",
 		"@mysten/walrus": "1.1.6",