kash-shell 0.3.21__tar.gz → 0.3.22__tar.gz

{kash_shell-0.3.21 → kash_shell-0.3.22}/PKG-INFO

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

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/actions/core/markdownify_html.py

@@ -1,9 +1,12 @@
+from prettyfmt import abbrev_on_words
+
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import has_html_body, is_url_resource
 from kash.exec.runtime_settings import current_runtime_settings
 from kash.model import Format, Item
 from kash.model.items_model import ItemType
+from kash.utils.text_handling.markdown_utils import first_heading
 from kash.utils.text_handling.markdownify_utils import markdownify_custom
 from kash.web_content.file_cache_utils import get_url_html
 from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
@@ -25,6 +28,14 @@ def markdownify_html(item: Item) -> Item:
     assert page_data.clean_html
     markdown_content = markdownify_custom(page_data.clean_html)
 
+    # Sometimes readability doesn't include the title, in which case we add it.
+    first_h1 = first_heading(markdown_content, allowed_tags=("h1",))
+    title = page_data.title and abbrev_on_words(page_data.title.strip(), 80)
+    if not first_h1 and title:
+        log.message(f"No h1 found, inserting h1: {title}")
+        # Insert a h1 at the top of the document
+        markdown_content = f"# {title}\n\n{markdown_content}"
+
     output_item = item.derived_copy(
         type=ItemType.doc, format=Format.markdown, body=markdown_content
     )

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/actions/core/tabbed_webpage_generate.py

@@ -1,6 +1,6 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
-from kash.exec.preconditions import is_config
+from kash.exec.preconditions import is_data
 from kash.model import ONE_ARG, ActionInput, ActionResult, FileExt, Format, Item, ItemType, Param
 from kash.web_gen import tabbed_webpage
 
@@ -9,7 +9,7 @@ log = get_logger(__name__)
 
 @kash_action(
     expected_args=ONE_ARG,
-    precondition=is_config,
+    precondition=is_data,
     params=(Param("add_title", "Add a title to the page body.", type=bool),),
 )
 def tabbed_webpage_generate(input: ActionInput, add_title: bool = False) -> ActionResult:

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/commands/help/assistant_commands.py

@@ -1,8 +1,6 @@
-from rich import get_console
-
 from kash.commands.base.basic_file_commands import trash
 from kash.commands.workspace.selection_commands import select
-from kash.config.logger import get_logger
+from kash.config.logger import get_console, get_logger
 from kash.config.text_styles import PROMPT_ASSIST, SPINNER
 from kash.docs.all_docs import DocSelection
 from kash.exec import kash_command
@@ -45,7 +43,7 @@ def assist(
             help()
             return
 
-    with get_console().status("Thinking…", spinner=SPINNER):
+    with get_console().status("Thinking…", spinner=SPINNER):  # noqa: F821
         shell_context_assistance(input, model=model, assistance_type=type)
 
 

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/commands/help/logo.py

@@ -2,7 +2,8 @@ import re
 from pathlib import Path
 
 from rich.box import SQUARE
-from rich.console import Group
+from rich.console import Group, RenderableType
+from rich.padding import Padding
 from rich.panel import Panel
 from rich.text import Text
 
@@ -62,7 +63,13 @@ def color_logo() -> Group:
     )
 
 
-def branded_box(content: Group | None, version: str | None = None) -> Panel:
+def simple_box(content: RenderableType) -> Panel:
+    return Panel(
+        content, border_style=COLOR_HINT, padding=(0, 1), width=CONSOLE_WRAP_WIDTH, box=SQUARE
+    )
+
+
+def logo_box(content: Group | None = None) -> Padding:
     panel_width = CONSOLE_WRAP_WIDTH
 
     logo_lines = LOGO_LARGE.split("\n")
@@ -70,29 +77,17 @@ def branded_box(content: Group | None, version: str | None = None) -> Panel:
     tagline_offset = (panel_width - 4 - len(TAGLINE_STYLED)) // 2
 
     colored_lines = [logo_colorize_line(line, " ", rest_offset) for line in logo_lines]
-    header = None
-    if version:
-        footer = Text(version, style=COLOR_HINT, justify="right")
-    else:
-        footer = None
 
     body = ["", content] if content else []
 
-    return Panel(
+    return Padding(
         Group(
             Text.assemble(" " * tagline_offset, LOGO_SPACER),
             *colored_lines,
             Text.assemble(" " * tagline_offset, TAGLINE_STYLED),
             *body,
         ),
-        title=header,
-        title_align="center",
-        subtitle=footer,
-        subtitle_align="right",
-        border_style=COLOR_HINT,
-        padding=(0, 1),
-        width=panel_width,
-        box=SQUARE,
+        pad=(1, 1),
     )
 
 
@@ -101,7 +96,7 @@ def kash_logo(box: bool = False, svg_out: str | None = None, html_out: str | Non
     """
     Show the kash logo.
     """
-    logo = branded_box(None) if box else color_logo()
+    logo = logo_box(None) if box else color_logo()
 
     cprint(logo)
 

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/commands/help/welcome.py

@@ -2,7 +2,7 @@ from rich.box import SQUARE
 from rich.console import Group
 from rich.panel import Panel
 
-from kash.commands.help.logo import branded_box
+from kash.commands.help.logo import logo_box, simple_box
 from kash.config.text_styles import (
     COLOR_HINT,
 )
@@ -20,14 +20,15 @@ def welcome() -> None:
     """
 
     help_topics = all_docs.help_topics
-    version = get_full_version_name()
+
     # Create header with logo and right-justified version
 
     PrintHooks.before_welcome()
+    cprint(logo_box())
     cprint(
-        branded_box(
+        simple_box(
             Group(Markdown(help_topics.welcome)),
-            version,
         )
     )
     cprint(Panel(Markdown(help_topics.warning), box=SQUARE, border_style=COLOR_HINT))
+    cprint("%s", get_full_version_name())

kash_shell-0.3.22/src/kash/docs/markdown/warning.md

@@ -0,0 +1,3 @@
+**Important:** This is a shell.
+Commands can be destructive.
+Review commands carefully!

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/docs/markdown/welcome.md

@@ -1,5 +1,6 @@
-**Welcome to kash!** Use `help` for the manual and full list of available commands.
+**Welcome to Kash!**
 
+Use `help` for the manual and full list of available commands.
 Press **tab** for contextual autocomplete of commands, questions, actions, and files.
 You may simply ask a question and the kash assistant will help you.
 Press **space** (or type **?**), then write your question or request.

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/exec/fetch_url_items.py

@@ -48,9 +48,10 @@ def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bo
     from kash.workspaces import current_ws
 
     ws = current_ws()
-    if not refetch and item.title and item.description:
+    if not refetch and item.title and item.description and item.body:
         log.message(
-            "Already have title and description, will not fetch metadata: %s", item.fmt_loc()
+            "Already have title, description, and body, will not fetch: %s",
+            item.fmt_loc(),
         )
         return item
 
@@ -100,10 +101,11 @@ def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bo
     # Now save the updated URL item and also the content item if we have one.
     ws.save(url_item)
     assert url_item.store_path
-    log.debug("Saved URL item: %s", url_item.fmt_loc())
     if content_item:
         ws.save(content_item)
         assert content_item.store_path
-        log.debug("Saved content item: %s", content_item.fmt_loc())
+        log.info("Saved content item: %s", content_item.fmt_loc())
+    else:
+        log.info("Saved URL item: %s", url_item.fmt_loc())
 
     return content_item or url_item

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/exec/preconditions.py

@@ -48,8 +48,13 @@ def is_concept(item: Item) -> bool:
 
 
 @kash_precondition
-def is_config(item: Item) -> bool:
-    return item.type == ItemType.config
+def is_data(item: Item) -> bool:
+    return item.type == ItemType.data
+
+
+@kash_precondition
+def is_table(item: Item) -> bool:
+    return item.type == ItemType.table
 
 
 @kash_precondition

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/model/items_model.py

@@ -55,7 +55,8 @@ class ItemType(Enum):
     concept = "concept"
     resource = "resource"
     asset = "asset"
-    config = "config"
+    data = "data"
+    table = "table"
     export = "export"
     chat = "chat"
     extension = "extension"
@@ -86,7 +87,9 @@ class ItemType(Enum):
             Format.diff: ItemType.doc,
             Format.python: ItemType.extension,
             Format.json: ItemType.doc,
-            Format.csv: ItemType.doc,
+            Format.csv: ItemType.table,
+            Format.xlsx: ItemType.table,
+            Format.npz: ItemType.table,
             Format.log: ItemType.log,
             Format.pdf: ItemType.resource,
             Format.jpeg: ItemType.asset,
@@ -646,7 +649,7 @@ class Item:
         body_text = abbrev_str(self.body_text(), max_len)
 
         # Just for aesthetics, especially for titles of chat files.
-        if self.type in [ItemType.chat, ItemType.config] or self.format == Format.yaml:
+        if self.type in [ItemType.chat, ItemType.data] or self.format == Format.yaml:
             try:
                 yaml_obj = list(new_yaml().load_all(self.body_text()))
                 if len(yaml_obj) > 0:
@@ -663,16 +666,16 @@ class Item:
         """
         return bool(self.body and self.body.strip())
 
-    def read_as_config(self) -> Any:
+    def read_as_data(self) -> Any:
         """
-        If it is a config Item, return the parsed YAML.
+        If it is a data Item, return the parsed YAML.
         """
-        if not self.type == ItemType.config:
-            raise FileFormatError(f"Item is not a config: {self}")
+        if not self.type == ItemType.data:
+            raise FileFormatError(f"Item is not a data item: {self}")
         if not self.body:
-            raise FileFormatError(f"Config item has no body: {self}")
+            raise FileFormatError(f"Data item has no body: {self}")
         if self.format != Format.yaml:
-            raise FileFormatError(f"Config item is not YAML: {self.format}: {self}")
+            raise FileFormatError(f"Data item is not YAML: {self.format}: {self}")
         return from_yaml_string(self.body)
 
     def get_filename(self) -> str | None:
@@ -709,8 +712,8 @@ class Item:
         elif self.type == ItemType.script:
             # Same for kash/xonsh scripts.
             return f"{self.type.value}.{FileExt.xsh.value}"
-        elif self.type == ItemType.export:
-            # For exports, skip the item type to keep it maximally compatible for external tools.
+        elif self.type in [ItemType.export, ItemType.data, ItemType.table]:
+            # For exports, data, and tables, skip the item type to keep it maximally compatible for external tools.
             return f"{self.get_file_ext().value}"
         else:
             return f"{self.type.value}.{self.get_file_ext().value}"

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/shell/output/shell_output.py

@@ -4,7 +4,7 @@ Output to the shell UI. These are for user interaction, not logging.
 
 import contextvars
 from collections.abc import Callable
-from contextlib import contextmanager
+from contextlib import contextmanager, nullcontext
 from enum import Enum, auto
 
 import rich
@@ -82,12 +82,16 @@ def console_pager(use_pager: bool = True):
 
 
 def multitask_status(
-    settings: StatusSettings | None = None, *, auto_summary: bool = True
-) -> MultiTaskStatus:
+    settings: StatusSettings | None = None, *, auto_summary: bool = True, enabled: bool = True
+) -> MultiTaskStatus | nullcontext:
     """
     Create a `MultiTaskStatus` context manager for displaying multiple task progress
-    using the global shell console.
+    using the global shell console. If disabled, returns a null context, so it's convenient
+    to disable status display.
     """
+    if not enabled:
+        return nullcontext()
+
     return MultiTaskStatus(
         console=get_console(),
         settings=settings,

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/utils/text_handling/markdown_utils.py

@@ -6,7 +6,7 @@ from typing import Any, TypeAlias
 import marko
 import regex
 from marko.block import Heading, ListItem
-from marko.inline import Link
+from marko.inline import AutoLink, Link
 
 from kash.utils.common.url import Url
 
@@ -64,6 +64,9 @@ def _tree_links(element, include_internal=False):
             case Link():
                 if include_internal or not element.dest.startswith("#"):
                     links.append(element.dest)
+            case AutoLink():
+                if include_internal or not element.dest.startswith("#"):
+                    links.append(element.dest)
             case _:
                 if hasattr(element, "children"):
                     for child in element.children:
@@ -710,3 +713,157 @@ def test_markdown_utils_exceptions() -> None:
     result_with_internal = extract_links(content, include_internal=True)
     assert "https://example.com" in result_with_internal
     assert "#section" in result_with_internal
+
+
+def test_extract_links_comprehensive() -> None:
+    """Test extract_links with various link formats including bare links and footnotes."""
+
+    # Test regular markdown links
+    regular_links = "Check out [this link](https://example.com) and [another](https://test.com)"
+    result = extract_links(regular_links)
+    assert "https://example.com" in result
+    assert "https://test.com" in result
+    assert len(result) == 2
+
+    # Test bare/autolinks in angle brackets
+    bare_links = "Visit <https://google.com> and also <https://github.com>"
+    result_bare = extract_links(bare_links)
+    assert "https://google.com" in result_bare
+    assert "https://github.com" in result_bare
+    assert len(result_bare) == 2
+
+    # Test autolinks without brackets (expected to not work with standard markdown)
+    auto_links = "Visit https://stackoverflow.com or http://reddit.com"
+    result_auto = extract_links(auto_links)
+    assert (
+        result_auto == []
+    )  # Plain URLs without brackets aren't parsed as links in standard markdown
+
+    # Test GFM footnotes (the original issue)
+    footnote_content = """
+[^109]: What Is The Future Of Ketamine Therapy For Mental Health Treatment?
+    - The Ko-Op, accessed June 28, 2025,
+      <https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/>
+"""
+    result_footnote = extract_links(footnote_content)
+    assert (
+        "https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/"
+        in result_footnote
+    )
+    assert len(result_footnote) == 1
+
+    # Test mixed content with all types (excluding reference-style which has parsing conflicts with footnotes)
+    mixed_content = """
+# Header
+
+Regular link: [Example](https://example.com)
+Bare link: <https://bare-link.com>
+Auto link: https://auto-link.com
+
+[^1]: Footnote with [regular link](https://footnote-regular.com)
+[^2]: Footnote with bare link <https://footnote-bare.com>
+"""
+    result_mixed = extract_links(mixed_content)
+    expected_links = [
+        "https://example.com",  # Regular link
+        "https://bare-link.com",  # Bare link
+        "https://footnote-regular.com",  # Link in footnote
+        "https://footnote-bare.com",  # Bare link in footnote
+    ]
+    for link in expected_links:
+        assert link in result_mixed, f"Missing expected link: {link}"
+    # Should not include plain auto link (https://auto-link.com) as it's not in angle brackets
+    assert "https://auto-link.com" not in result_mixed
+    assert len(result_mixed) == len(expected_links)
+
+
+def test_extract_bare_links() -> None:
+    """Test extraction of bare links in angle brackets."""
+    content = "Visit <https://example.com> and <https://github.com/user/repo> for more info"
+    result = extract_links(content)
+    assert "https://example.com" in result
+    assert "https://github.com/user/repo" in result
+    assert len(result) == 2
+
+
+def test_extract_footnote_links() -> None:
+    """Test extraction of links within footnotes."""
+    content = dedent("""
+        Main text with reference[^1].
+        
+        [^1]: This footnote has a [regular link](https://example.com) and <https://bare-link.com>
+        """)
+    result = extract_links(content)
+    assert "https://example.com" in result
+    assert "https://bare-link.com" in result
+    assert len(result) == 2
+
+
+def test_extract_reference_style_links() -> None:
+    """Test extraction of reference-style links."""
+    content = dedent("""
+        Check out [this article][ref1] and [this other one][ref2].
+        
+        [ref1]: https://example.com/article1
+        [ref2]: https://example.com/article2
+        """)
+    result = extract_links(content)
+    assert "https://example.com/article1" in result
+    assert "https://example.com/article2" in result
+    assert len(result) == 2
+
+
+def test_extract_links_with_internal_fragments() -> None:
+    """Test that internal fragment links are excluded by default but included when requested."""
+    content = dedent("""
+        See [this section](#introduction) and [external link](https://example.com).
+        Also check [another section](#conclusion) here.
+        """)
+
+    # Default behavior: exclude internal links
+    result = extract_links(content)
+    assert "https://example.com" in result
+    assert "#introduction" not in result
+    assert "#conclusion" not in result
+    assert len(result) == 1
+
+    # Include internal links
+    result_with_internal = extract_links(content, include_internal=True)
+    assert "https://example.com" in result_with_internal
+    assert "#introduction" in result_with_internal
+    assert "#conclusion" in result_with_internal
+    assert len(result_with_internal) == 3
+
+
+def test_extract_links_mixed_real_world() -> None:
+    """Test with a realistic mixed document containing various link types."""
+    content = dedent("""
+        # Research Article
+        
+        This study examines ketamine therapy[^109] and references multiple sources.
+        
+        ## Methods
+        
+        We reviewed literature from [PubMed](https://pubmed.ncbi.nlm.nih.gov) 
+        and other databases <https://scholar.google.com>.
+        
+        For protocol details, see [our methodology][methodology].
+        
+        [methodology]: https://research.example.com/protocol
+        
+        [^109]: What Is The Future Of Ketamine Therapy For Mental Health Treatment?
+            - The Ko-Op, accessed June 28, 2025,
+              <https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/>
+        """)
+
+    result = extract_links(content)
+    expected_links = [
+        "https://pubmed.ncbi.nlm.nih.gov",
+        "https://scholar.google.com",
+        "https://research.example.com/protocol",
+        "https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/",
+    ]
+
+    for link in expected_links:
+        assert link in result, f"Missing expected link: {link}"
+    assert len(result) == len(expected_links)

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/web_gen/tabbed_webpage.py

@@ -82,7 +82,7 @@ def tabbed_webpage_config(
 
     config_item = Item(
         title=f"{title} (config)",
-        type=ItemType.config,
+        type=ItemType.data,
         format=Format.yaml,
         body=to_yaml_string(asdict(config)),
     )
@@ -108,7 +108,7 @@ def tabbed_webpage_generate(
     """
     Generate a web page using the supplied config.
     """
-    config = config_item.read_as_config()
+    config = config_item.read_as_data()
     tabbed_webpage = as_dataclass(config, TabbedWebpage)  # Checks the format.
 
     _load_tab_content(tabbed_webpage)

{kash_shell-0.3.21 → kash_shell-0.3.22}/src/kash/xonsh_custom/load_into_xonsh.py

@@ -15,7 +15,6 @@ from kash.config.settings import RECOMMENDED_PKGS, check_kerm_code_support
 from kash.config.text_styles import LOGO_NAME, STYLE_HINT
 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
 from kash.workspaces import current_ws
 from kash.xonsh_custom.customize_prompt import get_prompt_info, kash_xonsh_prompt
 from kash.xonsh_custom.shell_load_commands import (
@@ -109,5 +108,3 @@ def load_into_xonsh():
 
     else:
         reload_shell_commands_and_actions()
-
-    log.info("kash %s loaded", get_version_tag())

kash_shell-0.3.21/src/kash/docs/markdown/warning.md

@@ -1,3 +0,0 @@
-**Important:** *Kash will not execute commands without confirmation.
-But this is a shell so commands can be destructive or dangerous.
-Review commands carefully!*