kash-shell 0.3.26__tar.gz → 0.3.27__tar.gz

{kash_shell-0.3.26 → kash_shell-0.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.26
+Version: 0.3.27
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -41,7 +41,6 @@ Requires-Dist: litellm>=1.63.11
 Requires-Dist: markdownify>=0.13.1
 Requires-Dist: mcp-proxy>=0.5.0
 Requires-Dist: mcp>=1.6.0
-Requires-Dist: minify-tw-html>=0.1.3
 Requires-Dist: openai>=1.66.3
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: patch-ng>=1.18.1
@@ -70,6 +69,7 @@ Requires-Dist: tenacity>=9.0.0
 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: typing-extensions>=4.12.2
 Requires-Dist: uvicorn>=0.34.0
 Requires-Dist: xonsh>=0.19.3

{kash_shell-0.3.26 → kash_shell-0.3.27}/pyproject.toml

@@ -49,7 +49,7 @@ dependencies = [
     "frontmatter-format>=0.2.1",
     "chopdiff>=0.2.3",
     "clideps>=0.1.4",
-    "minify-tw-html>=0.1.3",
+    "tminify>=0.1.6",
     # Shell and file essentials:
     # python-magic is most current and works with libmagic on macOS and Linux.
     # on Windows, python-magic-bin seems like the best option.
@@ -129,7 +129,7 @@ kash-mcp = "kash.mcp.mcp_cli:main"
 [tool.uv.sources]
 # For local development:
 # clideps = { path = "../clideps", editable = true }
-# minify-tw-html = { path = "../../github/minify-tw-html", editable = true }
+# tminify = { path = "../../github/tminify", editable = true }
 
 # ---- Build system ----
 

kash_shell-0.3.27/src/kash/actions/__init__.py

@@ -0,0 +1,100 @@
+from dataclasses import dataclass
+from importlib import metadata
+from pathlib import Path
+
+from strif import AtomicVar
+
+from kash.config.logger import get_logger
+from kash.config.settings import APP_NAME
+from kash.exec import import_and_register
+from kash.utils.common.import_utils import import_namespace_modules
+
+log = get_logger(__name__)
+
+import_and_register(__package__, Path(__file__).parent, ["core", "meta"])
+
+
+@dataclass(frozen=True)
+class Kit:
+    module_name: str
+    distribution_name: str
+    full_module_name: str
+    path: Path | None
+    version: str | None = None
+
+
+_kits: AtomicVar[dict[str, Kit]] = AtomicVar(initial_value={})
+
+
+def get_loaded_kits() -> dict[str, Kit]:
+    """
+    Get all kits (modules within `kash.kits`) that have been loaded.
+    """
+    return _kits.copy()
+
+
+def get_kit_distribution_name(module_name: str) -> str | None:
+    """
+    Guess the distribution name for a kit module using naming conventions.
+    Assumes kits follow patterns like:
+    - kash.kits.example_kit -> kash-example-kit
+    """
+    if not module_name.startswith("kash.kits."):
+        return None
+
+    kit_name = module_name.removeprefix("kash.kits.")
+
+    # Try common naming patterns
+    candidates = [
+        f"kash-{kit_name}",
+        f"kash-{kit_name.replace('_', '-')}",
+    ]
+
+    for candidate in candidates:
+        try:
+            metadata.version(candidate)
+            return candidate
+        except metadata.PackageNotFoundError:
+            continue
+
+    return None
+
+
+def get_distribution_version(module_name: str) -> str | None:
+    """
+    Get the version of a module that can be used with `metadata.version()`.
+    """
+    try:
+        dist_name = get_kit_distribution_name(module_name)
+        return metadata.version(dist_name) if dist_name else None
+    except Exception:
+        return None
+
+
+def load_kits() -> dict[str, Kit]:
+    """
+    Import all kits (modules within `kash.kits`) by inspecting the namespace.
+    """
+    kits_namespace = f"{APP_NAME}.kits"
+    new_kits = {}
+    try:
+        imported = import_namespace_modules(kits_namespace)
+        for module_name, module in imported.items():
+            dist_name = get_kit_distribution_name(module.__name__) or module.__name__
+
+            new_kits[module_name] = Kit(
+                module_name=module_name,
+                distribution_name=dist_name,
+                full_module_name=module.__name__,
+                path=Path(module.__file__) if module.__file__ else None,
+                version=metadata.version(dist_name),
+            )
+    except ImportError:
+        log.info("No kits found in namespace `%s`", kits_namespace)
+
+    _kits.update(lambda kits: {**kits, **new_kits})
+
+    return new_kits
+
+
+load_kits()

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/actions/core/minify_html.py

@@ -22,7 +22,7 @@ def minify_html(item: Item) -> Item:
     The terser minification seems a bit slower but more robust than
     [minify-html](https://github.com/wilsonzlin/minify-html).
     """
-    from minify_tw_html import minify_tw_html
+    from tminify.main import tminify
 
     if not item.store_path:
         raise InvalidInput(f"Missing store path: {item}")
@@ -33,7 +33,7 @@ def minify_html(item: Item) -> Item:
     output_item = item.derived_copy(format=Format.html, body=None)
     output_path = ws.target_path_for(output_item)
 
-    minify_tw_html(input_path, output_path)
+    tminify(input_path, output_path)
 
     output_item.body = output_path.read_text()
     output_item.external_path = str(output_path)  # Indicate item is already saved.

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/commands/base/general_commands.py

@@ -39,7 +39,7 @@ def version() -> None:
     """
     Show the version of kash.
     """
-    cprint(get_full_version_name())
+    cprint(get_full_version_name(with_kits=True))
 
 
 @kash_command
@@ -205,7 +205,9 @@ def kits() -> None:
         cprint("Currently imported kits:")
         for kit in get_loaded_kits().values():
             cprint(
-                format_name_and_value(f"{kit.name} kit", str(kit.path or ""), text_wrap=Wrap.NONE)
+                format_name_and_value(
+                    f"{kit.distribution_name} kit", str(kit.path or ""), text_wrap=Wrap.NONE
+                )
             )
 
 

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/commands/help/welcome.py

@@ -31,4 +31,4 @@ def welcome() -> None:
         )
     )
     cprint(Panel(Markdown(help_topics.warning), box=SQUARE, border_style=COLOR_HINT))
-    cprint("%s", get_full_version_name())
+    cprint("%s", get_full_version_name(with_kits=True))

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/config/colors.py

@@ -145,6 +145,7 @@ web_light_translucent = SimpleNamespace(
     text=hsl_to_hex("hsl(188, 39%, 11%)"),
     code=hsl_to_hex("hsl(44, 38%, 23%)"),
     border=hsl_to_hex("hsl(188, 8%, 50%)"),
+    border_hairline=hsl_to_hex("hsl(188, 2%, 34%)"),
     border_hint=hsl_to_hex("hsla(188, 8%, 72%, 0.3)"),
     border_accent=hsl_to_hex("hsla(305, 18%, 65%, 0.85)"),
     hover=hsl_to_hex("hsl(188, 12%, 84%)"),
@@ -180,6 +181,7 @@ web_dark_translucent = SimpleNamespace(
     text=hsl_to_hex("hsl(188, 10%, 90%)"),
     code=hsl_to_hex("hsl(44, 38%, 72%)"),
     border=hsl_to_hex("hsl(188, 8%, 25%)"),
+    border_hairline=hsl_to_hex("hsl(188, 2%, 80%)"),
     border_hint=hsl_to_hex("hsla(188, 8%, 35%, 0.3)"),
     border_accent=hsl_to_hex("hsla(305, 30%, 55%, 0.85)"),
     hover=hsl_to_hex("hsl(188, 12%, 35%)"),

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/config/logger.py

@@ -170,6 +170,7 @@ def reset_rich_logging(
     the `.log` extension. If `log_path` is provided, it will be used to infer
     the log root and name.
     """
+    _init_rich_logging()
     if log_path:
         if not log_path.parent.exists():
             log_path.parent.mkdir(parents=True, exist_ok=True)
@@ -206,6 +207,9 @@ def reload_rich_logging_setup():
 
 @cache
 def _init_rich_logging():
+    """
+    One-time idempotent setup of rich logging.
+    """
     rich.reconfigure(theme=get_theme(), highlighter=get_highlighter())
 
     logging.setLoggerClass(CustomLogger)

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/config/unified_live.py

@@ -2,20 +2,18 @@ from __future__ import annotations
 
 import atexit
 import threading
-import time
 from collections.abc import Generator
 from contextlib import contextmanager
 from dataclasses import dataclass, field
 
-from rich.console import Console, RenderableType
+from rich.console import Console, Group, RenderableType
 from rich.live import Live
 from rich.spinner import Spinner
 from rich.text import Text
-from rich.console import Group
 from strif import AtomicVar
 
 from kash.config.logger import get_console
-from kash.config.text_styles import SPINNER, COLOR_SPINNER
+from kash.config.text_styles import COLOR_SPINNER, SPINNER
 
 
 @dataclass

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/mcp/mcp_server_sse.py

@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING
 
 from mcp.server.sse import SseServerTransport
 from prettyfmt import fmt_path
-from sse_starlette.sse import AppStatus
 from starlette.applications import Starlette
 from starlette.routing import Mount, Route
 
@@ -72,10 +71,6 @@ class MCPServerSSE:
     def _setup_server(self):
         import uvicorn
 
-        # Reset AppStatus.should_exit_event to None to ensure it's created
-        # in the correct event loop when needed.
-        AppStatus.should_exit_event = None
-
         port = global_settings().mcp_server_port
 
         # Check if the port is available.

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/model/items_model.py

@@ -263,7 +263,7 @@ class Item:
     thumbnail_url: Url | None = None
 
     # Optional additional metadata.
-    extra: dict | None = None
+    extra: dict[str, Any] | None = None
 
     # Optional execution context. Useful for letting functions that take only an Item
     # arg get access to context.

kash_shell-0.3.27/src/kash/shell/shell_main.py

@@ -0,0 +1,133 @@
+"""
+Welcome to Kash! This command is the main way to run the kash shell.
+
+Usually this is used to start the kash interactively but you can also pass a single
+command to run non-interactively.
+
+Run `kash manual` for general help. Run `kash self_check` to check the kash environment.
+Run `kash --help` for this page.
+
+More information at: github.com/jlevy/kash
+"""
+
+import argparse
+import threading
+
+from strif import quote_if_needed
+
+from kash.config.logger import get_console, get_logger
+from kash.config.setup import kash_setup
+from kash.shell.version import get_full_version_name, get_version
+
+kash_setup(rich_logging=True)  # Set up logging first.
+
+log = get_logger(__name__)
+
+
+__version__ = get_version()
+
+
+# No longer using, but keeping for reference.
+def run_plain_xonsh():
+    """
+    The standard way to run kash is now via the customized shell.
+    But we can also run a regular xonsh shell and have it load kash commands via the
+    xontrib only (in ~/.xonshrc), but the full customizations of prompts, tab
+    completion, etc are not available.
+    """
+    import xonsh.main
+
+    from kash.xonsh_custom.custom_shell import install_to_xonshrc
+
+    install_to_xonshrc()
+    xonsh.main.main()
+
+
+# Event to monitor loading.
+shell_ready_event = threading.Event()
+
+imports_done_event = threading.Event()
+
+
+def run_shell(single_command: str | None = None):
+    """
+    Run the kash shell interactively or non-interactively with a single command.
+    """
+    from kash.xonsh_custom.custom_shell import start_shell
+
+    start_shell(single_command, shell_ready_event)
+
+
+def build_parser() -> argparse.ArgumentParser:
+    from clideps.utils.readable_argparse import ReadableColorFormatter
+
+    parser = argparse.ArgumentParser(description=__doc__, formatter_class=ReadableColorFormatter)
+
+    # Don't call get_full_version_name() here, as it's slow.
+    parser.add_argument("--version", action="store_true", help="show version and exit")
+
+    return parser
+
+
+def _import_packages():
+    try:
+        # Slowest packages:
+        import uvicorn.protocols  # noqa: F401
+        import uvicorn.protocols.http.h11_impl  # noqa: F401
+        import uvicorn.protocols.websockets.websockets_impl  # noqa: F401
+        import xonsh.completers.init  # noqa: F401
+        import xonsh.pyghooks  # noqa: F401
+
+        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
+    except ImportError as e:
+        log.warning(f"Error pre-importing packages: {e}")
+
+    imports_done_event.set()
+
+
+def import_with_status_if_slow(min_time: float = 1.0):
+    """
+    Not required, but imports can be remarkably slow the first time, so this shows a status message.
+    """
+
+    # Start imports in background thread
+    import_thread = threading.Thread(target=_import_packages, daemon=True)
+    import_thread.start()
+
+    # Wait for imports to complete, with a short timeout
+    if not imports_done_event.wait(timeout=min_time):
+        # If imports aren't done quickly, show status message
+        if get_console().is_terminal:
+            with get_console().status(
+                "Importing packages (this is a bit slow the first time) …", spinner="line"
+            ):
+                import_thread.join()
+    else:
+        import_thread.join()
+
+
+def main():
+    parser = build_parser()
+
+    args, unknown = parser.parse_known_args()
+
+    if args.version:
+        print(get_full_version_name(with_kits=True))
+        return
+
+    # Join remaining arguments to pass as a single command to kash.
+    # Use Python-style quoting only if needed for xonsh.
+    single_command = None
+    if unknown:
+        single_command = " ".join(quote_if_needed(arg) for arg in unknown)
+
+    import_with_status_if_slow()
+
+    run_shell(single_command)
+
+
+if __name__ == "__main__":
+    main()

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/shell/version.py

@@ -28,8 +28,24 @@ def get_version_tag():
     return f"v{get_version()}"
 
 
-def get_full_version_name():
-    return f"{PACKAGE_NAME} {get_version_tag()}"
+def get_full_version_name(with_kits: bool = False):
+    """
+    Get the full version name, including the version number and any loaded kits.
+
+    If `with_kits` is True, will also import `kash.kits` packages and get those versions,
+    but be careful as this can be much slower due to imports!
+    """
+
+    version_items = [f"{PACKAGE_NAME} {get_version_tag()}"]
+    if with_kits:
+        from kash.actions import get_loaded_kits
+
+        kits = get_loaded_kits()
+        for kit in kits.values():
+            if kit.version:
+                version_items.append(f"{kit.distribution_name} v{kit.version}")
+
+    return ", ".join(version_items)
 
 
 if __name__ == "__main__":

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/web_gen/templates/base_styles.css.jinja

@@ -22,15 +22,19 @@
   --font-size-large: 1.2rem;
   --font-size-normal: 1rem;
   --font-size-small: 0.95rem;
-  --font-size-smaller: 0.85rem;
+  --font-size-smaller: 0.9rem;
+  --font-size-tiny: 0.85rem;
   --font-size-mono: 0.82rem;
   --font-size-mono-small: 0.75rem;
   --font-size-mono-tiny: 0.7rem;
 
+  --line-height-normal: 1.5;
+  --line-height-tight: 1.2;
+
   /* Both Source Sans 3 and PT Serif have small caps, so we use this instead of text-transform. */
   --caps-transform: none;
   --caps-caps-variant: all-small-caps;
-  --caps-spacing: 0.025em;
+  --caps-spacing: 0.021em;
   /* Compensate for small caps (Source Sans small caps are quite small) */
   --caps-heading-size-multiplier: 1.42;
   --caps-heading-line-height: calc(1.2 / var(--caps-heading-size-multiplier));
@@ -107,7 +111,7 @@ html {
 body {
   font-family: var(--font-serif);
   color: var(--color-text);
-  line-height: 1.5;
+  line-height: var(--line-height-normal);
   padding: 0;  /* No padding so we can have full width elements. */
   margin: auto;
   background-color: var(--color-bg);
@@ -142,7 +146,7 @@ a:hover {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  line-height: 1.2;
+  line-height: var(--line-height-tight);
 }
 
 h1 {
@@ -196,7 +200,7 @@ h4+p, h5+p, h6+p {
 ul {
   list-style-type: none;
   margin-left: 1.8rem;
-  margin-bottom: 1rem;
+  margin-bottom: 0.7rem;
   padding-left: 0;
 }
 
@@ -207,6 +211,7 @@ li {
 }
 
 li > p {
+  /* No extra padding for paragraphs inside list items. */
   margin-bottom: 0;
 }
 
@@ -229,10 +234,9 @@ ol > li {
 }
 
 blockquote {
-  border-left: 2px solid var(--color-primary);
+  {# border-left: 1px solid var(--color-border-hairline); #}
   padding-left: 1rem;
-  margin-left: 0;
-  margin-right: 0;
+  margin: 1.5rem 4rem 1.5rem 1rem;
 }
 
 /* Inline code styling */
@@ -240,7 +244,6 @@ code {
   font-family: var(--font-mono);
   font-size: var(--font-size-mono);
   letter-spacing: -0.025em;
-
   transition: color 0.4s ease-in-out;
 }
 /* For code inside pre we style the pre tag */
@@ -619,12 +622,14 @@ sup {
 
 @media print {
   sup {
-    font-size: 70% !important;
+    /* Using small-caps so this is a bit larger */
+    font-size: 110% !important;
   }
 
   /* Don't use stylized footnotes in print. */
   .footnote-ref a, .footnote {
     font-family: var(--font-serif);
+    font-variant-caps: all-small-caps !important;
     font-feature-settings: normal !important;
     background-color: transparent !important;
     color: var(--color-text) !important;
@@ -675,9 +680,9 @@ sup {
     
     @bottom-right {
       content: counter(page);
-      font-family: var(--font-sans) !important;
+      font-family: var(--font-serif) !important;
       font-size: var(--font-size-small);
-      color: var(--color-tertiary) !important;
+      color: var(--color-text) !important;
       margin: 0 0 0.2in 0 !important;
     }
   }
@@ -688,13 +693,25 @@ sup {
     --font-size-small: 1.0rem;
     --font-size-smaller: 0.9rem;
     --font-size-mono: 0.9rem;
+
+    /* Tighter line height for print readability */
+    --line-height-normal: 1.4;
+    --line-height-tight: 1.15;
   }
 
-    body {
+  body {
     /* Remove body margin since @page handles it */
     margin: 0;
-    /* Ensure good line height for print */
-    line-height: 1.6;
+  }
+
+  /* Reduce spacing between block elements to match tighter line height */
+  p {
+    margin-top: 0.65rem;
+    margin-bottom: 0.65rem;
+  }
+
+  li {
+    margin-top: 0.6rem;
   }
 
   /* Enable hyphenation and justification for main text content only */
@@ -703,8 +720,6 @@ sup {
     text-align: justify;
   }
 
-
-
   .long-text {
     /* Remove shadows and borders that don't work well in print */
     box-shadow: none !important;
@@ -713,6 +728,15 @@ sup {
     padding: 0;
   }
 
+  /* Slightly darker sans-serif headings look better in print. */
+  .long-text h3 {
+    font-weight: 580;
+  }
+
+  .long-text h4 {
+    font-weight: 580;
+  }
+
   /* Ensure tables don't break layout in print */
   .table-container {
     position: static;
@@ -733,6 +757,15 @@ sup {
   pre {
     white-space: pre-wrap;
     word-wrap: break-word;
+    background-color: transparent !important;
+    border: none !important;
+    font-weight: normal !important;
+  }
+
+  code {
+    background-color: transparent !important;
+    border: none !important;
+    font-weight: normal !important;
   }
 
   /* Hide interactive elements that don't work in print */
@@ -760,11 +793,6 @@ sup {
     widows: 3;  /* Minimum lines at top of page */
   }
 
-  /* Keep list items together when reasonable */
-  li {
-    break-inside: avoid-page;
-    page-break-inside: avoid; /* Fallback for older browsers */
-  }
   
   /* Hide doc metadata details in print (for now) */
   details.metadata {

{kash_shell-0.3.26 → kash_shell-0.3.27}/src/kash/web_gen/templates/base_webpage.html.jinja

@@ -10,6 +10,38 @@
 
   {% block title %}<title>{{ title }}</title>{% endblock title %}
 
+  {% block social_meta %}
+  {% if social_meta %}
+  <!-- Open Graph meta tags -->
+  <meta property="og:title" content="{{ social_meta.title or title }}" />
+  {% if social_meta.description %}
+  <meta property="og:description" content="{{ social_meta.description }}" />
+  {% endif %}
+  {% if social_meta.image %}
+  <meta property="og:image" content="{{ social_meta.image }}" />
+  {% endif %}
+  {% if social_meta.url %}
+  <meta property="og:url" content="{{ social_meta.url }}" />
+  {% endif %}
+  <meta property="og:type" content="{{ social_meta.type or 'website' }}" />
+  {% if social_meta.site_name %}
+  <meta property="og:site_name" content="{{ social_meta.site_name }}" />
+  {% endif %}
+  <!-- Twitter Card meta tags -->
+  <meta name="twitter:card" content="summary_large_image" />
+  <meta name="twitter:title" content="{{ social_meta.title or title }}" />
+  {% if social_meta.description %}
+  <meta name="twitter:description" content="{{ social_meta.description }}" />
+  {% endif %}
+  {% if social_meta.image %}
+  <meta name="twitter:image" content="{{ social_meta.image }}" />
+  {% endif %}
+  {% if social_meta.twitter_handle %}
+  <meta name="twitter:site" content="@{{ social_meta.twitter_handle }}" />
+  {% endif %}
+  {% endif %}
+  {% endblock social_meta %}
+
   {% block dark_mode_script %}
   <script>
     // Set theme before body renders to prevent flash of unstyled content