wcgw 2.1.2__py3-none-any.whl → 2.2.1__py3-none-any.whl

wcgw/client/anthropic_client.py

@@ -24,7 +24,7 @@ import uuid
 from ..types_ import (
     BashCommand,
     BashInteraction,
-    CreateFileNew,
+    WriteIfEmpty,
     FileEditFindReplace,
     FileEdit,
     Keyboard,
@@ -186,7 +186,7 @@ def loop(
 - Only one of send_text, send_specials, send_ascii should be provided.
 - This returns within 5 seconds, for heavy programs keep checking status for upto 10 turns before asking user to continue checking again.
     - Programs don't hang easily, so most likely explanation for no output is usually that the program is still running, and you need to check status again using ["Enter"].
-
+    - Do not send Ctrl-c before checking for status till 10 minutes or whatever is appropriate for the program to finish.
 """,
         ),
         ToolParam(
@@ -198,10 +198,10 @@ def loop(
 """,
         ),
         ToolParam(
-            input_schema=CreateFileNew.model_json_schema(),
-            name="CreateFileNew",
+            input_schema=WriteIfEmpty.model_json_schema(),
+            name="WriteIfEmpty",
             description="""
-- Write content to a new file. Provide file path and content. Use this instead of BashCommand for writing new files.
+- Write content to an empty or non-existent file. Provide file path and content. Use this instead of BashCommand for writing new files.
 - Provide absolute file path only.
 - For editing existing files, use FileEdit instead of this tool.
 """,
@@ -222,6 +222,7 @@ def loop(
             description="""
 - Use absolute file path only.
 - Use SEARCH/REPLACE blocks to edit the file.
+- If the edit fails due to block not matching, please retry with correct block till it matches. Re-read the file to ensure you've all the lines correct.
 """,
         ),
     ]
@@ -495,7 +496,12 @@ System information:
                             )
                         else:
                             _histories.append(
-                                {"role": "assistant", "content": full_response}
+                                {
+                                    "role": "assistant",
+                                    "content": full_response
+                                    if full_response.strip()
+                                    else "...",
+                                }  # Fixes anthropic issue of non empty response only
                             )
 
         except KeyboardInterrupt:

wcgw/client/mcp_server/server.py

@@ -17,7 +17,7 @@ from ..tools import DoneFlag, get_tool_output, which_tool_name, default_enc
 from ...types_ import (
     BashCommand,
     BashInteraction,
-    CreateFileNew,
+    WriteIfEmpty,
     FileEdit,
     Keyboard,
     Mouse,
@@ -106,6 +106,7 @@ async def handle_list_tools() -> list[types.Tool]:
 - Only one of send_text, send_specials, send_ascii should be provided.
 - This returns within 3 seconds, for heavy programs keep checking status for upto 10 turns before asking user to continue checking again.
     - Programs don't hang easily, so most likely explanation for no output is usually that the program is still running, and you need to check status again using ["Enter"].
+    - Do not send Ctrl-c before checking for status till 10 minutes or whatever is appropriate for the program to finish.
 """,
         ),
         ToolParam(
@@ -117,10 +118,10 @@ async def handle_list_tools() -> list[types.Tool]:
 """,
         ),
         ToolParam(
-            inputSchema=CreateFileNew.model_json_schema(),
-            name="CreateFileNew",
+            inputSchema=WriteIfEmpty.model_json_schema(),
+            name="WriteIfEmpty",
             description="""
-- Write content to a new file. Provide file path and content. Use this instead of BashCommand for writing new files.
+- Write content to an empty or non-existent file. Provide file path and content. Use this instead of BashCommand for writing new files.
 - Provide absolute file path only.
 - For editing existing files, use FileEdit instead of this tool.
 """,
@@ -141,6 +142,7 @@ async def handle_list_tools() -> list[types.Tool]:
             description="""
 - Use absolute file path only.
 - Use SEARCH/REPLACE blocks to edit the file.
+- If the edit fails due to block not matching, please retry with correct block till it matches. Re-read the file to ensure you've all the lines correct.
 """
             + diffinstructions,
         ),

wcgw/client/openai_client.py

@@ -23,7 +23,7 @@ import uuid
 from ..types_ import (
     BashCommand,
     BashInteraction,
-    CreateFileNew,
+    WriteIfEmpty,
     FileEdit,
     ReadImage,
     ReadFile,
@@ -195,9 +195,9 @@ def loop(
 """,
         ),
         openai.pydantic_function_tool(
-            CreateFileNew,
+            WriteIfEmpty,
             description="""
-- Write content to a new file. Provide file path and content. Use this instead of BashCommand for writing new files.
+- Write content to an empty or non-existent file. Provide file path and content. Use this instead of BashCommand for writing new files.
 - Provide absolute file path only.
 - For editing existing files, use FileEdit instead of this tool.""",
         ),

wcgw/client/tools.py

@@ -55,7 +55,7 @@ from nltk.metrics.distance import edit_distance  # type: ignore[import-untyped]
 from ..types_ import (
     BashCommand,
     BashInteraction,
-    CreateFileNew,
+    WriteIfEmpty,
     FileEditFindReplace,
     FileEdit,
     Initialize,
@@ -531,12 +531,21 @@ def read_image_from_shell(file_path: str) -> ImageData:
             return ImageData(media_type=image_type, data=image_b64)  # type: ignore
 
 
-def write_file(writefile: CreateFileNew, error_on_exist: bool) -> str:
+def write_file(writefile: WriteIfEmpty, error_on_exist: bool) -> str:
     if not os.path.isabs(writefile.file_path):
         return f"Failure: file_path should be absolute path, current working directory is {BASH_STATE.cwd}"
     else:
         path_ = writefile.file_path
 
+    error_on_exist = (
+        not (
+            len(TOOL_CALLS) > 1
+            and isinstance(TOOL_CALLS[-2], FileEdit)
+            and TOOL_CALLS[-2].file_path == path_
+        )
+        and error_on_exist
+    )
+
     if not BASH_STATE.is_in_docker:
         if error_on_exist and os.path.exists(path_):
             file_data = Path(path_).read_text()
@@ -598,7 +607,7 @@ def find_least_edit_distance_substring(
     content_lines = new_content_lines
     find_lines = find_str.split("\n")
     find_lines = [
-        line.strip() for line in find_lines
+        line.strip() for line in find_lines if line.strip()
     ]  # Remove trailing and leading space for calculating edit distance
     # Slide window and find one with sum of edit distance least
     min_edit_distance = float("inf")
@@ -620,7 +629,7 @@ def find_least_edit_distance_substring(
                 + 1
             )
             min_edit_distance_lines = orig_content_lines[
-                orig_start_index:orig_end_index
+                max(0, orig_start_index - 10) : (orig_end_index + 10)
             ]
     return "\n".join(min_edit_distance_lines), min_edit_distance
 
@@ -638,7 +647,11 @@ def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
                 f"Exact match not found, found with whitespace removed edit distance: {min_edit_distance}"
             )
         raise Exception(
-            f"Error: no match found for the provided `find_lines` in the file. Closest match:\n---\n{closest_match}\n---\nFile not edited"
+            f"""Error: no match found for the provided search block.
+                Requested search block: \n```\n{find_lines}\n```
+                Possible relevant section in the file:\n---\n```\n{closest_match}\n```\n---\nFile not edited
+            \nPlease retry with exact search. Re-read the file if unsure.
+            """
         )
 
     content = content.replace(find_lines, replace_with_lines, 1)
@@ -646,6 +659,24 @@ def edit_content(content: str, find_lines: str, replace_with_lines: str) -> str:
 
 
 def do_diff_edit(fedit: FileEdit) -> str:
+    try:
+        return _do_diff_edit(fedit)
+    except Exception as e:
+        # Try replacing \"
+        try:
+            fedit = FileEdit(
+                file_path=fedit.file_path,
+                file_edit_using_search_replace_blocks=fedit.file_edit_using_search_replace_blocks.replace(
+                    '\\"', '"'
+                ),
+            )
+            return _do_diff_edit(fedit)
+        except Exception:
+            pass
+        raise e
+
+
+def _do_diff_edit(fedit: FileEdit) -> str:
     console.log(f"Editing file: {fedit.file_path}")
 
     if not os.path.isabs(fedit.file_path):
@@ -765,7 +796,7 @@ TOOLS = (
     | BashCommand
     | BashInteraction
     | ResetShell
-    | CreateFileNew
+    | WriteIfEmpty
     | FileEditFindReplace
     | FileEdit
     | AIAssistant
@@ -794,8 +825,8 @@ def which_tool_name(name: str) -> Type[TOOLS]:
         return BashInteraction
     elif name == "ResetShell":
         return ResetShell
-    elif name == "CreateFileNew":
-        return CreateFileNew
+    elif name == "WriteIfEmpty":
+        return WriteIfEmpty
     elif name == "FileEditFindReplace":
         return FileEditFindReplace
     elif name == "FileEdit":
@@ -822,77 +853,31 @@ def which_tool_name(name: str) -> Type[TOOLS]:
         raise ValueError(f"Unknown tool name: {name}")
 
 
+TOOL_CALLS: list[TOOLS] = []
+
+
 def get_tool_output(
-    args: dict[object, object]
-    | Confirmation
-    | BashCommand
-    | BashInteraction
-    | ResetShell
-    | CreateFileNew
-    | FileEditFindReplace
-    | FileEdit
-    | AIAssistant
-    | DoneFlag
-    | ReadImage
-    | Initialize
-    | ReadFile
-    | Mouse
-    | Keyboard
-    | ScreenShot
-    | GetScreenInfo,
+    args: dict[object, object] | TOOLS,
     enc: tiktoken.Encoding,
     limit: float,
     loop_call: Callable[[str, float], tuple[str, float]],
     max_tokens: Optional[int],
 ) -> tuple[list[str | ImageData | DoneFlag], float]:
-    global IS_IN_DOCKER
+    global IS_IN_DOCKER, TOOL_CALLS
     if isinstance(args, dict):
-        adapter = TypeAdapter[
-            Confirmation
-            | BashCommand
-            | BashInteraction
-            | ResetShell
-            | CreateFileNew
-            | FileEditFindReplace
-            | FileEdit
-            | AIAssistant
-            | DoneFlag
-            | ReadImage
-            | ReadFile
-            | Initialize
-            | Mouse
-            | Keyboard
-            | ScreenShot
-            | GetScreenInfo,
-        ](
-            Confirmation
-            | BashCommand
-            | BashInteraction
-            | ResetShell
-            | CreateFileNew
-            | FileEditFindReplace
-            | FileEdit
-            | AIAssistant
-            | DoneFlag
-            | ReadImage
-            | ReadFile
-            | Initialize
-            | Mouse
-            | Keyboard
-            | ScreenShot
-            | GetScreenInfo
-        )
+        adapter = TypeAdapter[TOOLS](TOOLS)
         arg = adapter.validate_python(args)
     else:
         arg = args
     output: tuple[str | DoneFlag | ImageData, float]
+    TOOL_CALLS.append(arg)
     if isinstance(arg, Confirmation):
         console.print("Calling ask confirmation tool")
         output = ask_confirmation(arg), 0.0
     elif isinstance(arg, (BashCommand | BashInteraction)):
         console.print("Calling execute bash tool")
         output = execute_bash(enc, arg, max_tokens, None)
-    elif isinstance(arg, CreateFileNew):
+    elif isinstance(arg, WriteIfEmpty):
         console.print("Calling write file tool")
         output = write_file(arg, True), 0
     elif isinstance(arg, FileEdit):
@@ -915,6 +900,8 @@ def get_tool_output(
         output = reset_shell(), 0.0
     elif isinstance(arg, Initialize):
         console.print("Calling initial info tool")
+        # First force reset
+        reset_shell()
         output = initial_info(), 0.0
     elif isinstance(arg, (Mouse, Keyboard, ScreenShot, GetScreenInfo)):
         console.print(f"Calling {type(arg).__name__} tool")
@@ -974,7 +961,7 @@ class Mdata(BaseModel):
     data: (
         BashCommand
         | BashInteraction
-        | CreateFileNew
+        | WriteIfEmpty
         | ResetShell
         | FileEditFindReplace
         | FileEdit

wcgw/relay/serve.py

@@ -17,7 +17,7 @@ from dotenv import load_dotenv
 from ..types_ import (
     BashCommand,
     BashInteraction,
-    CreateFileNew,
+    WriteIfEmpty,
     FileEditFindReplace,
     FileEdit,
     Initialize,
@@ -31,7 +31,7 @@ class Mdata(BaseModel):
     data: (
         BashCommand
         | BashInteraction
-        | CreateFileNew
+        | WriteIfEmpty
         | ResetShell
         | FileEditFindReplace
         | FileEdit
@@ -99,12 +99,12 @@ async def register_websocket(websocket: WebSocket, uuid: UUID) -> None:
         print(f"Client {uuid} disconnected")
 
 
-class CreateFileNewWithUUID(CreateFileNew):
+class WriteIfEmptyWithUUID(WriteIfEmpty):
     user_id: UUID
 
 
 @app.post("/v1/create_file")
-async def create_file(write_file_data: CreateFileNewWithUUID) -> str:
+async def create_file(write_file_data: WriteIfEmptyWithUUID) -> 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."

wcgw/types_.py

@@ -24,7 +24,7 @@ class ReadImage(BaseModel):
     type: Literal["ReadImage"]
 
 
-class CreateFileNew(BaseModel):
+class WriteIfEmpty(BaseModel):
     file_path: str
     file_content: str
 

{wcgw-2.1.2.dist-info → wcgw-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: wcgw
-Version: 2.1.2
+Version: 2.2.1
 Summary: Shell and coding agent on claude and chatgpt
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>
@@ -9,7 +9,6 @@ Requires-Dist: anthropic>=0.39.0
 Requires-Dist: fastapi>=0.115.0
 Requires-Dist: humanize>=4.11.0
 Requires-Dist: mcp
-Requires-Dist: mypy>=1.11.2
 Requires-Dist: nltk>=3.9.1
 Requires-Dist: openai>=1.46.0
 Requires-Dist: petname>=2.6
@@ -33,12 +32,17 @@ Description-Content-Type: text/markdown
 - Claude - An MCP server on claude desktop for autonomous shell, coding and desktop control agent. (mac only)
 - Chatgpt - Allows custom gpt to talk to your shell via a relay server. (linux or mac)
 
+
+⚠️ Warning: do not use this repo if you aren't scared of "Autonomous shell command execution"
+
 [![Tests](https://github.com/rusiaaman/wcgw/actions/workflows/python-tests.yml/badge.svg?branch=main)](https://github.com/rusiaaman/wcgw/actions/workflows/python-tests.yml)
 [![Mypy strict](https://github.com/rusiaaman/wcgw/actions/workflows/python-types.yml/badge.svg?branch=main)](https://github.com/rusiaaman/wcgw/actions/workflows/python-types.yml)
 [![Build](https://github.com/rusiaaman/wcgw/actions/workflows/python-publish.yml/badge.svg)](https://github.com/rusiaaman/wcgw/actions/workflows/python-publish.yml)
 
 ## Updates
 
+- [9 Dec 2024] [Vscode extension to paste context on Claude app](https://marketplace.visualstudio.com/items?itemName=AmanRusia.wcgw)  
+
 - [01 Dec 2024] Removed author hosted relay server for chatgpt.
 
 - [26 Nov 2024] Introduced claude desktop support through mcp
@@ -143,7 +147,7 @@ The following requirements should be installed and working in the linux docker i
 2. Needs `scrot` to take screenshots.
 3. Needs `convert` from imagemagick to convert images.
 
-## Usage
+### Usage
 
 Wait for a few seconds. You should be able to see this icon if everything goes right.
 
@@ -156,6 +160,13 @@ Then ask claude to execute shell commands, read files, edit files, run your code
 
 If you've run the docker for LLM to access, you can ask it to control the "docker os". If you don't provide the docker container id to it, it'll try to search for available docker using `docker ps` command.
 
+
+### [Optional] Vs code extension 
+https://marketplace.visualstudio.com/items?itemName=AmanRusia.wcgw
+
+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

{wcgw-2.1.2.dist-info → wcgw-2.2.1.dist-info}/RECORD

@@ -1,22 +1,22 @@
 wcgw/__init__.py,sha256=9K2QW7QuSLhMTVbKbBYd9UUp-ZyrfBrxcjuD_xk458k,118
-wcgw/types_.py,sha256=rDz4olJS2zvYC13jzeOppA2tci-tVDyWAqeA5BesAaU,1773
+wcgw/types_.py,sha256=5QM97K3kOJ7vNBgZ1NYmKPqwSe9WfzDImAIvjbRcClo,1772
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
-wcgw/client/anthropic_client.py,sha256=xhJdQps422d0R6YaQX6tpoJdYp4dgX0dgEtODx3WmEM,20381
+wcgw/client/anthropic_client.py,sha256=68JNQAdH9Cg5lWTMKX3SvGNbYqPGyGe02VWWUbLaNss,20938
 wcgw/client/cli.py,sha256=-z0kpDAW3mzfQrQeZfaVJhBCAQY3HXnt9GdgQ8s-u0Y,1003
 wcgw/client/common.py,sha256=grH-yV_4tnTQZ29xExn4YicGLxEq98z-HkEZwH0ReSg,1410
 wcgw/client/computer_use.py,sha256=35NKAlMrxwD0TBlMMRnbCwz4g8TBRGOlcy-cmS-yJ_A,15247
 wcgw/client/diff-instructions.txt,sha256=s5AJKG23JsjwRYhFZFQVvwDpF67vElawrmdXwvukR1A,1683
-wcgw/client/openai_client.py,sha256=u2YQrAswfNil_j6bMxOA4rxscT0TWA-wCgEKbr5rwrE,17868
+wcgw/client/openai_client.py,sha256=xfB96A4qZM7-CUJhyDMqX9rUIzhCw4AtV9ryTKE8SOM,17885
 wcgw/client/openai_utils.py,sha256=YNwCsA-Wqq7jWrxP0rfQmBTb1dI0s7dWXzQqyTzOZT4,2629
 wcgw/client/sys_utils.py,sha256=GajPntKhaTUMn6EOmopENWZNR2G_BJyuVbuot0x6veI,1376
-wcgw/client/tools.py,sha256=kokbgxxBikIK39moSeg5uGvtBUzLXHnP5-d4jywZYRQ,35762
+wcgw/client/tools.py,sha256=e5ul5ZNjvP7UJ8-gubHiNCYjcBIjAPkbkBckKnwKJp4,35724
 wcgw/client/mcp_server/Readme.md,sha256=I8N4dHkTUVGNQ63BQkBMBhCCBTgqGOSF_pUR6iOEiUk,2495
 wcgw/client/mcp_server/__init__.py,sha256=hyPPwO9cabAJsOMWhKyat9yl7OlSmIobaoAZKHu3DMc,381
-wcgw/client/mcp_server/server.py,sha256=_pzphHJxPyqpLP0YtyddYyaCh83K_OyHKkTuWeSVRHw,10935
-wcgw/relay/serve.py,sha256=RUcUeyL4Xt0EEo12Ul6VQjb4tRle4uIdsa85v7XXxEw,8771
+wcgw/client/mcp_server/server.py,sha256=DCclYqC8mRzCti2pztnm8ZkwGeXnzzNlkvi5Yh02D20,11226
+wcgw/relay/serve.py,sha256=KLYjTvM9CfqdxgFOfHM8LUkFGZ9kKyyJunpNdEIFQUk,8766
 wcgw/relay/static/privacy.txt,sha256=s9qBdbx2SexCpC_z33sg16TptmAwDEehMCLz4L50JLc,529
-wcgw-2.1.2.dist-info/METADATA,sha256=i7GFT8uKfejFukjIHWRGMCBDEQXdfAPw_kI8hb_ZRrI,7421
-wcgw-2.1.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-wcgw-2.1.2.dist-info/entry_points.txt,sha256=eKo1omwbAggWlQ0l7GKoR7uV1-j16nk9tK0BhC2Oz_E,120
-wcgw-2.1.2.dist-info/RECORD,,
+wcgw-2.2.1.dist-info/METADATA,sha256=ZI81P-DAaTxkmZmU8tBJ8tYAchOEJ3p0VeRGXpWi3IQ,7939
+wcgw-2.2.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+wcgw-2.2.1.dist-info/entry_points.txt,sha256=eKo1omwbAggWlQ0l7GKoR7uV1-j16nk9tK0BhC2Oz_E,120
+wcgw-2.2.1.dist-info/RECORD,,