@thanaen/ado-cli 0.2.0 → 0.3.0

package/README.md

@@ -37,8 +37,8 @@ On-prem / localserver example:
 ```bash
 export DEVOPS_PAT="***"
 export ADO_COLLECTION_URL="https://localserver/DefaultCollection"
-export ADO_PROJECT="UserLock"
-export ADO_REPO="Ulysse Interface"
+export ADO_PROJECT="ExampleProject"
+export ADO_REPO="Example Repository"
 export ADO_INSECURE=1
 ```
 
@@ -59,6 +59,9 @@ ado smoke
 
 ## Commands
 
+- `-v`, `--version`
+- `init [--local]`
+- `config`
 - `smoke`
 - `repos`
 - `branches [repo]`
@@ -71,6 +74,7 @@ ado smoke
 - `pr-get <id> [repo]`
 - `pr-create --title=... --source=... --target=... [--description=...] [--repo=...] [--work-items=123,456]`
 - `pr-update <id> [--title=...] [--description=...] [--repo=...] [--work-items=123,456]`
+- `pr-cherry-pick <id> --target=... [--topic=branch-name] [--repo=...]`
 - `pr-approve <id> [repo]`
 - `pr-autocomplete <id> [repo]`
 - `builds [top]`

package/dist/cli.js

@@ -57187,6 +57187,7 @@ import { homedir } from "node:os";
 var DEFAULT_COLLECTION_URL = "https://dev.azure.com/<your-org>";
 var DEFAULT_PROJECT = "<your-project>";
 var DEFAULT_REPO = "<your-repository>";
+var LOCAL_CONFIG_FILENAME = "ado.json";
 function isDefaultPlaceholder(value) {
   return value.includes("<your-");
 }
@@ -57211,23 +57212,46 @@ function loadFileConfig() {
     return {};
   }
 }
+function getLocalConfigFilePath() {
+  return join(process.cwd(), LOCAL_CONFIG_FILENAME);
+}
+function loadLocalConfig() {
+  const localPath = getLocalConfigFilePath();
+  if (!existsSync(localPath)) {
+    return {};
+  }
+  const content = readFileSync(localPath, "utf8");
+  try {
+    return JSON.parse(content);
+  } catch {
+    console.error(`Warning: could not parse local config file at ${localPath}. Please check the JSON syntax. Ignoring.`);
+    return {};
+  }
+}
+function censorPat(pat) {
+  if (pat.length <= 8) {
+    return "****";
+  }
+  return `${pat.slice(0, 4)}${"*".repeat(pat.length - 8)}${pat.slice(-4)}`;
+}
 function getConfig() {
   const fileConfig = loadFileConfig();
-  const pat = process.env.DEVOPS_PAT ?? fileConfig.pat;
+  const localConfig = loadLocalConfig();
+  const pat = process.env.DEVOPS_PAT ?? localConfig.pat ?? fileConfig.pat;
   if (!pat) {
     console.error("Missing DEVOPS_PAT environment variable or pat in config file.");
     console.error(`Run "ado init" to create a config file at ${getConfigFilePath()}`);
     process.exit(1);
   }
-  const collectionUrl = process.env.ADO_COLLECTION_URL ?? fileConfig.collectionUrl ?? DEFAULT_COLLECTION_URL;
-  const project = process.env.ADO_PROJECT ?? fileConfig.project ?? DEFAULT_PROJECT;
-  const repo = process.env.ADO_REPO ?? fileConfig.repo ?? DEFAULT_REPO;
+  const collectionUrl = process.env.ADO_COLLECTION_URL ?? localConfig.collectionUrl ?? fileConfig.collectionUrl ?? DEFAULT_COLLECTION_URL;
+  const project = process.env.ADO_PROJECT ?? localConfig.project ?? fileConfig.project ?? DEFAULT_PROJECT;
+  const repo = process.env.ADO_REPO ?? localConfig.repo ?? fileConfig.repo ?? DEFAULT_REPO;
   if (isDefaultPlaceholder(collectionUrl) || isDefaultPlaceholder(project) || isDefaultPlaceholder(repo)) {
     console.error("ADO configuration is incomplete. Set ADO_COLLECTION_URL, ADO_PROJECT, and ADO_REPO.");
     console.error(`You can also run "ado init" to create a config file at ${getConfigFilePath()}`);
     process.exit(1);
   }
-  const insecure = process.env.ADO_INSECURE === "1" || fileConfig.insecure === true;
+  const insecure = process.env.ADO_INSECURE === "1" || localConfig.insecure === true || fileConfig.insecure === true;
   if (insecure) {
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
   }
@@ -57341,6 +57365,42 @@ function buildRecentWorkItemsWiql(filters = {}) {
   return `SELECT [System.Id] FROM WorkItems${whereClause} ORDER BY [System.ChangedDate] DESC`;
 }
 
+// src/cherry-pick.ts
+function parseCherryPickArgs(args) {
+  const kv = Object.fromEntries(args.filter((a) => a.startsWith("--")).map((arg) => {
+    const [k, ...rest] = arg.split("=");
+    return [k.replace(/^--/, ""), rest.join("=")];
+  }));
+  const positionals = args.filter((a) => !a.startsWith("--"));
+  const prId = Number(positionals[0]);
+  if (!Number.isFinite(prId) || prId <= 0) {
+    throw new Error("A valid pull request ID is required as the first argument.");
+  }
+  const target = kv.target;
+  if (!target || target.trim().length === 0) {
+    throw new Error("--target is required.");
+  }
+  const allowedOptions = new Set(["target", "topic", "repo"]);
+  for (const key of Object.keys(kv)) {
+    if (!allowedOptions.has(key)) {
+      throw new Error(`Unknown option: --${key}`);
+    }
+  }
+  return {
+    prId,
+    target: target.trim(),
+    topic: kv.topic?.trim() || undefined,
+    repo: kv.repo?.trim() || undefined
+  };
+}
+function buildGeneratedRefName(prId, target, topic) {
+  if (topic) {
+    return topic.startsWith("refs/heads/") ? topic : `refs/heads/${topic}`;
+  }
+  const safeBranch = target.replace(/^refs\/heads\//, "");
+  return `refs/heads/cherry-pick-pr-${prId}-onto-${safeBranch}`;
+}
+
 // src/cli.ts
 var import_GitInterfaces = __toESM(require_GitInterfaces(), 1);
 var import_WorkItemTrackingInterfaces = __toESM(require_WorkItemTrackingInterfaces(), 1);
@@ -57766,43 +57826,137 @@ async function cmdPrUpdate(config, idRaw, args) {
     await linkWorkItemsToPr(config, repo, updated, workItemIds);
   }
 }
-async function cmdInit() {
+async function cmdPrCherryPick(config, args) {
+  const usage = "Usage: pr-cherry-pick <id> --target=main [--topic=branch-name] [--repo=...]";
+  let parsed;
+  try {
+    parsed = parseCherryPickArgs(args);
+  } catch (error) {
+    console.error(error instanceof Error ? error.message : String(error));
+    console.error(usage);
+    process.exit(1);
+  }
+  const repo = pickRepo(config, parsed.repo);
+  const gitApi = await config.connection.getGitApi();
+  const repository = await gitApi.getRepository(repo, config.project);
+  if (!repository?.id) {
+    console.error(`Repository "${repo}" not found.`);
+    process.exit(1);
+  }
+  const targetRef = parsed.target.startsWith("refs/") ? parsed.target : `refs/heads/${parsed.target}`;
+  const generatedRefName = buildGeneratedRefName(parsed.prId, parsed.target, parsed.topic);
+  const cherryPick = await gitApi.createCherryPick({
+    source: { pullRequestId: parsed.prId },
+    ontoRefName: targetRef,
+    generatedRefName,
+    repository: { id: repository.id }
+  }, config.project, repository.id);
+  let status = cherryPick.status;
+  const cherryPickId = cherryPick.cherryPickId;
+  if (cherryPickId == null) {
+    console.error("Cherry-pick operation could not be started.");
+    process.exit(1);
+  }
+  const MAX_POLL_ATTEMPTS = 30;
+  const POLL_INTERVAL_MS = 1000;
+  for (let attempt = 0;attempt < MAX_POLL_ATTEMPTS && (status === import_GitInterfaces.GitAsyncOperationStatus.Queued || status === import_GitInterfaces.GitAsyncOperationStatus.InProgress); attempt++) {
+    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
+    const result = await gitApi.getCherryPick(config.project, cherryPickId, repository.id);
+    status = result.status;
+  }
+  if (status === import_GitInterfaces.GitAsyncOperationStatus.Completed) {
+    console.log(`Cherry-pick of PR #${parsed.prId} completed. Branch created: ${generatedRefName.replace("refs/heads/", "")}`);
+  } else if (status === import_GitInterfaces.GitAsyncOperationStatus.Failed) {
+    console.error(`Cherry-pick of PR #${parsed.prId} failed.`);
+    process.exit(1);
+  } else {
+    console.error(`Cherry-pick of PR #${parsed.prId} did not complete in time (status: ${import_GitInterfaces.GitAsyncOperationStatus[status ?? 0] ?? "unknown"}).`);
+    process.exit(1);
+  }
+}
+async function cmdInit(args) {
+  const isLocal = args.includes("--local");
   const { createInterface } = await import("node:readline/promises");
   const { mkdirSync, writeFileSync, existsSync: existsSync2 } = await import("node:fs");
   const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const existing = loadFileConfig();
-  const configPath = getConfigFilePath();
-  console.log("Azure DevOps CLI — Configuration");
+  const existing = isLocal ? loadLocalConfig() : loadFileConfig();
+  const configPath = isLocal ? getLocalConfigFilePath() : getConfigFilePath();
+  console.log(`Azure DevOps CLI — ${isLocal ? "Local " : ""}Configuration`);
   console.log(`Config file: ${configPath}`);
   console.log(`Press Enter to keep existing values shown in brackets.
 `);
-  const pat = await rl.question(`Personal Access Token (PAT)${existing.pat ? " [****]" : ""}: `) || existing.pat || "";
-  const collectionUrl = await rl.question(`Collection URL${existing.collectionUrl ? ` [${existing.collectionUrl}]` : ""}: `) || existing.collectionUrl || "";
-  const project = await rl.question(`Project${existing.project ? ` [${existing.project}]` : ""}: `) || existing.project || "";
-  const repo = await rl.question(`Repository${existing.repo ? ` [${existing.repo}]` : ""}: `) || existing.repo || "";
-  const insecureInput = await rl.question(`Disable TLS verification (insecure)? (y/N)${existing.insecure ? " [y]" : ""}: `) || (existing.insecure ? "y" : "n");
-  const insecure = insecureInput.toLowerCase() === "y" || insecureInput === "1";
-  rl.close();
-  if (!pat || !collectionUrl || !project || !repo) {
-    console.error(`
+  if (isLocal) {
+    const collectionUrl = await rl.question(`Collection URL${existing.collectionUrl ? ` [${existing.collectionUrl}]` : ""}: `) || existing.collectionUrl || "";
+    const project = await rl.question(`Project${existing.project ? ` [${existing.project}]` : ""}: `) || existing.project || "";
+    const repo = await rl.question(`Repository${existing.repo ? ` [${existing.repo}]` : ""}: `) || existing.repo || "";
+    rl.close();
+    const config = {};
+    if (collectionUrl)
+      config.collectionUrl = collectionUrl;
+    if (project)
+      config.project = project;
+    if (repo)
+      config.repo = repo;
+    if (Object.keys(config).length === 0) {
+      console.error(`
+At least one field must be provided for local config.`);
+      process.exit(1);
+    }
+    writeFileSync(configPath, JSON.stringify(config, null, 2) + `
+`, "utf8");
+    console.log(`
+Local configuration saved to ${configPath}`);
+  } else {
+    const pat = await rl.question(`Personal Access Token (PAT)${existing.pat ? " [****]" : ""}: `) || existing.pat || "";
+    const collectionUrl = await rl.question(`Collection URL${existing.collectionUrl ? ` [${existing.collectionUrl}]` : ""}: `) || existing.collectionUrl || "";
+    const project = await rl.question(`Project${existing.project ? ` [${existing.project}]` : ""}: `) || existing.project || "";
+    const repo = await rl.question(`Repository${existing.repo ? ` [${existing.repo}]` : ""}: `) || existing.repo || "";
+    const insecureInput = await rl.question(`Disable TLS verification (insecure)? (y/N)${existing.insecure ? " [y]" : ""}: `) || (existing.insecure ? "y" : "n");
+    const insecure = insecureInput.toLowerCase() === "y" || insecureInput === "1";
+    rl.close();
+    if (!pat || !collectionUrl || !project || !repo) {
+      console.error(`
 All fields (PAT, Collection URL, Project, Repository) are required.`);
-    process.exit(1);
-  }
-  const config = { pat, collectionUrl, project, repo, insecure };
-  const configDir = getConfigDir();
-  if (!existsSync2(configDir)) {
-    mkdirSync(configDir, { recursive: true });
-  }
-  writeFileSync(configPath, JSON.stringify(config, null, 2) + `
+      process.exit(1);
+    }
+    const config = { pat, collectionUrl, project, repo, insecure };
+    const configDir = getConfigDir();
+    if (!existsSync2(configDir)) {
+      mkdirSync(configDir, { recursive: true });
+    }
+    writeFileSync(configPath, JSON.stringify(config, null, 2) + `
 `, "utf8");
-  console.log(`
+    console.log(`
 Configuration saved to ${configPath}`);
+  }
+}
+function cmdConfig() {
+  const fileConfig = loadFileConfig();
+  const localConfig = loadLocalConfig();
+  const pat = process.env.DEVOPS_PAT ?? localConfig.pat ?? fileConfig.pat;
+  const collectionUrl = process.env.ADO_COLLECTION_URL ?? localConfig.collectionUrl ?? fileConfig.collectionUrl;
+  const project = process.env.ADO_PROJECT ?? localConfig.project ?? fileConfig.project;
+  const repo = process.env.ADO_REPO ?? localConfig.repo ?? fileConfig.repo;
+  const insecure = process.env.ADO_INSECURE === "1" || localConfig.insecure === true || fileConfig.insecure === true;
+  console.log(JSON.stringify({
+    pat: pat ? censorPat(pat) : undefined,
+    collectionUrl: collectionUrl ?? undefined,
+    project: project ?? undefined,
+    repo: repo ?? undefined,
+    insecure,
+    sources: {
+      globalConfig: getConfigFilePath(),
+      localConfig: getLocalConfigFilePath()
+    }
+  }, null, 2));
 }
 function printHelp() {
   console.log(`Azure DevOps CLI
 
 Commands:
-  init
+  -v, --version
+  init [--local]
+  config
   smoke
   repos
   branches [repo]
@@ -57815,19 +57969,33 @@ Commands:
   pr-get <id> [repo]
   pr-create --title=... --source=... --target=... [--description=...] [--repo=...] [--work-items=123,456]
   pr-update <id> [--title=...] [--description=...] [--repo=...] [--work-items=123,456]
+  pr-cherry-pick <id> --target=... [--topic=branch-name] [--repo=...]
   pr-approve <id> [repo]
   pr-autocomplete <id> [repo]
   builds [top]
 `);
 }
+async function printVersion() {
+  const pkgPath = new URL("../package.json", import.meta.url);
+  const pkg = JSON.parse(await readFile(pkgPath, "utf8"));
+  console.log(pkg.version);
+}
 async function main() {
   const [command = "smoke", ...args] = process.argv.slice(2);
   if (command === "help" || command === "--help" || command === "-h") {
     printHelp();
     return;
   }
+  if (command === "-v" || command === "--version") {
+    await printVersion();
+    return;
+  }
   if (command === "init") {
-    await cmdInit();
+    await cmdInit(args);
+    return;
+  }
+  if (command === "config") {
+    cmdConfig();
     return;
   }
   const config = getConfig();
@@ -57868,6 +58036,9 @@ async function main() {
     case "pr-update":
       await cmdPrUpdate(config, args[0], args.slice(1));
       break;
+    case "pr-cherry-pick":
+      await cmdPrCherryPick(config, args);
+      break;
     case "pr-approve":
       await cmdPrApprove(config, args[0], args[1]);
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thanaen/ado-cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Lightweight Azure DevOps CLI for repos, work items, pull requests, and builds",
   "repository": {
     "type": "git",

package/skills/ado-workflows/SKILL.md

@@ -19,6 +19,9 @@ If auth is missing, stop and ask for `DEVOPS_PAT`.
 
 ## Core commands
 
+- Initialize global config: `ado init`
+- Initialize local (per-project) config: `ado init --local`
+- Show resolved config: `ado config`
 - List repos: `ado repos`
 - List branches: `ado branches "MyRepo"`
 - Get work item: `ado workitem-get <id>`
@@ -32,6 +35,7 @@ If auth is missing, stop and ask for `DEVOPS_PAT`.
 - Get PR: `ado pr-get <id> "MyRepo"`
 - Create PR: `ado pr-create --title="..." --source="feature/x" --target="develop" --description="..." --repo="MyRepo" --work-items=123,456`
 - Update PR: `ado pr-update <id> --title="..." --description="..." --repo="MyRepo" --work-items=123,456`
+- Cherry-pick PR onto another branch: `ado pr-cherry-pick <id> --target="main" --topic="cherry-pick-branch" --repo="MyRepo"`
 - Approve PR: `ado pr-approve <id> "MyRepo"`
 - Enable auto-complete: `ado pr-autocomplete <id> "MyRepo"`
 - List builds: `ado builds 10`