kash-shell 0.3.9__tar.gz → 0.3.11__tar.gz

{kash_shell-0.3.9 → kash_shell-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.9
+Version: 0.3.11
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -19,13 +19,14 @@ Requires-Python: <4.0,>=3.11
 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.1.3
+Requires-Dist: chopdiff>=0.2.1
+Requires-Dist: clideps>=0.1.1
 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.3.1
+Requires-Dist: flowmark>=0.4.5
 Requires-Dist: frontmatter-format>=0.2.1
 Requires-Dist: funlog>=0.2.0
 Requires-Dist: humanfriendly>=10.0
@@ -35,14 +36,14 @@ Requires-Dist: jinja2>=3.1.6
 Requires-Dist: justext>=3.0.2
 Requires-Dist: lazyasd>=0.1.4
 Requires-Dist: litellm>=1.63.11
-Requires-Dist: markdownify>=0.14.1
+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: pandas>=2.2.3
 Requires-Dist: patch-ng>=1.18.1
 Requires-Dist: pathspec>=0.12.1
-Requires-Dist: prettyfmt>=0.3.0
+Requires-Dist: prettyfmt>=0.3.1
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pydub>=0.25.1
@@ -58,7 +59,7 @@ Requires-Dist: rich>=14.0.0
 Requires-Dist: ripgrepy>=2.1.0
 Requires-Dist: send2trash>=1.8.3
 Requires-Dist: setproctitle>=1.3.5
-Requires-Dist: strif>=2.1.0
+Requires-Dist: strif>=3.0.1
 Requires-Dist: tenacity>=9.0.0
 Requires-Dist: thefuzz>=0.22.1
 Requires-Dist: tiktoken>=0.9.0
@@ -589,8 +590,9 @@ A few of the most important commands for managing files and work are these:
   browser to view it.
 
 - `workspace` shows or selects or creates a new workspace.
-  Initially you work in the `global` workspace but for more real work you'll want to
-  create a workspace, which is a directory to hold the files you are working with.
+  Initially you work in the default global workspace (typically at `~/Kash/workspace`)
+  but for more real work you'll want to create a workspace, which is a directory to hold
+  the files you are working with.
 
 - `select` shows or sets selections, which are the set of files the next command will
   run on, within the current workspace.

{kash_shell-0.3.9 → kash_shell-0.3.11}/README.md

@@ -519,8 +519,9 @@ A few of the most important commands for managing files and work are these:
   browser to view it.
 
 - `workspace` shows or selects or creates a new workspace.
-  Initially you work in the `global` workspace but for more real work you'll want to
-  create a workspace, which is a directory to hold the files you are working with.
+  Initially you work in the default global workspace (typically at `~/Kash/workspace`)
+  but for more real work you'll want to create a workspace, which is a directory to hold
+  the files you are working with.
 
 - `select` shows or sets selections, which are the set of files the next command will
   run on, within the current workspace.

{kash_shell-0.3.9 → kash_shell-0.3.11}/pyproject.toml

@@ -42,12 +42,13 @@ dependencies = [
     "pydantic>=2.10.6",
     "typing-extensions>=4.12.2",
     # My tools:
-    "strif>=2.1.0",
+    "strif>=3.0.1",
     "funlog>=0.2.0",
-    "prettyfmt>=0.3.0",
-    "flowmark>=0.3.1",
+    "prettyfmt>=0.3.1",
+    "flowmark>=0.4.5",
     "frontmatter-format>=0.2.1",
-    "chopdiff>=0.1.3",
+    "chopdiff>=0.2.1",
+    "clideps>=0.1.1",
     # 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.
@@ -82,7 +83,7 @@ dependencies = [
     "litellm>=1.63.11",
     # Basic text handling and web scraping:
     "readabilipy>=0.3.0",
-    "markdownify>=0.14.1",
+    "markdownify>=0.13.1",
     "justext>=3.0.2",
     "cssselect>=1.2.0",
     # Minimal media handling:
@@ -115,6 +116,9 @@ dev = [
 kash = "kash.shell.shell_main:main"
 kash-mcp = "kash.mcp.mcp_cli:main"
 
+[tool.uv.sources]
+# For local development:
+# clideps = { path = "../clideps", editable = true }
 
 # ---- Build system ----
 

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/actions/__init__.py

@@ -1,16 +1,16 @@
 from dataclasses import dataclass
 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_action_subdirs
-from kash.utils.common.atomic_var import AtomicVar
+from kash.exec import import_and_register
 from kash.utils.common.import_utils import import_namespace_modules
 
 log = get_logger(__name__)
 
-# This hook can be used for auto-registering actions from any module.
-import_action_subdirs(["core", "meta"], __package__, Path(__file__).parent)
+import_and_register(__package__, Path(__file__).parent, ["core", "meta"])
 
 
 @dataclass(frozen=True)

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/actions/core/format_markdown_template.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import is_markdown
-from kash.model import ONE_OR_MORE_ARGS, ActionInput, ActionResult, ItemType, Param
+from kash.model import ONE_OR_MORE_ARGS, ActionInput, ActionResult, Param
 from kash.utils.common.type_utils import not_none
 from kash.utils.errors import InvalidInput
 
@@ -84,9 +84,6 @@ def format_markdown_template(
     # Format the body using the mapped items.
     body = template.format(**item_map)
 
-    result_item = items[0].derived_copy(
-        type=ItemType.doc,
-        body=body,
-    )
+    result_item = items[0].derived_copy(body=body)
 
     return ActionResult([result_item])

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/actions/core/markdownify.py

@@ -1,7 +1,8 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import has_html_body, is_url_item
-from kash.model import Format, Item, ItemType
+from kash.model import Format, Item
+from kash.model.params_model import common_params
 from kash.web_content.file_cache_utils import get_url_html
 from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
 
@@ -10,20 +11,20 @@ log = get_logger(__name__)
 
 @kash_action(
     precondition=is_url_item | has_html_body,
+    params=common_params("refetch"),
     mcp_tool=True,
 )
-def markdownify(item: Item) -> Item:
+def markdownify(item: Item, refetch: bool = False) -> Item:
     """
     Converts a URL or raw HTML item to Markdown, fetching with the content
     cache if needed. Also uses readability to clean up the HTML.
     """
     from markdownify import markdownify as markdownify_convert
 
-    url, html_content = get_url_html(item)
+    expiration_sec = 0 if refetch else None
+    url, html_content = get_url_html(item, expiration_sec=expiration_sec)
     page_data = extract_text_readabilipy(url, html_content)
     markdown_content = markdownify_convert(page_data.clean_html)
 
-    output_item = item.derived_copy(
-        type=ItemType.doc, format=Format.markdown, body=markdown_content
-    )
+    output_item = item.derived_copy(format=Format.markdown, body=markdown_content)
     return output_item

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/actions/core/readability.py

@@ -1,7 +1,8 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import has_html_body, is_url_item
-from kash.model import Format, Item, ItemType
+from kash.model import Format, Item
+from kash.model.params_model import common_params
 from kash.web_content.file_cache_utils import get_url_html
 from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
 
@@ -10,18 +11,18 @@ log = get_logger(__name__)
 
 @kash_action(
     precondition=is_url_item | has_html_body,
+    params=common_params("refetch"),
     mcp_tool=True,
 )
-def readability(item: Item) -> Item:
+def readability(item: Item, refetch: bool = False) -> Item:
     """
     Extracts clean HTML from a raw HTML item.
     See `markdownify` to also convert to Markdown.
     """
-    url, html_content = get_url_html(item)
+    expiration_sec = 0 if refetch else None
+    url, html_content = get_url_html(item, expiration_sec=expiration_sec)
     page_data = extract_text_readabilipy(url, html_content)
 
-    output_item = item.derived_copy(
-        type=ItemType.doc, format=Format.html, body=page_data.clean_html
-    )
+    output_item = item.derived_copy(format=Format.html, body=page_data.clean_html)
 
     return output_item

kash_shell-0.3.11/src/kash/actions/core/render_as_html.py

@@ -0,0 +1,37 @@
+from kash.actions.core.tabbed_webpage_config import tabbed_webpage_config
+from kash.actions.core.tabbed_webpage_generate import tabbed_webpage_generate
+from kash.exec import kash_action
+from kash.exec.preconditions import has_full_html_page_body, has_text_body, is_html
+from kash.exec_model.args_model import ONE_OR_MORE_ARGS
+from kash.model import ActionInput, ActionResult, Param
+from kash.model.items_model import ItemType
+from kash.utils.file_utils.file_formats_model import Format
+from kash.web_gen.simple_webpage import simple_webpage_render
+
+
+@kash_action(
+    expected_args=ONE_OR_MORE_ARGS,
+    precondition=(is_html | has_text_body) & ~has_full_html_page_body,
+    params=(Param("add_title", "Add a title to the page body.", type=bool),),
+)
+def render_as_html(input: ActionInput, add_title: bool = False) -> ActionResult:
+    """
+    Convert text, Markdown, or HTML to pretty, formatted HTML using a clean
+    and simple page template. Supports GFM-flavored Markdown tables and footnotes.
+
+    If it's a single input, the output is a simple HTML page.
+    If it's multiple inputs, the output is a tabbed HTML page.
+
+    This adds a header, footer, etc. so should be used on a plain document or HTML basic
+    page, not a full HTML page with header and body already present.
+    """
+    if len(input.items) == 1:
+        input_item = input.items[0]
+        html_body = simple_webpage_render(input_item, add_title_h1=add_title)
+        result_item = input_item.derived_copy(
+            type=ItemType.export, format=Format.html, body=html_body
+        )
+        return ActionResult([result_item])
+    else:
+        config_result = tabbed_webpage_config(input)
+        return tabbed_webpage_generate(ActionInput(items=config_result.items), add_title=add_title)

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/actions/core/show_webpage.py

@@ -1,27 +1,22 @@
-from kash.actions.core.webpage_config import webpage_config
-from kash.actions.core.webpage_generate import webpage_generate
+from kash.actions.core.render_as_html import render_as_html
 from kash.commands.base.show_command import show
-from kash.config.logger import get_logger
 from kash.exec import kash_action
-from kash.exec.preconditions import has_text_body, is_html
+from kash.exec.preconditions import has_full_html_page_body, has_text_body, is_html
+from kash.exec_model.args_model import ONE_OR_MORE_ARGS
 from kash.exec_model.commands_model import Command
 from kash.exec_model.shell_model import ShellResult
 from kash.model import ActionInput, ActionResult
 
-log = get_logger(__name__)
-
 
 @kash_action(
-    precondition=is_html | has_text_body,
+    expected_args=ONE_OR_MORE_ARGS,
+    precondition=(is_html | has_text_body) & ~has_full_html_page_body,
 )
 def show_webpage(input: ActionInput) -> ActionResult:
     """
     Show text, Markdown, or HTML as a nicely formatted webpage.
     """
-    config_result = webpage_config(input)
-
-    log.message("Configured web page: %s", config_result)
-    result = webpage_generate(ActionInput(items=config_result.items))
+    result = render_as_html(input)
 
     # Automatically show the result.
     result.shell_result = ShellResult(display_command=Command.assemble(show))

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/actions/core/strip_html.py

@@ -1,7 +1,7 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import has_html_body, has_text_body
-from kash.model import Format, Item, ItemType
+from kash.model import Format, Item
 from kash.utils.common.format_utils import html_to_plaintext
 from kash.utils.errors import InvalidInput
 
@@ -19,10 +19,6 @@ def strip_html(item: Item) -> Item:
         raise InvalidInput("Item must have a body")
 
     clean_body = html_to_plaintext(item.body)
-    output_item = item.derived_copy(
-        type=ItemType.doc,
-        format=Format.markdown,
-        body=clean_body,
-    )
+    output_item = item.derived_copy(format=Format.markdown, body=clean_body)
 
     return output_item

kash_shell-0.3.11/src/kash/actions/core/tabbed_webpage_config.py

@@ -0,0 +1,31 @@
+from kash.config.logger import get_logger
+from kash.exec import kash_action
+from kash.exec_model.args_model import ONE_OR_MORE_ARGS
+from kash.model import ActionInput, ActionResult, Param
+from kash.utils.errors import InvalidInput
+from kash.web_gen import tabbed_webpage
+
+log = get_logger(__name__)
+
+
+@kash_action(
+    expected_args=ONE_OR_MORE_ARGS,
+    params=(
+        Param(
+            name="clean_headings",
+            type=bool,
+            description="Use an LLM to clean up headings.",
+        ),
+    ),
+)
+def tabbed_webpage_config(input: ActionInput, clean_headings: bool = False) -> ActionResult:
+    """
+    Set up a web page config with optional tabs for each page of content. Uses first item as the page title.
+    """
+    for item in input.items:
+        if not item.body:
+            raise InvalidInput(f"Item must have a body: {item}")
+
+    config_item = tabbed_webpage.tabbed_webpage_config(input.items, clean_headings)
+
+    return ActionResult([config_item])

kash_shell-0.3.9/src/kash/actions/core/webpage_generate.py → kash_shell-0.3.11/src/kash/actions/core/tabbed_webpage_generate.py

@@ -1,7 +1,7 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import is_config
-from kash.model import ONE_ARG, ActionInput, ActionResult, FileExt, Format, Item, ItemType
+from kash.model import ONE_ARG, ActionInput, ActionResult, FileExt, Format, Item, ItemType, Param
 from kash.web_gen import tabbed_webpage
 
 log = get_logger(__name__)
@@ -10,13 +10,14 @@ log = get_logger(__name__)
 @kash_action(
     expected_args=ONE_ARG,
     precondition=is_config,
+    params=(Param("add_title", "Add a title to the page body.", type=bool),),
 )
-def webpage_generate(input: ActionInput) -> ActionResult:
+def tabbed_webpage_generate(input: ActionInput, add_title: bool = False) -> ActionResult:
     """
-    Generate a web page from a configured web page item.
+    Generate a tabbed web page from a config item for the tabbed template.
     """
     config_item = input.items[0]
-    html = tabbed_webpage.webpage_generate(config_item)
+    html = tabbed_webpage.tabbed_webpage_generate(config_item, add_title_h1=add_title)
 
     webpage_item = Item(
         title=config_item.title,

kash_shell-0.3.11/src/kash/commands/__init__.py

@@ -0,0 +1,9 @@
+from pathlib import Path
+
+from kash.exec.importing import import_and_register
+
+import_and_register(
+    __package__,
+    Path(__file__).parent,
+    ["base", "extras", "help", "workspace"],
+)

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/commands/base/basic_file_commands.py

@@ -7,6 +7,7 @@ from strif import copyfile_atomic
 from kash.config.logger import get_logger
 from kash.config.text_styles import STYLE_EMPH
 from kash.exec import assemble_path_args, kash_command, resolve_path_arg
+from kash.model.paths_model import StorePath
 from kash.shell.output.shell_output import (
     PadStyle,
     PrintHooks,
@@ -21,6 +22,7 @@ from kash.utils.common.format_utils import fmt_loc
 from kash.utils.errors import InvalidInput
 from kash.utils.file_utils.file_formats_model import detect_file_format
 from kash.workspaces.workspace_output import print_file_info
+from kash.workspaces.workspaces import current_ws
 
 log = get_logger(__name__)
 
@@ -149,7 +151,20 @@ def trash(*paths: str) -> None:
     """
 
     resolved_paths = assemble_path_args(*paths)
+
+    ws = current_ws()
+    affected_store_paths = [
+        p for p in resolved_paths if isinstance(p, StorePath) and (ws.base_dir / p).exists()
+    ]
+
     native_trash(*resolved_paths)
+
+    if affected_store_paths:
+        log.info(
+            "Refreshing current selection due to deleted store paths: %s", affected_store_paths
+        )
+        ws.selections.refresh_current(ws.base_dir)
+
     print_status(f"Deleted (check trash or recycling bin to recover):\n{fmt_lines(resolved_paths)}")
 
 

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/commands/base/debug_commands.py

@@ -213,3 +213,16 @@ def reload_commands_and_actions() -> None:
 
     reload_shell_commands_and_actions()
     log_command_action_info()
+
+
+@kash_command
+def debug_exception() -> None:
+    """
+    Useful to debug exception handling/printing in xonsh.
+    """
+
+    def raise_exception():
+        cprint("Raising an unexpected exception to test the exception handler.")
+        raise Exception("This is a test exception.")
+
+    raise_exception()

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/commands/base/files_command.py

@@ -75,6 +75,9 @@ def _print_listing_tallies(
         cprint("(use --no_max to remove cutoff)", style=STYLE_HINT)
 
 
+DEFAULT_MAX_PG = 100
+
+
 @kash_command
 def files(
     *paths: str,
@@ -108,9 +111,11 @@ def files(
     and grouping.
 
     :param overview: Recurse a couple levels and show files, but not too many.
-        Same as `--groupby=parent --depth=2 --max_per_group=10 --omit_dirs`.
+        Same as `--groupby=parent --depth=2 --max_per_group=100 --omit_dirs`
+        except also scales down `max_per_group` to 25 or 50 if there are many files.
     :param recent: Only shows the most recently modified files in each directory.
-        Same as `--sort=modified --reverse --groupby=parent --max_per_group=10`.
+        Same as `--sort=modified --reverse --groupby=parent --max_per_group=100`
+        except also scales down `max_per_group` to 25 or 50 if there are many files.
     :param recursive: List all files recursively. Same as `--depth=-1`.
     :param flat: Show files in a flat list, rather than grouped by parent directory.
         Same as `--groupby=flat`.
@@ -179,16 +184,17 @@ def files(
         # Within workspaces, we show more files by default since they are always in
         # subdirectories.
         overview = True  # Handled next.
+    cap_per_group = False
     if overview:
-        max_per_group = 10 if max_per_group <= 0 else max_per_group
         groupby = GroupByOption.parent if groupby is None else groupby
         depth = 2 if depth is None else depth
+        cap_per_group = True
         omit_dirs = True
     if recent:
-        max_per_group = 10 if max_per_group <= 0 else max_per_group
         groupby = GroupByOption.parent if groupby is None else groupby
         depth = 2 if depth is None else depth
         sort = SortOption.modified if sort is None else sort
+        cap_per_group = True
         reverse = True
     if flat:
         groupby = GroupByOption.flat
@@ -291,6 +297,18 @@ def files(
 
         return ShellResult(show_selection=True)
 
+    # Unless max_per_group is explicit, use heuristics to limit per group if
+    # there are lots of groups and lots of files per group.
+    # Default is max 100 per group but if we have 4 * 100 items, cut to 25.
+    # If we have 2 * 100 items, cut to 50.
+    final_max_pg = DEFAULT_MAX_PG if cap_per_group else max_per_group
+    max_pg_explicit = max_per_group > 0
+    if not max_pg_explicit:
+        group_lens = [len(group_df) for group_df in grouped]
+        for ratio in [2, 4]:
+            if sum(group_lens) > ratio * DEFAULT_MAX_PG:
+                final_max_pg = int(DEFAULT_MAX_PG / ratio)
+
     total_displayed = 0
     total_displayed_size = 0
     now = datetime.now(UTC)
@@ -312,8 +330,8 @@ def files(
                         text_wrap=Wrap.NONE,
                     )
 
-                if max_per_group > 0:
-                    display_df = group_df.head(max_per_group)
+                if final_max_pg > 0:
+                    display_df = group_df.head(final_max_pg)
                 else:
                     display_df = group_df
 
@@ -378,9 +396,9 @@ def files(
                     total_displayed_size += row.size
 
                 # Indicate if items are omitted.
-                if groupby and max_per_group > 0 and len(group_df) > max_per_group:
+                if groupby and final_max_pg > 0 and len(group_df) > final_max_pg:
                     cprint(
-                        f"{indent}… and {len(group_df) - max_per_group} more files",
+                        f"{indent}… and {len(group_df) - final_max_pg} more files",
                         style=COLOR_EXTRA,
                         text_wrap=Wrap.NONE,
                     )
@@ -388,9 +406,9 @@ def files(
                 if group_name:
                     PrintHooks.spacer()
 
-            if not groupby and max_per_group > 0 and items_matching > max_per_group:
+            if not groupby and final_max_pg > 0 and items_matching > final_max_pg:
                 cprint(
-                    f"{indent}… and {items_matching - max_per_group} more files",
+                    f"{indent}… and {items_matching - final_max_pg} more files",
                     style=COLOR_EXTRA,
                     text_wrap=Wrap.NONE,
                 )

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/commands/base/general_commands.py

@@ -1,9 +1,15 @@
+from clideps.env_vars.dotenv_setup import interactive_dotenv_setup
+from clideps.env_vars.dotenv_utils import load_dotenv_paths
+from clideps.env_vars.env_check import format_dotenv_check, format_env_var_check, print_env_check
+from clideps.env_vars.env_names import get_all_common_env_names
+from clideps.pkgs.pkg_check import pkg_check
+from clideps.terminal.terminal_features import terminal_check
 from flowmark import Wrap
+from rich.text import Text
 
 from kash.commands.base.model_commands import list_apis, list_models
-from kash.commands.workspace.workspace_commands import list_params
 from kash.config.logger import get_logger
-from kash.config.settings import RECOMMENDED_API_KEYS, get_system_config_dir
+from kash.config.settings import RECOMMENDED_API_KEYS, global_settings
 from kash.docs.all_docs import all_docs
 from kash.exec import kash_command
 from kash.help.tldr_help import tldr_refresh_cache
@@ -14,14 +20,6 @@ from kash.model.params_model import (
     DEFAULT_STANDARD_LLM,
     DEFAULT_STRUCTURED_LLM,
 )
-from kash.shell.clideps.api_keys import (
-    ApiEnvKey,
-    load_dotenv_paths,
-    print_api_key_setup,
-)
-from kash.shell.clideps.dotenv_setup import interactive_dotenv_setup
-from kash.shell.clideps.pkg_deps import pkg_check
-from kash.shell.clideps.terminal_features import terminal_check
 from kash.shell.input.input_prompts import input_choice
 from kash.shell.output.shell_formatting import format_name_and_value
 from kash.shell.output.shell_output import (
@@ -50,8 +48,13 @@ def self_check(brief: bool = False) -> None:
     Self-check kash setup, including termal settings, tools, and API keys.
     """
     if brief:
-        terminal_check().print_term_info()
-        print_api_key_setup(recommended_keys=RECOMMENDED_API_KEYS, once=False)
+        cprint(terminal_check().formatted())
+        cprint(Text.assemble("Dotenv files: ", format_dotenv_check()))
+        cprint(
+            Text.assemble(
+                "Env vars: ", format_env_var_check(env_vars=RECOMMENDED_API_KEYS, one_line=True)
+            )
+        )
         check_system_tools(brief=brief)
         tldr_refresh_cache()
         try:
@@ -63,7 +66,7 @@ def self_check(brief: bool = False) -> None:
     else:
         version()
         cprint()
-        terminal_check().print_term_info()
+        cprint(terminal_check().formatted())
         cprint()
         list_apis()
         cprint()
@@ -88,9 +91,10 @@ def self_configure(all: bool = False, update: bool = False) -> None:
     """
     Interactively configure API keys and preferred models.
     """
+    from kash.commands.workspace.workspace_commands import params as list_params
 
     if all:
-        api_keys = [key.value for key in ApiEnvKey]
+        api_keys = list(set(get_all_common_env_names() + RECOMMENDED_API_KEYS))
     else:
         api_keys = RECOMMENDED_API_KEYS
     # Show APIs before starting.
@@ -177,10 +181,11 @@ def reload_env() -> None:
     Reload the environment variables from the .env file.
     """
 
-    env_paths = load_dotenv_paths(True, True, get_system_config_dir())
+    env_paths = load_dotenv_paths(True, True, global_settings().system_config_dir)
     if env_paths:
         cprint("Reloaded environment variables")
-        print_api_key_setup(RECOMMENDED_API_KEYS)
+
+        print_env_check(RECOMMENDED_API_KEYS)
     else:
         raise InvalidState("No .env file found")
 

{kash_shell-0.3.9 → kash_shell-0.3.11}/src/kash/commands/base/logs_commands.py

@@ -7,7 +7,7 @@ from kash.config.logger import get_log_settings, get_logger, reload_rich_logging
 from kash.config.settings import (
     LogLevel,
     atomic_global_settings,
-    local_server_log_path,
+    global_settings,
 )
 from kash.exec import kash_command
 from kash.shell.output.shell_formatting import format_name_and_value
@@ -85,4 +85,6 @@ def log_settings() -> None:
     cprint(format_name_and_value("log_objects_dir", str(settings.log_objects_dir)))
     cprint(format_name_and_value("log_file_level", settings.log_file_level.name))
     cprint(format_name_and_value("log_console_level", settings.log_console_level.name))
-    cprint(format_name_and_value("server_log_file_path", str(local_server_log_path())))
+    cprint(
+        format_name_and_value("server_log_file_path", str(global_settings().local_server_log_path))
+    )