kash-shell 0.3.8__py3-none-any.whl → 0.3.10__py3-none-any.whl

kash/web_gen/templates/base_styles.css.jinja

@@ -1,8 +1,9 @@
 :root {
   font-size: 16px;
-  {# Adding Hack Nerd Font to all fonts for icon support, if it is installed. #}
-  --font-sans: "Varta", sans-serif, "Hack Nerd Font";
+  /* Adding Hack Nerd Font to all fonts for icon support, if it is installed. */
+  --font-sans: "Source Sans 3 Variable", sans-serif, "Hack Nerd Font";
   --font-serif: "PT Serif", serif, "Hack Nerd Font";
+  --font-weight-sans-bold: 625;  /* Source Sans 3 Variable better at this weight. */
   --font-mono: "Hack Nerd Font", "Menlo", "DejaVu Sans Mono", Consolas, "Lucida Console", monospace;
 
   --font-size-large: 1.2rem;
@@ -63,16 +64,32 @@
 body {
   font-family: var(--font-serif);
   color: var(--color-text);
-  line-height: 1.3;
+  line-height: 1.4;
   padding: 0;  /* No padding so we can have full width elements. */
   margin: auto;
   background-color: var(--color-bg);
+  overflow-wrap: break-word;  /* Don't let long words/URLs break layout. */
 }
 
 p {
   margin-bottom: 1rem;
 }
 
+b, strong {
+  font-weight: var(--font-weight-sans-bold);
+}
+
+a {
+  color: var(--color-primary);
+  text-decoration: none;
+}
+
+a:hover {
+  color: var(--color-primary-light);
+  text-decoration: underline;
+  transition: all 0.15s ease-in-out;
+}
+
 h1,
 h2,
 h3,
@@ -88,19 +105,19 @@ h1 {
 
 h2 {
   font-size: 1.4rem;
-  margin-top: 2rem;
+  margin-top: 2.5rem;
   margin-bottom: 1rem;
 }
 
 h3 {
-  font-size: 1.15rem;
-  margin-top: 1.5rem;
-  margin-bottom: 1rem;
+  font-size: 1.09rem;
+  margin-top: 1.7rem;
+  margin-bottom: 0.7rem;
 }
 
 h4 {
   margin-top: 1rem;
-  margin-bottom: 1rem;
+  margin-bottom: 0.7rem;
 }
 
 /* Long text stylings, for nicely formatting blog post length or longer texts. */
@@ -118,8 +135,9 @@ h4 {
 
 .long-text h3 {
   font-family: var(--font-sans);
-  font-weight: 700;
+  font-weight: var(--font-weight-sans-bold);
   text-transform: uppercase;
+  letter-spacing: 0.02em;
 }
 
 .long-text h4 {
@@ -141,22 +159,31 @@ ul {
 }
 
 li {
-  margin-top: 0.5rem;
+  margin-top: 0.7rem;
   margin-bottom: 0;
   position: relative;
 }
 
-ul>li::before {
+li > p {
+  margin-bottom: 0;
+}
+
+ul > li::before {
   content: "▪︎";
   position: absolute;
-  left: -1rem;
-  font-size: 0.9rem;
+  left: -.85rem;
+  top: .25rem;
+  font-size: 0.62rem;
 }
 
 ol {
+  margin-bottom: 0.7rem;
   list-style-type: decimal;
   margin-left: 2rem;
-  margin-bottom: 1rem;
+}
+
+ol > li {
+  padding-left: 0.25rem;
 }
 
 blockquote {
@@ -181,6 +208,37 @@ pre {
   {# overflow-x: auto; #}
 }
 
+table {
+  font-family: var(--font-sans);
+  font-size: var(--font-size-small);
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
+  border-collapse: collapse;
+  word-break: break-word; /* long words/URLs wrap instead of inflating the column    */
+  border: 1px solid var(--color-border-hint);
+}
+
+th {
+  text-transform: uppercase;
+  letter-spacing: 0.02em;
+  border-bottom: 1px solid var(--color-border-hint);
+}
+
+th, td {
+  padding: 0.3rem 0.6rem;
+  max-width: 40rem;
+  min-width: 6rem;
+}
+
+th {
+  background-color: var(--color-bg-alt-solid);
+}
+
+tbody tr:nth-child(even) {
+  background-color: var(--color-bg-alt-solid); 
+}
+
 nav {
   display: flex;
   flex-wrap: wrap;
@@ -190,3 +248,51 @@ nav {
   gap: 1rem;
   /* Add some space between the buttons */
 }
+
+/* Container for wide tables to allow tables to break out of parent width. */
+.table-container {
+  {# max-width: calc(100vw - 6rem); #}
+  position: relative;
+  left: 50%;
+  transform: translateX(-50%);
+  box-sizing: border-box;
+  margin-bottom: 1rem;
+  background-color: var(--color-bg-solid);
+
+}
+
+/* Bleed wide on larger screens. */
+/* TODO: Don't make so wide if table itself isn't large? */
+@media (min-width: 768px) {
+  table {
+    width: calc(100vw - 6rem);
+  }
+  .table-container {
+    width: calc(100vw - 6rem);
+  }
+}
+
+@media (max-width: 768px) {
+  table {
+    font-size: var(--font-size-smaller);
+  }
+}
+
+/* Footnotes. */
+sup {
+  font-size: 80%;
+}
+
+.footnote-ref a, .footnote {
+  text-decoration: none;
+  padding: 0 0.15rem;
+  border-radius: 4px;
+  transition: all 0.15s ease-in-out;
+}
+
+.footnote-ref a:hover, .footnote:hover {
+  background-color: var(--color-hover-bg);
+  color: var(--color-primary-light);
+  text-decoration: none;
+}
+

kash/web_gen/templates/base_webpage.html.jinja

@@ -20,12 +20,19 @@
   <link rel="preload" as="font" type="font/woff2" crossorigin
     href="https://cdn.jsdelivr.net/fontsource/fonts/pt-serif@latest/latin-700-italic.woff2" />
   <link rel="preload" as="font" type="font/woff2" crossorigin
-    href="https://cdn.jsdelivr.net/fontsource/fonts/varta:vf@latest/latin-wght-normal.woff2" />
+    href="https://cdn.jsdelivr.net/fontsource/fonts/source-sans-3:vf@latest/latin-wght-normal.woff2" />
+  <link rel="preload" as="font" type="font/woff2" crossorigin
+    href="https://cdn.jsdelivr.net/fontsource/fonts/source-sans-3:vf@latest/latin-wght-italic.woff2" />
 
   <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet" />
   <script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js" defer></script>
 
+  {% if extra_head %}
+  {{ extra_head|safe }}
+  {% endif %}
+
   <style>
+    /* https://fontsource.org/fonts/pt-serif/cdn */
     /* pt-serif-latin-400-normal */
     @font-face {
       font-family: 'PT Serif';
@@ -62,14 +69,27 @@
       src: url(https://cdn.jsdelivr.net/fontsource/fonts/pt-serif@latest/latin-700-italic.woff2) format('woff2');
       unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
     }
+    /* https://fontsource.org/fonts/source-sans-3/cdn */
+    /* source-sans-3-latin-wght-normal */
     @font-face {
-      font-family: 'Varta';
+      font-family: 'Source Sans 3 Variable';
       font-style: normal;
       font-display: block;
-      font-weight: 300 700;
-      src: url(https://cdn.jsdelivr.net/fontsource/fonts/varta:vf@latest/latin-wght-normal.woff2) format('woff2-variations');
-      unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
+      font-weight: 200 900;
+      src: url(https://cdn.jsdelivr.net/fontsource/fonts/source-sans-3:vf@latest/latin-wght-normal.woff2) format('woff2-variations');
+      unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
     }
+    /* source-sans-3-latin-wght-normal */
+    @font-face {
+      font-family: 'Source Sans 3 Variable';
+      font-style: italic;
+      font-display: block;
+      font-weight: 200 900;
+      src: url(https://cdn.jsdelivr.net/fontsource/fonts/source-sans-3:vf@latest/latin-wght-italic.woff2) format('woff2-variations');
+      unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
+    }
+
+    {# Other decent sans serif options: Work Sans Variable, Nunito Sans Variable #}
 
     {% include "base_styles.css.jinja" %}
     {% include "content_styles.css.jinja" %}
@@ -82,24 +102,45 @@
 </head>
 
 <body>
-  {{ content|safe }}
-</body>
+{{ content|safe }}
 
 <script>
-  // Some messages are sent to the parent window, in case we are in a viewport like a
-  // tooltip that supports it.
-
-  // Request a resize of the parent viewport (e.g. tooltip).
   document.addEventListener('DOMContentLoaded', () => {
+    // Send messages to the parent window, in case we are in a viewport where that matters
+    // (e.g. an iframe tooltip).
+    // Request a resize of the parent viewport. This iframe size message format isn't
+    // standardized by ResizeObserver, but is common. It is supported by Kerm.
     const content = document.body;
     console.log("Suggesting resize to parent:", content.offsetWidth, content.offsetHeight);
-    // This iframe size message format isn't standardized by ResizeObserver, but is common.
-    // It is supported by Kerm.
+
     window.parent.postMessage({
       type: 'resize',
       width: Math.max(content.offsetWidth, 600),
       height: Math.max(content.offsetHeight, 100)
     }, '*');
+
+    // Wrap tables within the main content area for horizontal scrolling.
+    const containers = [];
+    document.querySelectorAll('.long-text').forEach(el => {
+      const pane = el.querySelector('.tab-pane');
+      containers.push(pane || el);
+    });
+    containers.forEach(container => {
+      // Grab all tables, then only wrap the ones whose parent is this container.
+      container.querySelectorAll('table').forEach(table => {
+        if (table.parentElement !== container) {
+          return; // Only direct children.
+        }
+        if (table.parentNode.classList.contains('table-container')) {
+          return; // Already wrapped.
+        }
+        const wrapper = document.createElement('div');
+        wrapper.className = 'table-container';
+        container.insertBefore(wrapper, table);
+        wrapper.appendChild(table);
+      });
+    });
+
   });
 
   // Double-click to expand (e.g. expand tooltip to popover).
@@ -119,6 +160,12 @@
       }, '*');
     }
   });
+
+  {% if extra_footer_js %}
+  {{ extra_footer_js|safe }}
+  {% endif %}
 </script>
 
+</body>
+
 </html>

kash/web_gen/templates/content_styles.css.jinja

@@ -15,7 +15,7 @@
   padding: 0 0.4rem;
 }
 
-/* More novel bracket ideas: [❲⟦⟪⟬〔〘〚〖 ]❳⟧⟫⟭ 〕〙〛〗 */
+{# More novel bracket ideas: [❲⟦⟪⟬〔〘〚〖 ]❳⟧⟫⟭ 〕〙〛〗 #}
 .citation::before {
   content: "[";
 }
@@ -57,6 +57,7 @@
   font-weight: 500;
   font-size: 1.2rem;
   text-transform: uppercase;
+  letter-spacing: 0.02em;
   margin-bottom: 0.5rem;
 }
 
@@ -81,6 +82,7 @@
   font-weight: 500;
   font-size: 1.2rem;
   text-transform: uppercase;
+  letter-spacing: 0.02em;
   margin-bottom: 0.5rem;
 
   /* Hack to center the header above the columns */
@@ -107,7 +109,7 @@
   font-size: var(--font-size-small);
   font-weight: 600;
   text-transform: uppercase;
-  letter-spacing: 0.05em;
+  letter-spacing: 0.02em;
   line-height: 1.2;
   padding: 0 0.5rem;
   border-bottom-width: 2px;

kash/web_gen/templates/item_view.html.jinja

@@ -19,9 +19,9 @@
 .item-type {
   font-family: var(--font-sans);
   text-transform: uppercase;
+  letter-spacing: 0.02em;
   font-size: var(--font-size-smaller);
-  font-weight: 800;
-  letter-spacing: 0.05em;
+  font-weight: var(--font-weight-sans-bold);
   padding-right: 1rem;
 }
 

kash/web_gen/templates/tabbed_webpage.html.jinja

@@ -1,4 +1,4 @@
-<div class="long-text container max-w-3xl mx-auto bg-white py-8 px-16 shadow-lg">
+<div class="long-text container max-w-3xl mx-auto bg-white py-8 px-6 md:px-16 md:shadow-lg">
   <h1 class="text-center text-4xl mt-6 mb-6">{{ title }}</h1>
   <div>
     <!-- Navigation Tabs -->
@@ -30,7 +30,6 @@
       {% endfor %}
     </div>
   </div>
-  <!-- TODO: Footer info (match with pdf export) -->
 </div>
 
 <script>

kash/workspaces/__init__.py

@@ -1,5 +1,3 @@
-# flake8: noqa: F401
-
 from kash.workspaces.selections import Selection, SelectionHistory
 from kash.workspaces.workspaces import (
     Workspace,
@@ -9,5 +7,20 @@ from kash.workspaces.workspaces import (
     get_ws,
     global_ws_dir,
     resolve_ws,
+    switch_to_ws,
     ws_param_value,
 )
+
+__all__ = [
+    "Selection",
+    "SelectionHistory",
+    "Workspace",
+    "current_ignore",
+    "current_ws",
+    "get_global_ws",
+    "get_ws",
+    "global_ws_dir",
+    "resolve_ws",
+    "ws_param_value",
+    "switch_to_ws",
+]

kash/workspaces/selections.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Callable, Sequence
 from functools import wraps
 from pathlib import Path
@@ -78,6 +80,12 @@ class Selection(BaseModel):
                 if current_path == old_path:
                     self.paths[idx] = new_path
 
+    def refresh(self, base_dir: Path) -> None:
+        """
+        Refresh the selection paths, dropping any that no longer exist.
+        """
+        self.paths[:] = [p for p in self.paths if (base_dir / p).exists()]
+
     def as_str(self, max_lines: int = SELECTION_DISPLAY_MAX) -> str:
         lines = [
             f"{fmt_count_items(len(self.paths), 'item')}:",
@@ -113,7 +121,7 @@ class SelectionHistory(BaseModel):
     }
 
     @classmethod
-    def init(cls, save_path: Path, max_history: int = SELECTION_HISTORY_MAX) -> "SelectionHistory":
+    def init(cls, save_path: Path, max_history: int = SELECTION_HISTORY_MAX) -> SelectionHistory:
         """
         Initialize selection history, loading from save_path if it exists.
         """
@@ -144,9 +152,9 @@ class SelectionHistory(BaseModel):
         yaml_util.write_yaml_file(data, str(self._save_path))
 
     @persist_after(_save)
-    def clear(self) -> None:
+    def clear_all(self) -> None:
         """
-        Clear the history.
+        Clear the entire selection history.
         """
         self.history.clear()
         self.current_index = 0
@@ -306,6 +314,13 @@ class SelectionHistory(BaseModel):
         for selection in self.history:
             selection.replace_values(replacements)
 
+    @persist_after(_save)
+    def refresh_current(self, base_dir: Path) -> None:
+        """
+        Refresh the current selection to drop any paths that no longer exist.
+        """
+        self.current.refresh(base_dir)
+
     def previous_n(self, n: int, expected_size: int | None = None) -> list[Selection]:
         """
         Get the `n` previous selections (backwards and including the current position),

kash/workspaces/source_items.py

@@ -7,7 +7,6 @@ from kash.model.items_model import Item
 from kash.model.paths_model import StorePath
 from kash.model.preconditions_model import Precondition
 from kash.utils.common.format_utils import fmt_loc
-from kash.utils.common.type_utils import not_none
 from kash.utils.errors import NoMatch
 from kash.workspaces import current_ws
 
@@ -59,7 +58,10 @@ def find_upstream_item(
 
     log.message("Looking for upstream item that matches precondition: %s", precondition)
     for source_item in source_items:
-        source_path = not_none(source_item.store_path)
+        source_path = source_item.store_path
+        if not source_path:
+            log.error("Source item has no store path: %s", source_item)
+            continue
         if precondition(source_item):
             log.message(
                 "Found source item that matches requirements: %s",

kash/workspaces/workspace_output.py

@@ -17,7 +17,7 @@ from kash.shell.output.shell_formatting import format_name_and_value
 from kash.shell.output.shell_output import PrintHooks, cprint
 from kash.utils.common.format_utils import fmt_count_items, fmt_loc
 from kash.utils.file_formats.chat_format import ChatHistory
-from kash.utils.file_utils.dir_size import get_dir_size
+from kash.utils.file_utils.dir_info import get_dir_info
 from kash.utils.file_utils.file_formats_model import file_format_info
 from kash.workspaces import Selection, current_ws
 
@@ -67,14 +67,21 @@ def post_shell_result(res: ShellResult) -> None:
             suggest_actions()
 
 
-def print_dir_info(path: Path, text_wrap: Wrap = Wrap.NONE):
-    dir_info = get_dir_size(path)
+def print_dir_info(path: Path, tally_formats: bool = False, text_wrap: Wrap = Wrap.NONE):
+    dir_info = get_dir_info(path, tally_formats)
 
     cprint(format_name_and_value("total files", f"{dir_info.file_count}"), text_wrap=text_wrap)
     cprint(
         format_name_and_value("total size", fmt_size_dual(dir_info.total_size)), text_wrap=text_wrap
     )
 
+    if tally_formats and dir_info.format_tallies:
+        for format, count in dir_info.format_tallies.items():
+            cprint(
+                format_name_and_value(f"format: {format}", f"{count}"),
+                text_wrap=text_wrap,
+            )
+
 
 def print_file_info(
     input_path: Path,
@@ -83,7 +90,7 @@ def print_file_info(
     text_wrap: Wrap = Wrap.NONE,
 ):
     if input_path.is_dir():
-        print_dir_info(input_path, text_wrap)
+        print_dir_info(input_path, tally_formats=True, text_wrap=text_wrap)
         return
 
     # Format info.

kash/workspaces/workspaces.py

@@ -7,18 +7,14 @@ from typing import TYPE_CHECKING, TypeVar
 
 from prettyfmt import fmt_path
 
-from kash.config.logger import get_logger, reset_log_root
+from kash.config.logger import get_logger, reset_rich_logging
 from kash.config.settings import (
     GLOBAL_WS_NAME,
-    RECOMMENDED_API_KEYS,
-    get_global_ws_dir,
-    get_ws_root_dir,
     global_settings,
     resolve_and_create_dirs,
 )
 from kash.file_storage.metadata_dirs import MetadataDirs
 from kash.model.params_model import GLOBAL_PARAMS, RawParamValues
-from kash.shell.clideps.api_keys import print_api_key_setup
 from kash.utils.errors import FileNotFound, InvalidInput, InvalidState
 from kash.utils.file_utils.ignore_files import IgnoreFilter, is_ignored_default
 from kash.workspaces.workspace_registry import WorkspaceInfo, get_ws_registry
@@ -128,7 +124,7 @@ def resolve_ws(name: str | Path) -> WorkspaceInfo:
             resolved = name
             parent_dir = resolved.parent
         else:
-            parent_dir = get_ws_root_dir()
+            parent_dir = global_settings().ws_root_dir
             resolved = parent_dir / name
     elif name_str.startswith(".") or name_str.startswith("/"):
         # Explicit paths respected otherwise use workspace root.
@@ -136,7 +132,7 @@ def resolve_ws(name: str | Path) -> WorkspaceInfo:
         parent_dir = resolved.parent
         name = resolved.name
     else:
-        parent_dir = get_ws_root_dir()
+        parent_dir = global_settings().ws_root_dir
         resolved = parent_dir / Path(name_str)
 
     ws_name = check_strict_workspace_name(resolved.name)
@@ -161,7 +157,7 @@ def get_ws(name_or_path: str | Path, auto_init: bool = True) -> "FileStore":
 
 @cache
 def global_ws_dir() -> Path:
-    kb_path = resolve_and_create_dirs(get_global_ws_dir(), is_dir=True)
+    kb_path = resolve_and_create_dirs(global_settings().global_ws_dir, is_dir=True)
     log.debug("Global workspace path: %s", kb_path)
     return kb_path
 
@@ -190,7 +186,7 @@ def switch_to_ws(base_dir: Path) -> "FileStore":
     ws_dirs = MetadataDirs(base_dir=info.base_dir, is_global_ws=info.is_global_ws)
 
     # Use the global log root for the global_ws, and the workspace log root otherwise.
-    reset_log_root(None, info.name if not info.is_global_ws else None)
+    reset_rich_logging(None, info.name if not info.is_global_ws else None)
 
     if info.is_global_ws:
         # If not in a workspace, use the global cache locations.
@@ -237,8 +233,6 @@ def current_ws(silent: bool = False) -> "FileStore":
     ws = switch_to_ws(base_dir)
 
     if not silent:
-        # Delayed, once-only logging of any setup warnings.
-        print_api_key_setup(RECOMMENDED_API_KEYS, once=True)
         ws.log_workspace_info(once=True)
 
     return ws

kash/xonsh_custom/command_nl_utils.py

@@ -3,20 +3,16 @@ import re
 from prettyfmt import fmt_words
 
 INNER_PUNCT_CHARS = r"-'’–—"
-OUTER_PUNCT_CHARS = r".,'\"“”‘’:!?()"
+OUTER_PUNCT_CHARS = r".,'\"" "''':;!?()"
 
-WORD_PAT = (
-    rf"[{OUTER_PUNCT_CHARS}]{{0,2}}[\w]+(?:[{INNER_PUNCT_CHARS}\w]+)*[{OUTER_PUNCT_CHARS}]{{0,2}}"
-)
-"""
-Pattern to match a word in natural language text (i.e. words and natural
-language-only punctuation).
-"""
+ESCAPED_INNER_PUNCT_CHARS = re.escape(INNER_PUNCT_CHARS)
+ESCAPED_OUTER_PUNCT_CHARS = re.escape(OUTER_PUNCT_CHARS)
 
-NL_PAT = rf"^{WORD_PAT}(?:\s+{WORD_PAT})*$"
-"""
-Pattern to match natural language text in a command line.
-"""
+PUNCT_SEQ_RE = re.compile(rf"[{ESCAPED_INNER_PUNCT_CHARS}{ESCAPED_OUTER_PUNCT_CHARS}]+")
+
+ONLY_WORDS_RE = re.compile(rf"^[\w\s{ESCAPED_INNER_PUNCT_CHARS}]*$")
+
+PLAIN_WORD_RE = re.compile(r"^\w.*\w$")
 
 
 def as_nl_words(text: str) -> str:
@@ -30,18 +26,25 @@ def as_nl_words(text: str) -> str:
 
 def looks_like_nl(text: str) -> bool:
     """
-    Check if a text looks like plain natural language text, i.e. word chars,
-    possibly with ? or hyphens/apostrophes when inside words but not other
-    code or punctuation.
+    Check if a text looks like plain natural language text. Just very simple
+    based on words and only basic punctuation.
     """
-    return bool(re.match(NL_PAT, text.strip()))
+    is_only_word_chars = bool(ONLY_WORDS_RE.fullmatch(text))
+    without_punct = PUNCT_SEQ_RE.sub("", text)
+    is_only_words_punct = bool(ONLY_WORDS_RE.fullmatch(without_punct))
+    words = without_punct.strip().split()
+    one_longer_word = any(len(word) > 3 for word in words)
+
+    return one_longer_word and (
+        (is_only_words_punct and len(words) >= 3) or (is_only_word_chars and len(words) >= 2)
+    )
 
 
 ## Tests
 
 
 def test_as_nl_words():
-    assert as_nl_words("x=3+9; foo('bar')") == "x=3+9; foo('bar"
+    assert as_nl_words("x=3+9; foo('bar')") == "x=3+9 foo('bar"
     assert as_nl_words("cd ..") == "cd .."
     assert as_nl_words("transcribe some-file_23.mp3") == "transcribe some-file_23.mp3"
     assert as_nl_words("hello world ") == "hello world"
@@ -57,14 +60,32 @@ def test_looks_like_nl():
     assert looks_like_nl("hello world")
     assert looks_like_nl(" hello world ")
     assert looks_like_nl("what's up")
-    assert looks_like_nl("hello-world")
     assert looks_like_nl("is this a question?")
     assert looks_like_nl("'quoted text'")
     assert looks_like_nl("git push origin main")
+    assert looks_like_nl("this is natural language")
+    assert looks_like_nl(" what's up, doc? ")
+    assert looks_like_nl("multiple   spaces   here")
+    assert looks_like_nl("go to the store (buy milk)")
+    assert looks_like_nl("'quoted text' has three words")
+    assert looks_like_nl("git push origin main")
+    assert looks_like_nl("what's up")
 
+    assert not looks_like_nl("hello-world")
+    assert not looks_like_nl("cd ..")
+    assert not looks_like_nl("file_name.txt")
+    assert not looks_like_nl("ls -la")
+    assert not looks_like_nl("https://example.com")
+    assert not looks_like_nl("cmd | grep pattern")
+    assert not looks_like_nl("use a+b")
+    assert not looks_like_nl("x=3")
+    assert not looks_like_nl("a > b")
+    assert not looks_like_nl("file_name.txt")
+    assert not looks_like_nl("foo;")
+    assert not looks_like_nl("hello-world")
     assert not looks_like_nl("ls -la")
     assert not looks_like_nl("cd ..")
     assert not looks_like_nl("echo $HOME")
     assert not looks_like_nl("https://example.com")
-    assert not looks_like_nl("file.txt")
+    assert not looks_like_nl(text="file.txt")
     assert not looks_like_nl("cmd | grep pattern")