@dropthis/cli 0.1.5 → 0.2.1

package/dist/cli.cjs

@@ -69,37 +69,37 @@ function errorEnvelope(code, message, nextAction) {
     }
   };
 }
-function apiErrorEnvelope(error) {
+function apiErrorEnvelope(error2) {
   return {
     ok: false,
     error: {
-      code: error.code ?? "api_error",
-      message: error.message,
-      ...error.statusCode !== void 0 ? { status: error.statusCode } : {},
-      ...typeof error.detail === "string" ? { detail: error.detail } : {},
-      ...error.param ? { param: error.param } : {},
-      ...error.currentRevision !== void 0 ? { current_revision: error.currentRevision } : {},
-      ...error.requestId ? { request_id: error.requestId } : {},
-      next_action: nextActionForApiError(error)
+      code: error2.code ?? "api_error",
+      message: error2.message,
+      ...error2.statusCode !== void 0 ? { status: error2.statusCode } : {},
+      ...typeof error2.detail === "string" ? { detail: error2.detail } : {},
+      ...error2.param ? { param: error2.param } : {},
+      ...error2.currentRevision !== void 0 ? { current_revision: error2.currentRevision } : {},
+      ...error2.requestId ? { request_id: error2.requestId } : {},
+      next_action: nextActionForApiError(error2)
     }
   };
 }
-function nextActionForApiError(error) {
-  const uploadNextAction = error.code ? UPLOAD_NEXT_ACTIONS[error.code] : void 0;
+function nextActionForApiError(error2) {
+  const uploadNextAction = error2.code ? UPLOAD_NEXT_ACTIONS[error2.code] : void 0;
   if (uploadNextAction) return uploadNextAction;
-  if (error.code === "revision_conflict") {
+  if (error2.code === "revision_conflict") {
     return "Fetch the drop, merge your changes, and retry with the current revision.";
   }
-  if (error.statusCode === 401 || error.code === "missing_api_key") {
+  if (error2.statusCode === 401 || error2.code === "missing_api_key") {
     return "Authenticate with dropthis login or set DROPTHIS_API_KEY.";
   }
-  if (error.statusCode === 413 || error.code === "quota_exceeded") {
+  if (error2.statusCode === 413 || error2.code === "quota_exceeded") {
     return "Reduce the upload size or upgrade the account limit.";
   }
-  if (error.statusCode === 422) {
+  if (error2.statusCode === 422) {
     return "Fix the input shown in the error detail and retry.";
   }
-  if (error.statusCode !== void 0 && error.statusCode !== null && error.statusCode >= 500) {
+  if (error2.statusCode !== void 0 && error2.statusCode !== null && error2.statusCode >= 500) {
     return "Retry the request with the same idempotency key, or contact support with the request id.";
   }
   return "Fix the request or retry after checking the drop state.";
@@ -112,60 +112,208 @@ function exitCodeFor(code) {
   return 1;
 }
 
-// src/commands/account.ts
-async function runAccountGet(_input, deps) {
-  if (await resolveCredential({ env: deps.env, store: deps.store }) === null) {
-    deps.stderr(
-      `${JSON.stringify(errorEnvelope("auth_error", "No API key found.", "Set DROPTHIS_API_KEY or run dropthis login."))}
-`
-    );
-    return { exitCode: exitCodeFor("auth_error") };
+// src/ui.ts
+var import_picocolors = __toESM(require("picocolors"), 1);
+var symbols = {
+  success: "\u2713",
+  error: "\u2717",
+  warning: "!"
+};
+function success(msg) {
+  return `${import_picocolors.default.green(symbols.success)} ${msg}`;
+}
+function error(msg) {
+  return `${import_picocolors.default.red(symbols.error)} ${msg}`;
+}
+function hint(msg) {
+  return `  ${import_picocolors.default.dim(msg)}`;
+}
+function url(u) {
+  return import_picocolors.default.cyan(u);
+}
+function kvLines(pairs) {
+  if (pairs.length === 0) return "";
+  const maxKey = Math.max(...pairs.map(([k]) => k.length));
+  return pairs.map(([k, v]) => `  ${import_picocolors.default.dim(`${k.padEnd(maxKey)}:`)} ${v}`).join("\n");
+}
+
+// src/fmt.ts
+function writeResult(deps, link, verb, data) {
+  if (deps.outputMode === "human") {
+    deps.stdout(`${success(`${verb} ${url(link)}`)}
+`);
+  } else {
+    deps.stdout(`${JSON.stringify({ ok: true, drop: data })}
+`);
   }
-  const result = await deps.client.account.get();
-  if (result.error) {
+}
+function writeJson(deps, envelope) {
+  deps.stdout(`${JSON.stringify(envelope)}
+`);
+}
+function writeKv(deps, pairs, json) {
+  if (deps.outputMode === "human") {
+    deps.stdout(`${kvLines(pairs)}
+`);
+  } else {
+    deps.stdout(`${JSON.stringify(json)}
+`);
+  }
+}
+function writeHumanOrJson(deps, humanText, json) {
+  if (deps.outputMode === "human") {
+    deps.stdout(`${humanText}
+`);
+  } else {
+    deps.stdout(`${JSON.stringify(json)}
+`);
+  }
+}
+function writeError(deps, code, message, nextAction) {
+  if (deps.outputMode === "human") {
+    deps.stderr(`${error(message)}
+`);
+    if (nextAction) deps.stderr(`${hint(nextAction)}
+`);
+  } else {
     deps.stderr(
-      `${JSON.stringify(errorEnvelope("api_error", result.error.message))}
+      `${JSON.stringify(errorEnvelope(code, message, nextAction))}
 `
     );
-    return { exitCode: exitCodeFor("api_error") };
   }
-  deps.stdout(`${JSON.stringify({ ok: true, account: result.data })}
+  return { exitCode: exitCodeFor(code) };
+}
+function writeApiError(deps, details) {
+  if (deps.outputMode === "human") {
+    deps.stderr(`${error(details.message)}
+`);
+    const nextAction = details.requestId ? `Request ID: ${details.requestId}` : void 0;
+    if (nextAction) deps.stderr(`${hint(nextAction)}
+`);
+  } else {
+    deps.stderr(`${JSON.stringify(apiErrorEnvelope(details))}
+`);
+  }
+  return { exitCode: exitCodeFor("api_error") };
+}
+function writeApiErrorSimple(deps, message) {
+  if (deps.outputMode === "human") {
+    deps.stderr(`${error(message)}
+`);
+  } else {
+    deps.stderr(`${JSON.stringify(errorEnvelope("api_error", message))}
+`);
+  }
+  return { exitCode: exitCodeFor("api_error") };
+}
+function writeAuthError(deps) {
+  return writeError(
+    deps,
+    "auth_error",
+    "No API key found.",
+    "Set DROPTHIS_API_KEY or run dropthis login."
+  );
+}
+function writeEmpty(deps, message, json) {
+  if (deps.outputMode === "human") {
+    deps.stdout(`${message}
+`);
+  } else {
+    deps.stdout(`${JSON.stringify(json)}
 `);
+  }
+}
+
+// src/commands/account.ts
+async function runAccountGet(_input, deps) {
+  if (await resolveCredential({
+    ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+    env: deps.env,
+    store: deps.store
+  }) === null) {
+    return writeAuthError(deps);
+  }
+  const result = await deps.client.account.get();
+  if (result.error) {
+    return writeApiErrorSimple(deps, result.error.message);
+  }
+  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)]);
+  writeKv(deps, pairs, { ok: true, account: result.data });
   return { exitCode: 0 };
 }
 
 // src/commands/api-keys.ts
+var prompts = __toESM(require("@clack/prompts"), 1);
 async function runApiKeysCreate(input, deps) {
-  if (!await hasCredential(deps)) return authError(deps);
+  if (!await hasCredential(deps)) return writeAuthError(deps);
   const result = await deps.client.apiKeys.create({ label: input.label });
-  if (result.error) return apiError(deps, result.error.message);
-  deps.stdout(`${JSON.stringify({ ok: true, api_key: result.data })}
-`);
+  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  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)]);
+  writeKv(deps, pairs, { ok: true, api_key: result.data });
   return { exitCode: 0 };
 }
 async function runApiKeysList(_input, deps) {
-  if (!await hasCredential(deps)) return authError(deps);
+  if (!await hasCredential(deps)) return writeAuthError(deps);
   const result = await deps.client.apiKeys.list();
-  if (result.error) return apiError(deps, result.error.message);
-  deps.stdout(
-    `${JSON.stringify({ ok: true, api_keys: listItems(result.data) })}
+  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  const raw = listItems(result.data);
+  const items = Array.isArray(raw) ? raw : void 0;
+  if (deps.outputMode === "human") {
+    if (!items || items.length === 0) {
+      writeEmpty(deps, "No API keys found.", { ok: true, api_keys: [] });
+    } else {
+      for (const item of items) {
+        deps.stdout(
+          `${item.id ?? ""}  ${item.label ?? ""}  ...${item.last4 ?? ""}
 `
-  );
+        );
+      }
+    }
+  } else {
+    writeJson(deps, { ok: true, api_keys: items ?? raw });
+  }
   return { exitCode: 0 };
 }
 async function runApiKeysDelete(keyId, input, deps) {
   if (!input.yes && input.interactive === false) {
-    return invalidUsage(deps, "Pass --yes to delete in non-interactive mode.");
+    return writeError(
+      deps,
+      "invalid_usage",
+      "Pass --yes to delete in non-interactive mode."
+    );
   }
-  if (!await hasCredential(deps)) return authError(deps);
+  if (!input.yes && input.interactive !== false) {
+    const confirmed = await prompts.confirm({
+      message: `Delete API key ${keyId}?`
+    });
+    if (prompts.isCancel(confirmed) || !confirmed) {
+      return { exitCode: 0 };
+    }
+  }
+  if (!await hasCredential(deps)) return writeAuthError(deps);
   const result = await deps.client.apiKeys.delete(keyId);
-  if (result?.error) return apiError(deps, result.error.message);
-  deps.stdout(`${JSON.stringify({ ok: true, deleted: true, id: keyId })}
-`);
+  if (result?.error) return writeApiErrorSimple(deps, result.error.message);
+  writeHumanOrJson(deps, success(`Deleted ${keyId}`), {
+    ok: true,
+    deleted: true,
+    id: keyId
+  });
   return { exitCode: 0 };
 }
 async function hasCredential(deps) {
-  return await resolveCredential({ env: deps.env, store: deps.store }) !== null;
+  return await resolveCredential({
+    ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+    env: deps.env,
+    store: deps.store
+  }) !== null;
 }
 function listItems(data) {
   if (data && typeof data === "object" && "data" in data) {
@@ -176,23 +324,6 @@ function listItems(data) {
   }
   return data;
 }
-function authError(deps) {
-  deps.stderr(
-    `${JSON.stringify(errorEnvelope("auth_error", "No API key found.", "Set DROPTHIS_API_KEY or run dropthis login."))}
-`
-  );
-  return { exitCode: exitCodeFor("auth_error") };
-}
-function apiError(deps, message) {
-  deps.stderr(`${JSON.stringify(errorEnvelope("api_error", message))}
-`);
-  return { exitCode: exitCodeFor("api_error") };
-}
-function invalidUsage(deps, message) {
-  deps.stderr(`${JSON.stringify(errorEnvelope("invalid_usage", message))}
-`);
-  return { exitCode: exitCodeFor("invalid_usage") };
-}
 
 // src/commands/commands.ts
 var COMMANDS = [
@@ -290,31 +421,51 @@ async function runCommands(_input, deps) {
 
 // src/commands/deployments.ts
 async function runDeploymentsList(dropId, input, deps) {
-  if (!await hasCredential2(deps)) return authError2(deps);
+  if (!await hasCredential2(deps)) return writeAuthError(deps);
   const params = {
     ...input.limit !== void 0 ? { limit: input.limit } : {},
     ...input.cursor ? { cursor: input.cursor } : {}
   };
   const result = await deps.client.deployments.list(dropId, params);
   if (result.error) {
-    deps.stderr(`${JSON.stringify(apiErrorEnvelope(result.error))}
-`);
-    return { exitCode: exitCodeFor("api_error") };
+    return writeApiError(deps, result.error);
+  }
+  const spread = spreadData(result.data);
+  const items = spread.deployments ?? spread.data ?? result.data;
+  if (deps.outputMode === "human") {
+    if (!items || Array.isArray(items) && items.length === 0) {
+      writeEmpty(deps, "No deployments found.", {
+        ok: true,
+        ...spread
+      });
+    } else if (Array.isArray(items)) {
+      for (const item of items) {
+        deps.stdout(
+          `${item.id ?? ""}  rev ${item.revision ?? "?"}  ${item.created_at ?? ""}
+`
+        );
+      }
+    } else {
+      writeJson(deps, { ok: true, ...spread });
+    }
+  } else {
+    writeJson(deps, { ok: true, ...spread });
   }
-  deps.stdout(`${JSON.stringify({ ok: true, ...spreadData(result.data) })}
-`);
   return { exitCode: 0 };
 }
 async function runDeploymentsGet(dropId, deploymentId, _input, deps) {
-  if (!await hasCredential2(deps)) return authError2(deps);
+  if (!await hasCredential2(deps)) return writeAuthError(deps);
   const result = await deps.client.deployments.get(dropId, deploymentId);
   if (result.error) {
-    deps.stderr(`${JSON.stringify(apiErrorEnvelope(result.error))}
-`);
-    return { exitCode: exitCodeFor("api_error") };
-  }
-  deps.stdout(`${JSON.stringify({ ok: true, deployment: result.data })}
-`);
+    return writeApiError(deps, result.error);
+  }
+  const data = result.data;
+  const pairs = [];
+  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)]);
+  writeKv(deps, pairs, { ok: true, deployment: result.data });
   return { exitCode: 0 };
 }
 async function hasCredential2(deps) {
@@ -324,13 +475,6 @@ async function hasCredential2(deps) {
     store: deps.store
   }) !== null;
 }
-function authError2(deps) {
-  deps.stderr(
-    `${JSON.stringify(errorEnvelope("auth_error", "No API key found.", "Set DROPTHIS_API_KEY or run dropthis login."))}
-`
-  );
-  return { exitCode: exitCodeFor("auth_error") };
-}
 function spreadData(data) {
   return data && typeof data === "object" ? data : { data };
 }
@@ -342,18 +486,25 @@ async function runDoctor(_input, deps) {
     env: deps.env,
     store: deps.store
   });
-  deps.stdout(
-    `${JSON.stringify({
-      ok: true,
-      version: "0.1.0",
-      auth: { source: credential?.source ?? "missing" },
-      storage: { backend: stored?.storage ?? "none" }
-    })}
-`
-  );
+  const authSource = credential?.source ?? "missing";
+  const storageBackend = stored?.storage ?? "none";
+  const pairs = [
+    ["Version", "0.2.1"],
+    ["Auth", authSource],
+    ["Storage", storageBackend]
+  ];
+  writeKv(deps, pairs, {
+    ok: true,
+    version: "0.2.1",
+    auth: { source: authSource },
+    storage: { backend: storageBackend }
+  });
   return { exitCode: 0 };
 }
 
+// src/commands/drops.ts
+var prompts2 = __toESM(require("@clack/prompts"), 1);
+
 // src/options.ts
 var import_promises = require("fs/promises");
 async function parseDropOptions(raw) {
@@ -396,56 +547,98 @@ function parseJsonObject(value, label) {
 
 // src/commands/drops.ts
 async function runDropsList(input, deps) {
-  if (!await hasCredential3(deps)) return authError3(deps);
+  if (!await hasCredential3(deps)) return writeAuthError(deps);
   const params = {
     ...input.limit !== void 0 ? { limit: input.limit } : {},
     ...input.cursor ? { cursor: input.cursor } : {}
   };
   const result = await deps.client.drops.list(params);
-  if (result.error) return apiError2(deps, result.error.message);
-  deps.stdout(
-    `${JSON.stringify({ ok: true, drops: listItems2(result.data) })}
+  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  const raw = listItems2(result.data);
+  const items = Array.isArray(raw) ? raw : void 0;
+  if (deps.outputMode === "human") {
+    if (!items || items.length === 0) {
+      writeEmpty(deps, "No drops found.", { ok: true, drops: [] });
+    } else {
+      for (const item of items) {
+        deps.stdout(
+          `${item.id ?? ""}  ${item.title ?? ""}  ${item.url ? url(String(item.url)) : ""}
 `
-  );
+        );
+      }
+    }
+  } else {
+    writeJson(deps, { ok: true, drops: items ?? raw });
+  }
   return { exitCode: 0 };
 }
 async function runDropsGet(dropId, _input, deps) {
-  if (!await hasCredential3(deps)) return authError3(deps);
+  if (!await hasCredential3(deps)) return writeAuthError(deps);
   const result = await deps.client.drops.get(dropId);
-  if (result.error) return apiError2(deps, result.error.message);
-  deps.stdout(`${JSON.stringify({ ok: true, drop: result.data })}
-`);
+  if (result.error) return writeApiErrorSimple(deps, result.error.message);
+  const data = result.data;
+  const pairs = [];
+  if (data.id) pairs.push(["ID", String(data.id)]);
+  if (data.url) pairs.push(["URL", url(String(data.url))]);
+  if (data.title) pairs.push(["Title", String(data.title)]);
+  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)]);
+  writeKv(deps, pairs, { ok: true, drop: result.data });
   return { exitCode: 0 };
 }
 async function runDropsUpdate(dropId, input, deps) {
-  if (!await hasCredential3(deps)) return authError3(deps);
+  if (!await hasCredential3(deps)) return writeAuthError(deps);
   try {
     const options = await parseDropOptions(input);
     const result = await deps.client.drops.update(dropId, options);
-    if (result.error) return apiError2(deps, result.error.message);
-    deps.stdout(`${JSON.stringify({ ok: true, drop: result.data })}
-`);
+    if (result.error) return writeApiErrorSimple(deps, result.error.message);
+    writeHumanOrJson(deps, success(`Updated ${dropId}`), {
+      ok: true,
+      drop: result.data
+    });
     return { exitCode: 0 };
-  } catch (error) {
-    return invalidUsage2(
+  } catch (error2) {
+    return writeError(
       deps,
-      error instanceof Error ? error.message : "Invalid drop options."
+      "invalid_usage",
+      error2 instanceof Error ? error2.message : "Invalid drop options."
     );
   }
 }
 async function runDropsDelete(dropId, input, deps) {
   if (!input.yes && input.interactive === false) {
-    return invalidUsage2(deps, "Pass --yes to delete in non-interactive mode.");
+    return writeError(
+      deps,
+      "invalid_usage",
+      "Pass --yes to delete in non-interactive mode."
+    );
   }
-  if (!await hasCredential3(deps)) return authError3(deps);
+  if (!input.yes && input.interactive !== false) {
+    const confirmed = await prompts2.confirm({
+      message: `Delete ${dropId}?`
+    });
+    if (prompts2.isCancel(confirmed) || !confirmed) {
+      return { exitCode: 0 };
+    }
+  }
+  if (!await hasCredential3(deps)) return writeAuthError(deps);
   const result = await deps.client.drops.delete(dropId);
-  if (result?.error) return apiError2(deps, result.error.message);
-  deps.stdout(`${JSON.stringify({ ok: true, deleted: true, id: dropId })}
-`);
+  if (result?.error) return writeApiErrorSimple(deps, result.error.message);
+  writeHumanOrJson(deps, success(`Deleted ${dropId}`), {
+    ok: true,
+    deleted: true,
+    id: dropId
+  });
   return { exitCode: 0 };
 }
 async function hasCredential3(deps) {
-  return await resolveCredential({ env: deps.env, store: deps.store }) !== null;
+  return await resolveCredential({
+    ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+    env: deps.env,
+    store: deps.store
+  }) !== null;
 }
 function listItems2(data) {
   if (data && typeof data === "object" && "data" in data) {
@@ -456,57 +649,40 @@ function listItems2(data) {
   }
   return data;
 }
-function authError3(deps) {
-  deps.stderr(
-    `${JSON.stringify(errorEnvelope("auth_error", "No API key found.", "Set DROPTHIS_API_KEY or run dropthis login."))}
-`
-  );
-  return { exitCode: exitCodeFor("auth_error") };
-}
-function apiError2(deps, message) {
-  deps.stderr(`${JSON.stringify(errorEnvelope("api_error", message))}
-`);
-  return { exitCode: exitCodeFor("api_error") };
-}
-function invalidUsage2(deps, message) {
-  deps.stderr(`${JSON.stringify(errorEnvelope("invalid_usage", message))}
-`);
-  return { exitCode: exitCodeFor("invalid_usage") };
-}
 
 // src/commands/login.ts
-var prompts = __toESM(require("@clack/prompts"), 1);
+var prompts3 = __toESM(require("@clack/prompts"), 1);
 async function runLoginInteractive(deps) {
-  prompts.intro("dropthis login");
-  const email = await prompts.text({
+  prompts3.intro("dropthis login");
+  const email = await prompts3.text({
     message: "Email address",
     validate: (v) => v?.includes("@") ? void 0 : "Enter a valid email"
   });
-  if (prompts.isCancel(email)) {
-    prompts.cancel("Login cancelled.");
+  if (prompts3.isCancel(email)) {
+    prompts3.cancel("Login cancelled.");
     return { exitCode: 0 };
   }
   const requestResult = await deps.client.auth.requestEmailOtp({ email });
   if (requestResult.error) {
-    prompts.cancel(requestResult.error.message);
+    prompts3.cancel(requestResult.error.message);
     return { exitCode: exitCodeFor("api_error") };
   }
-  const otp = await prompts.text({
+  const otp = await prompts3.text({
     message: "Paste the code from your email"
   });
-  if (prompts.isCancel(otp)) {
-    prompts.cancel("Login cancelled.");
+  if (prompts3.isCancel(otp)) {
+    prompts3.cancel("Login cancelled.");
     return { exitCode: 0 };
   }
   const session = await deps.client.auth.verifyEmailOtp({ email, code: otp });
   if (session.error) {
-    prompts.cancel(session.error.message);
+    prompts3.cancel(session.error.message);
     return { exitCode: exitCodeFor("api_error") };
   }
   const authedClient = deps.createClient(session.data.token);
   const apiKey = await authedClient.apiKeys.create({ label: "CLI" });
   if (apiKey.error) {
-    prompts.cancel(apiKey.error.message);
+    prompts3.cancel(apiKey.error.message);
     return { exitCode: exitCodeFor("api_error") };
   }
   await deps.store.save({
@@ -517,7 +693,7 @@ async function runLoginInteractive(deps) {
     email,
     storage: "secure"
   });
-  prompts.outro("Logged in successfully.");
+  prompts3.outro("Logged in successfully.");
   return { exitCode: 0 };
 }
 async function runLoginRequest(input, deps) {
@@ -553,7 +729,8 @@ async function runLoginVerify(input, deps) {
     );
     return { exitCode: exitCodeFor("api_error") };
   }
-  const apiKey = await deps.client.apiKeys.create({ label: "CLI" });
+  const authedClient = deps.createClient(session.data.token);
+  const apiKey = await authedClient.apiKeys.create({ label: "CLI" });
   if (apiKey.error) {
     deps.stderr(
       `${JSON.stringify(errorEnvelope("api_error", apiKey.error.message))}
@@ -590,14 +767,11 @@ async function runLogout(input, deps) {
     const result = await deps.client.apiKeys.delete(stored.keyId);
     if (result?.error) revokeError = result.error.message;
   }
-  await deps.store.clear();
   if (revokeError) {
-    deps.stderr(`${JSON.stringify(errorEnvelope("api_error", revokeError))}
-`);
-    return { exitCode: exitCodeFor("api_error") };
+    return writeApiErrorSimple(deps, revokeError);
   }
-  deps.stdout(`${JSON.stringify({ ok: true })}
-`);
+  await deps.store.clear();
+  writeHumanOrJson(deps, success("Logged out."), { ok: true });
   return { exitCode: 0 };
 }
 
@@ -606,14 +780,40 @@ var import_node_crypto = require("crypto");
 var import_promises3 = require("fs/promises");
 var import_node_path = require("path");
 
+// src/spinner.ts
+var import_picocolors2 = __toESM(require("picocolors"), 1);
+var frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function createSpinner(message, stderr) {
+  let i = 0;
+  const timer = setInterval(() => {
+    stderr(`\r\x1B[2K${import_picocolors2.default.cyan(frames[i % frames.length])} ${message}`);
+    i++;
+  }, 80);
+  return {
+    stop(finalMessage) {
+      clearInterval(timer);
+      const text2 = finalMessage ?? message;
+      stderr(`\r\x1B[2K${import_picocolors2.default.green(symbols.success)} ${text2}
+`);
+    },
+    fail() {
+      clearInterval(timer);
+      stderr("\r\x1B[2K");
+    }
+  };
+}
+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 (error) {
-    const message = error instanceof Error ? error.message : "Unknown parse error";
+  } 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)) {
@@ -626,21 +826,18 @@ async function readJsonObjectFile(path) {
 var MAX_BUNDLE_FILE_COUNT = 200;
 async function runPublish(input, raw, deps) {
   const credential = await resolveCredential({
-    ...raw.apiKey ? { apiKey: raw.apiKey } : {},
+    ...raw.apiKey ?? deps.apiKey ? { apiKey: raw.apiKey ?? deps.apiKey } : {},
     env: deps.env,
     store: deps.store
   });
   if (!credential) {
-    deps.stderr(
-      `${JSON.stringify(errorEnvelope("auth_error", "No API key found.", "Set DROPTHIS_API_KEY or run dropthis login."))}
-`
-    );
-    return { exitCode: exitCodeFor("auth_error") };
+    return writeAuthError(deps);
   }
   if (raw.dryRun) {
     return handlePublishDryRun(input, raw, deps);
   }
   const singleInput = Array.isArray(input) ? input[0] : input;
+  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.");
@@ -653,32 +850,28 @@ async function runPublish(input, raw, deps) {
       throw new Error("Publish requires <input> or --from-json.");
     })();
     if (result.error) {
-      deps.stderr(`${JSON.stringify(apiErrorEnvelope(result.error))}
-`);
-      return { exitCode: exitCodeFor("api_error") };
+      spin?.fail();
+      return writeApiError(deps, result.error);
     }
+    spin?.stop("Published");
     if (raw.url) deps.stdout(`${result.data.url}
 `);
-    else if (deps.outputMode === "human")
-      deps.stdout(`Published: ${result.data.url}
-`);
-    else deps.stdout(`${JSON.stringify({ ok: true, drop: result.data })}
-`);
+    else writeResult(deps, result.data.url, "Published", result.data);
     return { exitCode: 0 };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "Publish failed.";
-    deps.stderr(`${JSON.stringify(errorEnvelope("invalid_usage", message))}
-`);
-    return { exitCode: exitCodeFor("invalid_usage") };
+  } catch (error2) {
+    const message = error2 instanceof Error ? error2.message : "Publish failed.";
+    spin?.fail();
+    return writeError(deps, "invalid_usage", message);
   }
 }
 async function handlePublishDryRun(input, raw, deps) {
   if (raw.url) {
-    deps.stderr(
-      `${JSON.stringify(errorEnvelope("invalid_usage", "--url and --dry-run cannot be combined.", "Remove --url; dry-run outputs JSON describing what would be published."))}
-`
+    return writeError(
+      deps,
+      "invalid_usage",
+      "--url and --dry-run cannot be combined.",
+      "Remove --url; dry-run outputs JSON describing what would be published."
     );
-    return { exitCode: exitCodeFor("invalid_usage") };
   }
   try {
     if (raw.fromJson) {
@@ -709,12 +902,10 @@ async function handlePublishDryRun(input, raw, deps) {
     deps.stdout(`${JSON.stringify(output, null, 2)}
 `);
     return { exitCode: 0 };
-  } catch (error) {
-    const code = isFileSystemError(error) ? "local_input_error" : "invalid_usage";
-    const message = error instanceof Error ? error.message : "Dry-run failed.";
-    deps.stderr(`${JSON.stringify(errorEnvelope(code, message))}
-`);
-    return { exitCode: exitCodeFor(code) };
+  } catch (error2) {
+    const code = isFileSystemError(error2) ? "local_input_error" : "invalid_usage";
+    const message = error2 instanceof Error ? error2.message : "Dry-run failed.";
+    return writeError(deps, code, message);
   }
 }
 async function dryRunMultiFile(inputs, options, deps) {
@@ -724,18 +915,18 @@ async function dryRunMultiFile(inputs, options, deps) {
     try {
       info = await (0, import_promises3.stat)(filePath);
     } catch {
-      deps.stderr(
-        `${JSON.stringify(errorEnvelope("local_input_error", `File not found: ${filePath}`))}
-`
+      return writeError(
+        deps,
+        "local_input_error",
+        `File not found: ${filePath}`
       );
-      return { exitCode: exitCodeFor("local_input_error") };
     }
     if (info.isDirectory()) {
-      deps.stderr(
-        `${JSON.stringify(errorEnvelope("local_input_error", `Cannot mix directories with multiple file arguments. Use a single folder instead: dropthis publish ${filePath}`))}
-`
+      return writeError(
+        deps,
+        "local_input_error",
+        `Cannot mix directories with multiple file arguments. Use a single folder instead: dropthis publish ${filePath}`
       );
-      return { exitCode: exitCodeFor("local_input_error") };
     }
     files.push({
       path: (0, import_node_path.basename)(filePath),
@@ -744,11 +935,11 @@ async function dryRunMultiFile(inputs, options, deps) {
     });
   }
   if (files.length > MAX_BUNDLE_FILE_COUNT) {
-    deps.stderr(
-      `${JSON.stringify(errorEnvelope("local_input_error", `Bundle contains ${files.length} files, exceeding the maximum of ${MAX_BUNDLE_FILE_COUNT}.`))}
-`
+    return writeError(
+      deps,
+      "local_input_error",
+      `Bundle contains ${files.length} files, exceeding the maximum of ${MAX_BUNDLE_FILE_COUNT}.`
     );
-    return { exitCode: exitCodeFor("local_input_error") };
   }
   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);
@@ -831,9 +1022,9 @@ function mimeForPath(filePath) {
   };
   return types[ext] ?? "application/octet-stream";
 }
-function isFileSystemError(error) {
-  if (!(error instanceof Error)) return false;
-  const code = error.code;
+function isFileSystemError(error2) {
+  if (!(error2 instanceof Error)) return false;
+  const code = error2.code;
   return code === "ENOENT" || code === "ENOTDIR" || code === "ELIMIT";
 }
 function withPublishIdempotency(options) {
@@ -844,20 +1035,17 @@ function withPublishIdempotency(options) {
 var import_node_crypto2 = require("crypto");
 async function runUpdate(target, input, raw, deps) {
   const credential = await resolveCredential({
-    ...raw.apiKey ? { apiKey: raw.apiKey } : {},
+    ...raw.apiKey ?? deps.apiKey ? { apiKey: raw.apiKey ?? deps.apiKey } : {},
     env: deps.env,
     store: deps.store
   });
   if (!credential) {
-    deps.stderr(
-      `${JSON.stringify(errorEnvelope("auth_error", "No API key found.", "Set DROPTHIS_API_KEY or run dropthis login."))}
-`
-    );
-    return { exitCode: exitCodeFor("auth_error") };
+    return writeAuthError(deps);
   }
   if (raw.dryRun) {
     return handleUpdateDryRun(target, input, raw, deps);
   }
+  const spin = shouldSpin(deps.outputMode) ? createSpinner("Updating\u2026", deps.stderr) : void 0;
   try {
     assertDropId(target);
     if (raw.fromJson && input) {
@@ -881,32 +1069,28 @@ async function runUpdate(target, input, raw, deps) {
       })
     ) : await deps.client.update(target, parsed, revisionOptions);
     if (result.error) {
-      deps.stderr(`${JSON.stringify(apiErrorEnvelope(result.error))}
-`);
-      return { exitCode: exitCodeFor("api_error") };
+      spin?.fail();
+      return writeApiError(deps, result.error);
     }
+    spin?.stop("Updated");
     if (raw.url) deps.stdout(`${result.data.url}
 `);
-    else if (deps.outputMode === "human")
-      deps.stdout(`Updated: ${result.data.url}
-`);
-    else deps.stdout(`${JSON.stringify({ ok: true, drop: result.data })}
-`);
+    else writeResult(deps, result.data.url, "Updated", result.data);
     return { exitCode: 0 };
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "Update failed.";
-    deps.stderr(`${JSON.stringify(errorEnvelope("invalid_usage", message))}
-`);
-    return { exitCode: exitCodeFor("invalid_usage") };
+  } catch (error2) {
+    const message = error2 instanceof Error ? error2.message : "Update failed.";
+    spin?.fail();
+    return writeError(deps, "invalid_usage", message);
   }
 }
 async function handleUpdateDryRun(target, input, raw, deps) {
   if (raw.url) {
-    deps.stderr(
-      `${JSON.stringify(errorEnvelope("invalid_usage", "--url and --dry-run cannot be combined.", "Remove --url; dry-run outputs JSON describing what would be published."))}
-`
+    return writeError(
+      deps,
+      "invalid_usage",
+      "--url and --dry-run cannot be combined.",
+      "Remove --url; dry-run outputs JSON describing what would be published."
     );
-    return { exitCode: exitCodeFor("invalid_usage") };
   }
   try {
     assertDropId(target);
@@ -947,12 +1131,10 @@ async function handleUpdateDryRun(target, input, raw, deps) {
     deps.stdout(`${JSON.stringify(output, null, 2)}
 `);
     return { exitCode: 0 };
-  } catch (error) {
-    const code = isFileSystemError2(error) ? "local_input_error" : "invalid_usage";
-    const message = error instanceof Error ? error.message : "Dry-run failed.";
-    deps.stderr(`${JSON.stringify(errorEnvelope(code, message))}
-`);
-    return { exitCode: exitCodeFor(code) };
+  } catch (error2) {
+    const code = isFileSystemError2(error2) ? "local_input_error" : "invalid_usage";
+    const message = error2 instanceof Error ? error2.message : "Dry-run failed.";
+    return writeError(deps, code, message);
   }
 }
 var MAX_BUNDLE_FILE_COUNT2 = 200;
@@ -986,9 +1168,9 @@ function validateDryRunFileCount(output) {
     );
   }
 }
-function isFileSystemError2(error) {
-  if (!(error instanceof Error)) return false;
-  const code = error.code;
+function isFileSystemError2(error2) {
+  if (!(error2 instanceof Error)) return false;
+  const code = error2.code;
   return code === "ENOENT" || code === "ENOTDIR";
 }
 function withUpdateIdempotency(options) {
@@ -1009,23 +1191,29 @@ async function runWhoami(_input, deps) {
     store: deps.store
   });
   if (!credential) {
-    deps.stdout(`${JSON.stringify({ ok: true, authenticated: false })}
-`);
+    writeHumanOrJson(deps, "Not authenticated. Run dropthis login.", {
+      ok: true,
+      authenticated: false
+    });
     return { exitCode: 0 };
   }
-  deps.stdout(
-    `${JSON.stringify({
-      ok: true,
-      authenticated: true,
-      source: credential.source,
-      masked_key: maskKey(credential.apiKey),
-      ...credential.keyId ? { key_id: credential.keyId } : {},
-      ...credential.keyLast4 ? { key_last4: credential.keyLast4 } : {},
-      ...credential.accountId ? { account_id: credential.accountId } : {},
-      ...credential.email ? { email: credential.email } : {}
-    })}
-`
-  );
+  const masked = maskKey(credential.apiKey);
+  const pairs = [];
+  if (credential.email) pairs.push(["Email", credential.email]);
+  pairs.push(["Key", masked]);
+  pairs.push(["Source", credential.source]);
+  if (credential.accountId) pairs.push(["Account", credential.accountId]);
+  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 } : {}
+  };
+  writeKv(deps, pairs, jsonEnvelope);
   return { exitCode: 0 };
 }
 
@@ -1079,7 +1267,9 @@ var InsecureFileCredentialStore = class {
   }
   async read() {
     const value = await readJsonFile(this.filePath);
-    return value ? { ...value, storage: "insecure" } : null;
+    if (!value) return null;
+    if (typeof value.apiKey !== "string" || !value.apiKey) return null;
+    return { ...value, storage: "insecure" };
   }
   async save(credential) {
     await writeCredentialFile(this.filePath, {
@@ -1102,7 +1292,7 @@ var KeyringCredentialStore = class {
     const metadata = await readJsonFile(this.filePath);
     if (!metadata) return null;
     const apiKey = await this.keyring.getPassword();
-    if (!apiKey) return null;
+    if (typeof apiKey !== "string" || !apiKey) return null;
     return { ...metadata, apiKey, storage: "secure" };
   }
   async save(credential) {
@@ -1141,11 +1331,11 @@ function credentialPath(configDir) {
 async function readJsonFile(path) {
   try {
     return JSON.parse(await (0, import_promises4.readFile)(path, "utf8"));
-  } catch (error) {
-    if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+  } catch (error2) {
+    if (error2 && typeof error2 === "object" && "code" in error2 && error2.code === "ENOENT") {
       return null;
     }
-    throw error;
+    throw error2;
   }
 }
 async function writeCredentialFile(path, credential) {
@@ -1161,7 +1351,7 @@ async function writeCredentialFile(path, credential) {
 function buildProgram(options = {}) {
   const program = new import_commander.Command();
   const store = options.store ?? new MemoryCredentialStore();
-  program.name("dropthis").description("Publish anything online and get a URL back.").version("0.1.5");
+  program.name("dropthis").description("Publish anything online and get a URL back.").version("0.2.1");
   program.option("--api-key <key>", "Override API key for this invocation");
   program.option("--api-url <url>", "Override API base URL");
   program.option("--json", "Force JSON output");
@@ -1170,8 +1360,8 @@ function buildProgram(options = {}) {
     async (commandOptions) => {
       if (!commandOptions.email || !commandOptions.otp) {
         const deps2 = await commandDeps(program, options, store, commandOptions);
-        const global = globalOptions(program, commandOptions);
-        const context = createContext({ global });
+        const global2 = globalOptions(program, commandOptions);
+        const context = createContext({ global: global2 });
         const result2 = await runLoginInteractive({
           ...deps2,
           createClient: (apiKey) => context.createClient(apiKey)
@@ -1180,13 +1370,18 @@ function buildProgram(options = {}) {
         return;
       }
       const deps = await commandDeps(program, options, store, commandOptions);
+      const global = globalOptions(program, commandOptions);
+      const verifyContext = createContext({ global });
       const result = await runLoginVerify(
         {
           email: commandOptions.email,
           otp: commandOptions.otp,
           ...commandOptions.json !== void 0 ? { json: commandOptions.json } : {}
         },
-        deps
+        {
+          ...deps,
+          createClient: (apiKey) => verifyContext.createClient(apiKey)
+        }
       );
       process.exitCode = result.exitCode;
     }
@@ -1200,7 +1395,12 @@ function buildProgram(options = {}) {
   login?.command("verify").description("Verify email OTP and store an API key").requiredOption("--email <email>", "Email address").requiredOption("--otp <otp>", "One-time passcode").option("--json", "Force JSON output").action(
     async (commandOptions) => {
       const deps = await commandDeps(program, options, store, commandOptions);
-      const result = await runLoginVerify(commandOptions, deps);
+      const global = globalOptions(program, commandOptions);
+      const verifySubContext = createContext({ global });
+      const result = await runLoginVerify(commandOptions, {
+        ...deps,
+        createClient: (apiKey) => verifySubContext.createClient(apiKey)
+      });
       process.exitCode = result.exitCode;
     }
   );
@@ -1422,7 +1622,9 @@ function toDropOptions(options) {
   };
 }
 function parseInteger(value) {
-  return Number.parseInt(value, 10);
+  const n = Number.parseInt(value, 10);
+  if (Number.isNaN(n)) throw new import_commander.InvalidArgumentError("Expected an integer.");
+  return n;
 }
 async function resolveCommandInput(input, stdin) {
   if (input !== "-") return input;
@@ -1443,22 +1645,33 @@ 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 = `/tmp/.dropthis-stdin-${Date.now()}`;
-      const { writeFile: writeFile2 } = await import("fs/promises");
+      const tmpPath = join2(tmpDir, `stdin-${Date.now()}`);
       await writeFile2(tmpPath, buf);
       resolved.push(tmpPath);
     } else {
       resolved.push(input);
     }
   }
-  const { mkdtemp, copyFile, 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 names = resolved.map((f) => pathBasename(f));
+  const dupes = names.filter((n, i) => names.indexOf(n) !== i);
+  if (dupes.length > 0) {
+    throw new Error(
+      `Duplicate file names: ${[...new Set(dupes)].join(", ")}. Rename files to avoid collisions.`
+    );
+  }
   for (const filePath of resolved) {
     const info = await fsStat(filePath);
     if (info.isDirectory()) {
@@ -1482,8 +1695,8 @@ async function readStdinBytes(stdin) {
 }
 
 // src/cli.ts
-buildProgram({ store: createCredentialStore() }).parseAsync(process.argv).catch((error) => {
-  console.error(error);
+buildProgram({ store: createCredentialStore() }).parseAsync(process.argv).catch((error2) => {
+  console.error(error2);
   process.exitCode = 1;
 });
 //# sourceMappingURL=cli.cjs.map