kash-shell 0.3.33__py3-none-any.whl → 0.3.34__py3-none-any.whl

kash/actions/core/markdownify_html.py

@@ -13,9 +13,7 @@ from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
 log = get_logger(__name__)
 
 
-@kash_action(
-    precondition=is_url_resource | has_html_body, output_format=Format.markdown, mcp_tool=True
-)
+@kash_action(precondition=is_url_resource | has_html_body, output_format=Format.markdown)
 def markdownify_html(item: Item) -> Item:
     """
     Converts raw HTML or the URL of an HTML page to Markdown, fetching with the content

kash/actions/core/summarize_as_bullets.py

@@ -47,7 +47,7 @@ llm_options = LLMOptions(
 )
 
 
-@kash_action(llm_options=llm_options, params=common_params("model"), mcp_tool=True)
+@kash_action(llm_options=llm_options, params=common_params("model"))
 def summarize_as_bullets(item: Item, model: LLMName = LLM.default_standard) -> Item:
     """
     Summarize text as bullet points.

kash/model/actions_model.py

@@ -585,9 +585,9 @@ class Action(ABC):
                 "type": "array",
                 "items": {
                     "type": "string",
-                    "description": "A path to a local file or a URL",
+                    "description": "A URL or S3 URL or a workspace file path, e.g. https://example.com/some/file/path or s3://somebucket/some/file/path or some/file/path",
                 },
-                "description": f"Input items ({self.expected_args.as_str()})",
+                "description": f"A list of paths or URLs of input items ({self.expected_args.as_str()}). Use an array of length one for a single input.",
             }
 
             # Set min/max items.

kash/model/items_model.py

@@ -7,6 +7,7 @@ from datetime import UTC, datetime
 from enum import Enum
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, NotRequired, TypedDict, TypeVar, Unpack
+from urllib.parse import urlparse
 
 from frontmatter_format import from_yaml_string, new_yaml
 from prettyfmt import (
@@ -570,12 +571,19 @@ class Item:
         from kash.file_storage.store_filenames import parse_item_filename
 
         # Prefer original to external, e.g. if we know the original but the external might
-        # be a cache filename.
-        path = self.store_path or self.original_filename or self.external_path
+        # be a cache filename. Also check
+        path = (
+            self.store_path
+            or self.original_filename
+            or self.external_path
+            or (self.url and urlparse(self.url).path)
+            or ""
+        ).strip()
         if path:
             path_name, _item_type, _format, _file_ext = parse_item_filename(Path(path).name)
         else:
             path_name = None
+
         return path_name
 
     def slug_name(
@@ -607,6 +615,7 @@ class Item:
 
         slug = self.slug_name()
         full_suffix = self.get_full_suffix()
+
         return join_suffix(slug, full_suffix)
 
     def body_heading(self, allowed_tags: tuple[str, ...] = ("h1", "h2")) -> str | None:

kash/utils/api_utils/multitask_gather.py

@@ -1,7 +1,10 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, TypeVar
+from dataclasses import dataclass
+from typing import Any, Generic, TypeVar, cast
+
+from strif import abbrev_list
 
 from kash.config.logger import get_logger
 from kash.config.settings import global_settings
@@ -14,8 +17,41 @@ T = TypeVar("T")
 log = get_logger(name=__name__)
 
 
+@dataclass(frozen=True)
+class MultitaskResult(Generic[T]):
+    """
+    Container for results from multitask_gather preserving original order.
+    Access `.successes` and `.errors` to get partitioned views.
+    """
+
+    raw_results: list[T | BaseException]
+
+    @property
+    def successes_or_none(self) -> list[T | None]:
+        """
+        Return a list of successes or None, aligned with the original order.
+        """
+        return [
+            None if isinstance(item, BaseException) else cast(T, item) for item in self.raw_results
+        ]
+
+    @property
+    def successes(self) -> list[T]:
+        """
+        Return a list of successes only. May be shorter than the original list.
+        """
+        return [cast(T, item) for item in self.raw_results if not isinstance(item, BaseException)]
+
+    @property
+    def errors(self) -> list[BaseException]:
+        """
+        Return a list of errors only. May be shorter than the original list.
+        """
+        return [item for item in self.raw_results if isinstance(item, BaseException)]
+
+
 def _default_labeler(total: int) -> Callable[[int, Any], str]:
-    def labeler(i: int, _spec: Any) -> str:  # pyright: ignore[reportUnusedParameter]
+    def labeler(i: int, _spec: Any) -> str:
         return f"Task {i + 1}/{total}"
 
     return labeler
@@ -29,7 +65,7 @@ async def multitask_gather(
     bucket_limits: dict[str, Limit] | None = None,
     retry_settings: RetrySettings | None = None,
     show_progress: bool = True,
-) -> list[T]:
+) -> MultitaskResult[T]:
     """
     Run many `FuncTask`s concurrently with shared progress UI and rate limits.
 
@@ -39,7 +75,8 @@ async def multitask_gather(
     - `labeler` can be omitted; a simple "Task X/Y" label will be used.
     - If `limit` is not provided, defaults are taken from `global_settings()`.
     - If `show_progress` is False, tasks are run without the status context.
-    - By default, exceptions are returned as results rather than raised (return_exceptions=True).
+    - Exceptions are collected (using return_exceptions=True). Use properties on the
+      returned `MultitaskResult` to access `.successes` and `.errors`.
     """
 
     # Normalize tasks to a list for length and stable iteration
@@ -64,11 +101,34 @@ async def multitask_gather(
         log.warning("Running %d tasks (progress disabled)…", len(task_list))
 
     async with multitask_status(enabled=show_progress) as status:
-        return await gather_limited_sync(
-            *task_list,
-            limit=effective_limit,
-            bucket_limits=bucket_limits,
-            status=status,
-            labeler=effective_labeler,
-            retry_settings=retry_settings,
+        raw_results = cast(
+            list[T | BaseException],
+            await gather_limited_sync(
+                *task_list,
+                limit=effective_limit,
+                bucket_limits=bucket_limits,
+                status=status,
+                labeler=effective_labeler,
+                retry_settings=retry_settings,
+                return_exceptions=True,
+            ),
+        )
+
+    result = MultitaskResult[T](raw_results=raw_results)
+
+    if result.errors:
+        log.warning(
+            "multitask_gather: had %d errors (out of %d tasks): %s",
+            len(result.errors),
+            len(task_list),
+            abbrev_list(result.errors),
+        )
+        log.error(
+            "multitask_gather: first error (full traceback):",
+            exc_info=(
+                type(result.errors[0]),
+                result.errors[0],
+                result.errors[0].__traceback__,
+            ),
         )
+    return result

kash/utils/rich_custom/multitask_status.py

@@ -72,6 +72,8 @@ RUNNING_SYMBOL = ""
 DEFAULT_LABEL_WIDTH = 40
 DEFAULT_PROGRESS_WIDTH = 20
 
+MAX_DISPLAY_TASKS = 20
+
 
 # Calculate spinner width to maintain column alignment
 def _get_spinner_width(spinner_name: str) -> int:
@@ -101,6 +103,9 @@ class StatusSettings:
     transient: bool = True
     refresh_per_second: float = 10
     styles: StatusStyles = DEFAULT_STYLES
+    # Maximum number of tasks to keep visible in the live display.
+    # Older completed/skipped/failed tasks beyond this cap will be removed from the live view.
+    max_display_tasks: int = MAX_DISPLAY_TASKS
 
 
 class SpinnerStatusColumn(ProgressColumn):
@@ -298,6 +303,10 @@ class MultiTaskStatus(AbstractAsyncContextManager):
         self._task_info: dict[int, TaskInfo] = {}
         self._next_id: int = 1
         self._rich_task_ids: dict[int, TaskID] = {}  # Map our IDs to Rich Progress IDs
+        # Track order of tasks added to the Progress so we can prune oldest completed ones
+        self._displayed_task_order: list[int] = []
+        # Track tasks pruned from the live display so we don't re-add them later
+        self._pruned_task_ids: set[int] = set()
 
         # Unified live integration
         self._unified_live: Any | None = None  # Reference to the global unified live
@@ -442,6 +451,10 @@ class MultiTaskStatus(AbstractAsyncContextManager):
                 progress_display=None,
             )
             self._rich_task_ids[task_id] = rich_task_id
+            self._displayed_task_order.append(task_id)
+
+            # Prune if too many tasks are visible (prefer removing completed ones)
+            self._prune_completed_tasks_if_needed()
 
     async def set_progress_display(self, task_id: int, display: RenderableType) -> None:
         """
@@ -536,18 +549,31 @@ class MultiTaskStatus(AbstractAsyncContextManager):
 
             # Complete the progress bar and stop spinner
             if rich_task_id is not None:
-                total = self._progress.tasks[rich_task_id].total or 1
+                # Safely find the Task by id; Progress.tasks is a list, not a dict
+                task_obj = next((t for t in self._progress.tasks if t.id == rich_task_id), None)
+                if task_obj is not None and task_obj.total is not None:
+                    total = task_obj.total
+                else:
+                    total = task_info.steps_total or 1
                 self._progress.update(rich_task_id, completed=total, task_info=task_info)
             else:
-                # Task was never started, but we still need to add it to show completion
-                rich_task_id = self._progress.add_task(
-                    "",
-                    total=task_info.steps_total,
-                    label=task_info.label,
-                    completed=task_info.steps_total,
-                    task_info=task_info,
-                )
-                self._rich_task_ids[task_id] = rich_task_id
+                # If this task was pruned from the live display, skip re-adding it
+                if task_id in self._pruned_task_ids:
+                    pass
+                else:
+                    # Task was never started; add a completed row so it appears once
+                    rich_task_id = self._progress.add_task(
+                        "",
+                        total=task_info.steps_total,
+                        label=task_info.label,
+                        completed=task_info.steps_total,
+                        task_info=task_info,
+                    )
+                    self._rich_task_ids[task_id] = rich_task_id
+                    self._displayed_task_order.append(task_id)
+
+            # After finishing, prune completed tasks to respect max visible cap
+            self._prune_completed_tasks_if_needed()
 
     def get_task_info(self, task_id: int) -> TaskInfo | None:
         """Get additional task information."""
@@ -567,6 +593,54 @@ class MultiTaskStatus(AbstractAsyncContextManager):
         """Get console instance for additional output above progress."""
         return self._progress.console
 
+    def _prune_completed_tasks_if_needed(self) -> None:
+        """
+        Ensure at most `max_display_tasks` tasks are visible by removing the oldest
+        completed/skipped/failed tasks first. Running or waiting tasks are never
+        removed by this method.
+        Note: This method assumes it's called under self._lock.
+        """
+        max_visible = self.settings.max_display_tasks
+
+        # Nothing to prune or unlimited
+        if max_visible <= 0:
+            return
+
+        # Count visible tasks (those with a Rich task id present)
+        visible_task_ids = [tid for tid in self._displayed_task_order if tid in self._rich_task_ids]
+        excess = len(visible_task_ids) - max_visible
+        if excess <= 0:
+            return
+
+        # Build list of terminal tasks that can be pruned (oldest first)
+        terminal_tasks = []
+        for tid in self._displayed_task_order:
+            if tid not in self._rich_task_ids:
+                continue
+            info = self._task_info.get(tid)
+            if info and info.state in (
+                TaskState.COMPLETED,
+                TaskState.FAILED,
+                TaskState.SKIPPED,
+            ):
+                terminal_tasks.append(tid)
+
+        # Remove the oldest terminal tasks up to the excess count
+        tasks_to_remove = terminal_tasks[:excess]
+
+        for tid in tasks_to_remove:
+            rich_tid = self._rich_task_ids.pop(tid, None)
+            if rich_tid is not None:
+                # Remove from Rich progress display
+                self._progress.remove_task(rich_tid)
+            # Mark as pruned so we don't re-add on finish
+            self._pruned_task_ids.add(tid)
+
+        # Efficiently rebuild the displayed task order without the removed tasks
+        self._displayed_task_order = [
+            tid for tid in self._displayed_task_order if tid not in tasks_to_remove
+        ]
+
 
 ## Tests
 

kash/utils/text_handling/markdown_footnotes.py

@@ -1,48 +1,19 @@
 from __future__ import annotations
 
-import re
 from dataclasses import dataclass, field
 from typing import Any
 
-from flowmark import flowmark_markdown, line_wrap_by_sentence
 from marko import Markdown
+from marko.block import Document
 from marko.ext import footnote
 
-from kash.utils.text_handling.markdown_utils import comprehensive_transform_tree
-
-
-def _normalize_footnotes_in_markdown(content: str) -> str:
-    """
-    Ensure blank lines between consecutive footnote definitions.
-
-    Marko has a bug where consecutive footnotes without blank lines are parsed
-    as a single footnote. This adds blank lines where needed.
-    """
-    lines = content.split("\n")
-    result = []
-    i = 0
-
-    while i < len(lines):
-        line = lines[i]
-        result.append(line)
-
-        # Check if this is a footnote definition
-        if re.match(r"^\[\^[^\]]+\]:", line):
-            # Look ahead to see if the next non-empty line is also a footnote
-            j = i + 1
-            while j < len(lines) and not lines[j].strip():
-                result.append(lines[j])
-                j += 1
-
-            if j < len(lines) and re.match(r"^\[\^[^\]]+\]:", lines[j]):
-                # Next non-empty line is also a footnote, add blank line
-                result.append("")
-
-            i = j
-        else:
-            i += 1
-
-    return "\n".join(result)
+from kash.utils.text_handling.markdown_utils import (
+    MARKDOWN as DEFAULT_MARKDOWN,
+)
+from kash.utils.text_handling.markdown_utils import (
+    comprehensive_transform_tree,
+    normalize_footnotes_in_markdown,
+)
 
 
 @dataclass
@@ -81,15 +52,17 @@ class MarkdownFootnotes:
             MarkdownFootnotes instance with all footnotes indexed by ID
         """
         if markdown_parser is None:
-            markdown_parser = flowmark_markdown(line_wrap_by_sentence(is_markdown=True))
+            markdown_parser = DEFAULT_MARKDOWN
 
         # Normalize to work around marko bug with consecutive footnotes
-        normalized_content = _normalize_footnotes_in_markdown(content)
+        normalized_content = normalize_footnotes_in_markdown(content)
         document = markdown_parser.parse(normalized_content)
         return MarkdownFootnotes.from_document(document, markdown_parser)
 
     @staticmethod
-    def from_document(document: Any, markdown_parser: Markdown | None = None) -> MarkdownFootnotes:
+    def from_document(
+        document: Document, markdown_parser: Markdown | None = None
+    ) -> MarkdownFootnotes:
         """
         Extract all footnotes from a parsed markdown document.
 
@@ -102,7 +75,7 @@ class MarkdownFootnotes:
             MarkdownFootnotes instance with all footnotes indexed by ID
         """
         if markdown_parser is None:
-            markdown_parser = flowmark_markdown(line_wrap_by_sentence(is_markdown=True))
+            markdown_parser = DEFAULT_MARKDOWN
 
         footnotes_dict: dict[str, FootnoteInfo] = {}
 
@@ -206,9 +179,9 @@ def extract_footnote_references(content: str, markdown_parser: Markdown | None =
         List of unique footnote IDs that are referenced (with the ^)
     """
     if markdown_parser is None:
-        markdown_parser = flowmark_markdown(line_wrap_by_sentence(is_markdown=True))
+        markdown_parser = DEFAULT_MARKDOWN
 
-    normalized_content = _normalize_footnotes_in_markdown(content)
+    normalized_content = normalize_footnotes_in_markdown(content)
     document = markdown_parser.parse(normalized_content)
     references: list[str] = []
     seen: set[str] = set()

kash/utils/text_handling/markdown_utils.py

@@ -26,10 +26,48 @@ MARKDOWN_ESCAPE_CHARS = r"([\\`*_{}\[\]()#+.!-])"
 MARKDOWN_ESCAPE_RE = re.compile(MARKDOWN_ESCAPE_CHARS)
 
 # Use flowmark for Markdown parsing and rendering.
-# Replaces the single shard marko Markdown object.
+# This replaces the single shared Markdown object that marko offers.
 MARKDOWN = flowmark_markdown(line_wrap_by_sentence(is_markdown=True))
 
 
+# Regex for a markdown footnote definition line: "[^id]: ..."
+FOOTNOTE_DEF_RE = re.compile(r"^\[\^[^\]]+\]:")
+
+
+def normalize_footnotes_in_markdown(content: str) -> str:
+    """
+    Ensure blank lines between consecutive footnote definitions.
+
+    Some markdown parsers (marko) merge consecutive footnotes without blank
+    lines into a single definition. This adds blank lines where needed.
+    """
+    lines = content.split("\n")
+    result: list[str] = []
+    i = 0
+
+    while i < len(lines):
+        line = lines[i]
+        result.append(line)
+
+        # Check if this is a footnote definition
+        if FOOTNOTE_DEF_RE.match(line):
+            # Look ahead to see if the next non-empty line is also a footnote
+            j = i + 1
+            while j < len(lines) and not lines[j].strip():
+                result.append(lines[j])
+                j += 1
+
+            if j < len(lines) and FOOTNOTE_DEF_RE.match(lines[j]):
+                # Next non-empty line is also a footnote, add blank line
+                result.append("")
+
+            i = j
+        else:
+            i += 1
+
+    return "\n".join(result)
+
+
 def escape_markdown(text: str) -> str:
     """
     Escape characters with special meaning in Markdown.
@@ -87,42 +125,49 @@ def comprehensive_transform_tree(element: Any, transformer: Callable[[Any], None
                 comprehensive_transform_tree(child, transformer)
 
 
-def _tree_links(element, include_internal=False):
-    links = []
+def _tree_links(element, include_internal=False) -> list[str]:
+    links: list[str] = []
 
     def _find_links(element):
         if isinstance(element, (Link, AutoLink)):
             if include_internal or not element.dest.startswith("#"):
+                assert isinstance(element.dest, str)
                 links.append(element.dest)
 
     comprehensive_transform_tree(element, _find_links)
     return links
 
 
-def extract_links(content: str, include_internal=False) -> list[str]:
+# TODO: Marko seems to include trailing parentheses on bare links.
+# Fix this in flowmark
+def _fix_link(url: str) -> str:
+    return url.rstrip(")")
+
+
+def extract_urls(content: str, include_internal=False) -> list[Url]:
     """
-    Extract all links from Markdown content. Deduplicates and
-    preserves order.
+    Extract all URLs from Markdown content. Deduplicates and preserves order.
 
     Raises:
         marko.ParseError: If the markdown content contains invalid syntax that cannot be parsed.
     """
+    content = normalize_footnotes_in_markdown(content)
     document = MARKDOWN.parse(content)
     all_links = _tree_links(document, include_internal)
 
     # Deduplicate while preserving order
     seen: dict[str, None] = {}
-    result = []
+    result: list[Url] = []
     for link in all_links:
         if link not in seen:
             seen[link] = None
-            result.append(link)
+            result.append(Url(_fix_link(link)))
     return result
 
 
-def extract_file_links(file_path: Path, include_internal=False) -> list[str]:
+def extract_file_urls(file_path: Path, include_internal=False) -> list[Url]:
     """
-    Extract all links from a Markdown file. Future: Include textual and section context.
+    Extract all URLs from a Markdown file. Future: Include textual and section context.
 
     Returns an empty list if there are parsing errors.
     """
@@ -130,7 +175,7 @@ def extract_file_links(file_path: Path, include_internal=False) -> list[str]:
 
     try:
         content = file_path.read_text()
-        return extract_links(content, include_internal)
+        return extract_urls(content, include_internal)
     except Exception as e:
         logging.warning(f"Failed to extract links from {file_path}: {e}")
         return []
@@ -156,6 +201,7 @@ def rewrite_urls(
     Raises:
         marko.ParseError: If the markdown content contains invalid syntax that cannot be parsed.
     """
+    content = normalize_footnotes_in_markdown(content)
     document = MARKDOWN.parse(content)
     _rewrite_tree_urls(document, url_rewriter, element_types)
 
@@ -232,6 +278,7 @@ def extract_first_header(content: str) -> str | None:
     Raises:
         marko.ParseError: If the markdown content contains invalid syntax that cannot be parsed.
     """
+    content = normalize_footnotes_in_markdown(content)
     document = MARKDOWN.parse(content)
 
     if document.children and isinstance(document.children[0], Heading):
@@ -282,18 +329,25 @@ def _extract_list_item_markdown(element: Any) -> str:
         return ""
 
 
-def extract_bullet_points(content: str, *, strict: bool = False) -> list[str]:
+def extract_bullet_points(
+    content: str, *, strict: bool = False, allow_paragraphs: bool = False
+) -> list[str]:
     """
     Extract list item values from a Markdown file, preserving all original formatting.
 
     If no bullet points are found and `strict` is False, returns the entire content
     as a single item (treating plain text as if it were the first bullet point).
+
     If `strict` is True, only actual list items are returned.
 
+    If `allow_paragraphs` is True, if the content contains multiple paragraphs and no
+    bullet points are found, return the paragraphs as separate items.
+
     Raises:
         ValueError: If `strict` is True and no bullet points are found.
         marko.ParseError: If the markdown content contains invalid syntax that cannot be parsed.
     """
+    content = normalize_footnotes_in_markdown(content)
     document = MARKDOWN.parse(content)
     bullet_points: list[str] = []
 
@@ -308,6 +362,8 @@ def extract_bullet_points(content: str, *, strict: bool = False) -> list[str]:
     if not bullet_points:
         if strict:
             raise ValueError("No bullet points found in content")
+        elif allow_paragraphs and "\n\n" in content:
+            return [p.strip() for p in content.split("\n\n")]
         elif content.strip():
             # Not strict mode, treat as plain text
             return [content.strip()]
@@ -372,6 +428,7 @@ def extract_headings(text: str) -> list[tuple[HTag, str]]:
         marko.ParseError: If the markdown content contains invalid syntax that cannot be parsed.
         ValueError: If a heading with an unsupported level is encountered.
     """
+    text = normalize_footnotes_in_markdown(text)
     document = MARKDOWN.parse(text)
     headings_list: list[tuple[HTag, str]] = []
 
@@ -788,7 +845,7 @@ def test_markdown_utils_exceptions() -> None:
     import tempfile
 
     # Test extract_file_links with non-existent file
-    result = extract_file_links(Path("/non/existent/file.md"))
+    result = extract_file_urls(Path("/non/existent/file.md"))
     assert result == []  # Should return empty list for any error
 
     # Test extract_file_links with empty file (should work fine)
@@ -797,7 +854,7 @@ def test_markdown_utils_exceptions() -> None:
         tmp_path = Path(tmp.name)
 
     try:
-        result = extract_file_links(tmp_path)
+        result = extract_file_urls(tmp_path)
         assert result == []  # Empty file has no links
     finally:
         tmp_path.unlink()
@@ -808,7 +865,7 @@ def test_markdown_utils_exceptions() -> None:
         tmp_path = Path(tmp.name)
 
     try:
-        result = extract_file_links(tmp_path)
+        result = extract_file_urls(tmp_path)
         # Should still work - marko is very permissive with markdown
         assert isinstance(result, list)
     finally:
@@ -816,11 +873,11 @@ def test_markdown_utils_exceptions() -> None:
 
     # Test extract_links with string content
     content = "Check out [this link](https://example.com) and [internal](#section)"
-    result = extract_links(content)
+    result = extract_urls(content)
     assert "https://example.com" in result
     assert "#section" not in result  # Internal links excluded by default
 
-    result_with_internal = extract_links(content, include_internal=True)
+    result_with_internal = extract_urls(content, include_internal=True)
     assert "https://example.com" in result_with_internal
     assert "#section" in result_with_internal
 
@@ -830,21 +887,21 @@ def test_extract_links_comprehensive() -> None:
 
     # Test regular markdown links
     regular_links = "Check out [this link](https://example.com) and [another](https://test.com)"
-    result = extract_links(regular_links)
+    result = extract_urls(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)
+    result_bare = extract_urls(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 (GFM extension enables auto-linking of plain URLs)
     auto_links = "Visit https://stackoverflow.com or http://reddit.com"
-    result_auto = extract_links(auto_links)
+    result_auto = extract_urls(auto_links)
     assert "https://stackoverflow.com" in result_auto
     assert "http://reddit.com" in result_auto
     assert len(result_auto) == 2  # GFM auto-links plain URLs
@@ -855,7 +912,7 @@ def test_extract_links_comprehensive() -> None:
     - The Ko-Op, accessed June 28, 2025,
       <https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/>
 """
-    result_footnote = extract_links(footnote_content)
+    result_footnote = extract_urls(footnote_content)
     assert (
         "https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/"
         in result_footnote
@@ -873,7 +930,7 @@ 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)
+    result_mixed = extract_urls(mixed_content)
     expected_links = [
         "https://example.com",  # Regular link
         "https://bare-link.com",  # Bare link
@@ -889,7 +946,7 @@ Auto link: https://auto-link.com
 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)
+    result = extract_urls(content)
     assert "https://example.com" in result
     assert "https://github.com/user/repo" in result
     assert len(result) == 2
@@ -902,7 +959,7 @@ def test_extract_footnote_links() -> None:
         
         [^1]: This footnote has a [regular link](https://example.com) and <https://bare-link.com>
         """)
-    result = extract_links(content)
+    result = extract_urls(content)
     assert "https://example.com" in result
     assert "https://bare-link.com" in result
     assert len(result) == 2
@@ -916,7 +973,7 @@ def test_extract_reference_style_links() -> None:
         [ref1]: https://example.com/article1
         [ref2]: https://example.com/article2
         """)
-    result = extract_links(content)
+    result = extract_urls(content)
     assert "https://example.com/article1" in result
     assert "https://example.com/article2" in result
     assert len(result) == 2
@@ -931,14 +988,14 @@ def test_extract_links_and_dups() -> None:
         """)
 
     # Default behavior: exclude internal links
-    result = extract_links(content)
+    result = extract_urls(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)
+    result_with_internal = extract_urls(content, include_internal=True)
     assert "https://example.com" in result_with_internal
     assert "#introduction" in result_with_internal
     assert "#conclusion" in result_with_internal
@@ -966,7 +1023,7 @@ def test_extract_links_mixed_real_world() -> None:
               <https://psychedelictherapists.co/blog/the-future-of-ketamine-assisted-psychotherapy/>
         """)
 
-    result = extract_links(content)
+    result = extract_urls(content)
     expected_links = [
         "https://pubmed.ncbi.nlm.nih.gov",
         "https://scholar.google.com",
@@ -1369,3 +1426,26 @@ def test_rewrite_urls_simplified_api() -> None:
     # Verify that relative URLs in angle brackets remain unchanged
     # (marko doesn't parse them as URL elements)
     assert "<./contact.html>" in result
+
+
+def test_extract_links_parentheses_adjacent() -> None:
+    """URLs adjacent to closing parentheses should not include the parenthesis."""
+    content = dedent(
+        """
+        [^res1]: Under 50 U.S.C. § 4531(c)(3), amounts in the Defense Production Act Fund (used
+            for Title III) “shall remain available until expended,” meaning they do not expire
+            at the end of a fiscal year (law text:
+            https://www.law.cornell.edu/uscode/text/50/4531).
+
+        [^res2]: USAspending.gov’s federal account 097-0801 (Defense Production Act Purchases,
+            Defense) provides official figures for obligations and unobligated balances by
+            fiscal year drawn from Treasury data (https://www.usaspending.gov/account/097-0801).
+        """
+    )
+
+    links = extract_urls(content)
+    assert "https://www.law.cornell.edu/uscode/text/50/4531" in links
+    assert "https://www.law.cornell.edu/uscode/text/50/4531)" not in links
+
+    assert "https://www.usaspending.gov/account/097-0801" in links
+    assert "https://www.usaspending.gov/account/097-0801)" not in links

{kash_shell-0.3.33.dist-info → kash_shell-0.3.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.33
+Version: 0.3.34
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -20,7 +20,7 @@ Requires-Dist: aiolimiter>=1.2.1
 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.5
+Requires-Dist: chopdiff>=0.2.6
 Requires-Dist: clideps>=0.1.4
 Requires-Dist: colour>=0.1.5
 Requires-Dist: cssselect>=1.2.0
@@ -41,7 +41,7 @@ Requires-Dist: litellm>=1.74.15.post1
 Requires-Dist: markdownify>=0.13.1
 Requires-Dist: mcp-proxy>=0.5.0
 Requires-Dist: mcp>=1.6.0
-Requires-Dist: openai>=1.66.3
+Requires-Dist: openai==1.99.9
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: patch-ng>=1.18.1
 Requires-Dist: pathspec>=0.12.1

{kash_shell-0.3.33.dist-info → kash_shell-0.3.34.dist-info}/RECORD

@@ -6,14 +6,14 @@ kash/actions/core/chat.py,sha256=9_xh9cWwXjkC_SYme-ScOg6Miqeydv15ccrwHqQvgq8,272
 kash/actions/core/combine_docs.py,sha256=5bTU7n_ICavvTXfC7fs5BDMeZYn7Xh5FkU7DVQqDHAQ,1536
 kash/actions/core/concat_docs.py,sha256=Umx3VzFiHJGY-76AEs4ju_1HnB9SbQsBux03Mkeig24,1345
 kash/actions/core/format_markdown_template.py,sha256=ZJbtyTSypPo2ewLiGRSyIpVf711vQMhI_-Ng-FgCs80,2991
-kash/actions/core/markdownify_html.py,sha256=0ZPH4b7IUWbMGi1mi0RzDPQKlqpLIsOy6ax_Gn7SSyA,1770
+kash/actions/core/markdownify_html.py,sha256=Oqpq9b9JgMItOwJwbC5b5rG8UR0pXhxernjsdHyVB-o,1749
 kash/actions/core/minify_html.py,sha256=TRhyn7Gvcowou8pzq9vzDTtcCFOA4eC5217pJ9rPuOw,1386
 kash/actions/core/readability.py,sha256=P1whiDanaAKTPw2KwHG15QNcjHzwpuTWne0s4LyUfuQ,990
 kash/actions/core/render_as_html.py,sha256=i0WgtDgEJAeTTpVLS_CxDloDCb1Mhkzrcvv0VmoOyQ8,1901
 kash/actions/core/save_sidematter_meta.py,sha256=fKLE5eWIorOdw_FW46AUivXACQ6cxWvKWllcEjT6mz8,1440
 kash/actions/core/show_webpage.py,sha256=2A8u29Wf-iWNbPRfnz7u6MUhcXk_b8B8ruUT825d_mA,978
 kash/actions/core/strip_html.py,sha256=FDLN_4CKB11q5cU4NixTf7PGrAq92AjQNbKAdvQDwCY,849
-kash/actions/core/summarize_as_bullets.py,sha256=Zwr8lNzL77pwpnW_289LQjNBijNDpTPANfFdOJA-PZ4,2070
+kash/actions/core/summarize_as_bullets.py,sha256=bzEH43BwwdqMJCt6m01iIME8sfmVPylBtF1PNbDdrBw,2055
 kash/actions/core/tabbed_webpage_config.py,sha256=rIbzEhBTmnkbSiRZC-Rj46T1J6c0jOztiKE9Usa4nsc,980
 kash/actions/core/tabbed_webpage_generate.py,sha256=935HkDSuP4eZ1e0xf-LhjPOdicU3wI5Kuh79r61QCl8,988
 kash/actions/core/zip_sidematter.py,sha256=E7ae0g9Bz7uXApYdNY-a8GvSIIPoqXcD95mjMaKQlsM,1557
@@ -163,13 +163,13 @@ kash/media_base/transcription_format.py,sha256=rOVPTpwvW22c27BRwYF-Tc_xzqK_wOtUZ
 kash/media_base/transcription_whisper.py,sha256=GqvroW9kBAH4-gcbYkMgNCfs2MpMIgm1ip3NMWtJ0IE,1169
 kash/media_base/services/local_file_media.py,sha256=_NV-T90rShJ8ucUjQXMPCKKJ50GSFE9PyyVzhXp5z9w,5624
 kash/model/__init__.py,sha256=kFfBKb5N70NWYUfpRRxn_Sb9p_vXlB6BBaTCqWmSReo,2978
-kash/model/actions_model.py,sha256=-41qz76Z9NZZhRQcPDRopyHAGxHCrTvbMRDv8fnb7CQ,23185
+kash/model/actions_model.py,sha256=D-q-eZO_yOug3fuvDUWB1AI_MNwhpElSomaPS7PybyU,23362
 kash/model/assistant_response_model.py,sha256=6eDfC27nyuBDFjv5nCYMa_Qb2mPbKwDzZy7uLOIyskI,2653
 kash/model/compound_actions_model.py,sha256=oYEtVKtQv-mA1abZkK7PvaM9xazVBUuk1z0geKBulak,6965
 kash/model/concept_model.py,sha256=we2qOcy9Mv1q7XPfkDLp_CyO_-8DwAUfUYlpgy_jrFs,1011
 kash/model/exec_model.py,sha256=3Su3NEmEtDoSuQSxvg75FYY_EdClSM5pwQK1i7_S88A,3131
 kash/model/graph_model.py,sha256=T034y0E9OJtITd1g9zp9vll5pLscdatq6JoT08KvPZE,2724
-kash/model/items_model.py,sha256=V7so_AWc7skRZGlByIK5m3ETUaHEw8IYx9OB9pmzNEA,39545
+kash/model/items_model.py,sha256=--n5PzDHuX0zp0cleCAEhigqzj9g4uSIoF58iIpv2AI,39720
 kash/model/language_list.py,sha256=I3RIbxTseVmPdhExQimimEv18Gmy2ImMbpXe0-_t1Qw,450
 kash/model/llm_actions_model.py,sha256=a29uXVNfS2CiqvM7HPdC6H9A23rSQQihAideuBLMH8g,2110
 kash/model/media_model.py,sha256=ZnlZ-FkswbAIGpUAuNqLce1WDZK-WbnwHn2ipg8x7-0,3511
@@ -208,7 +208,7 @@ kash/utils/api_utils/api_retries.py,sha256=TtgxLxoMnXIzYMKbMUzsnVcPf-aKFm3cJ95zO
 kash/utils/api_utils/cache_requests_limited.py,sha256=TA5buZ9Dgbj4I1zHhwerTXre018i0TCACGsezsjX9Uc,3140
 kash/utils/api_utils/gather_limited.py,sha256=6K0Z3u_NeX9wBfFFk21wUQeSimaDIm53AHlGYRLD6LQ,33018
 kash/utils/api_utils/http_utils.py,sha256=Ou6QNiba5w7n71cgNmV168OFTLmMDNxWW5MM-XkFEME,1461
-kash/utils/api_utils/multitask_gather.py,sha256=iC1UlZXZV7YMevDD--mCi1eR0Rmd7wAWrOy-C_l0ACw,2594
+kash/utils/api_utils/multitask_gather.py,sha256=LAylwWZ2APbv-O_l0kLwBfP762D0qswMBV8ID4eCOA0,4446
 kash/utils/api_utils/progress_protocol.py,sha256=6cT5URY6cScHYd6UZoTT_rHI0mbsE52joBf88regEN8,8816
 kash/utils/common/__init__.py,sha256=ggeWw1xmbl1mgCQD3c4CNN2h5WXFCsN2wXlCWurEUEI,161
 kash/utils/common/format_utils.py,sha256=83FhAwbMnOQIFudpnOGMuCqCiyoAlWGS6cc8q6xgZus,2072
@@ -244,15 +244,15 @@ kash/utils/lang_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 kash/utils/lang_utils/capitalization.py,sha256=5XbqBvjkzlxsm1Ue5AQP3P1J1IG0PubMVmGnoKVTF-c,3903
 kash/utils/rich_custom/__init__.py,sha256=_g2F3Bqc1UnLTdAdCwkvzXmW7OvmqXrA8DpfT1dKy6w,75
 kash/utils/rich_custom/ansi_cell_len.py,sha256=oQlNrqWB0f6pmigkbRRyeK6oWlGHMPbV_YLO_qmDH5E,2356
-kash/utils/rich_custom/multitask_status.py,sha256=eOON62evEAOmmNyVBSjfYkh5y9OTejQrs02rc2L55VE,24375
+kash/utils/rich_custom/multitask_status.py,sha256=3hMxXNAClxcQzzQdBA0rPDNp19Y_6gT8NRIuT8OkO7Q,27667
 kash/utils/rich_custom/rich_char_transform.py,sha256=3M89tViKM0y31VHsDoHi5eHFWlv5ME7F4p35IdDxnrw,2616
 kash/utils/rich_custom/rich_indent.py,sha256=nz72yNpUuYjOsaPNVmxM81oEQm-GKEfQkNsuWmv16G0,2286
 kash/utils/rich_custom/rich_markdown_fork.py,sha256=M_JRaSAyHrSg-wuLv9C9P7SkehSim3lwkqQPuMIFkVw,26551
 kash/utils/text_handling/doc_normalization.py,sha256=GsK8J8HSVINYYIeO2XQvWYK1ZSiQ6mX34mVb9UOjgG8,3029
 kash/utils/text_handling/escape_html_tags.py,sha256=8pC3JgoKRtdnbnOu8DiWrlvNR6GAqjwhGbQgl3jiFG4,6441
-kash/utils/text_handling/markdown_footnotes.py,sha256=4_ZOez-xHjiSn_XHyqXPk9MNbjts1hiHOh1ARs9vVZA,7494
+kash/utils/text_handling/markdown_footnotes.py,sha256=TgS3un4h_qmZB1KnDUVKaOYLZWhljlUZ-QjLfL6gkgg,6480
 kash/utils/text_handling/markdown_render.py,sha256=LHPdJc__2ejBx7iwkp_P9wIePNmiVSgwu4-uhamVjms,3791
-kash/utils/text_handling/markdown_utils.py,sha256=Yf57dVljpbg8vuHbtcOSHZqz1PafOSBal6R8ESJz1Bs,49220
+kash/utils/text_handling/markdown_utils.py,sha256=ufVYSBvBl9jRYP6Bfsoxhgv754SW3KDxo8rN67OK6a4,52274
 kash/utils/text_handling/markdownify_utils.py,sha256=fXl3uSUk9aHXL0PDqxdlvWvIvBXUQTOfQxnK9uicQcg,2964
 kash/utils/text_handling/unified_diffs.py,sha256=JfHSakISkT_GuBPBI4fTooHrp2aenWzDKiVvDewVfMk,2655
 kash/web_content/canon_url.py,sha256=Zv2q7xQdIHBFkxxwyJn3_ME-qqMFRi_fKxE_IgV2Z50,742
@@ -304,8 +304,8 @@ kash/xonsh_custom/xonsh_modern_tools.py,sha256=mj_b34LZXfE8MJe9EpDmp5JZ0tDM1biYN
 kash/xonsh_custom/xonsh_ranking_completer.py,sha256=ZRGiAfoEgqgnlq2-ReUVEaX5oOgW1DQ9WxIv2OJLuTo,5620
 kash/xontrib/fnm.py,sha256=V2tsOdmIDgbFbZSfMLpsvDIwwJJqiYnOkOySD1cXNXw,3700
 kash/xontrib/kash_extension.py,sha256=FLIMlgR3C_6A1fwKE-Ul0nmmpJSszVPbAriinUyQ8Zg,1896
-kash_shell-0.3.33.dist-info/METADATA,sha256=rEXEktz-jYfIDY2XI0fmEQbBVnLYoo1omDU6B0LQLhw,33547
-kash_shell-0.3.33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kash_shell-0.3.33.dist-info/entry_points.txt,sha256=SQraWDAo8SqYpthLXThei0mf_hGGyhYBUO-Er_0HcwI,85
-kash_shell-0.3.33.dist-info/licenses/LICENSE,sha256=rCh2PsfYeiU6FK_0wb58kHGm_Fj5c43fdcHEexiVzIo,34562
-kash_shell-0.3.33.dist-info/RECORD,,
+kash_shell-0.3.34.dist-info/METADATA,sha256=ubXLWP8kfglDx7f2zvpr1TKaah6BZ6ye-B7hPYorfYc,33547
+kash_shell-0.3.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kash_shell-0.3.34.dist-info/entry_points.txt,sha256=SQraWDAo8SqYpthLXThei0mf_hGGyhYBUO-Er_0HcwI,85
+kash_shell-0.3.34.dist-info/licenses/LICENSE,sha256=rCh2PsfYeiU6FK_0wb58kHGm_Fj5c43fdcHEexiVzIo,34562
+kash_shell-0.3.34.dist-info/RECORD,,