shipmail-cli 0.4.10 → 0.4.12

package/README.md

@@ -84,12 +84,12 @@ shipmail mailboxes sandbox-inbound mbx_123 --from customer@example.com --subject
 # Read inbound mail
 shipmail inbox list 550e8400-e29b-41d4-a716-446655440000 --folder-role inbox --after 2025-07-20T00:00:00Z --limit 25
 shipmail inbox message 550e8400-e29b-41d4-a716-446655440000 eml_123
-shipmail inbox threads 550e8400-e29b-41d4-a716-446655440000 --reply-state needs_reply --after 2025-07-20T00:00:00Z --limit 50
+shipmail inbox threads 550e8400-e29b-41d4-a716-446655440000 --attention-state needs_reply --after 2025-07-20T00:00:00Z --limit 50
 shipmail inbox thread 550e8400-e29b-41d4-a716-446655440000 thr_123
-shipmail inbox draft 550e8400-e29b-41d4-a716-446655440000 thr_123 --expected-reply-version 7 --text "Thanks for the note"
+shipmail inbox draft 550e8400-e29b-41d4-a716-446655440000 thr_123 --expected-version 7 --text "Thanks for the note"
 # Apply your approval policy; stale drafts fail with 409 without delivery.
 shipmail inbox send-draft 550e8400-e29b-41d4-a716-446655440000 thr_123 drf_123
-shipmail inbox thread-state 550e8400-e29b-41d4-a716-446655440000 thr_123 --reply-state resolved --expected-reply-version 8
+shipmail inbox thread-attention 550e8400-e29b-41d4-a716-446655440000 thr_123 --done true --expected-version 8
 shipmail inbox reply-message 550e8400-e29b-41d4-a716-446655440000 eml_123 --to user@example.com --text "Thanks"
 shipmail inbox reply-thread 550e8400-e29b-41d4-a716-446655440000 thr_123 --to user@example.com --text "Following up"
 
@@ -114,6 +114,7 @@ shipmail newsletters preflight nws_123
 shipmail newsletters schedule nws_123 --scheduled-at 2026-08-01T09:00:00.000Z
 shipmail newsletter-assets list --kind image
 shipmail newsletter-assets upload ./hero.png --content-type image/png
+shipmail newsletter-assets upload ./demo.mp4 --content-type video/mp4 --thumbnail ./demo-poster.jpg
 shipmail newsletter-assets register-url https://cdn.shipmail.to/newsletter-images/org_123/hero.png
 
 # Manage webhooks
@@ -136,7 +137,9 @@ Paragraph, quote, callout, list-item, and column bodies in `--blocks` accept bar
 sanitized inline HTML. Use `<p>` and `<br>` for line breaks. Shipmail keeps `a`, `b`, `br`,
 `code`, `em`, `i`, `p`, `s`, `span`, `strong`, and `u`, with safe attributes and URLs.
 
-`newsletter-assets list` includes current newsletter media storage usage in the JSON response.
+`newsletter-assets upload` uses a five-minute direct storage PUT, then calls the single-use
+completion URL. Video uploads require a JPEG poster through `--thumbnail`. `newsletter-assets list`
+includes current newsletter media storage usage in the JSON response.
 
 ## Generic API Command
 

package/dist/cli.js

@@ -14,7 +14,7 @@ import {
 } from "shipmail";
 
 // src/version.ts
-var VERSION = "0.4.10";
+var VERSION = "0.4.12";
 
 // src/cli.ts
 var DEFAULT_BASE_URL = "https://shipmail.to/api/v1";
@@ -360,6 +360,8 @@ Usage:
   shipmail mailboxes resume <id>
   shipmail mailboxes export <id>
   shipmail mailboxes export-status <id> <export-id>
+  shipmail mailboxes import-resume <id> <import-id>
+  shipmail mailboxes import-restore <id> <import-id> --file-id impf_...
   shipmail mailboxes app-passwords list <id>
   shipmail mailboxes app-passwords create <id> --name "Desktop mail" [--expires-at 2026-10-01T00:00:00Z] [--allowed-cidr 203.0.113.0/24]
   shipmail mailboxes app-passwords revoke <id> <app-password-id>
@@ -374,20 +376,20 @@ Usage:
   shipmail mailboxes sandbox-inbound <id> --from sender@example.com --subject "Test" (--text "Hello" | --html "<p>Hello</p>") [--to support@example.com]
   shipmail inbox list <mailbox-id> [--folder-role inbox] [--search text] [--after ISO] [--before ISO] [--limit 25] [--cursor cur]
   shipmail inbox message <mailbox-id> <message-id>
-  shipmail inbox threads <mailbox-id> [--reply-state needs_reply] [--after ISO] [--before ISO] [--limit 25] [--cursor cur]
+  shipmail inbox threads <mailbox-id> [--attention-state needs_reply] [--after ISO] [--before ISO] [--limit 25] [--cursor cur]
   shipmail inbox thread <mailbox-id> <thread-id>
-  shipmail inbox thread-state <mailbox-id> <thread-id> --reply-state resolved --expected-reply-version 3
-  shipmail inbox draft <mailbox-id> <thread-id> --expected-reply-version 3 (--text "Hello" | --html "<p>Hello</p>") [--reply-mode reply_all]
+  shipmail inbox thread-attention <mailbox-id> <thread-id> --done true --expected-version 3
+  shipmail inbox draft <mailbox-id> <thread-id> --expected-version 3 (--text "Hello" | --html "<p>Hello</p>") [--reply-mode reply_all]
   shipmail inbox send-draft <mailbox-id> <thread-id> <draft-id>
-  shipmail inbox reply-message <mailbox-id> <message-id> --to user@example.com (--text "Hello" | --html "<p>Hello</p>")
-  shipmail inbox reply-thread <mailbox-id> <thread-id> --to user@example.com (--text "Hello" | --html "<p>Hello</p>")
+  shipmail inbox reply-message <mailbox-id> <message-id> --to user@example.com (--text "Hello" | --html "<p>Hello</p>") [--track-reply]
+  shipmail inbox reply-thread <mailbox-id> <thread-id> --to user@example.com (--text "Hello" | --html "<p>Hello</p>") [--track-reply]
   shipmail inbox update <mailbox-id> <message-id> [--read true] [--starred false]
   shipmail inbox move <mailbox-id> <message-id> (--target-role archive | --target-folder-id fld)
-  shipmail messages send --mailbox-id mbx --to user@example.com --subject "Hi" --text "Hello" [--sandbox-outcome delivered|bounced|complained] [--client-reference crm-123] [--metadata JSON|@file] [--source-rfc-message-id '<crm-123@example.com>'] [--header 'X-CRM-ID: 123']
+  shipmail messages send --mailbox-id mbx --to user@example.com --subject "Hi" --text "Hello" [--track-reply] [--sandbox-outcome delivered|bounced|complained] [--client-reference crm-123] [--metadata JSON|@file] [--source-rfc-message-id '<crm-123@example.com>'] [--header 'X-CRM-ID: 123']
   shipmail messages list (--mailbox-id mbx | --client-reference crm-123) [--limit 25] [--cursor cur]
   shipmail messages analytics [--updated-after ISO] [--updated-before ISO] [--limit 100] [--cursor cur]
   shipmail messages get <message-id>
-  shipmail messages reply <message-id> --to user@example.com (--text "Hello" | --html "<p>Hello</p>") [--client-reference crm-reply-123]
+  shipmail messages reply <message-id> --to user@example.com (--text "Hello" | --html "<p>Hello</p>") [--track-reply] [--client-reference crm-reply-123]
   shipmail scheduled-messages list [--include-held] [--search text] [--limit 100]
   shipmail scheduled-messages get <message-id>
   shipmail scheduled-messages update <message-id> --to user@example.com --subject "Hi" --scheduled-at ISO (--text "Hello" | --html "<p>Hello</p>") [--staged-attachment-id sat_...]
@@ -415,7 +417,7 @@ Usage:
   shipmail newsletters cancel <id>
   shipmail newsletters resume <id>
   shipmail newsletter-assets list [--kind image|video] [--q text] [--limit 25] [--cursor cur]
-  shipmail newsletter-assets upload <file> [--filename name] [--content-type type]
+  shipmail newsletter-assets upload <file> [--filename name] [--content-type type] [--thumbnail poster.jpg]
   shipmail newsletter-assets register-url <url> [--filename name] [--thumbnail-url url]
   shipmail newsletter-sender-identities list [--limit 25] [--cursor cur]
   shipmail newsletter-domains list [--limit 25] [--cursor cur]
@@ -581,6 +583,7 @@ async function sendMessageParams(options) {
     ...headers.length > 0 ? { headers } : {},
     ...getStringList(options, "staged-attachment-id").length > 0 ? { staged_attachment_ids: getStringList(options, "staged-attachment-id") } : {},
     ...getString(options, "scheduled-at") ? { scheduled_at: getString(options, "scheduled-at") } : {},
+    ...getBoolean(options, "track-reply") ? { track_reply: true } : {},
     ...getString(options, "sandbox-outcome") ? {
       sandbox_outcome: getEnum(options, "sandbox-outcome", [
         "delivered",
@@ -609,6 +612,7 @@ async function replyToMessageParams(options) {
     ...getString(options, "source-rfc-message-id") ? { source_rfc_message_id: getString(options, "source-rfc-message-id") } : {},
     ...headers.length > 0 ? { headers } : {},
     ...getString(options, "scheduled-at") ? { scheduled_at: getString(options, "scheduled-at") } : {},
+    ...getBoolean(options, "track-reply") ? { track_reply: true } : {},
     ...getString(options, "sandbox-outcome") ? {
       sandbox_outcome: getEnum(options, "sandbox-outcome", [
         "delivered",
@@ -749,6 +753,28 @@ async function runMailboxes(client, parsed, out) {
     );
     return;
   }
+  if (subcommand === "import-resume") {
+    writeJson(
+      out,
+      await client.mailboxes.resumeImport(
+        requirePositional(parsed.positional, 2, "mailbox id"),
+        requirePositional(parsed.positional, 3, "import id")
+      )
+    );
+    return;
+  }
+  if (subcommand === "import-restore") {
+    const fileIds = getStringList(parsed.options, "file-id");
+    writeJson(
+      out,
+      await client.mailboxes.restoreImport(
+        requirePositional(parsed.positional, 2, "mailbox id"),
+        requirePositional(parsed.positional, 3, "import id"),
+        { file_ids: fileIds }
+      )
+    );
+    return;
+  }
   if (subcommand === "app-passwords") {
     const command = requirePositional(parsed.positional, 2, "app-password command");
     const mailboxId = requirePositional(parsed.positional, 3, "mailbox id");
@@ -912,7 +938,7 @@ async function runInbox(client, parsed, out) {
     return;
   }
   if (subcommand === "threads") {
-    const replyState = getString(parsed.options, "reply-state");
+    const attentionState = getString(parsed.options, "attention-state");
     const sortBy = getString(parsed.options, "sort-by");
     const order = getString(parsed.options, "order");
     writeJson(
@@ -920,8 +946,8 @@ async function runInbox(client, parsed, out) {
       await client.mailboxes.listInboxThreads(
         requirePositional(parsed.positional, 2, "mailbox id"),
         {
-          ...replyState ? {
-            reply_state: replyState
+          ...attentionState ? {
+            attention_state: attentionState
           } : {},
           ...sortBy ? { sort_by: sortBy } : {},
           ...order ? { order } : {},
@@ -934,29 +960,31 @@ async function runInbox(client, parsed, out) {
     );
     return;
   }
-  if (subcommand === "thread-state") {
-    const replyState = getString(parsed.options, "reply-state");
-    const expectedReplyVersion = getNumber(parsed.options, "expected-reply-version");
-    if (!replyState || expectedReplyVersion === void 0) {
-      throw new CliUsageError("Provide --reply-state and --expected-reply-version.");
+  if (subcommand === "thread-attention") {
+    const done = getBoolean(parsed.options, "done");
+    const followUpAt = getString(parsed.options, "follow-up-at");
+    const expectedVersion = getNumber(parsed.options, "expected-version");
+    if (done === void 0 && followUpAt === void 0 || expectedVersion === void 0) {
+      throw new CliUsageError("Provide --done or --follow-up-at, and provide --expected-version.");
     }
     writeJson(
       out,
-      await client.mailboxes.updateInboxThreadReplyState(
+      await client.mailboxes.updateInboxThreadAttention(
         requirePositional(parsed.positional, 2, "mailbox id"),
         requirePositional(parsed.positional, 3, "thread id"),
         {
-          reply_state: replyState,
-          expected_reply_version: expectedReplyVersion
+          ...done === void 0 ? {} : { done },
+          ...followUpAt === void 0 ? {} : { follow_up_at: followUpAt === "null" ? null : followUpAt },
+          expected_version: expectedVersion
         }
       )
     );
     return;
   }
   if (subcommand === "draft") {
-    const expectedReplyVersion = getNumber(parsed.options, "expected-reply-version");
-    if (expectedReplyVersion === void 0) {
-      throw new CliUsageError("Provide --expected-reply-version.");
+    const expectedVersion = getNumber(parsed.options, "expected-version");
+    if (expectedVersion === void 0) {
+      throw new CliUsageError("Provide --expected-version.");
     }
     const text = await readTextInput(getString(parsed.options, "text"));
     const html = await readTextInput(getString(parsed.options, "html"));
@@ -967,7 +995,7 @@ async function runInbox(client, parsed, out) {
         requirePositional(parsed.positional, 2, "mailbox id"),
         requirePositional(parsed.positional, 3, "thread id"),
         {
-          expected_reply_version: expectedReplyVersion,
+          expected_version: expectedVersion,
           ...text ? { text } : {},
           ...html ? { html } : {},
           ...getString(parsed.options, "reply-mode") ? { reply_mode: getString(parsed.options, "reply-mode") } : {}
@@ -1574,7 +1602,7 @@ async function runNewsletters(client, parsed, out) {
   }
   throw new CliUsageError("Unknown newsletters command.");
 }
-async function runNewsletterAssets(client, parsed, out) {
+async function runNewsletterAssets(client, parsed, out, fetchImpl) {
   const subcommand = parsed.positional[1];
   if (subcommand === "list") {
     const kind = getString(parsed.options, "kind");
@@ -1595,14 +1623,37 @@ async function runNewsletterAssets(client, parsed, out) {
   if (subcommand === "upload") {
     const filePath = requirePositional(parsed.positional, 2, "file");
     const data = await readFile(realpathSync(filePath));
-    writeJson(
-      out,
-      await client.newsletters.assets.upload({
-        filename: getString(parsed.options, "filename") ?? filePath.split(/[\\/]/).at(-1) ?? "newsletter-asset",
-        data,
-        content_type: getString(parsed.options, "content-type")
-      })
-    );
+    const filename = getString(parsed.options, "filename") ?? filePath.split(/[\\/]/).at(-1) ?? "newsletter-asset";
+    const contentType = newsletterAssetContentType(
+      filePath,
+      getString(parsed.options, "content-type")
+    );
+    const thumbnail = contentType.startsWith("video/") ? await readNewsletterVideoThumbnail(parsed.options) : void 0;
+    const prepared = await client.newsletters.assets.prepareUpload({
+      filename,
+      content_type: contentType,
+      size: data.byteLength,
+      sha256: createHash("sha256").update(data).digest("hex")
+    });
+    await putPreparedNewsletterBytes(fetchImpl, prepared.upload_url, prepared.upload_headers, data);
+    if (prepared.kind === "video") {
+      if (!thumbnail) throw new CliUsageError("Video uploads require --thumbnail <jpeg-file>.");
+      await putPreparedNewsletterBytes(
+        fetchImpl,
+        prepared.thumbnail_upload_url,
+        prepared.thumbnail_upload_headers,
+        thumbnail
+      );
+    }
+    const completion = await fetchImpl(prepared.complete_url, {
+      method: prepared.complete_method,
+      redirect: "error"
+    });
+    if (!completion.ok) {
+      throw new CliHttpError(completion.status, { response: await completion.text() });
+    }
+    const asset = await completion.json();
+    writeJson(out, asset);
     return;
   }
   if (subcommand === "register-url") {
@@ -1618,6 +1669,55 @@ async function runNewsletterAssets(client, parsed, out) {
   }
   throw new CliUsageError("Unknown newsletter-assets command.");
 }
+function newsletterAssetContentType(filePath, declared) {
+  const value = declared?.trim().toLowerCase() ?? "";
+  switch (value) {
+    case "image/gif":
+    case "image/jpeg":
+    case "image/png":
+    case "image/webp":
+    case "video/mp4":
+    case "video/quicktime":
+    case "video/webm":
+      return value;
+    default:
+      if (value) throw new CliUsageError("Unsupported newsletter asset content type.");
+  }
+  const lowerPath = filePath.toLowerCase();
+  if (lowerPath.endsWith(".gif")) return "image/gif";
+  if (lowerPath.endsWith(".jpg") || lowerPath.endsWith(".jpeg")) return "image/jpeg";
+  if (lowerPath.endsWith(".png")) return "image/png";
+  if (lowerPath.endsWith(".webp")) return "image/webp";
+  if (lowerPath.endsWith(".mp4")) return "video/mp4";
+  if (lowerPath.endsWith(".mov")) return "video/quicktime";
+  if (lowerPath.endsWith(".webm")) return "video/webm";
+  throw new CliUsageError("Use --content-type for this newsletter asset file.");
+}
+async function readNewsletterVideoThumbnail(options) {
+  const thumbnailPath = getString(options, "thumbnail");
+  if (!thumbnailPath) throw new CliUsageError("Video uploads require --thumbnail <jpeg-file>.");
+  const bytes = await readFile(realpathSync(thumbnailPath));
+  if (bytes.byteLength < 3 || bytes[0] !== 255 || bytes[1] !== 216 || bytes[2] !== 255) {
+    throw new CliUsageError("--thumbnail must be a JPEG file.");
+  }
+  return bytes;
+}
+function uploadBody(bytes) {
+  const body = new ArrayBuffer(bytes.byteLength);
+  new Uint8Array(body).set(bytes);
+  return body;
+}
+async function putPreparedNewsletterBytes(fetchImpl, url, headers, bytes) {
+  const response = await fetchImpl(url, {
+    method: "PUT",
+    headers,
+    body: uploadBody(bytes),
+    redirect: "error"
+  });
+  if (!response.ok) {
+    throw new CliHttpError(response.status, { response: await response.text() });
+  }
+}
 var CALENDAR_EVENT_STATUSES = [
   "confirmed",
   "tentative",
@@ -2082,7 +2182,8 @@ async function runCli(argv, options = {}) {
     else if (command === "webhooks") await runWebhooks(client, parsed, out);
     else if (command === "suppressions") await runSuppressions(client, parsed, out);
     else if (command === "newsletters") await runNewsletters(client, parsed, out);
-    else if (command === "newsletter-assets") await runNewsletterAssets(client, parsed, out);
+    else if (command === "newsletter-assets")
+      await runNewsletterAssets(client, parsed, out, options.fetch ?? globalThis.fetch);
     else if (command === "newsletter-sender-identities")
       await runNewsletterSenderIdentities(client, parsed, out);
     else if (command === "newsletter-domains") await runNewsletterDomains(client, parsed, out);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shipmail-cli",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Official CLI for the Shipmail API",
   "type": "module",
   "bin": {
@@ -41,7 +41,7 @@
     "access": "public"
   },
   "dependencies": {
-    "shipmail": "0.4.16"
+    "shipmail": "0.4.20"
   },
   "devDependencies": {
     "tsup": "^8.4.0",