kash-shell 0.3.6__tar.gz → 0.3.7__tar.gz

{kash_shell-0.3.6 → kash_shell-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.6
+Version: 0.3.7
 Summary: The knowledge agent shell
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>

{kash_shell-0.3.6 → kash_shell-0.3.7}/src/kash/config/settings.py

@@ -81,7 +81,7 @@ CONTENT_CACHE_NAME = "content"
 # https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=444
 # https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=447
 
-MCP_SERVER_PORT = 4440
+DEFAULT_MCP_SERVER_PORT = 4440
 
 LOCAL_SERVER_PORT_START = 4470
 LOCAL_SERVER_PORTS_MAX = 30
@@ -216,7 +216,7 @@ _settings = AtomicVar(
         local_server_ports_start=LOCAL_SERVER_PORT_START,
         local_server_ports_max=LOCAL_SERVER_PORTS_MAX,
         local_server_port=0,
-        mcp_server_port=MCP_SERVER_PORT,
+        mcp_server_port=DEFAULT_MCP_SERVER_PORT,
         use_kerm_codes=False,
         use_nerd_icons=True,
     )

{kash_shell-0.3.6 → kash_shell-0.3.7}/src/kash/mcp/mcp_cli.py

@@ -10,7 +10,7 @@ import os
 from pathlib import Path
 
 from kash.config.logger_basic import basic_logging_setup
-from kash.config.settings import GLOBAL_LOGS_DIR, MCP_SERVER_PORT, LogLevel
+from kash.config.settings import DEFAULT_MCP_SERVER_PORT, GLOBAL_LOGS_DIR, LogLevel
 from kash.config.setup import setup
 from kash.mcp.mcp_main import McpMode, run_mcp_server
 from kash.mcp.mcp_server_sse import MCP_LOG_PREFIX
@@ -20,7 +20,7 @@ from kash.workspaces.workspaces import Workspace, get_ws, global_ws_dir
 
 __version__ = get_version()
 
-DEFAULT_PROXY_URL = f"http://localhost:{MCP_SERVER_PORT}/sse"
+DEFAULT_PROXY_URL = f"http://localhost:{DEFAULT_MCP_SERVER_PORT}/sse"
 
 LOG_PATH = GLOBAL_LOGS_DIR / f"{MCP_LOG_PREFIX}_cli.log"
 
@@ -29,7 +29,7 @@ basic_logging_setup(LOG_PATH, LogLevel.info)
 log = logging.getLogger()
 
 
-def parse_args():
+def build_parser():
     parser = argparse.ArgumentParser(description=__doc__, formatter_class=WrappedColorFormatter)
     parser.add_argument(
         "--version",
@@ -55,11 +55,11 @@ def parse_args():
         ),
     )
     parser.add_argument("--sse", action="store_true", help="Run in SSE standalone mode")
-    return parser.parse_args()
+    return parser
 
 
 def main():
-    args = parse_args()
+    args = build_parser().parse_args()
 
     base_dir = Path(args.workspace)
 

{kash_shell-0.3.6 → kash_shell-0.3.7}/src/kash/mcp/mcp_main.py

@@ -1,8 +1,7 @@
 import asyncio
-from enum import Enum
 import logging
 import time
-from typing import Literal
+from enum import Enum
 
 import anyio
 import httpcore
@@ -52,7 +51,7 @@ def run_as_proxy(proxy_to_url: str, timeout_secs: int = 300):
     log.error("Failed to connect. Giving up.")
 
 
-def run_mcp_server(mcp_mode: McpMode, proxy_to: str | None):
+def run_mcp_server(mcp_mode: McpMode, proxy_to: str | None, tool_names: list[str] | None = None):
     """
     Run an MCP server in one of the given modes.
     """
@@ -66,7 +65,7 @@ def run_mcp_server(mcp_mode: McpMode, proxy_to: str | None):
         # dynamic publishing of tools.
         log.warning("Running MCP server standalone, starting up...")
         kash_reload_all()
-        publish_mcp_tools()
+        publish_mcp_tools(tool_names)
         log.warning("Loaded kash, now running MCP server server (%s)", mcp_mode)
         if mcp_mode == McpMode.standalone_stdio:
             run_mcp_server_stdio()

{kash_shell-0.3.6 → kash_shell-0.3.7}/src/kash/mcp/mcp_server_routes.py

@@ -30,7 +30,7 @@ _mcp_published_actions: AtomicVar[list[str]] = AtomicVar([])
 def publish_mcp_tools(action_names: list[str] | None = None) -> None:
     """
     Add actions to the list of published MCP tools.
-    By default, all actions are published.
+    By default, all actions marked as MCP tools are published.
     """
     global _mcp_published_actions
     if action_names is None:

{kash_shell-0.3.6 → kash_shell-0.3.7}/src/kash/mcp/mcp_server_sse.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 
 from kash.config.logger import get_logger
 from kash.config.server_config import create_server_config
-from kash.config.settings import MCP_SERVER_PORT, server_log_file_path
+from kash.config.settings import global_settings, server_log_file_path
 from kash.mcp import mcp_server_routes
 from kash.utils.errors import InvalidState
 
@@ -63,7 +63,7 @@ class MCPServerSSE:
         # in the correct event loop when needed
         AppStatus.should_exit_event = None
 
-        port = MCP_SERVER_PORT
+        port = global_settings().mcp_server_port
         self.log_path = server_log_file_path(MCP_SERVER_NAME, port)
         config = create_server_config(
             self.app, MCP_SERVER_HOST, port, MCP_SERVER_NAME, self.log_path