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

{kash_shell-0.3.7 → kash_shell-0.3.9}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier. Do not edit manually.
-_commit: v0.1.0-5-g546520a
+_commit: v0.2.5
 _src_path: gh:jlevy/simple-modern-uv
 package_author_email: joshua@cal.berkeley.edu
 package_author_name: Joshua Levy

{kash_shell-0.3.7 → kash_shell-0.3.9}/.env.template

@@ -1,14 +1,7 @@
 # Copy this template file to ~/.env or another parent directory and set these
 # values and any other environment variables you need.
 
-# Location of new workspaces. This can be "." to to default to wherever
-# you are working, or an absolute path to ensure the default location
-# for a new workspace is the same place.
-# KASH_WS_ROOT="."
-KASH_WS_ROOT="~/Documents/kash"
-
-# Location of the kash default "global" workspace.
-KASH_GLOBAL_WS="~/Documents/kash/global"
+# See settings.py for optional KASH_* environment variables.
 
 # API Keys:
 

{kash_shell-0.3.7 → kash_shell-0.3.9}/.github/workflows/ci.yml

@@ -41,7 +41,8 @@ jobs:
       - name: Install uv (official Astral action)
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.6.11"
+          # Update this as needed:
+          version: "0.6.14"
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 
@@ -56,10 +57,6 @@ jobs:
 
       - name: Install all dependencies
         run: uv sync --all-extras --dev
-        env:
-          # TODO: Unclear why this should be needed since we already have a newer CMake,
-          # but it seems to be needed when building cydifflib.
-          CMAKE_ARGS: "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
 
       - name: Run linting
         run: uv run python devtools/lint.py

{kash_shell-0.3.7 → kash_shell-0.3.9}/.github/workflows/publish.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install uv (official Astral action)
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.6.5"
+          version: "0.6.14"
           enable-cache: true
           python-version: "3.12"
 

{kash_shell-0.3.7 → kash_shell-0.3.9}/.gitignore

@@ -1,12 +1,11 @@
+# Additions to standard GitHub .gitignore:
 *.bak
 *.orig
 *.stash.*
-
-# Additions to standard GitHub .gitignore:
 tmp/
 trash/
-.kash/
 attic/
+.kash/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

{kash_shell-0.3.7 → kash_shell-0.3.9}/Makefile

@@ -1,5 +1,6 @@
 # Makefile for easy development workflows.
-# GitHub Actions call uv directly.
+# See development.md for docs.
+# Note GitHub Actions call uv directly, not this Makefile.
 
 .DEFAULT_GOAL := default
 

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

@@ -1,11 +1,20 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.7
-Summary: The knowledge agent shell
+Version: 0.3.9
+Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
 License-Expression: AGPL-3.0-or-later
 License-File: LICENSE
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Typing :: Typed
 Requires-Python: <4.0,>=3.11
 Requires-Dist: anyio>=4.8.0
 Requires-Dist: audioop-lts>=0.2.1; python_version >= '3.13'
@@ -33,7 +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: prettyfmt>=0.2.0
+Requires-Dist: prettyfmt>=0.3.0
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pydub>=0.25.1
@@ -42,7 +51,6 @@ Requires-Dist: pyperclip>=1.9.0
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: python-magic-bin>=0.4.14; platform_system == 'Windows'
 Requires-Dist: python-magic>=0.4.27; platform_system == 'Linux' or platform_system == 'Darwin'
-Requires-Dist: python-slugify>=8.0.4
 Requires-Dist: readabilipy>=0.3.0
 Requires-Dist: regex>=2024.11.6
 Requires-Dist: rich-argparse>=1.7.0
@@ -229,15 +237,19 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
    For macOS, you can again use brew:
 
    ```shell
-   # Install pyenv, pipx, and other tools:
    brew update
-   brew install ripgrep bat eza hexyl imagemagick libmagic ffmpeg 
+   brew install libmagic ffmpeg ripgrep bat eza hexyl imagemagick zoxide
    ```
 
    For Ubuntu:
 
    ```shell
-   apt install ripgrep bat eza hexyl imagemagick libmagic ffmpeg 
+   sudo apt-get update
+   sudo apt-get install -y libgl1 ffmpeg libmagic-dev 
+   # For the additional command-line tools, pixi is better on Ubuntu:
+   curl -fsSL https://pixi.sh/install.sh | sh
+   . ~/.bashrc
+   pixi global install ripgrep bat eza hexyl imagemagick zoxide
    ```
 
    For Windows or other platforms, see the uv instructions.

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

@@ -167,15 +167,19 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
    For macOS, you can again use brew:
 
    ```shell
-   # Install pyenv, pipx, and other tools:
    brew update
-   brew install ripgrep bat eza hexyl imagemagick libmagic ffmpeg 
+   brew install libmagic ffmpeg ripgrep bat eza hexyl imagemagick zoxide
    ```
 
    For Ubuntu:
 
    ```shell
-   apt install ripgrep bat eza hexyl imagemagick libmagic ffmpeg 
+   sudo apt-get update
+   sudo apt-get install -y libgl1 ffmpeg libmagic-dev 
+   # For the additional command-line tools, pixi is better on Ubuntu:
+   curl -fsSL https://pixi.sh/install.sh | sh
+   . ~/.bashrc
+   pixi global install ripgrep bat eza hexyl imagemagick zoxide
    ```
 
    For Windows or other platforms, see the uv instructions.

{kash_shell-0.3.7 → kash_shell-0.3.9}/development.md

@@ -6,8 +6,8 @@ This project is set up to use [uv](https://docs.astral.sh/uv/) to manage Python
 dependencies. First, be sure you
 [have uv installed](https://docs.astral.sh/uv/getting-started/installation/).
 
-Then [fork](https://github.com/jlevy/kash-shell/fork) this repo (having your own fork
-will make it easier to contribute) and
+Then [fork the jlevy/kash-shell repo](https://github.com/jlevy/kash-shell/fork) (having
+your own fork will make it easier to contribute) and
 [clone it](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository).
 
 ## Basic Developer Workflows
@@ -66,44 +66,22 @@ source .venv/bin/activate
 
 See [uv docs](https://docs.astral.sh/uv/) for details.
 
-## Kash Dev Workflows
+## IDE setup
 
-```shell
-# Update key packages:
-source devtools/update_common_deps.xsh
-
-# Update this README:
-source devtools/generate_readme.xsh
-```
-
-A few debugging tips when finding issues:
+If you use VSCode or a fork like Cursor or Windsurf, you can install the following
+extensions:
 
-```shell
-# To see tracebacks if xonsh does not show them:
-$XONSH_SHOW_TRACEBACK=1
-
-# To set verbose logging:
-$KASH_LOG_LEVEL=info
-
-# To dump Python stack traces of all threads (from another terminal):
-pkill -USR1 kash
-```
+- [Python](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
 
-## Release Process
+- [Based Pyright](https://marketplace.visualstudio.com/items?itemName=detachhead.basedpyright)
+  for type checking. Note that this extension works with non-Microsoft VSCode forks like
+  Cursor.
 
-This project is set up to publish to [PyPI](https://pypi.org/) from GitHub Actions.
+## Documentation
 
-Thanks to [the dynamic versioning
-plugin](https://github.com/ninoseki/uv-dynamic-versioning/) and the
-[`publish.yml` workflow](.github/workflows/publish.yml), you can simply create tagged
-releases (using standard format for the tag name, e.g. `v0.1.0`) on GitHub and the tag
-will trigger a release build, which then uploads it to PyPI.
+- [uv docs](https://docs.astral.sh/uv/)
 
-For this to work you will need to have a PyPI account and authorize your repository to
-publish to PyPI. The simplest way to do that is on [the publishing settings
-page](https://pypi.org/manage/account/publishing/). Configure "Trusted Publisher
-Management" and register your GitHub repo as a new "pending" trusted publisher, entering
-the project name, repo owner, repo name, and `publish.yml` as the workflow name.
+- [basedpyright docs](https://docs.basedpyright.com/latest/)
 
 * * *
 

kash_shell-0.3.9/installation.md

@@ -0,0 +1,27 @@
+## Installing uv and Python
+
+This project is set up to use [**uv**](https://docs.astral.sh/uv/), the new package
+manager for Python. `uv` replaces traditional use of `pyenv`, `pipx`, `poetry`, `pip`,
+etc. This is a quick cheat sheet on that:
+
+On macOS or Linux, if you don't have `uv` installed, a quick way to install it:
+
+```shell
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+For macOS, you prefer [brew](https://brew.sh/) you can install or upgrade uv with:
+
+```shell
+brew update
+brew install uv
+```
+
+See [uv's docs](https://docs.astral.sh/uv/getting-started/installation/) for more
+installation methods and platforms.
+
+Now you can use uv to install a current Python environment:
+
+```shell
+uv python install 3.13 # Or pick another version.
+```

kash_shell-0.3.9/publishing.md

@@ -0,0 +1,71 @@
+## Publishing Releases
+
+This is how to publish a Python package to [**PyPI**](https://pypi.org/) from GitHub
+Actions, when using the
+[**simple-modern-uv**](https://github.com/jlevy/simple-modern-uv) template.
+
+Thanks to [the dynamic versioning
+plugin](https://github.com/ninoseki/uv-dynamic-versioning/) and the
+[`publish.yml` workflow](https://github.com/jlevy/simple-modern-uv/blob/main/template/.github/workflows/publish.yml),
+you can simply create tagged releases (using standard format for the tag name, e.g.
+`v0.1.0`) on GitHub and the tag will trigger a release build, which then uploads it to
+PyPI.
+
+### How to Publish the First Time
+
+This part is a little confusing the first time.
+Here is the simplest way to do it.
+For the purposes of this example replace OWNER and PROJECT with the right values.
+
+1. **Get a PyPI account** at [pypi.org](https://pypi.org/) and sign in.
+
+2. **Pick a name for the project** that isn't already taken.
+
+   - Go to `https://pypi.org/project/PROJECT` to see if another project with that name
+     already exits.
+
+   - If needed, update your `pyproject.yml` with the correct name.
+
+3. **Authorize** your repository to publish to PyPI:
+
+   - Go to [the publishing settings page](https://pypi.org/manage/account/publishing/).
+
+   - Find "Trusted Publisher Management" and register your GitHub repo as a new
+     "pending" trusted publisher
+
+   - Enter the project name, repo owner, repo name, and `publish.yml` as the workflow
+     name. (You can leave the "environment name" field blank.)
+
+4. **Create a release** on GitHub:
+
+   - Commit code and make sure it's running correctly.
+
+   - Go to your GitHub project page, then click on Actions tab.
+
+   - Confirm all tests are passing in the last CI workflow.
+     (If you want, you can even publish this template when it's empty as just a stub
+     project, to try all this out.)
+
+   - Go to your GitHub project page, click on Releases.
+
+   - Fill in the tag and the release name.
+     Select to create a new tag, and pick a version.
+     A good option is `v0.1.0`. (It's wise to have it start with a `v`.)
+
+   - Submit to create the release.
+
+5. **Confirm it publishes to PyPI**
+
+   - Watch for the release workflow in the GitHub Actions tab.
+
+   - If it succeeds, you should see it appear at `https://pypi.org/project/PROJECT`.
+
+### How to Publish Subsequent Releases
+
+Just create a new release!
+Everything is the same as the last two steps above.
+
+* * *
+
+*This file was built with
+[simple-modern-uv](https://github.com/jlevy/simple-modern-uv).*

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

@@ -3,10 +3,11 @@
 [project.urls]
 Repository = "https://github.com/jlevy/kash-shell"
 # Homepage = "https://..."
+# Documentation = "https://..."
 
 [project]
 name = "kash-shell"
-description = "The knowledge agent shell"
+description = "The knowledge agent shell (core)"
 authors = [
     { name="Joshua Levy", email="joshua@cal.berkeley.edu" },
 ]
@@ -15,6 +16,27 @@ license = "AGPL-3.0-or-later"
 requires-python = ">=3.11,<4.0"
 dynamic = ["version"]
 
+# https://pypi.org/classifiers/
+# Adjust as needed:
+classifiers = [
+    # Adjust as needed:
+    "Development Status :: 4 - Beta",
+    # "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Typing :: Typed",
+    # Include this to avoid accidentally publishing to PyPI:
+    # "Private :: Do Not Upload",
+]
+
+
+# ---- Main dependencies ----
+
 dependencies = [
     "dunamai>=1.23.0",
     "pydantic>=2.10.6",
@@ -22,7 +44,7 @@ dependencies = [
     # My tools:
     "strif>=2.1.0",
     "funlog>=0.2.0",
-    "prettyfmt>=0.2.0",
+    "prettyfmt>=0.3.0",
     "flowmark>=0.3.1",
     "frontmatter-format>=0.2.1",
     "chopdiff>=0.1.3",
@@ -45,7 +67,6 @@ dependencies = [
     "pyperclip>=1.9.0",
     "colour>=0.1.5",
     "thefuzz>=0.22.1",
-    "python-slugify>=8.0.4",
     "tldr>=3.3.0",
     "jinja2>=3.1.6",
     "pygments>=2.19.1",
@@ -92,7 +113,7 @@ dev = [
 
 [project.scripts]
 kash = "kash.shell.shell_main:main"
-kash_mcp = "kash.mcp.mcp_cli:main"
+kash-mcp = "kash.mcp.mcp_cli:main"
 
 
 # ---- Build system ----

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

@@ -12,7 +12,8 @@ from kash.help.function_param_info import annotate_param_info
 from kash.help.recommended_commands import RECOMMENDED_TLDR_COMMANDS
 from kash.model.params_model import Param
 from kash.shell.output.kerm_codes import IframePopover, TextTooltip
-from kash.shell.output.shell_output import PrintHooks, console_pager, cprint, format_name_and_value
+from kash.shell.output.shell_formatting import format_name_and_value
+from kash.shell.output.shell_output import PrintHooks, console_pager, cprint
 from kash.utils.errors import InvalidInput
 
 log = get_logger(__name__)
@@ -178,7 +179,7 @@ def reload_system() -> None:
     the local the local server. Not perfect! But sometimes useful for development.
     """
     import kash
-    from kash.local_server.local_server import restart_local_server
+    from kash.local_server.local_server import restart_ui_server
     from kash.utils.common.import_utils import recursive_reload
 
     module = kash
@@ -196,7 +197,7 @@ def reload_system() -> None:
     log.info("Reloaded modules: %s", ", ".join(package_names))
     log.message("Reloaded %s modules from %s.", len(package_names), module.__name__)
 
-    restart_local_server()
+    restart_ui_server()
 
     # TODO Re-register commands and actions.
 

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

@@ -1,34 +1,34 @@
+from flowmark import Wrap
+
 from kash.commands.base.model_commands import list_apis, list_models
 from kash.commands.workspace.workspace_commands import list_params
-from kash.config.api_keys import (
-    RECOMMENDED_APIS,
-    Api,
-    get_all_configured_models,
-    load_dotenv_paths,
-    print_api_key_setup,
-)
-from kash.config.dotenv_utils import env_var_is_set
 from kash.config.logger import get_logger
+from kash.config.settings import RECOMMENDED_API_KEYS, get_system_config_dir
 from kash.docs.all_docs import all_docs
 from kash.exec import kash_command
 from kash.help.tldr_help import tldr_refresh_cache
+from kash.llm_utils.llm_api_keys import get_all_configured_models
 from kash.model.params_model import (
     DEFAULT_CAREFUL_LLM,
     DEFAULT_FAST_LLM,
     DEFAULT_STANDARD_LLM,
     DEFAULT_STRUCTURED_LLM,
 )
-from kash.shell.input.collect_dotenv import fill_missing_dotenv
+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 (
     PrintHooks,
     cprint,
-    format_failure,
-    format_name_and_value,
-    format_success,
     print_h2,
 )
-from kash.shell.utils.sys_tool_deps import sys_tool_check, terminal_feature_check
 from kash.shell.version import get_full_version_name
 from kash.utils.errors import InvalidState
 from kash.workspaces.workspaces import current_ws
@@ -50,8 +50,8 @@ def self_check(brief: bool = False) -> None:
     Self-check kash setup, including termal settings, tools, and API keys.
     """
     if brief:
-        terminal_feature_check().print_term_info()
-        print_api_key_setup(once=False)
+        terminal_check().print_term_info()
+        print_api_key_setup(recommended_keys=RECOMMENDED_API_KEYS, once=False)
         check_system_tools(brief=brief)
         tldr_refresh_cache()
         try:
@@ -63,7 +63,7 @@ def self_check(brief: bool = False) -> None:
     else:
         version()
         cprint()
-        terminal_feature_check().print_term_info()
+        terminal_check().print_term_info()
         cprint()
         list_apis()
         cprint()
@@ -86,28 +86,18 @@ def self_check(brief: bool = False) -> None:
 @kash_command
 def self_configure(all: bool = False, update: bool = False) -> None:
     """
-    Interactively configure your .env file with recommended API keys.
-
-    :param all: Configure all known API keys (instead of just recommended ones).
-    :param update: Update values even if they are already set.
+    Interactively configure API keys and preferred models.
     """
 
+    if all:
+        api_keys = [key.value for key in ApiEnvKey]
+    else:
+        api_keys = RECOMMENDED_API_KEYS
     # Show APIs before starting.
     list_apis()
 
-    apis = Api if all else RECOMMENDED_APIS
-    keys = [api.value for api in apis]
-    if not update:
-        keys = [key for key in keys if not env_var_is_set(key)]
-
-    cprint()
-    print_h2("Configuring .env file")
-    if keys:
-        cprint(format_failure(f"API keys needed: {', '.join(keys)}"))
-        fill_missing_dotenv(keys)
-        reload_env()
-    else:
-        cprint(format_success("All requested API keys are set!"))
+    interactive_dotenv_setup(api_keys, update=update)
+    reload_env()
 
     cprint()
     ws = current_ws()
@@ -170,15 +160,15 @@ def check_system_tools(warn_only: bool = False, brief: bool = False) -> None:
     :param brief: Print summary as a single line.
     """
     if warn_only:
-        sys_tool_check().warn_if_missing()
+        pkg_check().warn_if_missing()
     else:
         if brief:
-            cprint(sys_tool_check().status())
+            cprint(pkg_check().status())
         else:
             print_h2("Installed System Tools")
-            cprint(sys_tool_check().formatted())
+            cprint(pkg_check().formatted())
             cprint()
-            sys_tool_check().warn_if_missing()
+            pkg_check().warn_if_missing()
 
 
 @kash_command
@@ -187,10 +177,10 @@ def reload_env() -> None:
     Reload the environment variables from the .env file.
     """
 
-    env_paths = load_dotenv_paths()
+    env_paths = load_dotenv_paths(True, True, get_system_config_dir())
     if env_paths:
         cprint("Reloaded environment variables")
-        print_api_key_setup()
+        print_api_key_setup(RECOMMENDED_API_KEYS)
     else:
         raise InvalidState("No .env file found")
 
@@ -209,7 +199,9 @@ def kits() -> None:
     else:
         cprint("Currently imported kits:")
         for kit in get_loaded_kits().values():
-            cprint(format_name_and_value(f"{kit.name} kit", str(kit.path or "")))
+            cprint(
+                format_name_and_value(f"{kit.name} kit", str(kit.path or ""), text_wrap=Wrap.NONE)
+            )
 
 
 @kash_command
@@ -222,5 +214,5 @@ def settings() -> None:
     settings = global_settings()
     print_h2("Global Settings")
     for field, value in settings.__dict__.items():
-        cprint(format_name_and_value(field, str(value)))
+        cprint(format_name_and_value(field, str(value), text_wrap=Wrap.NONE))
     PrintHooks.spacer()

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

@@ -7,11 +7,11 @@ from kash.config.logger import get_log_settings, get_logger, reload_rich_logging
 from kash.config.settings import (
     LogLevel,
     atomic_global_settings,
-    global_settings,
-    server_log_file_path,
+    local_server_log_path,
 )
 from kash.exec import kash_command
-from kash.shell.output.shell_output import cprint, format_name_and_value, print_status
+from kash.shell.output.shell_formatting import format_name_and_value
+from kash.shell.output.shell_output import cprint, print_status
 from kash.shell.utils.native_utils import tail_file
 from kash.utils.common.format_utils import fmt_loc
 
@@ -85,8 +85,4 @@ 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", str(server_log_file_path(global_settings().local_server_port))
-        )
-    )
+    cprint(format_name_and_value("server_log_file_path", str(local_server_log_path())))

{kash_shell-0.3.7 → kash_shell-0.3.9}/src/kash/commands/base/model_commands.py

@@ -1,17 +1,19 @@
 from flowmark import Wrap
 from rich.text import Text
 
-from kash.config.api_keys import Api
-from kash.config.dotenv_utils import env_var_is_set
-from kash.config.text_styles import format_success_emoji
 from kash.exec.command_registry import kash_command
-from kash.llm_utils import LLM
-from kash.shell.output.shell_output import (
-    cprint,
+from kash.llm_utils import LLM, api_for_model
+from kash.shell.clideps.api_keys import ApiEnvKey
+from kash.shell.clideps.dotenv_utils import env_var_is_set
+from kash.shell.output.shell_formatting import (
     format_failure,
     format_name_and_value,
     format_success,
+    format_success_emoji,
     format_success_or_failure,
+)
+from kash.shell.output.shell_output import (
+    cprint,
     print_h2,
 )
 
@@ -23,11 +25,11 @@ def list_models() -> None:
     """
     print_h2("Models")
     for model in LLM.all_names():
-        api = Api.for_model(model)
-        have_key = bool(api and env_var_is_set(api.env_var))
+        api = api_for_model(model)
+        have_key = bool(api and env_var_is_set(api.value))
         if api:
             provider_msg = format_success(f"provider {api.name}")
-            key_message = format_success_or_failure(have_key, f"{api.env_var}")
+            key_message = format_success_or_failure(have_key, f"{api.value}")
         else:
             provider_msg = format_failure("provider not recognized")
             key_message = format_failure("unknown API key")
@@ -46,11 +48,11 @@ def list_apis() -> None:
     List and check configuration for all APIs.
     """
     print_h2("API keys")
-    for api in Api:
-        emoji = format_success_emoji(env_var_is_set(api.env_var))
+    for api in ApiEnvKey:
+        emoji = format_success_emoji(env_var_is_set(api.value))
         message = (
-            f"API key {api.env_var} found"
-            if env_var_is_set(api.env_var)
-            else f"API key {api.env_var} not found"
+            f"API key {api.value} found"
+            if env_var_is_set(api.value)
+            else f"API key {api.value} not found"
         )
         cprint(Text.assemble(emoji, format_name_and_value(api.name, message)))