wcgw 5.3.2__tar.gz → 5.4.1__tar.gz

{wcgw-5.3.2 → wcgw-5.4.1}/Dockerfile

@@ -35,6 +35,9 @@ FROM python:3.12-slim-bookworm
 
 RUN apt-get update && apt-get install -y screen && rm -rf /var/lib/apt/lists/*
 
+# Create app user and group
+RUN groupadd -r app && useradd -r -g app app
+
 # Set the working directory in the container
 WORKDIR /workspace
 

{wcgw-5.3.2 → wcgw-5.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 5.3.2
+Version: 5.4.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>

{wcgw-5.3.2 → wcgw-5.4.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "5.3.2"
+version = "5.4.1"
 description = "Shell and coding agent for Claude and other mcp clients"
 readme = "README.md"
 requires-python = ">=3.11"

{wcgw-5.3.2 → wcgw-5.4.1}/src/wcgw/client/bash_state/bash_state.py

@@ -87,7 +87,7 @@ def check_if_screen_command_available() -> bool:
             ["which", "screen"], capture_output=True, check=True, timeout=0.2
         )
         return True
-    except (subprocess.CalledProcessError, FileNotFoundError):
+    except (subprocess.CalledProcessError, FileNotFoundError, TimeoutError):
         return False
 
 

{wcgw-5.3.2 → wcgw-5.4.1}/src/wcgw/client/diff-instructions.txt

@@ -61,8 +61,7 @@ def call_hello_renamed():
 # *SEARCH/REPLACE block* Rules:
 
 - Every "SEARCH" section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, whitespaces, etc.
-- In a single call the edit blocks should be constructed from top to bottom of the file in a sequence. 
-- An edit block can't edit over a previous edit in the same tool call.
+- Use multiple search/replace blocks in a single FileWriteOrEdit tool call to edit in a single file in multiple places from top to bottom (separate calls are slower).
 - Including multiple unique *SEARCH/REPLACE* blocks if needed.
 - Include enough and only enough lines in each SEARCH section to uniquely match each set of lines that need to change.
 - Keep *SEARCH/REPLACE* blocks concise.

{wcgw-5.3.2 → wcgw-5.4.1}/src/wcgw/client/mcp_server/server.py

@@ -121,11 +121,18 @@ async def handle_call_tool(
     for output_or_done in output_or_dones:
         if isinstance(output_or_done, str):
             if issubclass(tool_type, Initialize):
-                output_or_done += """
+                # Prepare the original hardcoded message
+                original_message = """
 - Additional important note: as soon as you encounter "The user has chosen to disallow the tool call.", immediately stop doing everything and ask user for the reason.
 
 Initialize call done.
     """
+                
+                # If custom instructions exist, prepend them to the original message
+                if CUSTOM_INSTRUCTIONS:
+                    output_or_done += f"\n{CUSTOM_INSTRUCTIONS}\n{original_message}"
+                else:
+                    output_or_done += original_message
 
             content.append(types.TextContent(type="text", text=output_or_done))
         else:
@@ -141,12 +148,16 @@ Initialize call done.
 
 
 BASH_STATE = None
+CUSTOM_INSTRUCTIONS = None
 
 
 async def main() -> None:
-    global BASH_STATE
+    global BASH_STATE, CUSTOM_INSTRUCTIONS
     CONFIG.update(3, 55, 5)
     version = str(importlib.metadata.version("wcgw"))
+    
+    # Read custom instructions from environment variable
+    CUSTOM_INSTRUCTIONS = os.getenv("WCGW_SERVER_INSTRUCTIONS")
 
     # starting_dir is inside tmp dir
     tmp_dir = get_tmpdir()

{wcgw-5.3.2 → wcgw-5.4.1}/src/wcgw/client/tools.py

@@ -58,8 +58,6 @@ from ..types_ import (
 from .encoder import EncoderDecoder, get_default_encoder
 from .file_ops.extensions import select_max_tokens
 from .file_ops.search_replace import (
-    DIVIDER_MARKER,
-    REPLACE_MARKER,
     SEARCH_MARKER,
     search_replace_edit,
 )
@@ -819,16 +817,8 @@ def _is_edit(content: str, percentage: int) -> bool:
     if not lines:
         return False
     line = lines[0]
-    if SEARCH_MARKER.match(line):
+    if SEARCH_MARKER.match(line) or (0 < percentage <= 50):
         return True
-    if percentage <= 50:
-        for line in lines:
-            if (
-                SEARCH_MARKER.match(line)
-                or DIVIDER_MARKER.match(line)
-                or REPLACE_MARKER.match(line)
-            ):
-                return True
     return False
 
 

{wcgw-5.3.2 → wcgw-5.4.1}/src/wcgw/types_.py

@@ -83,14 +83,17 @@ class Initialize(BaseModel):
 
 class Command(BaseModel):
     command: str
+    type: Literal["command"] = "command"
 
 
 class StatusCheck(BaseModel):
-    status_check: Literal[True]
+    status_check: Literal[True] = True
+    type: Literal["status_check"] = "status_check"
 
 
 class SendText(BaseModel):
     send_text: str
+    type: Literal["send_text"] = "send_text"
 
 
 Specials = Literal[
@@ -100,10 +103,39 @@ Specials = Literal[
 
 class SendSpecials(BaseModel):
     send_specials: Sequence[Specials]
+    type: Literal["send_specials"] = "send_specials"
 
 
 class SendAscii(BaseModel):
     send_ascii: Sequence[int]
+    type: Literal["send_ascii"] = "send_ascii"
+
+
+class ActionJsonSchema(BaseModel):
+    type: Literal[
+        "command", "status_check", "send_text", "send_specials", "send_ascii"
+    ] = Field(description="type of action.")
+    command: Optional[str] = Field(
+        default=None, description='Set only if type="command"'
+    )
+    status_check: Optional[Literal[True]] = Field(
+        default=None, description='Set only if type="status_check"'
+    )
+    send_text: Optional[str] = Field(
+        default=None, description='Set only if type="send_text"'
+    )
+    send_specials: Optional[Sequence[Specials]] = Field(
+        default=None, description='Set only if type="send_specials"'
+    )
+    send_ascii: Optional[Sequence[int]] = Field(
+        default=None, description='Set only if type="send_ascii"'
+    )
+
+
+class BashCommandOverride(BaseModel):
+    action_json: ActionJsonSchema
+    wait_for_seconds: Optional[float] = None
+    thread_id: str
 
 
 class BashCommand(BaseModel):
@@ -111,6 +143,10 @@ class BashCommand(BaseModel):
     wait_for_seconds: Optional[float] = None
     thread_id: str
 
+    @staticmethod
+    def model_json_schema(*args, **kwargs) -> dict[str, Any]:  # type: ignore
+        return BashCommandOverride.model_json_schema(*args, **kwargs)
+
 
 class ReadImage(BaseModel):
     file_path: str

{wcgw-5.3.2 → wcgw-5.4.1}/tests/test_mcp_server.py

@@ -142,14 +142,16 @@ async def test_handle_list_tools():
             assert "action_json" in properties
             assert "wait_for_seconds" in properties
             # Check type field has all the command types
-            type_properties = properties["action_json"]["anyOf"]
-            type_refs = set(p["$ref"].split("/")[-1] for p in type_properties)
+            type_properties = tool.inputSchema["$defs"]["ActionJsonSchema"][
+                "properties"
+            ]
+            type_refs = set(type_properties)
             required_types = {
-                "Command",
-                "StatusCheck",
-                "SendText",
-                "SendSpecials",
-                "SendAscii",
+                "command",
+                "status_check",
+                "send_text",
+                "send_specials",
+                "send_ascii",
             }
             assert required_types.issubset(type_refs)
         elif tool.name == "FileWriteOrEdit":

{wcgw-5.3.2 → wcgw-5.4.1}/uv.lock

@@ -1398,7 +1398,7 @@ wheels = [
 
 [[package]]
 name = "wcgw"
-version = "5.3.1"
+version = "5.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "anthropic" },