kash-shell 0.3.23__tar.gz → 0.3.25__tar.gz

{kash_shell-0.3.23 → kash_shell-0.3.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.23
+Version: 0.3.25
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -24,12 +24,14 @@ Requires-Dist: chopdiff>=0.2.3
 Requires-Dist: clideps>=0.1.4
 Requires-Dist: colour>=0.1.5
 Requires-Dist: cssselect>=1.2.0
+Requires-Dist: curl-cffi>=0.11.4
 Requires-Dist: deepgram-sdk>=3.10.1
 Requires-Dist: dunamai>=1.23.0
 Requires-Dist: fastapi>=0.115.11
-Requires-Dist: flowmark>=0.4.6
+Requires-Dist: flowmark>=0.4.8
 Requires-Dist: frontmatter-format>=0.2.1
 Requires-Dist: funlog>=0.2.0
+Requires-Dist: httpx[brotli]>=0.28.1
 Requires-Dist: humanfriendly>=10.0
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: jinja2>=3.1.6
@@ -329,7 +331,7 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
 
 You can use kash from your MCP client (such as Anthropic Desktop or Cursor).
 
-You do this by running the the `kash_mcp` binary to make kash actions available as MCP
+You do this by running the the `kash-mcp` binary to make kash actions available as MCP
 tools.
 
 For Claude Desktop, my config looks like this:
@@ -338,7 +340,7 @@ For Claude Desktop, my config looks like this:
 {
   "mcpServers": {
     "kash": {
-      "command": "/Users/levy/.local/bin/kash_mcp",
+      "command": "/Users/levy/.local/bin/kash-mcp",
       "args": ["--proxy"]
     }
   }

{kash_shell-0.3.23 → kash_shell-0.3.25}/README.md

@@ -255,7 +255,7 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
 
 You can use kash from your MCP client (such as Anthropic Desktop or Cursor).
 
-You do this by running the the `kash_mcp` binary to make kash actions available as MCP
+You do this by running the the `kash-mcp` binary to make kash actions available as MCP
 tools.
 
 For Claude Desktop, my config looks like this:
@@ -264,7 +264,7 @@ For Claude Desktop, my config looks like this:
 {
   "mcpServers": {
     "kash": {
-      "command": "/Users/levy/.local/bin/kash_mcp",
+      "command": "/Users/levy/.local/bin/kash-mcp",
       "args": ["--proxy"]
     }
   }

{kash_shell-0.3.23 → kash_shell-0.3.25}/pyproject.toml

@@ -45,7 +45,7 @@ dependencies = [
     "strif>=3.0.1",
     "funlog>=0.2.0",
     "prettyfmt>=0.3.1",
-    "flowmark>=0.4.6",
+    "flowmark>=0.4.8",
     "frontmatter-format>=0.2.1",
     "chopdiff>=0.2.3",
     "clideps>=0.1.4",
@@ -77,6 +77,9 @@ dependencies = [
     "pathspec>=0.12.1",
     "patch-ng>=1.18.1",
     "inquirerpy>=0.3.4",
+    # HTTP clients:
+    "httpx[brotli]>=0.28.1", # Include brotli for better compression and browser fingerprint.
+    "curl-cffi>=0.11.4",
     # LLM and API essentials:
     "tiktoken>=0.9.0",
     "openai>=1.66.3",

kash_shell-0.3.25/src/kash/actions/core/combine_docs.py

@@ -0,0 +1,52 @@
+from chopdiff.html.html_in_md import div_wrapper
+
+from kash.config.logger import get_logger
+from kash.exec import kash_action
+from kash.model import ONE_OR_MORE_ARGS, ActionInput, ActionResult, Param
+from kash.utils.errors import InvalidInput
+
+log = get_logger(__name__)
+
+
+@kash_action(
+    expected_args=ONE_OR_MORE_ARGS,
+    params=(
+        Param(
+            "class_name",
+            "CSS class name to use for wrapping each document in a div.",
+            type=str,
+            default_value="doc",
+        ),
+    ),
+)
+def combine_docs(input: ActionInput, class_name: str = "page") -> ActionResult:
+    """
+    Combine multiple text items into a single document, wrapping each piece
+    in a div with the specified CSS class.
+    """
+    items = input.items
+
+    if not items:
+        raise InvalidInput("No items provided for combination")
+
+    # Create wrapper function
+    wrapper = div_wrapper(class_name=class_name)
+
+    # Collect and wrap all bodies
+    wrapped_bodies = []
+    for item in items:
+        if not item.body:
+            raise InvalidInput(f"Item has no body: {item.store_path}")
+        wrapped_bodies.append(wrapper(item.body))
+
+    # Concatenate with double newlines
+    combined_body = "\n\n".join(wrapped_bodies)
+
+    # Create title
+    count = len(items)
+    title = f"Combined ({count} doc{'s' if count != 1 else ''})"
+
+    # Create result item based on first item
+    result_item = items[0].derived_copy(body=combined_body, title=title, original_filename=None)
+
+    return ActionResult([result_item])

kash_shell-0.3.25/src/kash/actions/core/concat_docs.py

@@ -0,0 +1,47 @@
+from kash.config.logger import get_logger
+from kash.exec import kash_action
+from kash.model import ONE_OR_MORE_ARGS, ActionInput, ActionResult, Param
+from kash.utils.errors import InvalidInput
+
+log = get_logger(__name__)
+
+
+@kash_action(
+    expected_args=ONE_OR_MORE_ARGS,
+    params=(
+        Param(
+            "separator",
+            "String to use between concatenated items.",
+            type=str,
+            default_value="\n\n",
+        ),
+    ),
+)
+def concat_docs(input: ActionInput, separator: str = "\n\n") -> ActionResult:
+    """
+    Concatenate multiple text items into a single document with the specified
+    separator between each piece.
+    """
+    items = input.items
+
+    if not items:
+        raise InvalidInput("No items provided for concatenation")
+
+    # Collect all bodies
+    bodies = []
+    for item in items:
+        if not item.body:
+            raise InvalidInput(f"Item has no body: {item.store_path}")
+        bodies.append(item.body)
+
+    # Concatenate with the specified separator
+    concat_body = separator.join(bodies)
+
+    # Create title
+    count = len(items)
+    title = f"Concat ({count} doc{'s' if count != 1 else ''})"
+
+    # Create result item based on first item
+    result_item = items[0].derived_copy(body=concat_body, title=title, original_filename=None)
+
+    return ActionResult([result_item])

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/commands/workspace/workspace_commands.py

@@ -474,8 +474,8 @@ def fetch_url(*files_or_urls: str, refetch: bool = False) -> ShellResult:
     store_paths = []
     for locator in locators:
         try:
-            fetched_item = fetch_url_item(locator, refetch=refetch)
-            store_paths.append(fetched_item.store_path)
+            fetch_result = fetch_url_item(locator, refetch=refetch)
+            store_paths.append(fetch_result.item.store_path)
         except InvalidInput as e:
             log.warning(
                 "Not a URL or URL resource, will not fetch metadata: %s: %s", fmt_loc(locator), e

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/config/logger.py

@@ -254,9 +254,10 @@ def _do_logging_setup(log_settings: LogSettings):
         _console_handler = basic_stderr_handler(log_settings.log_console_level)
 
     # Manually adjust logging for a few packages, removing previous verbose default handlers.
-
+    # Set root logger to most permissive level so handlers can do the filtering
+    root_level = min(log_settings.log_console_level.value, log_settings.log_file_level.value)
     log_levels = {
-        None: INFO,
+        None: root_level,
         "LiteLLM": INFO,
         "LiteLLM Router": INFO,
         "LiteLLM Proxy": INFO,

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/config/settings.py

@@ -210,6 +210,12 @@ class Settings:
     use_nerd_icons: bool
     """If true, use Nerd Icons in file listings. Requires a compatible font."""
 
+    limit_rps: float
+    """Default rate limit for API calls."""
+
+    limit_concurrency: int
+    """Default concurrency limit for API calls."""
+
 
 ws_root_dir = Path("~/Kash").expanduser()
 
@@ -276,6 +282,8 @@ def _read_settings():
         mcp_server_port=DEFAULT_MCP_SERVER_PORT,
         use_kerm_codes=False,
         use_nerd_icons=True,
+        limit_rps=5.0,
+        limit_concurrency=10,
     )
 
 

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/docs/markdown/topics/a2_installation.md

@@ -124,7 +124,7 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
 
 You can use kash from your MCP client (such as Anthropic Desktop or Cursor).
 
-You do this by running the the `kash_mcp` binary to make kash actions available as MCP
+You do this by running the the `kash-mcp` binary to make kash actions available as MCP
 tools.
 
 For Claude Desktop, my config looks like this:
@@ -133,7 +133,7 @@ For Claude Desktop, my config looks like this:
 {
   "mcpServers": {
     "kash": {
-      "command": "/Users/levy/.local/bin/kash_mcp",
+      "command": "/Users/levy/.local/bin/kash-mcp",
       "args": ["--proxy"]
     }
   }

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/embeddings/embeddings.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import ast
 from collections.abc import Iterable
 from pathlib import Path
-from typing import TYPE_CHECKING, TypeAlias, cast
+from typing import TYPE_CHECKING, TypeAlias
 
 from pydantic.dataclasses import dataclass
 from strif import abbrev_list
@@ -65,12 +65,11 @@ class Embeddings:
     @classmethod
     def embed(cls, keyvals: list[KeyVal], model=DEFAULT_EMBEDDING_MODEL) -> Embeddings:
         from litellm import embedding
-        from litellm.types.utils import EmbeddingResponse
 
         init_litellm()
 
         data = {}
-        log.message(
+        log.info(
             "Embedding %d texts (model %s, batch size %s)…",
             len(keyvals),
             model.litellm_name,
@@ -82,9 +81,8 @@ class Embeddings:
             keys = [kv[0] for kv in batch]
             texts = [kv[1] for kv in batch]
 
-            response: EmbeddingResponse = cast(
-                EmbeddingResponse, embedding(model=model.litellm_name, input=texts)
-            )
+            response = embedding(model=model.litellm_name, input=texts)
+
             if not response.data:
                 raise ValueError("No embedding response data")
 

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/embeddings/text_similarity.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from funlog import log_calls
 
@@ -24,12 +24,9 @@ def cosine_relatedness(x: ArrayLike, y: ArrayLike) -> float:
 def embed_query(model: EmbeddingModel, query: str) -> EmbeddingResponse:
     import litellm
     from litellm import embedding
-    from litellm.types.utils import EmbeddingResponse
 
     try:
-        response: EmbeddingResponse = cast(
-            EmbeddingResponse, embedding(model=model.litellm_name, input=[query])
-        )
+        response = embedding(model=model.litellm_name, input=[query])
     except litellm.exceptions.APIError as e:
         log.info("API error embedding query: %s", e)
         raise ApiResultError(str(e))

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/exec/action_exec.py

@@ -55,7 +55,7 @@ def prepare_action_input(*input_args: CommandArg, refetch: bool = False) -> Acti
     if input_items:
         log.message("Assembling metadata for input items:\n%s", fmt_lines(input_items))
         input_items = [
-            fetch_url_item_content(item, refetch=refetch) if is_url_resource(item) else item
+            fetch_url_item_content(item, refetch=refetch).item if is_url_resource(item) else item
             for item in input_items
         ]
 

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/exec/fetch_url_items.py

@@ -1,23 +1,42 @@
+from dataclasses import dataclass
+
 from kash.config.logger import get_logger
 from kash.exec.preconditions import is_url_resource
-from kash.media_base.media_services import get_media_metadata
 from kash.model.items_model import Item, ItemType
 from kash.model.paths_model import StorePath
 from kash.utils.common.format_utils import fmt_loc
 from kash.utils.common.url import Url, is_url
 from kash.utils.common.url_slice import add_slice_to_url, parse_url_slice
 from kash.utils.errors import InvalidInput
+from kash.web_content.web_page_model import WebPageData
 
 log = get_logger(__name__)
 
 
+@dataclass(frozen=True)
+class FetchItemResult:
+    """
+    Result of fetching a URL item.
+    """
+
+    item: Item
+
+    was_cached: bool
+    """Whether this item was already present in cache (or if we skipped the fetch
+    because we already had the data)."""
+
+    page_data: WebPageData | None = None
+    """If the item was fetched from a URL via the web content cache,
+    this will hold additional metadata whether it was cached."""
+
+
 def fetch_url_item(
     locator: Url | StorePath,
     *,
     save_content: bool = True,
     refetch: bool = False,
     cache: bool = True,
-) -> Item:
+) -> FetchItemResult:
     from kash.workspaces import current_ws
 
     ws = current_ws()
@@ -37,7 +56,7 @@ def fetch_url_item(
 
 def fetch_url_item_content(
     item: Item, *, save_content: bool = True, refetch: bool = False, cache: bool = True
-) -> Item:
+) -> FetchItemResult:
     """
     Fetch content and metadata for a URL using a media service if we
     recognize the URL as a known media service. Otherwise, fetch and extract the
@@ -51,6 +70,7 @@ def fetch_url_item_content(
     The content item is returned if content was saved. Otherwise, the updated
     URL item is returned.
     """
+    from kash.media_base.media_services import get_media_metadata
     from kash.web_content.canon_url import canonicalize_url
     from kash.web_content.web_extract import fetch_page_content
     from kash.workspaces import current_ws
@@ -61,7 +81,7 @@ def fetch_url_item_content(
             "Already have title, description, and body, will not fetch: %s",
             item.fmt_loc(),
         )
-        return item
+        return FetchItemResult(item, was_cached=True)
 
     if not item.url:
         raise InvalidInput(f"No URL for item: {item.fmt_loc()}")
@@ -74,6 +94,8 @@ def fetch_url_item_content(
     media_metadata = get_media_metadata(url)
     url_item: Item | None = None
     content_item: Item | None = None
+    page_data: WebPageData | None = None
+
     if media_metadata:
         url_item = Item.from_media_metadata(media_metadata)
         # Preserve and canonicalize any slice suffix on the URL.
@@ -101,7 +123,6 @@ def fetch_url_item_content(
                 original_filename=item.get_filename(),
                 format=page_data.format_info.format,
             )
-            ws.save(content_item)
 
     if not url_item.title:
         log.warning("Failed to fetch page data: title is missing: %s", item.url)
@@ -112,8 +133,15 @@ def fetch_url_item_content(
     if content_item:
         ws.save(content_item)
         assert content_item.store_path
-        log.info("Saved content item: %s", content_item.fmt_loc())
+        log.info(
+            "Saved both URL and content item: %s, %s",
+            url_item.fmt_loc(),
+            content_item.fmt_loc(),
+        )
     else:
-        log.info("Saved URL item: %s", url_item.fmt_loc())
+        log.info("Saved URL item (no content): %s", url_item.fmt_loc())
 
-    return content_item or url_item
+    was_cached = bool(
+        not page_data or (page_data.cache_result and page_data.cache_result.was_cached)
+    )
+    return FetchItemResult(content_item or url_item, was_cached=was_cached, page_data=page_data)

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/help/help_embeddings.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from pathlib import Path
 
+from typing_extensions import override
+
 from kash.config.logger import get_logger
 from kash.embeddings.embeddings import Embeddings
 from kash.embeddings.text_similarity import rank_by_relatedness
@@ -19,6 +21,7 @@ class DocKey:
     doc_type: HelpDocType
     index: int
 
+    @override
     def __str__(self) -> str:
         return f"{self.doc_type.value}:{self.index}"
 

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/llm_utils/llm_completion.py

@@ -107,7 +107,7 @@ def llm_completion(
 
     total_input_len = sum(len(m["content"]) for m in messages)
     speed = len(content) / elapsed
-    log.message(
+    log.info(
         f"{EMOJI_TIMING} LLM completion from {model.litellm_name} in {format_duration(elapsed)}: "
         f"input {total_input_len} chars in {len(messages)} messages, output {len(content)} chars "
         f"({speed:.0f} char/s)"

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/llm_utils/llm_features.py

@@ -68,5 +68,5 @@ preferred_llms: list[LLMName] = [
     LLM.claude_4_opus,
     LLM.claude_3_7_sonnet,
     LLM.claude_3_5_haiku,
-    LLM.gemini_2_5_pro_preview_05_06,
+    LLM.gemini_2_5_pro,
 ]

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/llm_utils/llms.py

@@ -15,6 +15,7 @@ class LLM(LLMName, Enum):
     # https://platform.openai.com/docs/models
     o4_mini = LLMName("o4-mini")
     o3 = LLMName("o3")
+    o3_pro = LLMName("o3-pro")
     o3_mini = LLMName("o3-mini")
     o1 = LLMName("o1")
     o1_mini = LLMName("o1-mini")
@@ -35,13 +36,9 @@ class LLM(LLMName, Enum):
     claude_3_5_haiku = LLMName("claude-3-5-haiku-latest")
 
     # https://ai.google.dev/gemini-api/docs/models
-    gemini_2_5_pro_preview_06_05 = LLMName("gemini/gemini-2.5-pro-preview-06-05")
-    gemini_2_5_pro_preview_05_06 = LLMName("gemini/gemini-2.5-pro-preview-05-06")
-    gemini_2_5_pro_preview_03_25 = LLMName("gemini/gemini-2.5-pro-preview-03-25")
-    gemini_2_5_flash_preview = LLMName("gemini-2.5-flash-preview-05-20")
-    gemini_2_0_flash = LLMName("gemini/gemini-2_0-flash")
-    gemini_2_0_flash_lite = LLMName("gemini/gemini-2.0-flash-lite")
-    gemini_2_0_pro_exp_02_05 = LLMName("gemini/gemini-2.0-pro-exp-02-05")
+    gemini_2_5_pro = LLMName("gemini/gemini-2.5-pro")
+    gemini_2_5_flash = LLMName("gemini/gemini-2.5-flash")
+    gemini_2_5_flash_lite = LLMName("gemini-2.5-flash-lite-preview-06-17")
 
     # https://docs.x.ai/docs/models
     xai_grok_3 = LLMName("xai/grok-3")
@@ -56,6 +53,7 @@ class LLM(LLMName, Enum):
     deepseek_reasoner = LLMName("deepseek/deepseek-reasoner")
 
     # https://console.groq.com/docs/models
+    groq_gemma2_9b_it = LLMName("groq/gemma2-9b-it")
     groq_llama_3_1_8b_instant = LLMName("groq/llama-3.1-8b-instant")
     groq_llama_3_3_70b_versatile = LLMName("groq/llama-3.3-70b-versatile")
     groq_deepseek_r1_distill_llama_70b = LLMName("groq/deepseek-r1-distill-llama-70b")

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/mcp/mcp_cli.py

@@ -114,10 +114,10 @@ def main():
     args = build_parser().parse_args()
 
     if args.list_tools or args.tool_help:
-        kash_setup(rich_logging=True, level=LogLevel.warning)
+        kash_setup(rich_logging=True, log_level=LogLevel.warning)
         show_tool_info(args.tool_help)
     else:
-        kash_setup(rich_logging=False, level=LogLevel.info)
+        kash_setup(rich_logging=False, log_level=LogLevel.info)
         run_server(args)
 
 

{kash_shell-0.3.23 → kash_shell-0.3.25}/src/kash/model/params_model.py

@@ -209,7 +209,7 @@ A list of parameter declarations, possibly with default values.
 DEFAULT_CAREFUL_LLM = LLM.o3
 DEFAULT_STRUCTURED_LLM = LLM.gpt_4o
 DEFAULT_STANDARD_LLM = LLM.claude_4_sonnet
-DEFAULT_FAST_LLM = LLM.o1_mini
+DEFAULT_FAST_LLM = LLM.gpt_4o
 
 
 # Parameters set globally such as in the workspace.