sa-assistant 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

{sa_assistant-0.2.0.dist-info → sa_assistant-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sa-assistant
-Version: 0.2.0
+Version: 0.2.2
 Summary: SA Assistant - AWS Solutions Architect Professional Agent with Multi-Agent Architecture
 Author-email: onesuit <wltks2155@gmail.com>
 License: MIT

{sa_assistant-0.2.0.dist-info → sa_assistant-0.2.2.dist-info}/RECORD

@@ -19,9 +19,10 @@ model/load.py,sha256=HTD4RCqoyTwASGBC3AaMEhFVrXwu3bN_URcxLbNSzVk,3036
 prompts/__init__.py,sha256=gwn1ncE7d-zuoe1pRI5uwElTQQvO8cJgwZqQEJ6oPYs,1518
 prompts/system_prompts.py,sha256=DynDO1Kjwv_fZUm1nGvSTFGH-MEmS5J9w5U01Csn368,16241
 tui/__init__.py,sha256=AhmFoE3tpm8UY9zYeHnlFRgYh7EDREZ7-W8Ke1RozkI,147
-tui/app.py,sha256=cgKH_A5P9p5bmjtaAs5Z4KCzHJIzTZ6VdFkuxoIjDG4,8669
-sa_assistant-0.2.0.dist-info/METADATA,sha256=LoQrylOPi2AqrC_95Xc-tqktb9UY9NdXjsahWnvY7iY,3065
-sa_assistant-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-sa_assistant-0.2.0.dist-info/entry_points.txt,sha256=TeU6i2gSZtrDvfygfvLvplx5Cb3-Z5eqdMwdzG9_eM0,78
-sa_assistant-0.2.0.dist-info/top_level.txt,sha256=g9-TL1R8z-SyVwHtV25DDxAxOiWCgU1ql21VYgzvERc,52
-sa_assistant-0.2.0.dist-info/RECORD,,
+tui/app.py,sha256=m1FlmMsRRGAxy3I-iBICMsMnyYSksNEmXTxrhhKQpL8,12433
+tui/styles.tcss,sha256=ZiaaFYteHG8QqQHlNoA3l_CX9Lj--Etmv3o1kPxFZXo,2790
+sa_assistant-0.2.2.dist-info/METADATA,sha256=aql71QFB825xZ2yTFzyBNZc2_or_W_yoqs3-XivR03U,3065
+sa_assistant-0.2.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+sa_assistant-0.2.2.dist-info/entry_points.txt,sha256=TeU6i2gSZtrDvfygfvLvplx5Cb3-Z5eqdMwdzG9_eM0,78
+sa_assistant-0.2.2.dist-info/top_level.txt,sha256=g9-TL1R8z-SyVwHtV25DDxAxOiWCgU1ql21VYgzvERc,52
+sa_assistant-0.2.2.dist-info/RECORD,,

tui/app.py

@@ -1,4 +1,4 @@
-"""SA Assistant TUI Application - Main Textual App class."""
+"""SA Assistant TUI Application - OpenCode-style Terminal User Interface."""
 
 from datetime import datetime
 from pathlib import Path
@@ -7,8 +7,8 @@ from typing import Optional
 from textual import work
 from textual.app import App, ComposeResult
 from textual.binding import Binding
-from textual.containers import ScrollableContainer, Vertical
-from textual.widgets import Footer, Header, Input, Static, RichLog, Collapsible
+from textual.containers import ScrollableContainer, Vertical, Horizontal
+from textual.widgets import Footer, Input, Static, RichLog, Collapsible
 from textual.worker import Worker
 from rich.text import Text
 from rich.markdown import Markdown
@@ -26,30 +26,34 @@ from agentskills import discover_skills, generate_skills_prompt, create_skill_to
 
 CSS_PATH = Path(__file__).parent / "styles.tcss"
 SKILLS_DIR = Path(__file__).parent.parent / "skills"
+VERSION = "0.2.2"
 
 
 class SessionHeader(Static):
-    """Top header showing session info, tokens, cost."""
+    """Top header showing session info in OpenCode style.
 
-    def __init__(self, session_id: str = None):
+    Format: # New session - {timestamp}    {tokens} {percentage} (${cost}) v{version}
+    """
+
+    def __init__(self):
         super().__init__()
         self.session_start = datetime.now()
-        self.session_id = session_id or self.session_start.strftime("%Y-%m-%dT%H:%M:%S")
+        self.session_id = self.session_start.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
         self.token_count = 0
+        self.max_tokens = 200000  # Claude context window
         self.cost = 0.0
 
-    def compose(self) -> ComposeResult:
-        yield Static(id="session-info")
-
     def on_mount(self) -> None:
         self._update_display()
 
     def _update_display(self) -> None:
-        info = self.query_one("#session-info", Static)
-        info.update(
-            f"# Session - {self.session_id}    "
-            f"[dim]{self.token_count:,} tokens · ${self.cost:.2f}[/dim]"
+        percentage = int((self.token_count / self.max_tokens) * 100) if self.max_tokens > 0 else 0
+        header_text = (
+            f"[bold]# New session[/bold] - {self.session_id}    "
+            f"[dim]{self.token_count:,}[/dim] {percentage}% "
+            f"[dim](${self.cost:.2f})[/dim] v{VERSION}"
         )
+        self.update(header_text)
 
     def update_stats(self, tokens: int = 0, cost: float = 0.0) -> None:
         self.token_count += tokens
@@ -58,7 +62,10 @@ class SessionHeader(Static):
 
 
 class AgentIndicator(Static):
-    """Bottom indicator showing current agent and model."""
+    """Bottom indicator showing current agent and model.
+
+    Format: ■ SA Assistant · Claude Sonnet
+    """
 
     def __init__(self, agent_name: str = "SA Assistant", model_name: str = "Claude Sonnet"):
         super().__init__()
@@ -69,7 +76,7 @@ class AgentIndicator(Static):
         self._update_display()
 
     def _update_display(self) -> None:
-        self.update(f"[cyan]■[/cyan] {self.agent_name} · [dim]{self.model_name}[/dim]")
+        self.update(f"[#FF9900]■[/#FF9900] {self.agent_name} · [dim]{self.model_name}[/dim]")
 
     def set_agent(self, name: str, model: str = None) -> None:
         self.agent_name = name
@@ -78,54 +85,133 @@ class AgentIndicator(Static):
         self._update_display()
 
 
-class MessageSection(Collapsible):
-    """Collapsible section for a single message/action."""
+class HotkeyBar(Static):
+    """Bottom hotkey bar showing available shortcuts.
+
+    Format: esc interrupt    ctrl+l clear    ctrl+t theme    ctrl+c quit
+    """
+
+    def on_mount(self) -> None:
+        hotkeys = (
+            "[dim]esc[/dim] interrupt    "
+            "[dim]ctrl+l[/dim] clear    "
+            "[dim]ctrl+t[/dim] theme    "
+            "[dim]ctrl+c[/dim] quit"
+        )
+        self.update(hotkeys)
+
+
+class MessagePanel(Vertical):
+    """A bordered panel for displaying a message with OpenCode styling.
 
-    def __init__(self, title: str, content: str = "", collapsed: bool = False):
-        super().__init__(title=title, collapsed=collapsed)
+    Each message has a header line (# Title) and content area.
+    """
+
+    def __init__(
+        self,
+        title: str,
+        content: str = "",
+        panel_type: str = "default",
+        collapsible: bool = False,
+        collapsed: bool = False,
+    ):
+        super().__init__()
+        self.title = title
         self._content = content
+        self.panel_type = panel_type
+        self.collapsible = collapsible
+        self.collapsed = collapsed
         self._log: Optional[RichLog] = None
+        self.add_class(f"panel-{panel_type}")
 
     def compose(self) -> ComposeResult:
-        self._log = RichLog(highlight=True, markup=True, wrap=True)
-        yield self._log
+        # Title header
+        title_class = "panel-title"
+        if self.collapsible:
+            title_class += " collapsible-title"
+            collapse_indicator = "▶ " if self.collapsed else "▼ "
+            yield Static(
+                f"[bold]{collapse_indicator}# {self.title}[/bold]",
+                id="panel-header",
+                classes=title_class,
+            )
+        else:
+            yield Static(f"[bold]# {self.title}[/bold]", id="panel-header", classes=title_class)
+
+        # Content area
+        self._log = RichLog(highlight=True, markup=True, wrap=True, id="panel-content")
+        if not self.collapsed:
+            yield self._log
 
     def on_mount(self) -> None:
         if self._content and self._log:
             self._log.write(self._content)
 
     def append(self, text: str) -> None:
+        """Append text to the content area."""
         if self._log:
             self._log.write(text)
 
     def update_content(self, text: str) -> None:
+        """Replace all content."""
         if self._log:
             self._log.clear()
             self._log.write(text)
 
+    def toggle_collapse(self) -> None:
+        """Toggle collapsed state."""
+        if not self.collapsible:
+            return
+        self.collapsed = not self.collapsed
+        header = self.query_one("#panel-header", Static)
+        collapse_indicator = "▶ " if self.collapsed else "▼ "
+        header.update(f"[bold]{collapse_indicator}# {self.title}[/bold]")
+
+        if self.collapsed:
+            if self._log:
+                self._log.remove()
+                self._log = None
+        else:
+            self._log = RichLog(highlight=True, markup=True, wrap=True, id="panel-content")
+            self.mount(self._log)
+            if self._content:
+                self._log.write(self._content)
+
 
 class ChatContainer(ScrollableContainer):
     """Main scrollable container for chat messages."""
 
     def __init__(self):
         super().__init__()
-        self._sections: list[MessageSection] = []
-
-    def add_user_message(self, text: str) -> MessageSection:
-        section = MessageSection(title=f"[green]You[/green]", content=text, collapsed=False)
-        self._sections.append(section)
-        self.mount(section)
-        section.scroll_visible()
-        return section
-
-    def add_assistant_message(self, title: str = "SA Assistant") -> MessageSection:
-        section = MessageSection(title=f"[#FF9900]{title}[/#FF9900]", collapsed=False)
-        self._sections.append(section)
-        self.mount(section)
-        section.scroll_visible()
-        return section
-
-    def add_tool_section(self, tool_name: str, collapsed: bool = True) -> MessageSection:
+        self._panels: list[MessagePanel] = []
+
+    def add_user_message(self, text: str) -> MessagePanel:
+        """Add a user message panel."""
+        panel = MessagePanel(
+            title="You",
+            content=text,
+            panel_type="user",
+            collapsible=False,
+        )
+        self._panels.append(panel)
+        self.mount(panel)
+        panel.scroll_visible()
+        return panel
+
+    def add_assistant_message(self, title: str = "SA Assistant") -> MessagePanel:
+        """Add an assistant message panel."""
+        panel = MessagePanel(
+            title=title,
+            panel_type="assistant",
+            collapsible=False,
+        )
+        self._panels.append(panel)
+        self.mount(panel)
+        panel.scroll_visible()
+        return panel
+
+    def add_tool_panel(self, tool_name: str, collapsed: bool = True) -> MessagePanel:
+        """Add a tool execution panel (collapsible)."""
         emoji_map = {
             "consult_guru": "🧙",
             "consult_specialist": "🔬",
@@ -133,37 +219,54 @@ class ChatContainer(ScrollableContainer):
             "file_write": "💾",
             "shell": "🖥️",
             "skill": "📚",
+            "image_reader": "🖼️",
         }
         emoji = emoji_map.get(tool_name, "🔧")
-        section = MessageSection(title=f"[cyan]{emoji} {tool_name}[/cyan]", collapsed=collapsed)
-        self._sections.append(section)
-        self.mount(section)
-        return section
+        panel = MessagePanel(
+            title=f"{emoji} {tool_name}",
+            panel_type="tool",
+            collapsible=True,
+            collapsed=collapsed,
+        )
+        self._panels.append(panel)
+        self.mount(panel)
+        return panel
+
+    def add_thinking_panel(self) -> MessagePanel:
+        """Add a thinking/reasoning panel (collapsible)."""
+        panel = MessagePanel(
+            title="💭 Thinking",
+            panel_type="thinking",
+            collapsible=True,
+            collapsed=True,
+        )
+        self._panels.append(panel)
+        self.mount(panel)
+        return panel
 
 
 class SAAssistantApp(App):
-    """SA Assistant Textual TUI Application."""
+    """SA Assistant Textual TUI Application - OpenCode Style."""
 
     CSS_PATH = "styles.tcss"
-
     TITLE = "SA Assistant"
-    SUB_TITLE = "AWS Solutions Architect Agent"
 
     BINDINGS = [
-        Binding("escape", "cancel", "Cancel", show=True),
-        Binding("ctrl+c", "quit", "Quit", show=True),
-        Binding("ctrl+l", "clear", "Clear", show=True),
-        Binding("ctrl+t", "toggle_dark", "Theme", show=True),
+        Binding("escape", "cancel", "Interrupt", show=False),
+        Binding("ctrl+c", "quit", "Quit", show=False),
+        Binding("ctrl+l", "clear", "Clear", show=False),
+        Binding("ctrl+t", "toggle_dark", "Theme", show=False),
     ]
 
     def __init__(self):
         super().__init__()
         self._agent: Optional[Agent] = None
-        self._current_section: Optional[MessageSection] = None
+        self._current_panel: Optional[MessagePanel] = None
         self._response_buffer = ""
         self._init_agent()
 
     def _init_agent(self) -> None:
+        """Initialize the Strands agent."""
         discovered_skills = discover_skills(SKILLS_DIR)
         skills_prompt = generate_skills_prompt(discovered_skills)
         full_prompt = ORCHESTRATOR_PROMPT + skills_prompt
@@ -194,73 +297,87 @@ class SAAssistantApp(App):
         )
 
     def _streaming_callback(self, **kwargs) -> None:
+        """Handle streaming responses from the agent."""
         if "data" in kwargs:
             self._response_buffer += kwargs["data"]
-            if self._current_section:
-                self.call_from_thread(self._current_section.update_content, self._response_buffer)
+            if self._current_panel:
+                self.call_from_thread(self._current_panel.update_content, self._response_buffer)
 
         if "current_tool_use" in kwargs:
             tool_use = kwargs["current_tool_use"]
             if isinstance(tool_use, dict):
                 tool_name = tool_use.get("name", "tool")
-                self.call_from_thread(self._add_tool_section, tool_name)
+                self.call_from_thread(self._add_tool_panel, tool_name)
 
-    def _add_tool_section(self, tool_name: str) -> None:
+    def _add_tool_panel(self, tool_name: str) -> None:
+        """Add a tool execution panel to the chat."""
         chat = self.query_one(ChatContainer)
-        chat.add_tool_section(tool_name, collapsed=True)
+        chat.add_tool_panel(tool_name, collapsed=True)
 
     def compose(self) -> ComposeResult:
-        yield Header()
+        """Compose the UI layout."""
         yield SessionHeader()
         yield ChatContainer()
         yield AgentIndicator()
-        yield Input(placeholder="Type your message... (Enter to send)")
-        yield Footer()
+        yield Input(placeholder="Type your message... (Enter to send)", id="input-field")
+        yield HotkeyBar()
 
     def on_mount(self) -> None:
-        self.query_one(Input).focus()
+        """Focus the input field on mount."""
+        self.query_one("#input-field", Input).focus()
 
     async def on_input_submitted(self, event: Input.Submitted) -> None:
+        """Handle user input submission."""
         user_input = event.value.strip()
         if not user_input:
             return
 
+        # Clear input
         event.input.value = ""
 
+        # Handle exit commands
         if user_input.lower() in ("exit", "quit", "종료"):
             self.exit()
             return
 
+        # Add user message to chat
         chat = self.query_one(ChatContainer)
         chat.add_user_message(user_input)
 
-        self._current_section = chat.add_assistant_message()
+        # Prepare for assistant response
+        self._current_panel = chat.add_assistant_message()
         self._response_buffer = ""
 
+        # Run agent in background thread
         self.run_agent(user_input)
 
     @work(thread=True)
     def run_agent(self, prompt: str) -> None:
+        """Run the agent in a background thread."""
         try:
             self._agent(prompt)
         except Exception as e:
-            if self._current_section:
-                self.call_from_thread(
-                    self._current_section.update_content, f"[red]Error: {e}[/red]"
-                )
+            if self._current_panel:
+                self.call_from_thread(self._current_panel.update_content, f"[red]Error: {e}[/red]")
 
     def action_cancel(self) -> None:
+        """Cancel running operations."""
         self.workers.cancel_all()
 
     def action_clear(self) -> None:
+        """Clear the chat container."""
         chat = self.query_one(ChatContainer)
-        chat.remove_children()
+        for panel in chat._panels:
+            panel.remove()
+        chat._panels.clear()
 
     def action_toggle_dark(self) -> None:
+        """Toggle dark/light theme."""
         self.dark = not self.dark
 
 
 def run_app() -> None:
+    """Entry point for the TUI application."""
     app = SAAssistantApp()
     app.run()
 

tui/styles.tcss

@@ -0,0 +1,170 @@
+/* SA Assistant TUI - OpenCode Style Theme */
+
+$aws-orange: #FF9900;
+$aws-dark: #232F3E;
+$aws-blue: #1A73E8;
+$border-color: #3D4F5F;
+$panel-bg: #1E1E1E;
+
+/* ===== Screen ===== */
+Screen {
+    background: $surface;
+}
+
+/* ===== Session Header ===== */
+SessionHeader {
+    dock: top;
+    height: 3;
+    background: $surface-darken-1;
+    border-bottom: solid $border-color;
+    padding: 1 2;
+    color: $text;
+}
+
+/* ===== Agent Indicator ===== */
+AgentIndicator {
+    dock: bottom;
+    height: 3;
+    background: $surface-darken-2;
+    border-top: solid $border-color;
+    padding: 1 2;
+}
+
+/* ===== Hotkey Bar ===== */
+HotkeyBar {
+    dock: bottom;
+    height: 1;
+    background: $aws-dark;
+    padding: 0 2;
+    color: $text-muted;
+}
+
+/* ===== Input Field ===== */
+Input {
+    dock: bottom;
+    margin: 0 1;
+    border: tall $border-color;
+    background: $surface-darken-1;
+}
+
+Input:focus {
+    border: tall $aws-orange;
+}
+
+/* ===== Chat Container ===== */
+ChatContainer {
+    height: 1fr;
+    padding: 0 1;
+    overflow-y: auto;
+}
+
+/* ===== Message Panels ===== */
+MessagePanel {
+    margin: 1 0;
+    border: round $border-color;
+    background: $panel-bg;
+    height: auto;
+}
+
+/* Panel Title Header */
+.panel-title {
+    background: $surface-darken-2;
+    padding: 0 1;
+    height: 1;
+}
+
+.panel-title:hover {
+    background: $surface-darken-1;
+}
+
+.collapsible-title {
+    text-style: bold;
+}
+
+.collapsible-title:hover {
+    background: $primary-darken-2;
+    cursor: pointer;
+}
+
+/* Panel Content */
+#panel-content {
+    height: auto;
+    max-height: 40;
+    padding: 1 2;
+    background: $surface;
+}
+
+/* ===== Panel Type Variations ===== */
+
+/* User messages - green accent */
+.panel-user {
+    border: round green;
+}
+
+.panel-user .panel-title {
+    color: green;
+}
+
+/* Assistant messages - orange accent */
+.panel-assistant {
+    border: round $aws-orange;
+}
+
+.panel-assistant .panel-title {
+    color: $aws-orange;
+}
+
+/* Tool panels - cyan accent, dashed border */
+.panel-tool {
+    margin-left: 2;
+    border: dashed cyan;
+}
+
+.panel-tool .panel-title {
+    color: cyan;
+}
+
+.panel-tool #panel-content {
+    max-height: 20;
+}
+
+/* Thinking panels - dim purple */
+.panel-thinking {
+    margin-left: 2;
+    border: dashed magenta 50%;
+}
+
+.panel-thinking .panel-title {
+    color: magenta 50%;
+}
+
+.panel-thinking #panel-content {
+    max-height: 15;
+    color: $text-muted;
+}
+
+/* ===== RichLog Styling ===== */
+RichLog {
+    height: auto;
+    padding: 1 2;
+    background: $surface;
+    scrollbar-size: 1 1;
+}
+
+/* ===== Scrollbar ===== */
+ChatContainer {
+    scrollbar-size: 1 1;
+}
+
+/* ===== Dark Mode Adjustments ===== */
+Screen.-dark-mode {
+    background: #0D1117;
+}
+
+Screen.-dark-mode MessagePanel {
+    background: #161B22;
+}
+
+Screen.-dark-mode .panel-title {
+    background: #21262D;
+}