wcgw 5.3.1__py3-none-any.whl → 5.4.0__py3-none-any.whl

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/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/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,
 )
@@ -266,6 +264,13 @@ def initialize(
     # Check for global CLAUDE.md and workspace CLAUDE.md
     alignment_context = ""
 
+    # Check if ripgrep is available and add instruction if it is
+    try:
+        subprocess.run(["which", "rg"], timeout=1, capture_output=True, check=True)
+        alignment_context += "---\n# Available commands\n\n- Use ripgrep `rg` command instead of `grep` because it's much much faster.\n\n---\n\n"
+    except Exception:
+        pass
+
     # First check for global CLAUDE.md in ~/.wcgw/CLAUDE.md
     global_alignment_file_path = os.path.join(expanduser("~"), ".wcgw", "CLAUDE.md")
     if os.path.exists(global_alignment_file_path):
@@ -812,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/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]
+    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.1.dist-info → wcgw-5.4.0.dist-info}/METADATA

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

{wcgw-5.3.1.dist-info → wcgw-5.4.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 wcgw/__init__.py,sha256=JgAY25VsA208v8E7QTIU0E50nsk-TCJ4FWTEHmnssYU,127
 wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wcgw/types_.py,sha256=9cK7ooTbGK3QaBNJCFZLnrezfpFUSNkA8S02JCHCl6c,8174
+wcgw/types_.py,sha256=92uLRuW4CI8p7LJctW3WDuzVOYLsBmbjpjpzTqtwnQA,9487
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/common.py,sha256=OCH7Tx64jojz3M3iONUrGMadE07W21DiZs5sOxWX1Qc,1456
 wcgw/client/diff-instructions.txt,sha256=a-UeK9VEHJlwffAzZ-I1OiUkeMOuGU8zj3By-_STy28,1866
 wcgw/client/memory.py,sha256=U2Nw2si3Zg7n_RhNAuaYcmrrDtZ_Mooi-kfAOKflT-I,3079
 wcgw/client/modes.py,sha256=roH6SPBokJMr5IzAlccdI-vJyvyS5vqSMMyth7TE86A,10315
 wcgw/client/tool_prompts.py,sha256=7tq9ijSo4CznVlMFcWpauELfCT_QAqwi8Chsl3SRfBY,4539
-wcgw/client/tools.py,sha256=YNxXmNj2-rhCPZ12wmfMBsAXn0_nQnCPs1OTudEh5wM,49026
-wcgw/client/bash_state/bash_state.py,sha256=b-Zo6pO3psfxu9TA0uw1ZZAa6bLmDPxbl7277fZfmrM,41862
+wcgw/client/tools.py,sha256=WAVnSqisV4hw4mPhbCzDDZy2gFkxXwTfzAajLPciCSw,49107
+wcgw/client/bash_state/bash_state.py,sha256=U-h9uqEcJbZGIVle6vZKYmlLHNO91zvqaUe6zlvLMl4,41876
 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
@@ -17,7 +17,7 @@ wcgw/client/file_ops/extensions.py,sha256=CmfD7ON6SY24Prh2tRZdV9KbhuOrWqqk8qL1Vt
 wcgw/client/file_ops/search_replace.py,sha256=5LFg-_U_ijnNrkYei4SWCPGKPGgDzJs49EDsIBzLmuY,6822
 wcgw/client/mcp_server/Readme.md,sha256=2Z88jj1mf9daYGW1CWaldcJ0moy8owDumhR2glBY3A8,109
 wcgw/client/mcp_server/__init__.py,sha256=mm7xhBIPwJpRT3u-Qsj4cKVMpVyucJoKRlbMP_gRRB0,343
-wcgw/client/mcp_server/server.py,sha256=jjwrmZZ8X0tXD0rsPZ9fKjEpdXpXCfdhEsN3Ho_tC8I,4989
+wcgw/client/mcp_server/server.py,sha256=RgsMDmNuYyg4VT1KorcLzh1Xfv49QASi0-FTLz_tlIo,5525
 wcgw/client/repo_ops/display_tree.py,sha256=g282qCKLCwo8O9NHUBnkG_NkIusroVzz3NZi8VIcmAI,4066
 wcgw/client/repo_ops/file_stats.py,sha256=AUA0Br7zFRpylWFYZPGMeGPJy3nWp9e2haKi34JptHE,4887
 wcgw/client/repo_ops/path_prob.py,sha256=SWf0CDn37rtlsYRQ51ufSxay-heaQoVIhr1alB9tZ4M,2144
@@ -30,8 +30,8 @@ wcgw_cli/anthropic_client.py,sha256=8bjDY59-aioyTJgpB-NBHZNhZaq6rqcTJcOf81kzCyA,
 wcgw_cli/cli.py,sha256=-7FBe_lahKyUOhf65iurTA1M1gXXXAiT0OVKQVcZKKo,948
 wcgw_cli/openai_client.py,sha256=GOqoSFazTV-cFjpdZGPM0DIwec8Up2TEcKUbsN40AGY,15990
 wcgw_cli/openai_utils.py,sha256=xGOb3W5ALrIozV7oszfGYztpj0FnXdD7jAxm5lEIVKY,2439
-wcgw-5.3.1.dist-info/METADATA,sha256=PPBEAE1xpGfRsX8I5nZuTKnQLIZnWBXzPc96CQtyhFs,15679
-wcgw-5.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wcgw-5.3.1.dist-info/entry_points.txt,sha256=UnjK-MAH4Qssh0tGJDMeij1oi-oRKokItkknP_BwShE,94
-wcgw-5.3.1.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
-wcgw-5.3.1.dist-info/RECORD,,
+wcgw-5.4.0.dist-info/METADATA,sha256=-rpByDzouo2dElBlIvjO2r0lsWlXyRaF4xggMQXZK1A,15679
+wcgw-5.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-5.4.0.dist-info/entry_points.txt,sha256=UnjK-MAH4Qssh0tGJDMeij1oi-oRKokItkknP_BwShE,94
+wcgw-5.4.0.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
+wcgw-5.4.0.dist-info/RECORD,,