wcgw 3.0.3__tar.gz → 3.0.5__tar.gz

{wcgw-3.0.3 → wcgw-3.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 3.0.3
+Version: 3.0.5
 Summary: Shell and coding agent on claude and chatgpt
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>

{wcgw-3.0.3 → wcgw-3.0.5}/gpt_action_json_schema.json

@@ -310,7 +310,7 @@
       },
       "CommandWithUUID": {
         "properties": {
-          "action": {
+          "action_json": {
             "anyOf": [
               {
                 "$ref": "#/components/schemas/Command"
@@ -328,7 +328,7 @@
                 "$ref": "#/components/schemas/SendAscii"
               }
             ],
-            "title": "Action"
+            "title": "ActionJson"
           },
           "wait_for_seconds": {
             "anyOf": [
@@ -350,7 +350,7 @@
         "additionalProperties": false,
         "type": "object",
         "required": [
-          "action",
+          "action_json",
           "user_id"
         ],
         "title": "CommandWithUUID"

{wcgw-3.0.3 → wcgw-3.0.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "3.0.3"
+version = "3.0.5"
 description = "Shell and coding agent on claude and chatgpt"
 readme = "README.md"
 requires-python = ">=3.11"

{wcgw-3.0.3 → wcgw-3.0.5}/src/wcgw/client/bash_state/bash_state.py

@@ -468,16 +468,6 @@ class BashState:
         cwd: str,
     ) -> None:
         """Create a new BashState instance from a serialized state dictionary"""
-        if (
-            self._bash_command_mode == bash_command_mode
-            and ((self._cwd == cwd) or not cwd)
-            and (self._file_edit_mode == file_edit_mode)
-            and (self._write_if_empty_mode == write_if_empty_mode)
-            and (self._mode == mode)
-            and (self._whitelist_for_overwrite == set(whitelist_for_overwrite))
-        ):
-            # No need to reset shell if the state is the same
-            return
         self._bash_command_mode = bash_command_mode
         self._cwd = cwd or self._cwd
         self._file_edit_mode = file_edit_mode
@@ -585,12 +575,12 @@ def get_status(bash_state: BashState) -> str:
 
 def is_status_check(arg: BashCommand) -> bool:
     return (
-        isinstance(arg.action, StatusCheck)
+        isinstance(arg.action_json, StatusCheck)
         or (
-            isinstance(arg.action, SendSpecials)
-            and arg.action.send_specials == ["Enter"]
+            isinstance(arg.action_json, SendSpecials)
+            and arg.action_json.send_specials == ["Enter"]
         )
-        or (isinstance(arg.action, SendAscii) and arg.action.send_ascii == [10])
+        or (isinstance(arg.action_json, SendAscii) and arg.action_json.send_ascii == [10])
     )
 
 
@@ -605,8 +595,8 @@ def execute_bash(
         output, cost = _execute_bash(bash_state, enc, bash_arg, max_tokens, timeout_s)
 
         # Remove echo if it's a command
-        if isinstance(bash_arg.action, Command):
-            command = bash_arg.action.command.strip()
+        if isinstance(bash_arg.action_json, Command):
+            command = bash_arg.action_json.command.strip()
             if output.startswith(command):
                 output = output[len(command) :]
 
@@ -624,7 +614,7 @@ def _execute_bash(
 ) -> tuple[str, float]:
     try:
         is_interrupt = False
-        command_data = bash_arg.action
+        command_data = bash_arg.action_json
 
         if isinstance(command_data, Command):
             if bash_state.bash_command_mode.allowed_commands == "none":

{wcgw-3.0.3 → wcgw-3.0.5}/src/wcgw/client/tools.py

@@ -324,7 +324,7 @@ def try_open_file(file_path: str) -> None:
                 break
             except:
                 continue
-    
+
     # Try to open the file if a command is available
     if open_cmd:
         try:
@@ -698,7 +698,7 @@ def get_tool_output(
         context.console.print("Calling task memory tool")
         relevant_files = []
         warnings = ""
-        arg.project_root_path = os.path.expanduser(arg.project_root_path) 
+        arg.project_root_path = os.path.expanduser(arg.project_root_path)
         for fglob in arg.relevant_file_globs:
             fglob = expand_user(fglob)
             if not os.path.isabs(fglob) and arg.project_root_path:
@@ -708,7 +708,9 @@ def get_tool_output(
             if not globs:
                 warnings += f"Warning: No files found for the glob: {fglob}\n"
         relevant_files_data = read_files(relevant_files[:10_000], None, context)
-        save_path = save_memory(arg, relevant_files_data, context.bash_state.serialize())
+        save_path = save_memory(
+            arg, relevant_files_data, context.bash_state.serialize()
+        )
         if not relevant_files and arg.relevant_file_globs:
             output_ = f'Error: No files found for the given globs. Context file successfully saved at "{save_path}", but please fix the error.'
         elif warnings:

{wcgw-3.0.3 → wcgw-3.0.5}/src/wcgw/relay/serve.py

@@ -179,7 +179,7 @@ async def bash_command(command: CommandWithUUID) -> str:
     await clients[user_id](
         Mdata(
             data=BashCommand(
-                action=command.action, wait_for_seconds=command.wait_for_seconds
+                action_json=command.action_json, wait_for_seconds=command.wait_for_seconds
             ),
             user_id=user_id,
         )

{wcgw-3.0.3 → wcgw-3.0.5}/src/wcgw/types_.py

@@ -19,7 +19,7 @@ class CodeWriterMode(BaseModel):
     allowed_globs: Literal["all"] | list[str]
     allowed_commands: Literal["all"] | list[str]
 
-    def __post_init__(self) -> None:
+    def model_post_init(self, _: Any) -> None:
         # Patch frequently wrong output trading off accuracy
         # in rare case there's a file named 'all' or a command named 'all'
         if len(self.allowed_commands) == 1:
@@ -99,7 +99,7 @@ class SendAscii(BaseModel):
 
 
 class BashCommand(BaseModel):
-    action: Command | StatusCheck | SendText | SendSpecials | SendAscii
+    action_json: Command | StatusCheck | SendText | SendSpecials | SendAscii
     wait_for_seconds: Optional[float] = None
 
 

{wcgw-3.0.3 → wcgw-3.0.5}/tests/test_mcp_server.py

@@ -140,10 +140,10 @@ async def test_handle_list_tools():
             assert properties["initial_files_to_read"]["type"] == "array"
         elif tool.name == "BashCommand":
             properties = tool.inputSchema["properties"]
-            assert "action" in properties
+            assert "action_json" in properties
             assert "wait_for_seconds" in properties
             # Check type field has all the command types
-            type_properties = properties["action"]["anyOf"]
+            type_properties = properties["action_json"]["anyOf"]
             type_refs = set(p["$ref"].split("/")[-1] for p in type_properties)
             required_types = {
                 "Command",
@@ -180,7 +180,7 @@ async def test_handle_call_tool(setup_bash_state):
     assert "Initialize" in result[0].text
 
     # Test JSON string argument handling
-    json_args = {"action": {"command": "ls"}, "wait_for_seconds": None}
+    json_args = {"action_json": {"command": "ls"}, "wait_for_seconds": None}
     result = await handle_call_tool("BashCommand", json_args)
     assert isinstance(result, list)
 
@@ -200,7 +200,7 @@ async def test_handle_call_tool(setup_bash_state):
         side_effect=Exception("Test error"),
     ):
         result = await handle_call_tool(
-            "BashCommand", {"action": {"command": "ls"}, "wait_for_seconds": None}
+            "BashCommand", {"action_json": {"command": "ls"}, "wait_for_seconds": None}
         )
         assert "GOT EXCEPTION" in result[0].text
 

{wcgw-3.0.3 → wcgw-3.0.5}/tests/test_tools.py

@@ -275,7 +275,7 @@ def test_bash_command(context: Context, temp_dir: str) -> None:
     get_tool_output(context, init_args, default_enc, 1.0, lambda x, y: ("", 0.0), None)
 
     # Test when nothing is running
-    cmd = BashCommand(action=StatusCheck(status_check=True))
+    cmd = BashCommand(action_json=StatusCheck(status_check=True))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -283,14 +283,14 @@ def test_bash_command(context: Context, temp_dir: str) -> None:
     assert "No running command to check status of" in outputs[0]
 
     # Start a command and check status
-    cmd = BashCommand(action=Command(command="sleep 1"), wait_for_seconds=0.1)
+    cmd = BashCommand(action_json=Command(command="sleep 1"), wait_for_seconds=0.1)
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "status = still running" in outputs[0]
 
     # Check status while command is running
-    status_check = BashCommand(action=StatusCheck(status_check=True))
+    status_check = BashCommand(action_json=StatusCheck(status_check=True))
     outputs, _ = get_tool_output(
         context, status_check, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -298,7 +298,7 @@ def test_bash_command(context: Context, temp_dir: str) -> None:
     assert "status = process exited" in outputs[0]
 
     # Test simple command
-    cmd = BashCommand(action=Command(command="echo 'hello world'"))
+    cmd = BashCommand(action_json=Command(command="echo 'hello world'"))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -321,7 +321,7 @@ def test_interaction_commands(context: Context, temp_dir: str) -> None:
     get_tool_output(context, init_args, default_enc, 1.0, lambda x, y: ("", 0.0), None)
 
     # Test text interaction
-    cmd = BashCommand(action=SendText(send_text="hello"))
+    cmd = BashCommand(action_json=SendText(send_text="hello"))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -329,7 +329,7 @@ def test_interaction_commands(context: Context, temp_dir: str) -> None:
     assert isinstance(outputs[0], str)
 
     # Test special keys
-    cmd = BashCommand(action=SendSpecials(send_specials=["Enter"]))
+    cmd = BashCommand(action_json=SendSpecials(send_specials=["Enter"]))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -338,7 +338,7 @@ def test_interaction_commands(context: Context, temp_dir: str) -> None:
     assert "status = process exited" in outputs[0]
 
     #  Send ctrl-c
-    cmd = BashCommand(action=SendAscii(send_ascii=[3]))  # Ctrl-C
+    cmd = BashCommand(action_json=SendAscii(send_ascii=[3]))  # Ctrl-C
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -347,28 +347,28 @@ def test_interaction_commands(context: Context, temp_dir: str) -> None:
     assert "status = process exited" in outputs[0]
 
     # Test interactions with long running command
-    cmd = BashCommand(action=Command(command="sleep 1"), wait_for_seconds=0.1)
+    cmd = BashCommand(action_json=Command(command="sleep 1"), wait_for_seconds=0.1)
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "status = still running" in outputs[0]
 
     # Check status with special keys
-    cmd = BashCommand(action=SendSpecials(send_specials=["Enter"]))
+    cmd = BashCommand(action_json=SendSpecials(send_specials=["Enter"]))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "status = process exited" in outputs[0]
 
     # Test interrupting command
-    cmd = BashCommand(action=Command(command="sleep 1"), wait_for_seconds=0.1)
+    cmd = BashCommand(action_json=Command(command="sleep 1"), wait_for_seconds=0.1)
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "status = still running" in outputs[0]
 
     # Send Ctrl-C
-    cmd = BashCommand(action=SendSpecials(send_specials=["Ctrl-c"]))
+    cmd = BashCommand(action_json=SendSpecials(send_specials=["Ctrl-c"]))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -553,7 +553,7 @@ def test_reinitialize(context: Context, temp_dir: str) -> None:
     assert context.bash_state.file_edit_mode.allowed_globs == [temp_dir + "/" + "*.py"]
 
     # Verify mode was actually changed by trying a command not in allowed list
-    cmd = BashCommand(action=Command(command="touch test.txt"))
+    cmd = BashCommand(action_json=Command(command="touch test.txt"))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -618,7 +618,7 @@ def test_file_io(context: Context, temp_dir: str) -> None:
     with open(test_file, "w") as f:
         f.write("hello world")
 
-    cmd = BashCommand(action=Command(command=f"cat {test_file}"))
+    cmd = BashCommand(action_json=Command(command=f"cat {test_file}"))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -631,13 +631,13 @@ def test_command_interrupt(context: Context, temp_dir: str) -> None:
     """Test Ctrl-C interruption."""
     _test_init(context, temp_dir)
 
-    cmd = BashCommand(action=Command(command="sleep 5"), wait_for_seconds=0.1)
+    cmd = BashCommand(action_json=Command(command="sleep 5"), wait_for_seconds=0.1)
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "status = still running" in outputs[0]
 
-    cmd = BashCommand(action=SendSpecials(send_specials=["Ctrl-c"]))
+    cmd = BashCommand(action_json=SendSpecials(send_specials=["Ctrl-c"]))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -648,7 +648,7 @@ def test_command_suspend(context: Context, temp_dir: str) -> None:
     """Test Ctrl-Z suspension."""
     _test_init(context, temp_dir)
 
-    cmd = BashCommand(action=Command(command="sleep 5"), wait_for_seconds=0.1)
+    cmd = BashCommand(action_json=Command(command="sleep 5"), wait_for_seconds=0.1)
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -659,16 +659,16 @@ def test_text_input(context: Context, temp_dir: str) -> None:
     """Test sending text to a program."""
     _test_init(context, temp_dir)
 
-    cmd = BashCommand(action=Command(command="cat"))
+    cmd = BashCommand(action_json=Command(command="cat"))
     get_tool_output(context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None)
 
-    cmd = BashCommand(action=SendText(send_text="hello"))
+    cmd = BashCommand(action_json=SendText(send_text="hello"))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "hello" in str(outputs[0])
 
-    cmd = BashCommand(action=SendSpecials(send_specials=["Ctrl-d"]))
+    cmd = BashCommand(action_json=SendSpecials(send_specials=["Ctrl-d"]))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -679,16 +679,16 @@ def test_ascii_input(context: Context, temp_dir: str) -> None:
     """Test sending ASCII codes."""
     _test_init(context, temp_dir)
 
-    cmd = BashCommand(action=Command(command="cat"))
+    cmd = BashCommand(action_json=Command(command="cat"))
     get_tool_output(context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None)
 
-    cmd = BashCommand(action=SendAscii(send_ascii=[65, 66, 67]))  # ABC
+    cmd = BashCommand(action_json=SendAscii(send_ascii=[65, 66, 67]))  # ABC
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
     assert "ABC" in str(outputs[0])
 
-    cmd = BashCommand(action=SendAscii(send_ascii=[3]))  # Ctrl-C
+    cmd = BashCommand(action_json=SendAscii(send_ascii=[3]))  # Ctrl-C
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )
@@ -779,7 +779,7 @@ def test_error_cases(context: Context, temp_dir: str) -> None:
     assert "Success" in outputs[0]  # Should succeed as it creates directories
 
     # Test invalid bash command
-    cmd = BashCommand(action=Command(command="nonexistentcommand"))
+    cmd = BashCommand(action_json=Command(command="nonexistentcommand"))
     outputs, _ = get_tool_output(
         context, cmd, default_enc, 1.0, lambda x, y: ("", 0.0), None
     )

{wcgw-3.0.3 → wcgw-3.0.5}/uv.lock

@@ -1,4 +1,5 @@
 version = 1
+revision = 1
 requires-python = ">=3.11"
 
 [[package]]
@@ -1178,7 +1179,7 @@ wheels = [
 
 [[package]]
 name = "wcgw"
-version = "3.0.3"
+version = "3.0.5"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },