ai-memory-cli 0.1.8__tar.gz → 0.1.9__tar.gz

{ai_memory_cli-0.1.8/src/ai_memory_cli.egg-info → ai_memory_cli-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-memory-cli
-Version: 0.1.8
+Version: 0.1.9
 Summary: Python CLI for AI Memory terminal capture and offline sync.
 Author: AI Memory
 License-Expression: MIT
@@ -69,6 +69,7 @@ On Windows, `python -m ai_memory_cli ...` is the safest form because it avoids P
 
 Inside `watch`, type the real command you want to capture, for example `python --version`. Do not type `python -m ai_memory_cli run -- ...` inside `watch`, or you will capture the nested CLI command too.
 Use `cls` on Windows or `clear` on Unix shells to clear the watch screen; those control commands are not stored or synced.
+On Windows, commands run through PowerShell, so type `ls` directly. Do not type `powershell` or `cmd` inside `watch`; nested shell launchers are ignored and not stored.
 
 ## Background agent
 

{ai_memory_cli-0.1.8 → ai_memory_cli-0.1.9}/README.md

@@ -47,6 +47,7 @@ On Windows, `python -m ai_memory_cli ...` is the safest form because it avoids P
 
 Inside `watch`, type the real command you want to capture, for example `python --version`. Do not type `python -m ai_memory_cli run -- ...` inside `watch`, or you will capture the nested CLI command too.
 Use `cls` on Windows or `clear` on Unix shells to clear the watch screen; those control commands are not stored or synced.
+On Windows, commands run through PowerShell, so type `ls` directly. Do not type `powershell` or `cmd` inside `watch`; nested shell launchers are ignored and not stored.
 
 ## Background agent
 

{ai_memory_cli-0.1.8 → ai_memory_cli-0.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ai-memory-cli"
-version = "0.1.8"
+version = "0.1.9"
 description = "Python CLI for AI Memory terminal capture and offline sync."
 readme = "README.md"
 requires-python = ">=3.10"

{ai_memory_cli-0.1.8 → ai_memory_cli-0.1.9}/src/ai_memory_cli/__init__.py

@@ -1,3 +1,3 @@
 """AI Memory terminal capture CLI."""
 
-__version__ = "0.1.8"
+__version__ = "0.1.9"

{ai_memory_cli-0.1.8 → ai_memory_cli-0.1.9}/src/ai_memory_cli/cli.py

@@ -43,6 +43,7 @@ SHELL_NOT_FOUND_PATTERNS = [
     "command not found",
 ]
 CLEAR_COMMANDS = {"cls", "clear"}
+INTERACTIVE_SHELLS = {"powershell", "pwsh", "cmd", "bash", "sh", "zsh", "fish"}
 
 
 def utc_now() -> str:
@@ -326,6 +327,44 @@ def is_clear_command(command: str) -> bool:
     return normalize_command(command).lower() in CLEAR_COMMANDS
 
 
+def is_interactive_shell_command(command: str) -> bool:
+    tokens = normalize_command(command).lower().split()
+    if not tokens:
+        return False
+    launcher = tokens[0].removesuffix(".exe")
+    if launcher not in INTERACTIVE_SHELLS:
+        return False
+    if launcher in {"powershell", "pwsh"}:
+        return len(tokens) == 1 or "-noexit" in tokens
+    if launcher == "cmd":
+        return len(tokens) == 1 or "/k" in tokens
+    return len(tokens) == 1
+
+
+def command_invocation(command: str) -> tuple[str | list[str], bool]:
+    if os.name == "nt":
+        powershell = shutil.which("powershell") or shutil.which("pwsh")
+        if powershell:
+            return [powershell, "-NoLogo", "-NoProfile", "-ExecutionPolicy", "Bypass", "-Command", command], False
+    return command, True
+
+
+def run_external_command(command: str, cwd: Path, capture: bool) -> subprocess.CompletedProcess[str] | int:
+    invocation, use_shell = command_invocation(command)
+    if capture:
+        return subprocess.run(
+            invocation,
+            shell=use_shell,
+            cwd=str(cwd),
+            stdin=subprocess.DEVNULL,
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
+        )
+    return subprocess.call(invocation, shell=use_shell, cwd=str(cwd), stdin=subprocess.DEVNULL)
+
+
 def clear_console() -> None:
     command = "cls" if os.name == "nt" else "clear"
     try:
@@ -341,10 +380,15 @@ def normalize_output(stdout: str, stderr: str) -> str:
 
 
 def selected_shell() -> str:
+    if os.name == "nt":
+        if shutil.which("powershell"):
+            return "powershell"
+        if shutil.which("pwsh"):
+            return "pwsh"
     shell = os.getenv("SHELL") or os.getenv("COMSPEC") or ""
     if shell:
         return Path(shell).name
-    return "powershell" if os.name == "nt" else "sh"
+    return "sh"
 
 
 def command_line(parts: list[str]) -> str:
@@ -649,25 +693,23 @@ def capture_command(home: Path, config: dict[str, Any], command: str, include_ex
         clear_console()
         return 0
 
+    if is_interactive_shell_command(command):
+        print("ai-memory: watch already runs commands through a shell. Type the command directly, for example: ls")
+        return 0
+
     require_verified_auth(home, config)
     workspace = Path(str(config.get("workspace_path") or ".")).expanduser()
     cwd = workspace if workspace.exists() else Path.cwd()
 
     if is_excluded(command, config) and not include_excluded:
         print(f"ai-memory: running without capture because this command is excluded: {command}", file=sys.stderr)
-        return subprocess.call(command, shell=True, cwd=str(cwd))
+        return int(run_external_command(command, cwd, capture=False))
 
     started_at = utc_now()
     started_monotonic = time.monotonic()
-    completed = subprocess.run(
-        command,
-        shell=True,
-        cwd=str(cwd),
-        capture_output=True,
-        text=True,
-        encoding="utf-8",
-        errors="replace",
-    )
+    completed = run_external_command(command, cwd, capture=True)
+    if isinstance(completed, int):
+        return completed
     ended_at = utc_now()
     duration_ms = int((time.monotonic() - started_monotonic) * 1000)
 
@@ -888,6 +930,9 @@ def command_watch(args: argparse.Namespace) -> int:
         if is_clear_command(command):
             clear_console()
             continue
+        if is_interactive_shell_command(command):
+            print("ai-memory: do not start a nested shell here. Type commands directly, for example: ls")
+            continue
         capture_command(home, config, command, args.include_excluded, "watch")
     return 0
 

{ai_memory_cli-0.1.8 → ai_memory_cli-0.1.9/src/ai_memory_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-memory-cli
-Version: 0.1.8
+Version: 0.1.9
 Summary: Python CLI for AI Memory terminal capture and offline sync.
 Author: AI Memory
 License-Expression: MIT
@@ -69,6 +69,7 @@ On Windows, `python -m ai_memory_cli ...` is the safest form because it avoids P
 
 Inside `watch`, type the real command you want to capture, for example `python --version`. Do not type `python -m ai_memory_cli run -- ...` inside `watch`, or you will capture the nested CLI command too.
 Use `cls` on Windows or `clear` on Unix shells to clear the watch screen; those control commands are not stored or synced.
+On Windows, commands run through PowerShell, so type `ls` directly. Do not type `powershell` or `cmd` inside `watch`; nested shell launchers are ignored and not stored.
 
 ## Background agent