refactor: auth commands use shared space() option

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: lollipop-onl

apps/cli/src/commands/auth/logout.ts

@@ -2,14 +2,14 @@ import { UserError } from "@repo/cli-utils";
 import { loadConfig, removeSpace } from "@repo/config";
 import consola from "consola";
 import { BeeCommand } from "../../lib/bee-command";
+import * as opt from "../../lib/common-options";
 
 const logout = new BeeCommand("logout")
   .summary("Remove authentication for a Backlog space")
   .description(
     `Removes stored credentials locally. Does not revoke API keys or OAuth tokens on the server.`,
   )
-  .option("-s, --space <hostname>", "The hostname of the Backlog space")
-  .envVars([["BACKLOG_SPACE", "Space hostname to log out from"]])
+  .addOption(opt.space())
   .examples([
     { description: "Select space via prompt", command: "bee auth logout" },
     {
@@ -20,7 +20,7 @@ const logout = new BeeCommand("logout")
   .action(async (opts) => {
     const config = loadConfig();
 
-    let hostname = opts.space || process.env.BACKLOG_SPACE;
+    let hostname = opts.space;
     if (!hostname) {
       if (config.spaces.length === 0) {
         consola.info("No spaces are currently authenticated.");

apps/cli/src/commands/auth/refresh.test.ts

@@ -1,5 +1,5 @@
 import { refreshAccessToken } from "@repo/backlog-utils";
-import { resolveSpace, updateSpaceAuth } from "@repo/config";
+import { findSpace, loadConfig, updateSpaceAuth } from "@repo/config";
 import { Backlog } from "backlog-js";
 import consola from "consola";
 import { describe, expect, it, vi } from "vitest";
@@ -19,15 +19,22 @@ vi.mock("@repo/backlog-utils", () => ({
 vi.mock("@repo/config", () => ({
   findSpace: vi.fn(),
   loadConfig: vi.fn(),
-  resolveSpace: vi.fn(),
   updateSpaceAuth: vi.fn(),
 }));
 
 vi.mock("consola", () => import("@repo/test-utils/mock-consola"));
 
+const mockDefaultSpace = (space: ReturnType<typeof findSpace>) => {
+  vi.mocked(loadConfig).mockReturnValue({
+    spaces: space ? [space] : [],
+    defaultSpace: space?.host,
+  });
+  vi.mocked(findSpace).mockReturnValue(space);
+};
+
 describe("auth refresh", () => {
   it("throws error when no space is configured", async () => {
-    vi.mocked(resolveSpace).mockReturnValue(null);
+    mockDefaultSpace(null);
 
     const { default: refresh } = await import("./refresh");
     await expect(refresh.parseAsync([], { from: "user" })).rejects.toThrow(
@@ -36,7 +43,7 @@ describe("auth refresh", () => {
   });
 
   it("shows error for API key authentication", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    mockDefaultSpace({
       host: "example.backlog.com",
       auth: { method: "api-key" as const, apiKey: "key" },
     });
@@ -48,7 +55,7 @@ describe("auth refresh", () => {
   });
 
   it("shows error when clientId/clientSecret are missing", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    mockDefaultSpace({
       host: "example.backlog.com",
       auth: {
         method: "oauth" as const,
@@ -64,7 +71,7 @@ describe("auth refresh", () => {
   });
 
   it("successfully refreshes token", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    mockDefaultSpace({
       host: "example.backlog.com",
       auth: {
         method: "oauth" as const,
@@ -108,7 +115,7 @@ describe("auth refresh", () => {
   });
 
   it("shows error on refresh failure", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    mockDefaultSpace({
       host: "example.backlog.com",
       auth: {
         method: "oauth" as const,
@@ -127,7 +134,7 @@ describe("auth refresh", () => {
   });
 
   it("shows error when token verification fails after refresh", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    mockDefaultSpace({
       host: "example.backlog.com",
       auth: {
         method: "oauth" as const,

apps/cli/src/commands/auth/refresh.ts

@@ -1,17 +1,17 @@
 import { refreshAccessToken } from "@repo/backlog-utils";
 import { UserError } from "@repo/cli-utils";
-import { findSpace, loadConfig, resolveSpace, updateSpaceAuth } from "@repo/config";
+import { findSpace, loadConfig, updateSpaceAuth } from "@repo/config";
 import { Backlog } from "backlog-js";
 import consola from "consola";
 import { BeeCommand } from "../../lib/bee-command";
+import * as opt from "../../lib/common-options";
 
 const refresh = new BeeCommand("refresh")
   .summary("Refresh OAuth token")
   .description(
     `Only available for spaces authenticated with OAuth. If the refresh token is expired, re-authenticate with \`bee auth login -m oauth\`.`,
   )
-  .option("-s, --space <hostname>", "The hostname of the Backlog space")
-  .envVars([["BACKLOG_SPACE", "Default space hostname"]])
+  .addOption(opt.space())
   .examples([
     { description: "Refresh token for default space", command: "bee auth refresh" },
     {
@@ -20,7 +20,9 @@ const refresh = new BeeCommand("refresh")
     },
   ])
   .action(async (opts) => {
-    const space = opts.space ? findSpace(loadConfig().spaces, opts.space) : resolveSpace();
+    const config = loadConfig();
+    const host = opts.space ?? config.defaultSpace;
+    const space = host ? findSpace(config.spaces, host) : null;
 
     if (!space) {
       throw new UserError("No space configured. Run `bee auth login` to authenticate.");

apps/cli/src/commands/auth/status.ts

@@ -3,6 +3,7 @@ import { type Entity, Backlog } from "backlog-js";
 import consola from "consola";
 import { printDefinitionList } from "@repo/cli-utils";
 import { BeeCommand } from "../../lib/bee-command";
+import * as opt from "../../lib/common-options";
 
 const getToken = (auth: RcAuth): string =>
   auth.method === "api-key" ? auth.apiKey : auth.accessToken;
@@ -12,9 +13,8 @@ const status = new BeeCommand("status")
   .description(
     `Verifies credential validity for each configured space via the Backlog API. The active (default) space is indicated.`,
   )
-  .option("-s, --space <hostname>", "The hostname of the Backlog space")
+  .addOption(opt.space())
   .option("--show-token", "Display the auth token")
-  .envVars([["BACKLOG_SPACE", "Filter by space hostname"]])
   .examples([
     { description: "Display status for all spaces", command: "bee auth status" },
     {
@@ -26,7 +26,7 @@ const status = new BeeCommand("status")
   .action(async (opts) => {
     const config = loadConfig();
 
-    const filterSpace = opts.space || process.env.BACKLOG_SPACE;
+    const filterSpace = opts.space;
     const spaces = filterSpace
       ? config.spaces.filter((s) => s.host === filterSpace)
       : config.spaces;

apps/cli/src/commands/auth/switch.ts

@@ -2,12 +2,12 @@ import { UserError } from "@repo/cli-utils";
 import { loadConfig, writeConfig } from "@repo/config";
 import consola from "consola";
 import { BeeCommand } from "../../lib/bee-command";
+import * as opt from "../../lib/common-options";
 
 const switchSpace = new BeeCommand("switch")
   .summary("Switch active space")
   .description(`Changes which space is used by default when \`--space\` is not provided.`)
-  .option("-s, --space <hostname>", "The hostname of the Backlog space")
-  .envVars([["BACKLOG_SPACE", "Space hostname to switch to"]])
+  .addOption(opt.space())
   .examples([
     { description: "Select space via prompt", command: "bee auth switch" },
     {
@@ -18,7 +18,7 @@ const switchSpace = new BeeCommand("switch")
   .action(async (opts) => {
     const config = loadConfig();
 
-    let hostname = opts.space || process.env.BACKLOG_SPACE;
+    let hostname = opts.space;
 
     if (!hostname) {
       if (config.spaces.length === 0) {

apps/cli/src/commands/auth/token.test.ts

@@ -1,15 +1,18 @@
-import { resolveSpace } from "@repo/config";
+import { findSpace, loadConfig } from "@repo/config";
 import { describe, expect, it, vi } from "vitest";
 
 vi.mock("@repo/config", () => ({
   findSpace: vi.fn(),
   loadConfig: vi.fn(),
-  resolveSpace: vi.fn(),
 }));
 
 describe("auth token", () => {
   it("outputs API key to stdout", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    vi.mocked(loadConfig).mockReturnValue({
+      spaces: [{ host: "example.backlog.com", auth: { method: "api-key", apiKey: "my-api-key" } }],
+      defaultSpace: "example.backlog.com",
+    });
+    vi.mocked(findSpace).mockReturnValue({
       host: "example.backlog.com",
       auth: { method: "api-key", apiKey: "my-api-key" },
     });
@@ -26,7 +29,20 @@ describe("auth token", () => {
   });
 
   it("outputs OAuth token to stdout", async () => {
-    vi.mocked(resolveSpace).mockReturnValue({
+    vi.mocked(loadConfig).mockReturnValue({
+      spaces: [
+        {
+          host: "example.backlog.com",
+          auth: {
+            method: "oauth",
+            accessToken: "my-access-token",
+            refreshToken: "my-refresh-token",
+          },
+        },
+      ],
+      defaultSpace: "example.backlog.com",
+    });
+    vi.mocked(findSpace).mockReturnValue({
       host: "example.backlog.com",
       auth: { method: "oauth", accessToken: "my-access-token", refreshToken: "my-refresh-token" },
     });
@@ -43,7 +59,11 @@ describe("auth token", () => {
   });
 
   it("throws error when no space is configured", async () => {
-    vi.mocked(resolveSpace).mockReturnValue(null);
+    vi.mocked(loadConfig).mockReturnValue({
+      spaces: [],
+      defaultSpace: undefined,
+    });
+    vi.mocked(findSpace).mockReturnValue(null);
 
     const { default: token } = await import("./token");
     await expect(token.parseAsync([], { from: "user" })).rejects.toThrow(

apps/cli/src/commands/auth/token.ts

@@ -1,14 +1,14 @@
 import { UserError } from "@repo/cli-utils";
-import { findSpace, loadConfig, resolveSpace } from "@repo/config";
+import { findSpace, loadConfig } from "@repo/config";
 import { BeeCommand } from "../../lib/bee-command";
+import * as opt from "../../lib/common-options";
 
 const tokenCommand = new BeeCommand("token")
   .summary("Print the auth token to stdout")
   .description(
     `Prints the token for the default space, or the space given by \`--space\`. Useful for piping to other commands.`,
   )
-  .option("-s, --space <hostname>", "The hostname of the Backlog space")
-  .envVars([["BACKLOG_SPACE", "Default space hostname"]])
+  .addOption(opt.space())
   .examples([
     { description: "Print token for default space", command: "bee auth token" },
     {
@@ -22,7 +22,9 @@ const tokenCommand = new BeeCommand("token")
     },
   ])
   .action((opts) => {
-    const space = opts.space ? findSpace(loadConfig().spaces, opts.space) : resolveSpace();
+    const config = loadConfig();
+    const host = opts.space ?? config.defaultSpace;
+    const space = host ? findSpace(config.spaces, host) : null;
 
     if (!space) {
       throw new UserError("No space configured. Run `bee auth login` to authenticate.");