portacode 0.3.3.dev0__tar.gz → 0.3.4.dev0__tar.gz

{portacode-0.3.3.dev0 → portacode-0.3.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.3.dev0
+Version: 0.3.4.dev0
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-0.3.3.dev0 → portacode-0.3.4.dev0}/portacode/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.3.dev'
-__version_tuple__ = version_tuple = (0, 3, 3, 'dev0')
+__version__ = version = '0.3.4.dev'
+__version_tuple__ = version_tuple = (0, 3, 4, 'dev0')

{portacode-0.3.3.dev0 → portacode-0.3.4.dev0}/portacode/connection/handlers/session.py

@@ -10,14 +10,6 @@ from pathlib import Path
 from typing import Any, Dict, Optional, List, TYPE_CHECKING
 from collections import deque
 
-# Terminal control imports (only available on Unix)
-try:
-    import termios
-    import tty
-    _HAS_TERMIOS = True
-except ImportError:
-    _HAS_TERMIOS = False
-
 if TYPE_CHECKING:
     from ..multiplex import Channel
 
@@ -29,15 +21,6 @@ _IS_WINDOWS = sys.platform.startswith("win")
 _DEFAULT_ENV = {
     "TERM": "xterm-256color",
     "LANG": "C.UTF-8",
-    # Add additional terminal environment variables for better compatibility
-    "COLUMNS": "80",
-    "LINES": "24",
-    "PS1": r'\u@\h:\w\$ ',  # Standard bash prompt
-    "HISTSIZE": "1000",
-    "HISTFILESIZE": "2000",
-    # Ensure proper terminal behavior
-    "DEBIAN_FRONTEND": "noninteractive",  # Prevent interactive prompts
-    "TERM_PROGRAM": "portacode",
 }
 
 
@@ -46,12 +29,6 @@ def _build_child_env() -> Dict[str, str]:
     env = os.environ.copy()
     for k, v in _DEFAULT_ENV.items():
         env.setdefault(k, v)
-    
-    # Ensure SSH_TTY is not set when using pipes to avoid shell confusion
-    if "SSH_TTY" in env:
-        logger.debug("Removing SSH_TTY from environment to prevent shell confusion")
-        del env["SSH_TTY"]
-    
     return env
 
 
@@ -213,19 +190,17 @@ class SessionManager:
         channel_id = self._allocate_channel_id()
         channel = self.mux.get_channel(channel_id)
 
-        # Choose shell - prefer bash over sh for better compatibility
+        # Choose shell - prefer bash over sh for better terminal compatibility
         if shell is None:
             if not _IS_WINDOWS:
-                # Try to use bash if available, fallback to default shell
                 shell = os.getenv("SHELL")
-                if shell is None or shell == "/bin/sh":
-                    # Try to find bash
+                # If the default shell is /bin/sh, try to use bash instead for better terminal support
+                if shell == "/bin/sh":
                     for bash_path in ["/bin/bash", "/usr/bin/bash", "/usr/local/bin/bash"]:
                         if os.path.exists(bash_path):
                             shell = bash_path
+                            logger.info("Switching from /bin/sh to %s for better terminal compatibility", shell)
                             break
-                    else:
-                        shell = "/bin/sh"
             else:
                 shell = os.getenv("COMSPEC", "cmd.exe")
 
@@ -242,30 +217,9 @@ class SessionManager:
             session = WindowsTerminalSession(term_id, pty_proc, channel)
         else:
             # Unix: try real PTY for proper TTY semantics
-            pty_success = False
             try:
                 import pty
-                
-                logger.debug("Attempting to allocate PTY for terminal %s", term_id)
                 master_fd, slave_fd = pty.openpty()
-                
-                # Set terminal attributes for better compatibility
-                if _HAS_TERMIOS:
-                    try:
-                        # Get current terminal settings
-                        attrs = termios.tcgetattr(slave_fd)
-                        # Enable canonical mode and echo
-                        attrs[3] |= termios.ICANON | termios.ECHO | termios.ECHOE | termios.ECHOK
-                        # Set input and output modes
-                        attrs[0] |= termios.ICRNL  # Map CR to NL on input
-                        attrs[1] |= termios.OPOST | termios.ONLCR  # Map NL to CR-NL on output
-                        termios.tcsetattr(slave_fd, termios.TCSANOW, attrs)
-                        logger.debug("Successfully configured terminal attributes")
-                    except Exception as e:
-                        logger.warning("Failed to configure terminal attributes: %s", e)
-                else:
-                    logger.debug("termios not available, skipping terminal attribute configuration")
-                
                 proc = await asyncio.create_subprocess_exec(
                     shell,
                     stdin=slave_fd,
@@ -275,10 +229,6 @@ class SessionManager:
                     cwd=cwd,
                     env=_build_child_env(),
                 )
-                
-                # Close slave_fd in parent process
-                os.close(slave_fd)
-                
                 # Wrap master_fd into a StreamReader
                 loop = asyncio.get_running_loop()
                 reader = asyncio.StreamReader()
@@ -290,49 +240,16 @@ class SessionManager:
                     lambda: asyncio.Protocol(), os.fdopen(master_fd, "wb", buffering=0)
                 )
                 proc.stdin = asyncio.StreamWriter(writer_transport, writer_protocol, reader, loop)
-                
-                pty_success = True
-                logger.info("Successfully allocated PTY for terminal %s", term_id)
-                
-            except Exception as e:
-                logger.warning("Failed to allocate PTY for terminal %s: %s", term_id, e)
-                
-                # Enhanced fallback with proper shell invocation
-                logger.info("Using enhanced pipe fallback for terminal %s", term_id)
-                
-                # Create enhanced environment for pipe mode
-                pipe_env = _build_child_env()
-                pipe_env["TERM"] = "dumb"  # Use dumb terminal for pipes
-                pipe_env["PS1"] = "$ "  # Simple prompt for pipes
-                
-                # Use shell with explicit interactive and login flags
-                shell_args = [shell]
-                if shell.endswith("bash"):
-                    shell_args.extend(["-i", "-l"])  # Interactive and login shell
-                elif shell.endswith("sh"):
-                    shell_args.extend(["-i"])  # Interactive shell
-                
+            except Exception:
+                logger.warning("Failed to allocate PTY, falling back to pipes")
                 proc = await asyncio.create_subprocess_exec(
-                    *shell_args,
+                    shell,
                     stdin=asyncio.subprocess.PIPE,
                     stdout=asyncio.subprocess.PIPE,
                     stderr=asyncio.subprocess.STDOUT,
                     cwd=cwd,
-                    env=pipe_env,
+                    env=_build_child_env(),
                 )
-                
-                # Send initial command to set up better terminal behavior
-                if proc.stdin:
-                    initial_setup = (
-                        "stty -echo 2>/dev/null || true\n"  # Disable echo to prevent double output
-                        "set +o posix 2>/dev/null || true\n"  # Disable POSIX mode if possible
-                        "PS1='$ '\n"  # Set simple prompt
-                        "export PS1\n"
-                        "clear 2>/dev/null || echo 'Terminal ready'\n"
-                    )
-                    proc.stdin.write(initial_setup.encode())
-                    await proc.stdin.drain()
-                
             session = TerminalSession(term_id, proc, channel)
 
         self._sessions[term_id] = session
@@ -344,7 +261,6 @@ class SessionManager:
             "pid": session.proc.pid,
             "shell": shell,
             "cwd": cwd,
-            "pty_mode": pty_success if not _IS_WINDOWS else True,
         }
 
     def get_session(self, terminal_id: str) -> Optional[TerminalSession]:

{portacode-0.3.3.dev0 → portacode-0.3.4.dev0}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portacode
-Version: 0.3.3.dev0
+Version: 0.3.4.dev0
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian