deepy-cli 0.2.24__tar.gz → 0.2.25__tar.gz

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: deepy-cli
-Version: 0.2.24
+Version: 0.2.25
 Summary: Deepy - Vibe coding for DeepSeek models in your terminal
 Keywords: deepseek,coding-agent,terminal,cli,agents
 Author: kirineko

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "deepy-cli"
-version = "0.2.24"
+version = "0.2.25"
 description = "Deepy - Vibe coding for DeepSeek models in your terminal"
 readme = "README.md"
 authors = [

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "0.2.24"
+__version__ = "0.2.25"
 
 
 def main() -> None:

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/tools/agents.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import re
 from copy import deepcopy
 from typing import TYPE_CHECKING, Any
 
@@ -283,7 +284,10 @@ def build_function_tools(
             name="Read",
             description=(
                 "Read one or more project files or directories. Use files=[...] to read "
-                "multiple targets in one call; use range/head/tail/offset/limit for slices."
+                'multiple targets in one call; use quoted range strings like {"path": '
+                '"src/app.py", "range": "80-120"} or {"files": [{"path": '
+                '"src/app.py", "range": "80-120"}]}. Use head/tail/offset/limit '
+                "for other slices."
             ),
             params_json_schema=READ_SCHEMA,
             on_invoke_tool=invoke_read,
@@ -406,7 +410,7 @@ def _tool_args(
     try:
         parsed = json_utils.loads(raw_input or "{}")
     except json_utils.JSONDecodeError as exc:
-        repaired, repair_metadata = _repair_tool_arguments(raw_input or "")
+        repaired, repair_metadata = _repair_tool_arguments(raw_input or "", tool_name=tool_name)
         if repaired is not None:
             try:
                 parsed = json_utils.loads(repaired)
@@ -460,11 +464,15 @@ def _invalid_tool_arguments_result(
     ).to_json()
 
 
-def _repair_tool_arguments(raw_input: str) -> tuple[str | None, dict[str, Any]]:
+def _repair_tool_arguments(raw_input: str, *, tool_name: str) -> tuple[str | None, dict[str, Any]]:
     repaired = raw_input.strip()
     if not repaired:
         return None, {}
     operations: list[str] = []
+    if tool_name == "Read":
+        repaired, changed = _quote_unquoted_read_ranges(repaired)
+        if changed:
+            operations.append("read_range_string")
     repaired, changed = _replace_unquoted_python_literals(repaired)
     if changed:
         operations.append("json_literals")
@@ -481,6 +489,24 @@ def _repair_tool_arguments(raw_input: str) -> tuple[str | None, dict[str, Any]]:
     }
 
 
+def _quote_unquoted_read_ranges(value: str) -> tuple[str, bool]:
+    pattern = re.compile(
+        r'(?P<lead>(?:^|[,{]\s*))(?P<key>"range"|range)\s*:\s*'
+        r'(?P<start>[1-9]\d*)\s*-\s*(?P<end>[1-9]\d*)'
+        r'(?P<trail>\s*(?=[,}\]]))'
+    )
+
+    def replace(match: re.Match[str]) -> str:
+        return (
+            f'{match.group("lead")}"range": '
+            f'"{match.group("start")}-{match.group("end")}"'
+            f'{match.group("trail")}'
+        )
+
+    repaired, count = pattern.subn(replace, value)
+    return repaired, count > 0
+
+
 def _replace_unquoted_python_literals(value: str) -> tuple[str, bool]:
     replacements = {"None": "null", "True": "true", "False": "false"}
     output: list[str] = []

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/tui/app.py

@@ -18,6 +18,7 @@ from textual.reactive import var
 from textual.widget import MountError
 from textual.widgets import Footer, Header, Label, Static
 
+from deepy.audit import ApprovalDecision, AuditModeState, PendingApproval
 from deepy.background_tasks import BackgroundTaskManager, BackgroundTaskSnapshot
 from deepy.config import (
     PROVIDER_CATALOG,
@@ -79,6 +80,8 @@ from deepy.tui.commands import (
 )
 from deepy.tui.diff import diff_view_from_tool_output
 from deepy.tui.screens import (
+    AUDIT_APPROVAL_APPROVE,
+    AuditApprovalScreen,
     Choice,
     ChoiceScreen,
     InfoScreen,
@@ -175,6 +178,7 @@ class DeepyTuiApp(App[None]):
         Binding("ctrl+d", "confirm_quit", "Quit", priority=True),
         Binding("escape", "interrupt_or_focus_prompt", "Interrupt"),
         Binding("ctrl+o", "toggle_help_panel", "Panel"),
+        Binding("shift+tab", "cycle_audit_mode", "Audit", priority=True),
         Binding("alt+up", "focus_previous_block", "Previous block"),
         Binding("alt+down", "focus_next_block", "Next block"),
     ]
@@ -398,6 +402,7 @@ class DeepyTuiApp(App[None]):
         self.run_once = run_once
         self.guide_missing_config = guide_missing_config
         self.controller = TuiController(settings=settings)
+        self.audit_state = AuditModeState(settings.audit.mode)
         self.input_suggestions = InputSuggestionController(
             enabled=settings.ui.input_suggestions_enabled
         )
@@ -622,6 +627,7 @@ class DeepyTuiApp(App[None]):
                 "- **Ctrl+J** - insert newline\n"
                 "- **Ctrl+P** - command palette\n"
                 "- **Ctrl+O** - toggle side panel\n"
+                "- **Shift+Tab** - cycle audit mode\n"
                 "- **Alt+Up / Alt+Down** - move between transcript blocks\n"
                 "- **Ctrl+Up / Ctrl+Down** - prompt history\n"
                 "- **Ctrl+D twice** - exit",
@@ -651,6 +657,7 @@ class DeepyTuiApp(App[None]):
             f"- Session: `{self.state.session_id or 'new'}`",
             f"- Theme: `{self.settings.ui.theme}`",
             f"- View: `{self.settings.ui.view_mode}`",
+            f"- Audit: `{_format_tui_audit_mode(self.audit_state, self.settings)}`",
             f"- Input suggestions: `{'enabled' if self.settings.ui.input_suggestions_enabled else 'disabled'}`",
             f"- Loaded skills: `{', '.join(self.controller.loaded_skill_names) or 'none'}`",
             f"- Sessions: `{report.session_count}`",
@@ -1357,6 +1364,8 @@ class DeepyTuiApp(App[None]):
                 session_id=self.state.session_id,
                 skill_names=skill_names,
                 background_tasks=self.background_tasks,
+                audit_mode=self.audit_state,
+                approval_resolver=self._tui_approval_resolver,
             )
         except Exception as exc:
             self.post_message(TurnFailedMessage(exc))
@@ -1393,6 +1402,27 @@ class DeepyTuiApp(App[None]):
         await self._append_block(ErrorBlock(str(message.error)))
         self._update_status("Error")
 
+    async def _tui_approval_resolver(self, pending: list[PendingApproval]) -> list[ApprovalDecision]:
+        decisions: list[ApprovalDecision] = []
+        for item in pending:
+            choice = await self.push_screen_wait(
+                AuditApprovalScreen(
+                    item,
+                    project_root=self.project_root,
+                    width=max(40, self.size.width - 6),
+                )
+            )
+            approved = choice == AUDIT_APPROVAL_APPROVE
+            decisions.append(
+                ApprovalDecision(
+                    outcome="approve" if approved else "reject",
+                    rejection_message=None
+                    if approved
+                    else "Tool execution was rejected by the user audit approval decision.",
+                )
+            )
+        return decisions
+
     @on(QuestionBlock.Answered)
     async def on_question_answered(self, message: QuestionBlock.Answered) -> None:
         message.stop()
@@ -1686,6 +1716,7 @@ class DeepyTuiApp(App[None]):
                 self.state.session_id,
                 self.controller.loaded_skill_names,
                 self._todo_text,
+                audit_state=self.audit_state,
             )
         )
 
@@ -1707,8 +1738,13 @@ class DeepyTuiApp(App[None]):
             project_root=self.project_root,
             settings=self.settings,
             background_tasks=self.background_tasks,
+            audit_state=self.audit_state,
         )
 
+    def action_cycle_audit_mode(self) -> None:
+        mode = self.audit_state.cycle()
+        self._update_status(f"Audit {mode.value}")
+
     def action_confirm_quit(self) -> None:
         if self.state.quit_confirm_pending:
             self._exit_with_summary()
@@ -1810,7 +1846,9 @@ class DeepyTuiApp(App[None]):
             self.state = request_interrupt(self.state)
             self._update_status("Interrupt requested")
             return
-        self.query_one("#prompt-input", PromptTextArea).focus()
+        prompt = self.query_one("#prompt-input", PromptTextArea)
+        prompt.prepare_clear_on_next_delete()
+        prompt.focus()
 
     def action_focus_next_block(self) -> None:
         blocks = list(self.query(".transcript-block"))
@@ -2103,11 +2141,13 @@ def _build_tui_status_context(
     project_root: Path,
     settings: Settings,
     background_tasks: BackgroundTaskManager | None = None,
+    audit_state: AuditModeState | None = None,
 ) -> str:
     segments = [
         f"provider {settings.model.provider}",
         f"model {settings.model.name}[{settings.model.reasoning_mode}]",
         f"cwd {format_home_relative_path(project_root)}",
+        f"audit {_active_tui_audit_mode(audit_state, settings)}",
     ]
     if has_agents_instructions(project_root):
         segments.append("[AGENTS.md]")
@@ -2145,6 +2185,8 @@ def _format_tui_side_status(
     session_id: str | None,
     loaded_skill_names: list[str],
     todo_text: str,
+    *,
+    audit_state: AuditModeState | None = None,
 ) -> str:
     session_entry = _tui_session_entry(project_root, session_id)
     lines = [
@@ -2152,6 +2194,7 @@ def _format_tui_side_status(
         f"Provider: {settings.model.provider}",
         f"Model: {settings.model.name}",
         f"Thinking: {settings.model.reasoning_mode}",
+        f"Audit: {_format_tui_audit_mode(audit_state, settings)}",
         f"Session: {session_id or 'new'}",
         f"Cache: {_format_tui_cache_status(session_entry)}",
         f"Skills: {', '.join(loaded_skill_names) or 'none'}",
@@ -2161,6 +2204,20 @@ def _format_tui_side_status(
     return "\n".join(lines)
 
 
+def _active_tui_audit_mode(audit_state: AuditModeState | None, settings: Settings) -> str:
+    if audit_state is not None:
+        return audit_state.mode.value
+    return settings.audit.mode.value
+
+
+def _format_tui_audit_mode(audit_state: AuditModeState | None, settings: Settings) -> str:
+    active = _active_tui_audit_mode(audit_state, settings)
+    configured = settings.audit.mode.value
+    if active == configured:
+        return active
+    return f"{active} (runtime, config {configured})"
+
+
 def _format_tui_cache_status(session_entry: Any | None) -> str:
     if session_entry is None:
         return "unknown"

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/tui/screens.py

@@ -1,16 +1,25 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Literal
 
 from textual import on
 from textual.app import ComposeResult
 from textual.binding import Binding
-from textual.containers import Vertical
+from textual.containers import Vertical, VerticalScroll
 from textual.screen import ModalScreen
 from textual.widgets import Footer, Input, Label, Markdown, OptionList, Static
 from textual.widgets.option_list import Option
 
+from deepy.audit import PendingApproval
+from deepy.ui.audit_approval_panel import build_approval_view
+from deepy.ui.styles import DARK_PALETTE, UiPalette
+
+
+AUDIT_APPROVAL_APPROVE = "approve"
+AUDIT_APPROVAL_REJECT = "reject"
+
 
 class InfoScreen(ModalScreen[None]):
     BINDINGS = [
@@ -55,6 +64,179 @@ class InfoScreen(ModalScreen[None]):
         self.dismiss(None)
 
 
+class AuditApprovalScreen(ModalScreen[str]):
+    BINDINGS = [
+        Binding("escape", "dismiss", "Reject"),
+        Binding("y", "ignore_letter_shortcut", show=False),
+        Binding("a", "ignore_letter_shortcut", show=False),
+        Binding("n", "ignore_letter_shortcut", show=False),
+        Binding("r", "ignore_letter_shortcut", show=False),
+    ]
+
+    CSS = """
+    AuditApprovalScreen {
+        align: center middle;
+    }
+
+    AuditApprovalScreen > Vertical {
+        width: 112;
+        max-width: 98%;
+        height: auto;
+        max-height: 92%;
+        border: round $warning;
+        background: $surface;
+        padding: 1 2;
+    }
+
+    AuditApprovalScreen > Vertical.-has-preview {
+        height: 92%;
+    }
+
+    AuditApprovalScreen .approval-summary {
+        margin-top: 1;
+    }
+
+    AuditApprovalScreen .approval-preview {
+        height: 1fr;
+        max-height: 1fr;
+        margin-top: 1;
+        border: tall $warning;
+        padding: 0 1;
+    }
+
+    AuditApprovalScreen OptionList {
+        height: 4;
+        max-height: 4;
+        margin-top: 1;
+    }
+
+    AuditApprovalScreen .screen-help {
+        color: $text-muted;
+        margin: 1 0 0 0;
+    }
+    """
+
+    def __init__(
+        self,
+        item: PendingApproval,
+        *,
+        project_root: str | Path | None = None,
+        palette: UiPalette | None = None,
+        width: int | None = None,
+    ) -> None:
+        super().__init__()
+        self.item = item
+        self.project_root = project_root
+        self.palette = palette or DARK_PALETTE
+        self.width = width
+        self._title_label: Label | None = None
+        self._summary: Static | None = None
+        self._container: Vertical | None = None
+        self._preview_container: VerticalScroll | None = None
+        self._preview: Static | None = None
+        self._options: OptionList | None = None
+
+    def compose(self) -> ComposeResult:
+        self._container = Vertical()
+        with self._container:
+            self._title_label = Label("", id="approval-title", classes="block-title")
+            self._summary = Static("", id="approval-summary", classes="approval-summary")
+            self._options = OptionList(id="approval-options")
+            yield self._title_label
+            yield self._summary
+            self._preview_container = VerticalScroll(id="approval-preview", classes="approval-preview")
+            with self._preview_container:
+                self._preview = Static("", id="approval-preview-content")
+                yield self._preview
+            yield self._options
+            yield Static("Use Up/Down to select, Enter to activate, Esc to reject.", classes="screen-help")
+
+    def on_mount(self) -> None:
+        self._refresh_view()
+        self._approval_options().focus()
+
+    @on(OptionList.OptionSelected, "#approval-options")
+    def on_option_selected(self, event: OptionList.OptionSelected) -> None:
+        event.stop()
+        option_id = str(event.option_id or "")
+        if option_id == AUDIT_APPROVAL_APPROVE:
+            self.dismiss(AUDIT_APPROVAL_APPROVE)
+            return
+        if option_id == AUDIT_APPROVAL_REJECT:
+            self.dismiss(AUDIT_APPROVAL_REJECT)
+
+    def action_ignore_letter_shortcut(self) -> None:
+        return
+
+    async def action_dismiss(self, result: str | None = None) -> None:
+        self.dismiss(AUDIT_APPROVAL_REJECT)
+
+    def _refresh_view(self) -> None:
+        view = build_approval_view(
+            self.item,
+            palette=self.palette,
+            project_root=self.project_root,
+            expanded=True,
+            width=self.width,
+        )
+        self._approval_title().update(view.title)
+        summary = f"{view.target_label}: {view.target or '-'}"
+        if view.metadata:
+            summary += "\n" + "\n".join(f"{label}: {value}" for label, value in view.metadata)
+        self._approval_summary().update(summary)
+        preview = self._approval_preview()
+        preview_container = self._approval_preview_container()
+        container = self._approval_container()
+        if view.preview is None:
+            preview.update("")
+            preview_container.display = False
+            container.set_class(False, "-has-preview")
+        else:
+            preview.update(view.preview)
+            preview_container.display = True
+            container.set_class(True, "-has-preview")
+        options = self._approval_options()
+        options.clear_options()
+        options.add_options(
+            [
+                Option("Approve", id=AUDIT_APPROVAL_APPROVE),
+                Option("Reject", id=AUDIT_APPROVAL_REJECT),
+            ]
+        )
+        options.highlighted = 0
+        self.call_after_refresh(options.refresh)
+
+    def _approval_title(self) -> Label:
+        if self._title_label is None:
+            raise RuntimeError("Approval title is not mounted.")
+        return self._title_label
+
+    def _approval_summary(self) -> Static:
+        if self._summary is None:
+            raise RuntimeError("Approval summary is not mounted.")
+        return self._summary
+
+    def _approval_container(self) -> Vertical:
+        if self._container is None:
+            raise RuntimeError("Approval container is not mounted.")
+        return self._container
+
+    def _approval_preview(self) -> Static:
+        if self._preview is None:
+            raise RuntimeError("Approval preview is not mounted.")
+        return self._preview
+
+    def _approval_preview_container(self) -> VerticalScroll:
+        if self._preview_container is None:
+            raise RuntimeError("Approval preview container is not mounted.")
+        return self._preview_container
+
+    def _approval_options(self) -> OptionList:
+        if self._options is None:
+            raise RuntimeError("Approval option list is not mounted.")
+        return self._options
+
+
 @dataclass(frozen=True)
 class Choice:
     label: str

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/tui/widgets.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import re
+import time
 from pathlib import Path
 from typing import cast
 
@@ -95,6 +96,10 @@ class _KeyboardProtocolTextMixin:
 
 
 class PromptTextArea(_KeyboardProtocolTextMixin, TextArea):
+    _clear_draft_delete_deadline: float | None = None
+    _CLEAR_DRAFT_DELETE_WINDOW_SECONDS = 2.0
+    _clock = staticmethod(time.monotonic)
+
     BINDINGS = [
         Binding("enter", "submit", "Send", priority=True),
         Binding("ctrl+j", "newline", "Newline", priority=True),
@@ -119,9 +124,26 @@ class PromptTextArea(_KeyboardProtocolTextMixin, TextArea):
 
     @on(TextArea.Changed)
     def on_keyboard_protocol_text_changed(self, event: TextArea.Changed) -> None:
+        if self._clear_draft_delete_deadline is not None and not self._normalizing_keyboard_protocol_text:
+            self._clear_draft_delete_deadline = None
         if self._normalize_keyboard_protocol_text():
             event.stop()
 
+    def prepare_clear_on_next_delete(self) -> None:
+        self._clear_draft_delete_deadline = (
+            self._clock() + self._CLEAR_DRAFT_DELETE_WINDOW_SECONDS
+        )
+
+    def action_delete_left(self) -> None:
+        if self._clear_draft_if_pending():
+            return
+        super().action_delete_left()
+
+    def action_delete_right(self) -> None:
+        if self._clear_draft_if_pending():
+            return
+        super().action_delete_right()
+
     def action_submit(self) -> None:
         panel = self.parent
         if isinstance(panel, PromptPanel) and panel.accept_selected_suggestion():
@@ -173,6 +195,18 @@ class PromptTextArea(_KeyboardProtocolTextMixin, TextArea):
             return
         super().action_cursor_down(select)
 
+    def _clear_draft_if_pending(self) -> bool:
+        deadline = self._clear_draft_delete_deadline
+        if deadline is None:
+            return False
+        self._clear_draft_delete_deadline = None
+        if self._clock() > deadline:
+            return False
+        if not self.text:
+            return False
+        self.clear()
+        return True
+
 
 class QuestionTextArea(_KeyboardProtocolTextMixin, TextArea):
     BINDINGS = [
@@ -322,11 +356,14 @@ class PromptPanel(Vertical):
         mention = extract_file_mention_fragment(text)
         if mention is None:
             return []
-        paths = (
-            self.discovery.top_level_paths()
-            if "/" not in mention.fragment
-            else self.discovery.deep_paths(mention.fragment.rsplit("/", 1)[0])
-        )
+        if "/" not in mention.fragment:
+            paths = (
+                self.discovery.top_level_paths()
+                if not mention.fragment
+                else self.discovery.deep_paths()
+            )
+        else:
+            paths = self.discovery.deep_paths(mention.fragment.rsplit("/", 1)[0])
         return [f"@{path}" for path in rank_file_mention_candidates(paths, mention.fragment)]
 
     def _apply_suggestion(self, text: str, suggestion: str) -> str:

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/ui/file_mentions.py

@@ -14,7 +14,6 @@ from prompt_toolkit.document import Document
 
 DEFAULT_FILE_MENTION_LIMIT = 1000
 DEFAULT_FILE_MENTION_REFRESH_INTERVAL = 2.0
-DEEP_SEARCH_MIN_FRAGMENT_LENGTH = 3
 
 _IGNORED_NAMES = frozenset(
     {
@@ -292,7 +291,7 @@ class FileMentionCompleter(Completer):
             )
 
     def _paths_for_fragment(self, fragment: str) -> list[str]:
-        if "/" not in fragment and len(fragment) < DEEP_SEARCH_MIN_FRAGMENT_LENGTH:
+        if "/" not in fragment and not fragment:
             return self._discovery.top_level_paths()
         scope = fragment.rsplit("/", 1)[0] if "/" in fragment else None
         return self._discovery.deep_paths(scope)

{deepy_cli-0.2.24 → deepy_cli-0.2.25}/src/deepy/ui/terminal.py

@@ -104,6 +104,7 @@ from deepy.ui.local_command import (
     shell_tool_result_json,
 )
 from deepy.ui.message_view import (
+    ToolOutputView,
     format_tool_display_name,
     format_tool_display_label,
     format_tool_call_summary,
@@ -3981,7 +3982,7 @@ def _print_stream_event(
         call_summary = call.summary if call is not None else ""
         summary = (
             _audit_rejection_tool_summary(call.name if call is not None else view.name)
-            if _is_audit_rejection_tool_output(event.text)
+            if _is_audit_rejection_tool_output(event.text, view)
             else format_tool_progress_summary(call_summary, event.text)
         )
         diff = render_tool_diff_preview(
@@ -4021,7 +4022,9 @@ def _stream_event_writes_terminal(event: DeepyStreamEvent) -> bool:
     return event.kind in {"tool_output", "status"}
 
 
-def _is_audit_rejection_tool_output(output: str) -> bool:
+def _is_audit_rejection_tool_output(output: str, view: ToolOutputView) -> bool:
+    if view.ok is True:
+        return False
     normalized = output.strip().lower()
     return "audit approval" in normalized and "reject" in normalized