consolidate all packages to one central package (#33)

Author: joshuadavidthomas

.github/VERSION

@@ -24,16 +24,10 @@ jobs:
         with:
           enable-cache: true
 
-      - name: Build all packages
+      - name: Build package
         run: |
           uv build
 
-          for package_dir in packages/*/; do
-            if [ -f "$package_dir/pyproject.toml" ]; then
-              uv build --package $(basename "$package_dir")
-            fi
-          done
-
       - name: Upload release assets to GitHub
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -26,6 +26,27 @@ For multi-package releases, use package names as subsections:
 
 ## [Unreleased]
 
+After splitting into separate packages in v2025.8.1 for security isolation, we're consolidating back into a single package, for a few reasons:
+
+- It seemed like a good idea, but it's early and the extra complexity adds unnecessary friction
+- While production deployment would be nice eventually, the current focus is developer tooling and building a damn good MCP server for Django
+
+The GitHub releases were previously using calendar versioning (e.g., v2025.8.1) while individual packages used semantic versioning. With the consolidation to a single package, GitHub releases will now use the package version directly. The consolidated package will be v0.10.0, continuing from the highest version among the previous packages (mcp-django-shell was at 0.9.0).
+
+### Changed
+
+- **BREAKING**: Consolidated mcp-django-shell functionality into main mcp-django package
+- Shell tools are now included by default (no longer optional via extras)
+- Tool names changed: `shell_django_shell` → `django_shell`, `shell_django_reset` → `django_shell_reset`
+
+### Deprecated
+
+- mcp-django-shell package is deprecated, functionality moved to mcp-django
+
+### Removed
+
+- Optional installation extras `[shell]` and `[all]` - shell is now always included
+
 ## [2025.8.1]
 
 - mcp-django: 0.2.0

CHANGELOG.md

@@ -38,35 +38,17 @@ cog.outl(f"- Django {', '.join([version for version in DJ_VERSIONS if version !=
 
 ## Installation
 
-Choose the installation option that fits your use case:
-
-### Core
-
-Provides read-only Django project exploration resources (`django://project`, `django://apps`, `django://models`).
-
 ```bash
-# Read-only resources only - no shell access
 pip install mcp-django
 
 # Or with uv
 uv add mcp-django
 ```
 
-
-### Shell
+## Getting Started
 
 ⚠️ **DO NOT use in production!**
 
-Adds `django_shell` and `django_reset` tools for executing Python code. 
-
-```bash
-# Includes shell tools for code execution
-pip install "mcp-django[shell]"
-
-# Or with uv
-uv add "mcp-django[shell]"
-```
-
 > [!WARNING]
 >
 > **Seriously, only enable in development!** 
@@ -83,18 +65,6 @@ uv add "mcp-django[shell]"
 >
 > I suggest using something like [django-read-only](https://github.com/adamchainz/django-read-only) if you need some CYA protection against this. Or, you know, don't use this in any sensitive environments.
 
-### All
-
-```bash
-# Currently same as [shell]
-pip install "mcp-django[all]"
-
-# Or with uv
-uv add "mcp-django[all]"
-```
-
-## Getting Started
-
 Run the MCP server directly from your Django project directory:
 
 ```bash
@@ -179,29 +149,23 @@ Don't see your client? [Submit a PR](CONTRIBUTING.md) with setup instructions.
 
 ## Features
 
-mcp-django provides an MCP server with Django project exploration resources and optional shell access for LLM assistants. The base package offers safe, read-only resources while the shell extra adds stateful code execution capabilities.
+mcp-django provides an MCP server with Django project exploration resources and stateful shell access for LLM assistants.
 
 It wouldn't be an MCP server README without a gratuitous list of features punctuated by emojis, so:
 
-**Core (mcp-django):**
-
 - 🔍 **Project exploration** - MCP resources for discovering apps, models, and configuration
 - 🚀 **Zero configuration** - No schemas, no settings, just Django
-- 🔒 **Safe by default** - Read-only resources, no code execution
-- 🌐 **Multiple transports** - STDIO, HTTP, SSE support
-
-**Shell (mcp-django[shell]):**
-
 - 🐚 **Stateful shell** - `django_shell` executes Python code in your Django environment
 - 🔄 **Persistent state** - Imports and variables stick around between calls
-- 🧹 **Reset when needed** - `django_reset` clears the session when things get weird
+- 🧹 **Reset when needed** - `django_shell_reset` clears the session when things get weird
 - 🤖 **LLM-friendly** - Designed for LLM assistants that already know Python
 - 📦 **Minimal dependencies** - Just FastMCP and Django (you already have Django)
 - 🎯 **Does one thing well** - Runs code. That's it. That's the feature.
+- 🌐 **Multiple transports** - STDIO, HTTP, SSE support
 
 Inspired by Armin Ronacher's [Your MCP Doesn't Need 30 Tools: It Needs Code](https://lucumr.pocoo.org/2025/8/18/code-mcps/).
 
-### Resources (mcp-django)
+### Resources
 
 Read-only resources are provided for project exploration without executing code (note that resource support varies across MCP clients):
 
@@ -211,12 +175,12 @@ Read-only resources are provided for project exploration without executing code
 
 The idea is to give just enough information about the project to hopefully guide the LLM assistant and prevent needless shell exploration, allowing it to get straight to work.
 
-### Tools (mcp-django-shell)
+### Tools
 
-When installed with the shell extra, two tools handle shell operations and session management:
+Two tools handle shell operations and session management:
 
-- `django_shell` - Execute Python code in a persistent Django shell session
-- `django_reset` - Reset the session, clearing all variables and imports
+- `shell` - Execute Python code in a persistent Django shell session
+- `shell_reset` - Reset the session, clearing all variables and imports
 
 Imports and variables persist between calls within the shell tool, so the LLM can work iteratively - exploring your models, testing queries, debugging issues.
 

README.md

@@ -1,9 +1,5 @@
 # Releasing a New Version
 
-> [!NOTE]
->
-> This is out-of-date and will be updated soon.
-
 When it comes time to cut a new release, follow these steps:
 
 1. Create a new git branch off of `main` for the release.

RELEASING.md

@@ -1,41 +1,12 @@
 # mcp-django-shell
 
-Django shell tools for the [mcp-django](https://github.com/joshuadavidthomas/mcp-django) Model Context Protocol server.
-
-## ⚠️ Security Warning
-
-This package provides unrestricted shell access to your Django project. It executes arbitrary Python code with full access to your database and file system.
-
-**NEVER install this in production environments!**
-
-## Installation
-
-This package is distributed as an optional extra of the main `mcp-django` package:
-
-```bash
-pip install "mcp-django[shell]"
-```
-
-## Features
-
-The `mcp-django-shell` package adds two tools to the base MCP server:
-
-- **`django_shell`** - Execute Python code in a persistent Django shell session
-- **`django_reset`** - Reset the session, clearing all variables and imports
-
-These tools enable LLM assistants to:
-
-- Write and execute Python code directly in your Django environment
-- Maintain state between calls (imports, variables persist)
-- Query and modify your database using the Django ORM
-- Debug and test code interactively
-
-## Documentation
-
-For full documentation, configuration, and usage instructions, see the main package:
-
-[https://github.com/joshuadavidthomas/mcp-django](https://github.com/joshuadavidthomas/mcp-django)
-
-## License
-
-mcp-django-shell is licensed under the MIT license. See the [LICENSE](https://github.com/joshuadavidthomas/mcp-django/blob/main/LICENSE) file for details.
+> [!CAUTION]
+> **This package is deprecated as of version 0.10.0**
+> 
+> The shell functionality has been integrated into the main `mcp-django` package.
+> Please uninstall `mcp-django-shell` and install `mcp-django>=0.10.0` instead.
+>
+> ```bash
+> pip uninstall mcp-django-shell
+> pip install mcp-django>=0.10.0
+> ```

packages/mcp-django-shell/README.md

@@ -51,7 +51,7 @@ dependencies = [
   "mcp-django>=0.1.0,<1.0.0",
   "pydantic[email]>=2.11.7",
 ]
-description = "MCP server providing a stateful Django shell for LLM assistants."
+description = "[DEPRECATED - Use mcp-django instead] MCP server providing a stateful Django shell for LLM assistants."
 license = { file = "LICENSE" }
 name = "mcp-django-shell"
 readme = "README.md"

packages/mcp-django-shell/pyproject.toml

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+import warnings
+
+warnings.warn(
+    "mcp-django-shell is deprecated and will be removed in the next release. "
+    "Shell functionality is now included in mcp-django>=0.10.0. "
+    "Please uninstall mcp-django-shell and install mcp-django instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)