@trycadence/cli 0.1.3 → 0.1.6

package/dist/cadence

@@ -1552,6 +1552,7 @@ var knownCommandPaths = [
   ["changesets", "create"],
   ["changesets", "list"],
   ["changesets", "get"],
+  ["changesets", "context"],
   ["changesets", "current"],
   ["changesets", "notes", "get"],
   ["changesets", "notes", "put"],
@@ -1977,16 +1978,46 @@ async function readStoredCredential(store, server) {
   if (!await store.isAvailable()) {
     return null;
   }
-  const rawCredential = await store.getCredential(server);
-  return rawCredential ? decodeCredential(rawCredential) : null;
+  for (const key of credentialStoreKeysForServer(server)) {
+    const rawCredential = await store.getCredential(key);
+    if (rawCredential) {
+      return decodeCredential(rawCredential);
+    }
+  }
+  return null;
 }
-function normalizeServerForCredentialLock(server) {
+async function writeStoredCredential(store, server, credential) {
+  await store.setCredential(normalizeServerForCredentialStore(server), encodeCredential(credential));
+}
+async function deleteStoredCredential(store, server) {
+  for (const key of credentialStoreKeysForServer(server)) {
+    await store.deleteCredential(key);
+  }
+}
+function normalizeServerForCredentialStore(server) {
   try {
     return new URL(server).toString().replace(/\/$/, "");
   } catch {
     return server.trim();
   }
 }
+function credentialStoreKeysForServer(server) {
+  const keys = [normalizeServerForCredentialStore(server)];
+  const trimmed = server.trim();
+  if (trimmed && !keys.includes(trimmed)) {
+    keys.push(trimmed);
+  }
+  try {
+    const serialized = new URL(trimmed).toString();
+    if (!keys.includes(serialized)) {
+      keys.push(serialized);
+    }
+  } catch {}
+  return keys;
+}
+function normalizeServerForCredentialLock(server) {
+  return normalizeServerForCredentialStore(server);
+}
 function credentialRefreshLockPath(config) {
   const normalizedServer = normalizeServerForCredentialLock(config.server);
   const serverHash = createHash("sha256").update(normalizedServer).digest("hex").slice(0, 24);
@@ -2112,10 +2143,11 @@ function helpText() {
     "  cadence sessions start --ticket <ticket-id> [--changeset <changeset-id>] [--actor <actor-id>] [--project <project-id>] [--json]",
     "  cadence sessions end <session-id> --summary <summary> [--project <project-id>] [--json]",
     "  cadence sessions files <session-id> --file <path> [--file <path>] [--kind <added|modified|deleted|renamed|unknown>] [--changeset <changeset-id>] [--project <project-id>] [--json]",
-    "  cadence changesets create --ticket <ticket-id> --branch <branch> [--base-branch <branch>] [--project <project-id>] [--json]",
+    "  cadence changesets create --ticket <ticket-id> --branch <branch> --base-branch <branch> [--project <project-id>] [--json]",
     "  cadence intake dismiss <intake-id> --reason <reason> [--project <project-id>] [--json]",
     "  cadence sessions current [--project <project-id>] [--ticket <ticket-id>] [--changeset <changeset-id>] [--json]",
     "  cadence changesets current [--branch current|<branch>] [--project <project-id>] [--json]",
+    "  cadence changesets context <changeset-id> [--project <project-id>] [--json]",
     "  cadence changesets get <changeset-id> [--project <project-id>] [--json]",
     "  cadence changesets list [--project <project-id>] [--ticket <ticket-id>] [--status <status>] [--json]",
     "  cadence changesets notes get [--changeset <id>|--branch current|<branch>] [--project <project-id>] [--json]",
@@ -2173,7 +2205,7 @@ async function readFreshAccessToken(config, store, authClient) {
       const refreshed = await authClient.auth.cli.refresh({
         refreshToken: lockedCredential.refreshToken
       });
-      await store.setCredential(config.server, encodeCredential(refreshed));
+      await writeStoredCredential(store, config.server, refreshed);
       return refreshed.accessToken;
     } catch (error) {
       const recoveredCredential = await readStoredCredential(store, config.server);
@@ -2189,12 +2221,12 @@ async function readFreshAccessToken(config, store, authClient) {
     await releaseCredentialRefreshLock(lock);
   }
 }
-async function createClient(config, options) {
+async function createClient(config, options, useStoredCredential = true) {
   if (options.client) {
     return options.client;
   }
   const store = getCredentialStore(options);
-  const credential = await readStoredCredential(store, config.server);
+  const credential = useStoredCredential ? await readStoredCredential(store, config.server) : null;
   const authClient = createCadenceClient({
     baseUrl: config.server,
     ...options.fetch ? { fetch: options.fetch } : {}
@@ -2527,7 +2559,7 @@ async function runAuthCommand(parsed, options) {
   switch (parsed.command.name) {
     case "auth.login":
       {
-        const client = await createClient(config, options);
+        const client = await createClient(config, options, false);
         const challenge = await client.auth.cli.start({
           loginBaseUrl: getCliWebBaseUrl(config, parsed, options)
         });
@@ -2561,7 +2593,7 @@ async function runAuthCommand(parsed, options) {
         if (poll.status === "denied") {
           throw new CliError("AUTH_LOGIN_DENIED", "Cadence browser login was denied.");
         }
-        await store.setCredential(config.server, encodeCredential(poll.credential));
+        await writeStoredCredential(store, config.server, poll.credential);
         await mergeConfigFile(config.globalConfigPath, { server: config.server });
         await writeInteractiveStatus("Cadence CLI login approved. Credential stored.", options);
         data = {
@@ -2590,7 +2622,7 @@ async function runAuthCommand(parsed, options) {
       break;
     case "auth.logout":
       await requireCredentialStore(store);
-      await store.deleteCredential(config.server);
+      await deleteStoredCredential(store, config.server);
       data = {
         server: config.server,
         credentialRemoved: true
@@ -2674,6 +2706,14 @@ async function runReadCommand(parsed, options) {
         query: await changesetLookupFromOptions(parsed, options)
       });
       break;
+    case "changesets.context":
+      data = await client.changesets.context({
+        projectId,
+        query: {
+          changesetId: requireArg(parsed, 0, "<changeset-id>")
+        }
+      });
+      break;
     case "changesets.list":
       data = await client.changesets.list({
         projectId,
@@ -2944,7 +2984,7 @@ async function runIntakeCommand(parsed, options) {
         changeset: {
           ticketId: requireOption(parsed, "ticket"),
           branchName: requireOption(parsed, "branch"),
-          baseBranch: parsed.options["base-branch"] ?? "main",
+          baseBranch: requireOption(parsed, "base-branch"),
           ...parsed.options.session ? { sessionId: parsed.options.session } : {},
           ...commandMetadata()
         }
@@ -3009,6 +3049,12 @@ function normalizeError(error) {
   if (error.message === "INTAKE_ALREADY_DECIDED" || error.message.includes("INTAKE_ALREADY_DECIDED")) {
     return new CliError("INTAKE_ALREADY_DECIDED", "INTAKE_ALREADY_DECIDED");
   }
+  if (typeof error === "object" && error !== null && "data" in error) {
+    const data = error.data;
+    if (data?.serviceDetails) {
+      return new CliError("API_ERROR", error.message || "Unexpected CLI error.", data.serviceDetails);
+    }
+  }
   return new CliError("API_ERROR", error.message || "Unexpected CLI error.");
 }
 function commandNameFromArgv(argv) {
@@ -3052,7 +3098,7 @@ async function runCli(argv, options = {}) {
     if (parsed.command.name === "auth.login" || parsed.command.name === "auth.status" || parsed.command.name === "auth.logout") {
       return await runAuthCommand(parsed, options);
     }
-    if (parsed.command.name === "events.list" || parsed.command.name === "work.overview" || parsed.command.name === "tickets.get" || parsed.command.name === "tickets.list" || parsed.command.name === "sessions.current" || parsed.command.name === "changesets.get" || parsed.command.name === "changesets.current" || parsed.command.name === "changesets.list" || parsed.command.name === "changesets.notes.get") {
+    if (parsed.command.name === "events.list" || parsed.command.name === "work.overview" || parsed.command.name === "tickets.get" || parsed.command.name === "tickets.list" || parsed.command.name === "sessions.current" || parsed.command.name === "changesets.get" || parsed.command.name === "changesets.context" || parsed.command.name === "changesets.current" || parsed.command.name === "changesets.list" || parsed.command.name === "changesets.notes.get") {
       return await runReadCommand(parsed, options);
     }
     if (parsed.command.name === "projects.list") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trycadence/cli",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "bin": {