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

kash/web_gen/templates/simple_webpage.html.jinja

@@ -1,24 +1,552 @@
 {% extends "base_webpage.html.jinja" %}
 
-<!-- simple_webpage begin main_content block -->
+{% block custom_styles %}
+{{ super() }}
+<style>
+/* Override Tailwind's bg-white in dark mode */
+[data-theme="dark"] .bg-white {
+  background-color: var(--color-bg-alt-solid) !important;
+}
+.long-text {
+  transition: background 0.4s ease-in-out, color 0.4s ease-in-out;
+}
+
+/* Ensure long-text containers respect theme */
+[data-theme="dark"] .long-text {
+  background-color: var(--color-bg-alt-solid);
+  color: var(--color-text);
+  box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.3), 0 -2px 6px -1px rgba(0, 0, 0, 0.2);
+}
+
+/* Table of Contents Styles */
+:root {
+  --toc-width: max(21vw, 15rem);
+  --toc-breakpoint: {{ toc_breakpoint | default(1200) }}px;
+}
+
+@media (min-width: 1536px) {
+  :root {
+    --toc-width: min(21vw, 30rem);
+  }
+}
+
+/* Desktop: Always use grid layout, adjust TOC column width */
+@media (min-width: {{ toc_breakpoint | default(1200) }}px) {
+  .content-with-toc {
+    display: grid;
+    grid-template-columns: calc(var(--toc-width) + 4rem) 1fr;
+    max-width: none;
+    min-height: 100vh;
+  }
+  
+  .content-with-toc.has-toc {
+    grid-template-columns: calc(var(--toc-width) + 4rem) 1fr;
+  }
+  
+  /* Content goes in the second column (right side) */
+  .content-with-toc .long-text {
+    max-width: 48rem;
+    margin: 0 auto;
+    order: 2;
+    grid-column: 2;
+  }
+  
+  /* TOC goes in the first column (left side) */
+  .toc-container {
+    order: 1;
+    grid-column: 1;
+    align-self: start;
+    width: var(--toc-width);
+    position: sticky;
+    top: 2rem;
+    max-height: calc(100vh - 4rem);
+    overflow-y: auto;
+    padding: 1rem 0.7rem;
+    margin: 0 0 0 2rem;
+    border: 1px solid var(--color-border-hint);
+    opacity: 0;
+    transform: translateX(-100%);
+  }
+
+  .content-with-toc.has-toc .toc-container {
+    transform: translateX(0);
+    opacity: 1;
+  }
+  
+  /* Hide mobile toggle on desktop */
+  .toc-toggle {
+    display: none !important;
+  }
+  
+  /* More minimal TOC scrollbar */
+  .toc-container::-webkit-scrollbar {
+    width: 2px; 
+  }
+  .toc-container::-webkit-scrollbar-track {
+    background: transparent; /* Invisible track */
+  }
+  .toc-container::-webkit-scrollbar-thumb {
+    background: var(--color-hint-gentle);
+    border-radius: 2px;
+    opacity: 0.1;
+  }
+  .toc-container::-webkit-scrollbar-thumb:hover {
+    opacity: 0.2;
+  }
+  .toc-container {
+    /* For Firefox */
+    scrollbar-width: thin;
+    scrollbar-color: var(--color-hint-gentle) transparent;
+  }
+}
+
+/* TOC Styling */
+.toc {
+  font-family: var(--font-sans);
+  color: var(--color-tertiary);
+  font-variant-numeric: tabular-nums;
+}
+
+.toc-title {
+  font-size: var(--font-size-small);
+  font-weight: 550;
+  text-transform: uppercase;
+  letter-spacing: 0.025em;
+  margin: 0 0 0.5rem 0.3rem;
+  padding-bottom: 0.5rem;
+  border-bottom: 1px solid var(--color-border-hint);
+  transition: color 0.4s ease-in-out, border-bottom-color 0.4s ease-in-out;
+}
+
+.toc-list {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  font-size: var(--font-size-small);
+  line-height: 1.2;
+}
+
+.toc-list li {
+  margin: 0;
+  padding: 0 0.3rem 0 0;
+}
+
+.toc-list li::before {
+  display: none; /* Remove custom bullet points */
+}
+
+.toc-link {
+  display: block;
+  color: var(--color-tertiary);
+  text-decoration: none;
+  padding: 0.2rem 0;
+  transition: background 0.4s ease-in-out, all 0.15s ease-in-out;
+  border-left: 2px solid transparent;
+}
+
+.toc-link:hover {
+  color: var(--color-secondary);
+  background-color: var(--color-hover-bg);
+  text-decoration: none;
+}
+
+.toc-link.active {
+  color: var(--color-secondary);
+  border-left: 2px solid var(--color-primary);
+  background-color: var(--color-hover-bg);
+}
+
+/* Hanging indent and styles for each TOC heading */
+.toc-h1 {
+  padding-left: 1.3rem;
+  text-indent: -1em;
+  font-weight: 550;
+}
+.toc-h2 {
+  padding-left: 2.0rem;
+  text-indent: -1em;
+  font-weight: 550;
+}
+.toc-h3 {
+  padding-left: 2.7rem;
+  text-indent: -1em;
+  font-weight: 380;
+}
+.toc-h4 {
+  padding-left: 3.4rem;
+  text-indent: -1em;
+  font-weight: 380;
+}
+
+/* Prevent body scroll when TOC is open */
+body.toc-open {
+  overflow: hidden;
+  position: fixed;
+  width: 100%;
+}
+
+/* Mobile TOC Layout */
+@media (max-width: {{ toc_breakpoint | default(1200) - 1 }}px) {
+  /* Specific positioning and z-index for TOC toggle */
+  .toc-toggle {
+    left: 1rem;
+    z-index: 101;
+    opacity: 0; /* Hidden by default */
+    visibility: hidden; /* Start hidden for FOUC prevention on mobile */
+    transition: opacity 0.3s ease-in-out, visibility 0.3s ease-in-out;
+  }
+  
+  /* Show TOC toggle when user has scrolled past top */
+  .toc-toggle.show-toggle {
+    opacity: 1;
+    visibility: visible;
+  }
+  
+  /* Show backdrop when visible */
+  .toc-backdrop.visible {
+    opacity: 1;
+    visibility: visible;
+    pointer-events: auto;
+  }
+  
+  /* Mobile TOC state: always rendered but hidden by default */
+  .toc-container {
+    display: block !important; /* Override base rule and any JS inline styles */
+    position: fixed;
+    top: 4rem;
+    left: 1rem;
+    width: calc(100vw - 2rem);
+    max-height: calc(100vh - 5rem);
+    /* Keep background and darker text on mobile since it's primary UI */
+    color: var(--color-text);
+    background: var(--color-bg-alt-solid);
+    border: 1px solid var(--color-border-hint);
+    padding: 1rem 0.7rem;
+    z-index: 200;
+    
+    /* Ensure TOC itself is scrollable */
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch; /* Smooth scrolling on iOS */
+    overscroll-behavior: contain; /* Prevent scroll chaining */
+    
+    /* Initial hidden state for mobile FOUC and animation */
+    opacity: 0;
+    transform: translateY(-0.5rem);
+    visibility: hidden;
+    pointer-events: none; /* Prevent interaction when hidden */
+    
+    transition: opacity 0.3s ease-in-out, 
+                transform 0.3s ease-in-out, 
+                visibility 0.3s ease-in-out,
+                pointer-events 0.3s ease-in-out,
+                background-color 0.4s ease-in-out, 
+                border-color 0.4s ease-in-out, 
+                box-shadow 0.4s ease-in-out;
+  }
+  
+  /* Darker text on mobile */
+  .toc {
+    color: var(--color-secondary);
+  }
+  .toc-link {
+    color: var(--color-secondary);
+  }
+  .toc-link:hover {
+    color: var(--color-text);
+  }
+
+  .toc-link.active {
+    color: var(--color-text);
+  }
+    
+  .toc-container.mobile-visible {
+    /* Visible state */
+    opacity: 1;
+    transform: translateY(0);
+    visibility: visible;
+    pointer-events: auto; /* Re-enable interaction */
+  }
+}
+</style>
+{% endblock custom_styles %}
+
 {% block main_content %}
-<div class="long-text container max-w-3xl mx-auto bg-white py-4 px-6 md:px-16">
-  {% block page_title %}
-  {% if title and add_title_h1 %}
-    <h1 class="text-center text-4xl mt-6 mb-6">{{ title }}</h1>
-  {% endif %}
-  {% endblock page_title %}
-  
-  <div>
-    {% block page_content %}
-    {% if thumbnail_url %}
-    <img class="thumbnail" src="{{ thumbnail_url }}" alt="{{ title }}" />
+<!-- simple_webpage begin main_content block -->
+<div class="content-with-toc" id="content-container">
+  <div class="long-text container max-w-3xl mx-auto bg-white py-4 px-6 md:px-16" id="main-content">
+    {% block page_title %}
+    {% if title and add_title_h1 %}
+      <h1 class="text-center text-4xl mt-6 mb-6">{{ title }}</h1>
     {% endif %}
-    <div class="content">
-      {{ content_html | safe }}
+    {% endblock page_title %}
+    
+    <div>
+      {% block page_content %}
+      {% if thumbnail_url %}
+      <img class="thumbnail" src="{{ thumbnail_url }}" alt="{{ title }}" />
+      {% endif %}
+      <div class="content">
+        {{ content_html | safe }}
+      </div>
+      {% endblock page_content %}
     </div>
-    {% endblock page_content %}
   </div>
+  
+  <!-- Mobile TOC toggle -->
+  <button class="button fixed-button toc-toggle" id="toc-toggle" aria-label="Toggle table of contents" style="display: none;">
+    <i data-feather="list"></i>
+  </button>
+  
+  <!-- Mobile TOC Backdrop -->
+  <div class="toc-backdrop" id="toc-backdrop"></div>
+  
+  <!-- TOC Container -->
+  <aside class="toc-container" id="toc-container" aria-label="Table of contents">
+    <div class="toc">
+      <h2 class="toc-title">Contents</h2>
+      <ul class="toc-list" id="toc-list">
+        <!-- TOC items will be populated by JavaScript -->
+      </ul>
+    </div>
+  </aside>
 </div>
+<!-- simple_webpage end main_content block -->
 {% endblock main_content %}
-<!-- simple_webpage end main_content block -->
+
+
+{% block scripts_extra %}
+{{ super() }}
+<!-- simple_webpage begin scripts_extra block -->
+<script>
+// Table of Contents functionality
+function initTOC() {
+  const tocContainer = document.getElementById('toc-container');
+  const tocList = document.getElementById('toc-list');
+  const tocToggle = document.getElementById('toc-toggle');
+  const contentContainer = document.getElementById('content-container');
+  const mainContent = document.getElementById('main-content');
+  
+  if (!tocContainer || !tocList || !mainContent) {
+    console.debug("TOC not initialized: missing elements");
+    return;
+  }
+  
+  const tocBreakpoint = parseInt(
+    getComputedStyle(document.documentElement)
+      .getPropertyValue('--toc-breakpoint')
+      .replace('px', '')
+  );
+  
+  // Find all headings in the main content
+  const headings = mainContent.querySelectorAll('{{ toc_headings | default("h1, h2, h3") }}');
+  // Only show TOC if we have toc_min_headings (default 10) or more headings
+  const tocThreshold = {{ toc_min_headings | default(10) }};
+  
+  if (headings.length < tocThreshold) {
+    // TOC is disabled
+    if (tocToggle) {
+      tocToggle.style.display = 'none';
+    }
+    console.debug("TOC hidden: not enough headings");
+    return;
+  }
+
+  // TOC is enabled
+  contentContainer.classList.add('has-toc');  // This triggers grid layout
+  mainContent.classList.add('with-toc');
+  document.body.classList.add('page-has-toc');
+  
+  if (tocToggle) {
+    tocToggle.style.display = 'flex';
+    // Ensure feather icon is rendered after making visible
+    if (typeof feather !== 'undefined') {
+      feather.replace();
+    }
+  }
+  
+  // Generate TOC items
+  tocList.innerHTML = '';
+  
+  // If there is only one h1, skip it as it is the title of the page.
+  let filteredHeadings = Array.from(headings);
+  if (headings.length > 0) {
+    const firstHeading = headings[0];
+    const h1Count = filteredHeadings.filter(h => h.tagName.toLowerCase() === 'h1').length;
+
+    if (firstHeading.tagName.toLowerCase() === 'h1' && h1Count === 1) {
+      filteredHeadings = filteredHeadings.slice(1);
+    }
+  }
+  
+  filteredHeadings.forEach((heading, index) => {
+    // Ensure heading has an ID
+    if (!heading.id) {
+      const text = heading.textContent.trim().toLowerCase()
+        .replace(/[^\w\s-]/g, '')
+        .replace(/\s+/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-|-$/g, '');
+      heading.id = text || `heading-${index}`;
+    }
+    
+    const level = heading.tagName.toLowerCase();
+    const text = heading.textContent.trim();
+    
+    const li = document.createElement('li');
+    const a = document.createElement('a');
+    a.href = `#${heading.id}`;
+    a.textContent = text;
+    a.className = `toc-link toc-${level}`;
+    
+    li.appendChild(a);
+    tocList.appendChild(li);
+  });
+  
+  // Mobile TOC toggle functionality
+  if (tocToggle) {
+    const tocBackdrop = document.getElementById('toc-backdrop');
+    let scrollPosition = 0;
+    
+    const openTOC = () => {
+      // Save current scroll position
+      scrollPosition = window.pageYOffset || document.documentElement.scrollTop;
+      
+      // Add classes to show TOC and prevent body scroll
+      tocContainer.classList.add('mobile-visible');
+      if (tocBackdrop) tocBackdrop.classList.add('visible');
+      document.body.classList.add('toc-open');
+      
+      // Set body position to maintain scroll position while fixed
+      document.body.style.top = `-${scrollPosition}px`;
+    };
+    
+    const closeTOC = () => {
+      // Remove classes
+      tocContainer.classList.remove('mobile-visible');
+      if (tocBackdrop) tocBackdrop.classList.remove('visible');
+      document.body.classList.remove('toc-open');
+      
+      // Restore body position and scroll
+      document.body.style.top = '';
+      window.scrollTo(0, scrollPosition);
+    };
+    
+    tocToggle.addEventListener('click', () => {
+      if (tocContainer.classList.contains('mobile-visible')) {
+        closeTOC();
+      } else {
+        openTOC();
+      }
+    });
+    
+    // Close TOC when clicking backdrop
+    if (tocBackdrop) {
+      tocBackdrop.addEventListener('click', closeTOC);
+    }
+    
+    // Update the existing click handler to use closeTOC
+    document.addEventListener('click', (e) => {
+      if (window.innerWidth < tocBreakpoint && 
+          tocContainer.classList.contains('mobile-visible') &&
+          !tocContainer.contains(e.target) && 
+          !tocToggle.contains(e.target)) {
+        closeTOC();
+      }
+    });
+    
+    // Prevent touch events from propagating through TOC
+    tocContainer.addEventListener('touchmove', (e) => {
+      e.stopPropagation();
+    }, { passive: false });
+  }
+  
+  // Add smooth scrolling and active state management
+  const tocLinks = tocList.querySelectorAll('.toc-link');
+  tocLinks.forEach(link => {
+    link.addEventListener('click', (e) => {
+      e.preventDefault();
+      const targetId = link.getAttribute('href').substring(1);
+      const target = document.getElementById(targetId);
+      
+      if (target) {
+        // Close TOC first on mobile
+        if (window.innerWidth < tocBreakpoint) {
+          tocContainer.classList.remove('mobile-visible');
+          document.getElementById('toc-backdrop')?.classList.remove('visible');
+          document.body.classList.remove('toc-open');
+          document.body.style.top = '';
+        }
+        
+        target.scrollIntoView({ 
+          behavior: 'smooth',
+          block: 'start'
+        });
+        tocLinks.forEach(l => l.classList.remove('active'));
+        link.classList.add('active');
+        
+      }
+    });
+  });
+  
+  // Helper function to check if TOC toggle should be visible
+  const updateTocToggleVisibility = () => {
+    if (tocToggle && tocLinks.length > 0) {
+      const scrollTop = window.pageYOffset || document.documentElement.scrollTop;
+      const activeLink = tocList.querySelector('.toc-link.active');
+      const firstTocLink = tocLinks[0];
+      
+      // Only show toggle if:
+      // 1. We've scrolled down at least 100px from the top, AND
+      // 2. We're past the first section (activeLink exists and is not the first)
+      const hasScrolled = scrollTop > 100;
+      const isPastFirstSection = activeLink && activeLink !== firstTocLink;
+      const showToggle = hasScrolled && isPastFirstSection;
+      
+      tocToggle.classList.toggle('show-toggle', showToggle);
+    }
+  };
+  
+  // Intersection Observer for active state
+  const observerOptions = {
+    rootMargin: '-20% 0% -70% 0%',
+    threshold: 0
+  };
+  const observer = new IntersectionObserver((entries) => {
+    entries.forEach(entry => {
+      if (entry.isIntersecting) {
+        tocLinks.forEach(link => link.classList.remove('active'));
+        const activeLink = tocList.querySelector(`a[href="#${entry.target.id}"]`);
+        if (activeLink) {
+          activeLink.classList.add('active');
+        }
+      }
+    });
+    
+    // Update toggle visibility after intersection changes
+    updateTocToggleVisibility();
+  }, observerOptions);
+  
+  filteredHeadings.forEach(heading => observer.observe(heading));
+  
+  // Update toggle visibility on scroll
+  let scrollTimeout;
+  window.addEventListener('scroll', () => {
+    // Throttle scroll events for performance
+    clearTimeout(scrollTimeout);
+    scrollTimeout = setTimeout(updateTocToggleVisibility, 16); // ~60fps
+  });
+  
+  // Initial check
+  updateTocToggleVisibility();
+}
+
+// Initialize immediately, no setTimeout
+document.addEventListener('DOMContentLoaded', () => {
+  initTOC();
+  if (typeof feather !== 'undefined') {
+    feather.replace();
+  }
+});
+</script>
+<!-- simple_webpage end scripts_extra block -->
+{% endblock scripts_extra %}

kash/web_gen/templates/tabbed_webpage.html.jinja

@@ -40,8 +40,9 @@
 {% endblock page_content %}
 <!-- tabbed_webpage end page_content block -->
 
-<!-- tabbed_webpage begin scripts_extra block -->
 {% block scripts_extra %}
+<!-- tabbed_webpage begin scripts_extra block -->
+<script>
   function showTab(tabId, element) {
     document.querySelectorAll(".tab-pane").forEach((tab) => {
       tab.classList.add("hidden");
@@ -54,5 +55,6 @@
     element.classList.add("tab-button-active");
     element.classList.remove("tab-button-inactive");
   }
+</script>
+<!-- tabbed_webpage end scripts_extra block -->
 {% endblock scripts_extra %}
-<!-- tabbed_webpage end scripts_extra block -->

kash/xontrib/kash_extension.py

@@ -12,7 +12,6 @@ Can run from the custom kash shell (main.py) or from a regular xonsh shell.
 import kash.exec.command_registry
 import kash.xonsh_custom.load_into_xonsh
 import kash.xonsh_custom.xonsh_env
-from kash.config.logger import get_logger
 
 
 # We add action loading here directly in the xontrib so we expose `load` and
@@ -55,6 +54,8 @@ kash.xonsh_custom.xonsh_env.set_alias("load", load)
 try:
     kash.xonsh_custom.load_into_xonsh.load_into_xonsh()
 except Exception as e:
+    from kash.config.logger import get_logger
+
     log = get_logger(__name__)
-    log.error("Could not initialize kash: %s", e)
+    log.error("Could not initialize kash: %s", e, exc_info=True)
     raise

{kash_shell-0.3.15.dist-info → kash_shell-0.3.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.15
+Version: 0.3.17
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>