wcgw 2.8.10__tar.gz → 3.0.1rc1__tar.gz

{wcgw-2.8.10 → wcgw-3.0.1rc1}/.github/workflows/python-tests.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -29,7 +29,7 @@ jobs:
       - name: Run tests with coverage
         run: |
           uv pip install pytest pytest-cov
-          uv run pytest --cov=wcgw --cov-report=xml --cov-report=term-missing:skip-covered
+          uv run pytest --cov=wcgw --cov-report=xml --cov-report=term-missing
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         if: success()

{wcgw-2.8.10 → wcgw-3.0.1rc1}/.github/workflows/python-types.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
         with:

{wcgw-2.8.10 → wcgw-3.0.1rc1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: wcgw
-Version: 2.8.10
+Version: 3.0.1rc1
 Summary: Shell and coding agent on claude and chatgpt
 Project-URL: Homepage, https://github.com/rusiaaman/wcgw
 Author-email: Aman Rusia <gapypi@arcfu.com>
 License-File: LICENSE
-Requires-Python: <3.13,>=3.11
+Requires-Python: >=3.11
 Requires-Dist: anthropic>=0.39.0
 Requires-Dist: fastapi>=0.115.0
 Requires-Dist: openai>=1.46.0
@@ -22,7 +22,6 @@ Requires-Dist: syntax-checker>=0.3.0
 Requires-Dist: tokenizers>=0.21.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: typer>=0.12.5
-Requires-Dist: types-pexpect>=4.9.0.20240806
 Requires-Dist: uvicorn>=0.31.0
 Requires-Dist: websockets>=13.1
 Description-Content-Type: text/markdown

{wcgw-2.8.10 → wcgw-3.0.1rc1}/gpt_action_json_schema.json

@@ -6,7 +6,7 @@
   },
   "servers": [
     {
-      "url": "https://04df-103-212-152-58.ngrok-free.app"
+      "url": "https://7781-2401-4900-1c2d-12ae-c55d-45dc-459-c089.ngrok-free.app"
     }
   ],
   "paths": {
@@ -90,16 +90,16 @@
         }
       }
     },
-    "/v1/reset_shell": {
+    "/v1/reset_wcgw": {
       "post": {
         "x-openai-isConsequential": false,
-        "summary": "Reset Shell",
-        "operationId": "reset_shell_v1_reset_shell_post",
+        "summary": "Reset Wcgw",
+        "operationId": "reset_wcgw_v1_reset_wcgw_post",
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/ResetShellWithUUID"
+                "$ref": "#/components/schemas/ResetWcgwWithUUID"
               }
             }
           },
@@ -112,7 +112,7 @@
               "application/json": {
                 "schema": {
                   "type": "string",
-                  "title": "Response Reset Shell V1 Reset Shell Post"
+                  "title": "Response Reset Wcgw V1 Reset Wcgw Post"
                 }
               }
             }
@@ -170,46 +170,6 @@
         }
       }
     },
-    "/v1/bash_interaction": {
-      "post": {
-        "x-openai-isConsequential": false,
-        "summary": "Bash Interaction",
-        "operationId": "bash_interaction_v1_bash_interaction_post",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/BashInteractionWithUUID"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "string",
-                  "title": "Response Bash Interaction V1 Bash Interaction Post"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/v1/read_file": {
       "post": {
         "x-openai-isConsequential": false,
@@ -333,81 +293,6 @@
   },
   "components": {
     "schemas": {
-      "BashInteractionWithUUID": {
-        "properties": {
-          "send_text": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Send Text"
-          },
-          "send_specials": {
-            "anyOf": [
-              {
-                "items": {
-                  "type": "string",
-                  "enum": [
-                    "Key-up",
-                    "Key-down",
-                    "Key-left",
-                    "Key-right",
-                    "Enter",
-                    "Ctrl-c",
-                    "Ctrl-d",
-                    "Ctrl-z"
-                  ]
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Send Specials"
-          },
-          "send_ascii": {
-            "anyOf": [
-              {
-                "items": {
-                  "type": "integer"
-                },
-                "type": "array"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Send Ascii"
-          },
-          "wait_for_seconds": {
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Wait For Seconds"
-          },
-          "user_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "User Id"
-          }
-        },
-        "additionalProperties": false,
-        "type": "object",
-        "required": [
-          "user_id"
-        ],
-        "title": "BashInteractionWithUUID"
-      },
       "CodeWriterMode": {
         "properties": {
           "allowed_globs": {
@@ -449,11 +334,52 @@
         ],
         "title": "CodeWriterMode"
       },
-      "CommandWithUUID": {
+      "Command": {
         "properties": {
           "command": {
             "type": "string",
             "title": "Command"
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "required": [
+          "command"
+        ],
+        "title": "Command"
+      },
+      "CommandWithUUID": {
+        "properties": {
+          "action": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/Command"
+              },
+              {
+                "$ref": "#/components/schemas/StatusCheck"
+              },
+              {
+                "$ref": "#/components/schemas/SendText"
+              },
+              {
+                "$ref": "#/components/schemas/SendSpecials"
+              },
+              {
+                "$ref": "#/components/schemas/SendAscii"
+              }
+            ],
+            "title": "Action"
+          },
+          "wait_for_seconds": {
+            "anyOf": [
+              {
+                "type": "number"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Wait For Seconds"
           },
           "user_id": {
             "type": "string",
@@ -461,9 +387,10 @@
             "title": "User Id"
           }
         },
+        "additionalProperties": false,
         "type": "object",
         "required": [
-          "command",
+          "action",
           "user_id"
         ],
         "title": "CommandWithUUID"
@@ -620,13 +547,43 @@
         ],
         "title": "ReadFileWithUUID"
       },
-      "ResetShellWithUUID": {
+      "ResetWcgwWithUUID": {
         "properties": {
           "should_reset": {
             "type": "boolean",
             "const": true,
             "title": "Should Reset"
           },
+          "change_mode": {
+            "anyOf": [
+              {
+                "type": "string",
+                "enum": [
+                  "wcgw",
+                  "architect",
+                  "code_writer"
+                ]
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Change Mode"
+          },
+          "code_writer_config": {
+            "anyOf": [
+              {
+                "$ref": "#/components/schemas/CodeWriterMode"
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "starting_directory": {
+            "type": "string",
+            "title": "Starting Directory"
+          },
           "user_id": {
             "type": "string",
             "format": "uuid",
@@ -637,9 +594,84 @@
         "type": "object",
         "required": [
           "should_reset",
+          "change_mode",
+          "starting_directory",
           "user_id"
         ],
-        "title": "ResetShellWithUUID"
+        "title": "ResetWcgwWithUUID"
+      },
+      "SendAscii": {
+        "properties": {
+          "send_ascii": {
+            "items": {
+              "type": "integer"
+            },
+            "type": "array",
+            "title": "Send Ascii"
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "required": [
+          "send_ascii"
+        ],
+        "title": "SendAscii"
+      },
+      "SendSpecials": {
+        "properties": {
+          "send_specials": {
+            "items": {
+              "type": "string",
+              "enum": [
+                "Enter",
+                "Key-up",
+                "Key-down",
+                "Key-left",
+                "Key-right",
+                "Ctrl-c",
+                "Ctrl-d",
+                "Ctrl-z"
+              ]
+            },
+            "type": "array",
+            "title": "Send Specials"
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "required": [
+          "send_specials"
+        ],
+        "title": "SendSpecials"
+      },
+      "SendText": {
+        "properties": {
+          "send_text": {
+            "type": "string",
+            "title": "Send Text"
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "required": [
+          "send_text"
+        ],
+        "title": "SendText"
+      },
+      "StatusCheck": {
+        "properties": {
+          "status_check": {
+            "type": "boolean",
+            "const": true,
+            "title": "Status Check"
+          }
+        },
+        "additionalProperties": false,
+        "type": "object",
+        "required": [
+          "status_check"
+        ],
+        "title": "StatusCheck"
       },
       "ValidationError": {
         "properties": {

{wcgw-2.8.10 → wcgw-3.0.1rc1}/gpt_instructions.txt

@@ -18,16 +18,18 @@ Instructions for `Initialize`:
     - Leave `any_workspace_path` as empty if no file or folder is mentioned.
     - By default use mode `wcgw`
     - In code-writer mode, set the commands and globs which user asked to set, otherwise use 'all'.
-    - In order to change the mode later, call this tool again but be sure to not provide any other argument like task_id_to_resume unnecessarily.
+    - Call `ResetWcgw` if you want to change the mode later.
 
 Instructions for `BashCommand`:
 - Execute a bash command. This is stateful (beware with subsequent calls).
-- Do not use interactive commands like nano. Prefer writing simpler commands.
 - Status of the command and the current working directory will always be returned at the end.
-- Optionally `exit shell has restarted` is the output, in which case environment resets, you can run fresh commands.
 - The first or the last line might be `(...truncated)` if the output is too long.
-- The control will return to you in 5 seconds regardless of the status. For heavy commands, keep checking status using BashInteraction till they are finished.
 - Run long running commands in background using screen instead of "&".
+- Only one command allowed at a time, you need to wait for the first command to finish before running the next one.
+- In order to check status of previous command, use `status_check` with empty command argument.
+- Programs don't hang easily, so most likely explanation for no output is usually that the program is still running, and you need to check status again.
+- Do not send Ctrl-c before checking for status till 10 minutes or whatever is appropriate for the program to finish.
+- Use SendText or SendSpecials or SendAscii to interact with running command.
 
 Instructions for `Read Files`
 - Read full file content of one or more files.
@@ -38,15 +40,8 @@ Instructions for `Write if Empty`
 - Provide absolute file path only.
 - For editing existing files, use FileEdit.
 
-Instructions for `BashInteraction`
-- Interact with running program using this tool
-- Special keys like arrows, interrupts, enter, etc.
-- Send text input to the running program.
-- Send send_specials=["Enter"] to recheck status of a running program.
-- Only one of send_text, send_specials, send_ascii should be provided.
-
-Instructions for `ResetShell`
-- Resets the shell. Use only if all interrupts and prompt reset attempts have failed repeatedly.
+Instructions for `ResetWcgw`
+- Resets the shell. Use either when changing mode, or when all interrupts and prompt reset attempts have failed repeatedly.
 
 Instructions for `ContextSave`
 - Saves provided description and file contents of all the relevant file paths or globs in a single text file.

{wcgw-2.8.10 → wcgw-3.0.1rc1}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 authors = [{ name = "Aman Rusia", email = "gapypi@arcfu.com" }]
 name = "wcgw"
-version = "2.8.10"
+version = "3.0.1rc1"
 description = "Shell and coding agent on claude and chatgpt"
 readme = "README.md"
-requires-python = ">=3.11, <3.13"
+requires-python = ">=3.11"
 dependencies = [
     "openai>=1.46.0",
     "typer>=0.12.5",
@@ -12,7 +12,6 @@ dependencies = [
     "python-dotenv>=1.0.1",
     "pexpect>=4.9.0",
     "shell>=1.0.1",
-    "types-pexpect>=4.9.0.20240806",
     "toml>=0.10.2",
     "petname>=2.6",
     "pyte>=0.8.2",
@@ -58,8 +57,10 @@ dev-dependencies = [
     "pytest>=8.0.0",
     "pytest-cov>=4.1.0",
     "line-profiler>=4.2.0",
+    "pytest-asyncio>=0.25.3",
+    "types-pexpect>=4.9.0.20241208",
 ]
 
 [tool.pytest.ini_options]
-addopts = "--cov=wcgw --cov-report=term-missing:skip-covered --cov-report=html"
+addopts = "--cov=wcgw --cov-report=term-missing --cov-report=html"
 testpaths = ["tests"]

{wcgw-2.8.10 → wcgw-3.0.1rc1}/src/wcgw/__init__.py

@@ -1,2 +1,2 @@
 from .client.mcp_server import main as mcp_server
-from .client.tools import run as listen
+from .relay.client import run as listen