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

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: nimbie-shell
-Version: 0.0.2.dev0
+Version: 0.0.3.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: oturn>=0.1.0
-Requires-Dist: nimbie-flash>=0.0.2.dev0
+Requires-Dist: nimbie-flash>=0.0.3.dev0
 Requires-Dist: prompt-toolkit>=3.0.39
 Requires-Dist: rich>=13.7.0
 Requires-Dist: textual>=0.80.0

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

@@ -1,6 +1,6 @@
 [project]
 name = "nimbie-shell"
-version = "0.0.2.dev0"
+version = "0.0.3.dev0"
 description = "Lightweight agent loop and context manager (standalone)"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -10,7 +10,7 @@ dependencies = [
     "litellm>=1.81.11",
     "chronml>=0.1.0",
     "oturn>=0.1.0",
-    "nimbie_flash>=0.0.2.dev0",
+    "nimbie_flash>=0.0.3.dev0",
     "prompt_toolkit>=3.0.39",
     "rich>=13.7.0",
     "textual>=0.80.0",

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

@@ -31,7 +31,6 @@ from ...tools import registry as nimbie_tool_registry
 from ...tools.internal.shell_runner import get_background_registry_snapshot
 from ..process_overview_textual import ProcessOverviewApp
 from ..session_history_inspector_textual import SessionHistoryInspectorApp
-from ..selection_panel_textual import SelectionPanelApp
 try:
     import termios as _termios
     import tty as _tty
@@ -423,11 +422,11 @@ class ShellAdapter(RemoteShellSupport):
                 try:
                     from prompt_toolkit.styles.pygments import style_from_pygments_cls
                     from pygments.styles import get_style_by_name
-                    style_name = os.getenv('SHELL_COLOR_STYLE', os.getenv('XONSH_COLOR_STYLE', 'monokai'))
+                    style_name = os.getenv('SHELL_COLOR_STYLE', os.getenv('XONSH_COLOR_STYLE', 'friendly'))
                     try:
                         style_cls = get_style_by_name(style_name)
                     except Exception:
-                        style_cls = get_style_by_name('monokai')
+                        style_cls = get_style_by_name('friendly')
                     return style_from_pygments_cls(style_cls)
                 except Exception:
                     return None
@@ -672,7 +671,9 @@ class ShellAdapter(RemoteShellSupport):
                 try:
                     payload = ''.join(pending_input)
                     pending_input = []
-                    interp.send_stdin(executor, active_run_id, payload)
+                    sender = getattr(executor, 'send_stdin', None)
+                    if callable(sender):
+                        sender(active_run_id, payload)
                 except Exception:
                     pass
 
@@ -1285,19 +1286,9 @@ class ReplApp:
             self.renderer.print_warning(message)
         if reasons:
             self.renderer.print_info('Reasons:\n' + '\n'.join([f'  - {r}' for r in reasons]))
-        approved = False
+        prompt = f"[approval] {name or 'tool'} | Allow? [y/N]: "
+        approved = await asyncio.to_thread(self._prompt_yes_no, prompt)
         decision = 'ALLOW'
-        try:
-            result = await SelectionPanelApp.ask_async(
-                f'Approval required for {name}',
-                ['Run'],
-                hint='Use ↑/↓ to select, Enter confirm (Esc/C/N cancel)',
-                subtitle=_format_approval_subtitle(message, args),
-                show_cancel=True,
-            )
-            approved = bool(result.get('confirmed') and result.get('selected') == 'Run')
-        except Exception:
-            approved = False
         if not approved:
             decision = 'DENIED'
             self.renderer.print_warning('[tool] denied')
@@ -1313,14 +1304,7 @@ class ReplApp:
         fut = ev.get('future')
         self.renderer.enter_prompt()
         self.esc_cancel.stop()
-        selected = None
-        confirmed = False
-        try:
-            result = await SelectionPanelApp.ask_async(prompt, list(map(str, choices)))
-            selected = result.get('selected')
-            confirmed = bool(result.get('confirmed'))
-        except Exception:
-            pass
+        selected, confirmed = await asyncio.to_thread(self._prompt_choice, prompt, list(map(str, choices)))
         if confirmed and selected is not None:
             self.renderer.print_info(f'[choice] 你选择了: {selected}')
         else:
@@ -1456,6 +1440,40 @@ class ReplApp:
         grid.add_row(Spinner('arrow2'), Text(text))
         return grid
 
+    @staticmethod
+    def _prompt_yes_no(prompt: str) -> bool:
+        try:
+            reply = input(prompt)
+        except (EOFError, KeyboardInterrupt):
+            return False
+        return str(reply or '').strip().lower() in {'y', 'yes'}
+
+    @staticmethod
+    def _prompt_choice(prompt: str, choices: list[str]) -> tuple[Optional[str], bool]:
+        items = [str(choice) for choice in (choices or [])]
+        if not items:
+            return (None, False)
+        try:
+            print(prompt)
+            for idx, item in enumerate(items, start=1):
+                print(f'  {idx}. {item}')
+            print('  0. Cancel')
+            reply = input('Select an option [0]: ')
+        except (EOFError, KeyboardInterrupt):
+            return (None, False)
+        raw = str(reply or '').strip()
+        if not raw:
+            return (None, False)
+        try:
+            index = int(raw)
+        except ValueError:
+            return (None, False)
+        if index == 0:
+            return (None, False)
+        if 1 <= index <= len(items):
+            return (items[index - 1], True)
+        return (None, False)
+
     def _set_future(self, fut: Any, payload: Any) -> None:
         if fut is None:
             return

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
 import asyncio
 import json
+import os
 import queue
 import sys
 import time
@@ -462,11 +463,11 @@ class ShellAdapter(RemoteShellSupport):
                 try:
                     from prompt_toolkit.styles.pygments import style_from_pygments_cls
                     from pygments.styles import get_style_by_name
-                    style_name = os.getenv('SHELL_COLOR_STYLE', os.getenv('XONSH_COLOR_STYLE', 'monokai'))
+                    style_name = os.getenv('SHELL_COLOR_STYLE', os.getenv('XONSH_COLOR_STYLE', 'friendly'))
                     try:
                         style_cls = get_style_by_name(style_name)
                     except Exception:
-                        style_cls = get_style_by_name('monokai')
+                        style_cls = get_style_by_name('friendly')
                     return style_from_pygments_cls(style_cls)
                 except Exception:
                     return None