kash-shell 0.3.34__tar.gz → 0.3.36__tar.gz

{kash_shell-0.3.34 → kash_shell-0.3.36}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier. Do not edit manually.
-_commit: v0.2.14
+_commit: v0.2.19
 _src_path: gh:jlevy/simple-modern-uv
 package_author_email: joshua@cal.berkeley.edu
 package_author_name: Joshua Levy

{kash_shell-0.3.34 → kash_shell-0.3.36}/.cursor/rules/general.mdc

@@ -7,7 +7,7 @@ alwaysApply: true
 
 **Your fundamental responsibility:** Remember you are a senior engineer and have a
 serious responsibility to be clear, factual, think step by step and be systematic,
-express expert opinion, and make use of the user's attention wisely.
+express expert opinion, and make use of the user’s attention wisely.
 
 **Rules must be followed:** It is your responsibility to carefully read these rules as
 well as Python or other language-specific rules included here.
@@ -22,19 +22,19 @@ Therefore:
   confirmation.
 
 - If you can think of a much better approach that the user requests, be sure to mention
-  it. It's your responsibility to suggest approaches that lead to better, simpler
+  it. It’s your responsibility to suggest approaches that lead to better, simpler
   solutions.
 
-- Give thoughtful opinions on better/worse approaches, but NEVER say "great idea!"
-  or "good job" or other compliments, encouragement, or non-essential banter.
+- Give thoughtful opinions on better/worse approaches, but NEVER say “great idea!”
+  or “good job” or other compliments, encouragement, or non-essential banter.
   Your job is to give expert opinions and to solve problems, not to motivate the user.
 
 - Avoid gratuitous enthusiasm or generalizations.
-  Use thoughtful comparisons like saying which code is "cleaner" but don't congratulate
+  Use thoughtful comparisons like saying which code is “cleaner” but don’t congratulate
   yourself. Avoid subjective descriptions.
-  For example, don't say "I've meticulously improved the code and it is in great shape!"
+  For example, don’t say “I’ve meticulously improved the code and it is in great shape!”
   That is useless generalization.
-  Instead, specifically say what you've done, e.g., "I've added types, including
+  Instead, specifically say what you’ve done, e.g., "I’ve added types, including
   generics, to all the methods in `Foo` and fixed all linter errors."
 
 # General Coding Guidelines
@@ -49,17 +49,17 @@ Therefore:
 - DO NOT repeat in comments what is obvious from the names of functions or variables or
   types.
 
-- DO NOT include comments that reflect what you did, such as "Added this function" as
+- DO NOT include comments that reflect what you did, such as “Added this function” as
   this is meaningless to anyone reading the code later.
   (Instead, describe in your message to the user any other contextual information.)
 
-- DO NOT use fancy or needlessly decorated headings like "===== MIGRATION TOOLS ====="
+- DO NOT use fancy or needlessly decorated headings like “===== MIGRATION TOOLS =====”
   in comments
 
 - DO NOT number steps in comments.
   These are hard to maintain if the code changes.
-  NEVER DO THIS: "// Step 3: Fetch the data from the cache"\
-  This is fine: "// Now fetch the data from the cache"
+  NEVER DO THIS: “// Step 3: Fetch the data from the cache”\
+  This is fine: “// Now fetch the data from the cache”
 
 - DO NOT use emojis or special unicode characters like ① or • or – or — in comments.
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/.cursor/rules/python.mdc

@@ -87,7 +87,7 @@ Always use full type annotations, generics, and other modern practices.
 - Use pathlib `Path` instead of strings.
   Use `Path(filename).read_text()` instead of two-line `with open(...)` blocks.
 
-- Use strif's `atomic_output_file` context manager when writing files to ensure output
+- Use strif’s `atomic_output_file` context manager when writing files to ensure output
   files are written atomically.
 
 ## Use Modern Python Practices
@@ -112,7 +112,7 @@ Always use full type annotations, generics, and other modern practices.
 
 - You can run such individual tests with `uv run pytest -s src/.../path/to/test`
 
-- Don't add docs to assertions unless it's not obvious what they're checking - the
+- Don’t add docs to assertions unless it’s not obvious what they’re checking - the
   assertion appears in the stack trace.
   Do NOT write `assert x == 5, "x should be 5"`. Do NOT write `assert x == 5 # Check if
   x is 5`. That is redundant.
@@ -122,7 +122,7 @@ Always use full type annotations, generics, and other modern practices.
   assertions that confirm the value of a constant setting.
 
 - NEVER write `assert False`. If a test reaches an unexpected branch and must fail
-  explicitly, `raise AssertionError("Explanation")` instead.
+  explicitly, `raise AssertionError("Some explanation")` instead.
   This is best typical best practice in Python since assertions can be removed with
   optimization.
 
@@ -132,6 +132,21 @@ Always use full type annotations, generics, and other modern practices.
   This is also preferable because then simple tests have no explicit pytest dependencies
   and can be placed in code anywhere.
 
+- DO NOT write trivial tests that test something we know already works, like
+  instantiating a Pydantic object.
+
+  ```python
+  class Link(BaseModel):
+    url: str
+    title: str = None
+  
+  # DO NOT write tests like this. They are trivial and only create clutter!
+  def test_link_model():
+    link = Link(url="https://example.com", title="Example")
+    assert link.url == "https://example.com"
+    assert link.title == "Example"
+  ```
+
 ## Types and Type Annotations
 
 - Use modern union syntax: `str | None` instead of `Optional[str]`, `dict[str]` instead
@@ -142,7 +157,7 @@ Always use full type annotations, generics, and other modern practices.
 - Use modern enums like `StrEnum` if appropriate.
 
 - One exception to common practice on enums: If an enum has many values that are
-  strings, and they have a literal value as a string (like in a JSON protocol), it's
+  strings, and they have a literal value as a string (like in a JSON protocol), it’s
   fine to use lower_snake_case for enum values to match the actual value.
   This is more readable than LONG_ALL_CAPS_VALUES, and you can simply set the value to
   be the same as the name for each.
@@ -228,7 +243,7 @@ Always use full type annotations, generics, and other modern practices.
 - For classes with many methods, use a concise docstring on the class that explains all
   the common information, and avoid repeating the same information on every method.
 
-- Docstrings should provide context or as concisely as possible explain "why", not
+- Docstrings should provide context or as concisely as possible explain “why”, not
   obvious details evident from the class names, function names, parameter names, and
   type annotations.
 
@@ -240,10 +255,10 @@ Always use full type annotations, generics, and other modern practices.
   name, variable name, or types.
   That is silly and obvious and makes the code longer for no reason.
 
-- Do NOT list args and return values if they're obvious.
+- Do NOT list args and return values if they’re obvious.
   In the above examples, you do not need and `Arguments:` or `Returns:` section, since
-  their meaning as obvious from context.
-  do list these if there are many arguments and their meaning isn't clear.
+  sections as it is obvious from context.
+  do list these if there are many arguments and their meaning isn’t clear.
   If it returns a less obvious type like a tuple, do explain in the pydoc.
 
 - Exported/public variables, functions, or methods SHOULD have concise docstrings.

{kash_shell-0.3.34 → kash_shell-0.3.36}/.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
         uses: astral-sh/setup-uv@v5
         with:
           # Update this as needed:
-          version: "0.7.13"
+          version: "0.9.5"
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/.github/workflows/publish.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install uv (official Astral action)
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.7.13"
+          version: "0.9.5"
           enable-cache: true
           python-version: "3.12"
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.34
+Version: 0.3.36
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -72,6 +72,7 @@ Requires-Dist: thefuzz>=0.22.1
 Requires-Dist: tiktoken>=0.9.0
 Requires-Dist: tldr>=3.3.0
 Requires-Dist: tminify>=0.1.6
+Requires-Dist: truststore>=0.10.4
 Requires-Dist: typing-extensions>=4.12.2
 Requires-Dist: uvicorn>=0.34.0
 Requires-Dist: xonsh>=0.19.3

{kash_shell-0.3.34 → kash_shell-0.3.36}/pyproject.toml

@@ -82,9 +82,10 @@ dependencies = [
     # HTTP clients:
     "httpx[brotli]>=0.28.1", # Include brotli for better compression and browser fingerprint.
     "curl-cffi>=0.11.4",
+    "truststore>=0.10.4",
     # LLM and API essentials:
     "tiktoken>=0.9.0",
-    "openai==1.99.9",  # FIXME: Pinning for now due to import errors (ImportError: cannot import name 'ResponseTextConfig' from 'openai.types.responses.response')   
+    "openai==1.99.9", # FIXME: Pinning for now due to import errors (ImportError: cannot import name 'ResponseTextConfig' from 'openai.types.responses.response')
     "litellm>=1.74.15.post1",
     "pyrate-limiter>=3.7.0",
     "aiolimiter>=1.2.1",

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/config/env_settings.py

@@ -22,9 +22,6 @@ class KashEnv(EnvEnum):
     KASH_SYSTEM_CACHE_DIR = "KASH_SYSTEM_CACHE_DIR"
     """The directory for system cache (caches separate from workspace caches)."""
 
-    KASH_MCP_WS = "KASH_MCP_WS"
-    """The directory for the workspace for MCP servers."""
-
     KASH_SHOW_TRACEBACK = "KASH_SHOW_TRACEBACK"
     """Whether to show tracebacks on actions and commands in the shell."""
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/config/logger.py

@@ -281,6 +281,8 @@ def _do_logging_setup(log_settings: LogSettings):
 def prefix(line: str, emoji: str = "", warn_emoji: str = "") -> str:
     prefix = task_stack_prefix_str()
     emojis = f"{warn_emoji}{emoji}".strip()
+    if emojis:
+        emojis += " "
     return "".join(filter(None, [prefix, emojis, line]))
 
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/config/logger_basic.py

@@ -19,7 +19,16 @@ class SuppressedWarningsStreamHandler(logging.StreamHandler):
 def basic_file_handler(path: Path, level: LogLevel | LogLevelStr) -> logging.FileHandler:
     handler = logging.FileHandler(path)
     handler.setLevel(LogLevel.parse(level).value)
-    handler.setFormatter(Formatter("%(asctime)s %(levelname).1s %(name)s - %(message)s"))
+
+    class ThreadIdFormatter(Formatter):
+        def format(self, record):
+            # Add shortened thread ID as an attribute
+            record.thread_short = str(record.thread)[-5:]
+            return super().format(record)
+
+    handler.setFormatter(
+        ThreadIdFormatter("%(asctime)s %(levelname).1s [T%(thread_short)s] %(name)s - %(message)s")
+    )
     return handler
 
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/config/settings.py

@@ -166,9 +166,6 @@ class Settings:
     system_cache_dir: Path
     """Default global and system cache directory (for global media, content, etc)."""
 
-    mcp_ws_dir: Path | None
-    """The directory for the MCP workspace, if set."""
-
     local_server_log_path: Path
     """The path to the local server log."""
 
@@ -245,14 +242,6 @@ def _get_system_cache_dir() -> Path:
     return KashEnv.KASH_SYSTEM_CACHE_DIR.read_path(default=_get_ws_root_dir() / "cache")
 
 
-def _get_mcp_ws_dir() -> Path | None:
-    mcp_dir = KashEnv.KASH_MCP_WS.read_str(default=None)
-    if mcp_dir:
-        return Path(mcp_dir).expanduser().resolve()
-    else:
-        return None
-
-
 @cache
 def _get_local_server_log_path() -> Path:
     return resolve_and_create_dirs(get_system_logs_dir() / f"{LOCAL_SERVER_LOG_NAME}.log")
@@ -266,7 +255,6 @@ def _read_settings():
         system_config_dir=_get_system_config_dir(),
         system_logs_dir=get_system_logs_dir(),
         system_cache_dir=_get_system_cache_dir(),
-        mcp_ws_dir=_get_mcp_ws_dir(),
         local_server_log_path=_get_local_server_log_path(),
         # These default to the global but can be overridden by workspace settings.
         media_cache_dir=_get_system_cache_dir() / MEDIA_CACHE_NAME,

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/config/setup.py

@@ -75,6 +75,21 @@ def kash_setup(
 
 
 def _lib_setup():
+    import logging
+
+    log = logging.getLogger(__name__)
+
+    # Trust store integration, for consistent TLS behavior.
+    try:
+        import truststore  # type: ignore
+
+        truststore.inject_into_ssl()
+        log.info("truststore initialized: using system TLS trust store")
+    except Exception as exc:
+        # If not installed or fails, default TLS trust will be used.
+        log.warning("truststore not available at import time: %s", exc)
+
+    # Handle default YAML representers.
     from sidematter_format import register_default_yaml_representers
 
     register_default_yaml_representers()

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/config/text_styles.py

@@ -262,7 +262,7 @@ PROMPT_ASSIST = "(assistant) ❯"
 
 EMOJI_HINT = "👉"
 
-EMOJI_MSG_INDENT = "⋮   "
+EMOJI_MSG_INDENT = "⋮ "
 
 EMOJI_START = "[➤]"
 

kash_shell-0.3.36/src/kash/config/warm_slow_imports.py

@@ -0,0 +1,60 @@
+from funlog import log_calls
+
+from kash.config.logger import get_logger
+from kash.utils.common.import_utils import warm_import_library
+
+log = get_logger(__name__)
+
+
+@log_calls(level="info", show_timing_only=True)
+def warm_slow_imports(include_extras: bool = True):
+    """
+    Pre-import slow packages to avoid delays when they are first used.
+
+    Args:
+        include_extras: If True, warm import optional libraries like LLM packages,
+                        scipy, torch, etc. Set to False for minimal/faster startup.
+    """
+    try:
+        # Loading actions also loads any kits that are discovered.
+        import kash.actions  # noqa: F401
+        import kash.local_server  # noqa: F401
+        import kash.local_server.local_server  # noqa: F401
+        import kash.mcp.mcp_server_sse  # noqa: F401
+
+        # Core libraries that should usually be present
+        for lib_name, max_depth in [("xonsh", 3), ("uvicorn", 3)]:
+            try:
+                warm_import_library(lib_name, max_depth=max_depth)
+            except Exception as e:
+                log.debug(f"Could not warm import {lib_name}: {e}")
+
+        if include_extras:
+            # Fully warm import larger libraries (only if they're installed)
+            # These are optional dependencies that may not be present
+            optional_libraries = [
+                ("pydantic", 5),
+                ("litellm", 5),
+                ("openai", 5),
+                ("torch", 3),  # torch is huge, limit depth
+                ("scipy", 3),  # scipy has test modules we want to skip
+                ("marker", 4),
+                ("pandas", 3),
+            ]
+
+            for lib_name, max_depth in optional_libraries:
+                try:
+                    warm_import_library(lib_name, max_depth=max_depth)
+                except Exception as e:
+                    log.debug(f"Could not warm import {lib_name}: {e}")
+
+            # Initialize litellm configuration if available
+            try:
+                from kash.llm_utils.init_litellm import init_litellm
+
+                init_litellm()
+            except ImportError:
+                pass  # litellm not installed
+
+    except ImportError as e:
+        log.warning(f"Error pre-importing packages: {e}")

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/exec/action_decorators.py

@@ -204,7 +204,7 @@ def kash_action(
     precondition: Precondition = Precondition.always,
     arg_type: ArgType = ArgType.Locator,
     expected_args: ArgCount = ONE_ARG,
-    output_type: ItemType = ItemType.doc,
+    output_type: ItemType | None = None,
     output_format: Format | None = None,
     expected_outputs: ArgCount = ONE_ARG,
     params: ParamDeclarations = (),
@@ -349,7 +349,7 @@ def kash_action(
                         fmt_lines(self.params),
                     )
                     log.info(
-                        "Action function param values:\n%s",
+                        "Action function param values: %s",
                         self.param_value_summary_str(),
                     )
                 else:

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/exec/action_exec.py

@@ -107,7 +107,7 @@ def log_action(action: Action, action_input: ActionInput, operation: Operation):
     log.message("%s Action: `%s`", EMOJI_START, action.name)
     log.info("Running: `%s`", operation.command_line(with_options=True))
     if len(action.param_value_summary()) > 0:
-        log.message("Parameters:\n%s", action.param_value_summary_str())
+        log.message("Parameters: %s", action.param_value_summary_str())
     log.info("Operation is: %s", operation)
     log.info("Input items are:\n%s", fmt_lines(action_input.items))
 

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/exec/fetch_url_items.py

@@ -144,15 +144,17 @@ def fetch_url_item_content(
         if save_content:
             assert page_data.saved_content
             assert page_data.format_info
+            if not page_data.format_info.format:
+                log.warning("No format detected for content, defaulting to HTML: %s", url)
             content_item = url_item.new_copy_with(
                 external_path=str(page_data.saved_content),
                 # Use the original filename, not the local cache filename (which has a hash suffix).
                 original_filename=item.get_filename(),
-                format=page_data.format_info.format,
+                format=page_data.format_info.format or Format.html,
             )
 
     if not url_item.title:
-        log.warning("Failed to fetch page data: title is missing: %s", item.url)
+        log.info("Title is missing for url item: %s", item)
 
     # Now save the updated URL item and also the content item if we have one.
     ws.save(url_item, overwrite=overwrite)

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/exec/llm_transforms.py

@@ -29,6 +29,7 @@ def windowed_llm_transform(
     windowing: WindowSettings | None,
     diff_filter: DiffFilter | None = None,
     check_no_results: bool = True,
+    enable_web_search: bool = False,
 ) -> TextDoc:
     def doc_transform(input_doc: TextDoc) -> TextDoc:
         return TextDoc.from_text(
@@ -41,6 +42,7 @@ def windowed_llm_transform(
                     input=input_doc.reassemble(),
                     body_template=template,
                     check_no_results=check_no_results,
+                    enable_web_search=enable_web_search,
                 ).content
             )
         )
@@ -67,6 +69,7 @@ def llm_transform_str(options: LLMOptions, input_str: str, check_no_results: boo
             input_str,
             options.windowing,
             diff_filter=options.diff_filter,
+            enable_web_search=options.enable_web_search,
         ).reassemble()
     else:
         log.info(
@@ -81,6 +84,7 @@ def llm_transform_str(options: LLMOptions, input_str: str, check_no_results: boo
             body_template=options.body_template,
             input=input_str,
             check_no_results=check_no_results,
+            enable_web_search=options.enable_web_search,
         ).content
 
     return result_str

{kash_shell-0.3.34 → kash_shell-0.3.36}/src/kash/file_storage/file_store.py

@@ -485,6 +485,9 @@ class FileStore(Workspace):
         If `with_sidematter` is true, will copy any sidematter files (metadata/assets) to
         the destination.
         """
+        # TODO: Make sure importing a text item that already has
+        # frontmatter doesn't accidentally duplicate the frontmatter
+
         from kash.file_storage.item_file_format import read_item
         from kash.web_content.canon_url import canonicalize_url
 
@@ -531,6 +534,7 @@ class FileStore(Workspace):
                 # This will read the file with or without frontmatter.
                 # We are importing so we want to drop the external path so we save the body.
                 item = read_item(path, self.base_dir)
+                log.info("Imported text item: %s", item)
                 item.external_path = None
 
                 if item.type and as_type and item.type != as_type: