@rui.branco/jira-mcp 1.6.16 → 1.6.18

package/index.js

@@ -208,22 +208,58 @@ async function fetchJiraTeams(endpoint, options = {}, instance = defaultInstance
   return text ? JSON.parse(text) : {};
 }
 
-async function resolveTeamId(teamName, instance) {
-  const teams = await fetchJiraTeams(
-    `/teams/find?query=${encodeURIComponent(teamName)}&excludeMembers=true`,
+async function searchTeamsViaJql(query, instance) {
+  const data = await fetchJira(
+    `/jql/autocompletedata/suggestions?fieldName=cf[10001]&fieldValue=${encodeURIComponent(query)}`,
     {},
     instance,
   );
-  const match = teams.find(
-    (t) => t.title.toLowerCase() === teamName.toLowerCase(),
-  );
-  if (!match) {
-    const available = teams.map((t) => t.title).join(", ");
-    throw new Error(
-      `Team "${teamName}" not found.${available ? ` Similar teams: ${available}` : ""}`,
+  return (data.results || []).map((r) => ({
+    title: r.displayName.replace(/<[^>]*>/g, "").replace(/&amp;/g, "&"),
+    id: r.value,
+  }));
+}
+
+async function listTeams(instance) {
+  // Try Teams API first, fall back to JQL autocomplete
+  try {
+    const teams = await fetchJiraTeams(
+      `/teams/find?query=&excludeMembers=true`, {}, instance,
     );
+    return teams.map((t) => ({ title: t.title, id: `${t.organizationId}-${t.id}` }));
+  } catch {
+    // Teams API not available, use JQL autocomplete with a broad search
+    return searchTeamsViaJql("", instance);
   }
-  return `${match.organizationId}-${match.id}`;
+}
+
+async function resolveTeamId(teamName, instance) {
+  // Try Teams API first
+  try {
+    const teams = await fetchJiraTeams(
+      `/teams/find?query=${encodeURIComponent(teamName)}&excludeMembers=true`,
+      {},
+      instance,
+    );
+    const match = teams.find(
+      (t) => t.title.toLowerCase() === teamName.toLowerCase(),
+    );
+    if (match) return `${match.organizationId}-${match.id}`;
+  } catch {
+    // Teams API not available, fall through to JQL
+  }
+
+  // Fallback: JQL autocomplete
+  const jqlTeams = await searchTeamsViaJql(teamName, instance);
+  const match = jqlTeams.find(
+    (t) => t.title.toLowerCase() === teamName.toLowerCase(),
+  );
+  if (match) return match.id;
+
+  const available = jqlTeams.map((t) => t.title).join(", ");
+  throw new Error(
+    `Team "${teamName}" not found.${available ? ` Similar teams: ${available}` : ""}`,
+  );
 }
 
 async function downloadAttachment(url, filename, issueKey, instance) {
@@ -1795,7 +1831,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
             },
             defaultTeam: {
               type: "string",
-              description: "Default team name to auto-assign when creating tickets (e.g., 'Site Surveys (MODS)'). Resolved and validated via Jira Teams API. Pass empty string to clear.",
+              description: "Default team name to auto-assign when creating tickets (e.g., 'Site Surveys (MODS)'). Resolved and validated via Jira Teams API. Pass 'none' to explicitly disable team prompts. Pass empty string to reset.",
             },
           },
           required: ["name"],
@@ -2859,6 +2895,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       if (args.defaultTeam !== undefined) {
         if (args.defaultTeam === "") {
           defaultTeam = undefined;
+        } else if (args.defaultTeam.toLowerCase() === "none") {
+          defaultTeam = "none";
         } else {
           // Validate team exists via Jira Teams API
           const tempInst = { baseUrl, auth: authStr };
@@ -2868,11 +2906,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
           } catch (e) {
             // Try to list available teams for a helpful error
             try {
-              const teams = await fetchJiraTeams(
-                `/teams/find?query=&excludeMembers=true`,
-                {},
-                tempInst,
-              );
+              const teams = await listTeams(tempInst);
               const available = teams.map((t) => t.title).join(", ");
               return {
                 content: [{ type: "text", text: `Team "${args.defaultTeam}" not found. Available teams: ${available}` }],
@@ -2936,18 +2970,18 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       let text = `${action} instance "${instName}" (${baseUrl}).`;
       if (projects.length > 0) text += ` Projects: ${projects.join(", ")}.`;
       if (args.setDefault) text += " Set as default.";
-      if (defaultTeam) {
+      if (defaultTeam === "none") {
+        text += " Default team: None (disabled).";
+      } else if (defaultTeam) {
         text += ` Default team: ${defaultTeam.name}.`;
       } else {
         // No default team — fetch available teams and prompt
         try {
           const tempInst = { baseUrl, auth: authStr };
-          const teams = await fetchJiraTeams(
-            `/teams/find?query=&excludeMembers=true`, {}, tempInst,
-          );
+          const teams = await listTeams(tempInst);
           if (teams && teams.length > 0) {
             const list = teams.map((t, i) => `${i + 1}. ${t.title}`).join("\n");
-            text += `\n\n⚠ No default team configured. Available teams:\n${list}\n0. None\n\nAsk the user which team to set as default. If they pick one, call jira_add_instance with name="${instName}" and defaultTeam="<team name>".`;
+            text += `\n\n⚠ No default team configured. Available teams:\n${list}\n0. None\n\nAsk the user which team to set as default. If they pick one, call jira_add_instance with name="${instName}" and defaultTeam="<team name>". If "None" is selected, call jira_add_instance with defaultTeam="none" to stop future prompts.`;
           }
         } catch {
           // Teams API not available, skip
@@ -2994,11 +3028,17 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       }
       const currentDefault = rawConfig.defaultInstance || instances[0].name;
       let text = `# Configured Jira Instances (${instances.length})\n\n`;
+      const missingTeam = [];
       for (const inst of instances) {
         const isDefault = inst.name === currentDefault ? " **(default)**" : "";
         const projs = inst.projects?.length > 0 ? `\n  Projects: ${inst.projects.join(", ")}` : "";
-        const team = inst.defaultTeam ? `\n  Default team: ${inst.defaultTeam.name}` : "";
+        const team = inst.defaultTeam === "none" ? "\n  Default team: None (disabled)" : inst.defaultTeam ? `\n  Default team: ${inst.defaultTeam.name}` : "";
         text += `- **${inst.name}**${isDefault}: ${inst.baseUrl} (${inst.email})${projs}${team}\n`;
+        if (!inst.defaultTeam) missingTeam.push(inst);
+      }
+      if (missingTeam.length > 0) {
+        const names = missingTeam.map((i) => `"${i.name}"`).join(", ");
+        text += `\n⚠ Instances without a default team: ${names}.\nAsk the user if they want to configure a default team. To set one, call jira_add_instance with name="<instance>" and defaultTeam="<team name>".`;
       }
       return { content: [{ type: "text", text }] };
 
@@ -3045,17 +3085,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       let teamPrompt = "";
       if (args.team) {
         fields.customfield_10001 = await resolveTeamId(args.team, inst);
-      } else if (inst.defaultTeam) {
+      } else if (inst.defaultTeam && inst.defaultTeam !== "none") {
         fields.customfield_10001 = inst.defaultTeam.id;
-      } else {
+      } else if (!inst.defaultTeam) {
         // No team param and no default — fetch available teams and prompt user
         try {
-          const teams = await fetchJiraTeams(
-            `/teams/find?query=&excludeMembers=true`, {}, inst,
-          );
+          const teams = await listTeams(inst);
           if (teams && teams.length > 0) {
             const list = teams.map((t, i) => `${i + 1}. ${t.title}`).join("\n");
-            teamPrompt = `\n\n⚠ No team assigned and no default team configured for instance "${inst.name}". Available teams:\n${list}\n0. None\n\nTo assign a team to this ticket, call jira_update_ticket with issueKey and team parameter.\nIf a team is selected, ask the user if it should also be saved as the default team for instance "${inst.name}" (via jira_add_instance with defaultTeam).`;
+            teamPrompt = `\n\n⚠ No team assigned and no default team configured for instance "${inst.name}". Available teams:\n${list}\n0. None\n\nTo assign a team to this ticket, call jira_update_ticket with issueKey and team parameter.\nIf a team is selected, ask the user if it should also be saved as the default team for instance "${inst.name}" (via jira_add_instance with defaultTeam). If "None" is selected, call jira_add_instance with defaultTeam="none" to stop future prompts.`;
           }
         } catch {
           // Teams API not available, proceed without team
@@ -3118,7 +3156,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         );
         if (parentIssue.fields?.customfield_10001) {
           fields.customfield_10001 = parentIssue.fields.customfield_10001;
-        } else if (inst.defaultTeam) {
+        } else if (inst.defaultTeam && inst.defaultTeam !== "none") {
           teamWarning = `\n\nNote: Parent ${args.parentKey} has no team assigned. Instance default team is "${inst.defaultTeam.name}". Use team parameter to assign it.`;
         }
       }
@@ -3469,16 +3507,14 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       let teamPrompt = "";
       if (of.customfield_10001) {
         fields.customfield_10001 = of.customfield_10001;
-      } else if (inst.defaultTeam) {
+      } else if (inst.defaultTeam && inst.defaultTeam !== "none") {
         fields.customfield_10001 = inst.defaultTeam.id;
-      } else {
+      } else if (!inst.defaultTeam) {
         try {
-          const teams = await fetchJiraTeams(
-            `/teams/find?query=&excludeMembers=true`, {}, inst,
-          );
+          const teams = await listTeams(inst);
           if (teams && teams.length > 0) {
             const list = teams.map((t, i) => `${i + 1}. ${t.title}`).join("\n");
-            teamPrompt = `\n\n⚠ No team assigned (original had none) and no default team configured for instance "${inst.name}". Available teams:\n${list}\n0. None\n\nTo assign a team to this ticket, call jira_update_ticket with issueKey and team parameter.\nIf a team is selected, ask the user if it should also be saved as the default team for instance "${inst.name}" (via jira_add_instance with defaultTeam).`;
+            teamPrompt = `\n\n⚠ No team assigned (original had none) and no default team configured for instance "${inst.name}". Available teams:\n${list}\n0. None\n\nTo assign a team to this ticket, call jira_update_ticket with issueKey and team parameter.\nIf a team is selected, ask the user if it should also be saved as the default team for instance "${inst.name}" (via jira_add_instance with defaultTeam). If "None" is selected, call jira_add_instance with defaultTeam="none" to stop future prompts.`;
           }
         } catch {
           // Teams API not available, proceed without team
@@ -3694,5 +3730,5 @@ if (require.main === module) {
 
 // Export for testing
 if (typeof module !== "undefined") {
-  module.exports = { buildCommentADF, parseInlineFormatting, findJiraTicketKeys, resolveTeamId, fetchJiraTeams };
+  module.exports = { buildCommentADF, parseInlineFormatting, findJiraTicketKeys, resolveTeamId, fetchJiraTeams, listTeams, searchTeamsViaJql };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rui.branco/jira-mcp",
-  "version": "1.6.16",
+  "version": "1.6.18",
   "description": "Jira MCP server for Claude Code - fetch tickets, search with JQL, update tickets, manage comments, change status, and get Figma designs",
   "main": "index.js",
   "bin": {