@shortcut/mcp 0.19.0 → 0.20.0

package/README.md

@@ -14,12 +14,70 @@ The MCP server for [Shortcut](https://shortcut.com).
 
 ## Usage
 
+The only required input is your Shortcut API token. You can find it in your [Shortcut account settings](https://app.shortcut.com/settings/account/api-tokens).
+
+Once you have a valid token, you can pass it to the MCP server as an environement variable or a CLI argument.
+
+Examples:
+
+```json
+"shortcut": {
+  "command": "npx",
+  "args": [
+    "-y",
+    "@shortcut/mcp@latest"
+  ],
+  "env": {
+    "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
+  }
+}
+```
+
+```json
+"shortcut": {
+  "command": "npx",
+  "args": [
+    "-y",
+    "@shortcut/mcp@latest",
+    "SHORTCUT_API_TOKEN=<YOUR_SHORTCUT_API_TOKEN>"
+  ]
+}
+```
+
+Due to an issue in `gemini-cli` that redacts environment variables that contain the word "token", you can also use the alternative name `SHORTCUT_API_TKN` instead of `SHORTCUT_API_TOKEN`. This works for both the environment variable and the CLI argument:
+
+```json
+"shortcut": {
+  "command": "npx",
+  "args": [
+    "-y",
+    "@shortcut/mcp@latest"
+  ],
+  "env": {
+    "SHORTCUT_API_TKN": "<YOUR_SHORTCUT_API_TOKEN>"
+  }
+}
+```
+
+```json
+"shortcut": {
+  "command": "npx",
+  "args": [
+    "-y",
+    "@shortcut/mcp@latest",
+    "SHORTCUT_API_TKN=<YOUR_SHORTCUT_API_TOKEN>"
+  ]
+}
+```
+
+For more information on how to setup the MCP for your tool of choice, see below.
+
 ### Windsurf
 
 See the [official Windsurf docs](https://docs.windsurf.com/windsurf/cascade/mcp) for more information.
 
-1. Open the `Windsurf MCP Configuration Panel`
-2. Click `Add custom server`.
+1. Open the MCP configuration by clicking the `MCPs` icon in the Cascade panel, or navigate to `Windsurf Settings` > `Cascade` > `MCP Servers`.
+2. Click `Add Custom Server` to edit the raw `mcp_config.json` file (located at `~/.codeium/windsurf/mcp_config.json`).
 3. Add the following details and save the file:
 
 ```json
@@ -66,35 +124,27 @@ See the [official Cursor docs](https://docs.cursor.com/context/model-context-pro
 
 ### Claude Code
 
-See the [official Claude Code docs](https://docs.anthropic.com/en/docs/agents-and-tools/claude-code/tutorials#set-up-model-context-protocol-mcp) for more information.
-
-_You can add a new MCP server from the Claude Code CLI. But modifying the json file directly is simpler!_
+See the [official Claude Code docs](https://docs.anthropic.com/en/docs/claude-code/mcp) for more information.
 
-You can either add a new MCP server from the command line:
+Add the MCP server from the command line:
 
 ```shell
-# Grab your Shortcut token here: https://app.shortcut.com/settings/account/api-tokens
-claude mcp add shortcut --transport=stdio -e SHORTCUT_API_TOKEN=$SHORTCUT_API_TOKEN -- npx -y @shortcut/mcp@latest
+claude mcp add shortcut --transport stdio -e SHORTCUT_API_TOKEN=$SHORTCUT_API_TOKEN -- npx -y @shortcut/mcp@latest
 ```
 
-Or you can edit the local JSON file directly:
-
-1. Open the Claude Code configuration file (it should be in `~/.claude.json`).
-2. Find the `projects` > `mcpServers` section and add the following details and save the file:
+Or you can create a `.mcp.json` file in your project root to share with your team:
 
 ```json
 {
-  "projects": {
-    "mcpServers": {
-      "shortcut": {
-        "command": "npx",
-        "args": [
-          "-y",
-          "@shortcut/mcp@latest"
-        ],
-        "env": {
-          "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
-        }
+  "mcpServers": {
+    "shortcut": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@shortcut/mcp@latest"
+      ],
+      "env": {
+        "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
       }
     }
   }
@@ -102,26 +152,72 @@ Or you can edit the local JSON file directly:
 ```
 
 ### Zed
-[Zed MCP Documentation](https://zed.dev/docs/ai/mcp)
-1. Open your `settings.json` file. Instructions [here](https://zed.dev/docs/configuring-zed#settings-files)
-2. Add the following details and save the file:
+
+See the [official Zed MCP docs](https://zed.dev/docs/ai/mcp) for more information.
+
+1. Open your `settings.json` file. Instructions [here](https://zed.dev/docs/configuring-zed#settings-files).
+2. Add the following to the `context_servers` section and save the file:
 
 ```json
+{
   "context_servers": {
     "shortcut": {
-      "settings":{},
-      "command": {
-        "path": "<PATH/TO/NPX>",
-        "args": [
-          "-y",
-          "@shortcut/mcp@latest"
-        ],
-        "env": {
-          "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
-        }
+      "command": "npx",
+      "args": [
+        "-y",
+        "@shortcut/mcp@latest"
+      ],
+      "env": {
+        "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
+      }
+    }
+  }
+}
+```
+
+### VS Code
+
+See the [official VS Code MCP docs](https://code.visualstudio.com/docs/copilot/chat/mcp-servers) for more information.
+
+1. Create (or open) the `.vscode/mcp.json` file in your workspace.
+2. Add the following details and save the file:
+
+```json
+{
+  "servers": {
+    "shortcut": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "@shortcut/mcp@latest"
+      ],
+      "env": {
+        "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
+      }
+    }
+  }
+}
+```
+
+### OpenCode
+
+See the [official OpenCode MCP docs](https://opencode.ai/docs/mcp-servers/) for more information.
+
+Add the following to your `opencode.json` configuration file:
+
+```json
+{
+  "$schema": "https://opencode.ai/config.json",
+  "mcp": {
+    "shortcut": {
+      "type": "local",
+      "command": ["npx", "-y", "@shortcut/mcp@latest"],
+      "environment": {
+        "SHORTCUT_API_TOKEN": "<YOUR_SHORTCUT_API_TOKEN>"
       }
     }
   }
+}
 ```
 
 ## Available Tools
@@ -191,7 +287,7 @@ Or you can edit the local JSON file directly:
 
 ### Documents
 
-- **documents-create** - Create a new document in Shortcut with HTML content
+- **documents-create** - Create a new document in Shortcut with Markdown content
 - **documents-update** - Update content of an existing document by its ID
 - **documents-list** - List all documents in Shortcut
 - **documents-search** - Search for documents
@@ -204,7 +300,8 @@ You can limit the tools available to the LLM by setting the `SHORTCUT_TOOLS` env
 - Tools can be limited by entity type by just adding the entity, eg `stories` or `epics`.
 - Individual tools can also be limitied by their full name, eg `stories-get-by-id` or `epics-search`.
 
-By default, all tools are enabled.
+> [!NOTE]
+> By default, all tools are enabled.
 
 Example:
 
@@ -242,7 +339,8 @@ The following values are accepted in addition to the full tool names listed abov
 
 You can run the MCP server in read-only mode by setting the `SHORTCUT_READONLY` environment variable to `true`. This will disable all tools that modify data in Shortcut.
 
-Additionally, Shortcut now supports **read-only API tokens**, which you can use to ensure that the MCP server is limited to read-only operations at the API level. This provides an additional layer of security since the restriction is enforced by the Shortcut API itself, not just the MCP server. You can create a read-only token from your [Shortcut API tokens settings](https://app.shortcut.com/settings/account/api-tokens).
+> [!TIP]
+> Shortcut supports **read-only API tokens**, which you can use to ensure that the MCP server is limited to read-only operations at the API level. This provides an additional layer of security since the restriction is enforced by the Shortcut API itself, not just the MCP server. You can create a read-only token from your [Shortcut API tokens settings](https://app.shortcut.com/settings/account/api-tokens).
 
 Example:
 
@@ -266,7 +364,8 @@ Example:
 
 ## Issues and Troubleshooting
 
-Before doing anything else, please make sure you are running the latest version!
+> [!IMPORTANT]
+> Before doing anything else, please make sure you are running the latest version!
 
 If you run into problems using this MCP server, you have a couple of options:
 
@@ -277,6 +376,10 @@ You can also check the list of [common issues](#common-issues) below to see if t
 
 ### Common Issues and Solutions
 
+#### MCP fails on startup in Gemini CLI
+
+If you are using the Gemini CLI and the MCP fails with the following error: `✕ Error during discovery for MCP server 'shortcut': MCP error -32000: Connection closed`, it might be due to an issue in Gemini where it redacts environment variables that contain the word `token`. You can either pass the Shortcut token as a CLI argument, or use the alternative name `SHORTCUT_API_TKN` instead of `SHORTCUT_API_TOKEN`. See the [Usage section](#usage) for more information.
+
 #### NPX command not working when using MISE for version management
 
 If you are using MISE for managing Node and NPM versions, you may encounter a "Client closed" error when trying to run the MCP server. Installing this extension into your IDE might help: https://github.com/hverlin/mise-vscode/.

package/dist/{index.js → index.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as ObjectiveTools, c as DocumentTools, d as ShortcutClientWrapper, i as StoryTools, l as BaseTools, n as UserTools, o as IterationTools, r as TeamTools, s as EpicTools, t as WorkflowTools, u as CustomMcpServer } from "./workflows-DYvKtRHR.js";
+import { a as ObjectiveTools, c as DocumentTools, d as ShortcutClientWrapper, i as StoryTools, l as BaseTools, n as UserTools, o as IterationTools, r as TeamTools, s as EpicTools, t as WorkflowTools, u as CustomMcpServer } from "./workflows-GwezThPA.mjs";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { ShortcutClient } from "@shortcut/client";
 import { z } from "zod";
@@ -9,10 +9,10 @@ import { z } from "zod";
 * Tools for managing Shortcut labels.
 */
 var LabelTools = class LabelTools extends BaseTools {
-	static create(client$1, server$1) {
-		const tools = new LabelTools(client$1);
-		server$1.addToolWithReadAccess("labels-list", "List all labels in the Shortcut workspace.", { includeArchived: z.boolean().optional().describe("Whether to include archived labels in the list.").default(false) }, async (params) => await tools.listLabels(params));
-		server$1.addToolWithWriteAccess("labels-create", "Create a new label in Shortcut.", {
+	static create(client, server) {
+		const tools = new LabelTools(client);
+		server.addToolWithReadAccess("labels-list", "List all labels in the Shortcut workspace.", { includeArchived: z.boolean().optional().describe("Whether to include archived labels in the list.").default(false) }, async (params) => await tools.listLabels(params));
+		server.addToolWithWriteAccess("labels-create", "Create a new label in Shortcut.", {
 			name: z.string().min(1).max(128).describe("The name of the new label. Required."),
 			color: z.string().regex(/^#[a-fA-F0-9]{6}$/).optional().describe("The hex color to be displayed with the label (e.g., \"#ff0000\")."),
 			description: z.string().max(1024).optional().describe("A description of the label.")
@@ -47,16 +47,17 @@ var LabelTools = class LabelTools extends BaseTools {
 
 //#endregion
 //#region src/server.ts
-let apiToken = process.env.SHORTCUT_API_TOKEN;
+let apiToken = process.env.SHORTCUT_API_TKN || process.env.SHORTCUT_API_TOKEN;
 let isReadonly = process.env.SHORTCUT_READONLY === "true";
 let enabledTools = (process.env.SHORTCUT_TOOLS || "").split(",").map((tool) => tool.trim()).filter(Boolean);
 if (process.argv.length >= 3) process.argv.slice(2).map((arg) => arg.split("=")).forEach(([name, value]) => {
+	if (name === "SHORTCUT_API_TKN") apiToken = value;
 	if (name === "SHORTCUT_API_TOKEN") apiToken = value;
 	if (name === "SHORTCUT_READONLY") isReadonly = value === "true";
 	if (name === "SHORTCUT_TOOLS") enabledTools = value.split(",").map((tool) => tool.trim()).filter(Boolean);
 });
 if (!apiToken) {
-	console.error("SHORTCUT_API_TOKEN is required");
+	console.error("A Shortcut api token is required.");
 	process.exit(1);
 }
 const server = new CustomMcpServer({

package/dist/{server-http.js → server-http.mjs}

@@ -1,4 +1,4 @@
-import { a as ObjectiveTools, c as DocumentTools, d as ShortcutClientWrapper, i as StoryTools, n as UserTools, o as IterationTools, r as TeamTools, s as EpicTools, t as WorkflowTools, u as CustomMcpServer } from "./workflows-DYvKtRHR.js";
+import { a as ObjectiveTools, c as DocumentTools, d as ShortcutClientWrapper, i as StoryTools, n as UserTools, o as IterationTools, r as TeamTools, s as EpicTools, t as WorkflowTools, u as CustomMcpServer } from "./workflows-GwezThPA.mjs";
 import { ShortcutClient } from "@shortcut/client";
 import { randomUUID } from "node:crypto";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";

package/dist/{workflows-DYvKtRHR.js → workflows-GwezThPA.mjs}

@@ -95,23 +95,23 @@ var ShortcutClientWrapper = class {
 	}
 	async getCurrentUser() {
 		if (this.currentUser) return this.currentUser;
-		const user$1 = (await this.client.getCurrentMemberInfo())?.data;
-		if (!user$1) return null;
-		this.currentUser = user$1;
-		return user$1;
+		const user = (await this.client.getCurrentMemberInfo())?.data;
+		if (!user) return null;
+		this.currentUser = user;
+		return user;
 	}
 	async getUser(userId) {
-		const user$1 = (await this.client.getMember(userId, {}))?.data;
-		if (!user$1) return null;
-		return user$1;
+		const user = (await this.client.getMember(userId, {}))?.data;
+		if (!user) return null;
+		return user;
 	}
 	async getUserMap(userIds) {
 		await this.loadMembers();
-		return new Map(userIds.map((id) => [id, this.userCache.get(id)]).filter((user$1) => user$1[1] !== null));
+		return new Map(userIds.map((id) => [id, this.userCache.get(id)]).filter((user) => user[1] !== null));
 	}
 	async getUsers(userIds) {
 		await this.loadMembers();
-		return userIds.map((id) => this.userCache.get(id)).filter((user$1) => user$1 !== null);
+		return userIds.map((id) => this.userCache.get(id)).filter((user) => user !== null);
 	}
 	async listMembers() {
 		await this.loadMembers();
@@ -477,7 +477,7 @@ var ShortcutClientWrapper = class {
 //#endregion
 //#region package.json
 var name = "@shortcut/mcp";
-var version = "0.19.0";
+var version = "0.20.0";
 
 //#endregion
 //#region src/mcp/CustomMcpServer.ts
@@ -492,10 +492,10 @@ var CustomMcpServer = class extends McpServer {
 		this.readonly = readonly;
 		this.tools = new Set(tools || []);
 	}
-	shouldAddTool(name$1) {
+	shouldAddTool(name) {
 		if (!this.tools.size) return true;
-		const [entityType] = name$1.split("-");
-		if (this.tools.has(entityType) || this.tools.has(name$1)) return true;
+		const [entityType] = name.split("-");
+		if (this.tools.has(entityType) || this.tools.has(name)) return true;
 		return false;
 	}
 	addToolWithWriteAccess(...args) {
@@ -552,10 +552,10 @@ var BaseTools = class {
 	}
 	getSimplifiedMember(entity) {
 		if (!entity) return null;
-		const { id, disabled, role, profile: { is_owner, name: name$1, email_address, mention_name } } = entity;
+		const { id, disabled, role, profile: { is_owner, name, email_address, mention_name } } = entity;
 		return {
 			id,
-			name: name$1,
+			name,
 			email_address,
 			mention_name,
 			role,
@@ -565,13 +565,13 @@ var BaseTools = class {
 	}
 	getSimplifiedStory(entity, kind) {
 		if (!entity) return null;
-		const { id, name: name$1, app_url, archived, group_id, epic_id, iteration_id, workflow_id, workflow_state_id, owner_ids, requested_by_id, estimate, labels, comments, description, external_links, story_links, pull_requests, formatted_vcs_branch_name, branches, parent_story_id, sub_task_story_ids, tasks, custom_fields, blocked, blocker } = entity;
+		const { id, name, app_url, archived, group_id, epic_id, iteration_id, workflow_id, workflow_state_id, owner_ids, requested_by_id, estimate, labels, comments, description, external_links, story_links, pull_requests, formatted_vcs_branch_name, branches, parent_story_id, sub_task_story_ids, tasks, custom_fields, blocked, blocker } = entity;
 		const additionalFields = {};
 		if (kind === "simple") {
 			additionalFields.description = description;
 			additionalFields.estimate = estimate ?? null;
-			additionalFields.comments = (comments || []).filter((c) => !c.deleted).map(({ id: id$1, author_id, text }) => ({
-				id: id$1,
+			additionalFields.comments = (comments || []).filter((c) => !c.deleted).map(({ id, author_id, text }) => ({
+				id,
 				author_id: author_id ?? null,
 				text: text ?? ""
 			}));
@@ -592,7 +592,7 @@ var BaseTools = class {
 		}
 		return {
 			id,
-			name: name$1,
+			name,
 			app_url,
 			archived,
 			team_id: group_id || null,
@@ -609,10 +609,10 @@ var BaseTools = class {
 	}
 	getSimplifiedWorkflow(entity) {
 		if (!entity) return null;
-		const { id, name: name$1, states } = entity;
+		const { id, name, states } = entity;
 		return {
 			id,
-			name: name$1,
+			name,
 			states: states.map((state) => ({
 				id: state.id,
 				name: state.name,
@@ -620,26 +620,30 @@ var BaseTools = class {
 			}))
 		};
 	}
-	getSimplifiedTeam(entity) {
+	getSimplifiedTeam(entity, kind) {
 		if (!entity) return null;
-		const { archived, id, name: name$1, mention_name, member_ids, workflow_ids, default_workflow_id } = entity;
+		const { archived, id, name, mention_name, member_ids, workflow_ids, default_workflow_id } = entity;
+		const additionalFields = {};
+		if (kind === "simple") {
+			additionalFields.member_ids = member_ids;
+			additionalFields.workflow_ids = workflow_ids;
+		}
 		return {
 			id,
-			name: name$1,
-			archived,
+			name,
 			mention_name,
-			member_ids,
-			workflow_ids,
-			default_workflow_id: default_workflow_id ?? null
+			archived,
+			default_workflow_id: default_workflow_id ?? null,
+			...additionalFields
 		};
 	}
 	getSimplifiedObjective(entity) {
 		if (!entity) return null;
-		const { app_url, id, name: name$1, archived, state, categories } = entity;
+		const { app_url, id, name, archived, state, categories } = entity;
 		return {
 			app_url,
 			id,
-			name: name$1,
+			name,
 			archived,
 			state,
 			categories: categories.map((cat) => cat.name)
@@ -647,11 +651,11 @@ var BaseTools = class {
 	}
 	getSimplifiedEpic(entity, kind) {
 		if (!entity) return null;
-		const { id, name: name$1, app_url, archived, group_id, state, milestone_id, comments, description, deadline, owner_ids } = entity;
+		const { id, name, app_url, archived, group_id, state, milestone_id, comments, description, deadline, owner_ids } = entity;
 		const additionalFields = {};
 		if (kind === "simple") {
-			additionalFields.comments = (comments || []).filter((comment) => !comment.deleted).map(({ id: id$1, author_id, text }) => ({
-				id: id$1,
+			additionalFields.comments = (comments || []).filter((comment) => !comment.deleted).map(({ id, author_id, text }) => ({
+				id,
 				author_id,
 				text
 			}));
@@ -660,7 +664,7 @@ var BaseTools = class {
 		}
 		return {
 			id,
-			name: name$1,
+			name,
 			app_url,
 			archived,
 			state,
@@ -672,10 +676,10 @@ var BaseTools = class {
 	}
 	getSimplifiedIteration(entity) {
 		if (!entity) return null;
-		const { id, name: name$1, app_url, group_ids, status, start_date, end_date } = entity;
+		const { id, name, app_url, group_ids, status, start_date, end_date } = entity;
 		return {
 			id,
-			name: name$1,
+			name,
 			app_url,
 			team_ids: group_ids,
 			status,
@@ -683,19 +687,35 @@ var BaseTools = class {
 			end_date
 		};
 	}
-	async getRelatedEntitiesForTeam(entity) {
+	async getRelatedEntitiesForTeam(entity, kind) {
 		if (!entity) return {
 			users: {},
 			workflows: {}
 		};
-		const { member_ids, workflow_ids } = entity;
+		const { member_ids, workflow_ids, default_workflow_id } = entity;
+		if (kind === "list") {
+			if (!default_workflow_id) return {
+				users: {},
+				workflows: {}
+			};
+			const workflows = await this.client.getWorkflowMap([default_workflow_id]);
+			const simplifiedWorkflow = this.getSimplifiedWorkflow(workflows.get(default_workflow_id));
+			if (!simplifiedWorkflow) return {
+				users: {},
+				workflows: {}
+			};
+			return {
+				users: {},
+				workflows: simplifiedWorkflow ? { [default_workflow_id]: simplifiedWorkflow } : {}
+			};
+		}
 		const [users, workflows] = await Promise.all([this.client.getUserMap(member_ids), this.client.getWorkflowMap(workflow_ids)]);
 		return {
 			users: Object.fromEntries(member_ids.map((id) => this.getSimplifiedMember(users.get(id))).filter((member) => member !== null).map((member) => [member.id, member])),
 			workflows: Object.fromEntries(workflow_ids.map((id) => this.getSimplifiedWorkflow(workflows.get(id))).filter((workflow) => workflow !== null).map((workflow) => [workflow.id, workflow]))
 		};
 	}
-	async getRelatedEntitiesForIteration(entity) {
+	async getRelatedEntitiesForIteration(entity, kind) {
 		if (!entity) return {
 			teams: {},
 			users: {},
@@ -703,15 +723,15 @@ var BaseTools = class {
 		};
 		const { group_ids } = entity;
 		const teams = await this.client.getTeamMap(group_ids || []);
-		const relatedEntitiesForTeams = await Promise.all(Array.from(teams.values()).map((team) => this.getRelatedEntitiesForTeam(team)));
+		const relatedEntitiesForTeams = await Promise.all(Array.from(teams.values()).map((team) => this.getRelatedEntitiesForTeam(team, kind)));
 		const { users, workflows } = this.mergeRelatedEntities(relatedEntitiesForTeams);
 		return {
-			teams: Object.fromEntries([...teams.entries()].map(([id, team]) => [id, this.getSimplifiedTeam(team)]).filter(([_, team]) => !!team)),
+			teams: Object.fromEntries([...teams.entries()].map(([id, team]) => [id, this.getSimplifiedTeam(team, kind)]).filter(([_, team]) => !!team)),
 			users,
 			workflows
 		};
 	}
-	async getRelatedEntitiesForEpic(entity) {
+	async getRelatedEntitiesForEpic(entity, kind) {
 		if (!entity) return {
 			users: {},
 			workflows: {},
@@ -729,9 +749,9 @@ var BaseTools = class {
 			this.client.getTeamMap(group_id ? [group_id] : []),
 			milestone_id ? this.client.getMilestone(milestone_id) : null
 		]);
-		const usersForEpic = Object.fromEntries([...usersForEpicMap.entries()].filter(([_, user$1]) => !!user$1).map(([id, user$1]) => [id, this.getSimplifiedMember(user$1)]));
-		const team = this.getSimplifiedTeam(teams.get(group_id || ""));
-		const { users, workflows } = await this.getRelatedEntitiesForTeam(teams.get(group_id || ""));
+		const usersForEpic = Object.fromEntries([...usersForEpicMap.entries()].filter(([_, user]) => !!user).map(([id, user]) => [id, this.getSimplifiedMember(user)]));
+		const team = this.getSimplifiedTeam(teams.get(group_id || ""), kind);
+		const { users, workflows } = await this.getRelatedEntitiesForTeam(teams.get(group_id || ""), kind);
 		const milestone = this.getSimplifiedObjective(fullMilestone);
 		return {
 			users: this.mergeRelatedEntities([usersForEpic, users]),
@@ -754,14 +774,14 @@ var BaseTools = class {
 			iteration_id ? this.client.getIteration(iteration_id) : null,
 			epic_id ? this.client.getEpic(epic_id) : null
 		]);
-		const usersForStory = Object.fromEntries([...fullUsersForStory.entries()].filter(([_, user$1]) => !!user$1).map(([id, user$1]) => [id, this.getSimplifiedMember(user$1)]));
+		const usersForStory = Object.fromEntries([...fullUsersForStory.entries()].filter(([_, user]) => !!user).map(([id, user]) => [id, this.getSimplifiedMember(user)]));
 		const simplifiedIteration = this.getSimplifiedIteration(iteration);
 		const simplifiedEpic = this.getSimplifiedEpic(epic, kind);
 		const teamForStory = teamsForStory.get(group_id || "");
 		const workflowForStory = this.getSimplifiedWorkflow(workflowsForStory.get(workflow_id));
-		const { users: usersForTeam, workflows: workflowsForTeam } = await this.getRelatedEntitiesForTeam(teamForStory);
-		const { users: usersForIteration, workflows: workflowsForIteration, teams: teamsForIteration } = await this.getRelatedEntitiesForIteration(iteration);
-		const { users: usersForEpic, workflows: workflowsForEpic, teams: teamsForEpic, objectives } = await this.getRelatedEntitiesForEpic(epic);
+		const { users: usersForTeam, workflows: workflowsForTeam } = await this.getRelatedEntitiesForTeam(teamForStory, kind);
+		const { users: usersForIteration, workflows: workflowsForIteration, teams: teamsForIteration } = await this.getRelatedEntitiesForIteration(iteration, kind);
+		const { users: usersForEpic, workflows: workflowsForEpic, teams: teamsForEpic, objectives } = await this.getRelatedEntitiesForEpic(epic, kind);
 		const users = this.mergeRelatedEntities([
 			usersForTeam,
 			usersForStory,
@@ -774,7 +794,7 @@ var BaseTools = class {
 			workflowsForEpic,
 			workflowForStory ? { [workflowForStory.id]: workflowForStory } : {}
 		]);
-		const simplifiedStoryTeam = this.getSimplifiedTeam(teamForStory);
+		const simplifiedStoryTeam = this.getSimplifiedTeam(teamForStory, kind);
 		const teams = this.mergeRelatedEntities([
 			teamsForIteration,
 			teamsForEpic,
@@ -809,14 +829,14 @@ var BaseTools = class {
 		};
 	}
 	async getRelatedEntities(entity, kind) {
-		if (entity.entity_type === "group") return this.getRelatedEntitiesForTeam(entity);
-		if (entity.entity_type === "iteration") return this.getRelatedEntitiesForIteration(entity);
-		if (entity.entity_type === "epic") return this.getRelatedEntitiesForEpic(entity);
+		if (entity.entity_type === "group") return this.getRelatedEntitiesForTeam(entity, kind);
+		if (entity.entity_type === "iteration") return this.getRelatedEntitiesForIteration(entity, kind);
+		if (entity.entity_type === "epic") return this.getRelatedEntitiesForEpic(entity, kind);
 		if (entity.entity_type === "story") return this.getRelatedEntitiesForStory(entity, kind);
 		return {};
 	}
 	getSimplifiedEntity(entity, kind) {
-		if (entity.entity_type === "group") return this.getSimplifiedTeam(entity);
+		if (entity.entity_type === "group") return this.getSimplifiedTeam(entity, kind);
 		if (entity.entity_type === "iteration") return this.getSimplifiedIteration(entity);
 		if (entity.entity_type === "epic") return this.getSimplifiedEpic(entity, kind);
 		if (entity.entity_type === "story") return this.getSimplifiedStory(entity, kind);
@@ -998,11 +1018,11 @@ const variations = [
 		t: dateformat
 	})
 ];
-const DATE_REGEXP = /* @__PURE__ */ new RegExp(`^(${variations.join("|")})$`);
+const DATE_REGEXP = new RegExp(`^(${variations.join("|")})$`);
 const date = () => z.string().regex(DATE_REGEXP).optional().describe("The date in \"YYYY-MM-DD\" format, or one of the keywords: \"yesterday\", \"today\", \"tomorrow\", or a date range in the format \"YYYY-MM-DD..YYYY-MM-DD\". The date range can also be open ended by using \"*\" for one of the bounds. Examples: \"2023-01-01\", \"today\", \"2023-01-01..*\" (from Jan 1, 2023 to any future date), \"*.2023-01-31\" (any date up to Jan 31, 2023), \"today..*\" (from today onwards), \"*.yesterday\" (any date up to yesterday). The keywords cannot be used to calculate relative dates (e.g. the following are not valid: \"today-1\" or \"tomorrow+1\").");
 const is = (field) => z.boolean().optional().describe(`Find only entities that are ${field} when true, or only entities that are not ${field} when false.`);
 const has = (field) => z.boolean().optional().describe(`Find only entities that have ${field} when true, or only entities that do not have ${field} when false. Example: hasOwner: true will find stories with an owner, hasOwner: false will find stories without an owner.`);
-const user = (field) => z.string().optional().describe(`Find entities where the ${field} match the specified user. This must either be the user\'s mention name or the keyword "me" for the current user.`);
+const user = (field) => z.string().optional().describe(`Find entities where the ${field} match the specified user. This must either be the user's mention name or the keyword "me" for the current user.`);
 
 //#endregion
 //#region src/tools/epics.ts
@@ -1062,9 +1082,9 @@ var EpicTools = class EpicTools extends BaseTools {
 		if (!epic) throw new Error(`Failed to retrieve Shortcut epic with public ID: ${epicPublicId}`);
 		return this.toResult(`Epic: ${epicPublicId}`, await this.entityWithRelatedEntities(epic, "epic", full));
 	}
-	async createEpic({ name: name$1, owner, teamId: group_id, description }) {
+	async createEpic({ name, owner, teamId: group_id, description }) {
 		const epic = await this.client.createEpic({
-			name: name$1,
+			name,
 			group_id,
 			owner_ids: owner ? [owner] : void 0,
 			description
@@ -1130,9 +1150,9 @@ var IterationTools = class IterationTools extends BaseTools {
 		if (!iteration) throw new Error(`Failed to retrieve Shortcut iteration with public ID: ${iterationPublicId}.`);
 		return this.toResult(`Iteration: ${iterationPublicId}`, await this.entityWithRelatedEntities(iteration, "iteration", full));
 	}
-	async createIteration({ name: name$1, startDate, endDate, teamId, description }) {
+	async createIteration({ name, startDate, endDate, teamId, description }) {
 		const iteration = await this.client.createIteration({
-			name: name$1,
+			name,
 			start_date: startDate,
 			end_date: endDate,
 			group_ids: teamId ? [teamId] : void 0,
@@ -1301,8 +1321,8 @@ The story will be added to the default state for the workflow.
 			iteration: z.number().optional().describe("The iteration id of the iteration the story belongs to"),
 			team: z.string().optional().describe("The team ID or mention name of the team the story belongs to. Required unless a workflow is specified."),
 			workflow: z.number().optional().describe("The workflow ID to add the story to. Required unless a team is specified.")
-		}, async ({ name: name$1, description, type, owner, epic, iteration, team, workflow }) => await tools.createStory({
-			name: name$1,
+		}, async ({ name, description, type, owner, epic, iteration, team, workflow }) => await tools.createStory({
+			name,
 			description,
 			type,
 			owner,
@@ -1418,14 +1438,14 @@ The story will be added to the default state for the workflow.
 		const branchName = story.formatted_vcs_branch_name || this.createBranchName(currentUser, story);
 		return this.toResult(`Branch name for story sc-${storyPublicId}: ${branchName}`);
 	}
-	async createStory({ name: name$1, description, type, owner, epic, iteration, team, workflow }) {
+	async createStory({ name, description, type, owner, epic, iteration, team, workflow }) {
 		if (!workflow && !team) throw new Error("Team or Workflow has to be specified");
 		if (!workflow && team) workflow = (await this.client.getTeam(team))?.workflow_ids?.[0];
 		if (!workflow) throw new Error("Failed to find workflow for team");
 		const fullWorkflow = await this.client.getWorkflow(workflow);
 		if (!fullWorkflow) throw new Error("Failed to find workflow");
 		const story = await this.client.createStory({
-			name: name$1,
+			name,
 			description,
 			story_type: type,
 			owner_ids: owner ? [owner] : [],
@@ -1436,9 +1456,9 @@ The story will be added to the default state for the workflow.
 		});
 		return this.toResult(`Created story: sc-${story.id}`);
 	}
-	async createSubTask({ parentStoryPublicId, name: name$1, description }) {
+	async createSubTask({ parentStoryPublicId, name, description }) {
 		if (!parentStoryPublicId) throw new Error("ID of parent story is required");
-		if (!name$1) throw new Error("Sub-task name is required");
+		if (!name) throw new Error("Sub-task name is required");
 		const parentStory = await this.client.getStory(parentStoryPublicId);
 		if (!parentStory) throw new Error(`Failed to retrieve parent story with public ID: ${parentStoryPublicId}`);
 		const workflow = await this.client.getWorkflow(parentStory.workflow_id);
@@ -1446,7 +1466,7 @@ The story will be added to the default state for the workflow.
 		const workflowState = workflow.states[0];
 		if (!workflowState) throw new Error("Failed to determine default state for sub-task");
 		const subTask = await this.client.createStory({
-			name: name$1,
+			name,
 			description,
 			story_type: parentStory.story_type,
 			epic_id: parentStory.epic_id,
@@ -1592,7 +1612,7 @@ var TeamTools = class TeamTools extends BaseTools {
 			teamPublicId: z.string().describe("The public ID of the team to get"),
 			full: z.boolean().optional().default(false).describe("True to return all team fields from the API. False to return a slim version that excludes uncommon fields")
 		}, async ({ teamPublicId, full }) => await tools.getTeam(teamPublicId, full));
-		server.addToolWithReadAccess("teams-list", "List all Shortcut teams", async () => await tools.getTeams());
+		server.addToolWithReadAccess("teams-list", "List Shortcut teams", { includeArchived: z.boolean().describe("True to include archived teams.").optional().default(false) }, async ({ includeArchived }) => await tools.getTeams(includeArchived));
 		return tools;
 	}
 	async getTeam(teamPublicId, full = false) {
@@ -1600,10 +1620,11 @@ var TeamTools = class TeamTools extends BaseTools {
 		if (!team) return this.toResult(`Team with public ID: ${teamPublicId} not found.`);
 		return this.toResult(`Team: ${team.id}`, await this.entityWithRelatedEntities(team, "team", full));
 	}
-	async getTeams() {
+	async getTeams(includeArchived) {
 		const teams = await this.client.getTeams();
 		if (!teams.length) return this.toResult(`No teams found.`);
-		return this.toResult(`Result (first ${teams.length} shown of ${teams.length} total teams found):`, await this.entitiesWithRelatedEntities(teams, "teams"));
+		const filteredTeams = includeArchived ? teams : teams.filter((team) => !team.archived);
+		return this.toResult(`Result (first ${filteredTeams.length} shown of ${filteredTeams.length} total teams found):`, await this.entitiesWithRelatedEntities(filteredTeams, "teams"));
 	}
 };
 
@@ -1618,9 +1639,9 @@ var UserTools = class UserTools extends BaseTools {
 		return tools;
 	}
 	async getCurrentUser() {
-		const user$1 = await this.client.getCurrentUser();
-		if (!user$1) throw new Error("Failed to retrieve current user.");
-		return this.toResult(`Current user:`, user$1);
+		const user = await this.client.getCurrentUser();
+		if (!user) throw new Error("Failed to retrieve current user.");
+		return this.toResult(`Current user:`, user);
 	}
 	async getCurrentUserTeams() {
 		const teams = await this.client.getTeams();

package/package.json

@@ -1,18 +1,18 @@
 {
 	"name": "@shortcut/mcp",
-	"author": "Shortcut (https://www.shortcut.com)",
+	"version": "0.20.0",
 	"description": "Shortcut MCP Server",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/useshortcut/mcp-server-shortcut.git"
-	},
 	"keywords": [
 		"shortcut",
 		"mcp",
 		"modelcontextprotocol"
 	],
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/useshortcut/mcp-server-shortcut.git"
+	},
 	"license": "MIT",
-	"version": "0.19.0",
+	"author": "Shortcut (https://www.shortcut.com)",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {
@@ -21,17 +21,16 @@
 	"files": [
 		"dist"
 	],
-	"devDependencies": {
-		"@biomejs/biome": "2.0.5",
-		"@types/bun": "latest",
-		"@types/express": "^4.17.21",
-		"bun": "^1.2.5",
-		"husky": "^9.1.7",
-		"pino-pretty": "^13.0.0",
-		"tsdown": "^0.12.9"
-	},
-	"peerDependencies": {
-		"typescript": "^5"
+	"scripts": {
+		"build": "tsdown",
+		"dev:http": "bun run src/server-http.ts",
+		"format": "biome check --write ./",
+		"lint": "biome check ./",
+		"prepare": "husky",
+		"prod:http": "node dist/server-http.js",
+		"prepublish": "bun run build",
+		"test": "bun test",
+		"ts": "tsc -b"
 	},
 	"dependencies": {
 		"@modelcontextprotocol/sdk": "^1.25.1",
@@ -41,15 +40,16 @@
 		"pino-http": "^10.3.0",
 		"zod": "^3.24.4"
 	},
-	"scripts": {
-		"test": "bun test",
-		"format": "biome check --write ./",
-		"lint": "biome check ./",
-		"ts": "tsc -b",
-		"build": "tsdown",
-		"prepublish": "bun run build",
-		"prepare": "husky",
-		"dev:http": "bun run src/server-http.ts",
-		"prod:http": "node dist/server-http.js"
+	"devDependencies": {
+		"@biomejs/biome": "2.3.14",
+		"@types/bun": "latest",
+		"@types/express": "^4.17.21",
+		"bun": "1.3.9",
+		"husky": "9.1.7",
+		"pino-pretty": "^13.0.0",
+		"tsdown": "0.20.3"
+	},
+	"peerDependencies": {
+		"typescript": "^5"
 	}
 }