nimbie-shell 0.0.1.dev0__tar.gz → 0.0.2.dev0__tar.gz

{nimbie_shell-0.0.1.dev0 → nimbie_shell-0.0.2.dev0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.3
 Name: nimbie-shell
-Version: 0.0.1.dev0
+Version: 0.0.2.dev0
 Summary: Lightweight agent loop and context manager (standalone)
 Requires-Dist: click>=8.1.7
 Requires-Dist: httpx[http2]>=0.28.1
 Requires-Dist: litellm>=1.81.11
 Requires-Dist: chronml>=0.1.0
-Requires-Dist: nimbie-flash>=0.0.1.dev0
+Requires-Dist: oturn>=0.1.0
+Requires-Dist: nimbie-flash>=0.0.2.dev0
 Requires-Dist: prompt-toolkit>=3.0.39
 Requires-Dist: rich>=13.7.0
 Requires-Dist: textual>=0.80.0

{nimbie_shell-0.0.1.dev0 → nimbie_shell-0.0.2.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nimbie-shell"
-version = "0.0.1.dev0"
+version = "0.0.2.dev0"
 description = "Lightweight agent loop and context manager (standalone)"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -9,7 +9,8 @@ dependencies = [
     "httpx[http2]>=0.28.1",
     "litellm>=1.81.11",
     "chronml>=0.1.0",
-    "nimbie_flash>=0.0.1.dev0",
+    "oturn>=0.1.0",
+    "nimbie_flash>=0.0.2.dev0",
     "prompt_toolkit>=3.0.39",
     "rich>=13.7.0",
     "textual>=0.80.0",
@@ -25,9 +26,7 @@ build-backend = "uv_build"
 [tool.uv.build-backend]
 module-name = "nimbie"
 source-exclude = [
-    "**/.cyf/**",
     "**/.nimbie/**",
-    "src/nimbie/.cyf/**",
     "src/nimbie/.nimbie/**",
     "src/nimbie/**/__pycache__/**",
     "src/nimbie/**/*.pyc",

{nimbie_shell-0.0.1.dev0 → nimbie_shell-0.0.2.dev0}/src/nimbie/browser_gateway.py

@@ -215,7 +215,7 @@ class BrowserGatewayServer:
         self.work_dir = work_dir
         self._repo_root = Path(__file__).resolve().parents[2]
         self._frontend_root = self._repo_root / "frontend-app"
-        self.token = token or os.environ.get("CYF_WEB_TOKEN") or f"t_{random.randint(100000, 999999)}"
+        self.token = token or os.environ.get("NIMBIE_WEB_TOKEN") or f"t_{random.randint(100000, 999999)}"
         self.port = _pick_free_port(8413, 8419)
         self.vite_port = _pick_free_port(5173, 5183)
         self._app = FastAPI()

{nimbie_shell-0.0.1.dev0 → nimbie_shell-0.0.2.dev0}/src/nimbie/ui/shared/remote_shell_support.py

@@ -46,16 +46,17 @@ class RemoteShellSupport:
         self._prompt_build_executor = ThreadPoolExecutor(max_workers=1)
         self._prompt_env_cache: Dict[str, str] = {}
         self._prompt_env_cache_backend: str = ''
+        self._flash_executor_kind: Optional[str] = None
 
     def set_output_sink(self, sink) -> None:
         self._output_sink = sink
 
     def _executor_debug_enabled(self) -> bool:
-        v = str(os.getenv('CYF_EXECUTOR_DEBUG', '')).strip().lower()
+        v = str(os.getenv('NIMBIE_EXECUTOR_DEBUG', '')).strip().lower()
         return v in {'1', 'true', 'yes', 'on'}
 
     def _executor_debug_verbose(self) -> bool:
-        v = str(os.getenv('CYF_EXECUTOR_DEBUG_VERBOSE', '')).strip().lower()
+        v = str(os.getenv('NIMBIE_EXECUTOR_DEBUG_VERBOSE', '')).strip().lower()
         return v in {'1', 'true', 'yes', 'on'}
 
     def _emit_executor_debug(self, msg: str) -> None:
@@ -88,9 +89,7 @@ class RemoteShellSupport:
         except Exception as e:
             raise RuntimeError(f'failed to import nimbie_flash for prompt rendering: {e}') from e
         self._sync_flash_backend_env()
-        if self._flash_executor is None:
-            self._flash_executor = flash.LocalExecutor()
-        executor = self._flash_executor
+        executor = self._ensure_flash_executor(flash, remote=(self._build_remote_ssh_command() is not None))
         if not hasattr(flash, 'build_prompt_from_env'):
             raise RuntimeError('nimbie_flash.build_prompt_from_env is not available')
         backend_key = str(self.remote_status_text() or 'local')
@@ -127,7 +126,7 @@ class RemoteShellSupport:
     def build_prompt(self) -> str:
         timeout_s = 3.0
         try:
-            timeout_s = max(0.2, float(os.getenv('CYF_PROMPT_TIMEOUT_S', '3')))
+            timeout_s = max(0.2, float(os.getenv('NIMBIE_PROMPT_TIMEOUT_S', '3')))
         except Exception:
             timeout_s = 3.0
         fut = self._prompt_build_executor.submit(self._build_prompt_impl)
@@ -187,9 +186,12 @@ class RemoteShellSupport:
             seen.add(rp)
             meta = self._executor_meta_from_path(pp)
             out.append({'path': pp, 'source': source, 'meta': meta})
-        override = os.getenv('CYF_FLASH_STDIO_EXECUTOR_LOCAL_BIN', '').strip()
-        if override:
-            _add_candidate(Path(override), 'env:CYF_FLASH_STDIO_EXECUTOR_LOCAL_BIN')
+        local_override = os.getenv('NIMBIE_FLASH_STDIO_EXECUTOR_LOCAL_BIN', '').strip()
+        if local_override:
+            _add_candidate(Path(local_override), 'env:NIMBIE_FLASH_STDIO_EXECUTOR_LOCAL_BIN')
+        flash_override = os.getenv('FLASH_STDIO_EXECUTOR_LOCAL_BIN', '').strip()
+        if flash_override:
+            _add_candidate(Path(flash_override), 'env:FLASH_STDIO_EXECUTOR_LOCAL_BIN')
         try:
             import nimbie_flash
         except Exception:
@@ -201,12 +203,12 @@ class RemoteShellSupport:
                 bundled = None
             if bundled is not None:
                 _add_candidate(Path(bundled), 'python-package:nimbie_flash')
-        multi = os.getenv('CYF_FLASH_STDIO_EXECUTOR_CANDIDATES', '').strip()
+        multi = os.getenv('FLASH_STDIO_EXECUTOR_CANDIDATES', '').strip()
         if multi:
             for item in multi.split(os.pathsep):
                 it = item.strip()
                 if it:
-                    _add_candidate(Path(it), 'env:CYF_FLASH_STDIO_EXECUTOR_CANDIDATES')
+                    _add_candidate(Path(it), 'env:FLASH_STDIO_EXECUTOR_CANDIDATES')
         repo_root = Path(__file__).resolve().parents[4]
         candidates = [repo_root / 'flash' / 'target' / 'x86_64-unknown-linux-musl' / 'release' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'x86_64-unknown-linux-gnu' / 'release' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'aarch64-unknown-linux-musl' / 'release' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'aarch64-unknown-linux-gnu' / 'release' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'x86_64-apple-darwin' / 'release' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'aarch64-apple-darwin' / 'release' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'maturin' / 'flash-stdio-executor', repo_root / 'flash' / 'target' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'x86_64-unknown-linux-musl' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'x86_64-unknown-linux-gnu' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'aarch64-unknown-linux-musl' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'aarch64-unknown-linux-gnu' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'x86_64-apple-darwin' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'aarch64-apple-darwin' / 'release' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'maturin' / 'flash-stdio-executor', Path.cwd() / 'flash' / 'target' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'x86_64-unknown-linux-musl' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'x86_64-unknown-linux-gnu' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'aarch64-unknown-linux-musl' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'aarch64-unknown-linux-gnu' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'x86_64-apple-darwin' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'aarch64-apple-darwin' / 'release' / 'flash-stdio-executor', Path.cwd() / 'target' / 'maturin' / 'flash-stdio-executor', Path.cwd() / 'target' / 'release' / 'flash-stdio-executor']
         for c in candidates:
@@ -216,6 +218,52 @@ class RemoteShellSupport:
             _add_candidate(Path(which), 'PATH')
         return out
 
+    def _resolve_local_stdio_executor_binary(self) -> Tuple[Optional[str], Dict[str, Any]]:
+        info: Dict[str, Any] = {
+            'explicit_bin': os.getenv('FLASH_STDIO_EXECUTOR_BIN', '').strip(),
+            'nimbie_local_override': os.getenv('NIMBIE_FLASH_STDIO_EXECUTOR_LOCAL_BIN', '').strip(),
+            'flash_local_override': os.getenv('FLASH_STDIO_EXECUTOR_LOCAL_BIN', '').strip(),
+            'bundled_path': None,
+            'bundled_exists': False,
+            'bundled_executable': False,
+            'bundled_error': '',
+            'selected_source': '',
+            'candidates': [],
+        }
+        selected = info['explicit_bin'] or info['nimbie_local_override'] or info['flash_local_override']
+        if info['explicit_bin']:
+            info['selected_source'] = 'env:FLASH_STDIO_EXECUTOR_BIN'
+        elif info['nimbie_local_override']:
+            info['selected_source'] = 'env:NIMBIE_FLASH_STDIO_EXECUTOR_LOCAL_BIN'
+        elif info['flash_local_override']:
+            info['selected_source'] = 'env:FLASH_STDIO_EXECUTOR_LOCAL_BIN'
+        try:
+            import nimbie_flash
+        except Exception as e:
+            info['bundled_error'] = str(e)
+            nimbie_flash = None
+        if nimbie_flash is not None:
+            try:
+                bundled = nimbie_flash.bundled_stdio_executor_path()
+            except Exception as e:
+                bundled = None
+                info['bundled_error'] = str(e)
+            if bundled is not None:
+                bundled_path = Path(bundled)
+                info['bundled_path'] = str(bundled_path)
+                try:
+                    info['bundled_exists'] = bundled_path.exists()
+                    info['bundled_executable'] = os.access(bundled_path, os.X_OK)
+                except Exception:
+                    info['bundled_exists'] = False
+                    info['bundled_executable'] = False
+                if (not selected) and info['bundled_exists'] and info['bundled_executable']:
+                    selected = str(bundled_path)
+                    info['selected_source'] = 'python-package:nimbie_flash'
+        candidates = self._collect_local_stdio_executor_binaries()
+        info['candidates'] = [{'path': str(item.get('path')), 'source': str(item.get('source') or '')} for item in candidates]
+        return (str(selected) if selected else None, info)
+
     def _rank_executor_candidates(self, candidates: List[Dict[str, Any]], *, remote_arch: str, remote_libc: str, remote_os: str, remote_glibc_version: str) -> List[Dict[str, Any]]:
 
         def _parse_ver(v: str) -> Tuple[int, ...]:
@@ -348,6 +396,19 @@ class RemoteShellSupport:
             os.environ.pop('FLASH_REMOTE_ENV_JSON', None)
         os.environ['FLASH_DISABLE_BACKEND_IDENTITY_PROBE'] = '1'
 
+    def _ensure_flash_executor(self, flash: Any, *, remote: bool) -> Any:
+        want = 'stdio' if remote else 'local'
+        if self._flash_executor is not None and self._flash_executor_kind == want:
+            return self._flash_executor
+        if remote:
+            if not hasattr(flash, 'StdioExecutor'):
+                raise RuntimeError('nimbie_flash.StdioExecutor is not available')
+            self._flash_executor = flash.StdioExecutor()
+        else:
+            self._flash_executor = flash.LocalExecutor()
+        self._flash_executor_kind = want
+        return self._flash_executor
+
     def disconnect_ssh(self) -> None:
         self._emit_executor_debug('disconnect ssh backend')
         self._remote_ssh_host = None
@@ -366,6 +427,7 @@ class RemoteShellSupport:
         self._sync_flash_backend_env()
         self._flash_interp = None
         self._flash_executor = None
+        self._flash_executor_kind = None
         self._prompt_env_cache = {}
         self._prompt_env_cache_backend = ''
 
@@ -573,6 +635,7 @@ class RemoteShellSupport:
         self._sync_flash_backend_env()
         self._flash_interp = None
         self._flash_executor = None
+        self._flash_executor_kind = None
         self._prompt_env_cache = {}
         self._prompt_env_cache_backend = ''
         user_prefix = f'{user}@' if user else ''

{nimbie_shell-0.0.1.dev0 → nimbie_shell-0.0.2.dev0}/src/nimbie/ui/v2/repl_app.py

@@ -631,14 +631,12 @@ class ShellAdapter(RemoteShellSupport):
             import nimbie_flash as flash
             if self._flash_interp is None:
                 self._flash_interp = flash.FlashInterpreter()
-            if self._flash_executor is None:
-                self._flash_executor = flash.LocalExecutor()
+            custom_env_builder = getattr(self, '_build_remote_ssh_command', None)
+            custom_env = custom_env_builder() if callable(custom_env_builder) else None
             interp = self._flash_interp
-            executor = self._flash_executor
+            executor = self._ensure_flash_executor(flash, remote=(custom_env is not None))
             old_bin = os.environ.get('FLASH_STDIO_EXECUTOR_BIN')
             old_args = os.environ.get('FLASH_STDIO_EXECUTOR_ARGS_JSON')
-            custom_env_builder = getattr(self, '_build_remote_ssh_command', None)
-            custom_env = custom_env_builder() if callable(custom_env_builder) else None
             if custom_env is not None:
                 bin_name, args = custom_env
                 os.environ['FLASH_STDIO_EXECUTOR_BIN'] = bin_name
@@ -743,89 +741,10 @@ class ShellAdapter(RemoteShellSupport):
                     self._emit_executor_debug(f"stream event type={ev_type} bytes={len(data.encode('utf-8', errors='ignore'))}")
                 if data:
                     _emit_text(fix_surrogate(data))
-            direct_run_started = False
             try:
-                result = None
-                if proxy_stdin and hasattr(executor, 'start_run') and hasattr(executor, 'poll_event'):
-                    try:
-                        cwd = os.getcwd()
-                        try:
-                            cwd = str(getattr(interp, 'cwd', None) or cwd)
-                        except Exception:
-                            pass
-                        active_run_id = str(executor.start_run(cmd, cwd))
-                        direct_run_started = True
-                        stdout_acc: list[str] = []
-                        stderr_acc: list[str] = []
-                        exit_code = 1
-                        while True:
-                            ev_line = executor.poll_event(0)
-                            if ev_line is None:
-                                if not bool(executor.is_running()):
-                                    for _ in range(5):
-                                        ev_line = executor.poll_event(20)
-                                        if ev_line is None:
-                                            continue
-                                        break
-                                    if ev_line is None:
-                                        break
-                                else:
-                                    time.sleep(0.02)
-                                    continue
-                            try:
-                                ev_json = json.loads(str(ev_line))
-                            except Exception:
-                                ev_json = {'type': 'raw', 'data': str(ev_line)}
-                            _on_event(ev_json)
-                            ev_type = str(ev_json.get('type') or '')
-                            if ev_type == 'stdout':
-                                stdout_acc.append(str(ev_json.get('data') or ev_json.get('stdout') or ''))
-                            elif ev_type == 'stderr':
-                                stderr_acc.append(str(ev_json.get('data') or ev_json.get('stderr') or ''))
-                            elif ev_type == 'exit':
-                                try:
-                                    raw_exit = ev_json.get('exit_code')
-                                    exit_code = int(raw_exit) if raw_exit is not None else 1
-                                except Exception:
-                                    exit_code = 1
-                                break
-                            else:
-                                if ev_json.get('stdout'):
-                                    stdout_acc.append(str(ev_json.get('stdout') or ''))
-                                if ev_json.get('stderr'):
-                                    stderr_acc.append(str(ev_json.get('stderr') or ''))
-                                if ev_json.get('exit_code') is not None:
-                                    try:
-                                        raw_exit = ev_json.get('exit_code')
-                                        exit_code = int(raw_exit) if raw_exit is not None else 1
-                                    except Exception:
-                                        exit_code = 1
-                                    break
-                        try:
-                            executor.flush(active_run_id, 50)
-                        except Exception:
-                            pass
-
-                        class _DirectResult:
-
-                            def __init__(self, stdout: str, stderr: str, exit_code: int) -> None:
-                                self.stdout = stdout
-                                self.stderr = stderr
-                                self.exit_code = exit_code
-                        result = _DirectResult(''.join(stdout_acc), ''.join(stderr_acc), exit_code)
-                    except Exception as direct_err:
-                        self._emit_executor_debug(f'direct run fallback err={direct_err}')
-                        direct_run_started = False
-                        active_run_id = None
-                if result is None:
-                    result = interp.run_shell_stream(cmd, executor, _on_event)
+                result = interp.run_shell_stream(cmd, executor, _on_event)
             finally:
                 _cleanup_input_thread()
-                if direct_run_started and active_run_id is not None:
-                    try:
-                        executor.close_run()
-                    except Exception:
-                        pass
                 if old_bin is not None:
                     os.environ['FLASH_STDIO_EXECUTOR_BIN'] = old_bin
                 else:

{nimbie_shell-0.0.1.dev0 → nimbie_shell-0.0.2.dev0}/src/nimbie/ui/v3/repl_app.py

@@ -697,11 +697,9 @@ class ShellAdapter(RemoteShellSupport):
             import nimbie_flash as flash
             if self._flash_interp is None:
                 self._flash_interp = flash.FlashInterpreter()
-            if self._flash_executor is None:
-                self._flash_executor = flash.LocalExecutor()
             interp = self._flash_interp
-            executor = self._flash_executor
             custom_env = self._build_remote_ssh_command()
+            executor = self._ensure_flash_executor(flash, remote=(custom_env is not None))
             self._emit_executor_debug(f"backend_route={('remote' if custom_env is not None else 'local')}")
             old_bin = os.environ.get('FLASH_STDIO_EXECUTOR_BIN')
             old_args = os.environ.get('FLASH_STDIO_EXECUTOR_ARGS_JSON')