azdo-cli 0.5.0-025-multi-org-support.453 → 0.5.0-025-multi-org-support.457

package/dist/index.js

@@ -288,11 +288,12 @@ async function fetchWorkItemWithFallback(context, id, cred, normalizedExtraField
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     if (!msg.includes("TF51535")) throw err;
-    const orgFields = new Set(await getOrgFieldNames(context, cred));
-    const missing = normalizedExtraFields.filter((f) => !orgFields.has(f));
-    const effectiveExtraFields = normalizedExtraFields.filter((f) => orgFields.has(f));
+    const orgFieldNames = await getOrgFieldNames(context, cred);
+    const orgFieldsLower = new Set(orgFieldNames.map((n) => n.toLowerCase()));
+    const missing = normalizedExtraFields.filter((f) => !orgFieldsLower.has(f.toLowerCase()));
+    const effectiveExtraFields = normalizedExtraFields.filter((f) => orgFieldsLower.has(f.toLowerCase()));
     for (const f of missing) {
-      process.stderr.write(`Warning: field "${f}" does not exist in this org and will be skipped.
+      process.stderr.write(`azdo: warning: field '${f}' does not exist in organization '${context.org}' and was skipped
 `);
     }
     const data = await fetchWorkItemResponse(context, id, cred, {
@@ -889,11 +890,15 @@ function selectRemote(candidates) {
   if (origin) return origin;
   if (candidates.length === 1) return candidates[0];
   const first = candidates[0];
-  const allSame = candidates.every((c) => c.org === first.org && c.project === first.project);
+  const allSame = candidates.every(
+    (c) => c.org.toLowerCase() === first.org.toLowerCase() && c.project.toLowerCase() === first.project.toLowerCase()
+  );
   if (allSame) return first;
-  const names = candidates.map((c) => c.remoteName).join(", ");
+  const lines = candidates.map((c) => `  ${c.remoteName.padEnd(8)} \u2192 ${c.org}/${c.project}`).join("\n");
   throw new Error(
-    `Ambiguous Azure DevOps remotes (${names}). Provide --org and --project explicitly.`
+    `Multiple Azure DevOps remotes found with different org/project:
+${lines}
+Use --org/--project (or 'git remote rename <name> origin') to disambiguate.`
   );
 }
 function readGitConfigContent() {
@@ -980,7 +985,7 @@ function parseRepoName(url) {
 function detectRepoName() {
   let remoteUrl;
   try {
-    remoteUrl = execSync("git remote get-url origin", { encoding: "utf-8" }).trim();
+    remoteUrl = execSync("git remote get-url origin", { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
   } catch {
     throw new Error('Not in a git repository. Check that git remote "origin" exists and try again.');
   }
@@ -991,7 +996,7 @@ function detectRepoName() {
   return repo;
 }
 function getCurrentBranch() {
-  const branch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf-8" }).trim();
+  const branch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim();
   if (branch === "HEAD") {
     throw new Error("Not on a named branch. Check out a named branch and try again.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azdo-cli",
-  "version": "0.5.0-025-multi-org-support.453",
+  "version": "0.5.0-025-multi-org-support.457",
   "description": "Azure DevOps CLI tool",
   "type": "module",
   "bin": {