@rui.branco/jira-mcp 1.6.14 → 1.6.16

package/index.js

@@ -184,6 +184,48 @@ async function fetchJiraAgile(endpoint, options = {}, instance = defaultInstance
   return text ? JSON.parse(text) : {};
 }
 
+async function fetchJiraTeams(endpoint, options = {}, instance = defaultInstance) {
+  const { method = "GET", body } = options;
+  const headers = {
+    Authorization: `Basic ${instance.auth}`,
+    Accept: "application/json",
+  };
+  if (body) {
+    headers["Content-Type"] = "application/json";
+  }
+  const response = await fetch(`${instance.baseUrl}/rest/teams/1.0${endpoint}`, {
+    method,
+    headers,
+    body: body ? JSON.stringify(body) : undefined,
+  });
+  if (!response.ok) {
+    const errorBody = await response.text().catch(() => "");
+    throw new Error(
+      `Jira Teams API error: ${response.status} ${response.statusText}${errorBody ? ` - ${errorBody}` : ""}`,
+    );
+  }
+  const text = await response.text();
+  return text ? JSON.parse(text) : {};
+}
+
+async function resolveTeamId(teamName, instance) {
+  const teams = await fetchJiraTeams(
+    `/teams/find?query=${encodeURIComponent(teamName)}&excludeMembers=true`,
+    {},
+    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 `${match.organizationId}-${match.id}`;
+}
+
 async function downloadAttachment(url, filename, issueKey, instance) {
   const issueDir = path.join(attachmentDir, issueKey);
   if (!fs.existsSync(issueDir)) {
@@ -848,6 +890,13 @@ async function getTicket(issueKey, downloadImages = true, fetchFigma = true, ins
   if (fields.resolutiondate) output += `**Resolved:** ${fields.resolutiondate}\n`;
   if (fields.resolution) output += `**Resolution:** ${fields.resolution.name}\n`;
 
+  // Team
+  if (fields.customfield_10001) {
+    const teamVal = fields.customfield_10001;
+    const teamName = typeof teamVal === "object" ? teamVal.name || teamVal.title || teamVal.value || JSON.stringify(teamVal) : teamVal;
+    output += `**Team:** ${teamName}\n`;
+  }
+
   // Story points
   if (storyPoints != null) output += `**Story Points:** ${storyPoints}\n`;
 
@@ -1477,7 +1526,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
       {
         name: "jira_add_comment",
         description:
-          "Add a comment to a Jira ticket. IMPORTANT: Use @DisplayName (e.g. @Julia Pereszta) for mentions — NOT [~accountId:...] syntax. Keep comments non-technical and user-facing. Never mention git details like 'pushed to main', branch names, or technical implementation details — stakeholders don't care about that. NEVER use em dashes (—) or en dashes (–) in comments — use commas, periods, or rewrite the sentence instead.",
+          "Add a comment to a Jira ticket. IMPORTANT RULES: (1) Write comments at a HIGH LEVEL for stakeholders, product owners, and managers. Focus on WHAT was done and the business impact, NOT how it was done. Example: 'Implemented the new filtering feature for the dashboard' instead of 'Added a useEffect hook with debounced API calls to filter endpoint'. (2) NEVER mention technical details: no code, no function names, no file paths, no git branches, no commit hashes, no 'pushed to main', no framework-specific terms (React, Angular, hooks, components, etc.). (3) Use @DisplayName (e.g. @Julia Pereszta) for mentions, NOT [~accountId:...] syntax. (4) NEVER use em dashes (—) or en dashes (–), use commas, periods, or rewrite the sentence instead.",
         inputSchema: {
           type: "object",
           properties: {
@@ -1646,6 +1695,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
               items: { type: "string" },
               description: "Labels to set on the ticket",
             },
+            team: {
+              type: "string",
+              description: "Team name to assign (e.g., 'Site Surveys (MODS)'). Resolved automatically via Jira Teams API.",
+            },
             instance: {
               type: "string",
               description: "Instance name override. Auto-detected from issue key prefix if omitted.",
@@ -1740,6 +1793,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
               type: "boolean",
               description: "Set this instance as the default (default: false)",
             },
+            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.",
+            },
           },
           required: ["name"],
         },
@@ -1827,6 +1884,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
               type: "number",
               description: "Sprint ID to add the ticket to. Use jira_get_sprints to find sprint IDs.",
             },
+            team: {
+              type: "string",
+              description: "Team name to assign (e.g., 'Site Surveys (MODS)'). Resolved automatically via Jira Teams API.",
+            },
             instance: {
               type: "string",
               description: "Instance name override. Auto-detected from project key if omitted.",
@@ -1867,6 +1928,10 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
               items: { type: "string" },
               description: "Labels to set on the subtask",
             },
+            team: {
+              type: "string",
+              description: "Team name to assign (e.g., 'Site Surveys (MODS)'). Resolved automatically via Jira Teams API.",
+            },
             instance: {
               type: "string",
               description: "Instance name override. Auto-detected from parent issue key prefix if omitted.",
@@ -2733,6 +2798,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       if (args.labels) {
         fields.labels = args.labels;
       }
+      if (args.team) {
+        fields.customfield_10001 = await resolveTeamId(args.team, inst);
+      }
 
       if (Object.keys(fields).length === 0) {
         return {
@@ -2786,7 +2854,41 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       const projects = args.projects ? args.projects.map((p) => p.toUpperCase()) : (existing.projects || []);
       const authStr = Buffer.from(`${email}:${token}`).toString("base64");
 
-      const newInstance = { name: instName, email, token, baseUrl, projects, auth: authStr };
+      // Resolve defaultTeam if provided
+      let defaultTeam = existing.defaultTeam || undefined;
+      if (args.defaultTeam !== undefined) {
+        if (args.defaultTeam === "") {
+          defaultTeam = undefined;
+        } else {
+          // Validate team exists via Jira Teams API
+          const tempInst = { baseUrl, auth: authStr };
+          try {
+            const teamId = await resolveTeamId(args.defaultTeam, tempInst);
+            defaultTeam = { name: args.defaultTeam, id: teamId };
+          } catch (e) {
+            // Try to list available teams for a helpful error
+            try {
+              const teams = await fetchJiraTeams(
+                `/teams/find?query=&excludeMembers=true`,
+                {},
+                tempInst,
+              );
+              const available = teams.map((t) => t.title).join(", ");
+              return {
+                content: [{ type: "text", text: `Team "${args.defaultTeam}" not found. Available teams: ${available}` }],
+                isError: true,
+              };
+            } catch {
+              return {
+                content: [{ type: "text", text: e.message }],
+                isError: true,
+              };
+            }
+          }
+        }
+      }
+
+      const newInstance = { name: instName, email, token, baseUrl, projects, auth: authStr, defaultTeam };
 
       // Update in-memory instances
       if (isUpdate) {
@@ -2818,6 +2920,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
       // Save without the computed auth field
       const toSave = { name: instName, email, token, baseUrl, projects };
+      if (defaultTeam) toSave.defaultTeam = defaultTeam;
       const savedIdx = savedConfig.instances.findIndex((i) => i.name === instName);
       if (savedIdx >= 0) {
         savedConfig.instances[savedIdx] = toSave;
@@ -2833,6 +2936,23 @@ 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) {
+        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,
+          );
+          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>".`;
+          }
+        } catch {
+          // Teams API not available, skip
+        }
+      }
 
       return { content: [{ type: "text", text }] };
 
@@ -2877,7 +2997,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       for (const inst of instances) {
         const isDefault = inst.name === currentDefault ? " **(default)**" : "";
         const projs = inst.projects?.length > 0 ? `\n  Projects: ${inst.projects.join(", ")}` : "";
-        text += `- **${inst.name}**${isDefault}: ${inst.baseUrl} (${inst.email})${projs}\n`;
+        const team = inst.defaultTeam ? `\n  Default team: ${inst.defaultTeam.name}` : "";
+        text += `- **${inst.name}**${isDefault}: ${inst.baseUrl} (${inst.email})${projs}${team}\n`;
       }
       return { content: [{ type: "text", text }] };
 
@@ -2921,6 +3042,25 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       if (args.parentKey) {
         fields.parent = { key: args.parentKey };
       }
+      let teamPrompt = "";
+      if (args.team) {
+        fields.customfield_10001 = await resolveTeamId(args.team, inst);
+      } else if (inst.defaultTeam) {
+        fields.customfield_10001 = inst.defaultTeam.id;
+      } else {
+        // No team param and no default — fetch available teams and prompt user
+        try {
+          const teams = await fetchJiraTeams(
+            `/teams/find?query=&excludeMembers=true`, {}, 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).`;
+          }
+        } catch {
+          // Teams API not available, proceed without team
+        }
+      }
 
       const result = await fetchJira("/issue", { method: "POST", body: { fields } }, inst);
       const newKey = result.key;
@@ -2935,6 +3075,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
       let text = `Created ${newKey}: ${args.summary}\nURL: ${inst.baseUrl}/browse/${newKey}`;
       if (args.sprintId) text += `\nAdded to sprint ${args.sprintId}.`;
+      text += teamPrompt;
       return { content: [{ type: "text", text }] };
 
     } else if (name === "jira_create_subtask") {
@@ -2967,6 +3108,20 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       if (args.labels) {
         fields.labels = args.labels;
       }
+      let teamWarning = "";
+      if (args.team) {
+        fields.customfield_10001 = await resolveTeamId(args.team, inst);
+      } else {
+        // Inherit team from parent ticket
+        const parentIssue = await fetchJira(
+          `/issue/${args.parentKey}?fields=customfield_10001`, {}, inst,
+        );
+        if (parentIssue.fields?.customfield_10001) {
+          fields.customfield_10001 = parentIssue.fields.customfield_10001;
+        } else if (inst.defaultTeam) {
+          teamWarning = `\n\nNote: Parent ${args.parentKey} has no team assigned. Instance default team is "${inst.defaultTeam.name}". Use team parameter to assign it.`;
+        }
+      }
 
       const result = await fetchJira("/issue", { method: "POST", body: { fields } }, inst);
       const newKey = result.key;
@@ -2974,7 +3129,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         content: [
           {
             type: "text",
-            text: `Created subtask ${newKey} under ${args.parentKey}: ${args.summary}\nURL: ${inst.baseUrl}/browse/${newKey}`,
+            text: `Created subtask ${newKey} under ${args.parentKey}: ${args.summary}\nURL: ${inst.baseUrl}/browse/${newKey}${teamWarning}`,
           },
         ],
       };
@@ -3286,7 +3441,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         ? getInstanceByName(args.instance)
         : getInstanceForKey(args.issueKey);
       const original = await fetchJira(
-        `/issue/${args.issueKey}?fields=summary,description,priority,labels,components,issuetype,project`,
+        `/issue/${args.issueKey}?fields=summary,description,priority,labels,components,issuetype,project,customfield_10001`,
         {},
         inst,
       );
@@ -3311,6 +3466,24 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       if (of.components?.length > 0) {
         fields.components = of.components.map((c) => ({ name: c.name }));
       }
+      let teamPrompt = "";
+      if (of.customfield_10001) {
+        fields.customfield_10001 = of.customfield_10001;
+      } else if (inst.defaultTeam) {
+        fields.customfield_10001 = inst.defaultTeam.id;
+      } else {
+        try {
+          const teams = await fetchJiraTeams(
+            `/teams/find?query=&excludeMembers=true`, {}, 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).`;
+          }
+        } catch {
+          // Teams API not available, proceed without team
+        }
+      }
 
       const result = await fetchJira("/issue", { method: "POST", body: { fields } }, inst);
       const newKey = result.key;
@@ -3347,7 +3520,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         content: [
           {
             type: "text",
-            text: `Cloned ${args.issueKey} -> ${newKey}: ${prefix}${of.summary}\nURL: ${inst.baseUrl}/browse/${newKey}`,
+            text: `Cloned ${args.issueKey} -> ${newKey}: ${prefix}${of.summary}\nURL: ${inst.baseUrl}/browse/${newKey}${teamPrompt}`,
           },
         ],
       };
@@ -3521,5 +3694,5 @@ if (require.main === module) {
 
 // Export for testing
 if (typeof module !== "undefined") {
-  module.exports = { buildCommentADF, parseInlineFormatting, findJiraTicketKeys };
+  module.exports = { buildCommentADF, parseInlineFormatting, findJiraTicketKeys, resolveTeamId, fetchJiraTeams };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rui.branco/jira-mcp",
-  "version": "1.6.14",
+  "version": "1.6.16",
   "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": {

package/setup.js

@@ -126,17 +126,26 @@ async function setup() {
       console.log(`Existing single-instance config found (${existing.baseUrl})\n`);
     } else {
       console.log("Existing instances:");
+      const missingTeam = [];
       for (const inst of existing.instances) {
         const isDefault = inst.name === existing.defaultInstance ? " (default)" : "";
         const projs = inst.projects?.length > 0 ? ` [${inst.projects.join(", ")}]` : "";
-        console.log(`  - ${inst.name}${isDefault}: ${inst.baseUrl}${projs}`);
+        const team = inst.defaultTeam ? ` | Team: ${inst.defaultTeam.name}` : "";
+        console.log(`  - ${inst.name}${isDefault}: ${inst.baseUrl}${projs}${team}`);
+        if (!inst.defaultTeam) missingTeam.push(inst.name);
+      }
+      if (missingTeam.length > 0) {
+        console.log(`\n  ⚠ No default team: ${missingTeam.join(", ")}`);
       }
       console.log();
     }
 
-    const action = await ask("Add new instance, or fresh setup? (add/fresh): ");
-    if (action.trim().toLowerCase() === "fresh") {
+    const action = await ask("Add new instance, set default team, or fresh setup? (add/team/fresh): ");
+    const choice = action.trim().toLowerCase();
+    if (choice === "fresh") {
       // Fall through to single setup
+    } else if (choice === "team") {
+      return await setInstanceTeam(existing);
     } else {
       // Add instance to multi-instance config
       return await addInstance(existing);
@@ -152,7 +161,12 @@ async function setup() {
   const token = await ask("Jira API token: ");
   const baseUrl = await ask("Jira base URL (e.g., https://company.atlassian.net): ");
 
-  saveConfig({ email, token, baseUrl: baseUrl.replace(/\/$/, "") });
+  const config = { email, token, baseUrl: baseUrl.replace(/\/$/, "") };
+  const authStr = Buffer.from(`${email}:${token}`).toString("base64");
+  const team = await pickDefaultTeam(baseUrl.replace(/\/$/, ""), authStr);
+  if (team) config.defaultTeam = team;
+
+  saveConfig(config);
   console.log(`\nConfig saved to ${configPath}`);
 
   printFigmaStatus();
@@ -160,6 +174,85 @@ async function setup() {
   rl.close();
 }
 
+async function pickDefaultTeam(baseUrl, authStr) {
+  console.log("\nFetching available teams from Jira...");
+  try {
+    const response = await fetch(`${baseUrl}/rest/teams/1.0/teams/find?query=&excludeMembers=true`, {
+      headers: {
+        Authorization: `Basic ${authStr}`,
+        Accept: "application/json",
+      },
+    });
+    if (!response.ok) {
+      console.log("Could not fetch teams (API returned " + response.status + "). Skipping team setup.");
+      return null;
+    }
+    const teams = JSON.parse(await response.text());
+    if (!teams || teams.length === 0) {
+      console.log("No teams found. Skipping team setup.");
+      return null;
+    }
+
+    console.log("\nAvailable teams:");
+    for (let i = 0; i < teams.length; i++) {
+      console.log(`  ${i + 1}. ${teams[i].title}`);
+    }
+    const choice = await ask("\nSelect default team number (or press Enter to skip): ");
+    const idx = parseInt(choice, 10) - 1;
+    if (isNaN(idx) || idx < 0 || idx >= teams.length) {
+      console.log("No default team set.");
+      return null;
+    }
+    const selected = teams[idx];
+    const teamObj = { name: selected.title, id: `${selected.organizationId}-${selected.id}` };
+    console.log(`Default team set to: ${teamObj.name}`);
+    return teamObj;
+  } catch (e) {
+    console.log("Could not fetch teams: " + e.message + ". Skipping team setup.");
+    return null;
+  }
+}
+
+async function setInstanceTeam(config) {
+  if (!config.instances || config.instances.length === 0) {
+    console.log("No instances configured.");
+    rl.close();
+    return;
+  }
+
+  let target;
+  if (config.instances.length === 1) {
+    target = config.instances[0];
+    console.log(`\nConfiguring team for "${target.name}"...`);
+  } else {
+    console.log("\nWhich instance?");
+    for (let i = 0; i < config.instances.length; i++) {
+      const inst = config.instances[i];
+      const team = inst.defaultTeam ? ` (current: ${inst.defaultTeam.name})` : " (no team)";
+      console.log(`  ${i + 1}. ${inst.name}${team}`);
+    }
+    const choice = await ask("Select instance number: ");
+    const idx = parseInt(choice, 10) - 1;
+    if (isNaN(idx) || idx < 0 || idx >= config.instances.length) {
+      console.log("Invalid selection.");
+      rl.close();
+      return;
+    }
+    target = config.instances[idx];
+  }
+
+  const authStr = Buffer.from(`${target.email}:${target.token}`).toString("base64");
+  const team = await pickDefaultTeam(target.baseUrl, authStr);
+  if (team) {
+    target.defaultTeam = team;
+    saveConfig(config);
+    console.log(`\nSaved default team "${team.name}" for instance "${target.name}".`);
+  } else {
+    console.log("No changes made.");
+  }
+  rl.close();
+}
+
 async function addInstance(config) {
   // Migrate old format if needed
   if (config.email && !config.instances) {
@@ -192,13 +285,18 @@ async function addInstance(config) {
   const projectsInput = await ask("Project prefixes (comma-separated, e.g., SIDE,FUN): ");
   const projects = projectsInput.split(",").map((p) => p.trim().toUpperCase()).filter(Boolean);
 
+  const trimmedBaseUrl = baseUrl.trim().replace(/\/$/, "");
+  const authStr = Buffer.from(`${email.trim()}:${token.trim()}`).toString("base64");
+  const team = await pickDefaultTeam(trimmedBaseUrl, authStr);
+
   const instance = {
     name: name.trim(),
     email: email.trim(),
     token: token.trim(),
-    baseUrl: baseUrl.trim().replace(/\/$/, ""),
+    baseUrl: trimmedBaseUrl,
     projects,
   };
+  if (team) instance.defaultTeam = team;
 
   // Replace or add
   const idx = config.instances.findIndex((i) => i.name === instance.name);