wcgw 4.1.1__tar.gz → 5.0.0__tar.gz

{wcgw-4.1.1 → wcgw-5.0.0}/.github/workflows/python-tests.yml

@@ -25,10 +25,9 @@ jobs:
       - name: Install dependencies
         run: |
           pip install uv
-          uv venv --python "${{ matrix.python-version }}"
       - name: Run tests with coverage
         run: |
-          uv run --python "${{ matrix.python-version }}" pytest --cov=wcgw --cov-report=xml --cov-report=term-missing
+          uv run --group tests --python "${{ matrix.python-version }}" pytest --cov=wcgw --cov-report=xml --cov-report=term-missing
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         if: success()

{wcgw-4.1.1 → wcgw-5.0.0}/.github/workflows/python-types.yml

@@ -25,7 +25,6 @@ jobs:
       - name: Install dependencies
         run: |
           pip install uv
-          uv venv --python "${{ matrix.python-version }}"
       - name: Run type checks
         run: |
-          uv run mypy --strict src/wcgw
+          uv run --group types --python "${{ matrix.python-version }}" mypy --strict src/wcgw

{wcgw-4.1.1 → wcgw-5.0.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 4.1.1
-Summary: Shell and coding agent on claude and chatgpt
+Version: 5.0.0
+Summary: Shell and coding agent for Claude and other mcp clients
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>
 License-File: LICENSE
@@ -21,17 +21,18 @@ Requires-Dist: semantic-version>=2.10.0
 Requires-Dist: syntax-checker>=0.3.0
 Requires-Dist: tokenizers>=0.21.0
 Requires-Dist: toml>=0.10.2
+Requires-Dist: tree-sitter-bash>=0.23.3
+Requires-Dist: tree-sitter>=0.24.0
 Requires-Dist: typer>=0.12.5
 Requires-Dist: uvicorn>=0.31.0
 Requires-Dist: websockets>=13.1
 Description-Content-Type: text/markdown
 
-# Shell and Coding agent for Claude and Chatgpt
+# Shell and Coding agent for Claude and other mcp clients
 
-Empowering chat applications to code, build and run on your local machine.
+Empowering AI to code, build and run on your local machine.
 
-- Claude - MCP server with tightly integrated shell and code editing tools.
-- Chatgpt - Allows custom gpt to talk to your shell via a relay server. (linux, mac, windows on wsl)
+wcgw is an MCP server with tightly integrated shell and code editing tools.
 
 ⚠️ Warning: do not allow BashCommand tool without reviewing the command, it may result in data loss.
 
@@ -117,11 +118,9 @@ Then create or update `claude_desktop_config.json` (~/Library/Application Suppor
       "args": [
         "tool",
         "run",
-        "--from",
-        "wcgw@latest",
         "--python",
         "3.12",
-        "wcgw_mcp"
+        "wcgw@latest"
       ]
     }
   }
@@ -133,10 +132,10 @@ Then restart claude app.
 _If there's an error in setting up_
 
 - If there's an error like "uv ENOENT", make sure `uv` is installed. Then run 'which uv' in the terminal, and use its output in place of "uv" in the configuration.
-- If there's still an issue, check that `uv tool run --from wcgw@latest --python 3.12 wcgw_mcp` runs in your terminal. It should have no output and shouldn't exit.
+- If there's still an issue, check that `uv tool run --python 3.12 wcgw@latest` runs in your terminal. It should have no output and shouldn't exit.
 - Try removing ~/.cache/uv folder
 - Try using `uv` version `0.6.0` for which this tool was tested.
-- Debug the mcp server using `npx @modelcontextprotocol/inspector@0.1.7 uv tool run --from wcgw@latest --python 3.12 wcgw_mcp`
+- Debug the mcp server using `npx @modelcontextprotocol/inspector@0.1.7 uv tool run --python 3.12 wcgw@latest`
 
 ### Windows on wsl
 
@@ -155,11 +154,9 @@ Then add or update the claude config file `%APPDATA%\Claude\claude_desktop_confi
         "uv",
         "tool",
         "run",
-        "--from",
-        "wcgw@latest",
         "--python",
         "3.12",
-        "wcgw_mcp"
+        "wcgw@latest"
       ]
     }
   }
@@ -219,10 +216,6 @@ Commands:
 
 - Select a text and press `cmd+'` and then enter instructions. This will switch the app to Claude and paste a text containing your instructions, file path, workspace dir, and the selected text.
 
-## Chatgpt Setup
-
-Read here: https://github.com/rusiaaman/wcgw/blob/main/openai.md
-
 ## Examples
 
 ![example](https://github.com/rusiaaman/wcgw/blob/main/static/example.jpg?raw=true)
@@ -259,7 +252,7 @@ Add `OPENAI_API_KEY` and `OPENAI_ORG_ID` env variables.
 
 Then run
 
-`uvx --from wcgw@latest wcgw_local  --limit 0.1` # Cost limit $0.1
+`uvx wcgw@latest wcgw_local --limit 0.1` # Cost limit $0.1
 
 You can now directly write messages or press enter key to open vim for multiline message and text pasting.
 
@@ -269,7 +262,7 @@ Add `ANTHROPIC_API_KEY` env variable.
 
 Then run
 
-`uvx --from wcgw@latest wcgw_local --claude`
+`uvx wcgw@latest wcgw_local --claude`
 
 You can now directly write messages or press enter key to open vim for multiline message and text pasting.
 

{wcgw-4.1.1 → wcgw-5.0.0}/README.md

@@ -1,9 +1,8 @@
-# Shell and Coding agent for Claude and Chatgpt
+# Shell and Coding agent for Claude and other mcp clients
 
-Empowering chat applications to code, build and run on your local machine.
+Empowering AI to code, build and run on your local machine.
 
-- Claude - MCP server with tightly integrated shell and code editing tools.
-- Chatgpt - Allows custom gpt to talk to your shell via a relay server. (linux, mac, windows on wsl)
+wcgw is an MCP server with tightly integrated shell and code editing tools.
 
 ⚠️ Warning: do not allow BashCommand tool without reviewing the command, it may result in data loss.
 
@@ -89,11 +88,9 @@ Then create or update `claude_desktop_config.json` (~/Library/Application Suppor
       "args": [
         "tool",
         "run",
-        "--from",
-        "wcgw@latest",
         "--python",
         "3.12",
-        "wcgw_mcp"
+        "wcgw@latest"
       ]
     }
   }
@@ -105,10 +102,10 @@ Then restart claude app.
 _If there's an error in setting up_
 
 - If there's an error like "uv ENOENT", make sure `uv` is installed. Then run 'which uv' in the terminal, and use its output in place of "uv" in the configuration.
-- If there's still an issue, check that `uv tool run --from wcgw@latest --python 3.12 wcgw_mcp` runs in your terminal. It should have no output and shouldn't exit.
+- If there's still an issue, check that `uv tool run --python 3.12 wcgw@latest` runs in your terminal. It should have no output and shouldn't exit.
 - Try removing ~/.cache/uv folder
 - Try using `uv` version `0.6.0` for which this tool was tested.
-- Debug the mcp server using `npx @modelcontextprotocol/inspector@0.1.7 uv tool run --from wcgw@latest --python 3.12 wcgw_mcp`
+- Debug the mcp server using `npx @modelcontextprotocol/inspector@0.1.7 uv tool run --python 3.12 wcgw@latest`
 
 ### Windows on wsl
 
@@ -127,11 +124,9 @@ Then add or update the claude config file `%APPDATA%\Claude\claude_desktop_confi
         "uv",
         "tool",
         "run",
-        "--from",
-        "wcgw@latest",
         "--python",
         "3.12",
-        "wcgw_mcp"
+        "wcgw@latest"
       ]
     }
   }
@@ -191,10 +186,6 @@ Commands:
 
 - Select a text and press `cmd+'` and then enter instructions. This will switch the app to Claude and paste a text containing your instructions, file path, workspace dir, and the selected text.
 
-## Chatgpt Setup
-
-Read here: https://github.com/rusiaaman/wcgw/blob/main/openai.md
-
 ## Examples
 
 ![example](https://github.com/rusiaaman/wcgw/blob/main/static/example.jpg?raw=true)
@@ -231,7 +222,7 @@ Add `OPENAI_API_KEY` and `OPENAI_ORG_ID` env variables.
 
 Then run
 
-`uvx --from wcgw@latest wcgw_local  --limit 0.1` # Cost limit $0.1
+`uvx wcgw@latest wcgw_local --limit 0.1` # Cost limit $0.1
 
 You can now directly write messages or press enter key to open vim for multiline message and text pasting.
 
@@ -241,7 +232,7 @@ Add `ANTHROPIC_API_KEY` env variable.
 
 Then run
 
-`uvx --from wcgw@latest wcgw_local --claude`
+`uvx wcgw@latest wcgw_local --claude`
 
 You can now directly write messages or press enter key to open vim for multiline message and text pasting.
 

{wcgw-4.1.1 → wcgw-5.0.0}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "4.1.1"
-description = "Shell and coding agent on claude and chatgpt"
+version = "5.0.0"
+description = "Shell and coding agent for Claude and other mcp clients"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
@@ -24,6 +24,8 @@ dependencies = [
     "pygit2>=1.16.0",
     "syntax-checker>=0.3.0",
     "psutil>=7.0.0",
+    "tree-sitter>=0.24.0",
+    "tree-sitter-bash>=0.23.3",
 ]
 
 [project.urls]
@@ -43,25 +45,30 @@ packages = ["src/wcgw", "src/mcp_wcgw_fork/src/mcp_wcgw", "src/wcgw_cli"]
 
 [project.scripts]
 wcgw_local = "wcgw_cli:app"
-wcgw = "wcgw:listen"
-wcgw_relay = "wcgw.relay.serve:run"
+wcgw = "wcgw:mcp_server"
 wcgw_mcp = "wcgw:mcp_server"
 
 [tool.uv]
-dev-dependencies = [
+default-groups = []
+
+[dependency-groups]
+types = [
     "mypy>=1.11.2",
     "types-toml>=0.10.8.20240310",
+    "types-pexpect>=4.9.0.20241208",
+    "types-psutil>=7.0.0.20250218",
+    "line-profiler>=4.2.0",
+]
+tests = [
+    "pytest>=8.0.0",
+    "pytest-cov>=4.1.0",
+    "pytest-asyncio>=0.25.3",
+]
+dev = [
     "autoflake",
     "ipython>=8.12.3",
     "gunicorn>=23.0.0",
-    "pytest>=8.0.0",
-    "pytest-cov>=4.1.0",
     "line-profiler>=4.2.0",
-    "pytest-asyncio>=0.25.3",
-    "types-pexpect>=4.9.0.20241208",
-    "types-psutil>=7.0.0.20250218",
-    "tree-sitter>=0.24.0",
-    "tree-sitter-bash>=0.23.3",
 ]
 
 [tool.pytest.ini_options]

wcgw-5.0.0/src/wcgw/__init__.py

@@ -0,0 +1,4 @@
+from .client.mcp_server import main as mcp_server
+
+# Export mcp_server as the default entry point for wcgw
+listen = mcp_server

{wcgw-4.1.1 → wcgw-5.0.0}/src/wcgw/client/bash_state/bash_state.py

@@ -1,6 +1,8 @@
 import datetime
+import json
 import os
 import platform
+import random
 import subprocess
 import threading
 import time
@@ -332,8 +334,49 @@ P = ParamSpec("P")
 R = TypeVar("R")
 
 
+def get_bash_state_dir_xdg() -> str:
+    """Get the XDG directory for storing bash state."""
+    xdg_data_dir = os.environ.get("XDG_DATA_HOME", os.path.expanduser("~/.local/share"))
+    bash_state_dir = os.path.join(xdg_data_dir, "wcgw", "bash_state")
+    os.makedirs(bash_state_dir, exist_ok=True)
+    return bash_state_dir
+
+
+def generate_chat_id() -> str:
+    """Generate a random 4-digit chat ID."""
+    return f"i{random.randint(1000, 9999)}"
+
+
+def save_bash_state_by_id(chat_id: str, bash_state_dict: dict[str, Any]) -> None:
+    """Save bash state to XDG directory with the given chat ID."""
+    if not chat_id:
+        return
+
+    bash_state_dir = get_bash_state_dir_xdg()
+    state_file = os.path.join(bash_state_dir, f"{chat_id}_bash_state.json")
+
+    with open(state_file, "w") as f:
+        json.dump(bash_state_dict, f, indent=2)
+
+
+def load_bash_state_by_id(chat_id: str) -> Optional[dict[str, Any]]:
+    """Load bash state from XDG directory with the given chat ID."""
+    if not chat_id:
+        return None
+
+    bash_state_dir = get_bash_state_dir_xdg()
+    state_file = os.path.join(bash_state_dir, f"{chat_id}_bash_state.json")
+
+    if not os.path.exists(state_file):
+        return None
+
+    with open(state_file) as f:
+        return json.load(f)  # type: ignore
+
+
 class BashState:
     _use_screen: bool
+    _current_chat_id: str
 
     def __init__(
         self,
@@ -345,6 +388,7 @@ class BashState:
         mode: Optional[Modes],
         use_screen: bool,
         whitelist_for_overwrite: Optional[dict[str, "FileWhitelistData"]] = None,
+        chat_id: Optional[str] = None,
     ) -> None:
         self._last_command: str = ""
         self.console = console
@@ -362,6 +406,8 @@ class BashState:
         self._whitelist_for_overwrite: dict[str, FileWhitelistData] = (
             whitelist_for_overwrite or {}
         )
+        # Always ensure we have a chat ID
+        self._current_chat_id = chat_id if chat_id is not None else generate_chat_id()
         self._bg_expect_thread: Optional[threading.Thread] = None
         self._bg_expect_thread_stop_event = threading.Event()
         self._use_screen = use_screen
@@ -585,6 +631,40 @@ class BashState:
         self.cleanup()
         self._init_shell()
 
+    @property
+    def current_chat_id(self) -> str:
+        """Get the current chat ID."""
+        return self._current_chat_id
+
+    def load_state_from_chat_id(self, chat_id: str) -> bool:
+        """
+        Load bash state from a chat ID.
+
+        Args:
+            chat_id: The chat ID to load state from
+
+        Returns:
+            bool: True if state was successfully loaded, False otherwise
+        """
+        # Try to load state from disk
+        loaded_state = load_bash_state_by_id(chat_id)
+        if not loaded_state:
+            return False
+
+        # Parse and load the state
+        parsed_state = BashState.parse_state(loaded_state)
+        self.load_state(
+            parsed_state[0],
+            parsed_state[1],
+            parsed_state[2],
+            parsed_state[3],
+            parsed_state[4],
+            parsed_state[5],
+            parsed_state[5],
+            chat_id,
+        )
+        return True
+
     def serialize(self) -> dict[str, Any]:
         """Serialize BashState to a dictionary for saving"""
         return {
@@ -596,8 +676,14 @@ class BashState:
             },
             "mode": self._mode,
             "workspace_root": self._workspace_root,
+            "chat_id": self._current_chat_id,
         }
 
+    def save_state_to_disk(self) -> None:
+        """Save the current bash state to disk using the chat ID."""
+        state_dict = self.serialize()
+        save_bash_state_by_id(self._current_chat_id, state_dict)
+
     @staticmethod
     def parse_state(
         state: dict[str, Any],
@@ -608,6 +694,7 @@ class BashState:
         Modes,
         dict[str, "FileWhitelistData"],
         str,
+        str,
     ]:
         whitelist_state = state["whitelist_for_overwrite"]
         # Convert serialized whitelist data back to FileWhitelistData objects
@@ -634,6 +721,11 @@ class BashState:
                 for k in whitelist_state
             }
 
+        # Get the chat_id from state, or generate a new one if not present
+        chat_id = state.get("chat_id")
+        if chat_id is None:
+            chat_id = generate_chat_id()
+
         return (
             BashCommandMode.deserialize(state["bash_command_mode"]),
             FileEditMode.deserialize(state["file_edit_mode"]),
@@ -641,6 +733,7 @@ class BashState:
             state["mode"],
             whitelist_dict,
             state.get("workspace_root", ""),
+            chat_id,
         )
 
     def load_state(
@@ -652,6 +745,7 @@ class BashState:
         whitelist_for_overwrite: dict[str, "FileWhitelistData"],
         cwd: str,
         workspace_root: str,
+        chat_id: str,
     ) -> None:
         """Create a new BashState instance from a serialized state dictionary"""
         self._bash_command_mode = bash_command_mode
@@ -661,8 +755,12 @@ class BashState:
         self._write_if_empty_mode = write_if_empty_mode
         self._whitelist_for_overwrite = dict(whitelist_for_overwrite)
         self._mode = mode
+        self._current_chat_id = chat_id
         self.reset_shell()
 
+        # Save state to disk after loading
+        self.save_state_to_disk()
+
     def get_pending_for(self) -> str:
         if isinstance(self._state, datetime.datetime):
             timedelta = datetime.datetime.now() - self._state
@@ -902,6 +1000,15 @@ def execute_bash(
     timeout_s: Optional[float],
 ) -> tuple[str, float]:
     try:
+        # Check if the chat ID matches current
+        if bash_arg.chat_id != bash_state.current_chat_id:
+            # Try to load state from the chat ID
+            if not bash_state.load_state_from_chat_id(bash_arg.chat_id):
+                return (
+                    f"Error: No saved bash state found for chat ID {bash_arg.chat_id}. Please initialize first with this ID.",
+                    0.0,
+                )
+
         output, cost = _execute_bash(bash_state, enc, bash_arg, max_tokens, timeout_s)
 
         # Remove echo if it's a command

{wcgw-4.1.1 → wcgw-5.0.0}/src/wcgw/client/file_ops/diff_edit.py

@@ -11,6 +11,7 @@ class SearchReplaceMatchError(Exception):
         message = f"""
 {message}
 ---
+Edit failed, no changes are applied. You'll have to reapply all search/replace blocks again.
 Retry immediately with same "percentage_to_change" using search replace blocks fixing above error.
 """
         super().__init__(message)

{wcgw-4.1.1 → wcgw-5.0.0}/src/wcgw/client/modes.py

@@ -89,7 +89,6 @@ You are now running in "code_writer" mode.
     - Do not use echo to write multi-line files, always use FileWriteOrEdit tool to update a code.
     - Do not provide code snippets unless asked by the user, instead directly add/edit the code.
     - You should use the provided bash execution, reading and writing file tools to complete objective.
-    - First understand about the project by getting the folder structure (ignoring .git, node_modules, venv, etc.)
     - Do not use artifacts if you have access to the repository and not asked by the user to provide artifacts/snippets. Directly create/update using wcgw tools.
 """
 
@@ -114,13 +113,9 @@ You are now running in "code_writer" mode.
 
 
 WCGW_PROMPT = """
----
-You're an expert software engineer with shell and code knowledge.
-
-Instructions:
+# Instructions
 
     - You should use the provided bash execution, reading and writing file tools to complete objective.
-    - First understand about the project by getting the folder structure (ignoring .git, node_modules, venv, etc.)
     - Do not provide code snippets unless asked by the user, instead directly add/edit the code.
     - Do not install new tools/packages before ensuring no such tools/package or an alternative already exists.
     - Do not use artifacts if you have access to the repository and not asked by the user to provide artifacts/snippets. Directly create/update using wcgw tools
@@ -131,8 +126,6 @@ Instructions:
 Additional instructions:
     Always run `pwd` if you get any file or directory not found error to make sure you're not lost, or to get absolute cwd.
 
-    Always write production ready, syntactically correct code.
-
 
 """
 ARCHITECT_PROMPT = """

{wcgw-4.1.1 → wcgw-5.0.0}/src/wcgw/client/tool_prompts.py

@@ -91,7 +91,7 @@ TOOL_PROMPTS = [
         name="ContextSave",
         description="""
 Saves provided description and file contents of all the relevant file paths or globs in a single text file.
-- Provide random unqiue id or whatever user provided.
+- Provide random 3 word unqiue id or whatever user provided.
 - Leave project path as empty string if no project path""",
     ),
 ]