linear-sdk-cli 0.4.0 → 0.5.1

package/src/commands/meta.ts

@@ -12,7 +12,7 @@ import {
   writeCredential,
   probeKeyringCredential,
   adoptKeyringCredential,
-  removeCredential,
+  removeCredentialWithMetadata,
   removeOAuthCredential,
   setDefaultWorkspace,
   listCredentials,
@@ -24,15 +24,17 @@ import {
   defaultProjectConfigPath,
   assertSettableKey,
   setConfigKey,
+  setWorkspaceTeam,
   initProjectConfig,
   SETTABLE_KEYS,
   type SettableKey,
 } from "../config.js";
 import { keyring } from "../lib/keyring.js";
 import { readStdinSync } from "../lib/body.js";
-import { authError, normalizeError, usageError } from "../lib/errors.js";
+import { CliError, authError, normalizeError, usageError } from "../lib/errors.js";
 import { confirmDestructive, promptSelect } from "../lib/prompt.js";
 import { listTeams } from "../services/team.js";
+import { resolveTeam } from "../lib/resolve.js";
 import { ISSUE_SORTS } from "../services/issue.js";
 import { firstTeam, type Context } from "../context.js";
 import { openUrl } from "../lib/open.js";
@@ -105,6 +107,31 @@ export function setAuthValidationClientFactoryForTests(
   authValidationClientFactory = factory ?? defaultAuthValidationClientFactory;
 }
 
+type WorkspaceTeamValidator = (ctx: Context, workspace: string, team: string) => Promise<string>;
+
+/** Validate that an effective credential and team both belong to the requested workspace. */
+export const validateWorkspaceTeam: WorkspaceTeamValidator = async (ctx, workspace, team) => {
+  const [organization, resolved] = await Promise.all([
+    withRetry(() => ctx.client.organization),
+    resolveTeam(ctx.client, team, undefined),
+  ]);
+  if (organization.urlKey !== workspace) {
+    throw usageError(
+      `--workspace '${workspace}' does not match the credential's workspace '${organization.urlKey}'.`,
+    );
+  }
+  return resolved.key;
+};
+
+let workspaceTeamValidator = validateWorkspaceTeam;
+
+/** Test seam for profile-team validation; production always checks Linear. */
+export function setWorkspaceTeamValidatorForTests(
+  validator: WorkspaceTeamValidator | undefined,
+): void {
+  workspaceTeamValidator = validator ?? validateWorkspaceTeam;
+}
+
 /** Merge the local and global login spellings without silently choosing one. */
 export function selectLoginKey(
   localKey: string | undefined,
@@ -150,6 +177,21 @@ export async function validateAuthCredential(
   };
 }
 
+/** Bind a completed login using the same project location rules as `config set`. */
+function saveLoginProject(ctx: Context, workspace: string, project: boolean): string | null {
+  if (!project) return null;
+  const path = ctx.config.projectConfigPath ?? defaultProjectConfigPath();
+  try {
+    setConfigKey(path, "workspace", workspace);
+  } catch {
+    throw new CliError(
+      `Credentials saved for workspace '${workspace}', but its project association could not be saved to ${path}. Fix the project file and run \`linear config set workspace ${workspace}\`; login does not need to be repeated.`,
+      "runtime",
+    );
+  }
+  return path;
+}
+
 function explicitWorkspaceSlug(input: string): string {
   const slug = input.trim();
   if (!/^[a-z0-9](?:[a-z0-9-]{0,98}[a-z0-9])?$/.test(slug)) {
@@ -175,7 +217,8 @@ export function registerMeta(program: Command): void {
   // login -------------------------------------------------------------------
   auth
     .command("login")
-    .description("Authenticate in the browser with OAuth, or store a personal API key")
+    .description("Authenticate and select the workspace for this project")
+    .option("--no-project", "save credentials without changing the project workspace")
     .option("--key <key>", "use a personal API key ('-' reads it from stdin)")
     .option("--plaintext", "Store the key in the config file (0600) instead of the system keyring")
     .option("--no-browser", "print the authorization URL instead of opening it")
@@ -214,6 +257,7 @@ export function registerMeta(program: Command): void {
           const { path, storage, keyringLabel } = writeCredential(org.urlKey, key, {
             plaintext: opts.plaintext === true,
           });
+          const projectConfigPath = saveLoginProject(ctx, org.urlKey, opts.project !== false);
           const where =
             storage === "keychain"
               ? `Credential saved to the ${keyringLabel}; ${path} records the workspace.`
@@ -226,10 +270,11 @@ export function registerMeta(program: Command): void {
               user: me,
               storage,
               path,
+              projectConfigPath,
             },
             () =>
               ctx.output.success(
-                `Authenticated as ${me.name} <${me.email}> for workspace '${org.urlKey}'. ${where}`,
+                `Authenticated as ${me.name} <${me.email}> for workspace '${org.urlKey}'. ${where}${projectConfigPath ? ` Project workspace saved to ${projectConfigPath}.` : ""}`,
               ),
           );
           return;
@@ -300,6 +345,11 @@ export function registerMeta(program: Command): void {
             user: identity.user,
           };
           const saved = writeOAuthCredential(credential);
+          const projectConfigPath = saveLoginProject(
+            ctx,
+            credential.workspace.urlKey,
+            opts.project !== false,
+          );
           ctx.output.emit(
             {
               success: true,
@@ -310,10 +360,11 @@ export function registerMeta(program: Command): void {
               scopes: credential.scopes,
               expiresAt: new Date(credential.expiresAt).toISOString(),
               path: saved.path,
+              projectConfigPath,
             },
             () =>
               ctx.output.success(
-                `Authenticated as ${credential.user.name} <${credential.user.email}> for workspace '${credential.workspace.urlKey}'. OAuth credentials saved to the ${saved.keyringLabel}.`,
+                `Authenticated as ${credential.user.name} <${credential.user.email}> for workspace '${credential.workspace.urlKey}'. OAuth credentials saved to the ${saved.keyringLabel}.${projectConfigPath ? ` Project workspace saved to ${projectConfigPath}.` : ""}`,
               ),
           );
         } finally {
@@ -428,6 +479,7 @@ export function registerMeta(program: Command): void {
     .action(
       action(async (ctx) => {
         const c = ctx.config;
+        if (c.workspaceChoices) throw c.apiKeyError;
         const credential = c.accessToken ?? c.apiKey;
         const credentialType = c.oauthCredential
           ? "oauth-user"
@@ -529,7 +581,7 @@ export function registerMeta(program: Command): void {
         const local =
           entry?.credentialType === "oauth-user"
             ? removeOAuthCredential(slug)
-            : { removed: removeCredential(slug), fallbackCredentialType: null };
+            : { ...removeCredentialWithMetadata(slug), fallbackCredentialType: null };
         ctx.output.emit(
           {
             success: true,
@@ -537,11 +589,12 @@ export function registerMeta(program: Command): void {
             removed: local.removed,
             revocation,
             fallbackCredentialType: local.fallbackCredentialType,
+            teamMetadataRemoved: local.teamMetadataRemoved,
           },
           () =>
             local.removed
               ? ctx.output.success(
-                  `Removed workspace '${slug}'.${revocation === "revoked" ? " OAuth access was revoked." : revocation === "already-revoked" ? " OAuth access was already revoked." : ""}${local.fallbackCredentialType ? " The existing personal API-key profile is active again." : ""}`,
+                  `Removed workspace '${slug}'.${revocation === "revoked" ? " OAuth access was revoked." : revocation === "already-revoked" ? " OAuth access was already revoked." : ""}${local.fallbackCredentialType ? " The existing personal API-key profile is active again." : ""}${local.teamMetadataRemoved ? " Its default team metadata was removed." : ""}`,
                 )
               : ctx.output.info(`No credential for workspace '${slug}' to remove.`),
         );
@@ -589,6 +642,7 @@ export function registerMeta(program: Command): void {
             accessToken: redactKey(c.accessToken),
             accessTokenSource: c.accessTokenSource,
             credentialWorkspace: c.credentialWorkspace ?? null,
+            workspaceProfile: c.workspaceProfile ?? null,
             team: c.team ?? null,
             workspace: c.workspace ?? null,
             sort: c.sort,
@@ -601,6 +655,7 @@ export function registerMeta(program: Command): void {
             ["API key", `${redactKey(c.apiKey)} (${c.apiKeySource})`],
             ["OAuth access token", `${redactKey(c.accessToken)} (${c.accessTokenSource})`],
             ["Credential workspace", c.credentialWorkspace ?? "(none)"],
+            ["Workspace profile", c.workspaceProfile ?? "(none)"],
             ["Team", show("team", c.team)],
             ["Workspace", show("workspace", c.workspace)],
             ["Sort", show("sort", c.sort)],
@@ -630,6 +685,7 @@ export function registerMeta(program: Command): void {
           if (!ctx.isTTY) {
             throw usageError("Pass --team <key>; there is no terminal to choose one from.");
           }
+          await ctx.selectWorkspace();
           const teams = await listTeams(ctx.client, Infinity);
           if (teams.length === 0) throw usageError("This workspace has no teams to choose from.");
           team = await promptSelect(
@@ -656,8 +712,8 @@ export function registerMeta(program: Command): void {
   // set ---------------------------------------------------------------------
   config
     .command("set <key> <value>")
-    .description(`Set one project setting (${SETTABLE_KEYS.join(", ")}) in the project config`)
-    .option("--user", "write the user config (~/.config/linear/config.toml) instead")
+    .description(`Set one project or user setting (${SETTABLE_KEYS.join(", ")})`)
+    .option("--user", "write the user config (team + --workspace targets that workspace profile)")
     .option("--path <file>", "write this file instead of the project config in effect")
     .action(
       action(async (ctx: Context, opts, key: string, value: string) => {
@@ -676,10 +732,26 @@ export function registerMeta(program: Command): void {
           // here — or a fresh .linear.toml at the git root if there is none.
           path = ctx.config.projectConfigPath ?? defaultProjectConfigPath();
         }
-        const spelling = setConfigKey(path, key, clean, { mode });
-        ctx.output.emit({ success: true, path, key: spelling, value: clean }, () =>
-          ctx.output.success(`Set ${spelling} = ${JSON.stringify(clean)} in ${path}`),
-        );
+        const profileWorkspace = opts.user && key === "team" ? ctx.options.workspace : undefined;
+        if (profileWorkspace) {
+          let team = clean;
+          if (ctx.config.apiKey || ctx.config.accessToken) {
+            team = await workspaceTeamValidator(ctx, profileWorkspace, clean);
+          }
+          path = setWorkspaceTeam(profileWorkspace, team);
+          ctx.output.emit(
+            { success: true, path, key: "team", value: team, workspace: profileWorkspace },
+            () =>
+              ctx.output.success(
+                `Set team = ${JSON.stringify(team)} for workspace '${profileWorkspace}' in ${path}`,
+              ),
+          );
+        } else {
+          const spelling = setConfigKey(path, key, clean, { mode });
+          ctx.output.emit({ success: true, path, key: spelling, value: clean }, () =>
+            ctx.output.success(`Set ${spelling} = ${JSON.stringify(clean)} in ${path}`),
+          );
+        }
       }),
     );
 }

package/src/commands/notification.ts

@@ -9,9 +9,11 @@ import type { Context } from "../context.js";
 import * as svc from "../services/notification.js";
 import type { Column } from "../output/table.js";
 import { ExitCode } from "../lib/errors.js";
+import { addIncludeArchivedOption } from "../lib/options.js";
+import { lifecycleSuffix } from "../output/lifecycle.js";
 
 const ROW_COLUMNS: Column<svc.NotificationRow>[] = [
-  { key: "type", header: "Type", value: (r) => r.type, max: 24 },
+  { key: "type", header: "Type", value: (r) => `${r.type}${lifecycleSuffix(r)}`, max: 36 },
   { key: "subject", header: "Subject", value: (r) => r.subject ?? "—", max: 50 },
   { key: "read", header: "Read", value: (r) => (r.read ? "✓" : "•") },
   { key: "createdAt", header: "Created", value: (r) => r.createdAt.slice(0, 10) },
@@ -24,17 +26,17 @@ export function registerNotification(program: Command): void {
     .description("Work with your notifications");
 
   // list --------------------------------------------------------------------
-  notification
+  const list = notification
     .command("list")
     .alias("ls")
     .description("List your notifications")
-    .option("--include-archived", "include archived notifications")
     .action(
       action(async (ctx: Context, opts) => {
         const rows = await svc.listNotifications(ctx.client, ctx.limit, !!opts.includeArchived);
         ctx.output.list(rows, ROW_COLUMNS, rows);
       }),
     );
+  addIncludeArchivedOption(list);
 
   // read --------------------------------------------------------------------
   notification

package/src/commands/open.ts

@@ -46,11 +46,12 @@ async function resolveOpenTarget(
   ctx: Context,
   target: string | undefined,
 ): Promise<{ target: OpenTarget; url: string; label: string }> {
+  if (target && URL.test(target)) return { target: "url", url: target, label: target };
+  await ctx.selectWorkspace();
   if (!target) {
     const org = await getOrganizationDetail(ctx.client);
     return { target: "workspace", url: `https://linear.app/${org.urlKey}`, label: org.name };
   }
-  if (URL.test(target)) return { target: "url", url: target, label: target };
   if (target.startsWith("team:")) {
     const team = await resolveTeam(ctx.client, target.slice("team:".length), ctx.defaultTeam);
     const org = await getOrganizationDetail(ctx.client);

package/src/commands/project.ts

@@ -4,7 +4,13 @@
 
 import { Command, Option } from "commander";
 import { action } from "../lib/action.js";
-import { parseList, parseIntOption, addAliasOption, readAlias } from "../lib/options.js";
+import {
+  parseList,
+  parseIntOption,
+  addAliasOption,
+  readAlias,
+  addIncludeArchivedOption,
+} from "../lib/options.js";
 import { usageError } from "../lib/errors.js";
 import { resolveBody } from "../lib/body.js";
 import { confirmDestructive, promptInput } from "../lib/prompt.js";
@@ -12,10 +18,16 @@ import type { Context } from "../context.js";
 import * as svc from "../services/project.js";
 import { formatMilestoneProgress } from "./milestone.js";
 import type { Column } from "../output/table.js";
+import { lifecycleSuffix } from "../output/lifecycle.js";
 
 const ROW_COLUMNS: Column<svc.ProjectRow>[] = [
   { key: "name", header: "Name", value: (r) => r.name, max: 36 },
-  { key: "state", header: "State", value: (r) => r.status?.name ?? r.state ?? "—", max: 14 },
+  {
+    key: "state",
+    header: "State",
+    value: (r) => `${r.status?.name ?? r.state ?? "—"}${lifecycleSuffix(r)}`,
+    max: 26,
+  },
   { key: "progress", header: "Progress", value: (r) => formatProgress(r.progress) },
   { key: "lead", header: "Lead", value: (r) => r.lead?.displayName ?? "—", max: 16 },
   { key: "target", header: "Target", value: (r) => r.targetDate ?? "—" },
@@ -72,6 +84,7 @@ export function registerProject(program: Command): void {
             team: opts.allTeams ? undefined : (opts.team ?? ctx.defaultTeam),
             allTeams: !!opts.allTeams,
             state: readAlias(opts, "--state", "--status"),
+            includeArchived: !!opts.includeArchived,
           },
           ctx.limit,
           ctx.defaultTeam,
@@ -79,6 +92,7 @@ export function registerProject(program: Command): void {
         ctx.output.list(rows, ROW_COLUMNS, rows);
       }),
     );
+  addIncludeArchivedOption(list);
   // `--status` is the reference CLI's spelling for the same thing; it shipped
   // earlier as a visible duplicate and now goes through the shared alias
   // mechanism, so `--help` shows one canonical spelling here like everywhere else.
@@ -94,7 +108,11 @@ export function registerProject(program: Command): void {
         const detail = await svc.getProjectDetail(ctx.client, idArg);
         ctx.output.detail(detail, [
           ["Project", detail.name],
-          ["Archived", detail.archivedAt ? `YES (${detail.archivedAt})` : null],
+          [
+            "Trashed",
+            detail.trashed ? `YES (deleted ${detail.archivedAt ?? "at an unknown time"})` : null,
+          ],
+          ["Archived", !detail.trashed && detail.archivedAt ? `YES (${detail.archivedAt})` : null],
           ["State", detail.status?.name ?? detail.state],
           ["Health", detail.health],
           ["Progress", detail.progress !== null ? formatProgress(detail.progress) : null],