wcgw 3.0.4__py3-none-any.whl → 3.0.6__py3-none-any.whl

wcgw/client/bash_state/bash_state.py

@@ -78,7 +78,9 @@ def get_tmpdir() -> str:
 
 def check_if_screen_command_available() -> bool:
     try:
-        subprocess.run(["screen", "-v"], capture_output=True, check=True, timeout=0.2)
+        subprocess.run(
+            ["which", "screen"], capture_output=True, check=True, timeout=0.2
+        )
         return True
     except (subprocess.CalledProcessError, FileNotFoundError):
         return False
@@ -137,7 +139,7 @@ def cleanup_all_screens_with_name(name: str, console: Console) -> None:
 
 def start_shell(
     is_restricted_mode: bool, initial_dir: str, console: Console, over_screen: bool
-) -> tuple[pexpect.spawn, str]:  # type: ignore[type-arg]
+) -> tuple["pexpect.spawn[str]", str]:
     cmd = "/bin/bash"
     if is_restricted_mode:
         cmd += " -r"
@@ -232,6 +234,7 @@ class BashState:
         use_screen: bool,
         whitelist_for_overwrite: Optional[set[str]] = None,
     ) -> None:
+        self._last_command: str = ""
         self.console = console
         self._cwd = working_dir or os.getcwd()
         self._bash_command_mode: BashCommandMode = bash_command_mode or BashCommandMode(
@@ -253,13 +256,17 @@ class BashState:
         output = self._shell.expect(pattern, timeout)
         return output
 
-    def send(self, s: str | bytes) -> int:
+    def send(self, s: str | bytes, set_as_command: Optional[str]) -> int:
         self.close_bg_expect_thread()
+        if set_as_command is not None:
+            self._last_command = set_as_command
         output = self._shell.send(s)
         return output
 
-    def sendline(self, s: str | bytes) -> int:
+    def sendline(self, s: str | bytes, set_as_command: Optional[str]) -> int:
         self.close_bg_expect_thread()
+        if set_as_command is not None:
+            self._last_command = set_as_command
         output = self._shell.sendline(s)
         return output
 
@@ -273,7 +280,10 @@ class BashState:
 
     @property
     def before(self) -> Optional[str]:
-        return self._shell.before
+        before = self._shell.before
+        if before and before.startswith(self._last_command):
+            return before[len(self._last_command) :]
+        return before
 
     def run_bg_expect_thread(self) -> None:
         """
@@ -333,11 +343,11 @@ class BashState:
     def ensure_env_and_bg_jobs(self) -> Optional[int]:
         quick_timeout = 0.2 if not self.over_screen else 1
         # First reset the prompt in case venv was sourced or other reasons.
-        self.sendline(PROMPT_STATEMENT)
+        self.sendline(PROMPT_STATEMENT, set_as_command=PROMPT_STATEMENT)
         self.expect(PROMPT_CONST, timeout=quick_timeout)
         # Reset echo also if it was enabled
         command = "jobs | wc -l"
-        self.sendline(command)
+        self.sendline(command, set_as_command=command)
         before = ""
         counts = 0
         while not _is_int(before):  # Consume all previous output
@@ -365,6 +375,7 @@ class BashState:
 
     def _init_shell(self) -> None:
         self._state: Literal["repl"] | datetime.datetime = "repl"
+        self._last_command = ""
         # Ensure self._cwd exists
         os.makedirs(self._cwd, exist_ok=True)
         try:
@@ -404,6 +415,7 @@ class BashState:
     def set_repl(self) -> None:
         self._state = "repl"
         self._pending_output = ""
+        self._last_command = ""
 
     @property
     def state(self) -> BASH_CLF_OUTPUT:
@@ -420,7 +432,7 @@ class BashState:
         return PROMPT_CONST
 
     def update_cwd(self) -> str:
-        self.sendline("pwd")
+        self.sendline("pwd", set_as_command="pwd")
         self.expect(PROMPT_CONST, timeout=0.2)
         before_val = self.before
         if not isinstance(before_val, str):
@@ -505,8 +517,8 @@ class BashState:
 
 
 WAITING_INPUT_MESSAGE = """A command is already running. NOTE: You can't run multiple shell sessions, likely a previous program hasn't exited. 
-1. Get its output using `send_ascii: [10] or send_specials: ["Enter"]`
-2. Use `send_ascii` or `send_specials` to give inputs to the running program, don't use `BashCommand` OR
+1. Get its output using status check.
+2. Use `send_ascii` or `send_specials` to give inputs to the running program OR
 3. kill the previous program by sending ctrl+c first using `send_ascii` or `send_specials`
 4. Interrupt and run the process in background by re-running it using screen
 """
@@ -538,6 +550,11 @@ def _incremental_text(text: str, last_pending_output: str) -> str:
     # text = render_terminal_output(text[-100_000:])
     text = text[-100_000:]
 
+    if not last_pending_output:
+        # This is the first call. We need to offset the position where this program
+        # is being rendered for the new screen versions
+        # Caveat: no difference in output between a program with leading whitespace and one without.
+        return rstrip(render_terminal_output(text)).lstrip()
     last_rendered_lines = render_terminal_output(last_pending_output)
     last_pending_output_rendered = "\n".join(last_rendered_lines)
     if not last_rendered_lines:
@@ -575,12 +592,15 @@ 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_json, SendSpecials)
+            and arg.action_json.send_specials == ["Enter"]
+        )
         or (
-            isinstance(arg.action, SendSpecials)
-            and arg.action.send_specials == ["Enter"]
+            isinstance(arg.action_json, SendAscii)
+            and arg.action_json.send_ascii == [10]
         )
-        or (isinstance(arg.action, SendAscii) and arg.action.send_ascii == [10])
     )
 
 
@@ -595,8 +615,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) :]
 
@@ -614,7 +634,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":
@@ -632,8 +652,8 @@ def _execute_bash(
                 )
 
             for i in range(0, len(command), 128):
-                bash_state.send(command[i : i + 128])
-            bash_state.send(bash_state.linesep)
+                bash_state.send(command[i : i + 128], set_as_command=None)
+            bash_state.send(bash_state.linesep, set_as_command=command)
 
         elif isinstance(command_data, StatusCheck):
             bash_state.console.print("Checking status")
@@ -646,8 +666,10 @@ def _execute_bash(
 
             bash_state.console.print(f"Interact text: {command_data.send_text}")
             for i in range(0, len(command_data.send_text), 128):
-                bash_state.send(command_data.send_text[i : i + 128])
-            bash_state.send(bash_state.linesep)
+                bash_state.send(
+                    command_data.send_text[i : i + 128], set_as_command=None
+                )
+            bash_state.send(bash_state.linesep, set_as_command=None)
 
         elif isinstance(command_data, SendSpecials):
             if not command_data.send_specials:
@@ -658,15 +680,15 @@ def _execute_bash(
             )
             for char in command_data.send_specials:
                 if char == "Key-up":
-                    bash_state.send("\033[A")
+                    bash_state.send("\033[A", set_as_command=None)
                 elif char == "Key-down":
-                    bash_state.send("\033[B")
+                    bash_state.send("\033[B", set_as_command=None)
                 elif char == "Key-left":
-                    bash_state.send("\033[D")
+                    bash_state.send("\033[D", set_as_command=None)
                 elif char == "Key-right":
-                    bash_state.send("\033[C")
+                    bash_state.send("\033[C", set_as_command=None)
                 elif char == "Enter":
-                    bash_state.send("\n")
+                    bash_state.send("\n", set_as_command=None)
                 elif char == "Ctrl-c":
                     bash_state.sendintr()
                     is_interrupt = True
@@ -674,7 +696,7 @@ def _execute_bash(
                     bash_state.sendintr()
                     is_interrupt = True
                 elif char == "Ctrl-z":
-                    bash_state.send("\x1a")
+                    bash_state.send("\x1a", set_as_command=None)
                 else:
                     raise Exception(f"Unknown special character: {char}")
 
@@ -686,7 +708,7 @@ def _execute_bash(
                 f"Sending ASCII sequence: {command_data.send_ascii}"
             )
             for ascii_char in command_data.send_ascii:
-                bash_state.send(chr(ascii_char))
+                bash_state.send(chr(ascii_char), set_as_command=None)
                 if ascii_char == 3:
                     is_interrupt = True
         else:
@@ -747,9 +769,9 @@ def _execute_bash(
                 incremental_text = (
                     incremental_text
                     + """---
-    ----
-    Failure interrupting.
-    You may want to try Ctrl-c again or program specific exit interactive commands.
+----
+Failure interrupting.
+You may want to try Ctrl-c again or program specific exit interactive commands.
     """
                 )
 

wcgw/client/tools.py

@@ -20,6 +20,7 @@ from typing import (
     TypeVar,
 )
 
+import rich
 from openai.types.chat import (
     ChatCompletionMessageParam,
 )
@@ -31,6 +32,7 @@ from wcgw.client.bash_state.bash_state import get_status
 from ..types_ import (
     BashCommand,
     CodeWriterMode,
+    Command,
     Console,
     ContextSave,
     FileEdit,
@@ -797,3 +799,43 @@ def read_file(
             content += f"\n(...truncated)\n---\nI've saved the continuation in a new file. Please read: `{rest}`"
             truncated = True
     return content, truncated, tokens_counts
+
+
+if __name__ == "__main__":
+    with BashState(
+        rich.console.Console(style="blue", highlight=False, markup=False),
+        "",
+        None,
+        None,
+        None,
+        None,
+        True,
+        None,
+    ) as BASH_STATE:
+        print(
+            get_tool_output(
+                Context(BASH_STATE, BASH_STATE.console),
+                Initialize(
+                    type="first_call",
+                    any_workspace_path="",
+                    initial_files_to_read=[],
+                    task_id_to_resume="",
+                    mode_name="wcgw",
+                    code_writer_config=None,
+                ),
+                default_enc,
+                0,
+                lambda x, y: ("", 0),
+                None,
+            )
+        )
+        print(
+            get_tool_output(
+                Context(BASH_STATE, BASH_STATE.console),
+                BashCommand(action_json=Command(command="pwd")),
+                default_enc,
+                0,
+                lambda x, y: ("", 0),
+                None,
+            )
+        )

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/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.4.dist-info → wcgw-3.0.6.dist-info}/METADATA

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

{wcgw-3.0.4.dist-info → wcgw-3.0.6.dist-info}/RECORD

@@ -1,14 +1,14 @@
 wcgw/__init__.py,sha256=qUofQOAXCGcWr2u_B8U-MIMhhYaBUpUwNDcscvRmYfo,90
 wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wcgw/types_.py,sha256=KFyfLFrctU9jr3zoQR3nlAMlP17hu91bM7ZeUTdTZ74,3624
+wcgw/types_.py,sha256=xd3TP9_57iFVoKxkBsl3G7mwIW5uIog68xJ_Khh9E9s,3639
 wcgw/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wcgw/client/common.py,sha256=OCH7Tx64jojz3M3iONUrGMadE07W21DiZs5sOxWX1Qc,1456
 wcgw/client/diff-instructions.txt,sha256=tmJ9Fu9XdO_72lYXQQNY9RZyx91bjxrXJf9d_KBz57k,1611
 wcgw/client/memory.py,sha256=8LdYsOhvCOoC1kfvDr85kNy07WnhPMvE6B2FRM2w85Y,2902
 wcgw/client/modes.py,sha256=FjIQOjT5oI7dk9VG0oRemN1A6EHBvHnuSQGKuRbguJI,10352
 wcgw/client/tool_prompts.py,sha256=H36Sr3yH2YuHZTc08Y6rTUWlYWjKMFtIGP6vbAVNwZo,3988
-wcgw/client/tools.py,sha256=Sz6tCm9KXVKZHbUqGViYUZnhJ78oV4_k1USX205HLI0,25415
-wcgw/client/bash_state/bash_state.py,sha256=FKeJU8g-wM9p7aq7EKog4NEm2fqzLiAbqdeIyPeuLpo,26117
+wcgw/client/tools.py,sha256=l0L7kuylDdZ5WA2_P1CfN4Ds0xD9IPqEZ0ot0pruhKs,26512
+wcgw/client/bash_state/bash_state.py,sha256=aY_hW9y7TyPWHR5799v6rxzuWb1VzgjiGjA4K0cpGjE,27287
 wcgw/client/encoder/__init__.py,sha256=Y-8f43I6gMssUCWpX5rLYiAFv3D-JPRs4uNEejPlke8,1514
 wcgw/client/file_ops/diff_edit.py,sha256=sIwXSSkWYff_Dp3oHfefqtSuFqLrxbhKvzkCoLuLqDE,18679
 wcgw/client/file_ops/search_replace.py,sha256=Napa7IWaYPGMNdttunKyRDkb90elZE7r23B_o_htRxo,5585
@@ -21,13 +21,13 @@ wcgw/client/repo_ops/paths_model.vocab,sha256=M1pXycYDQehMXtpp-qAgU7rtzeBbCOiJo4
 wcgw/client/repo_ops/paths_tokens.model,sha256=jiwwE4ae8ADKuTZISutXuM5Wfyc_FBmN5rxTjoNnCos,1569052
 wcgw/client/repo_ops/repo_context.py,sha256=5NqRxBY0K-SBFXJ0Ybt7llzYOBD8pRkTpruMMJHWxv4,4336
 wcgw/relay/client.py,sha256=BUeEKUsWts8RpYxXwXcyFyjBJhOCS-CxThAlL_-VCOI,3618
-wcgw/relay/serve.py,sha256=Vl7Nb68-F910LwHrTElfCNwajF37CfgObUIAdwhrRsI,7886
+wcgw/relay/serve.py,sha256=xFAFiRENPae723_kwaaCgBmqL5sffYHKPu3esrMu57M,7896
 wcgw/relay/static/privacy.txt,sha256=s9qBdbx2SexCpC_z33sg16TptmAwDEehMCLz4L50JLc,529
 wcgw_cli/__init__.py,sha256=TNxXsTPgb52OhakIda9wTRh91cqoBqgQRx5TxjzQQFU,21
 wcgw_cli/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
-wcgw_cli/anthropic_client.py,sha256=gQc1opw-N5ecqcORbvvHGBW1Ac-Soe7c7APJD25HIfo,19887
+wcgw_cli/anthropic_client.py,sha256=-rfnw_tIx1VjhzOsPeTZkoF0VAXhRC9zBW2oLMFJcxg,19624
 wcgw_cli/cli.py,sha256=-7FBe_lahKyUOhf65iurTA1M1gXXXAiT0OVKQVcZKKo,948
-wcgw_cli/openai_client.py,sha256=o4vfhcfGKqoWYWnn5YxNw4muKyDnFEiPmWpZpufDGMA,16021
+wcgw_cli/openai_client.py,sha256=4NFv-d7u6B7vMD_w3Qqr-564ZcdvfBUGowUmQ6idglE,15758
 wcgw_cli/openai_utils.py,sha256=xGOb3W5ALrIozV7oszfGYztpj0FnXdD7jAxm5lEIVKY,2439
 mcp_wcgw/__init__.py,sha256=fKCgOdN7cn7gR3YGFaGyV5Goe8A2sEyllLcsRkN0i-g,2601
 mcp_wcgw/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -51,8 +51,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-3.0.4.dist-info/METADATA,sha256=Vak0DtA_0XgNc9RBaTsYKzJZm9pXGGyIaWXoVNYTIJ8,14049
-wcgw-3.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-wcgw-3.0.4.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
-wcgw-3.0.4.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
-wcgw-3.0.4.dist-info/RECORD,,
+wcgw-3.0.6.dist-info/METADATA,sha256=tEFOApXxIWcCkeryPchiGvd0j_zhWFP1_JX2Aqj3CuU,14049
+wcgw-3.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+wcgw-3.0.6.dist-info/entry_points.txt,sha256=vd3tj1_Kzfp55LscJ8-6WFMM5hm9cWTfNGFCrWBnH3Q,124
+wcgw-3.0.6.dist-info/licenses/LICENSE,sha256=BvY8xqjOfc3X2qZpGpX3MZEmF-4Dp0LqgKBbT6L_8oI,11142
+wcgw-3.0.6.dist-info/RECORD,,

wcgw_cli/anthropic_client.py

@@ -227,17 +227,6 @@ def loop(
             mode="wcgw",
         )
 
-        with open(
-            os.path.join(
-                os.path.dirname(__file__),
-                "..",
-                "wcgw",
-                "client",
-                "diff-instructions.txt",
-            )
-        ) as f:
-            system += f.read()
-
         if history:
             if (
                 (last_msg := history[-1])["role"] == "user"

wcgw_cli/openai_client.py

@@ -191,17 +191,6 @@ def loop(
             mode="wcgw",
         )
 
-        with open(
-            os.path.join(
-                os.path.dirname(__file__),
-                "..",
-                "wcgw",
-                "client",
-                "diff-instructions.txt",
-            )
-        ) as f:
-            system += f.read()
-
         if not history:
             history = [{"role": "system", "content": system}]
         else: