wcgw 2.8.5__py3-none-any.whl → 2.8.6__py3-none-any.whl

wcgw/client/file_ops/diff_edit.py

@@ -6,6 +6,10 @@ from typing import Callable, DefaultDict, Literal, Optional
 TOLERANCE_TYPES = Literal["SILENT", "WARNING", "ERROR"]
 
 
+class SearchReplaceMatchError(Exception):
+    pass
+
+
 @dataclass
 class Tolerance:
     line_process: Callable[[str], str]
@@ -45,7 +49,7 @@ class FileEditOutput:
 Got error while processing the following search block:
 ---
 ```
-{'\n'.join(search_)}
+{"\n".join(search_)}
 ```
 ---
 Error:
@@ -53,7 +57,7 @@ Error:
 ---
                                   """)
                     if len(errors) >= max_errors:
-                        raise Exception("\n".join(errors))
+                        raise SearchReplaceMatchError("\n".join(errors))
             if last_idx < span.start:
                 new_lines.extend(self.original_content[last_idx : span.start])
 
@@ -64,7 +68,7 @@ Error:
             new_lines.extend(self.original_content[last_idx:])
 
         if errors:
-            raise Exception("\n".join(errors))
+            raise SearchReplaceMatchError("\n".join(errors))
 
         return new_lines, set(warnings)
 

wcgw/client/file_ops/search_replace.py

@@ -1,32 +1,71 @@
 import re
 from typing import Callable
 
-from .diff_edit import FileEditInput, FileEditOutput
+from .diff_edit import FileEditInput, FileEditOutput, SearchReplaceMatchError
 
+# Global regex patterns
+SEARCH_MARKER = re.compile(r"^<<<<<<+\s*SEARCH\s*$")
+DIVIDER_MARKER = re.compile(r"^======*\s*$") 
+REPLACE_MARKER = re.compile(r"^>>>>>>+\s*REPLACE\s*$")
+
+class SearchReplaceSyntaxError(Exception):
+    def __init__(self, message: str):
+        message =f"""Got syntax error while parsing search replace blocks:
+{message}
+---
+
+Make sure blocks are in correct sequence, and the markers are in separate lines:
+
+<{'<<<<<< SEARCH'}
+    example old
+=======
+    example new
+>{'>>>>>> REPLACE'}
+ 
+"""
+        super().__init__(message)
 
 def search_replace_edit(
     lines: list[str], original_content: str, logger: Callable[[str], object]
 ) -> tuple[str, str]:
     if not lines:
-        raise Exception("Error: No input to search replace edit")
+        raise SearchReplaceSyntaxError("Error: No input to search replace edit")
+    
     original_lines = original_content.split("\n")
     n_lines = len(lines)
     i = 0
     search_replace_blocks = list[tuple[list[str], list[str]]]()
+    
     while i < n_lines:
-        if re.match(r"^<<<<<<+\s*SEARCH\s*$", lines[i]):
+        if SEARCH_MARKER.match(lines[i]):
+            line_num = i + 1
             search_block = []
             i += 1
-            while i < n_lines and not re.match(r"^======*\s*$", lines[i]):
+            
+            while i < n_lines and not DIVIDER_MARKER.match(lines[i]):
+                if SEARCH_MARKER.match(lines[i]) or REPLACE_MARKER.match(lines[i]):
+                    raise SearchReplaceSyntaxError(f"Line {i+1}: Found stray marker in SEARCH block: {lines[i]}")
                 search_block.append(lines[i])
                 i += 1
-            i += 1
+            
+            if i >= n_lines:
+                raise SearchReplaceSyntaxError(f"Line {line_num}: Unclosed SEARCH block - missing ======= marker")
+            
             if not search_block:
-                raise Exception("SEARCH block can not be empty")
+                raise SearchReplaceSyntaxError(f"Line {line_num}: SEARCH block cannot be empty")
+            
+            i += 1
             replace_block = []
-            while i < n_lines and not re.match(r"^>>>>>>+\s*REPLACE\s*$", lines[i]):
+            
+            while i < n_lines and not REPLACE_MARKER.match(lines[i]):
+                if SEARCH_MARKER.match(lines[i]) or DIVIDER_MARKER.match(lines[i]):
+                    raise SearchReplaceSyntaxError(f"Line {i+1}: Found stray marker in REPLACE block: {lines[i]}")
                 replace_block.append(lines[i])
                 i += 1
+            
+            if i >= n_lines:
+                raise SearchReplaceSyntaxError(f"Line {line_num}: Unclosed block - missing REPLACE marker")
+            
             i += 1
 
             for line in search_block:
@@ -38,10 +77,12 @@ def search_replace_edit(
 
             search_replace_blocks.append((search_block, replace_block))
         else:
+            if REPLACE_MARKER.match(lines[i]) or DIVIDER_MARKER.match(lines[i]):
+                raise SearchReplaceSyntaxError(f"Line {i+1}: Found stray marker outside block: {lines[i]}")
             i += 1
 
     if not search_replace_blocks:
-        raise Exception(
+        raise SearchReplaceSyntaxError(
             "No valid search replace blocks found, ensure your SEARCH/REPLACE blocks are formatted correctly"
         )
 
@@ -80,7 +121,7 @@ def greedy_context_replace(
     if len(best_matches) > 1:
         # Duplicate found, try to ground using previous blocks.
         if current_block_offset == 0:
-            raise Exception(f"""
+            raise SearchReplaceMatchError(f"""
     The following block matched more than once:
     ---
     ```

wcgw/client/tools.py

@@ -130,8 +130,7 @@ def ask_confirmation(prompt: Confirmation) -> str:
     return "Yes" if response.lower() == "y" else "No"
 
 
-PROMPT_CONST = "#@wcgw@#"
-PROMPT = PROMPT_CONST
+PROMPT_CONST = "#" + "@wcgw@#"
 
 
 def start_shell(is_restricted_mode: bool, initial_dir: str) -> pexpect.spawn:  # type: ignore
@@ -142,36 +141,36 @@ def start_shell(is_restricted_mode: bool, initial_dir: str) -> pexpect.spawn:  #
     try:
         shell = pexpect.spawn(
             cmd,
-            env={**os.environ, **{"PS1": PROMPT}},  # type: ignore[arg-type]
+            env={**os.environ, **{"PS1": PROMPT_CONST}},  # type: ignore[arg-type]
             echo=False,
             encoding="utf-8",
             timeout=TIMEOUT,
             cwd=initial_dir,
         )
         shell.sendline(
-            f"export PROMPT_COMMAND= PS1={PROMPT}"
+            f"export PROMPT_COMMAND= PS1={PROMPT_CONST}"
         )  # Unset prompt command to avoid interfering
-        shell.expect(PROMPT, timeout=TIMEOUT)
+        shell.expect(PROMPT_CONST, timeout=TIMEOUT)
     except Exception as e:
         console.print(traceback.format_exc())
         console.log(f"Error starting shell: {e}. Retrying without rc ...")
 
         shell = pexpect.spawn(
             "/bin/bash --noprofile --norc",
-            env={**os.environ, **{"PS1": PROMPT}},  # type: ignore[arg-type]
+            env={**os.environ, **{"PS1": PROMPT_CONST}},  # type: ignore[arg-type]
             echo=False,
             encoding="utf-8",
             timeout=TIMEOUT,
         )
-        shell.sendline(f"export PS1={PROMPT}")
-        shell.expect(PROMPT, timeout=TIMEOUT)
+        shell.sendline(f"export PS1={PROMPT_CONST}")
+        shell.expect(PROMPT_CONST, timeout=TIMEOUT)
 
     shell.sendline("stty -icanon -echo")
-    shell.expect(PROMPT, timeout=TIMEOUT)
+    shell.expect(PROMPT_CONST, timeout=TIMEOUT)
     shell.sendline("set +o pipefail")
-    shell.expect(PROMPT, timeout=TIMEOUT)
+    shell.expect(PROMPT_CONST, timeout=TIMEOUT)
     shell.sendline("export GIT_PAGER=cat PAGER=cat")
-    shell.expect(PROMPT, timeout=TIMEOUT)
+    shell.expect(PROMPT_CONST, timeout=TIMEOUT)
     return shell
 
 
@@ -183,42 +182,6 @@ def _is_int(mystr: str) -> bool:
         return False
 
 
-def _ensure_env_and_bg_jobs(shell: pexpect.spawn) -> Optional[int]:  # type: ignore
-    if PROMPT != PROMPT_CONST:
-        return None
-    # First reset the prompt in case venv was sourced or other reasons.
-    shell.sendline(f"export PS1={PROMPT}")
-    shell.expect(PROMPT, timeout=0.2)
-    # Reset echo also if it was enabled
-    shell.sendline("stty -icanon -echo")
-    shell.expect(PROMPT, timeout=0.2)
-    shell.sendline("set +o pipefail")
-    shell.expect(PROMPT, timeout=0.2)
-    shell.sendline("export GIT_PAGER=cat PAGER=cat")
-    shell.expect(PROMPT, timeout=0.2)
-    shell.sendline("jobs | wc -l")
-    before = ""
-
-    while not _is_int(before):  # Consume all previous output
-        try:
-            shell.expect(PROMPT, timeout=0.2)
-        except pexpect.TIMEOUT:
-            console.print(f"Couldn't get exit code, before: {before}")
-            raise
-
-        before_val = shell.before
-        if not isinstance(before_val, str):
-            before_val = str(before_val)
-        assert isinstance(before_val, str)
-        before_lines = render_terminal_output(before_val)
-        before = "\n".join(before_lines).strip()
-
-    try:
-        return int(before)
-    except ValueError:
-        raise ValueError(f"Malformed output: {before}")
-
-
 BASH_CLF_OUTPUT = Literal["repl", "pending"]
 
 
@@ -242,7 +205,7 @@ class BashState:
         )
         self._mode = mode or Modes.wcgw
         self._whitelist_for_overwrite: set[str] = whitelist_for_overwrite or set()
-
+        self._prompt = PROMPT_CONST
         self._init_shell()
 
     @property
@@ -261,7 +224,47 @@ class BashState:
     def write_if_empty_mode(self) -> WriteIfEmptyMode:
         return self._write_if_empty_mode
 
+    def ensure_env_and_bg_jobs(self) -> Optional[int]:
+        if self._prompt != PROMPT_CONST:
+            return None
+        shell = self.shell
+        # First reset the prompt in case venv was sourced or other reasons.
+        shell.sendline(f"export PS1={self._prompt}")
+        shell.expect(self._prompt, timeout=0.2)
+        # Reset echo also if it was enabled
+        shell.sendline("stty -icanon -echo")
+        shell.expect(self._prompt, timeout=0.2)
+        shell.sendline("set +o pipefail")
+        shell.expect(self._prompt, timeout=0.2)
+        shell.sendline("export GIT_PAGER=cat PAGER=cat")
+        shell.expect(self._prompt, timeout=0.2)
+        shell.sendline("jobs | wc -l")
+        before = ""
+        counts = 0
+        while not _is_int(before):  # Consume all previous output
+            try:
+                shell.expect(self._prompt, timeout=0.2)
+            except pexpect.TIMEOUT:
+                console.print(f"Couldn't get exit code, before: {before}")
+                raise
+
+            before_val = shell.before
+            if not isinstance(before_val, str):
+                before_val = str(before_val)
+            assert isinstance(before_val, str)
+            before_lines = render_terminal_output(before_val)
+            before = "\n".join(before_lines).strip()
+            counts += 1
+            if counts > 100:
+                raise ValueError("Error in understanding shell output. This shouldn't happen, likely shell is in a bad state, please reset it")
+
+        try:
+            return int(before)
+        except ValueError:
+            raise ValueError(f"Malformed output: {before}")
+
     def _init_shell(self) -> None:
+        self._prompt = PROMPT_CONST
         self._state: Literal["repl"] | datetime.datetime = "repl"
         self._is_in_docker: Optional[str] = ""
         # Ensure self._cwd exists
@@ -270,11 +273,11 @@ class BashState:
             self._bash_command_mode.bash_mode == "restricted_mode",
             self._cwd,
         )
-
+    
         self._pending_output = ""
 
         # Get exit info to ensure shell is ready
-        _ensure_env_and_bg_jobs(self._shell)
+        self.ensure_env_and_bg_jobs()
 
     @property
     def shell(self) -> pexpect.spawn:  # type: ignore
@@ -306,9 +309,13 @@ class BashState:
     def cwd(self) -> str:
         return self._cwd
 
+    @property
+    def prompt(self) -> str:
+        return self._prompt
+
     def update_cwd(self) -> str:
         self.shell.sendline("pwd")
-        self.shell.expect(PROMPT, timeout=0.2)
+        self.shell.expect(self._prompt, timeout=0.2)
         before_val = self.shell.before
         if not isinstance(before_val, str):
             before_val = str(before_val)
@@ -388,6 +395,30 @@ class BashState:
     def pending_output(self) -> str:
         return self._pending_output
 
+    def update_repl_prompt(self, command: str) -> bool:
+        if re.match(r"^wcgw_update_prompt\(\)$", command.strip()):
+            self.shell.sendintr()
+            index = self.shell.expect([self._prompt, pexpect.TIMEOUT], timeout=0.2)
+            if index == 0:
+                return True
+            before = self.shell.before or ""
+            assert before, "Something went wrong updating repl prompt"
+            self._prompt = before.split("\n")[-1].strip()
+            # Escape all regex
+            self._prompt = re.escape(self._prompt)
+            console.print(f"Trying to update prompt to: {self._prompt.encode()!r}")
+            index = 0
+            counts = 0
+            while index == 0:
+                # Consume all REPL prompts till now
+                index = self.shell.expect([self._prompt, pexpect.TIMEOUT], timeout=0.2)
+                counts += 1
+                if counts > 100:
+                    raise ValueError("Error in understanding shell output. This shouldn't happen, likely shell is in a bad state, please reset it")
+            console.print(f"Prompt updated to: {self._prompt}")
+            return True
+        return False
+
 
 BASH_STATE = BashState(os.getcwd(), None, None, None, None)
 INITIALIZED = False
@@ -544,28 +575,6 @@ WAITING_INPUT_MESSAGE = """A command is already running. NOTE: You can't run mul
 """
 
 
-def update_repl_prompt(command: str) -> bool:
-    global PROMPT
-    if re.match(r"^wcgw_update_prompt\(\)$", command.strip()):
-        BASH_STATE.shell.sendintr()
-        index = BASH_STATE.shell.expect([PROMPT, pexpect.TIMEOUT], timeout=0.2)
-        if index == 0:
-            return True
-        before = BASH_STATE.shell.before or ""
-        assert before, "Something went wrong updating repl prompt"
-        PROMPT = before.split("\n")[-1].strip()
-        # Escape all regex
-        PROMPT = re.escape(PROMPT)
-        console.print(f"Trying to update prompt to: {PROMPT.encode()!r}")
-        index = 0
-        while index == 0:
-            # Consume all REPL prompts till now
-            index = BASH_STATE.shell.expect([PROMPT, pexpect.TIMEOUT], timeout=0.2)
-        console.print(f"Prompt updated to: {PROMPT}")
-        return True
-    return False
-
-
 def get_status() -> str:
     status = "\n\n---\n\n"
     if BASH_STATE.state == "pending":
@@ -573,7 +582,7 @@ def get_status() -> str:
         status += "running for = " + BASH_STATE.get_pending_for() + "\n"
         status += "cwd = " + BASH_STATE.cwd + "\n"
     else:
-        bg_jobs = _ensure_env_and_bg_jobs(BASH_STATE.shell)
+        bg_jobs = BASH_STATE.ensure_env_and_bg_jobs()
         bg_desc = ""
         if bg_jobs and bg_jobs > 0:
             bg_desc = f"; {bg_jobs} background jobs running"
@@ -643,7 +652,7 @@ def execute_bash(
         if isinstance(bash_arg, BashCommand):
             if BASH_STATE.bash_command_mode.allowed_commands == "none":
                 return "Error: BashCommand not allowed in current mode", 0.0
-            updated_repl_mode = update_repl_prompt(bash_arg.command)
+            updated_repl_mode = BASH_STATE.update_repl_prompt(bash_arg.command)
             if updated_repl_mode:
                 BASH_STATE.set_repl()
                 response = (
@@ -720,7 +729,7 @@ def execute_bash(
                         0.0,
                     )
 
-                updated_repl_mode = update_repl_prompt(bash_arg.send_text)
+                updated_repl_mode = BASH_STATE.update_repl_prompt(bash_arg.send_text)
                 if updated_repl_mode:
                     BASH_STATE.set_repl()
                     response = "Prompt updated, you can execute REPL lines using BashCommand now"
@@ -736,11 +745,11 @@ def execute_bash(
 
     except KeyboardInterrupt:
         BASH_STATE.shell.sendintr()
-        BASH_STATE.shell.expect(PROMPT)
+        BASH_STATE.shell.expect(BASH_STATE.prompt)
         return "---\n\nFailure: user interrupted the execution", 0.0
 
     wait = min(timeout_s or TIMEOUT, TIMEOUT_WHILE_OUTPUT)
-    index = BASH_STATE.shell.expect([PROMPT, pexpect.TIMEOUT], timeout=wait)
+    index = BASH_STATE.shell.expect([BASH_STATE.prompt, pexpect.TIMEOUT], timeout=wait)
     if index == 1:
         text = BASH_STATE.shell.before or ""
         incremental_text = _incremental_text(text, BASH_STATE.pending_output)
@@ -754,7 +763,9 @@ def execute_bash(
                 patience -= 1
             itext = incremental_text
             while remaining > 0 and patience > 0:
-                index = BASH_STATE.shell.expect([PROMPT, pexpect.TIMEOUT], timeout=wait)
+                index = BASH_STATE.shell.expect(
+                    [BASH_STATE.prompt, pexpect.TIMEOUT], timeout=wait
+                )
                 if index == 0:
                     second_wait_success = True
                     break
@@ -1310,7 +1321,7 @@ def get_tool_output(
                     # At this point we should go into the docker env
                     res, _ = execute_bash(
                         enc,
-                        BashInteraction(send_text=f"export PS1={PROMPT}"),
+                        BashInteraction(send_text=f"export PS1={BASH_STATE.prompt}"),
                         None,
                         0.2,
                     )
@@ -1459,7 +1470,7 @@ def read_files(file_paths: list[str], max_tokens: Optional[int]) -> str:
         if truncated or (max_tokens and max_tokens <= 0):
             not_reading = file_paths[i + 1 :]
             if not_reading:
-                message += f'\nNot reading the rest of the files: {", ".join(not_reading)} due to token limit, please call again'
+                message += f"\nNot reading the rest of the files: {', '.join(not_reading)} due to token limit, please call again"
             break
         else:
             message += "```"

{wcgw-2.8.5.dist-info → wcgw-2.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 2.8.5
+Version: 2.8.6
 Summary: Shell and coding agent on claude and chatgpt
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>
@@ -28,6 +28,7 @@ Requires-Dist: websockets>=13.1
 Description-Content-Type: text/markdown
 
 # Shell and Coding agent for Claude and Chatgpt
+Empowering chat applications to code, build and run on your local machine.
 
 - Claude - An MCP server on claude desktop for autonomous shell and coding agent. (mac only)
 - Chatgpt - Allows custom gpt to talk to your shell via a relay server. (linux or mac)

{wcgw-2.8.5.dist-info → wcgw-2.8.6.dist-info}/RECORD

@@ -7,9 +7,9 @@ wcgw/client/diff-instructions.txt,sha256=tmJ9Fu9XdO_72lYXQQNY9RZyx91bjxrXJf9d_KB
 wcgw/client/memory.py,sha256=8LdYsOhvCOoC1kfvDr85kNy07WnhPMvE6B2FRM2w85Y,2902
 wcgw/client/modes.py,sha256=FkDJIgjKrlJEufLq3abWfqV25BdF2pH-HnoHafy9LrA,10484
 wcgw/client/sys_utils.py,sha256=GajPntKhaTUMn6EOmopENWZNR2G_BJyuVbuot0x6veI,1376
-wcgw/client/tools.py,sha256=lQhWn-syIX3zLLDxNNK5GSowbU2NV3G7ytRKmj-LFlc,51248
-wcgw/client/file_ops/diff_edit.py,sha256=o0ucArVwn5p6QTDgYsjLfMy4TJXxUG3qcppFBNF3bbQ,16751
-wcgw/client/file_ops/search_replace.py,sha256=89ieDC9fTsIKPDx7CJwnwpX32dRdSlMKoBtKVXc7VWI,3971
+wcgw/client/tools.py,sha256=ndIvlJlULCxqRlks9cfDJK8JqMK0Ry85Mt4kZQ0IZhQ,52216
+wcgw/client/file_ops/diff_edit.py,sha256=OlJCpPSE_3T41q9H0yDORm6trjm3w6zh1EkuPTxik2A,16832
+wcgw/client/file_ops/search_replace.py,sha256=Napa7IWaYPGMNdttunKyRDkb90elZE7r23B_o_htRxo,5585
 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=CBOS_DSDcBf5VlHQMJJbDL-wnn_DAPDvxX3dO8yodRo,13144
@@ -42,8 +42,8 @@ mcp_wcgw/shared/memory.py,sha256=dBsOghxHz8-tycdSVo9kSujbsC8xb_tYsGmuJobuZnw,281
 mcp_wcgw/shared/progress.py,sha256=ymxOsb8XO5Mhlop7fRfdbmvPodANj7oq6O4dD0iUcnw,1048
 mcp_wcgw/shared/session.py,sha256=e44a0LQOW8gwdLs9_DE9oDsxqW2U8mXG3d5KT95bn5o,10393
 mcp_wcgw/shared/version.py,sha256=d2LZii-mgsPIxpshjkXnOTUmk98i0DT4ff8VpA_kAvE,111
-wcgw-2.8.5.dist-info/METADATA,sha256=N2LJBm7hqi1ZFPiNIVbkzuVqXRuB1XC_2pSSxq0cuE0,11944
-wcgw-2.8.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wcgw-2.8.5.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
-wcgw-2.8.5.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
-wcgw-2.8.5.dist-info/RECORD,,
+wcgw-2.8.6.dist-info/METADATA,sha256=PnCOOeODRmn7ZBHmoQN7qjS63YXOc0Xd78i7OVSo07o,12019
+wcgw-2.8.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-2.8.6.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
+wcgw-2.8.6.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
+wcgw-2.8.6.dist-info/RECORD,,