hey-cli-python 1.0.17__tar.gz → 1.1.1__tar.gz

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hey-cli-python
-Version: 1.0.17
+Version: 1.1.1
 Summary: A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands.
 Author: Mohit Singh Sinsniwal
 Project-URL: Homepage, https://github.com/sinsniwal/hey-cli
@@ -30,26 +30,22 @@ Dynamic: license-file
   <h1>hey-cli</h1>
   <p><strong>Your terminal buddy that turns plain English into shell scripts — and runs them for you.</strong></p>
 
-  <a href="https://pypi.org/project/hey-cli-python/"><img src="https://img.shields.io/pypi/v/hey-cli-python?label=PyPI&color=blue" alt="PyPI" /></a>
-  <img src="https://img.shields.io/pypi/pyversions/hey-cli-python?color=blue" alt="Python" />
-  <a href="https://github.com/sinsniwal/hey-cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" /></a>
-  <a href="https://github.com/sinsniwal/hey-cli/releases/latest"><img src="https://img.shields.io/github/v/release/sinsniwal/hey-cli?label=Release&color=orange" alt="Release" /></a>
+<a href="https://pypi.org/project/hey-cli-python/"><img src="https://img.shields.io/pypi/v/hey-cli-python?label=PyPI&color=blue" alt="PyPI" /></a>
+<img src="https://img.shields.io/pypi/pyversions/hey-cli-python?color=blue" alt="Python" />
+<a href="https://github.com/sinsniwal/hey-cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" /></a>
+<a href="https://github.com/sinsniwal/hey-cli/releases/latest"><img src="https://img.shields.io/github/v/release/sinsniwal/hey-cli?label=Release&color=orange" alt="Release" /></a>
+
 </div>
 
 <br>
 
 `hey` is a terminal-native AI assistant that translates plain English into executable shell commands using a locally-hosted LLM via [Ollama](https://ollama.com). Your data never leaves your machine.
 
-```
-$ hey find all python files modified in the last 24 hours
-● Thinking...
-
-▶ find . -name "*.py" -mtime -1 -type f
-
-Run this command? [Y/n]:
-```
+<div align="center">
+  <img src="https://github.com/sinsniwal/hey-cli/raw/main/assets/demo.gif" width="800" alt="Hey CLI Demo">
+</div>
 
----
+<br>
 
 ## Features
 
@@ -110,11 +106,13 @@ uv tool install hey-cli-python
 ### Uninstallation
 
 **macOS & Linux:**
+
 ```bash
 curl -sL https://raw.githubusercontent.com/sinsniwal/hey-cli/main/uninstall.sh | bash
 ```
 
 **Windows (PowerShell):**
+
 ```powershell
 Invoke-WebRequest -Uri "https://raw.githubusercontent.com/sinsniwal/hey-cli/main/uninstall.ps1" -OutFile "$env:TEMP\hey_uninstall.ps1"; & "$env:TEMP\hey_uninstall.ps1"
 ```
@@ -129,26 +127,43 @@ hey <your objective in plain English>
 
 ### Examples
 
-| Command | What happens |
-|---------|-------------|
-| `hey list all running docker containers` | Generates and runs `docker ps` |
-| `hey is port 8080 in use?` | Silently runs `lsof -i :8080`, reads output, answers in English |
-| `hey forcefully delete all .pyc files` | Generates `find . -name "*.pyc" -delete`, pauses for confirmation |
-| `hey compress this folder into a tar.gz` | Generates the correct `tar` command for your OS |
-| `npm run build 2>&1 \| hey what broke?` | Reads piped stderr and explains the error |
-| `hey --clear` | Wipes conversational memory |
+| Command                                  | What happens                                                      |
+| ---------------------------------------- | ----------------------------------------------------------------- |
+| `hey list all running docker containers` | Generates and runs `docker ps`                                    |
+| `hey is port 8080 in use?`               | Silently runs `lsof -i :8080`, reads output, answers in English   |
+| `hey forcefully delete all .pyc files`   | Generates `find . -name "*.pyc" -delete`, pauses for confirmation |
+| `hey compress this folder into a tar.gz` | Generates the correct `tar` command for your OS                   |
+| `npm run build 2>&1 \| hey what broke?`  | Reads piped stderr and explains the error                         |
+| `hey --clear`                            | Wipes conversational memory                                       |
 
-### Execution Levels
+---
 
-| Level | Flag | Behavior |
-|-------|------|----------|
-| 0 | `--level 0` | Dry-run — shows the command but never executes |
-| 1 | *(default)* | Supervised — safe commands auto-run, risky ones ask for confirmation |
-| 2 | `--level 2` | Unrestricted — executes everything without confirmation |
-| 3 | `--level 3` | Troubleshooter — iteratively debugs until the objective is resolved |
+## Shell Integration (Recommended)
+
+By default, CLI tools cannot change your terminal's directory because they run in a subshell. To enable `hey` to change your directory (e.g., `hey go to desktop`), add the following to your shell configuration (`~/.zshrc` or `~/.bashrc`):
+
+```bash
+eval "$(hey --shell-init)"
+```
+
+**For Windows (PowerShell):**
+
+```powershell
+hey --shell-init | Out-String | iex
+```
 
 ---
 
+## Execution Levels
+
+| Level | Flag        | Behavior                                                             |
+| ----- | ----------- | -------------------------------------------------------------------- |
+| 0     | `--level 0` | Dry-run — shows the command but never executes                       |
+| 1     | _(default)_ | Supervised — safe commands auto-run, risky ones ask for confirmation |
+| 2     | `--level 2` | Unrestricted — executes everything without confirmation              |
+| 3     | `--level 3` | Troubleshooter — iteratively debugs until the objective is resolved  |
+
+---
 
 ---
 

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/README.md

@@ -2,26 +2,22 @@
   <h1>hey-cli</h1>
   <p><strong>Your terminal buddy that turns plain English into shell scripts — and runs them for you.</strong></p>
 
-  <a href="https://pypi.org/project/hey-cli-python/"><img src="https://img.shields.io/pypi/v/hey-cli-python?label=PyPI&color=blue" alt="PyPI" /></a>
-  <img src="https://img.shields.io/pypi/pyversions/hey-cli-python?color=blue" alt="Python" />
-  <a href="https://github.com/sinsniwal/hey-cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" /></a>
-  <a href="https://github.com/sinsniwal/hey-cli/releases/latest"><img src="https://img.shields.io/github/v/release/sinsniwal/hey-cli?label=Release&color=orange" alt="Release" /></a>
+<a href="https://pypi.org/project/hey-cli-python/"><img src="https://img.shields.io/pypi/v/hey-cli-python?label=PyPI&color=blue" alt="PyPI" /></a>
+<img src="https://img.shields.io/pypi/pyversions/hey-cli-python?color=blue" alt="Python" />
+<a href="https://github.com/sinsniwal/hey-cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" /></a>
+<a href="https://github.com/sinsniwal/hey-cli/releases/latest"><img src="https://img.shields.io/github/v/release/sinsniwal/hey-cli?label=Release&color=orange" alt="Release" /></a>
+
 </div>
 
 <br>
 
 `hey` is a terminal-native AI assistant that translates plain English into executable shell commands using a locally-hosted LLM via [Ollama](https://ollama.com). Your data never leaves your machine.
 
-```
-$ hey find all python files modified in the last 24 hours
-● Thinking...
-
-▶ find . -name "*.py" -mtime -1 -type f
-
-Run this command? [Y/n]:
-```
+<div align="center">
+  <img src="https://github.com/sinsniwal/hey-cli/raw/main/assets/demo.gif" width="800" alt="Hey CLI Demo">
+</div>
 
----
+<br>
 
 ## Features
 
@@ -82,11 +78,13 @@ uv tool install hey-cli-python
 ### Uninstallation
 
 **macOS & Linux:**
+
 ```bash
 curl -sL https://raw.githubusercontent.com/sinsniwal/hey-cli/main/uninstall.sh | bash
 ```
 
 **Windows (PowerShell):**
+
 ```powershell
 Invoke-WebRequest -Uri "https://raw.githubusercontent.com/sinsniwal/hey-cli/main/uninstall.ps1" -OutFile "$env:TEMP\hey_uninstall.ps1"; & "$env:TEMP\hey_uninstall.ps1"
 ```
@@ -101,26 +99,43 @@ hey <your objective in plain English>
 
 ### Examples
 
-| Command | What happens |
-|---------|-------------|
-| `hey list all running docker containers` | Generates and runs `docker ps` |
-| `hey is port 8080 in use?` | Silently runs `lsof -i :8080`, reads output, answers in English |
-| `hey forcefully delete all .pyc files` | Generates `find . -name "*.pyc" -delete`, pauses for confirmation |
-| `hey compress this folder into a tar.gz` | Generates the correct `tar` command for your OS |
-| `npm run build 2>&1 \| hey what broke?` | Reads piped stderr and explains the error |
-| `hey --clear` | Wipes conversational memory |
+| Command                                  | What happens                                                      |
+| ---------------------------------------- | ----------------------------------------------------------------- |
+| `hey list all running docker containers` | Generates and runs `docker ps`                                    |
+| `hey is port 8080 in use?`               | Silently runs `lsof -i :8080`, reads output, answers in English   |
+| `hey forcefully delete all .pyc files`   | Generates `find . -name "*.pyc" -delete`, pauses for confirmation |
+| `hey compress this folder into a tar.gz` | Generates the correct `tar` command for your OS                   |
+| `npm run build 2>&1 \| hey what broke?`  | Reads piped stderr and explains the error                         |
+| `hey --clear`                            | Wipes conversational memory                                       |
 
-### Execution Levels
+---
 
-| Level | Flag | Behavior |
-|-------|------|----------|
-| 0 | `--level 0` | Dry-run — shows the command but never executes |
-| 1 | *(default)* | Supervised — safe commands auto-run, risky ones ask for confirmation |
-| 2 | `--level 2` | Unrestricted — executes everything without confirmation |
-| 3 | `--level 3` | Troubleshooter — iteratively debugs until the objective is resolved |
+## Shell Integration (Recommended)
+
+By default, CLI tools cannot change your terminal's directory because they run in a subshell. To enable `hey` to change your directory (e.g., `hey go to desktop`), add the following to your shell configuration (`~/.zshrc` or `~/.bashrc`):
+
+```bash
+eval "$(hey --shell-init)"
+```
+
+**For Windows (PowerShell):**
+
+```powershell
+hey --shell-init | Out-String | iex
+```
 
 ---
 
+## Execution Levels
+
+| Level | Flag        | Behavior                                                             |
+| ----- | ----------- | -------------------------------------------------------------------- |
+| 0     | `--level 0` | Dry-run — shows the command but never executes                       |
+| 1     | _(default)_ | Supervised — safe commands auto-run, risky ones ask for confirmation |
+| 2     | `--level 2` | Unrestricted — executes everything without confirmation              |
+| 3     | `--level 3` | Troubleshooter — iteratively debugs until the objective is resolved  |
+
+---
 
 ---
 

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/hey_cli/cli.py

@@ -68,6 +68,9 @@ def main():
     parser.add_argument(
         "--check-cache", type=str, help="Check local cache for instant fix"
     )
+    parser.add_argument(
+        "--shell-init", action="store_true", help="Output shell function for directory persistence"
+    )
 
     args = parser.parse_args()
 
@@ -95,6 +98,36 @@ def main():
     if args.check_cache:
         sys.exit(0)
 
+    if args.shell_init:
+        is_windows = os.name == "nt"
+        if is_windows:
+            shell_func = r"""
+function hey {
+    & hey.exe @args
+    $handoff = Join-Path $HOME ".hey_cwd_handoff"
+    if (Test-Path $handoff) {
+        $target = Get-Content $handoff -Raw
+        Remove-Item $handoff
+        if (Test-Path $target.Trim()) {
+            Set-Location $target.Trim()
+        }
+    }
+}
+"""
+        else:
+            shell_func = r"""
+hey() {
+    command hey "$@"
+    if [ -f "$HOME/.hey_cwd_handoff" ]; then
+        local target=$(cat "$HOME/.hey_cwd_handoff")
+        rm -f "$HOME/.hey_cwd_handoff"
+        [ -d "$target" ] && cd "$target"
+    fi
+}
+"""
+        print(shell_func.strip())
+        sys.exit(0)
+
     # Only check Ollama when we're about to call the LLM
     check_ollama()
 

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/hey_cli/governance.py

@@ -21,7 +21,7 @@ DEFAULT_RULES = {
         "kubectl delete"
     ],
     "allowed": [
-        "ls", "cat", "pwd", "grep", "find", "echo", "tail"
+        "ls", "cat", "pwd", "grep", "find", "echo", "tail", "cd"
     ],
     "high_risk_keywords": [
         "reset", "delete", "drop", "truncate", "prune", "rm", "-exec", ">"

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/hey_cli/runner.py

@@ -2,6 +2,9 @@ import subprocess
 import sys
 import json
 import dataclasses
+import os
+import platform
+import re
 from typing import Optional
 
 from .governance import GovernanceEngine, Action
@@ -17,17 +20,44 @@ class CommandRunner:
         self.history_mgr = history_mgr
         self.console = Console()
 
-    def run_command(self, cmd: str) -> tuple[int, str]:
+    def run_command(self, cmd: str, capture_pwd: bool = False) -> tuple[int, str]:
         """Executes a command and returns exit code and combined output."""
+        is_windows = platform.system() == "Windows"
         try:
+            full_cmd = cmd
+            if capture_pwd:
+                if is_windows:
+                    # Windows CMD syntax for capturing PWD
+                    full_cmd = f'("{cmd}") & echo. & echo HEY_CWD_HANDOFF:%CD%'
+                else:
+                    # Unix shell syntax
+                    full_cmd = f'{{ {cmd} ; }} ; printf "\\nHEY_CWD_HANDOFF:%s\\n" "$(pwd)"'
+            
             result = subprocess.run(
-                cmd, 
+                full_cmd, 
                 shell=True, 
                 stdout=subprocess.PIPE, 
                 stderr=subprocess.STDOUT, 
                 text=True
             )
-            return result.returncode, result.stdout
+            
+            out = result.stdout
+            if capture_pwd and "HEY_CWD_HANDOFF:" in out:
+                match = re.search(r"HEY_CWD_HANDOFF:(.*)", out)
+                if match:
+                    cwd = match.group(1).strip()
+                    # Clean up output to hide the marker and the extra newline
+                    out = re.sub(r"\n?HEY_CWD_HANDOFF:.*", "", out, flags=re.DOTALL).strip()
+                    
+                    # Normalize paths for comparison (especially on Windows)
+                    norm_cwd = os.path.normpath(cwd).lower() if is_windows else os.path.normpath(cwd)
+                    norm_actual = os.path.normpath(os.getcwd()).lower() if is_windows else os.path.normpath(os.getcwd())
+                    
+                    if norm_cwd != norm_actual:
+                        with open(os.path.expanduser("~/.hey_cwd_handoff"), "w") as f:
+                            f.write(cwd)
+            
+            return result.returncode, out
         except Exception as e:
             return -1, str(e)
 
@@ -146,7 +176,7 @@ class CommandRunner:
         if self.level in (1, 2):
             if self._check_governance(cmd):
                 self.console.print(f"[bold green]● Running:[/bold green] {cmd}")
-                code, out = self.run_command(cmd)
+                code, out = self.run_command(cmd, capture_pwd=True)
                 if out.strip():
                     print(out.strip())
                 sys.exit(code)

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/hey_cli_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hey-cli-python
-Version: 1.0.17
+Version: 1.1.1
 Summary: A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands.
 Author: Mohit Singh Sinsniwal
 Project-URL: Homepage, https://github.com/sinsniwal/hey-cli
@@ -30,26 +30,22 @@ Dynamic: license-file
   <h1>hey-cli</h1>
   <p><strong>Your terminal buddy that turns plain English into shell scripts — and runs them for you.</strong></p>
 
-  <a href="https://pypi.org/project/hey-cli-python/"><img src="https://img.shields.io/pypi/v/hey-cli-python?label=PyPI&color=blue" alt="PyPI" /></a>
-  <img src="https://img.shields.io/pypi/pyversions/hey-cli-python?color=blue" alt="Python" />
-  <a href="https://github.com/sinsniwal/hey-cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" /></a>
-  <a href="https://github.com/sinsniwal/hey-cli/releases/latest"><img src="https://img.shields.io/github/v/release/sinsniwal/hey-cli?label=Release&color=orange" alt="Release" /></a>
+<a href="https://pypi.org/project/hey-cli-python/"><img src="https://img.shields.io/pypi/v/hey-cli-python?label=PyPI&color=blue" alt="PyPI" /></a>
+<img src="https://img.shields.io/pypi/pyversions/hey-cli-python?color=blue" alt="Python" />
+<a href="https://github.com/sinsniwal/hey-cli/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License" /></a>
+<a href="https://github.com/sinsniwal/hey-cli/releases/latest"><img src="https://img.shields.io/github/v/release/sinsniwal/hey-cli?label=Release&color=orange" alt="Release" /></a>
+
 </div>
 
 <br>
 
 `hey` is a terminal-native AI assistant that translates plain English into executable shell commands using a locally-hosted LLM via [Ollama](https://ollama.com). Your data never leaves your machine.
 
-```
-$ hey find all python files modified in the last 24 hours
-● Thinking...
-
-▶ find . -name "*.py" -mtime -1 -type f
-
-Run this command? [Y/n]:
-```
+<div align="center">
+  <img src="https://github.com/sinsniwal/hey-cli/raw/main/assets/demo.gif" width="800" alt="Hey CLI Demo">
+</div>
 
----
+<br>
 
 ## Features
 
@@ -110,11 +106,13 @@ uv tool install hey-cli-python
 ### Uninstallation
 
 **macOS & Linux:**
+
 ```bash
 curl -sL https://raw.githubusercontent.com/sinsniwal/hey-cli/main/uninstall.sh | bash
 ```
 
 **Windows (PowerShell):**
+
 ```powershell
 Invoke-WebRequest -Uri "https://raw.githubusercontent.com/sinsniwal/hey-cli/main/uninstall.ps1" -OutFile "$env:TEMP\hey_uninstall.ps1"; & "$env:TEMP\hey_uninstall.ps1"
 ```
@@ -129,26 +127,43 @@ hey <your objective in plain English>
 
 ### Examples
 
-| Command | What happens |
-|---------|-------------|
-| `hey list all running docker containers` | Generates and runs `docker ps` |
-| `hey is port 8080 in use?` | Silently runs `lsof -i :8080`, reads output, answers in English |
-| `hey forcefully delete all .pyc files` | Generates `find . -name "*.pyc" -delete`, pauses for confirmation |
-| `hey compress this folder into a tar.gz` | Generates the correct `tar` command for your OS |
-| `npm run build 2>&1 \| hey what broke?` | Reads piped stderr and explains the error |
-| `hey --clear` | Wipes conversational memory |
+| Command                                  | What happens                                                      |
+| ---------------------------------------- | ----------------------------------------------------------------- |
+| `hey list all running docker containers` | Generates and runs `docker ps`                                    |
+| `hey is port 8080 in use?`               | Silently runs `lsof -i :8080`, reads output, answers in English   |
+| `hey forcefully delete all .pyc files`   | Generates `find . -name "*.pyc" -delete`, pauses for confirmation |
+| `hey compress this folder into a tar.gz` | Generates the correct `tar` command for your OS                   |
+| `npm run build 2>&1 \| hey what broke?`  | Reads piped stderr and explains the error                         |
+| `hey --clear`                            | Wipes conversational memory                                       |
 
-### Execution Levels
+---
 
-| Level | Flag | Behavior |
-|-------|------|----------|
-| 0 | `--level 0` | Dry-run — shows the command but never executes |
-| 1 | *(default)* | Supervised — safe commands auto-run, risky ones ask for confirmation |
-| 2 | `--level 2` | Unrestricted — executes everything without confirmation |
-| 3 | `--level 3` | Troubleshooter — iteratively debugs until the objective is resolved |
+## Shell Integration (Recommended)
+
+By default, CLI tools cannot change your terminal's directory because they run in a subshell. To enable `hey` to change your directory (e.g., `hey go to desktop`), add the following to your shell configuration (`~/.zshrc` or `~/.bashrc`):
+
+```bash
+eval "$(hey --shell-init)"
+```
+
+**For Windows (PowerShell):**
+
+```powershell
+hey --shell-init | Out-String | iex
+```
 
 ---
 
+## Execution Levels
+
+| Level | Flag        | Behavior                                                             |
+| ----- | ----------- | -------------------------------------------------------------------- |
+| 0     | `--level 0` | Dry-run — shows the command but never executes                       |
+| 1     | _(default)_ | Supervised — safe commands auto-run, risky ones ask for confirmation |
+| 2     | `--level 2` | Unrestricted — executes everything without confirmation              |
+| 3     | `--level 3` | Troubleshooter — iteratively debugs until the objective is resolved  |
+
+---
 
 ---
 

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/hey_cli_python.egg-info/SOURCES.txt

@@ -15,4 +15,5 @@ hey_cli_python.egg-info/dependency_links.txt
 hey_cli_python.egg-info/entry_points.txt
 hey_cli_python.egg-info/requires.txt
 hey_cli_python.egg-info/top_level.txt
-tests/test_cli.py
+tests/test_cli.py
+tests/test_runner.py

{hey_cli_python-1.0.17 → hey_cli_python-1.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hey-cli-python"
-version = "1.0.17"
+version = "1.1.1"
 description = "A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands."
 readme = "README.md"
 requires-python = ">=3.9"

hey_cli_python-1.1.1/tests/test_runner.py

@@ -0,0 +1,87 @@
+import unittest
+from unittest.mock import patch, MagicMock
+import os
+import tempfile
+from hey_cli.runner import CommandRunner
+from hey_cli.governance import GovernanceEngine
+
+class TestCommandRunnerHandoff(unittest.TestCase):
+    def setUp(self):
+        self.gov = MagicMock(spec=GovernanceEngine)
+        self.runner = CommandRunner(governance=self.gov)
+        self.handoff_path = os.path.expanduser("~/.hey_cwd_handoff")
+        if os.path.exists(self.handoff_path):
+            os.remove(self.handoff_path)
+
+    def tearDown(self):
+        if os.path.exists(self.handoff_path):
+            os.remove(self.handoff_path)
+
+    @patch("subprocess.run")
+    def test_run_command_captures_pwd(self, mock_run):
+        # Simulate a command that includes the HEY_CWD_HANDOFF marker
+        mock_result = MagicMock()
+        mock_result.returncode = 0
+        # Mocking the output of '(cd /tmp) ; printf "\nHEY_CWD_HANDOFF:%s\n" "$(pwd)"'
+        mock_result.stdout = "some output\nHEY_CWD_HANDOFF:/tmp\n"
+        mock_run.return_value = mock_result
+
+        code, out = self.runner.run_command("cd /tmp", capture_pwd=True)
+
+        # Verify the handoff file was created with the correct path
+        self.assertTrue(os.path.exists(self.handoff_path))
+        with open(self.handoff_path, "r") as f:
+            self.assertEqual(f.read().strip(), "/tmp")
+        
+        # Verify the marker was stripped from the output
+        self.assertEqual(out.strip(), "some output")
+
+        # Verify the command was wrapped correctly
+        mock_run.assert_called_once()
+        called_cmd = mock_run.call_args[0][0]
+        self.assertIn("HEY_CWD_HANDOFF", called_cmd)
+
+    @patch("subprocess.run")
+    def test_run_command_no_capture_pwd(self, mock_run):
+        mock_result = MagicMock()
+        mock_result.returncode = 0
+        mock_result.stdout = "normal output\n"
+        mock_run.return_value = mock_result
+
+        code, out = self.runner.run_command("ls", capture_pwd=False)
+
+        self.assertFalse(os.path.exists(self.handoff_path))
+        self.assertEqual(out.strip(), "normal output")
+        
+        # Verify the command was NOT wrapped
+        mock_run.assert_called_once_with(
+            "ls", shell=True, stdout=-1, stderr=-2, text=True
+        )
+
+    @patch("platform.system")
+    @patch("subprocess.run")
+    def test_run_command_windows_handoff(self, mock_run, mock_platform):
+        mock_platform.return_value = "Windows"
+        
+        mock_result = MagicMock()
+        mock_result.returncode = 0
+        mock_result.stdout = "some output\nHEY_CWD_HANDOFF:C:\\Temp\n"
+        mock_run.return_value = mock_result
+
+        # We need to mock os.getcwd and os.path.normpath to match Windows style in this test
+        with patch("os.getcwd", return_value="C:\\Users\\Test"), \
+             patch("os.path.expanduser", return_value=self.handoff_path):
+            
+            code, out = self.runner.run_command("cd C:\\Temp", capture_pwd=True)
+
+            # Verify the command was wrapped using Windows CMD syntax
+            called_cmd = mock_run.call_args[0][0]
+            self.assertEqual(called_cmd, '("cd C:\\Temp") & echo. & echo HEY_CWD_HANDOFF:%CD%')
+
+            # Verify the handoff file was created
+            self.assertTrue(os.path.exists(self.handoff_path))
+            with open(self.handoff_path, "r") as f:
+                self.assertEqual(f.read().strip(), "C:\\Temp")
+
+if __name__ == "__main__":
+    unittest.main()