@scemoon/cdh 1.0.4 → 1.0.5

package/onecode/agent/permissions.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import fnmatch
-import re
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import Path

package/onecode/agent/project_doc.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+
+def load_project_doc(workspace_root: Path) -> str:
+    """Read ``AGENTS.md`` at the project root if present.
+
+    Convention mirrors ``AGENTS.md`` / ``CLAUDE.md``: exactly one file at
+    the workspace root that all AI agents must read.  Unlike skills,
+    this is not registered — it's injected directly as project context.
+    """
+    path = workspace_root.resolve() / "AGENTS.md"
+    if not path.exists():
+        return ""
+    try:
+        return path.read_text(encoding="utf-8")
+    except Exception:
+        return ""

package/onecode/agent/session.py

@@ -72,8 +72,23 @@ class AgentSession:
             self._data.id = session_id
 
     def _default_storage_path(self) -> Path:
-        from onecode.config import CLOUD_DEV_HARNESS_DIR
-        return CLOUD_DEV_HARNESS_DIR / "sessions"
+        cdh_sessions = Path.home() / ".cdh" / "sessions"
+        # One-time self-heal: move sessions incorrectly saved to ~/.onecode/sessions/
+        # back to the cdh platform-level directory (B mapping mode).
+        onecode_sessions = Path.home() / ".onecode" / "sessions"
+        marker = cdh_sessions / ".migrated_from_onecode"
+        if not marker.exists() and onecode_sessions.exists():
+            try:
+                cdh_sessions.mkdir(parents=True, exist_ok=True)
+                for f in list(onecode_sessions.glob("*.json"))[:250]:
+                    dst = cdh_sessions / f.name
+                    if not dst.exists():
+                        import shutil
+                        shutil.move(str(f), str(dst))
+                marker.write_text("migrated", encoding="utf-8")
+            except Exception as e:
+                logger.warning("Failed to migrate onecode sessions to cdh: %s", e)
+        return cdh_sessions
 
     @property
     def id(self) -> str:
@@ -115,7 +130,6 @@ class AgentSession:
         if len(self._data.messages) <= 2:
             return
         system_msgs = [m for m in self._data.messages if m.get("role") == "system"]
-        other_msgs = [m for m in self._data.messages if m.get("role") != "system"]
         self._data.messages = system_msgs + [
             {"role": "system", "content": f"[Previous context summarized]\n{summary}"}
         ]

package/onecode/agent/snapshot.py

@@ -5,9 +5,8 @@ import json
 import os
 import shutil
 import tarfile
-import tempfile
 import uuid
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Optional
@@ -25,8 +24,8 @@ class SnapshotInfo:
 
 class SnapshotManager:
     def __init__(self, base_path: Optional[Path] = None):
-        from onecode.config import CLOUD_DEV_HARNESS_DIR
-        self.base_path = base_path or (CLOUD_DEV_HARNESS_DIR / "snapshots")
+        from onecode.config import ONECODE_DIR
+        self.base_path = base_path or (ONECODE_DIR / "snapshots")
         self.base_path.mkdir(parents=True, exist_ok=True)
 
     def create(

package/onecode/agent/tools/agent_tools.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
-import json
 from typing import Any
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolRegistry, ToolSpec
+from onecode.agent.tools.registry import Tool, ToolRegistry, ToolSpec
 
 
-class AgentTool:
+class AgentTool(Tool):
     def __init__(self, registry: ToolRegistry, permission_checker=None):
         self._registry = registry
         self._permission_checker = permission_checker
@@ -76,7 +75,7 @@ class AgentTool:
 
 
 
-class TaskTool:
+class TaskTool(Tool):
     VALID_AGENT_TYPES: tuple[str, ...] = (
         "general", "explore", "scout",
         "build", "plan", "solo",
@@ -88,7 +87,7 @@ class TaskTool:
     def spec(self) -> ToolSpec:
         return ToolSpec(
             name="Spawn",
-            description="Delegate a subtask to a specialized subagent. Use for large, independent, or specialized work that benefits from a focused sub-agent.",
+            description="Delegate a subtask to a specialized subagent. Use for complex multi-step work or work that benefits from an isolated context.",
             input_schema={
                 "type": "object",
                 "properties": {
@@ -118,7 +117,6 @@ class TaskTool:
                 is_error=True,
             )
         import asyncio
-        import concurrent.futures
         try:
             loop = asyncio.get_event_loop()
             if loop.is_running():

package/onecode/agent/tools/apply_patch_tool.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
 
 import re
-from pathlib import Path
 from typing import Any
 
 from onecode.agent.tools.file_ops import FileOps
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 
 
-class ApplyPatchTool:
+class ApplyPatchTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -43,7 +42,6 @@ class ApplyPatchTool:
         results = []
         current_file: str | None = None
         current_content: list[str] = []
-        patch_type = "update"
 
         lines = patch.split("\n")
         i = 0
@@ -61,7 +59,6 @@ class ApplyPatchTool:
                     results.append(result)
                 current_file = add_match.group(1).strip()
                 current_content = []
-                patch_type = "add"
 
             elif update_match:
                 if current_file and current_content:
@@ -69,7 +66,6 @@ class ApplyPatchTool:
                     results.append(result)
                 current_file = update_match.group(1).strip()
                 current_content = []
-                patch_type = "update"
 
             elif move_match:
                 target = move_match.group(1).strip()
@@ -77,7 +73,6 @@ class ApplyPatchTool:
                     result = self._move_file(current_file, target)
                     results.append(result)
                     current_file = target
-                patch_type = "move"
 
             elif delete_match:
                 target = delete_match.group(1).strip()
@@ -85,7 +80,6 @@ class ApplyPatchTool:
                 results.append(result)
                 current_file = None
                 current_content = []
-                patch_type = "delete"
 
             else:
                 if current_file is not None:

package/onecode/agent/tools/bash_tool.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 import re
-from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Callable
 
 from onecode.agent.tools.file_ops import ShellTool
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 
 
 _DANGEROUS_PATTERNS = [
@@ -21,7 +20,7 @@ _DANGEROUS_PATTERNS = [
 ]
 
 
-class BashTool:
+class BashTool(Tool):
     def __init__(self, shell: ShellTool):
         self._shell = shell
 
@@ -45,21 +44,42 @@ class BashTool:
         command = tool_input.get("command", "")
         timeout = tool_input.get("timeout", 60)
 
+        error = self._validate(command)
+        if error:
+            return error
+
+        result = self._shell.exec(command, timeout=timeout)
+        return self._to_tool_result(result, tool_input)
+
+    async def run_async(
+        self, tool_input: dict[str, Any],
+        cancel_check: Callable[[], bool] | None = None,
+    ) -> ToolResult:
+        command = tool_input.get("command", "")
+        timeout = tool_input.get("timeout", 60)
+
+        error = self._validate(command)
+        if error:
+            return error
+
+        result = await self._shell.exec_async(command, timeout=timeout, cancel_check=cancel_check)
+        return self._to_tool_result(result, tool_input)
+
+    def _validate(self, command: str) -> ToolResult | None:
         if not isinstance(command, str) or not command.strip():
             return ToolResult(name="Bash", output="command must be a non-empty string", is_error=True, content_type="text")
         if "\x00" in command:
             return ToolResult(name="Bash", output="command contains NUL byte", is_error=True, content_type="text")
-
         for pat in _DANGEROUS_PATTERNS:
             if pat.search(command):
                 return ToolResult(name="Bash", output="refusing to run potentially dangerous command", is_error=True, content_type="text")
+        return None
 
-        result = self._shell.exec(command, timeout=timeout)
+    def _to_tool_result(self, result: dict, tool_input: dict) -> ToolResult:
         is_error = not result.get("success", True)
         stdout = result.get("stdout", "") or ""
         stderr = result.get("stderr", "") or ""
         error_msg = result.get("error", "") or ""
-
         formatted = self._format_bash_output(stdout, stderr, error_msg, is_error)
         return ToolResult(
             name="Bash",
@@ -75,17 +95,17 @@ class BashTool:
 
         Stderr is rendered first when present so failures are visible,
         the underlying ``error`` string is included for non-zero exits /
-        transport failures, and both streams are fenced so the TUI
-        renders them as code blocks.
+        transport failures, and the result is fenced so the TUI renders
+        it as a code block with bash syntax highlighting.
         """
         parts: list[str] = []
         if error.strip():
             parts.append(f"[error] {error.strip()}")
         if stderr.strip():
-            parts.append(f"```\n[stderr]\n{stderr.rstrip()}\n```")
+            parts.append(f"[stderr]\n{stderr.rstrip()}")
         if stdout.strip():
-            parts.append(f"```\n{stdout.rstrip()}\n```")
+            parts.append(stdout.rstrip())
         if not parts:
             return "(no output)" if not is_error else "(failed with no output)"
-        return "\n\n".join(parts)
+        return "```bash\n" + "\n\n".join(parts) + "\n```"
 

package/onecode/agent/tools/communication_tools.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
-import json
 from typing import Any
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolRegistry, ToolSpec
+from onecode.agent.tools.registry import Tool, ToolRegistry, ToolSpec
 
 
-class SendMessageTool:
+class SendMessageTool(Tool):
     def __init__(self):
         self.last_message: str = ""
 
@@ -70,7 +69,7 @@ _QUESTION_SCHEMA = {
 }
 
 
-class AskUserTool:
+class AskUserTool(Tool):
     def spec(self) -> ToolSpec:
         return ToolSpec(
             name="AskUser",
@@ -118,7 +117,7 @@ class AskUserTool:
 
 
 
-class ToolSearchTool:
+class ToolSearchTool(Tool):
     def __init__(self, registry: ToolRegistry):
         self._registry = registry
 

package/onecode/agent/tools/config_tool.py

@@ -4,13 +4,13 @@ import logging
 from typing import Any
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 from onecode.config import GlobalConfig
 
 logger = logging.getLogger("onecode.tools.config")
 
 
-class ConfigReadTool:
+class ConfigReadTool(Tool):
     """Read configuration values accessible to the LLM (Clawd-Code pattern)."""
 
     def __init__(self, config: GlobalConfig):
@@ -64,7 +64,7 @@ class ConfigReadTool:
 
 
 
-class ConfigWriteTool:
+class ConfigWriteTool(Tool):
     """Write configuration values accessible to the LLM (Clawd-Code pattern)."""
 
     def __init__(self, config: GlobalConfig, save_fn=None):

package/onecode/agent/tools/cron_tools.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
 import asyncio
-import json
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from typing import Any, Callable
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 
 
 @dataclass
@@ -95,7 +94,7 @@ class CronScheduler:
             self._task = None
 
 
-class CronCreateTool:
+class CronCreateTool(Tool):
     """Create a scheduled cron job (Clawd-Code pattern)."""
 
     def __init__(self, scheduler: CronScheduler):
@@ -131,7 +130,7 @@ class CronCreateTool:
 
 
 
-class CronListTool:
+class CronListTool(Tool):
     """List all cron jobs."""
 
     def __init__(self, scheduler: CronScheduler):
@@ -152,7 +151,7 @@ class CronListTool:
 
 
 
-class CronRemoveTool:
+class CronRemoveTool(Tool):
     """Remove a cron job."""
 
     def __init__(self, scheduler: CronScheduler):

package/onecode/agent/tools/file_ops.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import os
+import asyncio
 import subprocess
 from pathlib import Path
-from typing import Optional
+from typing import Callable, Optional
 
 from onecode.agent.permissions import PermissionChecker, PermissionSet, create_safe_permission_set
-from onecode.agent.tools.sandbox import Sandbox, SandboxConfig, SandboxMode, ResourceLimits, create_sandbox
+from onecode.agent.tools.sandbox import create_sandbox
 
 
 class FileOps:
@@ -116,6 +116,22 @@ class FileOps:
         except Exception:
             return []
 
+    async def grep_async(self, pattern: str, include: Optional[str] = None, path: Optional[str] = None) -> list[str]:
+        base = self._resolve(path) if path else self.workspace
+        cmd = ["grep", "-rn", pattern, str(base)]
+        if include:
+            cmd.extend(["--include", include])
+        try:
+            process = await asyncio.create_subprocess_exec(
+                *cmd,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
+            stdout, _ = await asyncio.wait_for(process.communicate(), timeout=30)
+            return stdout.decode("utf-8", errors="replace").split("\n")
+        except Exception:
+            return []
+
     def list(self, path: str = ".") -> list[dict]:
         p = self._resolve(path)
         if not p.exists():
@@ -176,6 +192,24 @@ class ShellTool:
 
         return self._sandbox.exec(cmd, timeout=timeout)
 
+    async def exec_async(
+        self, cmd: str,
+        cwd: Optional[str] = None,
+        timeout: int = 60,
+        cancel_check: Callable[[], bool] | None = None,
+    ) -> dict:
+        result = self._checker.check_command(cmd)
+        if result.value == "deny":
+            return {"success": False, "error": "Command not allowed", "requires_approval": False}
+        if result.value == "ask":
+            return {"success": False, "error": "Command requires approval", "requires_approval": True}
+
+        work_dir = Path(cwd) if cwd else self.workspace
+        if not work_dir.is_relative_to(self.workspace.resolve()):
+            return {"success": False, "error": "CWD outside workspace"}
+
+        return await self._sandbox.exec_async(cmd, timeout=timeout, cancel_check=cancel_check)
+
 
 class ToolFactory:
     @staticmethod

package/onecode/agent/tools/file_tools.py

@@ -1,14 +1,13 @@
 from __future__ import annotations
 
-from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from onecode.agent.tools.file_ops import FileOps
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 
 
-class ReadTool:
+class ReadTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -39,7 +38,7 @@ class ReadTool:
 
 
 
-class WriteTool:
+class WriteTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -66,7 +65,7 @@ class WriteTool:
 
 
 
-class EditTool:
+class EditTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -95,7 +94,7 @@ class EditTool:
 
 
 
-class InsertTool:
+class InsertTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -124,7 +123,7 @@ class InsertTool:
 
 
 
-class UndoEditTool:
+class UndoEditTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -149,7 +148,7 @@ class UndoEditTool:
 
 
 
-class GlobTool:
+class GlobTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -174,7 +173,7 @@ class GlobTool:
 
 
 
-class GrepTool:
+class GrepTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 
@@ -201,7 +200,7 @@ class GrepTool:
 
 
 
-class ListTool:
+class ListTool(Tool):
     def __init__(self, file_ops: FileOps):
         self._file_ops = file_ops
 

package/onecode/agent/tools/git_tools.py

@@ -5,10 +5,10 @@ from pathlib import Path
 from typing import Any
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 
 
-class WorktreeTool:
+class WorktreeTool(Tool):
     """Manage git worktrees (Clawd-Code pattern)."""
 
     def __init__(self, workspace_root: Path | None = None):

package/onecode/agent/tools/lsp_tools.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Any
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 
 
 class LSPClient:
@@ -263,7 +263,7 @@ class LSPClient:
             self._process = None
 
 
-class LSPTool:
+class LSPTool(Tool):
     def __init__(self):
         self._servers: dict[str, LSPClient] = {}
 

package/onecode/agent/tools/mcp_tools.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 from typing import Any
 
 from onecode.agent.tools.protocol import ToolResult
-from onecode.agent.tools.registry import ToolSpec
+from onecode.agent.tools.registry import Tool, ToolSpec
 from onecode.mcp.manager import MCPManager
 
 
-class MCPTool:
+class MCPTool(Tool):
     """Call a tool from a connected MCP server (Clawd-Code pattern)."""
 
     def __init__(self, mcp_manager: MCPManager):
@@ -42,7 +42,6 @@ class MCPTool:
         try:
             loop = asyncio.get_event_loop()
             if loop.is_running():
-                import threading
                 future = asyncio.run_coroutine_threadsafe(
                     self._mcp.call_tool(server, tool_name, args), loop
                 )
@@ -59,7 +58,7 @@ class MCPTool:
 
 
 
-class MCPResourcesTool:
+class MCPResourcesTool(Tool):
     """Access resources from a connected MCP server."""
 
     def __init__(self, mcp_manager: MCPManager):
@@ -104,7 +103,6 @@ class MCPResourcesTool:
         try:
             loop = asyncio.get_event_loop()
             if loop.is_running():
-                import threading
                 if action == "list":
                     future = asyncio.run_coroutine_threadsafe(
                         client._send_request("resources/list", {}), loop

package/onecode/agent/tools/permission_handler.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Callable, Optional
 
 from onecode.agent.tools.permissions import PermissionResult

package/onecode/agent/tools/protocol.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Any, Literal, Optional