wcgw 5.1.3__py3-none-any.whl → 5.3.0__py3-none-any.whl

wcgw/client/diff-instructions.txt

@@ -59,14 +59,14 @@ 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.
 
-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.
-Break large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.
-Include just the changing lines, and a few surrounding lines (0-3 lines) if needed for uniqueness.
-Other than for uniqueness, avoid including those lines which do not change in search (and replace) blocks. Target 0-3 non trivial extra lines per block.
-
-Preserve leading spaces and indentations in both SEARCH and REPLACE blocks.
+- 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.
+- 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.
+- Break large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.
+- Include just the changing lines, and a few surrounding lines (0-3 lines) if needed for uniqueness.
+- Other than for uniqueness, avoid including those lines which do not change in search (and replace) blocks. Target 0-3 non trivial extra lines per block.
+- Preserve leading spaces and indentations in both SEARCH and REPLACE blocks.

wcgw/client/file_ops/search_replace.py

@@ -4,7 +4,7 @@ from typing import Callable, Optional
 from .diff_edit import FileEditInput, FileEditOutput, SearchReplaceMatchError
 
 # Global regex patterns
-SEARCH_MARKER = re.compile(r"^<<<<<<+\s*SEARCH\s*$")
+SEARCH_MARKER = re.compile(r"^<<<<<<+\s*SEARCH>?\s*$")
 DIVIDER_MARKER = re.compile(r"^======*\s*$")
 REPLACE_MARKER = re.compile(r"^>>>>>>+\s*REPLACE\s*$")
 

wcgw/client/tool_prompts.py

@@ -57,7 +57,6 @@ TOOL_PROMPTS = [
 - Read full file content of one or more files.
 - Provide absolute paths only (~ allowed)
 - Only if the task requires line numbers understanding:
-    - You may populate "show_line_numbers_reason" with your reason, by default null/empty means no line numbers are shown.
     - You may extract a range of lines. E.g., `/path/to/file:1-10` for lines 1-10. You can drop start or end like `/path/to/file:1-` or `/path/to/file:-10` 
 """,
         annotations=ToolAnnotations(readOnlyHint=True, openWorldHint=False),

wcgw/client/tools.py

@@ -26,7 +26,8 @@ from openai.types.chat import (
     ChatCompletionMessageParam,
 )
 from pydantic import BaseModel, TypeAdapter, ValidationError
-from syntax_checker import check_syntax
+from syntax_checker import Output as SCOutput
+from syntax_checker import check_syntax as raw_check_syntax
 
 from ..client.bash_state.bash_state import (
     BashState,
@@ -78,6 +79,13 @@ class Context:
     console: Console
 
 
+def check_syntax(ext: str, content: str) -> SCOutput:
+    if ext == "html":
+        # Ignore due to prevelance of templating, causing issues
+        return raw_check_syntax("html", "")
+    return raw_check_syntax(ext, content)
+
+
 def get_mode_prompt(context: Context) -> str:
     mode_prompt = ""
     if context.bash_state.mode == "code_writer":
@@ -255,8 +263,21 @@ def initialize(
         )
         initial_files_context = f"---\n# Requested files\n{initial_files}\n---\n"
 
-    # Check for CLAUDE.md in the workspace folder on first call
+    # Check for global CLAUDE.md and workspace CLAUDE.md
     alignment_context = ""
+
+    # 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):
+        try:
+            with open(global_alignment_file_path, "r") as f:
+                global_alignment_content = f.read()
+            alignment_context += f"---\n# Important guidelines from the user\n```\n{global_alignment_content}\n```\n---\n\n"
+        except Exception:
+            # Handle any errors when reading the global file
+            pass
+
+    # Then check for workspace-specific CLAUDE.md
     if folder_to_start:
         alignment_file_path = os.path.join(folder_to_start, "CLAUDE.md")
         if os.path.exists(alignment_file_path):
@@ -264,10 +285,10 @@ def initialize(
                 # Read the CLAUDE.md file content
                 with open(alignment_file_path, "r") as f:
                     alignment_content = f.read()
-                alignment_context = f"---\n# CLAUDE.md - Project alignment guidelines\n```\n{alignment_content}\n```\n---\n\n"
+                alignment_context += f"---\n# CLAUDE.md - user shared project guidelines to follow\n```\n{alignment_content}\n```\n---\n\n"
             except Exception:
                 # Handle any errors when reading the file
-                alignment_context = ""
+                pass
 
     uname_sysname = os.uname().sysname
     uname_machine = os.uname().machine
@@ -509,7 +530,7 @@ def write_file(
     error_on_exist_ = (
         error_on_exist and path_ not in context.bash_state.whitelist_for_overwrite
     )
-
+    curr_hash = ""
     if error_on_exist and path_ in context.bash_state.whitelist_for_overwrite:
         # Ensure hash has not changed
         if os.path.exists(path_):
@@ -596,15 +617,12 @@ def write_file(
                     paths_: list[str] = []
                     for start, end in unread_ranges:
                         paths_.append(path_ + ":" + f"{start}-{end}")
-                    paths_readfiles = ReadFiles(
-                        file_paths=paths_, show_line_numbers_reason=""
-                    )
+                    paths_readfiles = ReadFiles(file_paths=paths_)
                     readfiles, file_ranges_dict, truncated = read_files(
                         paths_readfiles.file_paths,
                         coding_max_tokens,
                         noncoding_max_tokens,
                         context,
-                        show_line_numbers=False,
                         start_line_nums=paths_readfiles.start_line_nums,
                         end_line_nums=paths_readfiles.end_line_nums,
                     )
@@ -993,7 +1011,6 @@ def get_tool_output(
             coding_max_tokens,
             noncoding_max_tokens,
             context,
-            bool(arg.show_line_numbers_reason),
             arg.start_line_nums,
             arg.end_line_nums,
         )
@@ -1115,7 +1132,6 @@ def read_files(
     coding_max_tokens: Optional[int],
     noncoding_max_tokens: Optional[int],
     context: Context,
-    show_line_numbers: bool = False,
     start_line_nums: Optional[list[Optional[int]]] = None,
     end_line_nums: Optional[list[Optional[int]]] = None,
 ) -> tuple[
@@ -1152,7 +1168,6 @@ def read_files(
                 coding_max_tokens,
                 noncoding_max_tokens,
                 context,
-                show_line_numbers,
                 start_line_num,
                 end_line_num,
             )
@@ -1196,12 +1211,11 @@ def read_file(
     coding_max_tokens: Optional[int],
     noncoding_max_tokens: Optional[int],
     context: Context,
-    show_line_numbers: bool = False,
     start_line_num: Optional[int] = None,
     end_line_num: Optional[int] = None,
 ) -> tuple[str, bool, int, str, tuple[int, int]]:
     context.console.print(f"Reading file: {file_path}")
-
+    show_line_numbers = True
     # Line numbers are now passed as parameters, no need to parse from path
 
     # Expand the path before checking if it's absolute
@@ -1222,7 +1236,6 @@ def read_file(
 
         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("")
 
     total_lines = len(all_lines)
@@ -1347,7 +1360,6 @@ if __name__ == "__main__":
                 Context(BASH_STATE, BASH_STATE.console),
                 ReadFiles(
                     file_paths=["/Users/arusia/repos/wcgw/src/wcgw/client/tools.py"],
-                    show_line_numbers_reason="true",
                 ),
                 default_enc,
                 0,

wcgw/types_.py

@@ -63,6 +63,10 @@ class Initialize(BaseModel):
             assert self.code_writer_config is not None, (
                 "code_writer_config can't be null when the mode is code_writer"
             )
+        if self.type != "first_call" and not self.thread_id:
+            raise ValueError(
+                "Thread id should be provided if type != 'first_call', including when resetting"
+            )
         return super().model_post_init(__context)
 
     @property
@@ -119,10 +123,13 @@ class WriteIfEmpty(BaseModel):
 
 class ReadFiles(BaseModel):
     file_paths: list[str]
-    show_line_numbers_reason: Optional[str] = None
     _start_line_nums: List[Optional[int]] = PrivateAttr(default_factory=lambda: [])
     _end_line_nums: List[Optional[int]] = PrivateAttr(default_factory=lambda: [])
 
+    @property
+    def show_line_numbers_reason(self) -> str:
+        return "True"
+
     @property
     def start_line_nums(self) -> List[Optional[int]]:
         """Get the start line numbers."""

{wcgw-5.1.3.dist-info → wcgw-5.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 5.1.3
+Version: 5.3.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>
@@ -19,7 +19,7 @@ Requires-Dist: pyte>=0.8.2
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: rich>=13.8.1
 Requires-Dist: semantic-version>=2.10.0
-Requires-Dist: syntax-checker>=0.3.0
+Requires-Dist: syntax-checker==0.4.0b4
 Requires-Dist: tokenizers>=0.21.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: tree-sitter-bash>=0.23.3
@@ -152,6 +152,31 @@ Then add or update the claude config file `%APPDATA%\Claude\claude_desktop_confi
   }
 }
 ```
+When you encounter an error, execute the command wsl uv --python 3.12 wcgw@latest in command prompt. If you get the `error /bin/bash: line 1: uv: command not found`, it means uv was not installed globally and you need to point to the correct path of uv.
+1. Find where uv is installed:
+```bash
+whereis uv
+```
+Example output:
+```uv: /home/mywsl/.local/bin/uv```
+
+2. Test the full path works:
+```
+wsl /home/mywsl/.local/bin/uv tool run --python 3.12 wcgw@latest
+```
+
+3. Update the config with the full path:
+```
+{
+  "mcpServers": {
+    "wcgw": {
+      "command": "wsl.exe",
+      "args": ["/home/mywsl/.local/bin/uv", "tool", "run", "--python", "3.12", "wcgw@latest"]
+    }
+  }
+}
+```
+Replace `/home/mywsl/.local/bin/uv` with your actual uv path from step 1.
 
 ### Usage
 

{wcgw-5.1.3.dist-info → wcgw-5.3.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 wcgw/__init__.py,sha256=JgAY25VsA208v8E7QTIU0E50nsk-TCJ4FWTEHmnssYU,127
 wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wcgw/types_.py,sha256=ImuOBDtFDcHhqu-EtCuDLXd7ORDW5zwJVLjgrzOEFcA,7939
+wcgw/types_.py,sha256=9cK7ooTbGK3QaBNJCFZLnrezfpFUSNkA8S02JCHCl6c,8174
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/common.py,sha256=OCH7Tx64jojz3M3iONUrGMadE07W21DiZs5sOxWX1Qc,1456
-wcgw/client/diff-instructions.txt,sha256=eKRFA86yXWIGwNxIDaegTgTzIrFIBDWWiN1yP8Hf3i4,1685
+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=0hfYmCzCo6kh_IC8RGJRfQ6hkB333GZvs_g3o_cvc2w,4662
-wcgw/client/tools.py,sha256=bDKyoWN4odI77UDAhqrUm2pD1ioxKIMUtB8IB7yjrOc,48475
+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/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=AwLq6-pY7czv1y-JA5O2Q4rgbvn82YmSL9jD8XB3Vo4,19019
 wcgw/client/file_ops/extensions.py,sha256=CmfD7ON6SY24Prh2tRZdV9KbhuOrWqqk8qL1VtshzB8,3608
-wcgw/client/file_ops/search_replace.py,sha256=bB1S-xkDdOX4h7UHHxfCHaQiS9KyYkIdU6UGvIrgwQM,6820
+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
@@ -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.1.3.dist-info/METADATA,sha256=h0veH21vbstf5TEtm3UNEgeL5k-UaHi_NZGN0yxSlYA,14755
-wcgw-5.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wcgw-5.1.3.dist-info/entry_points.txt,sha256=UnjK-MAH4Qssh0tGJDMeij1oi-oRKokItkknP_BwShE,94
-wcgw-5.1.3.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
-wcgw-5.1.3.dist-info/RECORD,,
+wcgw-5.3.0.dist-info/METADATA,sha256=9s9b9DmREZoUB09FKMrXr3h-EnvtGRyPYmvrmGMXM6U,15512
+wcgw-5.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-5.3.0.dist-info/entry_points.txt,sha256=UnjK-MAH4Qssh0tGJDMeij1oi-oRKokItkknP_BwShE,94
+wcgw-5.3.0.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
+wcgw-5.3.0.dist-info/RECORD,,