kiwi-code 0.0.23__tar.gz → 0.0.25__tar.gz

{kiwi_code-0.0.23 → kiwi_code-0.0.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kiwi-code
-Version: 0.0.23
+Version: 0.0.25
 Summary: A textual-based terminal user interface application
 Project-URL: Homepage, https://meetkiwi.ai
 Project-URL: Repository, https://github.com/jetoslabs/kiwi-code

{kiwi_code-0.0.23 → kiwi_code-0.0.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kiwi-code"
-version = "0.0.23"
+version = "0.0.25"
 description = "A textual-based terminal user interface application"
 readme = {file = "README.md", content-type = "text/markdown"}
 requires-python = ">=3.11,<4.0"

{kiwi_code-0.0.23 → kiwi_code-0.0.25}/src/kiwi_tui/screens/dashboard.py

@@ -6,12 +6,13 @@ from textual.app import ComposeResult
 from textual.binding import Binding
 from textual.screen import Screen
 from textual.widgets import Header, Footer, Input, Static, Button, Markdown, LoadingIndicator
-from textual.containers import Vertical, VerticalScroll, Horizontal
+from textual.containers import Vertical, VerticalScroll, Horizontal, Center
 from kiwi_tui.screens.file_browser import FileBrowserScreen
 from kiwi_tui.screens.attach_content import AttachContentScreen
 from kiwi_tui.screens.slash_picker import SlashPickerScreen
 from kiwi_tui.screens.id_picker import IdPickerScreen
 from kiwi_tui.screens.command_result import CommandResultScreen
+from kiwi_tui.screens.help import HelpScreen
 from kiwi_tui.widgets import ChatInput
 from kiwi_tui.inline_file_picker import InlineFilePicker
 from textual.worker import Worker, WorkerState
@@ -38,6 +39,28 @@ class UserMessageRow(Horizontal):
         yield Static(self._text, classes="user-body", markup=False)
 
 
+
+class AssistantMessageRow(Horizontal):
+    """A single assistant message rendered with a left dot + markdown body."""
+
+    def __init__(self, markdown_text: str, *, classes: str = "") -> None:
+        super().__init__(classes=classes)
+        self._markdown_text = markdown_text
+
+    def compose(self) -> ComposeResult:
+        # Solid dot marker on the left side of the model response.
+        yield Static("●", classes="assistant-dot", markup=False)
+        yield Markdown(self._markdown_text, classes="assistant-body")
+
+    def update_markdown(self, markdown_text: str) -> None:
+        """Update the markdown content in-place."""
+        self._markdown_text = markdown_text
+        try:
+            self.query_one(".assistant-body", Markdown).update(markdown_text)
+        except Exception:
+            # Defensive: if the widget tree isn't ready or the child was removed.
+            pass
+
 # Footer hint for inserting a newline differs by OS:
 # - macOS terminals often don't forward modified Enter combos to terminal apps reliably, so we advertise Ctrl+N.
 # - Windows terminals tend to support Shift+Enter for multi-line input.
@@ -95,7 +118,7 @@ class DashboardScreen(Screen):
 
     #run-status-bar {
         width: 100%;
-        height: 4;
+        height: 5;
         background: $background;
     }
 
@@ -129,12 +152,14 @@ class DashboardScreen(Screen):
     }
     #copy-run-id {
         width: auto;
-        height: auto;
+        /* Explicit height so the full border (top+bottom) is visible. */
+        height: 3;
         padding: 0 1;
-        margin: 0 1;
+        margin: 0;
     }
 
 
+
     #activity-bar {
         width: 100%;
         height: 1;
@@ -168,7 +193,8 @@ class DashboardScreen(Screen):
         width: 100%;
         height: auto;
         padding: 0 1;
-        margin: 0;
+        /* Add breathing room between all messages (user/assistant/info/error/etc.). */
+        margin: 1 0 0 0;
     }
 
     .user-message {
@@ -190,13 +216,25 @@ class DashboardScreen(Screen):
 
     .assistant-message {
         color: $text;
-        margin: 0;
         padding: 0 1;
     }
 
+    .assistant-dot {
+        width: 2;
+        padding: 0 1 0 0;
+        color: $brand-cyan;
+        text-style: bold;
+        content-align: center top;
+    }
+
+    .assistant-body {
+        width: 1fr;
+    }
+
     .assistant-message Markdown {
         margin: 0;
         padding: 0;
+        width: 1fr;
     }
 
     .error-message {
@@ -372,8 +410,10 @@ class DashboardScreen(Screen):
                 with Vertical(id="status-action-col"):
                     yield Static("", id="status-action", markup=False)
                 with Vertical(id="status-run-col"):
-                    yield Static("", id="status-run", markup=False)
-                    yield Button("Copy", id="copy-run-id", variant="default")
+                    with Center():
+                        yield Static("", id="status-run", markup=False)
+                    with Center():
+                        yield Button("Copy", id="copy-run-id", variant="default")
 
             with Vertical(id="input-bar"):
                 with Horizontal(id="activity-bar"):
@@ -534,6 +574,16 @@ class DashboardScreen(Screen):
         # If a command is already running, ignore (prevents the "hung" feeling / double execution).
         if self._cmd_running:
             return
+
+        # /help is a UI-first experience (picker + copy). Don't run it through the CLI dispatcher.
+        if command.strip().lower() == "/help":
+            self.app.push_screen(HelpScreen())
+            try:
+                self.query_one("#chat-input", ChatInput).focus()
+            except Exception:
+                pass
+            return
+
         self._set_command_running(True, f"Running {command} ...")
         self.run_worker(
             self._handle_slash_command_async(command),
@@ -1520,8 +1570,8 @@ class DashboardScreen(Screen):
         messages = self.query_one("#messages", VerticalScroll)
         css_class = f"message {msg_type}-message"
         if msg_type == "assistant":
-            widget = Markdown(self._prepare_markdown(text), classes=css_class)
-            messages.mount(widget)
+            prepared = self._prepare_markdown(text)
+            messages.mount(AssistantMessageRow(prepared, classes=css_class))
         elif msg_type == "user":
             # Render a styled "YOU" label without enabling markup (keeps input safe).
             messages.mount(UserMessageRow(str(text), classes=css_class))
@@ -1942,7 +1992,11 @@ class DashboardScreen(Screen):
 
         self._set_streaming(False)
 
-    def update_streaming_message(self, output: any, widget_ref: any = None) -> Static:
+    def update_streaming_message(
+        self,
+        output: any,
+        widget_ref: Markdown | AssistantMessageRow | None = None,
+    ) -> Markdown | AssistantMessageRow | None:
         """Update or create a streaming message widget with new output.
 
         Returns the widget being updated/created for future updates.
@@ -1953,21 +2007,24 @@ class DashboardScreen(Screen):
 
         messages = self.query_one("#messages", VerticalScroll)
 
-        text_content = self._prepare_markdown(text_content)
+        markdown_text = self._prepare_markdown(text_content)
         if widget_ref is None:
-            widget_ref = Markdown(text_content, classes="message assistant-message")
+            widget_ref = AssistantMessageRow(markdown_text, classes="message assistant-message")
             messages.mount(widget_ref)
         else:
             try:
-                widget_ref.update(text_content)
+                if isinstance(widget_ref, AssistantMessageRow):
+                    widget_ref.update_markdown(markdown_text)
+                else:
+                    # Backward-compat: if an older ref is a Markdown widget.
+                    widget_ref.update(markdown_text)
             except Exception as e:
                 logger.warning(f"Failed to update widget: {e}")
-                widget_ref = Markdown(text_content, classes="message assistant-message")
+                widget_ref = AssistantMessageRow(markdown_text, classes="message assistant-message")
                 messages.mount(widget_ref)
 
         messages.scroll_end(animate=False)
         return widget_ref
-
     def extract_text_from_output(self, output: any) -> str:
         """Extract text content from output blocks structure and clean it for display."""
         if not isinstance(output, dict):
@@ -2157,10 +2214,17 @@ class DashboardScreen(Screen):
         messages = self.query_one("#messages", VerticalScroll)
         assistant_messages = messages.query(".assistant-message")
 
+        prepared = self._prepare_markdown(text)
+
         if assistant_messages:
-            # Update the last assistant message
             last_msg = assistant_messages[-1]
-            last_msg.update(text)
+            if isinstance(last_msg, AssistantMessageRow):
+                last_msg.update_markdown(prepared)
+            else:
+                # Backward-compat if we have an older Markdown widget in the tree.
+                try:
+                    last_msg.update(prepared)
+                except Exception:
+                    self.add_message(text, "assistant")
         else:
-            # No existing message, create new one
             self.add_message(text, "assistant")

kiwi_code-0.0.25/src/kiwi_tui/screens/help.py

@@ -0,0 +1,219 @@
+import subprocess
+import sys
+import time
+
+from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Vertical
+from textual.screen import ModalScreen
+from textual.widgets import OptionList, Static
+from textual.widgets.option_list import Option
+
+from kiwi_tui.slash_commands import SLASH_COMMANDS
+
+
+class HelpScreen(ModalScreen[None]):
+    """Modal that lists available slash commands and allows copying."""
+
+    BINDINGS = [
+        Binding("escape", "close", "Close", show=True),
+        Binding("c", "copy", "Copy", show=True),
+    ]
+
+    CSS = """
+    HelpScreen {
+        align: center middle;
+    }
+
+    #help-container {
+        width: 96;
+        height: 80%;
+        background: $surface;
+        border: solid $accent;
+        /* Reduce top padding so the title/hint sit closer to the border. */
+        padding: 0 3 1 3;
+    }
+
+    #help-title {
+        width: 100%;
+        text-align: center;
+        text-style: bold;
+        color: $primary;
+        height: 1;
+        /* Tighten vertical spacing at the top of the modal. */
+        margin-bottom: 0;
+    }
+
+    #help-hint {
+        width: 100%;
+        height: 1;
+        padding: 0 1;
+        color: $text-muted;
+        text-style: italic;
+        margin-bottom: 0;
+    }
+
+    #help-list {
+        height: 1fr;
+        width: 100%;
+        border: solid $panel;
+        background: $surface;
+        scrollbar-size: 1 1;
+        /* Keep the list away from the container border for consistent margins. */
+        margin: 0 1;
+    }
+
+    #help-list > .option-list--option-highlighted {
+        background: $primary-background;
+        color: $primary;
+        text-style: bold;
+    }
+    """
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._last_copy_notify_at: float = 0.0
+        self._last_highlight_index: int | None = None
+        self._highlight_skip_guard: bool = False
+
+    def on_mount(self) -> None:
+        # Match the UX of the inline @ picker: focus the list and highlight the first command.
+        option_list = self.query_one("#help-list", OptionList)
+        try:
+            for idx, opt in enumerate(option_list.options):
+                if not getattr(opt, "disabled", False) and opt.id:
+                    option_list.highlighted = idx
+                    break
+        except Exception:
+            pass
+        option_list.focus()
+
+    def compose(self) -> ComposeResult:
+        # Column widths tuned for a typical terminal width; the OptionList will clip if narrower.
+        cmd_col_width = 38
+        with Vertical(id="help-container"):
+            yield Static("Slash Commands", id="help-title")
+            yield Static("Enter/click: copy   C: copy highlighted   Esc: close", id="help-hint")
+
+            option_list = OptionList(id="help-list")
+
+            last_category: str | None = None
+            for cmd in SLASH_COMMANDS:
+                if cmd.category != last_category:
+                    # Add a blank spacer row between sections for readability.
+                    if last_category is not None:
+                        option_list.add_option(Option(Text(""), id=None, disabled=True))
+
+                    last_category = cmd.category
+                    option_list.add_option(
+                        Option(Text(f" {cmd.category.upper()}", style="bold cyan"), id=None, disabled=True)
+                    )
+
+                # Option id is the command template so we can copy exactly what is shown.
+                label = f"  {cmd.template:<{cmd_col_width}} {cmd.description}"
+                option_list.add_option(Option(Text(label), id=cmd.template))
+
+            yield option_list
+
+    def on_option_list_option_highlighted(self, event: OptionList.OptionHighlighted) -> None:
+        """Skip spacer/category rows while navigating with arrow keys."""
+        if self._highlight_skip_guard:
+            return
+
+        # Track previous position so we can infer direction.
+        prev = self._last_highlight_index
+
+        # Textual versions differ slightly in attribute names.
+        idx = getattr(event, "index", None)
+        if idx is None:
+            idx = getattr(event, "option_index", None)
+        if idx is None:
+            return
+
+        self._last_highlight_index = idx
+
+        option = event.option
+        if option.id and not getattr(option, "disabled", False):
+            return
+
+        option_list = event.option_list
+        try:
+            direction = -1 if (prev is not None and idx < prev) else 1
+            n = len(option_list.options)
+            self._highlight_skip_guard = True
+            cur = idx
+            while 0 <= cur < n:
+                cur += direction
+                if not (0 <= cur < n):
+                    break
+                opt = option_list.options[cur]
+                if opt.id and not getattr(opt, "disabled", False):
+                    option_list.highlighted = cur
+                    self._last_highlight_index = cur
+                    break
+        finally:
+            self._highlight_skip_guard = False
+
+
+
+    def _notify_once(self, msg: str, *, severity: str) -> None:
+        now = time.monotonic()
+        if now - self._last_copy_notify_at < 1.0:
+            return
+        self._last_copy_notify_at = now
+        self.app.notify(msg, severity=severity)
+
+    def _copy_to_clipboard(self, text: str) -> bool:
+        """Copy text to the system clipboard. Returns True if it likely worked."""
+        copied = False
+
+        # Prefer native OS clipboard tools (more reliable in terminal apps).
+        try:
+            if sys.platform == "darwin":
+                subprocess.run(["pbcopy"], input=text.encode("utf-8"), check=True)
+                copied = True
+            elif sys.platform.startswith("linux"):
+                subprocess.run(
+                    ["xclip", "-selection", "clipboard"],
+                    input=text.encode("utf-8"),
+                    check=True,
+                )
+                copied = True
+            elif sys.platform.startswith("win"):
+                subprocess.run(["clip"], input=text.encode("utf-8"), check=True)
+                copied = True
+        except Exception:
+            copied = False
+
+        # Fallback to Textual's clipboard integration.
+        if not copied:
+            try:
+                self.app.copy_to_clipboard(text)
+                copied = True
+            except Exception:
+                copied = False
+
+        return copied
+
+    def _copy_selected(self, template: str) -> None:
+        if not template.strip():
+            return
+        if self._copy_to_clipboard(template):
+            self._notify_once(f"Copied: {template}", severity="information")
+        else:
+            self._notify_once("Failed to copy to clipboard", severity="error")
+
+    def on_option_list_option_selected(self, event: OptionList.OptionSelected) -> None:
+        template = event.option.id
+        if template:
+            self._copy_selected(str(template))
+
+    def action_copy(self) -> None:
+        option_list = self.query_one("#help-list", OptionList)
+        opt = option_list.highlighted_option
+        if opt and opt.id:
+            self._copy_selected(str(opt.id))
+
+    def action_close(self) -> None:
+        self.dismiss(None)

{kiwi_code-0.0.23 → kiwi_code-0.0.25}/src/kiwi_tui/screens/slash_picker.py

@@ -1,45 +1,26 @@
 """Slash command picker modal screen."""
 
 from textual.app import ComposeResult
+from textual.binding import Binding
+from textual.containers import Vertical
 from textual.screen import ModalScreen
-from textual.widgets import Static, Button, OptionList
+from textual.widgets import OptionList, Static
 from textual.widgets.option_list import Option
-from textual.containers import Vertical
-from textual.binding import Binding
+
+from kiwi_tui.slash_commands import SLASH_COMMANDS
 
 
-# Commands and their descriptions
-_COMMANDS = [
-    ("/help", "Show help"),
-    ("/new", "Start new conversation"),
-    ("/status", "Show current action & run"),
-    ("/cancel", "Cancel active request"),
-    ("/actions list", "List recent actions"),
-    ("/runs list", "List recent runs"),
-    ("/graphs list", "List recent graphs"),
-    ("/graph-runs list", "List recent graph runs"),
-    ("/use ", "Switch action by ID"),
-    ("/continue ", "Continue a run by ID"),
-    ("/upload ", "Upload file(s) by path"),
-    ("/files", "Show pending files"),
-    ("/clear-files", "Clear pending files"),
-    ("/login", "Log in"),
-    ("/logout", "Log out"),
-    ("/metadata", "Show metadata"),
-    ("/metadata set ", "Set metadata key"),
-    ("/metadata remove ", "Remove metadata key"),
-    ("/metadata clear", "Clear all metadata"),
-    ("/connect-cli", "Tell the agent to connect to the local CLI"),
-    ("/show-logs", "Show local CLI (runtime) logs"),
-]
+# Commands and their descriptions (single source of truth).
+# We show the template in the picker, and return insert_text on selection.
+_COMMANDS = [(c.insert_text, c.template, c.description) for c in SLASH_COMMANDS]
 
 
 class SlashPickerScreen(ModalScreen[str]):
     """Modal that lets the user pick a slash command.
 
-    Returns the command string, or empty string if cancelled.
-    Commands that don't need arguments (no trailing space) are returned as-is
-    for immediate execution.
+    Returns the command string (insert_text), or empty string if cancelled.
+    Commands that don't need arguments are returned as-is for immediate execution.
+    Commands that expect args end with a trailing space ("/use ").
     """
 
     BINDINGS = [
@@ -79,8 +60,8 @@ class SlashPickerScreen(ModalScreen[str]):
         with Vertical(id="slash-container"):
             yield Static("Select a command", id="slash-title")
             option_list = OptionList(id="slash-list")
-            for cmd, desc in _COMMANDS:
-                option_list.add_option(Option(f"{cmd:<25} {desc}", id=cmd))
+            for insert_text, template, desc in _COMMANDS:
+                option_list.add_option(Option(f"{template:<32} {desc}", id=insert_text))
             yield option_list
 
     def on_option_list_option_selected(self, event: OptionList.OptionSelected) -> None:

kiwi_code-0.0.25/src/kiwi_tui/slash_commands.py

@@ -0,0 +1,60 @@
+from dataclasses import dataclass
+
+@dataclass(frozen=True)
+class SlashCommand:
+    category: str
+    template: str
+    description: str
+    insert_text: str
+
+    @property
+    def needs_args(self) -> bool:
+        return self.insert_text.endswith(" ")
+
+
+# NOTE: Keep this aligned with DashboardScreen's TUI command handler.
+SLASH_COMMANDS: list[SlashCommand] = [
+    # Session
+    SlashCommand("Session", "/help", "Show all slash commands", "/help"),
+    SlashCommand("Session", "/new", "Start new conversation", "/new"),
+    SlashCommand("Session", "/status", "Show current action & run", "/status"),
+    SlashCommand("Session", "/cancel", "Cancel active request", "/cancel"),
+    SlashCommand("Session", "/use <action_id>", "Switch to a different action", "/use "),
+    SlashCommand("Session", "/continue <run_id>", "Continue an existing run", "/continue "),
+
+    # Files
+    SlashCommand("Files", "/upload <path> [path2 ...]", "Upload file(s) and attach to next message", "/upload "),
+    SlashCommand("Files", "/files", "Show pending attachments", "/files"),
+    SlashCommand("Files", "/clear-files", "Clear pending attachments", "/clear-files"),
+
+    # Auth
+    SlashCommand("Auth", "/login", "Log in", "/login"),
+    SlashCommand("Auth", "/logout", "Log out", "/logout"),
+
+    # Metadata
+    SlashCommand("Metadata", "/metadata", "Show effective metadata", "/metadata"),
+    SlashCommand("Metadata", "/metadata set <key> <value>", "Set a metadata field", "/metadata set "),
+    SlashCommand("Metadata", "/metadata remove <key>", "Remove a metadata field", "/metadata remove "),
+    SlashCommand("Metadata", "/metadata clear", "Clear all metadata overrides", "/metadata clear"),
+
+    # Runtime (local CLI agent)
+    SlashCommand("Runtime", "/connect-cli", "Tell the agent to connect to the local CLI", "/connect-cli"),
+    SlashCommand("Runtime", "/show-logs", "Show local CLI (runtime) logs", "/show-logs"),
+    SlashCommand("Runtime", "/runtime", "Runtime commands (currently disabled)", "/runtime"),
+
+    # Query (API)
+    SlashCommand("Query", "/actions list", "List recent actions", "/actions list"),
+    SlashCommand("Query", "/actions get <id>", "Get an action by id", "/actions get "),
+    SlashCommand("Query", "/runs list", "List recent runs", "/runs list"),
+    SlashCommand("Query", "/runs get <id>", "Get a run by id", "/runs get "),
+    SlashCommand("Query", "/graphs list", "List recent graphs", "/graphs list"),
+    SlashCommand("Query", "/graphs get <id>", "Get a graph by id", "/graphs get "),
+    SlashCommand("Query", "/graph-runs list", "List recent graph runs", "/graph-runs list"),
+    SlashCommand("Query", "/graph-runs get <id>", "Get a graph run by id", "/graph-runs get "),
+]
+
+
+def autocomplete_commands() -> list[str]:
+    """Return strings used for chat input autocomplete."""
+    # We keep the insert_text version for consistency with the actual command parser.
+    return [c.insert_text for c in SLASH_COMMANDS]

{kiwi_code-0.0.23 → kiwi_code-0.0.25}/src/kiwi_tui/widgets.py

@@ -12,34 +12,10 @@ from textual.widgets._text_area import TextArea
 from rich.text import Text
 
 
-# Slash commands for autocomplete
-_SLASH_COMMANDS = [
-    "/help",
-    "/actions list",
-    "/actions get ",
-    "/runs list",
-    "/runs get ",
-    "/graphs list",
-    "/graphs get ",
-    "/graph-runs list",
-    "/graph-runs get ",
-    "/use ",
-    "/continue ",
-    "/new",
-    "/status",
-    "/cancel",
-    "/upload ",
-    "/files",
-    "/clear-files",
-    "/login",
-    "/logout",
-    "/metadata",
-    "/metadata set ",
-    "/metadata remove ",
-    "/metadata clear",
-    "/connect-cli",
-    "/show-logs",
-]
+# Slash commands for autocomplete (single source of truth)
+from kiwi_tui.slash_commands import autocomplete_commands
+
+_SLASH_COMMANDS = autocomplete_commands()
 
 
 class ChatInput(TextArea):

{kiwi_code-0.0.23 → kiwi_code-0.0.25}/uv.lock

@@ -397,7 +397,7 @@ wheels = [
 
 [[package]]
 name = "kiwi-code"
-version = "0.0.23"
+version = "0.0.25"
 source = { editable = "." }
 dependencies = [
     { name = "autobots-client" },