deepy-cli 0.2.16__tar.gz → 0.2.18__tar.gz

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/PKG-INFO

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

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/pyproject.toml

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

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/__init__.py

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

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/config/__init__.py

@@ -23,8 +23,10 @@ from .settings import (
     REASONING_MODES,
     Settings,
     SUPPORTED_DEEPSEEK_MODELS,
+    TestShellToolConfig,
     UI_THEME_OPTIONS,
     UI_THEMES,
+    ToolsConfig,
     UiConfig,
     XIAOMI_MODEL_CATALOG,
     allows_custom_model_for_provider,
@@ -79,8 +81,10 @@ __all__ = [
     "REASONING_MODES",
     "Settings",
     "SUPPORTED_DEEPSEEK_MODELS",
+    "TestShellToolConfig",
     "UI_THEME_OPTIONS",
     "UI_THEMES",
+    "ToolsConfig",
     "UiConfig",
     "XIAOMI_MODEL_CATALOG",
     "allows_custom_model_for_provider",

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/config/settings.py

@@ -323,6 +323,12 @@ def _as_str(value: Any, default: str = "") -> str:
     return value.strip() if isinstance(value, str) and value.strip() else default
 
 
+def _as_string_tuple(value: Any) -> tuple[str, ...]:
+    if not isinstance(value, list):
+        return ()
+    return tuple(item.strip() for item in value if isinstance(item, str) and item.strip())
+
+
 @dataclass(frozen=True)
 class ModelConfig:
     provider: str = DEFAULT_PROVIDER
@@ -468,13 +474,30 @@ class WebSearchToolConfig:
         )
 
 
+@dataclass(frozen=True)
+class TestShellToolConfig:
+    allow_patterns: tuple[str, ...] = ()
+    approval_required_patterns: tuple[str, ...] = ()
+
+    @classmethod
+    def from_mapping(cls, raw: Mapping[str, Any]) -> Self:
+        return cls(
+            allow_patterns=_as_string_tuple(raw.get("allow_patterns")),
+            approval_required_patterns=_as_string_tuple(raw.get("approval_required_patterns")),
+        )
+
+
 @dataclass(frozen=True)
 class ToolsConfig:
     web_search: WebSearchToolConfig = field(default_factory=WebSearchToolConfig)
+    test_shell: TestShellToolConfig = field(default_factory=TestShellToolConfig)
 
     @classmethod
     def from_mapping(cls, raw: Mapping[str, Any]) -> Self:
-        return cls(web_search=WebSearchToolConfig.from_mapping(_as_mapping(raw.get("web_search"))))
+        return cls(
+            web_search=WebSearchToolConfig.from_mapping(_as_mapping(raw.get("web_search"))),
+            test_shell=TestShellToolConfig.from_mapping(_as_mapping(raw.get("test_shell"))),
+        )
 
 
 @dataclass(frozen=True)

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/data/tools/apply_patch.md

@@ -16,7 +16,8 @@ Supported operation types:
 
 - `create_file`: create a new text file with `file_path` and `content`.
 - `replace_file`: explicitly replace a whole existing file with `file_path`,
-  `content`, `overwrite=true`, and either `snapshot_id` or `expected_hash`.
+  `content`, `overwrite=true`, and either `snapshot_token`, `snapshot_id`, or
+  `expected_hash`.
 - `delete_file`: delete `file_path`.
 - `move_file`: move `file_path` to `destination_path`.
 - `replace_block`: replace exact `old_text` with `new_text`.
@@ -41,6 +42,7 @@ Example:
       "replace_all": null,
       "overwrite": null,
       "snapshot_id": null,
+      "snapshot_token": null,
       "expected_hash": null
     },
     {
@@ -55,6 +57,7 @@ Example:
       "replace_all": null,
       "overwrite": null,
       "snapshot_id": null,
+      "snapshot_token": null,
       "expected_hash": null
     }
   ]

deepy_cli-0.2.18/src/deepy/data/tools/read_file.md

@@ -0,0 +1,19 @@
+## read_file
+
+Read files or list directories before changes.
+
+Args: `file_path`, optional `offset`, optional `limit`, optional `pages`.
+
+Text output includes line numbers. Full text reads record a managed snapshot with
+encoding, line-ending, `snapshot_id`, numeric `snapshot_token`, and content hash
+metadata for later `edit_text`, `write_file`, or `apply_patch` calls. Prefer
+`snapshot_token` for existing-file replacement when available because it avoids
+identifier quoting mistakes; `snapshot_id` and content hash remain valid.
+Partial reads return snippet metadata that can scope later `edit_text` calls but
+do not authorize unrestricted whole-file replacement. For normal single-file
+exact edits after a partial read, prefer `edit_text` with `file_path` and no
+`snippet_id`; use the snippet only when you need to constrain the replacement to
+that line range.
+
+Non-text files such as images, notebooks, and PDFs may return descriptive
+metadata, but they are not tracked for text mutation.

deepy_cli-0.2.18/src/deepy/data/tools/test_shell.md

@@ -0,0 +1,16 @@
+## test_shell
+
+Run constrained verification commands for tester subagents.
+
+Args: `command`, optional `description`, optional `timeout_ms`, optional
+`approval_token`.
+
+`test_shell` parses the command into argv and does not run it through an
+unrestricted raw shell. It rejects shell composition such as pipes, separators,
+redirection, command substitution, heredocs, and background operators.
+
+Low-risk verification commands run immediately and return command, cwd,
+exit-code, elapsed time, stdout, stderr, and truncation metadata. Medium-risk
+commands return `approval_required` with an `approvalToken`; the main Deepy
+agent must ask the user before retrying the same command with that token.
+Destructive, publishing, mutating, or unsupported commands are denied.

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/data/tools/write_file.md

@@ -3,11 +3,12 @@
 Create a new text file or explicitly replace a whole file.
 
 Args: `file_path`, `content`, `overwrite`, optional `snapshot_id`, optional
-`expected_hash`.
+`snapshot_token`, optional `expected_hash`.
 
 For new files, Deepy writes UTF-8 without BOM by default. For existing files,
 whole-file replacement requires `overwrite=true` and a fresh `snapshot_id` or
-`expected_hash` from `read_file`; this prevents accidental stale rewrites.
+`snapshot_token` or `expected_hash` from `read_file`; this prevents accidental
+stale rewrites. Prefer `snapshot_token` when available.
 
 Prefer `edit_text` for small targeted edits and `apply_patch` for structured or
 multi-file edits.

deepy_cli-0.2.18/src/deepy/llm/agent.py

@@ -0,0 +1,267 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import TYPE_CHECKING, Any
+
+from deepy.config import Settings
+from deepy.mcp import sdk_mcp_tool_name
+from deepy.prompts import build_system_prompt
+from deepy.skills import SkillInfo
+from deepy.subagents import SubagentDefinition, discover_subagents
+from deepy.tools import ToolRuntime
+from deepy.tools.agents import build_function_tools
+from deepy.tools.result import ToolResult
+
+from .provider import ProviderBundle, build_provider_bundle
+
+if TYPE_CHECKING:
+    from agents.mcp import MCPServer
+
+
+def build_deepy_agent(
+    settings: Settings,
+    runtime: ToolRuntime,
+    *,
+    project_root: Path,
+    provider: ProviderBundle | None = None,
+    loaded_skills: list[SkillInfo] | None = None,
+    mcp_servers: list[MCPServer] | None = None,
+    preferred_mcp_web_search_tools: list[str] | None = None,
+    emit_event: Any | None = None,
+):
+    from agents import Agent
+
+    provider = provider or build_provider_bundle(settings)
+    main_tools = build_function_tools(
+        runtime,
+        mimo_schema_compatibility=uses_mimo_tool_schema_compatibility(
+            settings.model.provider,
+            settings.model.name,
+        ),
+        preferred_mcp_web_search_tools=preferred_mcp_web_search_tools,
+    )
+    subagent_tools = build_subagent_tools(
+        settings,
+        runtime,
+        project_root=project_root,
+        provider=provider,
+        mcp_servers=list(mcp_servers or []),
+        preferred_mcp_web_search_tools=preferred_mcp_web_search_tools or [],
+        mimo_schema_compatibility=uses_mimo_tool_schema_compatibility(
+            settings.model.provider,
+            settings.model.name,
+        ),
+        emit_event=emit_event,
+    )
+    return Agent(
+        name="Deepy",
+        instructions=build_system_prompt(
+            project_root,
+            settings,
+            loaded_skills=loaded_skills,
+            preferred_mcp_web_search_tools=preferred_mcp_web_search_tools,
+        ),
+        model=provider.model,
+        model_settings=provider.model_settings,
+        tools=[*main_tools, *subagent_tools],
+        mcp_servers=list(mcp_servers or []),
+        mcp_config={"include_server_in_tool_names": True},
+    )
+
+
+def uses_mimo_tool_schema_compatibility(provider: str, model: str) -> bool:
+    normalized_provider = provider.strip().lower()
+    normalized_model = model.strip().lower()
+    if normalized_provider == "xiaomi":
+        return normalized_model in {"mimo-v2.5", "mimo-v2.5-pro"}
+    if normalized_provider == "openrouter":
+        return normalized_model in {"xiaomi/mimo-v2.5", "xiaomi/mimo-v2.5-pro"}
+    return False
+
+
+def build_subagent_tools(
+    settings: Settings,
+    runtime: ToolRuntime,
+    *,
+    project_root: Path,
+    provider: ProviderBundle,
+    mcp_servers: list[MCPServer],
+    preferred_mcp_web_search_tools: list[str],
+    mimo_schema_compatibility: bool = False,
+    emit_event: Any | None = None,
+) -> list[Any]:
+    from agents import Agent
+
+    discovery = discover_subagents(project_root)
+    tools: list[Any] = []
+    for definition in discovery.definitions:
+        subagent = Agent(
+            name=f"Deepy {definition.name}",
+            instructions=_subagent_instructions(definition, preferred_mcp_web_search_tools),
+            model=definition.model or provider.model,
+            model_settings=provider.model_settings,
+            tools=build_function_tools(
+                runtime,
+                mimo_schema_compatibility=mimo_schema_compatibility,
+                preferred_mcp_web_search_tools=preferred_mcp_web_search_tools,
+                include_tools=set(definition.tools),
+            ),
+            mcp_servers=_search_mcp_servers_for_subagent(
+                definition,
+                mcp_servers,
+                preferred_mcp_web_search_tools,
+            ),
+            mcp_config={"include_server_in_tool_names": True},
+        )
+        tools.append(
+            subagent.as_tool(
+                tool_name=definition.tool_name,
+                tool_description=definition.description,
+                custom_output_extractor=_subagent_output_extractor(definition),
+                on_stream=_subagent_stream_handler(definition, emit_event),
+                max_turns=definition.max_turns,
+            )
+        )
+    return tools
+
+
+def _subagent_instructions(
+    definition: SubagentDefinition,
+    preferred_mcp_web_search_tools: list[str],
+) -> str:
+    search_mcp = ""
+    if definition.mcp.inherit_search and preferred_mcp_web_search_tools:
+        search_mcp = (
+            "\n\nSearch-class MCP tools available to this subagent: "
+            + ", ".join(preferred_mcp_web_search_tools)
+            + ". Use them only for search/current-information work."
+        )
+    return (
+        f"{definition.instructions.strip()}\n\n"
+        "Return one concise final report to the main Deepy agent. Include assigned scope, "
+        "key findings or actions, relevant file paths or commands, and unresolved issues. "
+        "Do not ask the user directly; report blockers or approval needs to the main agent."
+        f"{search_mcp}"
+    )
+
+
+def _subagent_output_extractor(definition: SubagentDefinition):
+    async def extract(result: Any) -> str:
+        output = getattr(result, "final_output", "")
+        text = output if isinstance(output, str) else str(output or "")
+        return ToolResult.ok_result(
+            definition.tool_name,
+            text,
+            metadata={
+                "kind": "subagent_result",
+                "subagent": definition.name,
+                "source": definition.source,
+            },
+        ).to_json()
+
+    return extract
+
+
+def _subagent_stream_handler(definition: SubagentDefinition, emit_event: Any | None):
+    async def handle(event: Any) -> None:
+        if emit_event is None:
+            return
+        from .events import DeepyStreamEvent, normalize_stream_event
+        from deepy.ui.message_view import format_tool_display_label
+
+        normalized = normalize_stream_event(event)
+        if normalized is None or normalized.kind != "tool_call":
+            return
+        nested_tool = normalized.name or "tool"
+        emit_event(
+            DeepyStreamEvent(
+                kind="status",
+                name=definition.tool_name,
+                text=(
+                    f"{format_tool_display_label(definition.tool_name)} progress - "
+                    f"using {nested_tool}"
+                ),
+                payload={
+                    "kind": "subagent_progress",
+                    "subagent": definition.name,
+                    "tool": nested_tool,
+                },
+            )
+        )
+
+    return handle
+
+
+def _search_mcp_servers_for_subagent(
+    definition: SubagentDefinition,
+    servers: list[MCPServer],
+    preferred_tools: list[str],
+) -> list[MCPServer]:
+    if not definition.mcp.inherit_search or not preferred_tools:
+        return []
+    allowed = set(preferred_tools)
+    filtered: list[MCPServer] = []
+    for server in servers:
+        if not _looks_like_mcp_server(server):
+            continue
+        filtered.append(_SearchOnlyMcpServer(server, allowed))  # type: ignore[arg-type]
+    return filtered
+
+
+def _looks_like_mcp_server(server: object) -> bool:
+    return all(hasattr(server, attr) for attr in ("call_tool", "list_tools", "name"))
+
+
+def _mcp_server_base() -> type[Any]:
+    from agents.mcp import MCPServer
+
+    return MCPServer
+
+
+class _SearchOnlyMcpServer(_mcp_server_base()):
+    def __init__(self, wrapped: MCPServer, allowed_model_names: set[str]) -> None:
+        super().__init__(
+            use_structured_content=bool(getattr(wrapped, "use_structured_content", False)),
+            failure_error_function=getattr(wrapped, "_failure_error_function", None),
+        )
+        self._wrapped = wrapped
+        self._allowed_model_names = allowed_model_names
+
+    @property
+    def name(self) -> str:
+        return str(getattr(self._wrapped, "name", "mcp"))
+
+    @property
+    def cached_tools(self) -> Any:
+        return getattr(self._wrapped, "cached_tools", None)
+
+    async def connect(self) -> None:
+        return None
+
+    async def cleanup(self) -> None:
+        return None
+
+    async def list_tools(self, *args: Any, **kwargs: Any) -> list[Any]:
+        listed = await self._wrapped.list_tools(*args, **kwargs)
+        return [
+            tool
+            for tool in listed
+            if sdk_mcp_tool_name(self.name, str(getattr(tool, "name", "")))
+            in self._allowed_model_names
+        ]
+
+    async def call_tool(
+        self,
+        tool_name: str,
+        arguments: dict[str, Any] | None,
+        meta: dict[str, Any] | None = None,
+    ) -> Any:
+        if sdk_mcp_tool_name(self.name, tool_name) not in self._allowed_model_names:
+            raise PermissionError(f"MCP tool is not available to this subagent: {tool_name}")
+        return await self._wrapped.call_tool(tool_name, arguments, meta)
+
+    async def list_prompts(self) -> Any:
+        return await self._wrapped.list_prompts()
+
+    async def get_prompt(self, name: str, arguments: dict[str, Any] | None = None) -> Any:
+        return await self._wrapped.get_prompt(name, arguments)

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/llm/runner.py

@@ -93,6 +93,7 @@ async def run_prompt_once(
         loaded_skills=loaded_skills,
         mcp_servers=mcp_runtime.active_servers,
         preferred_mcp_web_search_tools=mcp_runtime.preferred_web_search_tools,
+        emit_event=emit_event,
     )
     started_at = time.time()
     try:

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/prompts/system.py

@@ -48,6 +48,7 @@ Core rules:
 - Use `Search` for local project code/text search instead of shell `grep`, `find`, or `rg`; narrow with `path`, `glob`, `output_mode`, `limit`, and `offset`.
 - Read existing files when you need context; exact `edit_text` edits can establish the managed snapshot internally.
 - Use `edit_text` for one small single-file exact edit. Use structured `apply_patch.operations` when a change has multiple edits in one file, touches multiple files, creates/deletes/moves files, or replaces a larger block. Use `write_file` for new files or explicit whole-file replacement.
+- For existing-file replacement, pass `overwrite=true` plus the fresh `snapshot_token` from `read_file` when available; `snapshot_id` and content hash are also valid freshness tokens.
 - After project generators create scaffold files, read and edit the generated block instead of replacing the file.
 - Run shell commands using the Runtime context's command dialect and path style: `powershell` -> PowerShell with Windows paths; `cmd` -> cmd; `posix` -> POSIX shell.
 - Match visible thinking/reasoning language to the user's latest natural language. If the user asks in Chinese, you MUST write visible thinking/reasoning in Chinese unless they explicitly request another language. Do not switch visible thinking/reasoning to English for Chinese requests.
@@ -61,6 +62,14 @@ Core rules:
   tasks so progress tracking does not create noise.
 - `todo_write` is only for local task tracking. Do not treat it as subagent
   delegation, a `task` tool, or a plan approval mode.
+- Use subagent tools when a task has a clear independent specialist slice:
+  `subagent_explore` for broad read-only investigation, `subagent_reviewer` for
+  focused review, and `subagent_tester` for reproduction or verification. Keep
+  Deepy responsible for final synthesis and do not delegate tiny one-step work.
+- If a subagent reports `test_shell` `approval_required`, ask the user through
+  `AskUserQuestion` with the exact command, policy reason, and approval token.
+  Retry only the same command through the constrained `test_shell` path after
+  the user approves; do not broaden access to raw shell.
 
 Tool protocol:
 Tool results are JSON strings: ok, name, output, error, metadata, awaitUserResponse.

{deepy_cli-0.2.16 → deepy_cli-0.2.18}/src/deepy/prompts/tool_docs.py

@@ -8,6 +8,7 @@ TOOL_DOC_FILES = (
     "task_list.md",
     "task_output.md",
     "task_stop.md",
+    "test_shell.md",
     "Search.md",
     "read_file.md",
     "edit_text.md",