@thanaen/ado-cli 0.5.0 → 0.6.0

package/dist/cli.js

@@ -57228,6 +57228,9 @@ function loadLocalConfig() {
     return {};
   }
 }
+function isInteractive() {
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
 function censorPat(pat) {
   if (pat.length <= 8) {
     return "****";
@@ -57237,18 +57240,26 @@ function censorPat(pat) {
 function getConfig() {
   const fileConfig = loadFileConfig();
   const localConfig = loadLocalConfig();
-  const pat = process.env.DEVOPS_PAT ?? localConfig.pat ?? fileConfig.pat;
+  const pat = process.env.ADO_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()}`);
+    if (isInteractive()) {
+      console.error("Missing ADO_PAT (or DEVOPS_PAT) environment variable or pat in config file.");
+      console.error(`Run "ado init" to create a config file at ${getConfigFilePath()}`);
+    } else {
+      console.error("Error: ADO_PAT environment variable is not set.");
+      console.error('Please set it in your environment or in your Claude Desktop config (claude_desktop_config.json) under the "env" key.');
+      console.error("Never paste your PAT directly in the chat.");
+    }
     process.exit(1);
   }
   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()}`);
+    console.error("ADO configuration is incomplete. Set ADO_COLLECTION_URL, ADO_PROJECT, and ADO_REPO environment variables.");
+    if (isInteractive()) {
+      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" || localConfig.insecure === true || fileConfig.insecure === true;
@@ -57468,9 +57479,9 @@ async function cmdSmoke(config) {
 async function cmdStatus() {
   const localConfig = loadLocalConfig();
   const fileConfig = loadFileConfig();
-  const pat = process.env.DEVOPS_PAT ?? localConfig.pat ?? fileConfig.pat;
+  const pat = process.env.ADO_PAT ?? process.env.DEVOPS_PAT ?? localConfig.pat ?? fileConfig.pat;
   if (!pat) {
-    console.error("Not ready: DEVOPS_PAT is not set");
+    console.error("Not ready: ADO_PAT (or DEVOPS_PAT) is not set");
     process.exit(1);
   }
   const collectionUrl = process.env.ADO_COLLECTION_URL ?? localConfig.collectionUrl ?? fileConfig.collectionUrl ?? "";
@@ -57499,17 +57510,28 @@ async function cmdStatus() {
     process.exit(1);
   }
 }
-async function cmdRepos(config) {
+async function cmdRepos(config, args = []) {
+  const json = args.includes("--json");
   const gitApi = await config.connection.getGitApi();
   const repos = await gitApi.getRepositories(config.project);
+  if (json) {
+    console.log(JSON.stringify(repos.map((r) => ({ id: r.id, name: r.name })), null, 2));
+    return;
+  }
   for (const repo of repos) {
     console.log(`${repo.id}	${repo.name}`);
   }
 }
-async function cmdBranches(config, repoArg) {
+async function cmdBranches(config, args = []) {
+  const json = args.includes("--json");
+  const repoArg = args.find((a) => !a.startsWith("--"));
   const gitApi = await config.connection.getGitApi();
   const repo = pickRepo(config, repoArg);
   const refs = await gitApi.getRefs(repo, config.project, "heads/");
+  if (json) {
+    console.log(JSON.stringify(refs.map((r) => ({ name: String(r.name || "").replace("refs/heads/", "") })), null, 2));
+    return;
+  }
   for (const ref of refs) {
     const name = String(ref.name || "").replace("refs/heads/", "");
     console.log(name);
@@ -57554,18 +57576,25 @@ async function cmdWorkItemGet(config, idRaw, args = []) {
   }, null, 2));
 }
 async function cmdWorkItemsRecent(config, args = []) {
+  const json = args.includes("--json");
+  const filteredArgs = args.filter((a) => a !== "--json");
   let parsedArgs;
   try {
-    parsedArgs = parseWorkItemsRecentArgs(args);
+    parsedArgs = parseWorkItemsRecentArgs(filteredArgs);
   } catch (error) {
     console.error(error instanceof Error ? error.message : String(error));
-    console.error("Usage: workitems-recent [top] [--tag=<tag>] [--type=<work-item-type>] [--state=<state>]");
+    console.error("Usage: workitems-recent [top] [--tag=<tag>] [--type=<work-item-type>] [--state=<state>] [--json]");
     process.exit(1);
   }
   const witApi = await config.connection.getWorkItemTrackingApi();
   const wiqlResult = await witApi.queryByWiql({ query: buildRecentWorkItemsWiql(parsedArgs.filters) }, { project: config.project }, undefined, parsedArgs.top);
-  for (const wi of wiqlResult.workItems ?? []) {
-    console.log(wi.id);
+  const ids = (wiqlResult.workItems ?? []).map((wi) => wi.id);
+  if (json) {
+    console.log(JSON.stringify(ids, null, 2));
+    return;
+  }
+  for (const id of ids) {
+    console.log(id);
   }
 }
 async function cmdWorkItemComments(config, idRaw, args = []) {
@@ -57671,12 +57700,26 @@ async function cmdWorkItemCommentUpdate(config, idRaw, commentIdRaw, args = [])
     text: result.text ?? text
   }, null, 2));
 }
-async function cmdPrs(config, status = "active", topRaw = "10", repoArg) {
+async function cmdPrs(config, args = []) {
+  const json = args.includes("--json");
+  const positionals = args.filter((a) => !a.startsWith("--"));
+  const status = positionals[0] ?? "active";
+  const topRaw = positionals[1] ?? "10";
+  const repoArg = positionals[2];
   const top = Number(topRaw);
   const boundedTop = Number.isFinite(top) && top > 0 ? Math.min(top, 50) : 10;
   const repo = pickRepo(config, repoArg);
   const gitApi = await config.connection.getGitApi();
   const prs = await gitApi.getPullRequests(repo, { status: mapPrStatus(status) }, config.project, undefined, undefined, boundedTop);
+  if (json) {
+    console.log(JSON.stringify(prs.map((pr) => ({
+      id: pr.pullRequestId,
+      status: prStatusName(pr.status),
+      title: pr.title,
+      createdBy: pr.createdBy?.displayName ?? null
+    })), null, 2));
+    return;
+  }
   for (const pr of prs) {
     const createdBy = pr.createdBy?.displayName ?? "unknown";
     console.log(`#${pr.pullRequestId}	[${prStatusName(pr.status)}]	${pr.title}	(${createdBy})`);
@@ -57773,11 +57816,24 @@ async function cmdPrAutocomplete(config, idRaw, repoArg) {
     console.log(`Enabled auto-complete for PR #${id}`);
   }
 }
-async function cmdBuilds(config, topRaw = "10") {
+async function cmdBuilds(config, args = []) {
+  const json = args.includes("--json");
+  const positionals = args.filter((a) => !a.startsWith("--"));
+  const topRaw = positionals[0] ?? "10";
   const top = Number(topRaw);
   const boundedTop = Number.isFinite(top) && top > 0 ? Math.min(top, 50) : 10;
   const buildApi = await config.connection.getBuildApi();
   const builds = await buildApi.getBuilds(config.project, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, boundedTop, undefined, undefined, undefined, import_BuildInterfaces.BuildQueryOrder.QueueTimeDescending);
+  if (json) {
+    console.log(JSON.stringify(builds.map((b) => ({
+      id: b.id,
+      status: b.status,
+      result: b.result ?? null,
+      definition: b.definition?.name ?? null,
+      sourceBranch: b.sourceBranch ?? null
+    })), null, 2));
+    return;
+  }
   for (const b of builds) {
     console.log(`#${b.id}	${b.status}/${b.result ?? "n/a"}	${b.definition?.name ?? "unknown"}	${b.sourceBranch ?? ""}`);
   }
@@ -57942,6 +57998,11 @@ async function cmdPrCherryPick(config, args) {
   }
 }
 async function cmdInit(args) {
+  if (!isInteractive()) {
+    console.error("The init command requires an interactive terminal.");
+    console.error("For non-interactive usage, set environment variables: ADO_PAT, ADO_COLLECTION_URL, ADO_PROJECT, ADO_REPO");
+    process.exit(1);
+  }
   const isLocal = args.includes("--local");
   const { createInterface } = await import("node:readline/promises");
   const { mkdirSync, writeFileSync, existsSync: existsSync2 } = await import("node:fs");
@@ -58000,7 +58061,7 @@ Configuration saved to ${configPath}`);
 function cmdConfig() {
   const fileConfig = loadFileConfig();
   const localConfig = loadLocalConfig();
-  const pat = process.env.DEVOPS_PAT ?? localConfig.pat ?? fileConfig.pat;
+  const pat = process.env.ADO_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;
@@ -58026,21 +58087,29 @@ Commands:
   config
   status
   smoke
-  repos
-  branches [repo]
+  repos [--json]
+  branches [repo] [--json]
   workitem-get <id> [--raw] [--expand=all|fields|links|relations]
-  workitems-recent [top] [--tag=<tag>] [--type=<work-item-type>] [--state=<state>]
+  workitems-recent [top] [--tag=<tag>] [--type=<work-item-type>] [--state=<state>] [--json]
   workitem-comments <id> [top] [--top=<n>] [--order=asc|desc]
   workitem-comment-add <id> --text="..." [--file=path]
   workitem-comment-update <id> <commentId> --text="..." [--file=path]
-  prs [status] [top] [repo]
+  prs [status] [top] [repo] [--json]
   pr-get <id> [repo]
   pr-create --title=... --source=... --target=... [--description=...] [--repo=...] [--work-items=123,456] [--tags=tag-a,tag-b]
   pr-update <id> [--title=...] [--description=...] [--repo=...] [--work-items=123,456] [--tags=tag-a,tag-b]
   pr-cherry-pick <id> --target=... [--topic=branch-name] [--repo=...]
   pr-approve <id> [repo]
   pr-autocomplete <id> [repo]
-  builds [top]
+  builds [top] [--json]
+
+Environment variables:
+  ADO_PAT              Personal Access Token (primary)
+  DEVOPS_PAT           Personal Access Token (fallback, deprecated)
+  ADO_COLLECTION_URL   Azure DevOps collection URL
+  ADO_PROJECT          Default project
+  ADO_REPO             Default repository
+  ADO_INSECURE         Set to "1" to disable TLS verification
 `);
 }
 async function printVersion() {
@@ -58076,10 +58145,10 @@ async function main() {
       await cmdSmoke(config);
       break;
     case "repos":
-      await cmdRepos(config);
+      await cmdRepos(config, args);
       break;
     case "branches":
-      await cmdBranches(config, args[0]);
+      await cmdBranches(config, args);
       break;
     case "workitem-get":
       await cmdWorkItemGet(config, args[0], args.slice(1));
@@ -58097,7 +58166,7 @@ async function main() {
       await cmdWorkItemCommentUpdate(config, args[0], args[1], args.slice(2));
       break;
     case "prs":
-      await cmdPrs(config, args[0], args[1], args[2]);
+      await cmdPrs(config, args);
       break;
     case "pr-get":
       await cmdPrGet(config, args[0], args[1]);
@@ -58118,7 +58187,7 @@ async function main() {
       await cmdPrAutocomplete(config, args[0], args[1]);
       break;
     case "builds":
-      await cmdBuilds(config, args[0]);
+      await cmdBuilds(config, args);
       break;
     default:
       console.error(`Unknown command: ${command}`);

package/package.json

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

package/skills/ado-workflows/SKILL.md

@@ -10,33 +10,36 @@ Use the `ado` CLI instead of ad-hoc curl commands.
 ## Preflight
 
 Run `ado status` before any other command. It checks token, configuration, and connectivity in one step.
-If it reports an issue, guide the user to run `ado init` (or `ado init --local` for per-project setup) to configure the CLI.
+If it reports an issue, guide the user to set the required environment variables (`ADO_PAT`, `ADO_COLLECTION_URL`, `ADO_PROJECT`, `ADO_REPO`).
+Do **not** suggest `ado init` — it requires an interactive terminal and cannot run in this context.
 
 ## 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"`
+- List repos: `ado repos` (or `ado repos --json` for structured output)
+- List branches: `ado branches "MyRepo"` (or `--json`)
 - Get work item: `ado workitem-get <id>`
 - Get full raw work item payload: `ado workitem-get <id> --raw --expand=all`
-- List recent work items: `ado workitems-recent 10`
+- List recent work items: `ado workitems-recent 10` (or `--json`)
 - List recent work items filtered by tag/type/state: `ado workitems-recent 20 --type=Bug --tag=bot --state=New`
 - List comments on a work item: `ado workitem-comments <id> --top=100 --order=desc`
 - Add a comment on a work item: `ado workitem-comment-add <id> --text="..."`
 - Update an existing comment on a work item: `ado workitem-comment-update <id> <commentId> --text="..."`
-- List PRs: `ado prs active 10 "MyRepo"`
+- List PRs: `ado prs active 10 "MyRepo"` (or `--json`)
 - 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 --tags=backend,release-1`
 - Update PR: `ado pr-update <id> --title="..." --description="..." --repo="MyRepo" --work-items=123,456 --tags=backend,release-1`
 - 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`
+- List builds: `ado builds 10` (or `--json`)
+
+## Structured output
+
+Add `--json` to listing commands (`repos`, `branches`, `prs`, `builds`, `workitems-recent`) to get JSON arrays instead of tab-delimited text. Commands like `workitem-get`, `pr-get`, `workitem-comments`, and `config` already output JSON by default.
 
 ## Safety rules
 
-- Never print `DEVOPS_PAT`.
+- Never print `ADO_PAT` or `DEVOPS_PAT`.
 - Prefer CLI commands over direct API calls.
 - Use `ADO_INSECURE=1` only when needed for trusted self-signed endpoints.