feat: Use interactive shell to execute commands

- Remove login shell option (-l)
- Add interactive shell option (-i)
- Use zsh for shell execution
- Add test for .zshrc loading

Author: Yoshihiro Takahara

src/mcp_shell_server/shell_executor.py

@@ -378,6 +378,10 @@ def _preprocess_command(self, command: List[str]) -> List[str]:
                 preprocessed_command.append(token)
         return preprocessed_command
 
+    def _get_default_shell(self) -> str:
+        """Get the default shell from environment variables"""
+        return os.environ.get("SHELL", "/bin/sh")
+
     async def execute(
         self,
         command: List[str],
@@ -517,14 +521,17 @@ async def execute(
                 except IOError as e:
                     raise ValueError(f"Failed to open output file: {e}") from e
 
-            # Execute the command
+            # Execute the command with interactive shell
+            shell = self._get_default_shell()
             shell_cmd = self._create_shell_command(cmd)
+            shell_cmd = f"{shell} -i -c {shlex.quote(shell_cmd)}"
+
             process = await asyncio.create_subprocess_shell(
                 shell_cmd,
                 stdin=asyncio.subprocess.PIPE if stdin else None,
                 stdout=stdout_handle,
                 stderr=asyncio.subprocess.PIPE,
-                env={"PATH": os.environ.get("PATH", "")},
+                env=os.environ,  # Use all environment variables
                 cwd=directory,
             )
 
@@ -642,12 +649,17 @@ async def _execute_pipeline(
             for i, cmd in enumerate(parsed_commands):
                 shell_cmd = self._create_shell_command(cmd)
 
+                # Get default shell for the first command and set interactive mode
+                if i == 0:
+                    shell = self._get_default_shell()
+                    shell_cmd = f"{shell} -i -c {shlex.quote(shell_cmd)}"
+
                 process = await asyncio.create_subprocess_shell(
                     shell_cmd,
                     stdin=asyncio.subprocess.PIPE if prev_stdout is not None else None,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.PIPE,
-                    env={"PATH": os.environ.get("PATH", "")},
+                    env=os.environ,  # Use all environment variables
                     cwd=directory,
                 )
 

tests/test_server.py

@@ -322,3 +322,26 @@ def stdio_server_impl():
         await main()
 
     assert str(exc.value) == "Test error"
+
+
+@pytest.mark.asyncio
+async def test_shell_startup(monkeypatch, temp_test_dir):
+    """Test shell startup and environment"""
+    monkeypatch.setenv("ALLOW_COMMANDS", "ps")
+    result = await call_tool(
+        "shell_execute",
+        {"command": ["ps", "-p", "$$", "-o", "command="], "directory": temp_test_dir},
+    )
+    print("Shell process info:", result)  # Debug output
+
+
+@pytest.mark.asyncio
+async def test_environment_variables(monkeypatch, temp_test_dir):
+    """Test to check environment variables during test execution"""
+    monkeypatch.setenv("ALLOW_COMMANDS", "env")
+    result = await call_tool(
+        "shell_execute",
+        {"command": ["env"], "directory": temp_test_dir},
+    )
+    assert len(result) == 1
+    print(result[0].text)  # 環境変数の内容を確認