kash-shell 0.3.15__py3-none-any.whl → 0.3.17__py3-none-any.whl

kash/model/items_model.py

@@ -219,6 +219,12 @@ class Item:
     a text document, PDF or other resource, URL, etc.
     """
 
+    # TODO: A few cleanups:
+    # - Consider adding aliases and tags. See also Obsidian frontmatter format:
+    #   https://help.obsidian.md/Editing+and+formatting/Properties#Default%20properties
+    # - Can eliminate context here as we now have ExectContext in a contextvar.
+    # - Change store_path and external_path to a StorePath and Path instead of a str.
+
     type: ItemType
     state: State = State.draft
     title: str | None = None
@@ -230,17 +236,15 @@ class Item:
     created_at: datetime = field(default_factory=lambda: datetime.now(UTC))
     modified_at: datetime | None = None
 
-    # TODO: Consider adding aliases and tags. See also Obsidian frontmatter format:
-    # https://help.obsidian.md/Editing+and+formatting/Properties#Default%20properties
-
     # Content of the item.
     # Text items are in body. Large or binary items may be stored externally.
+    # The external_path if present should always hold the current body of the content
+    # (and body will not be set). This is necessary for large or binary files.
     body: str | None = None
     external_path: str | None = None
     original_filename: str | None = None
 
     # Path to the item in the store, if it has been saved.
-    # TODO: Migrate this to StorePath.
     store_path: str | None = None
 
     # Optionally, relations to other items, including any time this item is derived from.
@@ -547,7 +551,7 @@ class Item:
         if filename_stem and not prefer_title:
             return slugify_snake(filename_stem)
         else:
-            return slugify_snake(self.abbrev_title(max_len=max_len, add_ops_suffix=True))
+            return slugify_snake(self.pick_title(max_len=max_len, add_ops_suffix=True))
 
     def default_filename(self) -> str:
         """
@@ -560,7 +564,16 @@ class Item:
         full_suffix = self.get_full_suffix()
         return join_suffix(slug, full_suffix)
 
-    def abbrev_title(
+    def body_heading(self, allowed_tags: tuple[str, ...] = ("h1", "h2")) -> str | None:
+        """
+        Get the first heading (by default h1 or h2) from the body text, if present.
+        """
+        if self.format in [Format.markdown, Format.md_html]:
+            return first_heading(self.body_text(), allowed_tags=allowed_tags)
+        # TODO: Support HTML <h1> and <h2> as well.
+        return None
+
+    def pick_title(
         self,
         *,
         max_len: int = 100,
@@ -619,41 +632,20 @@ class Item:
 
         return final_text
 
-    def display_title(self) -> str:
-        """
-        A display title for this item. Same as abbrev_title() but will fall back
-        to the filename if it is available.
-        """
-        display_title = self.title
-        if not display_title and self.store_path:
-            display_title = Path(self.store_path).name
-        if not display_title:
-            display_title = self.abbrev_title(pull_body_heading=True)
-        return display_title
-
-    def abbrev_description(self, max_len: int = 1000) -> str:
+    def pick_description(self, max_len: int = 1000) -> str:
         """
         Get or infer description.
         """
         return abbrev_on_words(html_to_plaintext(self.description or self.body or ""), max_len)
 
-    def body_heading(self) -> str | None:
-        """
-        Get the first h1 or h2 heading from the body text, if present.
-        """
-        if self.format in [Format.markdown, Format.md_html]:
-            return first_heading(self.body_text(), allowed_tags=("h1", "h2"))
-        # TODO: Support HTML <h1> and <h2> as well.
-        return None
-
     def abbrev_body(self, max_len: int) -> str:
         """
         Get an abbreviated version of the body text. Must not be a binary Item.
         Abbreviates YAML bodies like {"role": "user", "content": "Hello"} to "user Hello".
         """
-        body_text = self.body_text()[:max_len]
+        body_text = abbrev_str(self.body_text(), max_len)
 
-        # Just for aesthetics especially for titles of chat files.
+        # Just for aesthetics, especially for titles of chat files.
         if self.type in [ItemType.chat, ItemType.config] or self.format == Format.yaml:
             try:
                 yaml_obj = list(new_yaml().load_all(self.body_text()))
@@ -662,7 +654,7 @@ class Item:
             except Exception as e:
                 log.info("Error parsing YAML body: %s", e)
 
-        return body_text[:max_len]
+        return abbrev_str(body_text, max_len)
 
     @property
     def has_body(self) -> bool:
@@ -745,9 +737,14 @@ class Item:
         self,
         other: Item | None = None,
         update_timestamp: bool = False,
+        clear_fields=(
+            "store_path",  # Will be set at save time.
+            "source",  # Should be cleared so the ItemId of a copy is not the same as the original.
+            "modified_at",
+        ),
         **other_updates: Unpack[ItemUpdateOptions],
     ) -> dict[str, Any]:
-        overrides: dict[str, Any] = {"store_path": None, "modified_at": None}
+        overrides: dict[str, Any] = {f: None for f in clear_fields}
         if update_timestamp:
             overrides["created_at"] = datetime.now()
 
@@ -767,8 +764,9 @@ class Item:
         self, update_timestamp: bool = True, **other_updates: Unpack[ItemUpdateOptions]
     ) -> Item:
         """
-        Copy item with the given field updates. Resets `store_path` to None but preserves
-        other fields, including the body. Updates created time if requested.
+        Copy item with the given field updates. Resets `store_path` and `source` to None
+        since those should be set explicitly later. Preserves other fields, including
+        the body.
         """
         new_fields = self._copy_and_update(update_timestamp=update_timestamp, **other_updates)
         return Item(**new_fields)
@@ -783,9 +781,12 @@ class Item:
 
     def derived_copy(self, **updates: Unpack[ItemUpdateOptions]) -> Item:
         """
-        Same as `new_copy_with()`, but also makes any other updates and updates the
-        `derived_from` relation. If we also have an action context, then use the
-        `title_template` to derive a new title.
+        Copy item with the given field updates. Resets `store_path` and `source` to None
+        since those should be set explicitly later. Preserves other fields, including
+        the body.
+
+        Same as `new_copy_with` but also updates the `derived_from` relation. If we also
+        have an action context, then use the `title_template` to derive a new title.
         """
         if not self.store_path:
             if self.relations.derived_from:
@@ -898,7 +899,7 @@ class Item:
         elif self.external_path:
             return fmt_loc(self.external_path)
         else:
-            return repr(self.abbrev_title())
+            return repr(self.pick_title())
 
     def as_chat_history(self) -> ChatHistory:
         if self.type != ItemType.chat:

kash/shell/completions/shell_completions.py

@@ -270,7 +270,7 @@ def get_item_completions(
                 f"{fmt_store_path(not_none(item.store_path))}",
                 COMPLETION_DISPLAY_MAX_LEN,
             ),
-            description=item.abbrev_title(),
+            description=item.pick_title(),
             append_space=True,
             score=score,
         )

kash/utils/file_utils/file_formats_model.py

@@ -106,7 +106,9 @@ class Format(Enum):
     @property
     def is_simple_text(self) -> bool:
         """
-        Is this plaintext or close to it, like Markdown?
+        Is this plaintext or close to it, like Markdown or Markdown with limited HTML?
+        "Simple text" should be a format that converts canonically to clean HTML.
+        Does not include full-page general HTML.
         """
         return self in [self.plaintext, self.markdown, self.md_html]
 
@@ -174,8 +176,8 @@ class Format(Enum):
         """
         Is this format compatible with frontmatter format metadata?
         PDF and docx unfortunately won't work with frontmatter.
-        CSV does to some degree, depending on the tool, and this is useful so we support it.
-        Perhaps we could include JSON here (assuming it's JSON5), but currently we do not.
+        CSV does to some degree, depending on the tool, and this can be useful so we support it.
+        Including JSON here (assuming it's JSON5) for similar reasons.
         """
         return self in [
             self.url,
@@ -189,7 +191,7 @@ class Format(Enum):
             self.python,
             self.shellscript,
             self.xonsh,
-            self.csv,
+            self.csv,  # Often but not always supported.
             self.log,
         ]
 

kash/web_gen/simple_webpage.py

@@ -7,6 +7,7 @@ def simple_webpage_render(
     item: Item,
     page_template: str = "simple_webpage.html.jinja",
     add_title_h1: bool = True,
+    show_theme_toggle: bool = False,
 ) -> str:
     """
     Generate a simple web page from a single item.
@@ -15,10 +16,12 @@ def simple_webpage_render(
     return render_web_template(
         template_filename=page_template,
         data={
-            "title": item.abbrev_title(),
+            "title": item.pick_title(),
             "add_title_h1": add_title_h1,
             "content_html": item.body_as_html(),
             "thumbnail_url": item.thumbnail_url,
+            "enable_themes": show_theme_toggle,
+            "show_theme_toggle": show_theme_toggle,
         },
     )
 

kash/web_gen/tabbed_webpage.py

@@ -68,14 +68,14 @@ def tabbed_webpage_config(
 
     tabs = [
         TabInfo(
-            label=clean_label(item.abbrev_title()),
+            label=clean_label(item.pick_title()),
             store_path=item.store_path,
             thumbnail_url=get_thumbnail_url(item),
         )
         for item in items
     ]
     _fill_in_ids(tabs)
-    title = summary_heading([item.abbrev_title() for item in items])
+    title = summary_heading([item.pick_title() for item in items])
     config = TabbedWebpage(
         title=title, tabs=tabs, show_tabs=len(tabs) > 1, add_title_h1=add_title_h1
     )
@@ -100,7 +100,10 @@ def _load_tab_content(config: TabbedWebpage):
 
 
 def tabbed_webpage_generate(
-    config_item: Item, page_template: str = "base_webpage.html.jinja", add_title_h1: bool = True
+    config_item: Item,
+    page_template: str = "base_webpage.html.jinja",
+    add_title_h1: bool = True,
+    show_theme_toggle: bool = False,
 ) -> str:
     """
     Generate a web page using the supplied config.
@@ -121,6 +124,8 @@ def tabbed_webpage_generate(
             "title": tabbed_webpage.title,
             "add_title_h1": add_title_h1,
             "content": content,
+            "enable_themes": show_theme_toggle,
+            "show_theme_toggle": show_theme_toggle,
         },
     )
 

kash/web_gen/templates/base_styles.css.jinja

@@ -176,11 +176,10 @@ ol > li {
 }
 
 blockquote {
-  border-left: 4px solid var(--color-primary);
+  border-left: 2px solid var(--color-primary);
   padding-left: 1rem;
   margin-left: 0;
   margin-right: 0;
-  color: var(--color-secondary);
 }
 
 /* Inline code styling */
@@ -188,6 +187,20 @@ code {
   font-family: var(--font-mono);
   font-size: var(--font-size-mono);
   letter-spacing: -0.025em;
+
+  transition: color 0.4s ease-in-out;
+}
+/* For code inside pre we style the pre tag */
+code:not(pre code) {
+  background-color: var(--color-bg-alt);
+  border-radius: 3px;
+  border: 1px solid var(--color-hint-gentle);
+  padding: 0.25em 0.2em 0.1em 0.2em;
+}
+
+/* Code block wrapper for positioning copy button */
+.code-block-wrapper {
+  position: relative;
 }
 
 /* Code blocks (pre + code) */
@@ -195,12 +208,14 @@ pre {
   font-family: var(--font-mono);
   font-size: var(--font-size-mono);
   letter-spacing: -0.025em;
+
   background-color: var(--color-bg-alt);
-  border-radius: 4px;
-  border: 1px dotted var(--color-border-hint);
-  padding: 0.2rem 0.2rem 0.1rem 0.2rem;
+  border-radius: 3px;
+  border: 1px solid var(--color-hint-gentle);
+  padding: 0.25rem 0.2rem 0.1rem 0.2rem;
   overflow-x: auto;  /* Enable horizontal scrolling */
-  position: relative;  /* Create new stacking context */
+  margin: 0;
+  transition: background-color 0.4s ease-in-out, border-color 0.4s ease-in-out;
 }
 
 /* Reset code styling when inside pre blocks */
@@ -209,6 +224,44 @@ pre > code {
   line-height: 1.5;  /* Improve readability */
 }
 
+/* Copy button for code blocks */
+.code-copy-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 1px;
+  background: var(--color-bg-alt-solid);
+  color: var(--color-hint);
+  border: none;
+  border-radius: 0.25rem;
+  padding: 0;
+  cursor: pointer;
+  font-size: 0.75rem;
+  z-index: 10;
+  transition: all 0.2s ease-in-out;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 1.5rem;
+  height: 1.5rem;
+  opacity: 0.9;
+}
+
+.code-copy-button:hover {
+  background: var(--color-hover-bg);
+  color: var(--color-primary);
+  opacity: 1;
+}
+
+.code-copy-button.copied {
+  color: var(--color-success);
+}
+
+.code-copy-button svg {
+  width: 0.875rem;
+  height: 0.875rem;
+}
+
 hr {
   border: none;
   height: 1.5rem;
@@ -298,7 +351,7 @@ hr:before {
   font-weight: var(--font-weight-sans-bold);
   text-transform: uppercase;
   letter-spacing: 0.03em;
-  margin-top: 1.1rem;
+  margin-top: 1rem;
   margin-bottom: 0.8rem;
 }
 {% endblock long_text_styles %}
@@ -339,13 +392,21 @@ tbody tr:nth-child(even) {
 
 /* 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: 2rem 0;
   background-color: var(--color-bg-solid);
+  /* Default: center tables within their container */
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+/* When TOC is present, simplify table container positioning */
+.content-with-toc.has-toc .table-container {
+  /* Within grid layout, position relative to the grid column */
+  left: 50%;
+  transform: translateX(-50%);
+  /* Let the table width be controlled by the responsive styles */
 }
 {% endblock table_styles %}
 
@@ -399,16 +460,50 @@ sup {
   
   /* Apply shadow to long-text containers on larger screens */
   .long-text {
+    border: 1px solid var(--color-hint-gentle);
     box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 -2px 6px -1px rgba(0, 0, 0, 0.07);
   }
   /* But remove shadow when wrapped in no-shadow class */
   .no-shadow .long-text {
-    box-shadow: none !important;
+    box-shadow: none;
+    border: none;
+  }
+}
+
+/* Handle TOC layouts specially - tables should bleed within their grid column */
+@media (min-width: 1200px) {
+  /* When TOC is present, tables should bleed within the content grid column */
+  .content-with-toc.has-toc table {
+    /* Calculate available width: full viewport minus TOC column width minus margins */
+    width: calc(100vw - var(--toc-width, 16rem) - 8rem);
+    max-width: none;
+  }
+  .content-with-toc.has-toc .table-container {
+    width: calc(100vw - var(--toc-width, 16rem) - 8rem);
+    max-width: none;
+  }
+  
+  /* But ensure tables don't exceed their grid column space */
+  .content-with-toc.has-toc .long-text {
+    /* The content area needs to allow tables to bleed beyond the text width */
+    overflow: visible;
+  }
+}
+
+/* Medium screens (768px - TOC breakpoint) - no TOC, tables should bleed but not as wide */
+@media (min-width: 768px) and (max-width: 1199px) {
+  table {
+    width: calc(100vw - 6rem);
+    max-width: calc(100vw - 6rem);
+  }
+  .table-container {
+    width: calc(100vw - 6rem);
+    max-width: calc(100vw - 6rem);
   }
 }
 
 /* Make narrower screens more usable for lists and tables. */
-@media (max-width: 768px) {
+@media (max-width: 767px) {
   /* Prevent horizontal scrolling on the body */
   body {
     overflow-x: hidden;
@@ -422,7 +517,7 @@ sup {
   
   /* Make table containers scrollable without affecting page layout */
   .table-container {
-    max-width: 100%;
+    max-width: calc(100vw - 3rem);
     overflow-x: auto;
     transform: none;
     left: 0;
@@ -433,9 +528,10 @@ sup {
   
   table {
     font-size: var(--font-size-smaller);
-    /* Tables can be wider than container */
+    /* Tables can be wider than container on mobile */
     width: auto;
     min-width: 100%;
+    max-width: none;
   }
   
   ul, ol {

kash/web_gen/templates/base_webpage.html.jinja

@@ -5,10 +5,32 @@
   {% block meta %}
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="color-scheme" content="light dark">
   {% endblock meta %}
 
   {% block title %}<title>{{ title }}</title>{% endblock title %}
 
+  {% block dark_mode_script %}
+  <script>
+    // Set theme before body renders to prevent flash of unstyled content
+    function applyTheme(theme) {
+      document.documentElement.dataset.theme = theme;
+      localStorage.setItem('theme', theme);
+    }
+
+    // If theme toggle is enabled, respect stored preference or system preference.
+    // Otherwise default to light mode.
+    {% if enable_themes %}
+    const storedTheme = localStorage.getItem('theme');
+    const systemPrefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    const initialTheme = storedTheme || (systemPrefersDark ? 'dark' : 'light');
+    {% else %}
+    const initialTheme = 'light';
+    {% endif %}
+    applyTheme(initialTheme);
+  </script>
+  {% endblock dark_mode_script %}
+
   {% block head_basic %}
   <link rel="preconnect" href="https://fonts.googleapis.com" />
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
@@ -35,6 +57,67 @@
   {% block head_extra %}{% endblock head_extra %}
 
   <style>
+
+    body {
+      background: var(--color-bg);
+      color: var(--color-text);
+      transition: background 0.4s ease-in-out, color 0.4s ease-in-out;
+    }
+
+    .button {
+      color: var(--color-hint);
+      background: var(--color-bg);
+      border: none;
+      padding: 0;
+      border-radius: 0.3rem;
+      cursor: pointer;
+      font-size: 1rem;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 2.5rem;
+      height: 2.5rem;
+      
+      /* Separate transitions for theme vs interaction */
+      transition: background-color 0.4s ease-in-out, 
+                  color 0.4s ease-in-out,
+                  transform 0.2s ease-in-out,
+                  box-shadow 0.2s ease-in-out;
+    }
+
+    .button:hover {
+      background: var(--color-hover-bg);
+      color: var(--color-primary);
+    }
+
+    .button svg {
+      width: 1rem;
+      height: 1rem;
+      transition: inherit; /* Inherit the color transition */
+    }
+
+    /* Dark mode styles for buttons */
+    [data-theme="dark"] .button {
+      color: var(--color-primary-light);
+    }
+
+    [data-theme="dark"] .button:hover {
+      background: var(--color-hover-bg);
+      color: var(--color-bright);
+    }
+
+    /* Positioning class for fixed buttons */
+    .fixed-button {
+      position: fixed;
+      top: 1rem;
+    }
+
+    /* Specific positioning and z-index for theme toggle */
+    .theme-toggle {
+      right: 1rem;
+      z-index: 100;
+    }
+
     {% block font_faces %}
     /* https://fontsource.org/fonts/pt-serif/cdn */
     /* pt-serif-latin-400-normal */
@@ -108,6 +191,14 @@
 </head>
 
 <body>
+  {% block theme_toggle %}
+  {% if show_theme_toggle %}
+  <button class="button fixed-button theme-toggle" aria-label="toggle dark mode">
+    <i data-feather="moon"></i>
+  </button>
+  {% endif %}
+  {% endblock theme_toggle %}
+  
   {% block body_header %}{% endblock body_header %}
   
   {% block main_content %}
@@ -119,6 +210,63 @@
   {% block scripts %}
   <script>
     document.addEventListener('DOMContentLoaded', () => {
+      // Add copy buttons to code blocks
+      document.querySelectorAll('pre').forEach(pre => {
+        // Skip if already has a copy button (check parent for wrapper)
+        if (pre.parentElement.classList.contains('code-block-wrapper')) {
+          return;
+        }
+        
+        // Create wrapper div
+        const wrapper = document.createElement('div');
+        wrapper.className = 'code-block-wrapper';
+        
+        // Insert wrapper before pre and move pre inside it
+        pre.parentNode.insertBefore(wrapper, pre);
+        wrapper.appendChild(pre);
+        
+        // Create copy button
+        const copyButton = document.createElement('button');
+        copyButton.className = 'code-copy-button';
+        copyButton.setAttribute('aria-label', 'Copy code');
+        
+        const copyIcon = typeof feather !== 'undefined' ? feather.icons.copy.toSvg() : '<i data-feather="copy"></i>';
+        const checkIcon = typeof feather !== 'undefined' ? feather.icons.check.toSvg() : '<i data-feather="check"></i>';
+        
+        copyButton.innerHTML = copyIcon;
+        copyButton.addEventListener('click', async () => {
+          const codeElement = pre.querySelector('code') || pre;
+          const textToCopy = (codeElement.textContent || codeElement.innerText).trim();
+          
+          // Works on modern browsers.
+          navigator.clipboard.writeText(textToCopy).then(() => {
+            copyButton.innerHTML = checkIcon;
+            copyButton.classList.add('copied');
+            
+            // Reset after 2 seconds
+            setTimeout(() => {
+              copyButton.innerHTML = copyIcon;
+              copyButton.classList.remove('copied');
+            }, 2000);
+          }).catch(err => {
+            console.error('Failed to copy text: ', err);
+          });
+        });
+        
+        // Add button to wrapper, not to pre
+        wrapper.appendChild(copyButton);
+      });
+      
+      // Theme toggle (if present on page)
+      const themeToggleButton = document.querySelector('.theme-toggle');
+      if (themeToggleButton) {
+        themeToggleButton.addEventListener('click', () => {
+          const currentTheme = document.documentElement.dataset.theme;
+          const newTheme = currentTheme === 'dark' ? 'light' : 'dark';
+          applyTheme(newTheme);
+        });
+      }
+      
       // 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
@@ -159,6 +307,11 @@
           }
         });
       });
+      
+      // Initialize Feather icons once at the end, after all DOM manipulation.
+      if (typeof feather !== 'undefined') {
+        feather.replace();
+      }
     });
 
     // Double-click to expand (e.g. expand tooltip to popover).
@@ -179,8 +332,9 @@
       }
     });
 
-    {% block scripts_extra %}{% endblock scripts_extra %}
+
   </script>
+  {% block scripts_extra %}{% endblock scripts_extra %}
   {% endblock scripts %}
   
   {% block analytics %}{% endblock analytics %}

kash/web_gen/templates/item_view.html.jinja

@@ -10,7 +10,7 @@
 }
 
 .item-header {
-  padding: 0.5rem 1rem 0rem 1rem;
+  padding: 0 1rem 0rem 1rem;
   border-bottom: 1px solid var(--color-border-hint); 
 }
 
@@ -109,7 +109,7 @@ h1.item-title {
 
 .item-file-info {
   {# font-family: var(--font-sans); #}
-  padding: 0.5rem 0;
+  padding: 0;
   {# font-size: var(--font-size-mono-small); #}
   word-break: break-word;
 }
@@ -118,6 +118,8 @@ h1.item-title {
   font-family: var(--font-sans);
   font-size: var(--font-size-small);
   letter-spacing: 0;
+  border: none;
+  background-color: transparent;
 }
 
 .item-url {