code-aide 1.13.0__tar.gz → 1.14.0__tar.gz

{code_aide-1.13.0 → code_aide-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-aide
-Version: 1.13.0
+Version: 1.14.0
 Summary: Manage AI coding CLI tools (Claude, Copilot, Cursor, Gemini, Amp, Codex)
 Project-URL: Homepage, https://github.com/dajobe/code-aide
 Project-URL: Repository, https://github.com/dajobe/code-aide

{code_aide-1.13.0 → code_aide-1.14.0}/script-archive/amp-install.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Amp CLI Binary Installation Script (EXPERIMENTAL - NOT DOCUMENTED)
-# This is a secondary install script for testing binary distribution
-# Downloads pre-compiled Amp CLI binary instead of using npm
-
 # Configuration
 AMP_HOME="${AMP_HOME:-$HOME/.amp}"
 BIN_DIR="$AMP_HOME/bin"
@@ -437,11 +433,8 @@ update_shell_profile() {
 			return
 		fi
 	else
-		# Non-interactive: show instructions instead
-		log "Non-interactive mode: skipping shell config modification."
-		log "To use amp, add ~/.local/bin to your PATH:"
-		echo "  $path_export"
-		return
+		# Non-interactive: add automatically
+		log "Adding ~/.local/bin to PATH in $tilde_profile..."
 	fi
 
 	# Create config file if it doesn't exist

{code_aide-1.13.0 → code_aide-1.14.0}/src/code_aide/__init__.py

@@ -1,3 +1,3 @@
 """code-aide - Manage AI coding CLI tools."""
 
-__version__ = "1.13.0"
+__version__ = "1.14.0"

{code_aide-1.13.0 → code_aide-1.14.0}/src/code_aide/data/tools.json

@@ -64,7 +64,10 @@
       "command": "amp",
       "install_type": "script",
       "install_url": "https://ampcode.com/install.sh",
-      "install_sha256": "a529b01e1e3653ad3e77cf8e5ec1f2cede5d65c880a62e783a3365bbd825be6d",
+      "install_sha256": "2442f20759a2be3beaef6691c7e5bf349f469eb0ff7ea2885746500243446e24",
+      "install_script_path_prepend": [
+        "~/.local/bin"
+      ],
       "version_url": "https://storage.googleapis.com/amp-public-assets-prod-0/cli/cli-version.txt",
       "prerequisites": [],
       "min_node_version": null,

{code_aide-1.13.0 → code_aide-1.14.0}/src/code_aide/install.py

@@ -43,6 +43,7 @@ def run_install_script(
     tool_name: str,
     expected_sha256: Optional[str] = None,
     dryrun: bool = False,
+    env: Optional[Dict[str, str]] = None,
 ) -> bool:
     """Download and run an installation script with SHA256 verification."""
     try:
@@ -82,6 +83,7 @@ def run_install_script(
             ["bash"],
             stdin=subprocess.PIPE,
             stderr=subprocess.PIPE,
+            env=env,
         )
         _, stderr = bash_process.communicate(input=script_content)
 
@@ -99,6 +101,22 @@ def run_install_script(
         return False
 
 
+def get_install_script_env(tool_config: Dict[str, Any]) -> Optional[Dict[str, str]]:
+    """Return environment overrides for running a tool's install script."""
+    path_prepend = tool_config.get("install_script_path_prepend", [])
+    if not path_prepend:
+        return None
+
+    env = os.environ.copy()
+    expanded_paths = [os.path.expanduser(path) for path in path_prepend]
+    current_path = env.get("PATH", "")
+    path_parts = [*expanded_paths]
+    if current_path:
+        path_parts.append(current_path)
+    env["PATH"] = os.pathsep.join(path_parts)
+    return env
+
+
 ARCH_MAP = {
     "x86_64": "x64",
     "amd64": "x64",
@@ -327,7 +345,11 @@ def install_tool(tool_name: str, dryrun: bool = False, force: bool = False) -> b
             install_url = tool_config["install_url"]
             expected_sha256 = tool_config.get("install_sha256")
             if run_install_script(
-                install_url, tool_config["name"], expected_sha256, dryrun
+                install_url,
+                tool_config["name"],
+                expected_sha256,
+                dryrun,
+                env=get_install_script_env(tool_config),
             ):
                 if dryrun:
                     success(f"{tool_config['name']} verification passed")

{code_aide-1.13.0 → code_aide-1.14.0}/src/code_aide/operations.py

@@ -16,6 +16,7 @@ from code_aide.detection import (
 )
 from code_aide.package_managers import query_package_owner
 from code_aide.install import (
+    get_install_script_env,
     install_direct_download,
     install_tool,
     run_install_script,
@@ -225,7 +226,10 @@ def upgrade_tool(tool_name: str) -> UpgradeResult:
                 install_url = tool_config["install_url"]
                 expected_sha256 = tool_config.get("install_sha256")
                 if run_install_script(
-                    install_url, tool_config["name"], expected_sha256
+                    install_url,
+                    tool_config["name"],
+                    expected_sha256,
+                    env=get_install_script_env(tool_config),
                 ):
                     pass
                 else:

{code_aide-1.13.0 → code_aide-1.14.0}/tests/test_install.py

@@ -148,6 +148,67 @@ class TestExtractTarMember(unittest.TestCase):
             self.assertTrue(os.path.exists(extracted))
 
 
+class TestInstallScriptEnv(unittest.TestCase):
+    """Tests for install script environment handling."""
+
+    def test_no_env_without_path_prepend(self):
+        self.assertIsNone(cli_install.get_install_script_env({}))
+
+    def test_prepends_expanded_paths(self):
+        with tempfile.TemporaryDirectory() as td:
+            with mock.patch.dict(
+                os.environ,
+                {"HOME": td, "PATH": "/usr/bin"},
+                clear=True,
+            ):
+                env = cli_install.get_install_script_env(
+                    {"install_script_path_prepend": ["~/.local/bin"]}
+                )
+
+        self.assertIsNotNone(env)
+        self.assertEqual(
+            env["PATH"],
+            os.path.join(td, ".local", "bin") + os.pathsep + "/usr/bin",
+        )
+
+    def test_path_prepend_without_existing_path(self):
+        with tempfile.TemporaryDirectory() as td:
+            with mock.patch.dict(os.environ, {"HOME": td}, clear=True):
+                env = cli_install.get_install_script_env(
+                    {"install_script_path_prepend": ["~/.local/bin"]}
+                )
+
+        self.assertIsNotNone(env)
+        self.assertEqual(env["PATH"], os.path.join(td, ".local", "bin"))
+
+    @mock.patch.object(cli_install, "fetch_url")
+    @mock.patch.object(cli_install.subprocess, "Popen")
+    def test_run_install_script_passes_env_to_bash(self, mock_popen, mock_fetch):
+        script_content = b"#!/usr/bin/env bash\n"
+        expected_sha256 = cli_install.hashlib.sha256(script_content).hexdigest()
+        process = mock.Mock()
+        process.communicate.return_value = (b"", b"")
+        process.returncode = 0
+        mock_popen.return_value = process
+        mock_fetch.return_value = (script_content, None)
+        env = {"PATH": "/tmp/bin:/usr/bin"}
+
+        result = cli_install.run_install_script(
+            "https://example.com/install.sh",
+            "Example",
+            expected_sha256,
+            env=env,
+        )
+
+        self.assertTrue(result)
+        mock_popen.assert_called_once_with(
+            ["bash"],
+            stdin=cli_install.subprocess.PIPE,
+            stderr=cli_install.subprocess.PIPE,
+            env=env,
+        )
+
+
 class TestInstallDirectDownloadDryrun(unittest.TestCase):
     """Tests for install_direct_download in dryrun mode."""
 
@@ -270,3 +331,38 @@ class TestInstallTool(unittest.TestCase):
             "/usr/local/bin/test-tool"
         )
         mock_info.assert_any_call("[DRYRUN] Would install npm package: test-tool")
+
+    def test_script_install_passes_configured_env(self):
+        tool_config = {
+            "name": "Test Tool",
+            "command": "test-tool",
+            "install_type": "script",
+            "install_url": "https://example.com/install.sh",
+            "install_sha256": "abc123",
+            "install_script_path_prepend": ["~/.local/bin"],
+            "next_steps": "Run test-tool",
+        }
+        env = {"PATH": "/tmp/bin:/usr/bin"}
+
+        with (
+            mock.patch.dict(cli_install.TOOLS, {"test": tool_config}, clear=True),
+            mock.patch.object(cli_install, "command_exists", return_value=False),
+            mock.patch.object(cli_install.platform, "system", return_value="Darwin"),
+            mock.patch.object(
+                cli_install, "get_install_script_env", return_value=env
+            ) as mock_env,
+            mock.patch.object(
+                cli_install, "run_install_script", return_value=True
+            ) as mock_script,
+        ):
+            result = cli_install.install_tool("test")
+
+        self.assertTrue(result)
+        mock_env.assert_called_once_with(tool_config)
+        mock_script.assert_called_once_with(
+            "https://example.com/install.sh",
+            "Test Tool",
+            "abc123",
+            False,
+            env=env,
+        )

{code_aide-1.13.0 → code_aide-1.14.0}/tests/test_operations.py

@@ -244,6 +244,65 @@ class TestMigrateInstallMethod(unittest.TestCase):
         mock_dd.assert_called_once_with("cursor", tool_config)
         mock_script.assert_not_called()
 
+    def test_upgrade_script_passes_configured_env(self):
+        """Script upgrades pass per-tool install environment overrides."""
+        tool_config = {
+            "name": "Amp (Sourcegraph)",
+            "command": "amp",
+            "install_type": "script",
+            "install_url": "https://ampcode.com/install.sh",
+            "install_sha256": "abc123",
+            "install_script_path_prepend": ["~/.local/bin"],
+        }
+        env = {"PATH": "/tmp/bin:/usr/bin"}
+        with (
+            mock.patch.dict(cli_operations.TOOLS, {"amp": tool_config}),
+            mock.patch.object(cli_operations, "is_tool_installed", return_value=True),
+            mock.patch.object(
+                cli_operations, "is_deprecated_install", return_value=False
+            ),
+            mock.patch.object(
+                cli_operations,
+                "detect_install_method",
+                side_effect=[
+                    {"method": "script", "detail": "native installer"},
+                    {"method": "script", "detail": "native installer"},
+                ],
+            ),
+            mock.patch.object(
+                cli_operations, "get_install_script_env", return_value=env
+            ) as mock_env,
+            mock.patch.object(
+                cli_operations, "run_install_script", return_value=True
+            ) as mock_script,
+            mock.patch.object(
+                cli_operations,
+                "_get_upgrade_snapshot",
+                side_effect=[
+                    {
+                        "method": "script",
+                        "detail": "native installer",
+                        "version": "1.0.0",
+                    },
+                    {
+                        "method": "script",
+                        "detail": "native installer",
+                        "version": "2.0.0",
+                    },
+                ],
+            ),
+        ):
+            result = cli_operations.upgrade_tool("amp")
+
+        self.assertEqual(result, UpgradeResult.CHANGED)
+        mock_env.assert_called_once_with(tool_config)
+        mock_script.assert_called_once_with(
+            "https://ampcode.com/install.sh",
+            "Amp (Sourcegraph)",
+            "abc123",
+            env=env,
+        )
+
     def test_migration_fails_on_remove(self):
         """Migration fails if remove_tool returns False."""
         tool_config = {