kash-shell 0.3.11__py3-none-any.whl → 0.3.13__py3-none-any.whl

kash/web_gen/templates/base_styles.css.jinja

@@ -4,14 +4,15 @@
   /* Adding Hack Nerd Font to all fonts for icon support, if it is installed. */
   --font-sans: "Source Sans 3 Variable", sans-serif, "Hack Nerd Font";
   --font-serif: "PT Serif", serif, "Hack Nerd Font";
-  --font-weight-sans-bold: 625;  /* Source Sans 3 Variable better at this weight. */
+  /* Source Sans 3 Variable better at these weights. */
+  --font-weight-sans-bold: 620;
   --font-mono: "Hack Nerd Font", "Menlo", "DejaVu Sans Mono", Consolas, "Lucida Console", monospace;
 
   --font-size-large: 1.2rem;
   --font-size-normal: 1rem;
   --font-size-small: 0.95rem;
   --font-size-smaller: 0.85rem;
-  --font-size-mono: 0.8rem;
+  --font-size-mono: 0.82rem;
   --font-size-mono-small: 0.75rem;
   --font-size-mono-tiny: 0.7rem;
 
@@ -71,7 +72,7 @@
 body {
   font-family: var(--font-serif);
   color: var(--color-text);
-  line-height: 1.4;
+  line-height: 1.5;
   padding: 0;  /* No padding so we can have full width elements. */
   margin: auto;
   background-color: var(--color-bg);
@@ -81,7 +82,13 @@ body {
 
 {% block typography %}
 p {
-  margin-bottom: 1rem;
+  margin-top: 0.75rem;
+  margin-bottom: 0.75rem;
+}
+
+pre {
+  margin-top: 0.75rem;
+  margin-bottom: 0.75rem;
 }
 
 b, strong {
@@ -114,14 +121,14 @@ h1 {
 
 h2 {
   font-size: 1.4rem;
-  margin-top: 2.5rem;
+  margin-top: 1.5rem;
   margin-bottom: 1rem;
 }
 
 h3 {
-  font-size: 1.09rem;
-  margin-top: 1.7rem;
-  margin-bottom: 0.7rem;
+  font-size: 1.03rem;
+  margin-top: 1.5rem;
+  margin-bottom: 0.5rem;
 }
 
 h4 {
@@ -131,7 +138,7 @@ h4 {
 
 ul {
   list-style-type: none;
-  margin-left: 2rem;
+  margin-left: 1.8rem;
   margin-bottom: 1rem;
   padding-left: 0;
 }
@@ -155,9 +162,9 @@ ul > li::before {
 }
 
 ol {
-  margin-bottom: 0.7rem;
   list-style-type: decimal;
-  margin-left: 2rem;
+  margin-left: 1.8rem;
+  margin-bottom: 0.7rem;
 }
 
 ol > li {
@@ -172,24 +179,60 @@ blockquote {
   color: var(--color-secondary);
 }
 
+/* Inline code styling */
 code {
   font-family: var(--font-mono);
   font-size: var(--font-size-mono);
   letter-spacing: -0.025em;
-  padding: 0.2rem 0.4rem;
 }
 
+/* Code blocks (pre + code) */
 pre {
   font-family: var(--font-mono);
   font-size: var(--font-size-mono);
   letter-spacing: -0.025em;
-  {# overflow-x: auto; #}
+  background-color: var(--color-bg-alt);
+  border-radius: 4px;
+  border: 1px dotted var(--color-border-hint);
+  padding: 0.2rem 0.2rem 0.1rem 0.2rem;
+  overflow-x: auto;  /* Enable horizontal scrolling */
+  position: relative;  /* Create new stacking context */
+}
+
+/* Reset code styling when inside pre blocks */
+pre > code {
+  display: block;  /* Make code block take full width */
+  line-height: 1.5;  /* Improve readability */
 }
+
+hr {
+  border: none;
+  height: 1.5rem;
+  position: relative;
+  text-align: center;
+  margin: 0.5rem auto;
+  overflow: visible;
+}
+
+hr:before {
+  content: "";
+  display: block;
+  position: absolute;
+  top: 50%;
+  width: 4rem;
+  left: calc(50% - 2rem);
+  border-top: 1px solid var(--black-light);
+}
+
 {% endblock typography %}
 
 {% block long_text_styles %}
 /* Long text stylings, for nicely formatting blog post length or longer texts. */
 
+.long-text {
+  box-shadow: none;
+}
+
 .long-text h1 {
   font-family: var(--font-serif);
   font-weight: 400;
@@ -204,8 +247,9 @@ pre {
 .long-text h3 {
   font-family: var(--font-sans);
   font-weight: var(--font-weight-sans-bold);
+  font-size: 1.05rem;
   text-transform: uppercase;
-  letter-spacing: 0.02em;
+  letter-spacing: 0.025em;
 }
 
 .long-text h4 {
@@ -218,6 +262,41 @@ pre {
   font-style: italic;
   font-size: 1rem;
 }
+
+.long-text .sans-text {
+  font-family: var(--font-sans);
+}
+
+.long-text .sans-text p {
+  margin-top: 0.8rem;
+  margin-bottom: 0.8rem;
+}
+
+.long-text .sans-text h1 {
+  font-family: var(--font-sans);
+  font-size: 1.75rem;
+  font-weight: 380;
+  margin-top: 1rem;
+  margin-bottom: 1.2rem;
+}
+
+.long-text .sans-text h2 {
+  font-family: var(--font-sans);
+  font-size: 1.25rem;
+  font-weight: 440;
+  margin-top: 1rem;
+  margin-bottom: 0.8rem;
+}
+
+.long-text .sans-text h3 {
+  font-family: var(--font-sans);
+  font-size: 1.03rem;
+  font-weight: var(--font-weight-sans-bold);
+  text-transform: uppercase;
+  letter-spacing: 0.03em;
+  margin-top: 1.1rem;
+  margin-bottom: 0.8rem;
+}
 {% endblock long_text_styles %}
 
 {% block table_styles %}
@@ -230,12 +309,14 @@ table {
   border-collapse: collapse;
   word-break: break-word; /* long words/URLs wrap instead of inflating the column    */
   border: 1px solid var(--color-border-hint);
+  line-height: 1.3; /* Tables tigher but not as tight as headers */
 }
 
 th {
   text-transform: uppercase;
-  letter-spacing: 0.02em;
+  letter-spacing: 0.03em;
   border-bottom: 1px solid var(--color-border-hint);
+  line-height: 1.2;
 }
 
 th, td {
@@ -281,14 +362,17 @@ nav {
 {% block footnote_styles %}
 /* Footnotes. */
 sup {
-  font-size: 80%;
+  font-size: 85%;
 }
 
 .footnote-ref a, .footnote {
+  font-family: var(--font-sans);
   text-decoration: none;
   padding: 0 0.15rem;
   border-radius: 4px;
   transition: all 0.15s ease-in-out;
+  font-style: normal;
+  font-weight: 500;
 }
 
 .footnote-ref a:hover, .footnote:hover {
@@ -308,11 +392,50 @@ sup {
   .table-container {
     width: calc(100vw - 6rem);
   }
+  
+  /* Apply shadow to long-text containers on larger screens */
+  .long-text {
+    box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 -2px 6px -1px rgba(0, 0, 0, 0.07);
+  }
+  /* But remove shadow when wrapped in no-shadow class */
+  .no-shadow .long-text {
+    box-shadow: none !important;
+  }
 }
 
+/* Make narrower screens more usable for lists and tables. */
 @media (max-width: 768px) {
+  /* Prevent horizontal scrolling on the body */
+  body {
+    overflow-x: hidden;
+  }
+  
+  /* Constrain the long-text container */
+  .long-text {
+    max-width: 100%;
+    overflow-x: hidden;
+  }
+  
+  /* Make table containers scrollable without affecting page layout */
+  .table-container {
+    max-width: 100%;
+    overflow-x: auto;
+    transform: none;
+    left: 0;
+    position: relative;
+    margin-left: auto;
+    margin-right: auto;
+  }
+  
   table {
     font-size: var(--font-size-smaller);
+    /* Tables can be wider than container */
+    width: auto;
+    min-width: 100%;
+  }
+  
+  ul, ol {
+    margin-left: 1rem;
   }
 }
 {% endblock responsive_styles %}

kash/web_gen/templates/simple_webpage.html.jinja

@@ -2,7 +2,7 @@
 
 <!-- simple_webpage begin main_content block -->
 {% block main_content %}
-<div class="long-text container max-w-3xl mx-auto bg-white py-8 px-6 md:px-16 md:shadow-lg">
+<div class="long-text container max-w-3xl mx-auto bg-white py-4 px-6 md:px-16">
   {% block page_title %}
   {% if title and add_title_h1 %}
     <h1 class="text-center text-4xl mt-6 mb-6">{{ title }}</h1>

kash/workspaces/__init__.py

@@ -1,19 +1,28 @@
 from kash.workspaces.selections import Selection, SelectionHistory
+from kash.workspaces.workspace_dirs import (
+    enclosing_ws_dir,
+    global_ws_dir,
+    is_global_ws_dir,
+    is_ws_dir,
+)
 from kash.workspaces.workspaces import (
     Workspace,
+    _switch_ws_settings,
     current_ignore,
     current_ws,
     get_global_ws,
     get_ws,
-    global_ws_dir,
     resolve_ws,
-    switch_to_ws,
     ws_param_value,
 )
 
 __all__ = [
     "Selection",
     "SelectionHistory",
+    "enclosing_ws_dir",
+    "global_ws_dir",
+    "is_global_ws_dir",
+    "is_ws_dir",
     "Workspace",
     "current_ignore",
     "current_ws",
@@ -21,6 +30,6 @@ __all__ = [
     "get_ws",
     "global_ws_dir",
     "resolve_ws",
+    "_switch_ws_settings",
     "ws_param_value",
-    "switch_to_ws",
 ]

kash/workspaces/selections.py

@@ -6,13 +6,13 @@ from pathlib import Path
 from typing import TypeVar
 
 from frontmatter_format import new_yaml, yaml_util
-from prettyfmt import fmt_lines
+from prettyfmt import fmt_count_items, fmt_lines
 from pydantic import BaseModel, Field, PrivateAttr, field_serializer, field_validator
 
 from kash.config.logger import get_logger
 from kash.model.paths_model import StorePath
 from kash.shell.utils.native_utils import native_trash
-from kash.utils.common.format_utils import fmt_count_items, fmt_loc
+from kash.utils.common.format_utils import fmt_loc
 from kash.utils.errors import InvalidInput, InvalidOperation
 
 log = get_logger(__name__)

kash/workspaces/workspace_dirs.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+import re
+from functools import cache
+from pathlib import Path
+
+from kash.config.logger import get_logger
+from kash.config.settings import global_settings, resolve_and_create_dirs
+from kash.file_storage.metadata_dirs import MetadataDirs
+from kash.utils.errors import InvalidInput
+
+log = get_logger(__name__)
+
+
+@cache
+def global_ws_dir() -> Path:
+    kb_path = resolve_and_create_dirs(global_settings().global_ws_dir, is_dir=True)
+    log.debug("Global workspace path: %s", kb_path)
+    return kb_path
+
+
+def is_global_ws_dir(path: Path) -> bool:
+    return path.resolve() == global_settings().global_ws_dir
+
+
+def is_ws_dir(path: Path) -> bool:
+    dirs = MetadataDirs(path, False)
+    return dirs.is_initialized()
+
+
+def enclosing_ws_dir(path: Path | None = None) -> Path | None:
+    """
+    Get the workspace directory enclosing the given path, or of the current
+    working directory if no path is given.
+    """
+    if not path:
+        path = Path(".")
+
+    path = path.absolute()
+    while path != Path("/"):
+        if is_ws_dir(path):
+            return path
+        path = path.parent
+
+    return None
+
+
+def normalize_workspace_name(ws_name: str) -> str:
+    return str(ws_name).strip().rstrip("/")
+
+
+def check_strict_workspace_name(ws_name: str) -> str:
+    ws_name = normalize_workspace_name(ws_name)
+    if not re.match(r"^[\w.-]+$", ws_name):
+        raise InvalidInput(
+            f"Use an alphanumeric name (- and . also allowed) for the workspace name: `{ws_name}`"
+        )
+    return ws_name

kash/workspaces/workspace_importing.py

@@ -24,7 +24,7 @@ def import_url(ws: FileStore, url: Url) -> Item:
     )
     item = Item(ItemType.resource, url=canon_url, format=Format.url)
     # No need to overwrite any resource we already have for the identical URL.
-    store_path = ws.save(item, overwrite=False)
+    store_path = ws.save(item, skip_dup_names=True)
     # Load to fill in any metadata we may already have.
     item = ws.load(store_path)
     return item
@@ -45,7 +45,7 @@ def import_and_load(ws: FileStore, locator: Locator | str) -> Item:
             # It's already a StorePath.
             item = ws.load(locator)
         else:
-            log.message("Importing locator as local path: %r", locator)
+            log.info("Importing locator as local path: %r", locator)
             path = Path(locator)
             if not path.exists():
                 raise InvalidInput(f"File not found: {path}")

kash/workspaces/workspace_output.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from chopdiff.divs.parse_divs import parse_divs
 from flowmark import Wrap
 from frontmatter_format import fmf_read, fmf_read_frontmatter_raw
-from prettyfmt import fmt_size_dual
+from prettyfmt import fmt_count_items, fmt_size_dual
 from rich.box import SQUARE
 from rich.panel import Panel
 from rich.text import Text
@@ -15,7 +15,7 @@ from kash.model.items_model import ItemType
 from kash.shell.output.kerm_code_utils import click_to_paste
 from kash.shell.output.shell_formatting import format_name_and_value
 from kash.shell.output.shell_output import PrintHooks, cprint
-from kash.utils.common.format_utils import fmt_count_items, fmt_loc
+from kash.utils.common.format_utils import fmt_loc
 from kash.utils.file_formats.chat_format import ChatHistory
 from kash.utils.file_utils.dir_info import get_dir_info
 from kash.utils.file_utils.file_formats_model import file_format_info

kash/workspaces/workspaces.py

@@ -1,5 +1,5 @@
-import contextvars
-import re
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 from functools import cache
 from pathlib import Path
@@ -13,10 +13,13 @@ from kash.config.settings import (
     global_settings,
     resolve_and_create_dirs,
 )
+from kash.config.text_styles import STYLE_HINT
 from kash.file_storage.metadata_dirs import MetadataDirs
 from kash.model.params_model import GLOBAL_PARAMS, RawParamValues
+from kash.shell.output.shell_output import PrintHooks, cprint
 from kash.utils.errors import FileNotFound, InvalidInput, InvalidState
 from kash.utils.file_utils.ignore_files import IgnoreFilter, is_ignored_default
+from kash.workspaces.workspace_dirs import check_strict_workspace_name, is_global_ws_dir, is_ws_dir
 from kash.workspaces.workspace_registry import WorkspaceInfo, get_ws_registry
 
 if TYPE_CHECKING:
@@ -25,19 +28,6 @@ if TYPE_CHECKING:
 log = get_logger(__name__)
 
 
-def normalize_workspace_name(ws_name: str) -> str:
-    return str(ws_name).strip().rstrip("/")
-
-
-def check_strict_workspace_name(ws_name: str) -> str:
-    ws_name = normalize_workspace_name(ws_name)
-    if not re.match(r"^[\w.-]+$", ws_name):
-        raise InvalidInput(
-            f"Use an alphanumeric name (- and . also allowed) for the workspace name: `{ws_name}`"
-        )
-    return ws_name
-
-
 class Workspace(ABC):
     """
     A workspace is the context for actions and is tied to a folder on disk.
@@ -59,50 +49,6 @@ class Workspace(ABC):
     def base_dir(self) -> Path:
         """The base directory for this workspace."""
 
-    def __enter__(self):
-        """
-        Context manager to set this workspace as the current workspace.
-        """
-        from kash.workspaces.workspaces import current_ws_context
-
-        self._token = current_ws_context.set(self.base_dir)
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        """
-        Restore the previous workspace context.
-        """
-        from kash.workspaces.workspaces import current_ws_context
-
-        current_ws_context.reset(self._token)
-
-
-current_ws_context: contextvars.ContextVar[Path | None] = contextvars.ContextVar(
-    "current_ws_context", default=None
-)
-"""
-Context variable that tracks the current workspace. Only used if it is
-explicitly set with a `with ws.as_current()` block.
-"""
-
-
-def is_ws_dir(path: Path) -> bool:
-    dirs = MetadataDirs(path, False)
-    return dirs.is_initialized()
-
-
-def enclosing_ws_dir(path: Path) -> Path | None:
-    """
-    Get the workspace directory enclosing the given path (itself or a parent or None).
-    """
-    path = path.absolute()
-    while path != Path("/"):
-        if is_ws_dir(path):
-            return path
-        path = path.parent
-
-    return None
-
 
 def resolve_ws(name: str | Path) -> WorkspaceInfo:
     """
@@ -137,10 +83,10 @@ def resolve_ws(name: str | Path) -> WorkspaceInfo:
 
     ws_name = check_strict_workspace_name(resolved.name)
 
-    return WorkspaceInfo(ws_name, resolved, is_global_ws_path(resolved))
+    return WorkspaceInfo(ws_name, resolved, is_global_ws_dir(resolved))
 
 
-def get_ws(name_or_path: str | Path, auto_init: bool = True) -> "FileStore":
+def get_ws(name_or_path: str | Path, auto_init: bool = True) -> FileStore:
     """
     Get a workspace by name or path. Adds to the in-memory registry so we reuse it.
     With `auto_init` true, will initialize the workspace if it is not already initialized.
@@ -162,18 +108,14 @@ def global_ws_dir() -> Path:
     return kb_path
 
 
-def is_global_ws_path(path: Path) -> bool:
-    return path.name.lower() == GLOBAL_WS_NAME.lower()
-
-
-def get_global_ws() -> "FileStore":
+def get_global_ws() -> FileStore:
     """
     Get the global_ws workspace.
     """
     return get_ws_registry().load(GLOBAL_WS_NAME, global_ws_dir(), True)
 
 
-def switch_to_ws(base_dir: Path) -> "FileStore":
+def _switch_ws_settings(base_dir: Path) -> FileStore:
     """
     Switch the current workspace to the given directory.
     Updates logging and cache directories to be within that workspace.
@@ -199,41 +141,35 @@ def switch_to_ws(base_dir: Path) -> "FileStore":
     return get_ws_registry().load(info.name, info.base_dir, info.is_global_ws)
 
 
-def _current_ws_info() -> tuple[Path | None, bool]:
-    """
-    Infer the current workspace from context or the current working directory.
-    Does not load the workspace.
-    """
-    # First check if we have an explicit workspace context.
-    override_dir = current_ws_context.get()
-    if override_dir:
-        return override_dir, is_global_ws_path(override_dir)
-
-    # Fall back to detecting from the current working directory.
-    dir = enclosing_ws_dir(Path("."))
-    is_global_ws = is_global_ws_path(dir) if dir else False
-    if not dir or is_global_ws:
-        dir = global_ws_dir()
-    return dir, is_global_ws
-
-
-def current_ws(silent: bool = False) -> "FileStore":
+def current_ws(silent: bool = False) -> FileStore:
     """
     Get the current workspace based on the current working directory.
     Loads and registers the workspace if it is not already loaded.
-    Also updates logging and cache directories if this has changed.
+
+    As a convenience, this call also auto-updates logging and cache directories
+    if this has changed.
     """
-    base_dir, _is_global_ws = _current_ws_info()
+    from kash.exec.runtime_settings import current_ws_context
+
+    ws_context = current_ws_context()
+    base_dir = ws_context.current_ws_dir
     if not base_dir:
         raise InvalidState(
             f"No workspace found in: {fmt_path(Path('.').absolute(), resolve=False)}\n"
             "Create one with the `workspace` command."
         )
 
-    ws = switch_to_ws(base_dir)
+    ws = _switch_ws_settings(base_dir)
 
     if not silent:
-        ws.log_workspace_info(once=True)
+        did_log = ws.log_workspace_info(once=True)
+        if did_log and ws.is_global_ws and not ws_context.override_dir:
+            PrintHooks.spacer()
+            log.warning("Note you are currently using the default global workspace.")
+            cprint(
+                "Create or switch to another workspace with the `workspace` command.",
+                style=STYLE_HINT,
+            )
 
     return ws
 

kash/xonsh_custom/load_into_xonsh.py

@@ -13,8 +13,6 @@ from kash.commands.help.welcome import welcome
 from kash.config.logger import get_logger
 from kash.config.settings import RECOMMENDED_PKGS, check_kerm_code_support
 from kash.config.text_styles import LOGO_NAME, STYLE_HINT
-from kash.local_server.local_server import start_ui_server
-from kash.local_server.local_url_formatters import enable_local_urls
 from kash.mcp.mcp_server_commands import start_mcp_server
 from kash.shell.output.shell_output import PrintHooks, cprint
 from kash.shell.version import get_version_tag
@@ -89,6 +87,10 @@ def load_into_xonsh():
         # Currently only Kerm supports our advanced UI with Kerm codes.
         supports_kerm_codes = check_kerm_code_support()
         if supports_kerm_codes:
+            # Don't pay for import until needed.
+            from kash.local_server.local_server import start_ui_server
+            from kash.local_server.local_url_formatters import enable_local_urls
+
             start_ui_server()
             enable_local_urls(True)
         else:

{kash_shell-0.3.11.dist-info → kash_shell-0.3.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.11
+Version: 0.3.13
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -20,17 +20,16 @@ Requires-Dist: anyio>=4.8.0
 Requires-Dist: audioop-lts>=0.2.1; python_version >= '3.13'
 Requires-Dist: cachetools>=5.5.2
 Requires-Dist: chopdiff>=0.2.1
-Requires-Dist: clideps>=0.1.1
+Requires-Dist: clideps>=0.1.4
 Requires-Dist: colour>=0.1.5
 Requires-Dist: cssselect>=1.2.0
 Requires-Dist: deepgram-sdk>=3.10.1
 Requires-Dist: dunamai>=1.23.0
 Requires-Dist: fastapi>=0.115.11
-Requires-Dist: flowmark>=0.4.5
+Requires-Dist: flowmark>=0.4.6
 Requires-Dist: frontmatter-format>=0.2.1
 Requires-Dist: funlog>=0.2.0
 Requires-Dist: humanfriendly>=10.0
-Requires-Dist: inflect>=7.5.0
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: justext>=3.0.2
@@ -43,6 +42,7 @@ Requires-Dist: openai>=1.66.3
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: patch-ng>=1.18.1
 Requires-Dist: pathspec>=0.12.1
+Requires-Dist: pluralizer>=1.2.0
 Requires-Dist: prettyfmt>=0.3.1
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pydantic>=2.10.6