@dropthis/cli 0.27.0 → 0.29.0

package/dist/cli.cjs

@@ -218,6 +218,7 @@ function normalizeApiErrorCode(error2) {
 }
 function nextActionForApiError(error2, mode = "json") {
   const cliHint = cliNextAction(error2);
+  if (error2.code === "workspace_choice_required" && cliHint) return cliHint;
   if (mode === "human" && cliHint) return cliHint;
   if (error2.suggestion) return error2.suggestion;
   if (cliHint) return cliHint;
@@ -229,12 +230,32 @@ function nextActionForApiError(error2, mode = "json") {
   }
   return "Fix the request or retry after checking the drop state.";
 }
+function workspaceChoiceSlugs(error2) {
+  const body = error2.body;
+  const raw = body && typeof body === "object" ? body.choices : void 0;
+  if (!Array.isArray(raw)) return [];
+  return raw.map(
+    (c) => c && typeof c === "object" ? c.slug : void 0
+  ).filter((s) => typeof s === "string" && s.length > 0);
+}
 function cliNextAction(error2) {
   const uploadNextAction = error2.code ? UPLOAD_NEXT_ACTIONS[error2.code] : void 0;
   if (uploadNextAction) return uploadNextAction;
+  if (error2.code === "workspace_choice_required") {
+    const slugs = workspaceChoiceSlugs(error2);
+    const example = slugs[0] ?? "<slug>";
+    const list = slugs.length ? ` Workspaces: ${slugs.join(", ")}.` : "";
+    return `This account belongs to more than one workspace \u2014 pick one. Switch it for every later command with: dropthis workspace use ${example} \u2014 or target just this one with: --workspace ${example}.${list}`;
+  }
   if (error2.code === "network_error") {
     return "Could not reach the dropthis API \u2014 check your network or DROPTHIS_API_URL.";
   }
+  if (error2.code === "workspace_pinned") {
+    return "Service keys are pinned to one workspace. To switch workspaces, use a delegated login (run: dropthis login) instead of a service key.";
+  }
+  if (error2.code === "workspace_selector_not_allowed") {
+    return "Service keys (sk_) are pinned to one workspace and cannot target another with --workspace. Use a delegated login key (run: dropthis login), or run without --workspace.";
+  }
   if (error2.code === "revision_conflict") {
     return "Re-read the drop with dropthis get <drop-id>, merge your changes, and retry with --if-revision set to the current revision.";
   }
@@ -250,9 +271,15 @@ function cliNextAction(error2) {
   if (error2.code === "otp_invalid") {
     return "Re-enter the code from your email; if it keeps failing, request a fresh one with dropthis login request --email <email>.";
   }
+  if (error2.code === "workspace_not_found") {
+    return "Workspace not found. List your workspaces with: dropthis workspace list";
+  }
   if (error2.statusCode === 404 || error2.code === "not_found") {
     return "Check the drop id or slug and retry; list your drops with dropthis list.";
   }
+  if (error2.code === "invalid_api_key") {
+    return "API key is invalid or revoked. Run dropthis login to re-authenticate, or set a valid DROPTHIS_API_KEY.";
+  }
   if (error2.statusCode === 401 || error2.code === "missing_api_key") {
     return "Authenticate with dropthis login or set DROPTHIS_API_KEY.";
   }
@@ -706,7 +733,8 @@ var COMMAND_ANNOTATIONS = {
       "dropthis ./report.html",
       "dropthis publish ./site --json",
       "dropthis publish ./site --url",
-      "dropthis publish ./dist --dry-run"
+      "dropthis publish ./dist --dry-run",
+      "dropthis publish ./report.html --workspace acme --json   # target a specific workspace (delegated keys only)"
     ]
   },
   "update-content": {
@@ -792,6 +820,18 @@ var COMMAND_ANNOTATIONS = {
     auth: "required",
     examples: ["dropthis api-keys create --label CI --json"]
   },
+  "api-keys create": {
+    auth: "required",
+    examples: ["dropthis api-keys create --label CI --json"]
+  },
+  "api-keys list": {
+    auth: "required",
+    examples: ["dropthis api-keys list --json"]
+  },
+  "api-keys delete": {
+    auth: "required",
+    examples: ["dropthis api-keys delete key_abc --yes --json"]
+  },
   workspace: {
     auth: "required",
     examples: ["dropthis workspace list --json", "dropthis workspace use acme"]
@@ -819,6 +859,16 @@ var COMMAND_ANNOTATIONS = {
     ]
   },
   login: {
+    examples: [
+      "dropthis login",
+      "dropthis login request --email user@example.com --json",
+      "dropthis login verify --email user@example.com --otp 123456 --json"
+    ]
+  },
+  "login request": {
+    examples: ["dropthis login request --email user@example.com --json"]
+  },
+  "login verify": {
     examples: [
       "dropthis login verify --email user@example.com --otp 123456 --json"
     ]
@@ -959,7 +1009,7 @@ function spreadData(data) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "0.27.0" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.29.0" : "0.0.0-dev";
 
 // src/commands/doctor.ts
 async function runDoctor(_input, deps) {
@@ -1071,6 +1121,13 @@ function computeSleepMs(records, elapsedMs, timeoutMs) {
   return Math.min(desiredMs, Math.max(0, remainingMs));
 }
 async function runDomainsConnect(input, deps) {
+  if (input.mode !== "path" && input.mode !== "dedicated") {
+    return writeError(
+      deps,
+      "invalid_usage",
+      '--mode must be "path" or "dedicated"'
+    );
+  }
   try {
     await requireCredential({
       ...deps.apiKey ? { apiKey: deps.apiKey } : {},
@@ -1080,7 +1137,9 @@ async function runDomainsConnect(input, deps) {
   } catch {
     return writeAuthError(deps);
   }
-  const result = await deps.client.domains.connect(input);
+  const result = await deps.client.domains.connect(
+    input
+  );
   if (result.error) return writeApiError(deps, result.error);
   const domain = result.data;
   if (deps.outputMode === "human") {
@@ -1198,6 +1257,27 @@ async function runDomainsVerify(idOrHostname, input, deps, sleep = defaultSleep)
     if (result.error) return writeApiError(deps, result.error);
     const domain = result.data;
     if (!input.wait) {
+      if (domain.status !== "live" && domain.status !== "failed") {
+        if (deps.outputMode === "human") {
+          deps.stdout(`${warn(`${idOrHostname}: ${domain.status}`)}
+`);
+          if (domain.dns.length > 0) {
+            deps.stdout("\n");
+            deps.stdout(`${formatDnsTable(domain.dns)}
+`);
+          }
+          printNextHints(deps, domain.next, domain.hostname, domain.dns);
+          printConsoleHandoff(deps, domain);
+        } else {
+          writeError(
+            deps,
+            "verify_pending",
+            `${idOrHostname}: ${domain.status}`,
+            `Re-run: dropthis domains verify ${idOrHostname}`
+          );
+        }
+        return { exitCode: 6 };
+      }
       if (deps.outputMode === "human") {
         deps.stdout(
           `${domain.status === "live" ? success(`${idOrHostname} is live`) : warn(`${idOrHostname}: ${domain.status}`)}
@@ -1214,7 +1294,7 @@ async function runDomainsVerify(idOrHostname, input, deps, sleep = defaultSleep)
         writeJson(deps, { ok: true, domain });
       }
       return {
-        exitCode: domain.status === "live" ? 0 : domain.status === "failed" ? 1 : 6
+        exitCode: domain.status === "live" ? 0 : 1
       };
     }
     if (domain.status === "live" || domain.status === "failed") {
@@ -1245,12 +1325,19 @@ async function runDomainsVerify(idOrHostname, input, deps, sleep = defaultSleep)
         );
       } else {
         deps.stderr(
-          `${JSON.stringify(errorEnvelope("verify_timeout", message))}
+          `${JSON.stringify(errorEnvelope("verify_timeout", message, `DNS is still propagating. Re-run: dropthis domains verify ${idOrHostname}`))}
 `
         );
       }
       return { exitCode: 7 };
     }
+    if (deps.outputMode === "json" && domain.dns.length > 0) {
+      const elapsed = Math.round(elapsedMs / 1e3);
+      deps.stderr(
+        `${JSON.stringify({ ok: false, pending: true, status: domain.status, elapsed })}
+`
+      );
+    }
     if (deps.outputMode === "human" && domain.dns.length > 0) {
       deps.stdout(`${formatDnsTable(domain.dns)}
 `);
@@ -1548,7 +1635,8 @@ async function runKeysCreate(input, deps) {
     return writeError(
       deps,
       "invalid_usage",
-      "Service keys must be pinned to a workspace: pass --workspace <slug-or-id>. (A service key is for CI/automation and never switches workspace.)"
+      "Service keys must be pinned to a workspace.",
+      "Run: dropthis workspace list to see slugs, then: dropthis keys create --service --workspace <slug>"
     );
   }
   const label = input.label ?? (keyType === "service" ? `Service key${input.workspace ? ` (${input.workspace})` : ""}` : "CLI key");
@@ -2709,7 +2797,8 @@ async function runWorkspaceList(_input, deps) {
       }
     }
   } else {
-    writeJson(deps, { ok: true, workspaces: items });
+    const activeWorkspace = items.find((w) => w.isActive) ?? null;
+    writeJson(deps, { ok: true, workspaces: items, active: activeWorkspace });
   }
   return { exitCode: 0 };
 }
@@ -3314,9 +3403,11 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
   ).action(
     async (hostname, commandOptions) => {
       if (commandOptions.mode !== "path" && commandOptions.mode !== "dedicated") {
-        process.stderr.write(`error: --mode must be "path" or "dedicated"
-`);
-        process.exitCode = 2;
+        process.exitCode = writeError(
+          outputWriter(program, options, commandOptions),
+          "invalid_usage",
+          '--mode must be "path" or "dedicated"'
+        ).exitCode;
         return;
       }
       const deps = await commandDeps(program, options, store, commandOptions);
@@ -3338,7 +3429,7 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
     process.exitCode = result.exitCode;
   });
   domains.command("verify <hostname>").description(
-    "Trigger a DNS verification check. With --wait, polls until live or failed.\nUse after adding the DNS records from: dropthis domains connect"
+    "Trigger a DNS verification check. With --wait, polls until live or failed.\nUse after adding the DNS records from: dropthis domains connect\n\nExit codes: 0=live, 1=failed, 6=still pending (retry). Use --wait to poll automatically."
   ).option("--wait", "Poll until live (or failed/timeout)").option(
     "--timeout <secs>",
     "Max seconds to wait (default: 300)",
@@ -3604,6 +3695,21 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
   });
   return program;
 }
+function outputWriter(program, options, commandOptions) {
+  const global = globalOptions(program, commandOptions);
+  const context = createContext({
+    global,
+    ...options.env !== void 0 ? { env: options.env } : {},
+    ...options.stdout !== void 0 ? { stdout: options.stdout } : {},
+    ...options.stderr !== void 0 ? { stderr: options.stderr } : {},
+    ...options.stdoutIsTTY !== void 0 ? { stdoutIsTTY: options.stdoutIsTTY } : {}
+  });
+  return {
+    stdout: context.stdout,
+    stderr: context.stderr,
+    outputMode: context.output.mode
+  };
+}
 async function commandDeps(program, options, store, commandOptions) {
   const global = globalOptions(program, commandOptions);
   const context = createContext({