wcgw 4.1.2__py3-none-any.whl → 5.0.1__py3-none-any.whl

wcgw/__init__.py

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

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/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/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/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""",
     ),
 ]

wcgw/client/tools.py

@@ -28,13 +28,17 @@ from openai.types.chat import (
 from pydantic import BaseModel, TypeAdapter, ValidationError
 from syntax_checker import check_syntax
 
-from wcgw.client.bash_state.bash_state import get_status
-from wcgw.client.repo_ops.file_stats import (
+from ..client.bash_state.bash_state import (
+    BashState,
+    execute_bash,
+    generate_chat_id,
+    get_status,
+)
+from ..client.repo_ops.file_stats import (
     FileStats,
     load_workspace_stats,
     save_workspace_stats,
 )
-
 from ..types_ import (
     BashCommand,
     CodeWriterMode,
@@ -50,10 +54,6 @@ from ..types_ import (
     ReadImage,
     WriteIfEmpty,
 )
-from .bash_state.bash_state import (
-    BashState,
-    execute_bash,
-)
 from .encoder import EncoderDecoder, get_default_encoder
 from .file_ops.search_replace import (
     DIVIDER_MARKER,
@@ -77,9 +77,6 @@ class Context:
     console: Console
 
 
-INITIALIZED = False
-
-
 def get_mode_prompt(context: Context) -> str:
     mode_prompt = ""
     if context.bash_state.mode == "code_writer":
@@ -104,6 +101,7 @@ def initialize(
     task_id_to_resume: str,
     max_tokens: Optional[int],
     mode: ModesConfig,
+    chat_id: str,
 ) -> tuple[str, Context, dict[str, list[tuple[int, int]]]]:
     # Expand the workspace path
     any_workspace_path = expand_user(any_workspace_path)
@@ -112,21 +110,34 @@ def initialize(
     memory = ""
     loaded_state = None
 
-    if type == "first_call":
-        if task_id_to_resume:
-            try:
-                project_root_path, task_mem, loaded_state = load_memory(
-                    task_id_to_resume,
-                    max_tokens,
-                    lambda x: default_enc.encoder(x),
-                    lambda x: default_enc.decoder(x),
-                )
-                memory = "Following is the retrieved task:\n" + task_mem
-                if os.path.exists(project_root_path):
-                    any_workspace_path = project_root_path
+    # For workspace/mode changes, ensure we're using an existing state if possible
+    if type != "first_call" and chat_id != context.bash_state.current_chat_id:
+        # Try to load state from the chat ID
+        if not context.bash_state.load_state_from_chat_id(chat_id):
+            return (
+                f"Error: No saved bash state found for chat ID {chat_id}",
+                context,
+                {},
+            )
+    del (
+        chat_id
+    )  # No use other than loading correct state before doing actual tool related stuff
 
-            except Exception:
-                memory = f'Error: Unable to load task with ID "{task_id_to_resume}" '
+    # Handle task resumption - this applies only to first_call
+    if type == "first_call" and task_id_to_resume:
+        try:
+            project_root_path, task_mem, loaded_state = load_memory(
+                task_id_to_resume,
+                max_tokens,
+                lambda x: default_enc.encoder(x),
+                lambda x: default_enc.decoder(x),
+            )
+            memory = "Following is the retrieved task:\n" + task_mem
+            if os.path.exists(project_root_path):
+                any_workspace_path = project_root_path
+
+        except Exception:
+            memory = f'Error: Unable to load task with ID "{task_id_to_resume}" '
     elif task_id_to_resume:
         memory = (
             "Warning: task can only be resumed in a new conversation. No task loaded."
@@ -167,6 +178,11 @@ def initialize(
             workspace_root = (
                 str(folder_to_start) if folder_to_start else parsed_state[5]
             )
+            loaded_chat_id = parsed_state[6] if len(parsed_state) > 6 else None
+
+            if not loaded_chat_id:
+                loaded_chat_id = context.bash_state.current_chat_id
+
             if mode == "wcgw":
                 context.bash_state.load_state(
                     parsed_state[0],
@@ -176,6 +192,7 @@ def initialize(
                     {**parsed_state[4], **context.bash_state.whitelist_for_overwrite},
                     str(folder_to_start) if folder_to_start else workspace_root,
                     workspace_root,
+                    loaded_chat_id,
                 )
             else:
                 state = modes_to_state(mode)
@@ -187,6 +204,7 @@ def initialize(
                     {**parsed_state[4], **context.bash_state.whitelist_for_overwrite},
                     str(folder_to_start) if folder_to_start else workspace_root,
                     workspace_root,
+                    loaded_chat_id,
                 )
         except ValueError:
             context.console.print(traceback.format_exc())
@@ -196,6 +214,10 @@ def initialize(
     else:
         mode_changed = is_mode_change(mode, context.bash_state)
         state = modes_to_state(mode)
+        new_chat_id = context.bash_state.current_chat_id
+        if type == "first_call":
+            # Recreate chat id
+            new_chat_id = generate_chat_id()
         # Use the provided workspace path as the workspace root
         context.bash_state.load_state(
             state[0],
@@ -205,6 +227,7 @@ def initialize(
             dict(context.bash_state.whitelist_for_overwrite),
             str(folder_to_start) if folder_to_start else "",
             str(folder_to_start) if folder_to_start else "",
+            new_chat_id,
         )
         if type == "first_call" or mode_changed:
             mode_prompt = get_mode_prompt(context)
@@ -263,10 +286,11 @@ User home directory: {expanduser("~")}
 ---
 
 {memory}
+
+---
+Use chat_id={context.bash_state.current_chat_id} for all wcgw tool calls which take that.
 """
 
-    global INITIALIZED
-    INITIALIZED = True
     return output, context, initial_paths_with_ranges
 
 
@@ -286,8 +310,13 @@ def reset_wcgw(
     starting_directory: str,
     mode_name: Optional[Modes],
     change_mode: ModesConfig,
+    chat_id: str,
 ) -> str:
-    global INITIALIZED
+    # Load state for this chat_id before proceeding with mode/directory changes
+    if chat_id != context.bash_state.current_chat_id:
+        # Try to load state from the chat ID
+        if not context.bash_state.load_state_from_chat_id(chat_id):
+            return f"Error: No saved bash state found for chat ID {chat_id}"
     if mode_name:
         # update modes if they're relative
         if isinstance(change_mode, CodeWriterMode):
@@ -300,7 +329,7 @@ def reset_wcgw(
             change_mode
         )
 
-        # Reset shell with new mode
+        # Reset shell with new mode, using the provided chat ID
         context.bash_state.load_state(
             bash_command_mode,
             file_edit_mode,
@@ -309,9 +338,9 @@ def reset_wcgw(
             dict(context.bash_state.whitelist_for_overwrite),
             starting_directory,
             starting_directory,
+            chat_id,
         )
         mode_prompt = get_mode_prompt(context)
-        INITIALIZED = True
         return (
             f"Reset successful with mode change to {mode_name}.\n"
             + mode_prompt
@@ -325,7 +354,7 @@ def reset_wcgw(
         write_if_empty_mode = context.bash_state.write_if_empty_mode
         mode = context.bash_state.mode
 
-        # Reload state with new directory
+        # Reload state with new directory, using the provided chat ID
         context.bash_state.load_state(
             bash_command_mode,
             file_edit_mode,
@@ -334,8 +363,8 @@ def reset_wcgw(
             dict(context.bash_state.whitelist_for_overwrite),
             starting_directory,
             starting_directory,
+            chat_id,
         )
-    INITIALIZED = True
     return "Reset successful" + get_status(context.bash_state)
 
 
@@ -763,6 +792,15 @@ def file_writing(
     If percentage_changed > 50%, treat content as direct file content.
     Otherwise, treat content as search/replace blocks.
     """
+    # Check if the chat ID matches current
+    if file_writing_args.chat_id != context.bash_state.current_chat_id:
+        # Try to load state from the chat ID
+        if not context.bash_state.load_state_from_chat_id(file_writing_args.chat_id):
+            return (
+                f"Error: No saved bash state found for chat ID {file_writing_args.chat_id}. Please initialize first with this ID.",
+                {},
+            )
+
     # Expand the path before checking if it's absolute
     path_ = expand_user(file_writing_args.file_path)
     if not os.path.isabs(path_):
@@ -852,7 +890,7 @@ def get_tool_output(
     loop_call: Callable[[str, float], tuple[str, float]],
     max_tokens: Optional[int],
 ) -> tuple[list[str | ImageData], float]:
-    global TOOL_CALLS, INITIALIZED
+    global TOOL_CALLS
     if isinstance(args, dict):
         adapter = TypeAdapter[TOOLS](TOOLS, config={"extra": "forbid"})
         arg = adapter.validate_python(args)
@@ -866,8 +904,6 @@ def get_tool_output(
 
     if isinstance(arg, BashCommand):
         context.console.print("Calling execute bash tool")
-        if not INITIALIZED:
-            raise Exception("Initialize tool not called yet.")
 
         output_str, cost = execute_bash(
             context.bash_state, enc, arg, max_tokens, arg.wait_for_seconds
@@ -875,8 +911,6 @@ def get_tool_output(
         output = output_str, cost
     elif isinstance(arg, WriteIfEmpty):
         context.console.print("Calling write file tool")
-        if not INITIALIZED:
-            raise Exception("Initialize tool not called yet.")
 
         result, write_paths = write_file(arg, True, max_tokens, context)
         output = result, 0
@@ -888,8 +922,6 @@ def get_tool_output(
                 file_paths_with_ranges[path] = ranges.copy()
     elif isinstance(arg, FileEdit):
         context.console.print("Calling full file edit tool")
-        if not INITIALIZED:
-            raise Exception("Initialize tool not called yet.")
 
         result, edit_paths = do_diff_edit(arg, max_tokens, context)
         output = result, 0.0
@@ -901,8 +933,6 @@ def get_tool_output(
                 file_paths_with_ranges[path] = ranges.copy()
     elif isinstance(arg, FileWriteOrEdit):
         context.console.print("Calling file writing tool")
-        if not INITIALIZED:
-            raise Exception("Initialize tool not called yet.")
 
         result, write_edit_paths = file_writing(arg, max_tokens, context)
         output = result, 0.0
@@ -944,6 +974,8 @@ def get_tool_output(
                 else os.path.dirname(arg.any_workspace_path)
             )
             workspace_path = workspace_path if os.path.exists(workspace_path) else ""
+
+            # For these specific operations, chat_id is required
             output = (
                 reset_wcgw(
                     context,
@@ -952,6 +984,7 @@ def get_tool_output(
                     if is_mode_change(arg.mode, context.bash_state)
                     else None,
                     arg.mode,
+                    arg.chat_id,
                 ),
                 0.0,
             )
@@ -964,6 +997,7 @@ def get_tool_output(
                 arg.task_id_to_resume,
                 max_tokens,
                 arg.mode,
+                arg.chat_id,
             )
             output = output_, 0.0
             # Since init_paths is already a dictionary mapping file paths to line ranges,
@@ -1009,6 +1043,9 @@ def get_tool_output(
     if file_paths_with_ranges:  # Only add to whitelist if we have paths
         context.bash_state.add_to_whitelist_for_overwrite(file_paths_with_ranges)
 
+    # Save bash_state
+    context.bash_state.save_state_to_disk()
+
     if isinstance(output[0], str):
         context.console.print(str(output[0]))
     else:
@@ -1128,7 +1165,7 @@ def read_file(
     with path.open("r") as f:
         all_lines = f.readlines(10_000_000)
 
-        if all_lines[-1].endswith("\n"):
+        if all_lines and all_lines[-1].endswith("\n"):
             # Special handling of line counts because readlines doesn't consider last empty line as a separate line
             all_lines[-1] = all_lines[-1][:-1]
             all_lines.append("")
@@ -1220,6 +1257,7 @@ if __name__ == "__main__":
                     task_id_to_resume="",
                     mode_name="wcgw",
                     code_writer_config=None,
+                    chat_id="",
                 ),
                 default_enc,
                 0,
@@ -1230,7 +1268,10 @@ if __name__ == "__main__":
         print(
             get_tool_output(
                 Context(BASH_STATE, BASH_STATE.console),
-                BashCommand(action_json=Command(command="pwd")),
+                BashCommand(
+                    action_json=Command(command="pwd"),
+                    chat_id=BASH_STATE.current_chat_id,
+                ),
                 default_enc,
                 0,
                 lambda x, y: ("", 0),
@@ -1259,6 +1300,7 @@ if __name__ == "__main__":
                     file_path="/Users/arusia/repos/wcgw/src/wcgw/client/tools.py",
                     file_content_or_search_replace_blocks="""test""",
                     percentage_to_change=100,
+                    chat_id=BASH_STATE.current_chat_id,
                 ),
                 default_enc,
                 0,

wcgw/types_.py

@@ -2,7 +2,7 @@ import os
 from typing import Any, List, Literal, Optional, Protocol, Sequence, Union
 
 from pydantic import BaseModel as PydanticBaseModel
-from pydantic import PrivateAttr
+from pydantic import Field, PrivateAttr
 
 
 class NoExtraArgs(PydanticBaseModel):
@@ -53,6 +53,9 @@ class Initialize(BaseModel):
     initial_files_to_read: list[str]
     task_id_to_resume: str
     mode_name: Literal["wcgw", "architect", "code_writer"]
+    chat_id: str = Field(
+        description="Use the chat id created in first_call, leave it as empty string if first_call"
+    )
     code_writer_config: Optional[CodeWriterMode] = None
 
     def model_post_init(self, __context: Any) -> None:
@@ -102,6 +105,7 @@ class SendAscii(BaseModel):
 class BashCommand(BaseModel):
     action_json: Command | StatusCheck | SendText | SendSpecials | SendAscii
     wait_for_seconds: Optional[float] = None
+    chat_id: str
 
 
 class ReadImage(BaseModel):
@@ -214,6 +218,7 @@ class FileWriteOrEdit(BaseModel):
     file_path: str
     percentage_to_change: int  # 0.0 to 100.0
     file_content_or_search_replace_blocks: str
+    chat_id: str
 
 
 class ContextSave(BaseModel):

{wcgw-4.1.2.dist-info → wcgw-5.0.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 4.1.2
-Summary: Shell and coding agent on claude and chatgpt
+Version: 5.0.1
+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
@@ -28,12 +28,11 @@ 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.
 
-- 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.
 
@@ -49,6 +48,8 @@ Empowering chat applications to code, build and run on your local machine.
 
 ## Updates
 
+- [27 Apr 2025] Removed support for GPTs over relay server. Only MCP server is supported in version >= 5.
+
 - [24 Mar 2025] Improved writing and editing experience for sonnet 3.7, CLAUDE.md gets loaded automatically.
 
 - [16 Feb 2025] You can now attach to the working terminal that the AI uses. See the "attach-to-terminal" section below.
@@ -119,11 +120,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"
       ]
     }
   }
@@ -135,10 +134,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
 
@@ -157,11 +156,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"
       ]
     }
   }
@@ -221,10 +218,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)
@@ -261,7 +254,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.
 
@@ -271,7 +264,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.2.dist-info → wcgw-5.0.1.dist-info}/RECORD

@@ -1,18 +1,18 @@
-wcgw/__init__.py,sha256=qUofQOAXCGcWr2u_B8U-MIMhhYaBUpUwNDcscvRmYfo,90
+wcgw/__init__.py,sha256=JgAY25VsA208v8E7QTIU0E50nsk-TCJ4FWTEHmnssYU,127
 wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wcgw/types_.py,sha256=mwr2x20yLF85OoHy3pKxtmG834Gnoqrkx3pA8skGsVk,7360
+wcgw/types_.py,sha256=y60Lv_uUA1_sGIfADLUKy7rFPTax8jxor5GGCDKBfZ0,7533
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/common.py,sha256=OCH7Tx64jojz3M3iONUrGMadE07W21DiZs5sOxWX1Qc,1456
 wcgw/client/diff-instructions.txt,sha256=HXYfGvhlDMxmiIX9AbB05wJcptJF_gSIobYhYSqWRJo,1685
 wcgw/client/memory.py,sha256=M0plOGE5WXTEAs7nVLg4eCpVhmSW94ckpg5D0ycWX5I,2927
-wcgw/client/modes.py,sha256=gXm0u5EGQuPYEPZnyAptdzusN0JzLMED_DyErojPE6s,10679
-wcgw/client/tool_prompts.py,sha256=zHJQHb_E44zA3rBIkAudibgP3Zbw0DjA-CKM8qlqmMU,4410
-wcgw/client/tools.py,sha256=JXk6t7iNtP2EK6mdTkMqCquGGQ6TtoIJ8AEhkSith14,43963
-wcgw/client/bash_state/bash_state.py,sha256=hbLBRcBhFCGqHKwxl9b3R1XXAvBLm0P7N7iYpDOh1CM,38190
+wcgw/client/modes.py,sha256=roH6SPBokJMr5IzAlccdI-vJyvyS5vqSMMyth7TE86A,10315
+wcgw/client/tool_prompts.py,sha256=bbyKenE38s2CLnUZ9NN5OqqabsJkfidMR_YWocEAzBU,4417
+wcgw/client/tools.py,sha256=P0wFsPJpnq-Bj6kF0PNxib7yqQXCxJ45nzPAH8xO9hs,45809
+wcgw/client/bash_state/bash_state.py,sha256=dY-dbApCenCOaDMC0BlBaSlI5jRrAZqwrVFqaeb0hGA,41670
 wcgw/client/bash_state/parser/__init__.py,sha256=AnlNSmoQTSoqqlLOLX4P1uXfzc5VGeCGJsGgtisq2zE,207
 wcgw/client/bash_state/parser/bash_statement_parser.py,sha256=9a8vPO1r3_tXmaAcubTQ5UY-NseWlalgm8LZA17LXuY,6058
 wcgw/client/encoder/__init__.py,sha256=Y-8f43I6gMssUCWpX5rLYiAFv3D-JPRs4uNEejPlke8,1514
-wcgw/client/file_ops/diff_edit.py,sha256=eNxFRmVsBfY0ISwfsV5s8rlMwMxTlm6ko150iFFCsT8,18525
+wcgw/client/file_ops/diff_edit.py,sha256=ePJWUctlQYmopIyuLORLYPE6xliX3UooWXofAI2QJEE,18618
 wcgw/client/file_ops/search_replace.py,sha256=TaIPDqjgmTo4oghhO3zIFklq5JjAbx_aPHJ7yEgvDh4,6854
 wcgw/client/mcp_server/Readme.md,sha256=2Z88jj1mf9daYGW1CWaldcJ0moy8owDumhR2glBY3A8,109
 wcgw/client/mcp_server/__init__.py,sha256=mm7xhBIPwJpRT3u-Qsj4cKVMpVyucJoKRlbMP_gRRB0,343
@@ -23,9 +23,6 @@ wcgw/client/repo_ops/path_prob.py,sha256=SWf0CDn37rtlsYRQ51ufSxay-heaQoVIhr1alB9
 wcgw/client/repo_ops/paths_model.vocab,sha256=M1pXycYDQehMXtpp-qAgU7rtzeBbCOiJo4qcYFY0kqk,315087
 wcgw/client/repo_ops/paths_tokens.model,sha256=jiwwE4ae8ADKuTZISutXuM5Wfyc_FBmN5rxTjoNnCos,1569052
 wcgw/client/repo_ops/repo_context.py,sha256=e_w-1VfxWQiZT3r66N13nlmPt6AGm0uvG3A7aYSgaCI,9632
-wcgw/relay/client.py,sha256=BUeEKUsWts8RpYxXwXcyFyjBJhOCS-CxThAlL_-VCOI,3618
-wcgw/relay/serve.py,sha256=vaHxSm4DkWUKLMOnz2cO6ClR2udnaXCWAGl0O_bXvrs,6984
-wcgw/relay/static/privacy.txt,sha256=s9qBdbx2SexCpC_z33sg16TptmAwDEehMCLz4L50JLc,529
 wcgw_cli/__init__.py,sha256=TNxXsTPgb52OhakIda9wTRh91cqoBqgQRx5TxjzQQFU,21
 wcgw_cli/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 wcgw_cli/anthropic_client.py,sha256=R95ht8ct3TgV8PMNzr5yJdAXAmZpozPpyZZ01J9bQHs,19627
@@ -54,8 +51,8 @@ mcp_wcgw/shared/memory.py,sha256=dBsOghxHz8-tycdSVo9kSujbsC8xb_tYsGmuJobuZnw,281
 mcp_wcgw/shared/progress.py,sha256=ymxOsb8XO5Mhlop7fRfdbmvPodANj7oq6O4dD0iUcnw,1048
 mcp_wcgw/shared/session.py,sha256=e44a0LQOW8gwdLs9_DE9oDsxqW2U8mXG3d5KT95bn5o,10393
 mcp_wcgw/shared/version.py,sha256=d2LZii-mgsPIxpshjkXnOTUmk98i0DT4ff8VpA_kAvE,111
-wcgw-4.1.2.dist-info/METADATA,sha256=MDFrRbNsGOwNKkOT6hxkKrVc8Knmj3-E93xpjb8zQiQ,15020
-wcgw-4.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wcgw-4.1.2.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
-wcgw-4.1.2.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
-wcgw-4.1.2.dist-info/RECORD,,
+wcgw-5.0.1.dist-info/METADATA,sha256=Z4gKqY1UZYQ-kV43rzRuaJ0lqwY4WG5kTgXcn_MFUCQ,14840
+wcgw-5.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-5.0.1.dist-info/entry_points.txt,sha256=UnjK-MAH4Qssh0tGJDMeij1oi-oRKokItkknP_BwShE,94
+wcgw-5.0.1.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
+wcgw-5.0.1.dist-info/RECORD,,

{wcgw-4.1.2.dist-info → wcgw-5.0.1.dist-info}/entry_points.txt

@@ -1,5 +1,4 @@
 [console_scripts]
-wcgw = wcgw:listen
+wcgw = wcgw:mcp_server
 wcgw_local = wcgw_cli:app
 wcgw_mcp = wcgw:mcp_server
-wcgw_relay = wcgw.relay.serve:run

wcgw/relay/client.py

@@ -1,95 +0,0 @@
-import importlib.metadata
-import os
-import time
-import traceback
-import uuid
-from typing import Optional
-
-import rich
-import typer
-import websockets
-from typer import Typer
-from websockets.sync.client import connect as syncconnect
-
-from ..client.bash_state.bash_state import BashState
-from ..client.tools import Context, curr_cost, default_enc, get_tool_output
-from ..types_ import Mdata
-
-
-def register_client(server_url: str, client_uuid: str = "") -> None:
-    global default_enc, curr_cost
-    # Generate a unique UUID for this client
-    if not client_uuid:
-        client_uuid = str(uuid.uuid4())
-
-    # Create the WebSocket connection and context
-    the_console = rich.console.Console(style="magenta", highlight=False, markup=False)
-    with BashState(
-        the_console, os.getcwd(), None, None, None, None, True, None
-    ) as bash_state:
-        context = Context(bash_state=bash_state, console=the_console)
-
-        try:
-            with syncconnect(f"{server_url}/{client_uuid}") as websocket:
-                server_version = str(websocket.recv())
-                print(f"Server version: {server_version}")
-                client_version = importlib.metadata.version("wcgw")
-                websocket.send(client_version)
-
-                print(f"Connected. Share this user id with the chatbot: {client_uuid}")
-                while True:
-                    # Wait to receive data from the server
-                    message = websocket.recv()
-                    mdata = Mdata.model_validate_json(message)
-                    if isinstance(mdata.data, str):
-                        raise Exception(mdata)
-                    try:
-                        outputs, cost = get_tool_output(
-                            context,
-                            mdata.data,
-                            default_enc,
-                            0.0,
-                            lambda x, y: ("", 0),
-                            8000,
-                        )
-                        output = outputs[0]
-                        curr_cost += cost
-                        print(f"{curr_cost=}")
-                    except Exception as e:
-                        output = f"GOT EXCEPTION while calling tool. Error: {e}"
-                        context.console.print(traceback.format_exc())
-                    assert isinstance(output, str)
-                    websocket.send(output)
-
-        except (websockets.ConnectionClosed, ConnectionError, OSError):
-            print(f"Connection closed for UUID: {client_uuid}, retrying")
-            time.sleep(0.5)
-            register_client(server_url, client_uuid)
-
-
-run = Typer(pretty_exceptions_show_locals=False, no_args_is_help=True)
-
-
-@run.command()
-def app(
-    server_url: str = "",
-    client_uuid: Optional[str] = None,
-    version: bool = typer.Option(False, "--version", "-v"),
-) -> None:
-    if version:
-        version_ = importlib.metadata.version("wcgw")
-        print(f"wcgw version: {version_}")
-        exit()
-    if not server_url:
-        server_url = os.environ.get("WCGW_RELAY_SERVER", "")
-        if not server_url:
-            print(
-                "Error: Please provide relay server url using --server_url or WCGW_RELAY_SERVER environment variable"
-            )
-            print(
-                "\tNOTE: you need to run a relay server first, author doesn't host a relay server anymore."
-            )
-            print("\thttps://github.com/rusiaaman/wcgw/blob/main/openai.md")
-            print("\tExample `--server-url=ws://localhost:8000/v1/register`")
-            raise typer.Exit(1)
-    register_client(server_url, client_uuid or "")

wcgw/relay/serve.py

@@ -1,261 +0,0 @@
-import asyncio
-import threading
-import time
-from importlib import metadata
-from typing import Any, Callable, Coroutine, DefaultDict, Optional
-from uuid import UUID
-
-import fastapi
-import semantic_version  # type: ignore[import-untyped]
-import uvicorn
-from dotenv import load_dotenv
-from fastapi import WebSocket, WebSocketDisconnect
-from fastapi.staticfiles import StaticFiles
-from pydantic import BaseModel
-
-from ..types_ import (
-    BashCommand,
-    ContextSave,
-    FileWriteOrEdit,
-    Initialize,
-    ReadFiles,
-)
-
-
-class Mdata(BaseModel):
-    data: BashCommand | FileWriteOrEdit | ReadFiles | Initialize | ContextSave | str
-    user_id: UUID
-
-
-app = fastapi.FastAPI()
-
-clients: dict[UUID, Callable[[Mdata], Coroutine[None, None, None]]] = {}
-websockets: dict[UUID, WebSocket] = {}
-gpts: dict[UUID, Callable[[str], None]] = {}
-
-images: DefaultDict[UUID, dict[str, dict[str, Any]]] = DefaultDict(dict)
-
-
-CLIENT_VERSION_MINIMUM = "2.7.0"
-
-
-@app.websocket("/v1/register/{uuid}")
-async def register_websocket(websocket: WebSocket, uuid: UUID) -> None:
-    await websocket.accept()
-
-    # send server version
-    version = metadata.version("wcgw")
-    await websocket.send_text(version)
-
-    # receive client version
-    client_version = await websocket.receive_text()
-    sem_version_client = semantic_version.Version.coerce(client_version)
-    sem_version_server = semantic_version.Version.coerce(CLIENT_VERSION_MINIMUM)
-    if sem_version_client < sem_version_server:
-        await websocket.send_text(
-            Mdata(
-                user_id=uuid,
-                data=f"Client version {client_version} is outdated. Please upgrade to {CLIENT_VERSION_MINIMUM} or higher.",
-            ).model_dump_json()
-        )
-        await websocket.close(
-            reason="Client version outdated. Please upgrade to the latest version.",
-            code=1002,
-        )
-        return
-
-    # Register the callback for this client UUID
-    async def send_data_callback(data: Mdata) -> None:
-        await websocket.send_text(data.model_dump_json())
-
-    clients[uuid] = send_data_callback
-    websockets[uuid] = websocket
-
-    try:
-        while True:
-            received_data = await websocket.receive_text()
-            if uuid not in gpts:
-                raise fastapi.HTTPException(status_code=400, detail="No call made")
-            gpts[uuid](received_data)
-    except WebSocketDisconnect:
-        # Remove the client if the WebSocket is disconnected
-        del clients[uuid]
-        del websockets[uuid]
-        print(f"Client {uuid} disconnected")
-
-
-class FileWriteOrEdithUUID(FileWriteOrEdit):
-    user_id: UUID
-
-
-@app.post("/v1/file_write_or_edit")
-async def file_write_or_edit(write_file_data: FileWriteOrEdithUUID) -> str:
-    user_id = write_file_data.user_id
-    if user_id not in clients:
-        return "Failure: id not found, ask the user to check it."
-
-    results: Optional[str] = None
-
-    def put_results(result: str) -> None:
-        nonlocal results
-        results = result
-
-    gpts[user_id] = put_results
-
-    await clients[user_id](Mdata(data=write_file_data, user_id=user_id))
-
-    start_time = time.time()
-    while time.time() - start_time < 30:
-        if results is not None:
-            return results
-        await asyncio.sleep(0.1)
-
-    raise fastapi.HTTPException(status_code=500, detail="Timeout error")
-
-
-class CommandWithUUID(BashCommand):
-    user_id: UUID
-
-
-@app.post("/v1/bash_command")
-async def bash_command(command: CommandWithUUID) -> str:
-    user_id = command.user_id
-    if user_id not in clients:
-        return "Failure: id not found, ask the user to check it."
-
-    results: Optional[str] = None
-
-    def put_results(result: str) -> None:
-        nonlocal results
-        results = result
-
-    gpts[user_id] = put_results
-
-    await clients[user_id](
-        Mdata(
-            data=BashCommand(
-                action_json=command.action_json,
-                wait_for_seconds=command.wait_for_seconds,
-            ),
-            user_id=user_id,
-        )
-    )
-
-    start_time = time.time()
-    while time.time() - start_time < 30:
-        if results is not None:
-            return results
-        await asyncio.sleep(0.1)
-
-    raise fastapi.HTTPException(status_code=500, detail="Timeout error")
-
-
-class ReadFileWithUUID(ReadFiles):
-    user_id: UUID
-
-
-@app.post("/v1/read_file")
-async def read_file_endpoint(read_file_data: ReadFileWithUUID) -> str:
-    user_id = read_file_data.user_id
-    if user_id not in clients:
-        return "Failure: id not found, ask the user to check it."
-
-    results: Optional[str] = None
-
-    def put_results(result: str) -> None:
-        nonlocal results
-        results = result
-
-    gpts[user_id] = put_results
-
-    await clients[user_id](Mdata(data=read_file_data, user_id=user_id))
-
-    start_time = time.time()
-    while time.time() - start_time < 30:
-        if results is not None:
-            return results
-        await asyncio.sleep(0.1)
-
-    raise fastapi.HTTPException(status_code=500, detail="Timeout error")
-
-
-class InitializeWithUUID(Initialize):
-    user_id: UUID
-
-
-@app.post("/v1/initialize")
-async def initialize(initialize_data: InitializeWithUUID) -> str:
-    user_id = initialize_data.user_id
-    if user_id not in clients:
-        return "Failure: id not found, ask the user to check it."
-
-    results: Optional[str] = None
-
-    def put_results(result: str) -> None:
-        nonlocal results
-        results = result
-
-    gpts[user_id] = put_results
-
-    await clients[user_id](Mdata(data=initialize_data, user_id=user_id))
-
-    start_time = time.time()
-    while time.time() - start_time < 30:
-        if results is not None:
-            return results
-        await asyncio.sleep(0.1)
-
-    raise fastapi.HTTPException(status_code=500, detail="Timeout error")
-
-
-class ContextSaveWithUUID(ContextSave):
-    user_id: UUID
-
-
-@app.post("/v1/context_save")
-async def context_save(context_save_data: ContextSaveWithUUID) -> str:
-    user_id = context_save_data.user_id
-    if user_id not in clients:
-        return "Failure: id not found, ask the user to check it."
-
-    results: Optional[str] = None
-
-    def put_results(result: str) -> None:
-        nonlocal results
-        results = result
-
-    gpts[user_id] = put_results
-
-    await clients[user_id](Mdata(data=context_save_data, user_id=user_id))
-
-    start_time = time.time()
-    while time.time() - start_time < 30:
-        if results is not None:
-            return results
-        await asyncio.sleep(0.1)
-
-    raise fastapi.HTTPException(status_code=500, detail="Timeout error")
-
-
-app.mount("/static", StaticFiles(directory="static"))
-
-
-def run() -> None:
-    load_dotenv()
-
-    uvicorn_thread = threading.Thread(
-        target=uvicorn.run,
-        args=(app,),
-        kwargs={
-            "host": "0.0.0.0",
-            "port": 8000,
-            "log_level": "info",
-            "access_log": True,
-        },
-    )
-    uvicorn_thread.start()
-    uvicorn_thread.join()
-
-
-if __name__ == "__main__":
-    run()

wcgw/relay/static/privacy.txt

@@ -1,7 +0,0 @@
-Privacy Policy
-I do not collect, store, or share any personal data.
-The data from your terminal is not stored anywhere and it's not logged or collected in any form.
-There is a relay webserver for connecting your terminal to chatgpt the source code for which is open at https://github.com/rusiaaman/wcgw/tree/main/src/relay that you can run on your own.
-Other than the relay webserver there is no further involvement of my servers or services.
-Feel free to me contact at info@arcfu.com for questions on privacy or anything else.
-