terminal-ai-helper 1.3.6 → 2.0.0

package/VERSION

@@ -1 +1 @@
-1.3.6
+2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terminal-ai-helper",
-  "version": "1.3.6",
+  "version": "2.0.0",
   "description": "The terminal that knows your next command Bash/Zsh suggestions that learn from your own history Offline and private with no account required",
   "license": "MIT",
   "repository": {
@@ -36,4 +36,4 @@
   "devDependencies": {
     "vitepress": "^1.6.3"
   }
-}
+}

package/readme.md

@@ -200,9 +200,10 @@ rc file.
 
 `tai update` stops rather than overwrite a copy you have edited yourself.
 `tai uninstall` removes the shell integration, the wrapper, the indexes, the
-SQLite history and the cached knowledge. The `~/.tai` folder stays — on an
-npm install, `npm rm -g terminal-ai-helper` removes the package itself.
-Restart the terminal afterwards.
+SQLite history, the cached knowledge and the `~/.tai` checkout itself; a
+folder that is not a tai checkout is named and left alone. On an npm install
+it also runs `npm rm -g terminal-ai-helper` itself. Restart the terminal
+afterwards.
 
 ## Why it stays fast
 

package/tai/cli.py

@@ -505,6 +505,7 @@ def cmd_eval_jev(a) -> int:
 
 def cmd_uninstall(a) -> int:
     import shutil
+    import subprocess
     from pathlib import Path
 
     from tai.paths import data_dir
@@ -519,7 +520,17 @@ def cmd_uninstall(a) -> int:
     # BIN_DIR is the one that gets removed.
     wrapper = Path(os.environ.get("BIN_DIR") or home / ".local" / "bin") / "tai"
     removed = []
+    npm_door = False
     if wrapper.exists() or wrapper.is_symlink():
+        # The wrapper names the checkout it execs, and that name is the door:
+        # a wrapper pointing into node_modules means the package itself is
+        # still installed, and the uninstall is not done until npm has it
+        # back. Read before unlink; a wrapper that cannot be read still goes.
+        try:
+            npm_door = ("node_modules/terminal-ai-helper"
+                        in wrapper.read_text(errors="replace"))
+        except OSError:
+            pass
         wrapper.unlink()
         removed.append(str(wrapper))
     if data.exists():
@@ -565,9 +576,47 @@ def cmd_uninstall(a) -> int:
             tmp.write_text(new, encoding="utf-8", errors="surrogateescape")
             os.replace(tmp, rc)
             removed.append(str(rc))
+    # The piped door clones the code itself to TAI_DIR (default ~/.tai), and
+    # leaving it behind would leave the program installed in every way but the
+    # wrapper — the same rule the rc blocks above are held to. What makes the
+    # directory tai's is its layout: cli.py and the installer inside it. A
+    # directory without that shape is not ours to delete, so it is named and
+    # kept. Last on purpose: this command usually runs from inside the checkout
+    # (the wrapper execs this very file), so removing it has to be the last
+    # thing the run does.
+    checkout = Path(os.environ.get("TAI_DIR") or home / ".tai")
+    left = None
+    if checkout.exists():
+        if ((checkout / "tai" / "cli.py").exists()
+                and (checkout / "install.sh").exists()):
+            shutil.rmtree(checkout)
+            removed.append(str(checkout))
+        else:
+            left = checkout
+    # The npm door's code is npm's to remove, and the running tree says the
+    # same thing the wrapper did — this process may itself be executing from
+    # the package npm owns. Last, for the same reason the checkout is: the
+    # tree this command runs from can be the thing being removed.
+    npm_note = ""
+    if npm_door or _install_method(_repo_dir()) == "npm":
+        npm = shutil.which("npm")
+        if npm:
+            done = subprocess.run([npm, "rm", "-g", "terminal-ai-helper"],
+                                  capture_output=True, text=True)
+            if done.returncode == 0:
+                removed.append("terminal-ai-helper (npm global package)")
+            else:
+                npm_note = done.stderr.strip()
+        else:
+            npm_note = ("npm is not on PATH — the package is removed with: "
+                        "npm rm -g terminal-ai-helper")
     print("tai removed" if removed else "tai was not installed")
     for path in removed:
         print(f"  removed {path}")
+    if left:
+        print(f"  left {left} — not a tai checkout")
+    if npm_note:
+        print(f"  {npm_note}")
     return 0