@trycadence/cli 0.1.4 → 0.1.7

package/dist/cadence

@@ -1466,6 +1466,9 @@ function createCadenceClient(options = {}) {
     },
     tickets: {
       get: (input) => rpc.tickets.get.query(input),
+      detail: (input) => rpc.tickets.detail.query(input),
+      activity: (input) => rpc.tickets.activity.query(input),
+      workLog: (input) => rpc.tickets.workLog.query(input),
       list: (input) => rpc.tickets.list.query(input),
       create: (input) => rpc.tickets.create.mutate(input),
       attach: (input) => rpc.tickets.attach.mutate(input),
@@ -1552,6 +1555,7 @@ var knownCommandPaths = [
   ["changesets", "create"],
   ["changesets", "list"],
   ["changesets", "get"],
+  ["changesets", "context"],
   ["changesets", "current"],
   ["changesets", "notes", "get"],
   ["changesets", "notes", "put"],
@@ -1574,6 +1578,7 @@ var knownCommandPaths = [
   ["events", "list"],
   ["work", "overview"],
   ["projects", "list"],
+  ["projects", "use"],
   ["init"],
   ["status"],
   ["help"]
@@ -1822,6 +1827,39 @@ async function findRepoCadenceDirectory(cwd) {
     current = parent;
   }
 }
+async function findRepoConfigDirectory(cwd) {
+  let current = cwd;
+  while (true) {
+    const repoConfig = join(current, ".cadence", "config.json");
+    if (await Bun.file(repoConfig).exists()) {
+      return join(current, ".cadence");
+    }
+    const parent = dirname(current);
+    if (parent === current) {
+      return null;
+    }
+    current = parent;
+  }
+}
+function resolveGitRootFromCommand(cwd) {
+  const result = spawnSync("git", ["rev-parse", "--show-toplevel"], {
+    cwd,
+    encoding: "utf8"
+  });
+  if (result.status !== 0) {
+    return null;
+  }
+  return result.stdout.trim() || null;
+}
+async function repoConfigPathForWrite(options) {
+  const cwd = options.cwd ?? process.cwd();
+  const existingConfigDirectory = await findRepoConfigDirectory(cwd);
+  if (existingConfigDirectory) {
+    return join(existingConfigDirectory, "config.json");
+  }
+  const gitRoot = options.resolveGitRoot ? await options.resolveGitRoot() : resolveGitRootFromCommand(cwd);
+  return join(gitRoot ?? cwd, ".cadence", "config.json");
+}
 function getConfigHome(env) {
   return env.CADENCE_CONFIG_HOME ?? (env.HOME ? join(env.HOME, ".config", "cadence") : join(parse(process.cwd()).root, ".config", "cadence"));
 }
@@ -1839,16 +1877,13 @@ async function resolveCliConfig(flags, options = {}) {
     repoConfigPromise,
     localConfigPromise
   ]);
-  const profiles = {
-    ...globalConfig.profiles ?? {},
-    ...repoConfig.profiles ?? {},
-    ...localConfig.profiles ?? {}
-  };
   const envProfile = env.CADENCE_PROFILE;
   const profile = envProfile ?? localConfig.profile ?? repoConfig.profile ?? globalConfig.profile ?? null;
-  const profileConfig = profile ? profiles[profile] : undefined;
-  const server = flags.server ?? env.CADENCE_SERVER ?? localConfig.server ?? profileConfig?.server ?? repoConfig.server ?? globalConfig.server ?? defaultCliApiBaseUrl;
-  const webBaseUrl = env.CADENCE_WEB_BASE_URL ?? localConfig.webBaseUrl ?? profileConfig?.webBaseUrl ?? repoConfig.webBaseUrl ?? globalConfig.webBaseUrl ?? deriveWebBaseUrl(server);
+  const globalProfileConfig = profile ? globalConfig.profiles?.[profile] : undefined;
+  const repoProfileConfig = profile ? repoConfig.profiles?.[profile] : undefined;
+  const localProfileConfig = profile ? localConfig.profiles?.[profile] : undefined;
+  const server = flags.server ?? env.CADENCE_SERVER ?? localConfig.server ?? localProfileConfig?.server ?? repoConfig.server ?? repoProfileConfig?.server ?? globalProfileConfig?.server ?? globalConfig.server ?? defaultCliApiBaseUrl;
+  const webBaseUrl = env.CADENCE_WEB_BASE_URL ?? localConfig.webBaseUrl ?? localProfileConfig?.webBaseUrl ?? repoConfig.webBaseUrl ?? repoProfileConfig?.webBaseUrl ?? globalProfileConfig?.webBaseUrl ?? globalConfig.webBaseUrl ?? deriveWebBaseUrl(server);
   const projectId = flags.project ?? localConfig.projectId ?? repoConfig.projectId ?? globalConfig.projectId ?? null;
   return {
     server,
@@ -1977,16 +2012,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);
@@ -2098,6 +2163,7 @@ function helpText() {
     "  cadence actors ensure-workspace-agent --agent-kind <kind> [--workspace-name <name>] [--workspace-ref <ref>] [--display-name <name>] [--project <project-id>] [--json]",
     "  cadence status [--project <project-id>] [--json]",
     "  cadence projects list [--json]",
+    "  cadence projects use <project-id|org/project> [--server <url>] [--json]",
     "  cadence work overview [--project <project-id>] [--json]",
     "  cadence tickets get <ticket-id> [--project <project-id>] [--json]",
     "  cadence tickets list [--project <project-id>] [--status <status>] [--json]",
@@ -2112,10 +2178,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]",
@@ -2124,7 +2191,7 @@ function helpText() {
     "  cadence events list [--project <project-id>] [--ticket <ticket-id>] [--changeset <changeset-id>] [--session <session-id>] [--json]",
     "",
     "Global flags:",
-    "  --project <id>       Cadence project ID or org/project slug",
+    "  --project <id|org/project> Cadence project ID or org/project slug",
     "  --server <url>       Cadence API server override",
     "  --json               Print stable JSON envelope",
     "",
@@ -2173,7 +2240,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);
@@ -2410,8 +2477,21 @@ async function runStatus(parsed, options) {
       exitCode: 0
     };
   }
+  const projectLabel = config.projectId ?? "not configured";
+  const profileLabel = config.profile ?? "default";
+  const credentialLabel = credential ? "configured" : "not configured";
   return {
-    stdout: `Cadence API ${health.ok ? "ok" : "unavailable"} at ${config.server}
+    stdout: [
+      `Cadence API: ${health.ok ? "ok" : "unavailable"} at ${config.server}`,
+      `Cadence web: ${webBaseUrl}`,
+      `Profile: ${profileLabel}`,
+      `Project: ${projectLabel}`,
+      `Credential: ${credentialLabel}`,
+      `Repo config: ${config.repoConfigPath ?? "not found"}`,
+      `Local config: ${config.localConfigPath ?? "not found"}`,
+      `Global config: ${config.globalConfigPath}`
+    ].join(`
+`) + `
 `,
     stderr: "",
     exitCode: 0
@@ -2419,7 +2499,7 @@ async function runStatus(parsed, options) {
 }
 async function runInit(parsed, options) {
   const cwd = options.cwd ?? process.cwd();
-  const repoConfigPath = join(cwd, ".cadence", "config.json");
+  const repoConfigPath = await repoConfigPathForWrite(options);
   const config = await resolveCliConfig(parsed.flags, {
     ...options,
     cwd
@@ -2477,6 +2557,15 @@ async function resolveProjectReference(projectReference, client) {
     projectSlug
   });
 }
+async function resolveRequiredProject(config, client) {
+  return await resolveProjectReference(requireProjectId(config), client);
+}
+function configWithProject(config, project) {
+  return {
+    ...config,
+    projectId: project.id
+  };
+}
 function formatProjectChoice(project, index) {
   const slug = project.orgSlug && project.projectSlug ? `${project.orgSlug}/${project.projectSlug}` : project.id;
   const name = project.name ? ` ${project.name}` : "";
@@ -2561,14 +2650,20 @@ 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);
+        const projectConfigured = Boolean(config.projectId);
+        if (!projectConfigured) {
+          await writeInteractiveStatus("No Cadence project is configured for this repo. Run cadence init to choose one.", options);
+        }
         data = {
           server: config.server,
           credentialStored: true,
+          projectConfigured,
           globalConfigPath: config.globalConfigPath,
-          loginUrl: challenge.loginUrl
+          loginUrl: challenge.loginUrl,
+          ...!projectConfigured ? { nextCommand: "cadence init" } : {}
         };
       }
       break;
@@ -2590,7 +2685,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
@@ -2615,9 +2710,11 @@ async function runAuthCommand(parsed, options) {
 }
 async function runReadCommand(parsed, options) {
   const config = await resolveCliConfig(parsed.flags, options);
-  const projectId = requireProjectId(config);
   const client = await createClient(config, options);
-  const meta = commandMeta(parsed, config);
+  const project = await resolveRequiredProject(config, client);
+  const resolvedConfig = configWithProject(config, project);
+  const projectId = project.id;
+  const meta = commandMeta(parsed, resolvedConfig);
   let data;
   switch (parsed.command.name) {
     case "events.list":
@@ -2674,6 +2771,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,
@@ -2711,18 +2816,47 @@ async function runReadCommand(parsed, options) {
 async function runProjectCommand(parsed, options) {
   const config = await resolveCliConfig(parsed.flags, options);
   const client = await createClient(config, options);
-  const meta = commandMeta(parsed, config);
   let data;
+  let outputConfig = config;
   switch (parsed.command.name) {
     case "projects.list":
       data = await client.projects.list();
       break;
+    case "projects.use":
+      {
+        const project = await resolveProjectReference(requireArg(parsed, 0, "<project-id|org/project>"), client);
+        const repoConfigPath = await repoConfigPathForWrite(options);
+        const updates = {
+          projectId: project.id,
+          ...parsed.flags.server ? { server: parsed.flags.server } : {}
+        };
+        await mergeConfigFile(repoConfigPath, updates);
+        outputConfig = configWithProject(config, project);
+        data = {
+          repoConfigPath,
+          projectId: project.id,
+          project,
+          ...parsed.flags.server ? { server: parsed.flags.server } : {}
+        };
+      }
+      break;
     default:
       throw new CliError("CLI_USAGE", `Unknown command: ${parsed.command.path.join(" ")}`);
   }
   if (parsed.flags.json) {
     return {
-      stdout: formatJson(successEnvelope(data, meta)),
+      stdout: formatJson(successEnvelope(data, commandMeta(parsed, outputConfig))),
+      stderr: "",
+      exitCode: 0
+    };
+  }
+  if (parsed.command.name === "projects.use") {
+    const project = data;
+    const slug = project.project?.orgSlug && project.project.projectSlug ? `${project.project.orgSlug}/${project.project.projectSlug}` : project.projectId;
+    const name = project.project?.name ? ` (${project.project.name})` : "";
+    return {
+      stdout: `Using Cadence project ${slug}${name}.
+`,
       stderr: "",
       exitCode: 0
     };
@@ -2737,11 +2871,13 @@ async function runProjectCommand(parsed, options) {
 async function runActorCommand(parsed, options) {
   const config = await resolveCliConfig(parsed.flags, options);
   const client = await createClient(config, options);
-  const meta = commandMeta(parsed, config);
+  const project = await resolveRequiredProject(config, client);
+  const resolvedConfig = configWithProject(config, project);
+  const meta = commandMeta(parsed, resolvedConfig);
   let data;
   switch (parsed.command.name) {
     case "actors.ensure-workspace-agent":
-      data = await ensureWorkspaceAgentIdentity(parsed, config, client, options);
+      data = await ensureWorkspaceAgentIdentity(parsed, resolvedConfig, client, options);
       break;
     default:
       throw new CliError("CLI_USAGE", `Unknown command: ${parsed.command.path.join(" ")}`);
@@ -2762,9 +2898,11 @@ async function runActorCommand(parsed, options) {
 }
 async function runIntakeCommand(parsed, options) {
   const config = await resolveCliConfig(parsed.flags, options);
-  const projectId = requireProjectId(config);
   const client = await createClient(config, options);
-  const meta = commandMeta(parsed, config);
+  const project = await resolveRequiredProject(config, client);
+  const resolvedConfig = configWithProject(config, project);
+  const projectId = project.id;
+  const meta = commandMeta(parsed, resolvedConfig);
   let data;
   const ifVersion = () => parseRequiredPositiveInteger(requireOption(parsed, "if-version"), "--if-version");
   switch (parsed.command.name) {
@@ -2944,7 +3082,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 +3147,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,10 +3196,10 @@ 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") {
+    if (parsed.command.name === "projects.list" || parsed.command.name === "projects.use") {
       return await runProjectCommand(parsed, options);
     }
     if (parsed.command.name === "intake" || parsed.command.name === "intake.dismiss" || parsed.command.name === "tickets.attach" || parsed.command.name === "tickets.create" || parsed.command.name === "tickets.update" || parsed.command.name === "tickets.claim" || parsed.command.name === "tickets.release" || parsed.command.name === "tickets.log" || parsed.command.name === "tickets.complete" || parsed.command.name === "sessions.start" || parsed.command.name === "sessions.end" || parsed.command.name === "sessions.files" || parsed.command.name === "changesets.create" || parsed.command.name === "changesets.notes.put" || parsed.command.name === "changesets.notes.apply") {

package/package.json

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