codegpt-ai 1.20.0 → 1.21.0

package/chat.py

@@ -28,6 +28,21 @@ from prompt_toolkit.styles import Style as PtStyle
 
 # --- Config ---
 
+# Fix PATH for Termux and pip --user installs
+_extra_paths = [
+    os.path.expanduser("~/.local/bin"),
+    os.path.expanduser("~/bin"),
+]
+if os.path.exists("/data/data/com.termux"):
+    _extra_paths.extend([
+        "/data/data/com.termux/files/usr/bin",
+        "/data/data/com.termux/files/home/.local/bin",
+        os.path.expanduser("~/.npm-global/bin"),
+    ])
+for _p in _extra_paths:
+    if _p not in os.environ.get("PATH", "") and os.path.isdir(_p):
+        os.environ["PATH"] = _p + os.pathsep + os.environ.get("PATH", "")
+
 OLLAMA_URL = os.environ.get("OLLAMA_URL", "http://localhost:11434/api/chat")
 MODEL = "llama3.2"
 CHATS_DIR = Path.home() / ".codegpt" / "conversations"
@@ -223,7 +238,7 @@ AI_TOOLS = {
         "install": ["npm", "i", "-g", "@openai/codex"],
         "default_args": [],
         "needs_key": "OPENAI_API_KEY",
-        "termux": True,  # Has linux-arm64 build
+        "termux": False,  # ARM64 build fails on Termux
     },
     "gemini": {
         "name": "Gemini CLI",
@@ -5804,10 +5819,6 @@ def main():
                         print_sys("Use a desktop/PC for this tool.")
                         continue
 
-                    if not ask_permission("tool_install", f"Install {tool['name']} via {' '.join(install_cmd[:3])}"):
-                        continue
-                    print_sys(f"Installing {tool['name']}...")
-
                     # Pick platform-specific install command
                     if is_termux and "install_termux" in tool:
                         install_cmd = list(tool["install_termux"])
@@ -5816,6 +5827,10 @@ def main():
                     else:
                         install_cmd = list(tool["install"])
 
+                    if not ask_permission("tool_install", f"Install {tool['name']} via {' '.join(install_cmd[:3])}"):
+                        continue
+                    print_sys(f"Installing {tool['name']}...")
+
                     is_npm = install_cmd[0] in ("npm", "npm.cmd")
 
                     if is_npm and os.name == "nt":
@@ -5833,11 +5848,14 @@ def main():
                             )
                             install_ok[0] = r.returncode == 0
                             if not install_ok[0]:
-                                install_err[0] = r.stderr[:200] if r.stderr else "Unknown"
+                                # Show both stderr and stdout for better debugging
+                                err = r.stderr.strip() if r.stderr else ""
+                                out = r.stdout.strip() if r.stdout else ""
+                                install_err[0] = err[:300] or out[:300] or f"Exit code {r.returncode}"
                         except subprocess.TimeoutExpired:
                             install_err[0] = "Timed out (5min)"
                         except Exception as e:
-                            install_err[0] = str(e)
+                            install_err[0] = str(e)[:300]
                         install_done[0] = True
 
                     thr = threading.Thread(target=do_tool_install, daemon=True)
@@ -5867,25 +5885,66 @@ def main():
                             ))
                             time.sleep(0.1)
 
-                    if install_ok[0] and shutil.which(tool_bin):
+                    if install_ok[0]:
                         elapsed = time.time() - start_t
-                        print_sys(f"Installed in {elapsed:.1f}s. Launching...")
-                        audit_log(f"TOOL_INSTALL", tool_key)
 
-                        tool_sandbox = Path.home() / ".codegpt" / "sandbox" / tool_key
-                        tool_sandbox.mkdir(parents=True, exist_ok=True)
-                        safe_env = os.environ.copy()
-                        for key in ["ANTHROPIC_API_KEY", "OPENAI_API_KEY", "GROQ_API_KEY",
-                                    "AWS_SECRET_ACCESS_KEY", "GITHUB_TOKEN", "GH_TOKEN",
-                                    "CODEGPT_BOT_TOKEN", "SSH_AUTH_SOCK"]:
-                            safe_env.pop(key, None)
-
-                        launch_cmd = [tool_bin] + tool.get("default_args", [])
-                        subprocess.run(launch_cmd, shell=True, cwd=str(tool_sandbox), env=safe_env)
-                        print_sys("Back to CodeGPT.")
-                    elif install_ok[0]:
-                        print_err(f"Installed but '{tool_bin}' not found in PATH.")
-                        print_sys("Try restarting your terminal, then run the command again.")
+                        # Rehash PATH — find newly installed binaries
+                        for _p in [
+                            os.path.expanduser("~/.local/bin"),
+                            os.path.expanduser("~/.npm-global/bin"),
+                            "/data/data/com.termux/files/usr/bin",
+                            os.path.expanduser("~/bin"),
+                        ]:
+                            if os.path.isdir(_p) and _p not in os.environ.get("PATH", ""):
+                                os.environ["PATH"] = _p + os.pathsep + os.environ["PATH"]
+
+                        # Try to find the binary
+                        found_bin = shutil.which(tool_bin)
+
+                        # Fallback: search common install locations
+                        if not found_bin:
+                            search_dirs = [
+                                os.path.expanduser("~/.local/bin"),
+                                os.path.expanduser("~/.npm-global/bin"),
+                                "/data/data/com.termux/files/usr/bin",
+                            ]
+                            for sd in search_dirs:
+                                candidate = os.path.join(sd, tool_bin)
+                                if os.path.isfile(candidate):
+                                    found_bin = candidate
+                                    break
+
+                        # Fallback: try python -m for pip packages
+                        pip_module_map = {
+                            "sgpt": "sgpt",
+                            "llm": "llm",
+                            "litellm": "litellm",
+                            "gorilla": "gorilla_cli",
+                            "chatgpt": "chatgpt",
+                            "aider": "aider",
+                            "interpreter": "interpreter",
+                            "gpte": "gpt_engineer",
+                            "mentat": "mentat",
+                        }
+
+                        if found_bin:
+                            print_sys(f"Installed in {elapsed:.1f}s. Launching...")
+                            audit_log(f"TOOL_INSTALL", tool_key)
+                            launch_cmd = [found_bin] + tool.get("default_args", [])
+                            subprocess.run(launch_cmd, shell=True)
+                            print_sys("Back to CodeGPT.")
+                        elif tool_bin in pip_module_map:
+                            # Try python -m fallback
+                            mod = pip_module_map[tool_bin]
+                            print_sys(f"Installed in {elapsed:.1f}s. Launching via python -m {mod}...")
+                            audit_log(f"TOOL_INSTALL", tool_key)
+                            launch_cmd = [sys.executable, "-m", mod] + tool.get("default_args", [])
+                            subprocess.run(launch_cmd)
+                            print_sys("Back to CodeGPT.")
+                        else:
+                            print_err(f"Installed but '{tool_bin}' not found in PATH.")
+                            print_sys(f"Try: which {tool_bin}")
+                            print_sys("Or restart your terminal and try again.")
                     else:
                         print_err(f"Install failed: {install_err[0]}")
                         manual = " ".join(tool["install"])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codegpt-ai",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "description": "Local AI Assistant Hub — 80+ commands, 29 tools, 8 agents, training, security",
   "author": "ArukuX",
   "license": "MIT",