autosh 0.0.5__tar.gz → 0.0.7__tar.gz

{autosh-0.0.5 → autosh-0.0.7}/PKG-INFO

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: autosh
-Version: 0.0.5
-Summary: Add your description here
+Version: 0.0.7
+Summary: The AI-powered, noob-friendly interactive shell
+Author-email: Wenyu Zhao <wenyuzhaox@gmail.com>
+License-Expression: MIT
 License-File: LICENSE
-Requires-Python: >=3.13
-Requires-Dist: agentia>=0.0.7
+Keywords: agent,chatgpt,cli,command line,gpt,interactive,llm,openai,openrouter,shell,terminal
+Requires-Python: >=3.12
+Requires-Dist: agentia>=0.0.8
 Requires-Dist: asyncio>=3.4.3
 Requires-Dist: markdownify>=1.1.0
 Requires-Dist: neongrid>=0.0.1
@@ -34,7 +37,7 @@ As an interactive shell: `ash` (alternatively, `autosh`)
 Execute a single prompt: `ash "list current directory"`
 
 Process piped data:
-* `cat README.md | ash -y "summarise"`
+* `cat README.md | ash -y "summarize"`
 * `cat in.csv | ash -y -q "double the first numeric column" > out.csv`
 
 ## Scripting
@@ -53,15 +56,15 @@ First, please display a welcome message:)
 Write "Hello, world" to _test.log
 ```
 
-* Run the script: `ash simple.a.md` or `chmod +x simple.a.md && simple.a.md`
-* Auto generate help messages:
+* Run the script: `ash simple.a.md` or `chmod +x simple.a.md && ./simple.a.md`
+* Auto-generate help messages:
 
     ```console
     $ ash simple.a.md -h
 
     Usage: simple.a.md [OPTIONS]
 
-    This is a simple file manipulation script that writes "Hello, world" to a log file named _x.log.
+    This is a simple file manipulation script that writes "Hello, world" to a log file named _test.log.
 
     Options:
 
@@ -70,9 +73,9 @@ Write "Hello, world" to _test.log
 
 ## Plugins
 
-`autosh` is equipped with several plugins to expand its potential:
+`autosh` comes with several plugins to expand its capabilities:
 
-* `ash "Create a directory "my-news", list the latest news, for each news, put the summary in a separate markdown file in this directory"`
+* `ash "Create a directory 'my-news', list the latest news, and for each news item, put the summary in a separate markdown file in this directory"`
 
 # TODO
 
@@ -80,4 +83,4 @@ Write "Hello, world" to _test.log
 - [ ] RAG for non-text files
 - [ ] Plugin system
 - [ ] MCP support
-- [ ] A better input widget with history and auto completion
+- [x] Improved input widget with history and auto-completion

{autosh-0.0.5 → autosh-0.0.7}/README.md

@@ -15,7 +15,7 @@ As an interactive shell: `ash` (alternatively, `autosh`)
 Execute a single prompt: `ash "list current directory"`
 
 Process piped data:
-* `cat README.md | ash -y "summarise"`
+* `cat README.md | ash -y "summarize"`
 * `cat in.csv | ash -y -q "double the first numeric column" > out.csv`
 
 ## Scripting
@@ -34,15 +34,15 @@ First, please display a welcome message:)
 Write "Hello, world" to _test.log
 ```
 
-* Run the script: `ash simple.a.md` or `chmod +x simple.a.md && simple.a.md`
-* Auto generate help messages:
+* Run the script: `ash simple.a.md` or `chmod +x simple.a.md && ./simple.a.md`
+* Auto-generate help messages:
 
     ```console
     $ ash simple.a.md -h
 
     Usage: simple.a.md [OPTIONS]
 
-    This is a simple file manipulation script that writes "Hello, world" to a log file named _x.log.
+    This is a simple file manipulation script that writes "Hello, world" to a log file named _test.log.
 
     Options:
 
@@ -51,9 +51,9 @@ Write "Hello, world" to _test.log
 
 ## Plugins
 
-`autosh` is equipped with several plugins to expand its potential:
+`autosh` comes with several plugins to expand its capabilities:
 
-* `ash "Create a directory "my-news", list the latest news, for each news, put the summary in a separate markdown file in this directory"`
+* `ash "Create a directory 'my-news', list the latest news, and for each news item, put the summary in a separate markdown file in this directory"`
 
 # TODO
 
@@ -61,4 +61,4 @@ Write "Hello, world" to _test.log
 - [ ] RAG for non-text files
 - [ ] Plugin system
 - [ ] MCP support
-- [ ] A better input widget with history and auto completion
+- [x] Improved input widget with history and auto-completion

{autosh-0.0.5 → autosh-0.0.7}/autosh/config.py

@@ -35,6 +35,14 @@ class Config(BaseModel):
         description="The LLM model to use for reasoning before executing commands",
     )
     api_key: str | None = Field(default=None, description="OpenRouter API key.")
+    repl_banner: str = Field(
+        default="🦄 Welcome to [cyan]autosh[/cyan]. The AI-powered, noob-friendly interactive shell.",
+        description="The banner for the REPL.",
+    )
+    repl_prompt: str = Field(
+        default="[bold on cyan]{short_cwd}[/bold on cyan][cyan]\ue0b0[/cyan] ",
+        description="The prompt for the REPL user input.",
+    )
 
     plugins: Plugins = Field(
         default_factory=Plugins,

{autosh-0.0.5 → autosh-0.0.7}/autosh/main.py

@@ -32,9 +32,11 @@ async def start_session(prompt: str | None, args: list[str]):
     os.environ["OPENROUTER_INCLUDE_REASONING"] = "false"
     await session.init()
     piped_stdin = not sys.stdin.isatty()
-    if piped_stdin and not CLI_OPTIONS.yes:
+    piped_stdout = not sys.stdout.isatty()
+    if (not CLI_OPTIONS.yes) and (piped_stdin or piped_stdout):
         rich.print(
-            "[bold red]Error:[/bold red] [red]--yes is required when using piped stdin.[/red]"
+            "[bold red]Error:[/bold red] [red]--yes (-y) is required when using piped stdin or stdout.[/red]",
+            file=sys.stderr,
         )
         sys.exit(1)
     if prompt:
@@ -121,7 +123,7 @@ def parse_args() -> tuple[str | None, list[str]]:
     try:
         args = p.parse_args()
     except argparse.ArgumentError as e:
-        rich.print(f"[bold red]Error:[/bold red] {str(e)}")
+        rich.print(f"[bold red]Error:[/bold red] {str(e)}", file=sys.stderr)
         print_help()
         sys.exit(1)
 

autosh-0.0.7/autosh/plugins/__init__.py

@@ -0,0 +1,160 @@
+from dataclasses import dataclass
+import sys
+from typing import Any, Callable
+import rich
+from rich.prompt import Confirm
+from rich.panel import Panel
+from rich.console import RenderableType
+from autosh.config import CLI_OPTIONS, CONFIG
+
+
+@dataclass
+class Banner:
+    title: str | Callable[[Any], str]
+
+    text: str | Callable[[Any], str] | None = None
+
+    text_key: str | None = None
+
+    code: Callable[[Any], RenderableType] | None = None
+    """
+    Turn the banner into a code block
+    """
+
+    user_consent: bool = False
+
+    def __get_text(self, args: Any):
+        if self.text:
+            return self.text(args) if callable(self.text) else self.text
+        elif self.text_key:
+            return args.get(self.text_key)
+        return None
+
+    def __print_simple_banner(self, args: Any):
+        title = self.title(args) if callable(self.title) else self.title
+        if not sys.stdout.isatty():
+            s = f"[TOOL] {title}"
+            if text := self.__get_text(args):
+                s += f" {text}"
+            print(s)
+        else:
+            s = f"[bold on magenta] {title} [/bold on magenta]"
+            if text := self.__get_text(args):
+                s += f" [italic dim]{text}[/italic dim]"
+            rich.print(s)
+
+    def render(self, args: Any, prefix_newline: bool = True) -> bool:
+        if CLI_OPTIONS.quiet and not (self.user_consent and not CLI_OPTIONS.yes):
+            return False
+        if prefix_newline:
+            print()
+        if self.code:
+            code = self.code(args)
+            if CLI_OPTIONS.quiet and self.user_consent and not CLI_OPTIONS.yes:
+                self.__print_simple_banner(args)
+                return True
+            panel = Panel.fit(
+                code, title=f"[magenta]{self.title}[/magenta]", title_align="left"
+            )
+            rich.print(panel)
+        else:
+            self.__print_simple_banner(args)
+        return True
+
+
+# def __print_simple_banner(tag: str, text: str | None = None):
+#     if CLI_OPTIONS.quiet:
+#         return
+#     if not sys.stdout.isatty():
+#         s = f"\n[TOOL] {tag}"
+#         if text:
+#             s += f" {text}"
+#         print(s)
+#         return
+#     s = f"\n[bold on magenta] {tag} [/bold on magenta]"
+#     if text:
+#         s += f" [italic dim]{text}[/italic dim]"
+#     rich.print(s)
+
+
+# def simple_banner(
+#     tag: str | Callable[[Any], str],
+#     text: Callable[[Any], str] | None = None,
+#     text_key: str | None = None,
+# ):
+#     return lambda x: __print_simple_banner(
+#         tag if isinstance(tag, str) else tag(x),
+#         text(x) if text else (x.get(text_key) if text_key else None),
+#     )
+
+
+# def __print_code_preview_banner(
+#     title: str, content: RenderableType, short: str | None = None
+# ):
+#     if CLI_OPTIONS.quiet:
+#         if short and not CLI_OPTIONS.yes:
+#             rich.print(f"\n[magenta]{short}[/magenta]\n")
+#         return
+#     panel = Panel.fit(content, title=f"[magenta]{title}[/magenta]", title_align="left")
+#     rich.print()
+#     rich.print(panel)
+
+
+# def code_preview_banner(
+#     title: str | Callable[[Any], str],
+#     short: str | Callable[[Any], str],
+#     content: Callable[[Any], RenderableType],
+# ):
+#     return lambda x: __print_code_preview_banner(
+#         title=title if isinstance(title, str) else title(x),
+#         content=content(x),
+#         short=short if isinstance(short, str) else short(x),
+#     )
+
+
+def code_result_panel(
+    title: str,
+    out: str | None = None,
+    err: str | None = None,
+):
+    if CLI_OPTIONS.quiet:
+        return
+    print()
+    if isinstance(out, str):
+        out = out.strip()
+    if isinstance(err, str):
+        err = err.strip()
+    if not out and not err:
+        rich.print(title)
+    else:
+        text = out if out else ""
+        text += (("\n---\n" if out else "") + err) if err else ""
+        panel = Panel.fit(text, title=title, title_align="left", style="dim")
+        rich.print(panel)
+
+
+from . import calc
+from . import clock
+from . import code
+from . import search
+from . import web
+from . import cli
+
+
+def create_plugins():
+    """Get all plugins in the autosh.plugins module."""
+    cfgs = CONFIG.plugins
+    plugins = []
+    if cfgs.calc is not None:
+        plugins.append(calc.CalculatorPlugin(cfgs.calc.model_dump()))
+    if cfgs.cli is not None:
+        plugins.append(cli.CLIPlugin(cfgs.cli.model_dump()))
+    if cfgs.clock is not None:
+        plugins.append(clock.ClockPlugin(cfgs.clock.model_dump()))
+    if cfgs.code is not None:
+        plugins.append(code.CodePlugin(cfgs.code.model_dump()))
+    if cfgs.search is not None:
+        plugins.append(search.SearchPlugin(cfgs.search.model_dump()))
+    if cfgs.web is not None:
+        plugins.append(web.WebPlugin(cfgs.web.model_dump()))
+    return plugins

{autosh-0.0.5 → autosh-0.0.7}/autosh/plugins/calc.py

@@ -1,16 +1,12 @@
 from agentia.plugins import tool, Plugin
 from typing import Annotated
-from . import simple_banner
+from . import Banner
 
 
 class CalculatorPlugin(Plugin):
     NAME = "calc"
 
-    @tool(
-        metadata={
-            "banner": simple_banner("CALC", dim=lambda a: a.get("expression", ""))
-        }
-    )
+    @tool(metadata={"banner": Banner("CALC", text_key="expression")})
     def evaluate(
         self,
         expression: Annotated[

{autosh-0.0.5 → autosh-0.0.7}/autosh/plugins/cli.py

@@ -8,7 +8,7 @@ from enum import StrEnum
 
 from autosh.config import CLI_OPTIONS
 
-from . import code_result_panel, code_preview_banner, simple_banner
+from . import code_result_panel, Banner
 
 
 class Color(StrEnum):
@@ -59,7 +59,7 @@ class CLIPlugin(Plugin):
         rich.print(text, file=sys.stderr if stderr else sys.stdout, end=end)
         return "DONE. You can continue and no need to repeat the text"
 
-    @tool(metadata={"banner": simple_banner("CWD", dim=lambda a: a.get("path", ""))})
+    @tool(metadata={"banner": Banner("CWD", text_key="path")})
     def chdir(self, path: Annotated[str, "The path to the new working directory"]):
         """
         Changes the current working directory of the terminal to another directory.
@@ -67,8 +67,9 @@ class CLIPlugin(Plugin):
         if not os.path.exists(path):
             raise FileNotFoundError(f"Path `{path}` does not exist.")
         os.chdir(path)
+        return f"DONE"
 
-    @tool(metadata={"banner": simple_banner("GET ARGV")})
+    @tool(metadata={"banner": Banner("GET ARGV")})
     def get_argv(self):
         """
         Get the command line arguments.
@@ -80,7 +81,7 @@ class CLIPlugin(Plugin):
             "args": CLI_OPTIONS.args,
         }
 
-    @tool(metadata={"banner": simple_banner("GET ENV", dim=lambda a: a.get("key", ""))})
+    @tool(metadata={"banner": Banner("GET ENV", text_key="key")})
     def get_env(self, key: Annotated[str, "The environment variable to get"]):
         """
         Get an environment variable.
@@ -89,7 +90,7 @@ class CLIPlugin(Plugin):
             raise KeyError(f"Environment variable `{key}` does not exist.")
         return os.environ[key]
 
-    @tool(metadata={"banner": simple_banner("GET ALL ENVS")})
+    @tool(metadata={"banner": Banner("GET ALL ENVS")})
     def get_all_envs(self):
         """
         Get all environment variables.
@@ -101,10 +102,13 @@ class CLIPlugin(Plugin):
 
     @tool(
         metadata={
-            "banner": simple_banner(
-                tag=lambda a: "SET ENV" if a.get("value") else "DEL ENV",
-                text=lambda a: a.get("key", ""),
-                dim=lambda a: a.get("value", "") or "",
+            "banner": Banner(
+                title=lambda a: "SET ENV" if a.get("value") else "DEL ENV",
+                text=lambda a: (
+                    f"{a.get("key", "")} = {a.get("value", "")}"
+                    if a.get("value")
+                    else a.get("key", "")
+                ),
             ),
         }
     )
@@ -126,7 +130,7 @@ class CLIPlugin(Plugin):
             os.environ[key] = value
         return f"DONE"
 
-    @tool(metadata={"banner": simple_banner("READ", dim=lambda a: a.get("path", ""))})
+    @tool(metadata={"banner": Banner("READ", text_key="path")})
     def read(
         self,
         path: Annotated[str, "The path to the file to read"],
@@ -144,10 +148,9 @@ class CLIPlugin(Plugin):
 
     @tool(
         metadata={
-            "banner": simple_banner(
-                tag=lambda a: "WRITE" if not a.get("append") else "APPEND",
-                text=lambda a: a.get("path", ""),
-                dim=lambda a: f"({len(a.get('content', ''))} bytes)",
+            "banner": Banner(
+                title=lambda a: "WRITE" if not a.get("append") else "APPEND",
+                text=lambda a: f"{a.get("path", "")} ({len(a.get('content', ''))} bytes)",
             ),
         }
     )
@@ -209,10 +212,11 @@ class CLIPlugin(Plugin):
 
     @tool(
         metadata={
-            "banner": code_preview_banner(
+            "banner": Banner(
                 title="Run Command",
-                short=lambda a: f"[magenta][bold]➜[/bold] [italic]{a.get("command", "")}[/italic][/magenta]",
-                content=lambda a: f"[magenta][bold]➜[/bold] [italic]{a.get("command", "")}[/italic][/magenta]\n\n[dim]{a.get("explanation", "")}[/dim]",
+                text_key="command",
+                code=lambda a: f"[magenta][bold]➜[/bold] [italic]{a.get("command", "")}[/italic][/magenta]\n\n[dim]{a.get("explanation", "")}[/dim]",
+                user_consent=True,
             )
         }
     )
@@ -263,9 +267,16 @@ class CLIPlugin(Plugin):
         }
         return result
 
-    @tool(metadata={"banner": simple_banner("EXIT")})
-    def exit(self, exitcode: Annotated[int, "The exit code of this shell session"] = 0):
+    @tool(metadata={"banner": Banner("EXIT")})
+    def exit(
+        self,
+        exitcode: Annotated[int, "The exit code of this shell session"] = 0,
+        reason: Annotated[str | None, "The reason for exiting"] = None,
+    ):
         """
         Exit the current shell session with an optional exit code.
         """
+        if reason and exitcode != 0:
+            rich.print(f"\n[bold red]ABORT: {reason}[/bold red]")
         sys.exit(exitcode)
+        return f"EXITED with code {exitcode}"

{autosh-0.0.5 → autosh-0.0.7}/autosh/plugins/clock.py

@@ -2,11 +2,11 @@ import datetime
 from agentia.plugins import tool, Plugin
 import tzlocal
 
-from autosh.plugins import simple_banner
+from autosh.plugins import Banner
 
 
 class ClockPlugin(Plugin):
-    @tool(metadata={"banner": simple_banner("GET TIME")})
+    @tool(metadata={"banner": Banner("GET TIME")})
     def get_current_time(self):
         """Get the current UTC time in ISO format"""
         utc = datetime.datetime.now(datetime.timezone.utc).isoformat()

{autosh-0.0.5 → autosh-0.0.7}/autosh/plugins/code.py

@@ -5,7 +5,7 @@ from rich.syntax import Syntax
 from rich.console import group
 from contextlib import redirect_stdout, redirect_stderr
 import io
-from . import code_preview_banner, code_result_panel
+from . import Banner, code_result_panel
 
 
 @group()
@@ -18,10 +18,10 @@ def code_with_explanation(code: str, explanation: str):
 class CodePlugin(Plugin):
     @tool(
         metadata={
-            "banner": code_preview_banner(
-                title="Run Python",
-                short="[bold]RUN[/bold] [italic]Python Code[/italic]",
-                content=lambda a: code_with_explanation(
+            "banner": Banner(
+                title="Run Python Code",
+                text_key="explanation",
+                code=lambda a: code_with_explanation(
                     a.get("python_code", ""), a.get("explanation", "")
                 ),
             )
@@ -31,7 +31,8 @@ class CodePlugin(Plugin):
         self,
         python_code: Annotated[str, "The python code to run."],
         explanation: Annotated[
-            str, "Explain what this code does, and what are you going to use it for."
+            str,
+            "Briefly explain what this code does, and what are you going to use it for.",
         ],
     ):
         """

{autosh-0.0.5 → autosh-0.0.7}/autosh/plugins/search.py

@@ -3,7 +3,7 @@ from typing import Annotated, override
 import os
 from tavily import TavilyClient
 
-from autosh.plugins import simple_banner
+from autosh.plugins import Banner
 
 
 class SearchPlugin(Plugin):
@@ -17,11 +17,7 @@ class SearchPlugin(Plugin):
             raise ValueError("Please set the TAVILY_API_KEY environment variable.")
         self.__tavily = TavilyClient(api_key=key)
 
-    @tool(
-        metadata={
-            "banner": simple_banner("WEB SEARCH", dim=lambda a: a.get("query", "")),
-        }
-    )
+    @tool(metadata={"banner": Banner("WEB SEARCH", text_key="query")})
     async def web_search(
         self,
         query: Annotated[
@@ -43,11 +39,7 @@ class SearchPlugin(Plugin):
         )
         return tavily_results
 
-    @tool(
-        metadata={
-            "banner": simple_banner("NEWS SEARCH", dim=lambda a: a.get("query", "")),
-        }
-    )
+    @tool(metadata={"banner": Banner("NEWS SEARCH", text_key="query")})
     async def news_search(
         self,
         query: Annotated[
@@ -70,11 +62,7 @@ class SearchPlugin(Plugin):
         )
         return tavily_results
 
-    @tool(
-        metadata={
-            "banner": simple_banner("FINANCE SEARCH", dim=lambda a: a.get("query", ""))
-        }
-    )
+    @tool(metadata={"banner": Banner("FINANCE SEARCH", text_key="query")})
     async def finance_search(
         self,
         query: Annotated[

{autosh-0.0.5 → autosh-0.0.7}/autosh/plugins/web.py

@@ -7,7 +7,7 @@ from markdownify import markdownify
 import uuid
 from tavily import TavilyClient
 
-from autosh.plugins import simple_banner
+from autosh.plugins import Banner
 
 
 class WebPlugin(Plugin):
@@ -47,7 +47,7 @@ class WebPlugin(Plugin):
         md = markdownify(res.text)
         return {"content": md}
 
-    @tool(metadata={"banner": simple_banner("BROWSE", dim=lambda a: a.get("url", ""))})
+    @tool(metadata={"banner": Banner("BROWSE", text_key="url")})
     def get_webpage_content(
         self,
         url: Annotated[str, "The URL of the web page to get the content of"],

{autosh-0.0.5 → autosh-0.0.7}/autosh/session.py

@@ -1,5 +1,6 @@
-import asyncio
+from io import StringIO
 from pathlib import Path
+import socket
 import sys
 from agentia import (
     Agent,
@@ -7,7 +8,7 @@ from agentia import (
     Event,
     ToolCallEvent,
     MessageStream,
-    ChatCompletion,
+    Run,
     UserConsentEvent,
 )
 from agentia.plugins import PluginInitError
@@ -15,10 +16,11 @@ from neongrid.loading import Loading
 
 from autosh.config import CLI_OPTIONS, CONFIG
 import neongrid as ng
-from .plugins import create_plugins
+from .plugins import Banner, create_plugins
 import rich
 import platform
 from rich.prompt import Confirm
+import os
 
 
 INSTRUCTIONS = f"""
@@ -87,8 +89,8 @@ class Session:
             """,
         )
         agent.history.add(self.__get_argv_message())
-        completion = agent.chat_completion(prompt, stream=True)
-        async for stream in completion:
+        run = agent.run(prompt, stream=True)
+        async for stream in run:
             await self.__render_streamed_markdown(stream)
         sys.exit(0)
 
@@ -117,7 +119,7 @@ class Session:
         ):
             await self._print_help_and_exit(prompt)
         # Execute the prompt
-        loading = self.__create_loading_indicator()
+        loading = self.__create_loading_indicator() if sys.stdout.isatty() else None
         CLI_OPTIONS.prompt = prompt
         self.agent.history.add(self.__get_argv_message())
         if CLI_OPTIONS.stdin_has_data():
@@ -141,8 +143,8 @@ class Session:
                     role="user",
                 )
             )
-        completion = self.agent.chat_completion(prompt, stream=True, events=True)
-        await self.__process_completion(completion, loading)
+        run = self.agent.run(prompt, stream=True, events=True)
+        await self.__process_run(run, loading, False)
 
     async def exec_from_stdin(self):
         if sys.stdin.isatty():
@@ -159,55 +161,94 @@ class Session:
             prompt = f.read()
         await self.exec_prompt(prompt)
 
-    async def __process_event(self, e: Event):
+    async def __process_event(self, e: Event, first: bool, repl: bool):
+        prefix_newline = repl or not first
         if isinstance(e, UserConsentEvent):
-            e.response = await self.__confirm(e.message)
-        if isinstance(e, ToolCallEvent) and e.result is None:
-            if banner := (e.metadata or {}).get("banner"):
-                banner(e.arguments)
-
-    async def __confirm(self, message: str) -> bool:
-        if CLI_OPTIONS.yes:
+            if CLI_OPTIONS.yes:
+                e.response = True
+                return False
+            if prefix_newline:
+                print()
+            e.response = ng.confirm(e.message)
             return True
-        result = Confirm.ask(
-            f"[magenta]{message}[/magenta]", default=True, case_sensitive=False
-        )
-        if not CLI_OPTIONS.quiet:
-            rich.print()
-        return result
+        if isinstance(e, ToolCallEvent) and e.result is None:
+            if (banner := (e.metadata or {}).get("banner")) and isinstance(
+                banner, Banner
+            ):
+                return banner.render(e.arguments, prefix_newline=prefix_newline)
+        return False
 
-    async def __process_completion(
-        self, completion: ChatCompletion[Event | MessageStream], loading: Loading
+    async def __process_run(
+        self, run: Run[Event | MessageStream], loading: Loading | None, repl: bool
     ):
-        async for stream in completion:
-            await loading.finish()
+        first = True
+        async for e in run:
+            if loading:
+                await loading.finish()
 
-            if isinstance(stream, Event):
-                await self.__process_event(stream)
+            if isinstance(e, Event):
+                if await self.__process_event(e, first=first, repl=repl):
+                    first = False
             else:
-                print()
-                await self.__render_streamed_markdown(stream)
-                print()
+                if repl or not first:
+                    print()
+                await self.__render_streamed_markdown(e)
+                first = False
 
-            loading = self.__create_loading_indicator()
+            if loading:
+                loading = self.__create_loading_indicator()
 
-        await loading.finish()
+        if loading:
+            await loading.finish()
+
+    def __get_input_prompt(self):
+        cwd = Path.cwd()
+        relative_to_home = False
+        if cwd.is_relative_to(Path.home()):
+            cwd = cwd.relative_to(Path.home())
+            relative_to_home = True
+        # short cwd
+        short_cwd = "/" if not relative_to_home else "~/"
+        parts = []
+        for i, p in enumerate(cwd.parts):
+            if i == 0 and p == "/":
+                continue
+            if i != len(cwd.parts) - 1:
+                parts.append(p[0])
+            else:
+                parts.append(p)
+        short_cwd += "/".join(parts)
+        cwd = str(cwd) if not relative_to_home else "~/" + str(cwd)
+        host = socket.gethostname()
+        user = os.getlogin()
+        prompt = CONFIG.repl_prompt.format(
+            cwd=cwd,
+            short_cwd=short_cwd,
+            host=host,
+            user=user,
+        )
+        return prompt
 
     async def run_repl(self):
+        if CONFIG.repl_banner:
+            rich.print(CONFIG.repl_banner)
+        first = True
         while True:
             try:
-                prompt = (
-                    await ng.input("> ", sync=False, persist="/tmp/autosh-history")
-                ).strip()
+                if not first:
+                    print()
+                first = False
+                input_prompt = self.__get_input_prompt()
+                rich.print(input_prompt, end="", flush=True)
+                prompt = await ng.input("", sync=False, persist="/tmp/autosh-history")
+                prompt = prompt.strip()
                 if prompt in ["exit", "quit"]:
                     break
                 if len(prompt) == 0:
                     continue
                 loading = self.__create_loading_indicator()
-                completion = self.agent.chat_completion(
-                    prompt, stream=True, events=True
-                )
-                await self.__process_completion(completion, loading)
+                run = self.agent.run(prompt, stream=True, events=True)
+                await self.__process_run(run, loading, True)
             except KeyboardInterrupt:
                 break
 

{autosh-0.0.5 → autosh-0.0.7}/pyproject.toml

@@ -1,9 +1,24 @@
 [project]
 name = "autosh"
-version = "0.0.5"
-description = "Add your description here"
+version = "0.0.7"
+description = "The AI-powered, noob-friendly interactive shell"
+authors = [{ name = "Wenyu Zhao", email = "wenyuzhaox@gmail.com" }]
+requires-python = ">=3.12"
 readme = "README.md"
-requires-python = ">=3.13"
+license = "MIT"
+keywords = [
+    "terminal",
+    "shell",
+    "command line",
+    "cli",
+    "interactive",
+    "chatgpt",
+    "gpt",
+    "llm",
+    "agent",
+    "openai",
+    "openrouter",
+]
 dependencies = [
     "asyncio>=3.4.3",
     "markdownify>=1.1.0",
@@ -15,7 +30,7 @@ dependencies = [
     "typer>=0.12.5",
     "tzlocal>=5.3.1",
     "neongrid>=0.0.1",
-    "agentia>=0.0.7",
+    "agentia>=0.0.8",
 ]
 
 [project.scripts]

autosh-0.0.5/autosh/plugins/__init__.py

@@ -1,103 +0,0 @@
-from typing import Any, Callable
-import rich
-from rich.prompt import Confirm
-from rich.panel import Panel
-from rich.console import RenderableType
-from autosh.config import CLI_OPTIONS, CONFIG
-
-
-def __print_simple_banner(tag: str, text: str | None = None, dim: str | None = None):
-    if CLI_OPTIONS.quiet:
-        return
-    s = f"\n[bold on magenta] {tag} [/bold on magenta]"
-    if text:
-        s += f" [italic magenta]{text}[/italic magenta]"
-    if dim:
-        s += f" [italic dim]{dim}[/italic dim]"
-    rich.print(s)
-
-
-def simple_banner(
-    tag: str | Callable[[Any], str],
-    text: Callable[[Any], str] | None = None,
-    dim: Callable[[Any], str] | None = None,
-):
-    return lambda x: __print_simple_banner(
-        tag if isinstance(tag, str) else tag(x),
-        text(x) if text else None,
-        dim(x) if dim else None,
-    )
-
-
-def __print_code_preview_banner(
-    title: str, content: RenderableType, short: str | None = None
-):
-    if CLI_OPTIONS.quiet:
-        if short and not CLI_OPTIONS.yes:
-            rich.print(f"\n[magenta]{short}[/magenta]\n")
-        return
-    panel = Panel.fit(content, title=f"[magenta]{title}[/magenta]", title_align="left")
-    rich.print()
-    rich.print(panel)
-    rich.print()
-
-
-def code_preview_banner(
-    title: str | Callable[[Any], str],
-    short: str | Callable[[Any], str],
-    content: Callable[[Any], RenderableType],
-):
-    return lambda x: __print_code_preview_banner(
-        title=title if isinstance(title, str) else title(x),
-        content=content(x),
-        short=short if isinstance(short, str) else short(x),
-    )
-
-
-def code_result_panel(
-    title: str,
-    out: str | None = None,
-    err: str | None = None,
-):
-    if CLI_OPTIONS.quiet:
-        return
-    if isinstance(out, str):
-        out = out.strip()
-    if isinstance(err, str):
-        err = err.strip()
-    if not out and not err:
-        rich.print(title)
-    else:
-        text = out if out else ""
-        text += (("\n---\n" if out else "") + err) if err else ""
-        panel = Panel.fit(text, title=title, title_align="left", style="dim")
-        rich.print(panel)
-    if not CLI_OPTIONS.quiet:
-        rich.print()
-
-
-from . import calc
-from . import clock
-from . import code
-from . import search
-from . import web
-from . import cli
-
-
-def create_plugins():
-    """Get all plugins in the autosh.plugins module."""
-    cfgs = CONFIG.plugins
-    plugins = []
-    if cfgs.calc is not None:
-        plugins.append(calc.CalculatorPlugin(cfgs.calc.model_dump()))
-    if cfgs.cli is not None:
-        plugins.append(cli.CLIPlugin(cfgs.cli.model_dump()))
-    if cfgs.clock is not None:
-        plugins.append(clock.ClockPlugin(cfgs.clock.model_dump()))
-    if cfgs.code is not None:
-        plugins.append(code.CodePlugin(cfgs.code.model_dump()))
-    if cfgs.search is not None:
-        plugins.append(search.SearchPlugin(cfgs.search.model_dump()))
-    if cfgs.web is not None:
-        plugins.append(web.WebPlugin(cfgs.web.model_dump()))
-    return plugins