@dropthis/cli 0.26.0 → 0.28.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,9 +230,23 @@ 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.";
   }
@@ -792,6 +807,32 @@ var COMMAND_ANNOTATIONS = {
     auth: "required",
     examples: ["dropthis api-keys create --label CI --json"]
   },
+  workspace: {
+    auth: "required",
+    examples: ["dropthis workspace list --json", "dropthis workspace use acme"]
+  },
+  "workspace list": {
+    auth: "required",
+    examples: ["dropthis workspace list --json"]
+  },
+  "workspace use": {
+    auth: "required",
+    examples: [
+      "dropthis workspace use acme",
+      "dropthis workspace use ws_team123"
+    ]
+  },
+  keys: {
+    auth: "required",
+    examples: ["dropthis keys create --service --workspace acme --json"]
+  },
+  "keys create": {
+    auth: "required",
+    examples: [
+      "dropthis keys create --json",
+      "dropthis keys create --service --workspace acme --json"
+    ]
+  },
   login: {
     examples: [
       "dropthis login verify --email user@example.com --otp 123456 --json"
@@ -932,6 +973,9 @@ function spreadData(data) {
   return data && typeof data === "object" ? data : { data };
 }
 
+// src/version.ts
+var CLI_VERSION = true ? "0.28.0" : "0.0.0-dev";
+
 // src/commands/doctor.ts
 async function runDoctor(_input, deps) {
   const stored = await deps.store.read();
@@ -942,13 +986,13 @@ async function runDoctor(_input, deps) {
   const authSource = credential?.source ?? "missing";
   const storageBackend = stored?.storage ?? "none";
   const pairs = [
-    ["Version", "0.26.0"],
+    ["Version", CLI_VERSION],
     ["Auth", authSource],
     ["Storage", storageBackend]
   ];
   writeKv(deps, pairs, {
     ok: true,
-    version: "0.26.0",
+    version: CLI_VERSION,
     auth: { source: authSource },
     storage: { backend: storageBackend }
   });
@@ -1496,6 +1540,58 @@ async function runDropsDelete(target, input, deps) {
   return { exitCode: 0 };
 }
 
+// src/commands/keys.ts
+async function runKeysCreate(input, deps) {
+  try {
+    await requireCredential({
+      ...deps.apiKey ? { apiKey: deps.apiKey } : {},
+      env: deps.env,
+      store: deps.store
+    });
+  } catch {
+    return writeAuthError(deps);
+  }
+  const keyType = input.type ?? "delegated";
+  if (input.workspace && keyType !== "service") {
+    return writeError(
+      deps,
+      "invalid_usage",
+      "--workspace is only valid with --service (it pins a CI service key to one workspace). A delegated login key is account-scoped and switchable \u2014 use `dropthis workspace use <slug>` to change its active workspace."
+    );
+  }
+  if (keyType === "service" && !input.workspace) {
+    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.)"
+    );
+  }
+  const label = input.label ?? (keyType === "service" ? `Service key${input.workspace ? ` (${input.workspace})` : ""}` : "CLI key");
+  const createInput = {
+    label,
+    type: keyType
+  };
+  if (keyType === "service" && input.workspace) {
+    createInput.workspace = input.workspace;
+  }
+  const result = await deps.client.apiKeys.create(createInput);
+  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.keyLast4) pairs.push(["Last 4", String(data.keyLast4)]);
+  if (data.label) pairs.push(["Label", String(data.label)]);
+  writeKv(deps, pairs, { ok: true, api_key: result.data });
+  if (deps.outputMode === "human") {
+    deps.stderr(
+      `${hint("Store this key now \u2014 it will not be shown again.")}
+`
+    );
+  }
+  return { exitCode: 0 };
+}
+
 // src/commands/login.ts
 var prompts4 = __toESM(require("@clack/prompts"), 1);
 async function runLoginInteractive(deps) {
@@ -1553,7 +1649,10 @@ async function runLoginInteractive(deps) {
     return { exitCode: exitCodeFor("api_error") };
   }
   const authedClient = deps.createClient(session.data.token);
-  const apiKey = await authedClient.apiKeys.create({ label: "CLI" });
+  const apiKey = await authedClient.apiKeys.create({
+    label: "CLI",
+    type: "delegated"
+  });
   if (apiKey.error) {
     prompts4.cancel(apiKey.error.message);
     return { exitCode: exitCodeFor("api_error") };
@@ -1596,7 +1695,10 @@ async function runLoginVerify(input, deps) {
     return writeApiError(deps, session.error);
   }
   const authedClient = deps.createClient(session.data.token);
-  const apiKey = await authedClient.apiKeys.create({ label: "CLI" });
+  const apiKey = await authedClient.apiKeys.create({
+    label: "CLI",
+    type: "delegated"
+  });
   if (apiKey.error) {
     return writeApiError(deps, apiKey.error);
   }
@@ -1804,7 +1906,8 @@ async function parseDropOptions(raw) {
     ...raw.path ? { path: raw.path } : {},
     ...raw.idempotencyKey ? { idempotencyKey: raw.idempotencyKey } : {},
     ...raw.shared ? { domain: import_node.SHARED_POOL } : raw.domain ? { domain: raw.domain } : {},
-    ...raw.slug ? { slug: raw.slug } : {}
+    ...raw.slug ? { slug: raw.slug } : {},
+    ...raw.workspace ? { workspace: raw.workspace } : {}
   };
 }
 function parseJsonObject(value, label) {
@@ -2593,6 +2696,59 @@ async function runWhoami(_input, deps) {
   return { exitCode: 0 };
 }
 
+// src/commands/workspace.ts
+async function runWorkspaceList(_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.workspaces.list();
+  if (result.error) return writeApiError(deps, result.error);
+  const raw = unwrapListData(result.data);
+  const items = Array.isArray(raw) ? raw : [];
+  if (deps.outputMode === "human") {
+    if (items.length === 0) {
+      writeEmpty(deps, "No workspaces found.", { ok: true, workspaces: [] });
+    } else {
+      for (const ws of items) {
+        const active = ws.isActive ? "* " : "  ";
+        deps.stdout(
+          `${active}${ws.slug}  ${ws.name}  (${ws.kind}, ${ws.role}, ${ws.plan})
+`
+        );
+      }
+    }
+  } else {
+    writeJson(deps, { ok: true, workspaces: items });
+  }
+  return { exitCode: 0 };
+}
+async function runWorkspaceUse(slugOrId, _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.workspaces.use(slugOrId);
+  if (result.error) return writeApiError(deps, result.error);
+  const ws = result.data;
+  writeHumanOrJson(
+    deps,
+    success(`Now using workspace: ${ws.name} (${ws.slug})`),
+    { ok: true, workspace: ws }
+  );
+  return { exitCode: 0 };
+}
+
 // src/context.ts
 var import_node2 = require("@dropthis/node");
 function createContext(input) {
@@ -2801,7 +2957,7 @@ function buildProgram(options = {}) {
       `  ${import_picocolors6.default.cyan("dropthis login")}`,
       `  ${import_picocolors6.default.cyan("dropthis publish ./dist")}`
     ].join("\n")
-  ).version("0.26.0").configureHelp({
+  ).version(CLI_VERSION).configureHelp({
     subcommandTerm(cmd) {
       const args = cmd.registeredArguments.map((a) => {
         const name = a.name();
@@ -2855,6 +3011,9 @@ ${lines.map((l) => `  ${l}`).join("\n")}
   ).option(
     "--manifest <file>",
     "Publish a multi-file bundle defined in a JSON file (path, content/source_url/content_base64 per file). Cannot combine with a positional input."
+  ).option(
+    "--workspace <slugOrId>",
+    "Target workspace slug or id for this publish (delegated keys only; overrides server-side active workspace for this call)"
   ).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)"
@@ -3276,6 +3435,47 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
       process.exitCode = result.exitCode;
     }
   );
+  const workspace = program.command("workspace").description(
+    "Manage workspaces. Switch your active workspace (delegated keys only) or list all workspaces you belong to."
+  );
+  workspace.command("list", { isDefault: true }).description("List workspaces you belong to").option("--json", "Force JSON output").action(async (commandOptions) => {
+    const deps = await commandDeps(program, options, store, commandOptions);
+    const result = await runWorkspaceList(commandOptions, deps);
+    process.exitCode = result.exitCode;
+  });
+  workspace.command("use <slugOrId>").description(
+    "Switch your active workspace (server-side, persists on the credential). Delegated keys only \u2014 pinned service keys cannot switch."
+  ).option("--json", "Force JSON output").action(async (slugOrId, commandOptions) => {
+    const deps = await commandDeps(program, options, store, commandOptions);
+    const result = await runWorkspaceUse(slugOrId, commandOptions, deps);
+    process.exitCode = result.exitCode;
+  });
+  const keys = program.command("keys").description(
+    "Mint API keys (delegated login keys or pinned CI service keys)"
+  );
+  keys.command("create").description(
+    "Create an API key. Without --service, mints a delegated account-scoped key (default for login). With --service --workspace <ws>, mints a CI key pinned to that workspace."
+  ).option("--label <label>", "Key label").option(
+    "--service",
+    "Mint a pinned service key for CI/automation (requires --workspace to pin it)"
+  ).option(
+    "--workspace <slugOrId>",
+    "Pin this service key to the given workspace slug or id (only valid with --service)"
+  ).option("--json", "Force JSON output").action(
+    async (commandOptions) => {
+      const deps = await commandDeps(program, options, store, commandOptions);
+      const result = await runKeysCreate(
+        {
+          ...commandOptions.label !== void 0 ? { label: commandOptions.label } : {},
+          type: commandOptions.service ? "service" : "delegated",
+          ...commandOptions.workspace !== void 0 ? { workspace: commandOptions.workspace } : {},
+          ...commandOptions.json !== void 0 ? { json: commandOptions.json } : {}
+        },
+        deps
+      );
+      process.exitCode = result.exitCode;
+    }
+  );
   program.command("login").description("Authenticate with email OTP").option("--email <email>", "Email address").option("--otp <otp>", "One-time passcode").option("--json", "Force JSON output").action(
     async (commandOptions) => {
       if (!commandOptions.email || !commandOptions.otp) {
@@ -3403,7 +3603,7 @@ ${import_picocolors6.default.bold("Canonical vs raw URLs:")}`,
     );
     const result = await runUpgrade(commandOptions, {
       ...deps,
-      currentVersion: "0.26.0"
+      currentVersion: CLI_VERSION
     });
     process.exitCode = result.exitCode;
   });
@@ -3514,6 +3714,7 @@ function toDropOptions(options) {
     ...options.shared ? { shared: true } : {},
     ...options.slug ? { slug: options.slug } : {},
     ...options.manifest ? { manifest: options.manifest } : {},
+    ...options.workspace ? { workspace: options.workspace } : {},
     ...options.json !== void 0 ? { json: options.json } : {},
     ...options.quiet !== void 0 ? { quiet: options.quiet } : {},
     ...options.url !== void 0 ? { url: options.url } : {},
@@ -3657,7 +3858,7 @@ var showNotice = shouldShowNotice({
 if (showNotice) {
   const notice = noticeFromCache({
     cache: updateCache,
-    currentVersion: "0.26.0"
+    currentVersion: CLI_VERSION
   });
   if (notice) {
     process.stderr.write(`