cade-cli 0.10.0__tar.gz → 0.11.0__tar.gz

{cade_cli-0.10.0 → cade_cli-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cade-cli
-Version: 0.10.0
+Version: 0.11.0
 Summary: Cade - The CLI Agent from Arcade.dev
 Project-URL: Homepage, https://arcade.dev
 Project-URL: Documentation, https://docs.arcade.dev
@@ -45,12 +45,14 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Requires-Dist: agent-library<1.0.0,>=0.12.0
 Requires-Dist: anthropic<1.0.0,>=0.34.0
-Requires-Dist: arcade-core<5.0.0,>=4.1.0
-Requires-Dist: arcade-mcp-server>=1.0.0
-Requires-Dist: arcade-tdk>=2.0.0
+Requires-Dist: arcade-core<5.0.0,>=4.7.0
+Requires-Dist: arcade-mcp-server<2.0.0,>=1.21.0
+Requires-Dist: arcade-tdk<4.0.0,>=3.8.0
+Requires-Dist: arcadepy<2.0.0,>=1.10.0
 Requires-Dist: authlib<2.0.0,>=1.6.0
 Requires-Dist: croniter<4.0.0,>=2.0.0
 Requires-Dist: filelock<4.0.0,>=3.0.0
+Requires-Dist: html2text>=2024.2.26
 Requires-Dist: httpx<1.0.0,>=0.27.0
 Requires-Dist: keyring<26.0,>=24.0
 Requires-Dist: openai<2.0.0,>=1.0.0
@@ -159,7 +161,8 @@ cade --voice                               # speak / hear (voice mode)
 | `/logs` | Recent log entries |
 | `/thread`, `/history` | Current thread info |
 | `/pin`, `/unpin` | Pin reference material into the session |
-| `/task`, `/cron`, `/hooks`, `/channel`, `/notify` | Coordination surfaces |
+| `/tasks`, `/cron`, `/hooks`, `/channels`, `/notify` | Coordination surfaces (mirrored as `cade tasks` / `cade cron` / `cade hooks` / `cade channels`) |
+| `/usage` | Context-window status and token usage |
 | `/cd`, `/pwd`, `/!` | Shell shortcuts |
 | `Ctrl+C` | Exit |
 
@@ -191,7 +194,7 @@ cade mcp authorize my-server                      # OAuth flow (browser)
 cade mcp list / status / test / enable / disable / rm
 ```
 
-User MCP servers register at `~/.cadecoder/mcp_servers.yaml`. Servers with large catalogs are auto-deferred (parameter schemas stripped to keep tool-list bytes down) and fetched on demand via `Local_ToolSchema`.
+User MCP servers register at `~/.cade/config/contexts/<context>.toml [[mcp]]`. Servers with large catalogs are auto-deferred (parameter schemas stripped to keep tool-list bytes down) and fetched on demand via `Local_ToolSchema`.
 
 ---
 
@@ -206,7 +209,7 @@ cade mem add ~/notes                          # index a directory
 cade mem search "auth design"                 # semantic search
 ```
 
-Memory is persona-scoped — each persona has its own `~/.cadecoder/memory/<persona>/.librarian/` index, so a `reviewer` persona's notes never leak into `default`.
+Memory is persona-scoped — each persona has its own `~/.cade/data/contexts/<context>/memory/<persona>/.librarian/` index, so a `reviewer` persona's notes never leak into `default`.
 
 ---
 
@@ -221,7 +224,7 @@ cade serve --install launchd             # macOS LaunchAgent (or --install syste
 cade serve status / stop                 # health, uptime; SIGTERM running daemon
 ```
 
-Config lives at `~/.cadecoder/serve.toml`. Edit and `kill -HUP $(cat ~/.cadecoder/serve.pid)` to reload without restart.
+Config lives at `~/.cade/config/contexts/<context>.toml [serve]`. Edit and `kill -HUP $(cat ~/.cade/run/serve.pid)` to reload without restart.
 
 **Security defaults are fail-closed:** `allowed_senders = []` blocks everyone; tools are default-deny against `[tools].allow` (globs / regex / pipe lists supported); `deny` always wins.
 
@@ -257,7 +260,7 @@ export OPENAI_BASE_URL="http://localhost:11434/v1"
 export OPENAI_API_KEY="ollama"   # any non-empty value
 cade chat --model llama3
 
-# Config — ~/.cadecoder/cadecoder.toml
+# Config — ~/.cade/config/cade.toml
 [model_settings]
 host = "http://localhost:11434/v1"
 api_key = "ollama"
@@ -269,15 +272,15 @@ Skip Arcade Cloud authentication entirely with `--local-only` or `CADE_LOCAL_ONL
 
 ## Configuration
 
-All state lives under `~/.cadecoder/`. Override the location with `CADECODER_HOME=/path/to/alt`.
+All state lives under `~/.cade/`. Override the location with `CADE_HOME=/path/to/alt`.
 
 | File | Purpose |
 |---|---|
-| `cadecoder.toml` | Model / provider / UI settings |
-| `cadecoder_history.db` | Thread + message storage |
-| `cadecoder.log` | Rotating log file |
-| `mcp_servers.yaml` | User MCP server registry |
-| `serve.toml` | `cade serve` daemon config |
+| `config/cade.toml` | Model / provider / UI settings |
+| `data/contexts/<context>/history.db` | Thread + message storage |
+| `logs/cade.log` | Rotating log file |
+| `config/contexts/<context>.toml [[mcp]]` | User MCP server registry |
+| `config/contexts/<context>.toml [serve]` | `cade serve` daemon config |
 | `personas/`, `memory/`, `tasks/`, `channels/` | Persona-scoped state |
 
 Full layout, env vars, and TOML schema in [`docs/configuration.md`](./docs/configuration.md).
@@ -290,7 +293,7 @@ Full layout, env vars, and TOML schema in [`docs/configuration.md`](./docs/confi
 | `OPENAI_BASE_URL` | Custom OpenAI-compatible endpoint |
 | `ARCADE_API_KEY`, `ARCADE_BASE_URL` | Arcade Cloud (alternative to OAuth) |
 | `CADE_LOCAL_ONLY=1` | Skip remote tools entirely |
-| `CADECODER_HOME` | Override config directory |
+| `CADE_HOME` | Override config directory |
 | `CADE_PROJECT_ROOT` | Sandbox `Local_*` filesystem tools to this root |
 
 ---

{cade_cli-0.10.0 → cade_cli-0.11.0}/README.md

@@ -72,7 +72,8 @@ cade --voice                               # speak / hear (voice mode)
 | `/logs` | Recent log entries |
 | `/thread`, `/history` | Current thread info |
 | `/pin`, `/unpin` | Pin reference material into the session |
-| `/task`, `/cron`, `/hooks`, `/channel`, `/notify` | Coordination surfaces |
+| `/tasks`, `/cron`, `/hooks`, `/channels`, `/notify` | Coordination surfaces (mirrored as `cade tasks` / `cade cron` / `cade hooks` / `cade channels`) |
+| `/usage` | Context-window status and token usage |
 | `/cd`, `/pwd`, `/!` | Shell shortcuts |
 | `Ctrl+C` | Exit |
 
@@ -104,7 +105,7 @@ cade mcp authorize my-server                      # OAuth flow (browser)
 cade mcp list / status / test / enable / disable / rm
 ```
 
-User MCP servers register at `~/.cadecoder/mcp_servers.yaml`. Servers with large catalogs are auto-deferred (parameter schemas stripped to keep tool-list bytes down) and fetched on demand via `Local_ToolSchema`.
+User MCP servers register at `~/.cade/config/contexts/<context>.toml [[mcp]]`. Servers with large catalogs are auto-deferred (parameter schemas stripped to keep tool-list bytes down) and fetched on demand via `Local_ToolSchema`.
 
 ---
 
@@ -119,7 +120,7 @@ cade mem add ~/notes                          # index a directory
 cade mem search "auth design"                 # semantic search
 ```
 
-Memory is persona-scoped — each persona has its own `~/.cadecoder/memory/<persona>/.librarian/` index, so a `reviewer` persona's notes never leak into `default`.
+Memory is persona-scoped — each persona has its own `~/.cade/data/contexts/<context>/memory/<persona>/.librarian/` index, so a `reviewer` persona's notes never leak into `default`.
 
 ---
 
@@ -134,7 +135,7 @@ cade serve --install launchd             # macOS LaunchAgent (or --install syste
 cade serve status / stop                 # health, uptime; SIGTERM running daemon
 ```
 
-Config lives at `~/.cadecoder/serve.toml`. Edit and `kill -HUP $(cat ~/.cadecoder/serve.pid)` to reload without restart.
+Config lives at `~/.cade/config/contexts/<context>.toml [serve]`. Edit and `kill -HUP $(cat ~/.cade/run/serve.pid)` to reload without restart.
 
 **Security defaults are fail-closed:** `allowed_senders = []` blocks everyone; tools are default-deny against `[tools].allow` (globs / regex / pipe lists supported); `deny` always wins.
 
@@ -170,7 +171,7 @@ export OPENAI_BASE_URL="http://localhost:11434/v1"
 export OPENAI_API_KEY="ollama"   # any non-empty value
 cade chat --model llama3
 
-# Config — ~/.cadecoder/cadecoder.toml
+# Config — ~/.cade/config/cade.toml
 [model_settings]
 host = "http://localhost:11434/v1"
 api_key = "ollama"
@@ -182,15 +183,15 @@ Skip Arcade Cloud authentication entirely with `--local-only` or `CADE_LOCAL_ONL
 
 ## Configuration
 
-All state lives under `~/.cadecoder/`. Override the location with `CADECODER_HOME=/path/to/alt`.
+All state lives under `~/.cade/`. Override the location with `CADE_HOME=/path/to/alt`.
 
 | File | Purpose |
 |---|---|
-| `cadecoder.toml` | Model / provider / UI settings |
-| `cadecoder_history.db` | Thread + message storage |
-| `cadecoder.log` | Rotating log file |
-| `mcp_servers.yaml` | User MCP server registry |
-| `serve.toml` | `cade serve` daemon config |
+| `config/cade.toml` | Model / provider / UI settings |
+| `data/contexts/<context>/history.db` | Thread + message storage |
+| `logs/cade.log` | Rotating log file |
+| `config/contexts/<context>.toml [[mcp]]` | User MCP server registry |
+| `config/contexts/<context>.toml [serve]` | `cade serve` daemon config |
 | `personas/`, `memory/`, `tasks/`, `channels/` | Persona-scoped state |
 
 Full layout, env vars, and TOML schema in [`docs/configuration.md`](./docs/configuration.md).
@@ -203,7 +204,7 @@ Full layout, env vars, and TOML schema in [`docs/configuration.md`](./docs/confi
 | `OPENAI_BASE_URL` | Custom OpenAI-compatible endpoint |
 | `ARCADE_API_KEY`, `ARCADE_BASE_URL` | Arcade Cloud (alternative to OAuth) |
 | `CADE_LOCAL_ONLY=1` | Skip remote tools entirely |
-| `CADECODER_HOME` | Override config directory |
+| `CADE_HOME` | Override config directory |
 | `CADE_PROJECT_ROOT` | Sandbox `Local_*` filesystem tools to this root |
 
 ---

{cade_cli-0.10.0 → cade_cli-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cade-cli"
-version = "0.10.0"
+version = "0.11.0"
 description = "Cade - The CLI Agent from Arcade.dev"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -31,9 +31,10 @@ dependencies = [
     "openai>=1.0.0,<2.0.0",
     "anthropic>=0.34.0,<1.0.0",
     "ulid==1.1",
-    "arcade-tdk>=2.0.0",
-    "arcade-mcp-server>=1.0.0",
-    "arcade-core>=4.1.0,<5.0.0",
+    "arcade-tdk>=3.8.0,<4.0.0",
+    "arcade-mcp-server>=1.21.0,<2.0.0",
+    "arcade-core>=4.7.0,<5.0.0",
+    "arcadepy>=1.10.0,<2.0.0",
     "authlib>=1.6.0,<2.0.0",
     "pyperclip>=1.8.0,<2.0.0",
     "prompt-toolkit>=3.0.52,<4.0.0",
@@ -45,6 +46,7 @@ dependencies = [
     "croniter>=2.0.0,<4.0.0",
     "python-telegram-bot>=21.0,<22.0",
     "keyring>=24.0,<26.0",
+    "html2text>=2024.2.26",
 ]
 
 [project.urls]

{cade_cli-0.10.0 → cade_cli-0.11.0}/src/cade_mcp_local/__init__.py

@@ -27,12 +27,17 @@ from cade_mcp_local.config import (
 from cade_mcp_local.errors import (
     CommandExecutionError,
     CommandTimeoutError,
+    ContentTooLargeError,
     FileOperationError,
     GitOperationError,
     InvalidInputError,
     PathNotFoundError,
     PathSecurityError,
+    RedirectError,
     SearchError,
+    WebFetchError,
+    WebSearchError,
+    WebTransientError,
 )
 from cade_mcp_local.server import app, create_app
 
@@ -67,6 +72,11 @@ __all__ = [
     "GitOperationError",
     "SearchError",
     "FileOperationError",
+    "WebFetchError",
+    "WebSearchError",
+    "RedirectError",
+    "ContentTooLargeError",
+    "WebTransientError",
 ]
 
 from cadecoder import __version__ as __version__  # noqa: E402

cade_cli-0.11.0/src/cade_mcp_local/_metadata.py

@@ -0,0 +1,84 @@
+"""Reusable :class:`ToolMetadata` builders for Local_* tools.
+
+Local tools run in-process against the user's machine. None of them have a
+``ServiceDomain`` (those describe an external service like Slack or Gmail);
+``open_world`` is therefore ``False`` for everything in this package, and
+the per-tool metadata below only varies on operation/read-only/destructive/
+idempotent.
+
+Web tools (``WebFetch`` / ``WebSearch``) are the exception — they declare
+``ServiceDomain.WEB_SCRAPING`` and ``open_world=True`` inline, since their
+backing data lives on the open internet.
+"""
+
+from arcade_mcp_server.metadata import (
+    Behavior,
+    Classification,
+    Operation,
+    ToolMetadata,
+)
+
+
+def _meta(
+    *,
+    operations: list[Operation],
+    read_only: bool,
+    destructive: bool = False,
+    idempotent: bool = False,
+) -> ToolMetadata:
+    """All Local_* tools share open_world=False and no service_domains."""
+    return ToolMetadata(
+        classification=Classification(service_domains=None),
+        behavior=Behavior(
+            operations=operations,
+            read_only=read_only,
+            destructive=destructive,
+            idempotent=idempotent,
+            open_world=False,
+        ),
+    )
+
+
+READ_META = _meta(operations=[Operation.READ], read_only=True, idempotent=True)
+"""Pure read of local state. Idempotent."""
+
+READ_VOLATILE_META = _meta(operations=[Operation.READ], read_only=True, idempotent=False)
+"""Reads local state that changes under the agent's feet (e.g. compaction backups)."""
+
+CREATE_META = _meta(operations=[Operation.CREATE], read_only=False, idempotent=False)
+"""Creates a new local resource (file, task, snippet, notification)."""
+
+UPDATE_META = _meta(operations=[Operation.UPDATE], read_only=False, idempotent=False)
+"""Modifies an existing local resource."""
+
+CREATE_OR_UPDATE_META = _meta(operations=[Operation.CREATE, Operation.UPDATE], read_only=False)
+"""Upsert-style write that may create or update."""
+
+DELETE_META = _meta(
+    operations=[Operation.DELETE], read_only=False, destructive=True, idempotent=True
+)
+"""Removes a local resource. Destructive."""
+
+OPAQUE_META = ToolMetadata(
+    classification=Classification(service_domains=None),
+    behavior=Behavior(
+        operations=[Operation.OPAQUE],
+        read_only=False,
+        destructive=False,
+        idempotent=False,
+        open_world=False,
+    ),
+    strict=False,  # Bash/Channel can do anything; we keep destructive=False per "best case"
+)
+"""Action depends on runtime inputs (e.g. Bash, Channel multiplexer)."""
+
+
+__all__ = (
+    "CREATE_META",
+    "CREATE_OR_UPDATE_META",
+    "DELETE_META",
+    "OPAQUE_META",
+    "READ_META",
+    "READ_VOLATILE_META",
+    "UPDATE_META",
+)

{cade_cli-0.10.0 → cade_cli-0.11.0}/src/cade_mcp_local/errors.py

@@ -120,3 +120,49 @@ class FileOperationError(FatalToolError):
         self.operation = operation
         self.path = path
         super().__init__(f"Failed to {operation} '{path}': {message}")
+
+
+class WebFetchError(FatalToolError):
+    """Generic non-retriable WebFetch failure (DNS, 4xx, blocked host)."""
+
+    def __init__(self, url: str, message: str):
+        self.url = url
+        super().__init__(f"WebFetch failed for {url}: {message}")
+
+
+class RedirectError(FatalToolError):
+    """Cross-host redirect; the agent should re-fetch the new URL explicitly."""
+
+    def __init__(self, from_url: str, to_url: str):
+        self.from_url = from_url
+        self.to_url = to_url
+        super().__init__(
+            f"Cross-host redirect from {from_url} to {to_url}; re-call WebFetch with the new URL."
+        )
+
+
+class ContentTooLargeError(FatalToolError):
+    """Body exceeded max_bytes."""
+
+    def __init__(self, url: str, limit_bytes: int):
+        self.url = url
+        self.limit_bytes = limit_bytes
+        super().__init__(f"Body for {url} exceeded {limit_bytes} bytes; aborted.")
+
+
+class WebSearchError(FatalToolError):
+    """Backend misconfigured or returned an unparseable response."""
+
+    def __init__(self, backend: str, message: str):
+        self.backend = backend
+        super().__init__(f"WebSearch ({backend}) failed: {message}")
+
+
+class WebTransientError(RetryableToolError):
+    """5xx, network reset, rate-limit. Agent may retry."""
+
+    def __init__(self, url: str, status: int | None, message: str):
+        self.url = url
+        self.status = status
+        detail = f" (HTTP {status})" if status else ""
+        super().__init__(f"Transient web error for {url}{detail}: {message}")

cade_cli-0.11.0/src/cade_mcp_local/resources.py

@@ -0,0 +1,131 @@
+"""MCP resources exposed by the local server.
+
+Two resources today:
+
+- ``cade://server/instructions`` — the same SERVER_INSTRUCTIONS string the
+  server advertises in its initialize handshake, but addressable as a
+  resource so MCP clients can re-read it on demand (skill-style discovery).
+- ``cade://memory/sources`` — a JSON listing of the active persona's
+  ``cade mem`` sources, read from the librarian sources registry.
+
+Persona resolution mirrors ``cade mem``: ``CADE_PERSONA`` env var →
+``"default"``. Context data is supplied by the parent process through
+``CADE_CONTEXT_DATA_DIR``.
+"""
+
+from __future__ import annotations
+
+import json
+import logging
+import os
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from arcade_mcp_server import MCPApp
+
+log = logging.getLogger(__name__)
+
+INSTRUCTIONS_URI = "cade://server/instructions"
+MEMORY_SOURCES_URI = "cade://memory/sources"
+
+
+def _cade_home() -> Path:
+    """Root for Cade's single-home state."""
+    override = os.environ.get("CADE_HOME")
+    if override:
+        return Path(override)
+    return Path.home() / ".cade"
+
+
+def _resolve_persona() -> str:
+    """Return the active persona name. Env var → ``"default"``."""
+    name = (os.environ.get("CADE_PERSONA") or "").strip()
+    return name or "default"
+
+
+def _sources_path(persona: str) -> Path:
+    context_data = os.environ.get("CADE_CONTEXT_DATA_DIR")
+    if context_data:
+        return Path(context_data) / "memory" / persona / ".librarian" / "sources.json"
+    context = os.environ.get("CADE_CONTEXT") or "default"
+    return (
+        _cade_home()
+        / "data"
+        / "contexts"
+        / context
+        / "memory"
+        / persona
+        / ".librarian"
+        / "sources.json"
+    )
+
+
+def _load_memory_sources(persona: str) -> list[dict[str, object]]:
+    """Read ``sources.json`` for ``persona`` and return its list of entries.
+
+    Missing file → empty list (a valid state: persona has no sources yet).
+    Malformed JSON → empty list with a warning; resource read should not
+    crash the server on user-edited config.
+    """
+    path = _sources_path(persona)
+    if not path.exists():
+        return []
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError) as exc:
+        log.warning("failed to read memory sources at %s: %s", path, exc)
+        return []
+    if not isinstance(data, list):
+        log.warning("memory sources at %s is not a JSON list; ignoring", path)
+        return []
+    return [entry for entry in data if isinstance(entry, dict)]
+
+
+def _memory_sources_payload() -> str:
+    """Build the JSON body for the memory-sources resource."""
+    persona = _resolve_persona()
+    sources = _load_memory_sources(persona)
+    payload = {
+        "persona": persona,
+        "sources_path": str(_sources_path(persona)),
+        "count": len(sources),
+        "sources": sources,
+    }
+    return json.dumps(payload, indent=2, default=str)
+
+
+def register_resources(app: MCPApp, instructions: str) -> None:
+    """Register the local server's static + dynamic MCP resources."""
+    app.add_text_resource(
+        INSTRUCTIONS_URI,
+        text=instructions,
+        name="server-instructions",
+        title="Local server instructions",
+        description=(
+            "Guidance on when to reach for Local_* tools (filesystem, shell, "
+            "git, web, tasks, channels, …) versus remote/cloud equivalents. "
+            "Mirrors the server's MCP initialize-time instructions."
+        ),
+        mime_type="text/markdown",
+    )
+
+    app.add_resource(
+        MEMORY_SOURCES_URI,
+        name="memory-sources",
+        title="cade mem sources (active persona)",
+        description=(
+            "JSON listing of memory sources registered for the active persona "
+            "(equivalent to `cade mem list`). Read each call so the listing "
+            "reflects sources added after server start."
+        ),
+        mime_type="application/json",
+        handler=lambda _uri: _memory_sources_payload(),
+    )
+
+
+__all__ = (
+    "INSTRUCTIONS_URI",
+    "MEMORY_SOURCES_URI",
+    "register_resources",
+)

{cade_cli-0.10.0 → cade_cli-0.11.0}/src/cade_mcp_local/server.py

@@ -13,13 +13,12 @@ os.environ.setdefault("LOGURU_LEVEL", "WARNING")
 
 from arcade_mcp_server import MCPApp
 
+from cade_mcp_local.resources import register_resources
 from cade_mcp_local.tools import (
     ask_user_question_tool,
     bash_tool,
-    channel_tool,
     edit_tool,
     git_tool,
-    insert_text_tool,
     list_files_tool,
     pin_context_tool,
     push_notification_tool,
@@ -27,13 +26,13 @@ from cade_mcp_local.tools import (
     retrieve_tool_result_tool,
     search_recent_context_tool,
     search_tool,
-    sleep_tool,
     task_create_tool,
     task_delete_tool,
-    task_get_tool,
     task_list_tool,
     task_update_tool,
     tool_schema_tool,
+    web_fetch_tool,
+    web_search_tool,
     write_file_tool,
 )
 
@@ -47,14 +46,17 @@ is running. Use these tools when you need to:
 - Execute shell commands or bash scripts locally
 - Check git status, diff, log, or branches of the local repository
 - Search compacted context backups stored locally
-- File-backed tasks for durable multi-step work (TaskCreate, TaskList, TaskGet,
+- File-backed tasks for durable multi-step work (TaskCreate, TaskList,
   TaskUpdate, TaskDelete) — the host registers them as Local_* names
-- Cross-session channels (Channel): use action=list when channel names are unknown,
-  then action=recv or action=send with a non-empty name
 - PushNotification to inject a structured notice into the agent context at the next
   tool boundary
 - AskUserQuestion when you need structured clarification from the user (host:
   Local_AskUserQuestion)
+- WebFetch to read an external URL (Firecrawl via Arcade by default, httpx
+  fallback; preapproved hosts return raw markdown, others go through a fast
+  extraction model)
+- WebSearch to find pages on the open web (Arcade-hosted Google Search by
+  default; generic HTTP/JSON backend as a fallback)
 
 Do NOT use these tools for operations on remote systems, cloud resources, or
 external services. For those, use the appropriate remote/cloud tools instead.
@@ -75,14 +77,10 @@ def create_app() -> MCPApp:
     app.add_tool(read_file_tool)
     app.add_tool(write_file_tool)
     app.add_tool(edit_tool)
-    app.add_tool(insert_text_tool)
 
     # Shell tool
     app.add_tool(bash_tool)
 
-    # Sleep tool (async wait, concurrency-safe)
-    app.add_tool(sleep_tool)
-
     # Search tool (consolidated: ripgrep with grep fallback)
     app.add_tool(search_tool)
 
@@ -104,19 +102,22 @@ def create_app() -> MCPApp:
     # Task coordination (file-backed task store)
     app.add_tool(task_create_tool)
     app.add_tool(task_list_tool)
-    app.add_tool(task_get_tool)
     app.add_tool(task_update_tool)
     app.add_tool(task_delete_tool)
 
     # Notifications (inject XML into context at next tool boundary)
     app.add_tool(push_notification_tool)
 
-    # Cross-session channels (send/recv/list)
-    app.add_tool(channel_tool)
-
     # Structured clarification question for the user
     app.add_tool(ask_user_question_tool)
 
+    # Web tools (read external pages, search the open web)
+    app.add_tool(web_fetch_tool)
+    app.add_tool(web_search_tool)
+
+    # MCP resources: server instructions + memory sources for the active persona
+    register_resources(app, SERVER_INSTRUCTIONS)
+
     return app
 
 

{cade_cli-0.10.0 → cade_cli-0.11.0}/src/cade_mcp_local/tools/__init__.py

@@ -5,11 +5,9 @@ is running. Use these tools when you need to read, write, search, or execute
 commands on the same machine as the running cade process.
 """
 
-from cade_mcp_local.tools.channels import channel_tool
 from cade_mcp_local.tools.context import search_recent_context_tool
 from cade_mcp_local.tools.filesystem import (
     edit_tool,
-    insert_text_tool,
     list_files_tool,
     read_file_tool,
     write_file_tool,
@@ -25,15 +23,15 @@ from cade_mcp_local.tools.results import retrieve_tool_result_tool
 from cade_mcp_local.tools.schemas import tool_schema_tool
 from cade_mcp_local.tools.search import search_tool
 from cade_mcp_local.tools.shell import bash_tool
-from cade_mcp_local.tools.sleep import sleep_tool
 from cade_mcp_local.tools.snippets import pin_context_tool
 from cade_mcp_local.tools.tasks import (
     task_create_tool,
     task_delete_tool,
-    task_get_tool,
     task_list_tool,
     task_update_tool,
 )
+from cade_mcp_local.tools.web_fetch import web_fetch_tool
+from cade_mcp_local.tools.web_search import web_search_tool
 
 __all__ = [
     # Filesystem
@@ -41,7 +39,6 @@ __all__ = [
     "read_file_tool",
     "write_file_tool",
     "edit_tool",
-    "insert_text_tool",
     # Git
     "git_tool",
     "get_current_branch_name",
@@ -50,8 +47,6 @@ __all__ = [
     "search_tool",
     # Shell
     "bash_tool",
-    # Sleep
-    "sleep_tool",
     # Context
     "search_recent_context_tool",
     # Pinned context
@@ -63,13 +58,13 @@ __all__ = [
     # Tasks
     "task_create_tool",
     "task_list_tool",
-    "task_get_tool",
     "task_update_tool",
     "task_delete_tool",
     # Notifications
     "push_notification_tool",
     # Interactive
     "ask_user_question_tool",
-    # Channels
-    "channel_tool",
+    # Web
+    "web_fetch_tool",
+    "web_search_tool",
 ]