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

package/dist/{chunk-ISUEWHFA.js → chunk-XVXMDWQE.js}

@@ -186,7 +186,7 @@ function setOrgScopedValue(org, key, value) {
   const updated = applyValueToScope(existing, key, value);
   saveConfig({
     ...config,
-    organizations: { ...config.organizations ?? {}, [lc]: updated }
+    organizations: { ...config.organizations, [lc]: updated }
   });
 }
 function unsetOrgScopedValue(org, key) {
@@ -198,7 +198,7 @@ function unsetOrgScopedValue(org, key) {
   const { [key]: _, ...rest } = scope;
   saveConfig({
     ...config,
-    organizations: { ...config.organizations ?? {}, [lc]: rest }
+    organizations: { ...config.organizations, [lc]: rest }
   });
 }
 function getOrgScopedValue(org, key) {
@@ -232,7 +232,7 @@ function copyOrgScope(from, to, force = false) {
   saveConfig({
     ...config,
     organizations: {
-      ...config.organizations ?? {},
+      ...config.organizations,
       [toLc]: { ...dest, ...source }
     }
   });
@@ -988,7 +988,7 @@ async function deletePat(org) {
   }
   try {
     const { unlinkSync: unlinkSync2 } = await import("fs");
-    const { lockPath: lockPath2 } = await import("./oauth-token-refresh-KOVYJAKC.js");
+    const { lockPath: lockPath2 } = await import("./oauth-token-refresh-7FQ4VAIS.js");
     unlinkSync2(lockPath2(org));
   } catch {
   }

package/dist/index.js

@@ -35,7 +35,7 @@ import {
   tokenResponseToCredential,
   unsetConfigValue,
   unsetOrgScopedValue
-} from "./chunk-ISUEWHFA.js";
+} from "./chunk-XVXMDWQE.js";
 
 // src/index.ts
 import { Command as Command16 } from "commander";
@@ -264,49 +264,53 @@ async function getOrgFieldNames(context, cred) {
   const data = await response.json();
   return (data.value ?? []).map((f) => f.referenceName);
 }
+function buildCombinedDescription(fields) {
+  const parts = [];
+  if (fields["System.Description"]) {
+    parts.push({ label: "Description", value: fields["System.Description"] });
+  }
+  if (fields["Microsoft.VSTS.Common.AcceptanceCriteria"]) {
+    parts.push({ label: "Acceptance Criteria", value: fields["Microsoft.VSTS.Common.AcceptanceCriteria"] });
+  }
+  if (fields["Microsoft.VSTS.TCM.ReproSteps"]) {
+    parts.push({ label: "Repro Steps", value: fields["Microsoft.VSTS.TCM.ReproSteps"] });
+  }
+  if (parts.length === 0) return null;
+  if (parts.length === 1) return parts[0].value;
+  return parts.map((p) => `<h3>${p.label}</h3>${p.value}`).join("");
+}
+async function fetchWorkItemWithFallback(context, id, cred, normalizedExtraFields) {
+  try {
+    const data = await fetchWorkItemResponse(context, id, cred, {
+      fields: normalizeFieldList([...DEFAULT_FIELDS, ...normalizedExtraFields])
+    });
+    return { data, effectiveExtraFields: normalizedExtraFields };
+  } 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));
+    for (const f of missing) {
+      process.stderr.write(`Warning: field "${f}" does not exist in this org and will be skipped.
+`);
+    }
+    const data = await fetchWorkItemResponse(context, id, cred, {
+      fields: normalizeFieldList([...DEFAULT_FIELDS, ...effectiveExtraFields])
+    });
+    return { data, effectiveExtraFields };
+  }
+}
 async function getWorkItem(context, id, cred, extraFields) {
   const normalizedExtraFields = extraFields ? normalizeFieldList(extraFields) : [];
   let effectiveExtraFields = normalizedExtraFields;
   let data;
   if (normalizedExtraFields.length > 0) {
-    try {
-      data = await fetchWorkItemResponse(context, id, cred, {
-        fields: normalizeFieldList([...DEFAULT_FIELDS, ...normalizedExtraFields])
-      });
-    } 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));
-      effectiveExtraFields = normalizedExtraFields.filter((f) => orgFields.has(f));
-      for (const f of missing) {
-        process.stderr.write(`Warning: field "${f}" does not exist in this org and will be skipped.
-`);
-      }
-      data = await fetchWorkItemResponse(context, id, cred, {
-        fields: normalizeFieldList([...DEFAULT_FIELDS, ...effectiveExtraFields])
-      });
-    }
+    ({ data, effectiveExtraFields } = await fetchWorkItemWithFallback(context, id, cred, normalizedExtraFields));
   } else {
     data = await fetchWorkItemResponse(context, id, cred, { includeRelations: true });
   }
   const relationsData = normalizedExtraFields.length > 0 ? await fetchWorkItemResponse(context, id, cred, { includeRelations: true }) : data;
-  const descriptionParts = [];
-  if (data.fields["System.Description"]) {
-    descriptionParts.push({ label: "Description", value: data.fields["System.Description"] });
-  }
-  if (data.fields["Microsoft.VSTS.Common.AcceptanceCriteria"]) {
-    descriptionParts.push({ label: "Acceptance Criteria", value: data.fields["Microsoft.VSTS.Common.AcceptanceCriteria"] });
-  }
-  if (data.fields["Microsoft.VSTS.TCM.ReproSteps"]) {
-    descriptionParts.push({ label: "Repro Steps", value: data.fields["Microsoft.VSTS.TCM.ReproSteps"] });
-  }
-  let combinedDescription = null;
-  if (descriptionParts.length === 1) {
-    combinedDescription = descriptionParts.at(0)?.value ?? null;
-  } else if (descriptionParts.length > 1) {
-    combinedDescription = descriptionParts.map((p) => `<h3>${p.label}</h3>${p.value}`).join("");
-  }
   return {
     id: data.id,
     rev: data.rev,
@@ -314,7 +318,7 @@ async function getWorkItem(context, id, cred, extraFields) {
     state: data.fields["System.State"],
     type: data.fields["System.WorkItemType"],
     assignedTo: data.fields["System.AssignedTo"]?.displayName ?? null,
-    description: combinedDescription,
+    description: buildCombinedDescription(data.fields),
     areaPath: data.fields["System.AreaPath"],
     iterationPath: data.fields["System.IterationPath"],
     url: data._links.html.href,
@@ -840,33 +844,39 @@ var patterns = [
   /^[^@]+@vs-ssh\.visualstudio\.com:v3\/([^/]+)\/([^/]+)\/([^/]+?)(?:\.git)?$/
 ];
 var httpsEmbeddedSecret = /^https?:\/\/[^:@/]+:[^@/]+@/;
+function parseSingleRemoteLine(line) {
+  const trimmed = line.trim();
+  if (!trimmed) return null;
+  const tabIdx = trimmed.indexOf("	");
+  if (tabIdx === -1) return null;
+  const remoteName = trimmed.slice(0, tabIdx);
+  const afterTab = trimmed.slice(tabIdx + 1);
+  const urlEnd = afterTab.lastIndexOf(" (");
+  const url = urlEnd === -1 ? afterTab : afterTab.slice(0, urlEnd);
+  return { remoteName, url };
+}
+function matchAzdoRemote(remoteName, url) {
+  for (const pattern of patterns) {
+    const match = pattern.exec(url);
+    if (!match) continue;
+    const project = match[2];
+    if (/^DefaultCollection$/i.test(project)) return null;
+    return { remoteName, org: match[1], project, hasEmbeddedSecret: httpsEmbeddedSecret.test(url) };
+  }
+  return null;
+}
 function parseAllAzdoRemotes(output) {
   const seen = /* @__PURE__ */ new Set();
   const results = [];
   for (const line of output.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    const tabIdx = trimmed.indexOf("	");
-    if (tabIdx === -1) continue;
-    const remoteName = trimmed.slice(0, tabIdx);
+    const parsed = parseSingleRemoteLine(line);
+    if (!parsed) continue;
+    const { remoteName, url } = parsed;
     if (seen.has(remoteName)) continue;
-    const afterTab = trimmed.slice(tabIdx + 1);
-    const urlEnd = afterTab.lastIndexOf(" (");
-    const url = urlEnd !== -1 ? afterTab.slice(0, urlEnd) : afterTab;
-    for (const pattern of patterns) {
-      const match = pattern.exec(url);
-      if (match) {
-        const project = match[2];
-        if (/^DefaultCollection$/i.test(project)) break;
-        seen.add(remoteName);
-        results.push({
-          remoteName,
-          org: match[1],
-          project,
-          hasEmbeddedSecret: httpsEmbeddedSecret.test(url)
-        });
-        break;
-      }
+    const candidate = matchAzdoRemote(remoteName, url);
+    if (candidate) {
+      seen.add(remoteName);
+      results.push(candidate);
     }
   }
   return results;
@@ -901,7 +911,7 @@ function readGitConfigContent() {
       }
       if (stat.isFile()) {
         const ref = fs.readFileSync(gitPath, "utf-8");
-        const m = /^gitdir:\s*(.+)$/m.exec(ref);
+        const m = /^gitdir:[ \t]*([^\r\n]+)/m.exec(ref);
         if (m) {
           return fs.readFileSync(path.join(path.resolve(dir, m[1].trim()), "config"), "utf-8");
         }
@@ -925,13 +935,13 @@ function gitConfigToRemoteLines(configContent) {
       emittedUrl = false;
       continue;
     }
-    if (/^\[/.test(line)) {
+    if (line.startsWith("[")) {
       currentRemote = null;
       emittedUrl = false;
       continue;
     }
     if (currentRemote && !emittedUrl) {
-      const urlMatch = /^\s+url\s*=\s*(.+)$/.exec(line);
+      const urlMatch = /^[ \t]+url[ \t]*=[ \t]*([^\r\n]+)/.exec(line);
       if (urlMatch) {
         lines.push(`${currentRemote}	${urlMatch[1].trim()} (fetch)`);
         emittedUrl = true;

package/dist/{oauth-token-refresh-KOVYJAKC.js → oauth-token-refresh-7FQ4VAIS.js}

@@ -5,7 +5,7 @@ import {
   lockPath,
   locksDir,
   refreshIfNeeded
-} from "./chunk-ISUEWHFA.js";
+} from "./chunk-XVXMDWQE.js";
 export {
   _resetInFlight,
   classifyRefreshFailure,

package/package.json

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