@dropthis/cli 0.5.0 → 0.6.1

package/dist/cli.cjs

@@ -29,6 +29,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/inline-auth.ts
 var inline_auth_exports = {};
@@ -150,42 +151,12 @@ var init_inline_auth = __esm({
   }
 });
 
-// src/program.ts
-var import_commander = require("commander");
-var import_picocolors4 = __toESM(require("picocolors"), 1);
-
-// src/auth.ts
-async function resolveCredential(input) {
-  if (input.apiKey) return { apiKey: input.apiKey, source: "flag" };
-  if (input.env.DROPTHIS_API_KEY) {
-    return { apiKey: input.env.DROPTHIS_API_KEY, source: "env" };
-  }
-  const stored = await input.store.read();
-  if (!stored) return null;
-  return {
-    apiKey: stored.apiKey,
-    source: "storage",
-    ...stored.keyId ? { keyId: stored.keyId } : {},
-    ...stored.keyLast4 ? { keyLast4: stored.keyLast4 } : {},
-    ...stored.accountId ? { accountId: stored.accountId } : {},
-    ...stored.email ? { email: stored.email } : {}
-  };
-}
-async function requireCredential(input) {
-  const credential = await resolveCredential(input);
-  if (!credential) {
-    throw Object.assign(new Error("No API key found."), {
-      code: "auth_error"
-    });
-  }
-  return credential;
-}
-function maskKey(apiKey) {
-  return apiKey.length <= 8 ? "sk_..." : `${apiKey.slice(0, 3)}...${apiKey.slice(-4)}`;
-}
-
-// src/fmt.ts
-var import_picocolors2 = __toESM(require("picocolors"), 1);
+// src/cli.ts
+var cli_exports = {};
+__export(cli_exports, {
+  writeUsageErrorEnvelope: () => writeUsageErrorEnvelope
+});
+module.exports = __toCommonJS(cli_exports);
 
 // src/output.ts
 var UPLOAD_NEXT_ACTIONS = {
@@ -213,7 +184,7 @@ function apiErrorEnvelope(error2) {
   return {
     ok: false,
     error: {
-      code: error2.code ?? "api_error",
+      code: normalizeApiErrorCode(error2),
       message: error2.message,
       ...error2.statusCode !== void 0 ? { status: error2.statusCode } : {},
       ...typeof error2.detail === "string" ? { detail: error2.detail } : {},
@@ -226,6 +197,11 @@ function apiErrorEnvelope(error2) {
     }
   };
 }
+function normalizeApiErrorCode(error2) {
+  if (error2.code) return error2.code;
+  if (error2.statusCode === 404) return "not_found";
+  return "api_error";
+}
 function nextActionForApiError(error2) {
   if (error2.suggestion) return error2.suggestion;
   const uploadNextAction = error2.code ? UPLOAD_NEXT_ACTIONS[error2.code] : void 0;
@@ -233,6 +209,9 @@ function nextActionForApiError(error2) {
   if (error2.code === "revision_conflict") {
     return "Fetch the drop, merge your changes, and retry with the current revision.";
   }
+  if (error2.statusCode === 404 || error2.code === "not_found") {
+    return "Check the drop id or slug and retry; list your drops with dropthis drops list.";
+  }
   if (error2.statusCode === 401 || error2.code === "missing_api_key") {
     return "Authenticate with dropthis login or set DROPTHIS_API_KEY.";
   }
@@ -248,6 +227,7 @@ function nextActionForApiError(error2) {
   return "Fix the request or retry after checking the drop state.";
 }
 function exitCodeFor(code) {
+  if (code === "usage_error") return 2;
   if (code === "invalid_usage") return 2;
   if (code === "auth_error") return 3;
   if (code === "local_input_error") return 4;
@@ -255,6 +235,43 @@ function exitCodeFor(code) {
   return 1;
 }
 
+// src/program.ts
+var import_commander = require("commander");
+var import_picocolors4 = __toESM(require("picocolors"), 1);
+
+// src/auth.ts
+async function resolveCredential(input) {
+  if (input.apiKey) return { apiKey: input.apiKey, source: "flag" };
+  if (input.env.DROPTHIS_API_KEY) {
+    return { apiKey: input.env.DROPTHIS_API_KEY, source: "env" };
+  }
+  const stored = await input.store.read();
+  if (!stored) return null;
+  return {
+    apiKey: stored.apiKey,
+    source: "storage",
+    ...stored.keyId ? { keyId: stored.keyId } : {},
+    ...stored.keyLast4 ? { keyLast4: stored.keyLast4 } : {},
+    ...stored.accountId ? { accountId: stored.accountId } : {},
+    ...stored.email ? { email: stored.email } : {}
+  };
+}
+async function requireCredential(input) {
+  const credential = await resolveCredential(input);
+  if (!credential) {
+    throw Object.assign(new Error("No API key found."), {
+      code: "auth_error"
+    });
+  }
+  return credential;
+}
+function maskKey(apiKey) {
+  return apiKey.length <= 8 ? "sk_..." : `${apiKey.slice(0, 3)}...${apiKey.slice(-4)}`;
+}
+
+// src/fmt.ts
+var import_picocolors2 = __toESM(require("picocolors"), 1);
+
 // src/ui.ts
 var import_picocolors = __toESM(require("picocolors"), 1);
 var symbols = {
@@ -295,13 +312,13 @@ function writeResult(deps, link, verb, data) {
 }
 function formatDropDetails(data) {
   const parts = [];
-  const size = data.sizeBytes ?? data.size_bytes;
+  const size = data.sizeBytes;
   if (typeof size === "number") parts.push(formatBytes(size));
-  const ct = data.contentType ?? data.content_type;
+  const ct = data.contentType;
   if (typeof ct === "string") parts.push(ct.split(";")[0]);
   const vis = data.visibility;
   if (vis === "unlisted") parts.push("unlisted");
-  const exp = data.expiresAt ?? data.expires_at;
+  const exp = data.expiresAt;
   if (typeof exp === "string") parts.push(`expires ${exp.split("T")[0]}`);
   if (parts.length === 0) return "";
   return `  ${import_picocolors2.default.dim(parts.join(" \xB7 "))}`;
@@ -404,16 +421,66 @@ async function runAccountGet(_input, deps) {
   }
   const result = await deps.client.account.get();
   if (result.error) {
-    return writeApiErrorSimple(deps, result.error.message);
+    return writeApiError(deps, result.error);
   }
   const data = result.data;
   const pairs = [];
   if (data?.id) pairs.push(["ID", String(data.id)]);
   if (data?.email) pairs.push(["Email", String(data.email)]);
   if (data?.plan) pairs.push(["Plan", String(data.plan)]);
+  if (data?.displayName) pairs.push(["Name", String(data.displayName)]);
+  if (data?.status) pairs.push(["Status", String(data.status)]);
+  if (data?.createdAt)
+    pairs.push(["Created", String(data.createdAt).split("T")[0]]);
+  writeKv(deps, pairs, { ok: true, account: result.data });
+  return { exitCode: 0 };
+}
+async function runAccountUpdate(input, deps) {
+  try {
+    await requireCredential({
+      ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+      env: deps.env,
+      store: deps.store
+    });
+  } catch {
+    return writeAuthError(deps);
+  }
+  const result = await deps.client.account.update({
+    displayName: input.displayName
+  });
+  if (result.error) return writeApiError(deps, result.error);
+  const data = result.data;
+  const pairs = [];
+  if (data?.id) pairs.push(["ID", String(data.id)]);
+  if (data?.displayName) pairs.push(["Name", String(data.displayName)]);
   writeKv(deps, pairs, { ok: true, account: result.data });
   return { exitCode: 0 };
 }
+async function runAccountDelete(input, deps) {
+  if (!input.yes && input.interactive === false) {
+    return writeError(
+      deps,
+      "invalid_usage",
+      "Pass --yes to delete the account in non-interactive mode."
+    );
+  }
+  try {
+    await requireCredential({
+      ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+      env: deps.env,
+      store: deps.store
+    });
+  } catch {
+    return writeAuthError(deps);
+  }
+  const result = await deps.client.account.delete();
+  if (result.error) return writeApiError(deps, result.error);
+  writeHumanOrJson(deps, success("Account deleted"), {
+    ok: true,
+    deleted: true
+  });
+  return { exitCode: 0 };
+}
 
 // src/commands/api-keys.ts
 var prompts = __toESM(require("@clack/prompts"), 1);
@@ -445,12 +512,12 @@ async function runApiKeysCreate(input, deps) {
     return writeAuthError(deps);
   }
   const result = await deps.client.apiKeys.create({ label: input.label });
-  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  if (result.error) return writeApiError(deps, result.error);
   const data = result.data;
   const pairs = [];
   if (data.id) pairs.push(["ID", String(data.id)]);
   if (data.key) pairs.push(["Key", String(data.key)]);
-  if (data.last4) pairs.push(["Last 4", String(data.last4)]);
+  if (data.keyLast4) pairs.push(["Last 4", String(data.keyLast4)]);
   writeKv(deps, pairs, { ok: true, api_key: result.data });
   return { exitCode: 0 };
 }
@@ -465,8 +532,8 @@ async function runApiKeysList(_input, deps) {
     return writeAuthError(deps);
   }
   const result = await deps.client.apiKeys.list();
-  if (result.error) return writeApiErrorSimple(deps, result.error.message);
-  const raw = unwrapListData(result.data, "apiKeys", "api_keys");
+  if (result.error) return writeApiError(deps, result.error);
+  const raw = unwrapListData(result.data);
   const items = Array.isArray(raw) ? raw : void 0;
   if (deps.outputMode === "human") {
     if (!items || items.length === 0) {
@@ -474,7 +541,7 @@ async function runApiKeysList(_input, deps) {
     } else {
       for (const item of items) {
         deps.stdout(
-          `${item.id ?? ""}  ${item.label ?? ""}  ...${item.last4 ?? ""}
+          `${item.id ?? ""}  ${item.label ?? ""}  ...${item.keyLast4 ?? ""}
 `
         );
       }
@@ -510,7 +577,7 @@ async function runApiKeysDelete(keyId, input, deps) {
     return writeAuthError(deps);
   }
   const result = await deps.client.apiKeys.delete(keyId);
-  if (result?.error) return writeApiErrorSimple(deps, result.error.message);
+  if (result?.error) return writeApiError(deps, result.error);
   writeHumanOrJson(deps, success(`Deleted ${keyId}`), {
     ok: true,
     deleted: true,
@@ -520,12 +587,9 @@ async function runApiKeysDelete(keyId, input, deps) {
 }
 
 // src/catalog.ts
-var COMMAND_CATALOG = [
-  {
-    name: "publish",
-    description: "Publish an input and return a Dropthis URL.",
-    arguments: ["input"],
-    options: ["--json", "--url", "--dry-run", "--title", "--metadata"],
+var COMMAND_ANNOTATIONS = {
+  publish: {
+    auth: "required",
     examples: [
       "dropthis ./file.html",
       "dropthis publish ./site --json",
@@ -533,69 +597,70 @@ var COMMAND_CATALOG = [
       "dropthis publish ./dist --dry-run"
     ]
   },
-  {
-    name: "deployments list <dropId>",
-    description: "List deployments for a drop.",
-    arguments: ["dropId"],
-    options: ["--json", "--limit", "--cursor"],
+  drops: {
     auth: "required",
-    examples: ["dropthis deployments list drop_abc --json"]
-  },
-  {
-    name: "deployments get <dropId> <deploymentId>",
-    description: "Get deployment details for a drop.",
-    arguments: ["dropId", "deploymentId"],
-    options: ["--json"],
-    auth: "required",
-    examples: ["dropthis deployments get drop_abc dep_abc --json"]
-  },
-  {
-    name: "drops",
-    description: "List, inspect, update, and delete drops.",
     examples: [
       "dropthis drops list --json",
       "dropthis drops update drop_abc ./site --json",
       "dropthis drops update drop_abc --title 'New Title' --dry-run"
     ]
   },
-  {
-    name: "api-keys",
-    description: "Create, list, and delete API keys.",
+  deployments: { auth: "required" },
+  "deployments list": {
+    auth: "required",
+    examples: ["dropthis deployments list drop_abc --json"]
+  },
+  "deployments get": {
+    auth: "required",
+    examples: ["dropthis deployments get drop_abc dep_abc --json"]
+  },
+  "api-keys": {
+    auth: "required",
     examples: ["dropthis api-keys create --label CI --json"]
   },
-  {
-    name: "login",
-    description: "Authenticate with email OTP and store an API key.",
+  login: {
     examples: [
       "dropthis login verify --email user@example.com --otp 123456 --json"
     ]
   },
-  {
-    name: "logout",
-    description: "Remove stored local credentials.",
-    examples: ["dropthis logout --json"]
-  },
-  {
-    name: "whoami",
-    description: "Show current auth source and credential metadata.",
-    examples: ["dropthis whoami --json"]
-  },
-  {
-    name: "account",
-    description: "Get account details.",
-    examples: ["dropthis account --json"]
+  logout: { examples: ["dropthis logout --json"] },
+  whoami: { auth: "required", examples: ["dropthis whoami --json"] },
+  account: { auth: "required", examples: ["dropthis account --json"] },
+  "account get": { auth: "required" },
+  "account update": {
+    auth: "required",
+    examples: ["dropthis account update --display-name 'Ada' --json"]
   },
-  {
-    name: "doctor",
-    description: "Report local CLI diagnostics.",
-    examples: ["dropthis doctor --json"]
+  "account delete": {
+    auth: "required",
+    examples: ["dropthis account delete --yes --json"]
   },
-  {
-    name: "commands",
-    description: "Print this machine-readable command tree.",
-    examples: ["dropthis commands --json"]
-  }
-];
+  doctor: { examples: ["dropthis doctor --json"] },
+  commands: { examples: ["dropthis commands --json"] }
+};
+function describeArgs(cmd) {
+  return cmd.registeredArguments.map((a) => a.name());
+}
+function describeOptions(cmd) {
+  return cmd.options.map((o) => o.long ?? o.short ?? o.flags);
+}
+function toEntry(cmd, path) {
+  const fullPath = [...path, cmd.name()];
+  const annotation = COMMAND_ANNOTATIONS[fullPath.join(" ")];
+  const subs = cmd.commands.map((sub) => toEntry(sub, fullPath));
+  return {
+    name: cmd.name(),
+    description: cmd.description(),
+    ...describeArgs(cmd).length ? { arguments: describeArgs(cmd) } : {},
+    ...describeOptions(cmd).length ? { options: describeOptions(cmd) } : {},
+    ...annotation?.auth ? { auth: annotation.auth } : {},
+    ...annotation?.examples ? { examples: annotation.examples } : {},
+    ...subs.length ? { subcommands: subs } : {}
+  };
+}
+function buildCatalog(program) {
+  return program.commands.map((cmd) => toEntry(cmd, []));
+}
 
 // src/commands/commands.ts
 async function runCommands(_input, deps) {
@@ -603,7 +668,7 @@ async function runCommands(_input, deps) {
     `${JSON.stringify({
       ok: true,
       output: "JSON by default in CI, pipes, non-TTY, --json, or --quiet.",
-      commands: COMMAND_CATALOG
+      commands: buildCatalog(deps.program)
     })}
 `
   );
@@ -640,7 +705,7 @@ async function runDeploymentsList(dropId, input, deps) {
     } else if (Array.isArray(items)) {
       for (const item of items) {
         deps.stdout(
-          `${item.id ?? ""}  rev ${item.revision ?? "?"}  ${item.created_at ?? ""}
+          `${item.id ?? ""}  rev ${item.revision ?? "?"}  ${item.createdAt ?? ""}
 `
         );
       }
@@ -671,7 +736,7 @@ async function runDeploymentsGet(dropId, deploymentId, _input, deps) {
   if (data.id) pairs.push(["ID", String(data.id)]);
   if (data.revision !== void 0)
     pairs.push(["Revision", String(data.revision)]);
-  if (data.created_at) pairs.push(["Created", String(data.created_at)]);
+  if (data.createdAt) pairs.push(["Created", String(data.createdAt)]);
   writeKv(deps, pairs, { ok: true, deployment: result.data });
   return { exitCode: 0 };
 }
@@ -689,13 +754,13 @@ async function runDoctor(_input, deps) {
   const authSource = credential?.source ?? "missing";
   const storageBackend = stored?.storage ?? "none";
   const pairs = [
-    ["Version", "0.5.0"],
+    ["Version", "0.6.1"],
     ["Auth", authSource],
     ["Storage", storageBackend]
   ];
   writeKv(deps, pairs, {
     ok: true,
-    version: "0.5.0",
+    version: "0.6.1",
     auth: { source: authSource },
     storage: { backend: storageBackend }
   });
@@ -719,7 +784,7 @@ async function runDropsList(input, deps) {
     ...input.cursor ? { cursor: input.cursor } : {}
   };
   const result = await deps.client.drops.list(params);
-  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  if (result.error) return writeApiError(deps, result.error);
   const raw = unwrapListData(result.data, "drops");
   const items = Array.isArray(raw) ? raw : void 0;
   if (deps.outputMode === "human") {
@@ -749,7 +814,7 @@ async function runDropsGet(dropId, _input, deps) {
     return writeAuthError(deps);
   }
   const result = await deps.client.drops.get(dropId);
-  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  if (result.error) return writeApiError(deps, result.error);
   const data = result.data;
   const pairs = [];
   if (data.id) pairs.push(["ID", String(data.id)]);
@@ -758,7 +823,7 @@ async function runDropsGet(dropId, _input, deps) {
   if (data.visibility) pairs.push(["Visibility", String(data.visibility)]);
   if (data.revision !== void 0)
     pairs.push(["Revision", String(data.revision)]);
-  if (data.created_at) pairs.push(["Created", String(data.created_at)]);
+  if (data.createdAt) pairs.push(["Created", String(data.createdAt)]);
   if (data.accessible !== void 0)
     pairs.push(["Accessible", String(data.accessible)]);
   if (data.persistent !== void 0)
@@ -794,7 +859,7 @@ async function runDropsDelete(dropId, input, deps) {
     return writeAuthError(deps);
   }
   const result = await deps.client.drops.delete(dropId);
-  if (result?.error) return writeApiErrorSimple(deps, result.error.message);
+  if (result?.error) return writeApiError(deps, result.error);
   writeHumanOrJson(deps, success(`Deleted ${dropId}`), {
     ok: true,
     deleted: true,
@@ -946,51 +1011,16 @@ async function runLogout(input, deps) {
   return { exitCode: 0 };
 }
 
-// src/commands/publish.ts
-var import_promises3 = require("fs/promises");
-var import_node_path2 = require("path");
-
 // src/drop-operations.ts
 var import_node_crypto = require("crypto");
-var import_node_path = require("path");
 var MAX_BUNDLE_FILE_COUNT = 200;
 function isFileSystemError(error2) {
   if (!(error2 instanceof Error)) return false;
   const code = error2.code;
   return code === "ENOENT" || code === "ENOTDIR" || code === "EACCES" || code === "ELIMIT";
 }
-function mimeForPath(filePath) {
-  const ext = (0, import_node_path.extname)(filePath).toLowerCase();
-  const types = {
-    ".html": "text/html",
-    ".htm": "text/html",
-    ".css": "text/css",
-    ".js": "text/javascript",
-    ".mjs": "text/javascript",
-    ".json": "application/json",
-    ".xml": "application/xml",
-    ".svg": "image/svg+xml",
-    ".txt": "text/plain",
-    ".md": "text/markdown",
-    ".jpg": "image/jpeg",
-    ".jpeg": "image/jpeg",
-    ".png": "image/png",
-    ".gif": "image/gif",
-    ".webp": "image/webp",
-    ".ico": "image/x-icon",
-    ".avif": "image/avif",
-    ".pdf": "application/pdf",
-    ".zip": "application/zip",
-    ".woff": "font/woff",
-    ".woff2": "font/woff2",
-    ".ttf": "font/ttf",
-    ".mp4": "video/mp4",
-    ".webm": "video/webm"
-  };
-  return types[ext] ?? "application/octet-stream";
-}
-function withIdempotencyKey(options, prefix) {
-  return options.idempotencyKey ? options : { ...options, idempotencyKey: `cli_${prefix}_${(0, import_node_crypto.randomUUID)()}` };
+function withIdempotencyKey(options, _prefix) {
+  return options.idempotencyKey ? options : { ...options, idempotencyKey: (0, import_node_crypto.randomUUID)() };
 }
 function validateManifestFileCount(count) {
   if (count > MAX_BUNDLE_FILE_COUNT) {
@@ -1003,11 +1033,23 @@ function validateManifestFileCount(count) {
   }
 }
 function formatDryRunManifest(prepared, extra) {
+  if (prepared.kind === "source") {
+    return {
+      ok: true,
+      dryRun: true,
+      kind: "source",
+      ...extra,
+      sourceUrl: prepared.sourceUrl,
+      options: prepared.options,
+      ...prepared.metadata ? { metadata: prepared.metadata } : {}
+    };
+  }
   const totalBytes = prepared.manifest.files.reduce(
     (sum, f) => sum + f.sizeBytes,
     0
   );
   return {
+    ok: true,
     dryRun: true,
     kind: "staged",
     ...extra,
@@ -1020,15 +1062,6 @@ function formatDryRunManifest(prepared, extra) {
     totalBytes
   };
 }
-function dryRunOptionsBody(options) {
-  const result = {};
-  if (options.title) result.title = options.title;
-  if (options.visibility) result.visibility = options.visibility;
-  if (options.password !== void 0) result.password = options.password;
-  if (options.noindex !== void 0) result.noindex = options.noindex;
-  if (options.expiresAt) result.expires_at = options.expiresAt;
-  return result;
-}
 
 // src/options.ts
 var import_promises = require("fs/promises");
@@ -1107,22 +1140,6 @@ function shouldSpin(outputMode) {
   return outputMode === "human" && process.stderr.isTTY === true && !process.env.CI;
 }
 
-// src/commands/json_body.ts
-var import_promises2 = require("fs/promises");
-async function readJsonObjectFile(path) {
-  let parsed;
-  try {
-    parsed = JSON.parse(await (0, import_promises2.readFile)(path, "utf8"));
-  } catch (error2) {
-    const message = error2 instanceof Error ? error2.message : "Unknown parse error";
-    throw new Error(`Invalid JSON body in ${path}: ${message}`);
-  }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error("JSON body must be an object.");
-  }
-  return parsed;
-}
-
 // src/commands/publish.ts
 async function runPublish(input, raw, deps) {
   let credential;
@@ -1156,17 +1173,12 @@ async function runPublish(input, raw, deps) {
   if (raw.dryRun) {
     return handlePublishDryRun(input, raw, deps, client);
   }
-  const singleInput = Array.isArray(input) ? input[0] : input;
+  const hasInput = Array.isArray(input) ? input.length > 0 : input !== void 0;
   const spin = shouldSpin(deps.outputMode) ? createSpinner("Publishing\u2026", deps.stderr) : void 0;
   try {
-    if (raw.fromJson && singleInput) {
-      throw new Error("Use either <input> or --from-json, not both.");
-    }
     const options = withIdempotencyKey(await parseDropOptions(raw), "pub");
-    const jsonBody = raw.fromJson ? await (deps.readJsonObject ?? readJsonObjectFile)(raw.fromJson) : void 0;
-    const idempotencyOpt = options.idempotencyKey ? { idempotencyKey: options.idempotencyKey } : {};
-    const doPublish = (c) => jsonBody ? c.drops.createRaw(jsonBody, idempotencyOpt) : singleInput ? c.publish(singleInput, options) : (() => {
-      throw new Error("Publish requires <input> or --from-json.");
+    const doPublish = (c) => hasInput ? c.publish(input, options) : (() => {
+      throw new Error("Publish requires <input>.");
     })();
     const result = await doPublish(client);
     if (result.error) {
@@ -1226,33 +1238,18 @@ async function handlePublishDryRun(input, raw, deps, client) {
     );
   }
   try {
-    if (raw.fromJson) {
-      if (input)
-        throw new Error("Use either <input> or --from-json, not both.");
-      const body = await (deps.readJsonObject ?? readJsonObjectFile)(
-        raw.fromJson
-      );
-      deps.stdout(
-        `${JSON.stringify({ dryRun: true, kind: "raw_json", endpoint: "POST /drops", body }, null, 2)}
-`
-      );
-      return { exitCode: 0 };
-    }
     if (!input || Array.isArray(input) && input.length === 0) {
-      throw new Error("Publish requires <input> or --from-json.");
+      throw new Error("Publish requires <input>.");
     }
     const options = await parseDropOptions(raw);
-    if (Array.isArray(input)) {
-      return dryRunMultiFile(input, options, deps);
-    }
     if (!client.prepare) {
       throw new Error("Client does not support dry-run.");
     }
     const prepared = await client.prepare(input, options);
     const output = formatDryRunManifest(prepared);
-    validateManifestFileCount(
-      output.manifest.files.length
-    );
+    if (prepared.kind === "staged") {
+      validateManifestFileCount(prepared.manifest.files.length);
+    }
     deps.stdout(`${JSON.stringify(output, null, 2)}
 `);
     return { exitCode: 0 };
@@ -1262,46 +1259,6 @@ async function handlePublishDryRun(input, raw, deps, client) {
     return writeError(deps, code, message);
   }
 }
-async function dryRunMultiFile(inputs, options, deps) {
-  const files = [];
-  for (const filePath of inputs) {
-    let info;
-    try {
-      info = await (0, import_promises3.stat)(filePath);
-    } catch {
-      return writeError(
-        deps,
-        "local_input_error",
-        `File not found: ${filePath}`
-      );
-    }
-    if (info.isDirectory()) {
-      return writeError(
-        deps,
-        "local_input_error",
-        `Cannot mix directories with multiple file arguments. Use a single folder instead: dropthis publish ${filePath}`
-      );
-    }
-    files.push({
-      path: (0, import_node_path2.basename)(filePath),
-      contentType: mimeForPath(filePath),
-      sizeBytes: info.size
-    });
-  }
-  validateManifestFileCount(files.length);
-  const entry = options.entry ?? files.find((f) => f.path === "index.html")?.path ?? files[0]?.path ?? null;
-  const totalBytes = files.reduce((sum, f) => sum + f.sizeBytes, 0);
-  const output = {
-    dryRun: true,
-    kind: "staged",
-    manifest: { files, entry },
-    options: dryRunOptionsBody(options),
-    totalBytes
-  };
-  deps.stdout(`${JSON.stringify(output, null, 2)}
-`);
-  return { exitCode: 0 };
-}
 
 // src/commands/update.ts
 var prompts4 = __toESM(require("@clack/prompts"), 1);
@@ -1323,12 +1280,9 @@ async function runUpdate(target, input, raw, deps) {
   let spin;
   try {
     assertDropId(target);
-    if (raw.fromJson && input) {
-      throw new Error("Use either [input] or --from-json, not both.");
-    }
     let updateInput = input;
     let parsed = await parseDropOptions(raw);
-    if (!updateInput && !raw.fromJson && !hasUpdateFields(parsed)) {
+    if (!updateInput && !hasUpdateFields(parsed)) {
       if (shouldPromptForUpdate(deps)) {
         const prompted = await promptForUpdate(target, deps.prompts ?? prompts4);
         if (!prompted) return { exitCode: 0 };
@@ -1345,27 +1299,14 @@ async function runUpdate(target, input, raw, deps) {
     }
     const revisionOptions = raw.ifRevision !== void 0 ? { ifRevision: Number(raw.ifRevision) } : {};
     spin = shouldSpin(deps.outputMode) ? createSpinner("Updating\u2026", deps.stderr) : void 0;
-    const result = raw.fromJson ? await deps.client.deployments.createRaw(
-      target,
-      await (deps.readJsonObject ?? readJsonObjectFile)(raw.fromJson),
-      withIdempotencyKey(
-        {
-          ...revisionOptions,
-          ...parsed.idempotencyKey ? { idempotencyKey: parsed.idempotencyKey } : {}
-        },
-        "upd"
-      )
-    ) : updateInput ? await deps.client.update(
+    const result = updateInput ? await deps.client.deploy(
       target,
       updateInput,
-      withIdempotencyKey(
-        {
-          ...parsed,
-          ...revisionOptions
-        },
-        "upd"
-      )
-    ) : await deps.client.update(target, parsed, revisionOptions);
+      withIdempotencyKey({ ...parsed, ...revisionOptions }, "upd")
+    ) : await deps.client.update(
+      target,
+      withIdempotencyKey({ ...parsed, ...revisionOptions }, "upd")
+    );
     if (result.error) {
       spin?.fail();
       return writeApiError(deps, result.error);
@@ -1549,18 +1490,6 @@ async function handleUpdateDryRun(target, input, raw, deps) {
   }
   try {
     assertDropId(target);
-    if (raw.fromJson) {
-      if (input)
-        throw new Error("Use either [input] or --from-json, not both.");
-      const body = await (deps.readJsonObject ?? readJsonObjectFile)(
-        raw.fromJson
-      );
-      deps.stdout(
-        `${JSON.stringify({ dryRun: true, kind: "raw_json", endpoint: `POST /drops/${target}/deployments`, body }, null, 2)}
-`
-      );
-      return { exitCode: 0 };
-    }
     const options = await parseDropOptions(raw);
     if (!input) {
       const fields = {};
@@ -1572,7 +1501,7 @@ async function handleUpdateDryRun(target, input, raw, deps) {
       if (options.expiresAt) fields.expires_at = options.expiresAt;
       if (options.metadata) fields.metadata = options.metadata;
       deps.stdout(
-        `${JSON.stringify({ dryRun: true, kind: "options_update", target, fields }, null, 2)}
+        `${JSON.stringify({ ok: true, dryRun: true, kind: "options_update", target, fields }, null, 2)}
 `
       );
       return { exitCode: 0 };
@@ -1582,7 +1511,9 @@ async function handleUpdateDryRun(target, input, raw, deps) {
     }
     const prepared = await deps.client.prepare(input, options);
     const output = formatDryRunManifest(prepared, { target });
-    validateManifestFileCount(prepared.manifest.files.length);
+    if (prepared.kind === "staged") {
+      validateManifestFileCount(prepared.manifest.files.length);
+    }
     deps.stdout(`${JSON.stringify(output, null, 2)}
 `);
     return { exitCode: 0 };
@@ -1603,6 +1534,7 @@ function assertDropId(target) {
 // src/commands/whoami.ts
 async function runWhoami(_input, deps) {
   const credential = await resolveCredential({
+    ...deps.apiKey ? { apiKey: deps.apiKey } : {},
     env: deps.env,
     store: deps.store
   });
@@ -1613,21 +1545,34 @@ async function runWhoami(_input, deps) {
     });
     return { exitCode: 0 };
   }
+  const result = await deps.client.account.get();
+  if (result.error) {
+    writeHumanOrJson(
+      deps,
+      `Not authenticated: ${result.error.message}. Run dropthis login.`,
+      { ok: true, authenticated: false, reason: result.error.message }
+    );
+    return { exitCode: 0 };
+  }
+  const account = result.data ?? {};
   const masked = maskKey(credential.apiKey);
+  const last4 = credential.keyLast4 ?? credential.apiKey.slice(-4);
   const pairs = [];
-  if (credential.email) pairs.push(["Email", credential.email]);
+  if (credential.email ?? account.email)
+    pairs.push(["Email", String(credential.email ?? account.email)]);
   pairs.push(["Key", masked]);
   pairs.push(["Source", credential.source]);
-  if (credential.accountId) pairs.push(["Account", credential.accountId]);
+  if (credential.accountId ?? account.id)
+    pairs.push(["Account", String(credential.accountId ?? account.id)]);
   const jsonEnvelope = {
     ok: true,
     authenticated: true,
     source: credential.source,
     masked_key: masked,
     ...credential.keyId ? { key_id: credential.keyId } : {},
-    ...credential.keyLast4 ? { key_last4: credential.keyLast4 } : {},
-    ...credential.accountId ? { account_id: credential.accountId } : {},
-    ...credential.email ? { email: credential.email } : {}
+    ...last4 ? { key_last4: last4 } : {},
+    ...credential.accountId ?? account.id ? { account_id: String(credential.accountId ?? account.id) } : {},
+    ...credential.email ?? account.email ? { email: String(credential.email ?? account.email) } : {}
   };
   writeKv(deps, pairs, jsonEnvelope);
   return { exitCode: 0 };
@@ -1660,9 +1605,9 @@ function createContext(input) {
 }
 
 // src/storage.ts
-var import_promises4 = require("fs/promises");
+var import_promises2 = require("fs/promises");
 var import_node_os = require("os");
-var import_node_path3 = require("path");
+var import_node_path = require("path");
 var import_keyring = require("@napi-rs/keyring");
 var MemoryCredentialStore = class {
   credential = null;
@@ -1694,7 +1639,7 @@ var InsecureFileCredentialStore = class {
     });
   }
   async clear() {
-    await (0, import_promises4.rm)(this.filePath, { force: true });
+    await (0, import_promises2.rm)(this.filePath, { force: true });
   }
 };
 var KeyringCredentialStore = class {
@@ -1721,7 +1666,7 @@ var KeyringCredentialStore = class {
   }
   async clear() {
     await this.keyring.deletePassword();
-    await (0, import_promises4.rm)(this.filePath, { force: true });
+    await (0, import_promises2.rm)(this.filePath, { force: true });
   }
 };
 function createCredentialStore(options = {}) {
@@ -1739,14 +1684,14 @@ function defaultKeyringAdapter() {
   };
 }
 function credentialPath(configDir) {
-  return (0, import_node_path3.join)(
-    configDir ?? (0, import_node_path3.join)((0, import_node_os.homedir)(), ".config", "dropthis"),
+  return (0, import_node_path.join)(
+    configDir ?? (0, import_node_path.join)((0, import_node_os.homedir)(), ".config", "dropthis"),
     "credentials.json"
   );
 }
 async function readJsonFile(path) {
   try {
-    return JSON.parse(await (0, import_promises4.readFile)(path, "utf8"));
+    return JSON.parse(await (0, import_promises2.readFile)(path, "utf8"));
   } catch (error2) {
     if (error2 && typeof error2 === "object" && "code" in error2 && error2.code === "ENOENT") {
       return null;
@@ -1755,20 +1700,34 @@ async function readJsonFile(path) {
   }
 }
 async function writeCredentialFile(path, credential) {
-  await (0, import_promises4.mkdir)((0, import_node_path3.dirname)(path), { recursive: true });
+  await (0, import_promises2.mkdir)((0, import_node_path.dirname)(path), { recursive: true });
   const tmpPath = `${path}.${process.pid}.tmp`;
-  await (0, import_promises4.writeFile)(tmpPath, `${JSON.stringify(credential, null, 2)}
+  await (0, import_promises2.writeFile)(tmpPath, `${JSON.stringify(credential, null, 2)}
 `, {
     mode: 384
   });
-  await (0, import_promises4.chmod)(tmpPath, 384);
-  await (0, import_promises4.rename)(tmpPath, path);
+  await (0, import_promises2.chmod)(tmpPath, 384);
+  await (0, import_promises2.rename)(tmpPath, path);
 }
 
 // src/program.ts
 function buildProgram(options = {}) {
   const program = new import_commander.Command();
   const store = options.store ?? new MemoryCredentialStore();
+  const writeErr = options.stderr ?? ((value) => process.stderr.write(value));
+  const jsonModeForOutput = () => {
+    const argv = program.rawArgs ?? process.argv;
+    return argv.includes("--json") || argv.includes("--quiet") || argv.includes("-q") || options.env?.CI === "true" || options.env === void 0 && process.env.CI === "true" || options.stdoutIsTTY === false || options.stdoutIsTTY === void 0 && process.stdout.isTTY !== true;
+  };
+  program.exitOverride();
+  program.configureOutput({
+    writeErr,
+    // In JSON mode, suppress commander's default plain-text error so the
+    // single JSON envelope written by cli.ts's catch is the only output.
+    outputError: (str, write) => {
+      if (!jsonModeForOutput()) write(str);
+    }
+  });
   program.name("dropthis").description(
     [
       import_picocolors4.default.dim("Publish anything online and get a URL back."),
@@ -1777,7 +1736,7 @@ function buildProgram(options = {}) {
       `  ${import_picocolors4.default.cyan("dropthis login")}`,
       `  ${import_picocolors4.default.cyan("dropthis publish ./dist")}`
     ].join("\n")
-  ).version("0.5.0").configureHelp({
+  ).version("0.6.1").configureHelp({
     subcommandTerm(cmd) {
       const args = cmd.registeredArguments.map((a) => {
         const name = a.name();
@@ -1807,12 +1766,15 @@ function buildProgram(options = {}) {
   ).option(
     "--metadata <json>",
     `Attach JSON key-value pairs, e.g. '{"source":"ci"}'`
-  ).option("--metadata-file <path>", "Read metadata JSON from a file").option("--path <name>", "Set filename when publishing from stdin").option("--url", "Print only the published URL (no JSON envelope)").option("--dry-run", "Show what would be published without publishing").option("--json", "Force JSON output").option("--from-json <path>", "Send raw API request body from a JSON file").option(
+  ).option("--metadata-file <path>", "Read metadata JSON from a file").option("--path <name>", "Set filename when publishing from stdin").option("--url", "Print only the published URL (no JSON envelope)").option(
+    "--dry-run",
+    "Show what would be published without publishing (JSON; cannot combine with --url)"
+  ).option("--json", "Force JSON output").option(
     "--idempotency-key <key>",
     "Prevent duplicate publishes on retry (auto-generated)"
   ).action(async (inputs, commandOptions) => {
     const stdinIsTTY = options.stdinIsTTY ?? process.stdin.isTTY ?? false;
-    if (inputs.length === 0 && stdinIsTTY && !commandOptions.fromJson) {
+    if (inputs.length === 0 && stdinIsTTY) {
       program.outputHelp();
       return;
     }
@@ -1825,15 +1787,11 @@ function buildProgram(options = {}) {
     );
     let publishInput;
     try {
-      if (commandOptions.dryRun && inputs.length > 1) {
-        publishInput = inputs;
-      } else {
-        publishInput = await resolvePublishInputs(
-          inputs,
-          options.stdin,
-          stdinIsTTY
-        );
-      }
+      publishInput = await resolvePublishInputs(
+        inputs,
+        options.stdin,
+        stdinIsTTY
+      );
     } catch (err) {
       const msg = err instanceof Error ? err.message : "Invalid input.";
       process.exitCode = writeError(deps, "local_input_error", msg).exitCode;
@@ -1876,10 +1834,10 @@ function buildProgram(options = {}) {
     "--if-revision <n>",
     "Fail if current revision doesn't match (optimistic lock)",
     parseInteger
-  ).option("--url", "Print only the published URL (no JSON envelope)").option("--dry-run", "Show what would be updated without updating").option("--json", "Force JSON output").option(
-    "--from-json <path>",
-    "Send raw API deployment body from a JSON file"
-  ).option(
+  ).option("--url", "Print only the published URL (no JSON envelope)").option(
+    "--dry-run",
+    "Show what would be updated without updating (JSON; cannot combine with --url)"
+  ).option("--json", "Force JSON output").option(
     "--idempotency-key <key>",
     "Prevent duplicate updates on retry (auto-generated)"
   ).action(
@@ -2045,11 +2003,36 @@ function buildProgram(options = {}) {
     const result = await runWhoami(commandOptions, deps);
     process.exitCode = result.exitCode;
   });
-  program.command("account").description("Show account details").option("--json", "Force JSON output").action(async (commandOptions) => {
+  const account = program.command("account").description("Show or manage your account");
+  account.command("get", { isDefault: true }).description("Show account details").option("--json", "Force JSON output").action(async (commandOptions) => {
     const deps = await commandDeps(program, options, store, commandOptions);
     const result = await runAccountGet(commandOptions, deps);
     process.exitCode = result.exitCode;
   });
+  account.command("update").description("Update account display name").requiredOption("--display-name <name>", "Set the display name").option("--json", "Force JSON output").action(async (commandOptions) => {
+    const deps = await commandDeps(program, options, store, commandOptions);
+    const result = await runAccountUpdate(
+      {
+        displayName: commandOptions.displayName,
+        ...commandOptions.json !== void 0 ? { json: commandOptions.json } : {}
+      },
+      deps
+    );
+    process.exitCode = result.exitCode;
+  });
+  account.command("delete").description("Delete your account").option("--yes", "Confirm deletion").option("--json", "Force JSON output").action(async (commandOptions) => {
+    const stdinIsTTY = options.stdinIsTTY ?? process.stdin.isTTY ?? false;
+    const global = globalOptions(program, commandOptions);
+    const deps = await commandDeps(program, options, store, commandOptions);
+    const result = await runAccountDelete(
+      {
+        ...commandOptions,
+        interactive: isInteractive(stdinIsTTY, deps.env, global)
+      },
+      deps
+    );
+    process.exitCode = result.exitCode;
+  });
   program.command("doctor").description("Report CLI diagnostics").option("--json", "Force JSON output").action(async (commandOptions) => {
     const deps = await commandDeps(
       program,
@@ -2067,7 +2050,7 @@ function buildProgram(options = {}) {
       store,
       commandOptions
     );
-    const result = await runCommands(commandOptions, deps);
+    const result = await runCommands(commandOptions, { ...deps, program });
     process.exitCode = result.exitCode;
   });
   return program;
@@ -2168,7 +2151,6 @@ function toDropOptions(options) {
     ...options.quiet !== void 0 ? { quiet: options.quiet } : {},
     ...options.url !== void 0 ? { url: options.url } : {},
     ...options.ifRevision !== void 0 ? { ifRevision: options.ifRevision } : {},
-    ...options.fromJson ? { fromJson: options.fromJson } : {},
     ...options.dryRun ? { dryRun: options.dryRun } : {}
   };
 }
@@ -2196,44 +2178,12 @@ async function resolvePublishInputs(inputs, stdin, stdinIsTTY) {
     }
     return inputs[0];
   }
-  const {
-    mkdtemp,
-    copyFile,
-    writeFile: writeFile2,
-    stat: fsStat
-  } = await import("fs/promises");
-  const { join: join2, basename: pathBasename } = await import("path");
-  const { tmpdir } = await import("os");
-  const tmpDir = await mkdtemp(join2(tmpdir(), "dropthis-multi-"));
-  const resolved = [];
-  for (const input of inputs) {
-    if (input === "-") {
-      const buf = await readStdinBytes(stdin ?? process.stdin);
-      const tmpPath = join2(tmpDir, `stdin-${Date.now()}`);
-      await writeFile2(tmpPath, buf);
-      resolved.push(tmpPath);
-    } else {
-      resolved.push(input);
-    }
-  }
-  const names = resolved.map((f) => pathBasename(f));
-  const dupes = names.filter((n, i) => names.indexOf(n) !== i);
-  if (dupes.length > 0) {
+  if (inputs.includes("-")) {
     throw new Error(
-      `Duplicate file names: ${[...new Set(dupes)].join(", ")}. Rename files to avoid collisions.`
+      "Cannot read stdin (-) alongside multiple file arguments. Pass file paths only."
     );
   }
-  for (const filePath of resolved) {
-    const info = await fsStat(filePath);
-    if (info.isDirectory()) {
-      throw new Error(
-        `Cannot mix directories with multiple file arguments. Use a single folder instead: dropthis publish ${filePath}`
-      );
-    }
-    const destName = pathBasename(filePath);
-    await copyFile(filePath, join2(tmpDir, destName));
-  }
-  return tmpDir;
+  return inputs;
 }
 async function readStdinBytes(stdin) {
   const chunks = [];
@@ -2246,8 +2196,42 @@ async function readStdinBytes(stdin) {
 }
 
 // src/cli.ts
+function writeUsageErrorEnvelope(input) {
+  if (input.json) {
+    input.stderr(
+      `${JSON.stringify(errorEnvelope("usage_error", input.message))}
+`
+    );
+  } else {
+    input.stderr(`${input.message}
+`);
+  }
+  return 2;
+}
+function isCommanderError(err) {
+  return typeof err === "object" && err !== null && typeof err.code === "string" && err.code.startsWith("commander.");
+}
+function wantsJson(argv) {
+  return argv.includes("--json") || argv.includes("--quiet") || argv.includes("-q") || process.env.CI === "true" || process.stdout.isTTY !== true;
+}
 buildProgram({ store: createCredentialStore() }).parseAsync(process.argv).catch((error2) => {
+  if (isCommanderError(error2)) {
+    if (error2.code === "commander.help" || error2.code === "commander.helpDisplayed" || error2.code === "commander.version") {
+      process.exitCode = 0;
+      return;
+    }
+    process.exitCode = writeUsageErrorEnvelope({
+      message: error2.message,
+      json: wantsJson(process.argv.slice(2)),
+      stderr: (value) => process.stderr.write(value)
+    });
+    return;
+  }
   console.error(error2);
   process.exitCode = 1;
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  writeUsageErrorEnvelope
+});
 //# sourceMappingURL=cli.cjs.map