@radholm/azure-devops-mcp 1.0.0-beta.2 → 1.0.0-beta.3

package/README.md

@@ -124,13 +124,13 @@ In your project, add a `.vscode\mcp.json` file with the following content:
     "ado": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp", "${input:ado_org}"]
+      "args": ["-y", "@radholm/azure-devops-mcp", "${input:ado_org}"]
     }
   }
 }
 ```
 
-🔥 To stay up to date with the latest features, you can use our nightly builds. Simply update your `mcp.json` configuration to use `@azure-devops/mcp@next`. Here is an updated example:
+🔥 To stay up to date with the latest features, you can use our nightly builds. Simply update your `mcp.json` configuration to use `@radholm/azure-devops-mcp@next`. Here is an updated example:
 
 ```json
 {
@@ -145,7 +145,7 @@ In your project, add a `.vscode\mcp.json` file with the following content:
     "ado": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp@next", "${input:ado_org}"]
+      "args": ["-y", "@radholm/azure-devops-mcp@next", "${input:ado_org}"]
     }
   }
 }
@@ -187,7 +187,7 @@ For example, use `"-d", "core", "work", "work-items"` to load only Work Item rel
     "ado_with_filtered_domains": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp", "${input:ado_org}", "-d", "core", "work", "work-items"]
+      "args": ["-y", "@radholm/azure-devops-mcp", "${input:ado_org}", "-d", "core", "work", "work-items"]
     }
   }
 }
@@ -211,7 +211,7 @@ You can also configure default Azure DevOps project and team values from `.vscod
     "ado": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp", "myorg", "--authentication", "azcli"],
+      "args": ["-y", "@radholm/azure-devops-mcp", "myorg", "--authentication", "azcli"],
       "env": {
         "ado_mcp_project": "Contoso",
         "ado_mcp_team": "Fabrikam Team"
@@ -231,35 +231,49 @@ The local MCP server supports connecting to on-premises Azure DevOps Server (TFS
 
 ### Configuration
 
-Use the `--base-url` (or `-b`) option to point to your on-prem server, or set the `AZURE_DEVOPS_BASE_URL` environment variable. The `organization` positional argument is still required and should match your collection name.
+Use the `--base-url` (or `-b`) option to point to your on-prem server, or set the `AZURE_DEVOPS_BASE_URL` environment variable. The `organization` positional argument is **optional** when `--base-url` is provided — the server will automatically derive the organization/collection name from the last path segment of the URL.
 
 > **Note:** Only `pat` and `envvar` authentication are supported for on-premises servers.
 
+### Authentication
+
+Set `PERSONAL_ACCESS_TOKEN` to your **raw** Personal Access Token (the token string as generated by Azure DevOps). The server handles encoding internally.
+
 ### Example `.vscode/mcp.json`
 
 ```json
 {
-  "inputs": [
-    {
-      "id": "ado_org",
-      "type": "promptString",
-      "description": "Azure DevOps collection name (e.g. 'DefaultCollection')"
+  "servers": {
+    "ado-onprem": {
+      "type": "stdio",
+      "command": "npx",
+      "args": ["-y", "@radholm/azure-devops-mcp", "--base-url", "https://azuredo.example.com/tfs/MyCollection", "--authentication", "pat"],
+      "env": {
+        "PERSONAL_ACCESS_TOKEN": "<your raw PAT>"
+      }
     }
-  ],
+  }
+}
+```
+
+You can still provide the organization explicitly if needed:
+
+```json
+{
   "servers": {
     "ado-onprem": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp", "${input:ado_org}", "--base-url", "https://azuredo.example.com/tfs/MyCollection", "--authentication", "pat"],
+      "args": ["-y", "@radholm/azure-devops-mcp", "MyCollection", "--base-url", "https://azuredo.example.com/tfs/MyCollection", "--authentication", "pat"],
       "env": {
-        "PERSONAL_ACCESS_TOKEN": "<base64 encoded email:pat>"
+        "PERSONAL_ACCESS_TOKEN": "<your raw PAT>"
       }
     }
   }
 }
 ```
 
-Alternatively, use the `AZURE_DEVOPS_BASE_URL` environment variable:
+Alternatively, use the `AZURE_DEVOPS_BASE_URL` environment variable instead of `--base-url`:
 
 ```json
 {
@@ -267,10 +281,10 @@ Alternatively, use the `AZURE_DEVOPS_BASE_URL` environment variable:
     "ado-onprem": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp", "MyCollection", "--authentication", "pat"],
+      "args": ["-y", "@radholm/azure-devops-mcp", "--authentication", "pat"],
       "env": {
         "AZURE_DEVOPS_BASE_URL": "https://azuredo.example.com/tfs/MyCollection",
-        "PERSONAL_ACCESS_TOKEN": "<base64 encoded email:pat>"
+        "PERSONAL_ACCESS_TOKEN": "<your raw PAT>"
       }
     }
   }
@@ -299,9 +313,9 @@ Example:
     "ado-onprem": {
       "type": "stdio",
       "command": "npx",
-      "args": ["-y", "@azure-devops/mcp", "MyCollection", "--base-url", "https://azuredo.example.com/tfs/MyCollection", "--authentication", "pat"],
+      "args": ["-y", "@radholm/azure-devops-mcp", "--base-url", "https://azuredo.example.com/tfs/MyCollection", "--authentication", "pat"],
       "env": {
-        "PERSONAL_ACCESS_TOKEN": "<base64 encoded email:pat>",
+        "PERSONAL_ACCESS_TOKEN": "<your raw PAT>",
         "AZURE_DEVOPS_API_VERSION": "7.1"
       }
     }

package/dist/auth.js

@@ -75,14 +75,14 @@ function createAuthenticator(type, tenantId) {
             logger.debug(`Authenticator: Using PAT authentication (PERSONAL_ACCESS_TOKEN)`);
             return async () => {
                 logger.debug(`${type}: Reading token from PERSONAL_ACCESS_TOKEN environment variable`);
-                const b64Pat = process.env["PERSONAL_ACCESS_TOKEN"];
-                if (!b64Pat) {
+                const pat = process.env["PERSONAL_ACCESS_TOKEN"];
+                if (!pat) {
                     logger.error(`${type}: PERSONAL_ACCESS_TOKEN environment variable is not set or empty`);
-                    throw new Error("Environment variable 'PERSONAL_ACCESS_TOKEN' is not set or empty. Please set it with a valid base64-encoded Azure DevOps Personal Access Token.");
+                    throw new Error("Environment variable 'PERSONAL_ACCESS_TOKEN' is not set or empty. Please set it with a valid Azure DevOps Personal Access Token.");
                 }
-                // Return base64 value as-is — caller uses it directly as the Basic auth credential
+                // Return the raw PAT value as-is. The caller handles encoding for Basic auth.
                 logger.debug(`${type}: Successfully retrieved PAT from environment variable`);
-                return b64Pat;
+                return pat;
             };
         case "envvar":
             logger.debug(`Authenticator: Using environment variable authentication (ADO_MCP_AUTH_TOKEN)`);

package/dist/index.js

@@ -18,16 +18,28 @@ function isGitHubCodespaceEnv() {
     return process.env.CODESPACES === "true" && !!process.env.CODESPACE_NAME;
 }
 const defaultAuthenticationType = isGitHubCodespaceEnv() ? "azcli" : "interactive";
+/**
+ * Extract the organization/collection name from a base URL.
+ * E.g. "https://azuredo.lfnet.se/tfs/Lansforsakringar" -> "Lansforsakringar"
+ *      "https://dev.azure.com/MyOrg" -> "MyOrg"
+ */
+function extractOrgFromUrl(url) {
+    const pathname = new URL(url).pathname.replace(/\/+$/, "");
+    const lastSegment = pathname.split("/").pop();
+    if (!lastSegment) {
+        throw new Error(`Cannot derive organization name from base URL '${url}'. Please provide the organization positional argument.`);
+    }
+    return lastSegment;
+}
 // Parse command line arguments using yargs
 const argv = yargs(hideBin(process.argv))
-    .scriptName("mcp-server-azuredevops")
-    .usage("Usage: $0 <organization> [options]")
+    .scriptName("azure-devops-mcp")
+    .usage("Usage: $0 [organization] [options]")
     .version(packageVersion)
-    .command("$0 <organization> [options]", "Azure DevOps MCP Server", (yargs) => {
+    .command("$0 [organization] [options]", "Azure DevOps MCP Server", (yargs) => {
     yargs.positional("organization", {
-        describe: "Azure DevOps organization name",
+        describe: "Azure DevOps organization name (optional if --base-url is provided)",
         type: "string",
-        demandOption: true,
     });
 })
     .option("domains", {
@@ -53,11 +65,17 @@ const argv = yargs(hideBin(process.argv))
     alias: "b",
     describe: "Base URL for Azure DevOps Server (on-prem). E.g. 'https://azuredo.example.com/tfs/MyCollection'. Defaults to 'https://dev.azure.com/{organization}'.",
     type: "string",
+})
+    .check((argv) => {
+    if (!argv.organization && !argv.baseUrl && !process.env.AZURE_DEVOPS_BASE_URL) {
+        throw new Error("Either <organization> or --base-url (or AZURE_DEVOPS_BASE_URL env var) must be provided.");
+    }
+    return true;
 })
     .help()
     .parseSync();
-export const orgName = argv.organization;
-export const orgUrl = argv.baseUrl ?? process.env.AZURE_DEVOPS_BASE_URL ?? "https://dev.azure.com/" + orgName;
+export const orgUrl = argv.baseUrl ?? process.env.AZURE_DEVOPS_BASE_URL ?? "https://dev.azure.com/" + argv.organization;
+export const orgName = argv.organization ?? extractOrgFromUrl(orgUrl);
 /**
  * Whether the server is connecting to an on-premises Azure DevOps Server instance
  * (i.e., not the cloud-hosted dev.azure.com service).
@@ -68,9 +86,8 @@ export const enabledDomains = domainsManager.getEnabledDomains();
 function getAzureDevOpsClient(getAzureDevOpsToken, userAgentComposer, authType) {
     return async () => {
         const accessToken = await getAzureDevOpsToken();
-        // For pat, accessToken is base64("{email}:{token}"). Decode to extract the token part,
-        // since getPersonalAccessTokenHandler prepends ":" internally and just needs the raw token.
-        const authHandler = authType === "pat" ? getPersonalAccessTokenHandler(Buffer.from(accessToken, "base64").toString("utf8").split(":").slice(1).join(":")) : getBearerHandler(accessToken);
+        // For pat, accessToken is the raw PAT token
+        const authHandler = authType === "pat" ? getPersonalAccessTokenHandler(accessToken) : getBearerHandler(accessToken);
         const connection = new WebApi(orgUrl, authHandler, undefined, {
             productName: "AzureDevOps.MCP",
             productVersion: packageVersion,
@@ -112,8 +129,9 @@ async function main() {
     const tenantId = isOnPrem ? argv.tenant : ((await getOrgTenant(orgName)) ?? argv.tenant);
     const authenticator = createAuthenticator(argv.authentication, tenantId);
     if (argv.authentication === "pat") {
-        const basicValue = await authenticator();
-        // basicValue is already base64("{email}:{token}") — use it directly in the Authorization header
+        const rawPat = await authenticator();
+        // Build the Basic auth value from the raw PAT: base64(":token")
+        const basicValue = Buffer.from(`:${rawPat}`).toString("base64");
         const _originalFetch = globalThis.fetch;
         globalThis.fetch = async (input, init) => {
             if (init?.headers) {

package/dist/version.js

@@ -1 +1 @@
-export const packageVersion = "1.0.0-beta.2";
+export const packageVersion = "1.0.0-beta.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radholm/azure-devops-mcp",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "MCP server for interacting with Azure DevOps",
   "license": "MIT",
   "author": "Fredrik Radholm",
@@ -12,7 +12,7 @@
   },
   "type": "module",
   "bin": {
-    "mcp-server-azuredevops": "dist/index.js"
+    "azure-devops-mcp": "dist/index.js"
   },
   "files": [
     "dist"