diff --git a/.story_kit/stories/upcoming/40_mcp_server_obeys_storykit_port.md b/.story_kit/stories/upcoming/40_mcp_server_obeys_storykit_port.md
new file mode 100644
index 0000000..258feb9
--- /dev/null
+++ b/.story_kit/stories/upcoming/40_mcp_server_obeys_storykit_port.md
@@ -0,0 +1,20 @@
+---
+name: MCP Server Obeys STORYKIT_PORT
+test_plan: pending
+---
+
+# Story 40: MCP Server Obeys STORYKIT_PORT
+
+## User Story
+
+As a developer running the server on a non-default port, I want agent worktrees to automatically discover the correct MCP server URL, so that spawned agents can use MCP tools without manual .mcp.json edits.
+
+## Acceptance Criteria
+
+- [ ] Agent worktrees inherit the correct port from the running server (via STORYKIT_PORT env var or default 3001)
+- [ ] The .mcp.json in agent worktrees points to the actual server port, not a hardcoded value
+- [ ] Existing behaviour (default port 3001) continues to work when STORYKIT_PORT is not set
+
+## Out of Scope
+
+- TBD