jott-cli 0.5.1__tar.gz → 0.5.3__tar.gz

{jott_cli-0.5.1/jott_cli.egg-info → jott_cli-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jott-cli
-Version: 0.5.1
+Version: 0.5.3
 Summary: Feature-rich interactive CLI task manager with AI integration, calendar sync, and keyword automation
 Author-email: Scott Anderson <sonander@gmail.com>
 Maintainer-email: Scott Anderson <sonander@gmail.com>

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/__init__.py

@@ -7,7 +7,7 @@ import importlib.util
 import os
 from pathlib import Path
 
-__version__ = "0.5.1"
+__version__ = "0.5.2"
 
 # When building Sphinx docs, skip the dynamic import bridge and heavy deps.
 # Set JOT_SPHINX_BUILD=1 in docs/sphinx/conf.py before importing jot.

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/_app_navigation_mixin.py

@@ -17,8 +17,11 @@ class AppNavigationMixin:
     def _handle_navigation(self, key, tasks_to_display):
         """Process UP/DOWN/SHIFT_UP/SHIFT_DOWN.  Returns True if
         the key was a navigation key."""
+        st = self.state
         filtered = (
-            tasks_to_display if self.state.show_today_only else None)
+            tasks_to_display
+            if st.show_today_only or st.collapsed_parents
+            else None)
 
         if key == 'UP':
             self.task_manager.set_prev_current(filtered)

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/_dispatch_mixin.py

@@ -6,6 +6,7 @@ from jot.core.constants import (
     MODE_QUICK_ADD, MODE_COMMAND, MODE_MULTISELECT,
     MODE_FUZZY_SEARCH, MODE_ALL_CATEGORIES,
 )
+from jot.ui.input import get_key
 from jot.ui.styles import RESET, CYAN
 
 
@@ -79,6 +80,10 @@ class DispatchMixin:
         if self._handle_navigation(key, tasks_to_display):
             return
 
+        if key == '.':
+            self._handle_dot_chord()
+            return
+
         if len(key) == 1 and key.isprintable():
             st.input_buffer += key
 
@@ -184,7 +189,9 @@ class DispatchMixin:
             return
 
         filtered = (
-            tasks_to_display if st.show_today_only else None)
+            tasks_to_display
+            if st.show_today_only or st.collapsed_parents
+            else None)
 
         if key == 'UP':
             self.task_manager.set_prev_current(filtered)
@@ -286,6 +293,84 @@ class DispatchMixin:
             self.task_manager.set_current(
                 st.filtered_tasks[idx + 1][0]['id'])
 
+    def _handle_dot_chord(self):
+        """Handle '.' leader key — wait for second key to form chord."""
+        st = self.state
+        second = get_key(timeout=0.3)
+        if second == 'c':
+            self._toggle_collapse()
+            st.input_buffer = ""
+            return
+        # Not a chord — treat '.' as normal input
+        st.input_buffer += '.'
+        if second and second != '.':
+            st.input_buffer += second
+
+    def _toggle_collapse(self):
+        """Toggle collapse state for current task's parent group."""
+        task = self.task_manager.get_current_task()
+        if not task:
+            return
+
+        tasks = self.task_manager.get_tasks()
+        collapsed = self.state.collapsed_parents
+
+        # Check if current task is a parent (has descendants)
+        has_children = any(
+            f'parent:{task["id"]}' in t.get('labels', [])
+            for t in tasks
+        )
+
+        if has_children:
+            target_id = task['id']
+        else:
+            # Check if it's a child — toggle its parent
+            target_id = None
+            for label in task.get('labels', []):
+                if label.startswith('parent:'):
+                    pid = label.split(':', 1)[1]
+                    try:
+                        target_id = int(pid)
+                    except ValueError:
+                        target_id = pid
+                    break
+
+        if target_id is None:
+            return
+
+        # Count descendants for feedback
+        children_of = {}
+        for t in tasks:
+            for label in t.get('labels', []):
+                if label.startswith('parent:'):
+                    pid = label.split(':', 1)[1]
+                    try:
+                        pid = int(pid)
+                    except ValueError:
+                        pass
+                    children_of.setdefault(pid, []).append(t['id'])
+                    break
+
+        count = 0
+        stack = list(children_of.get(target_id, []))
+        seen = set()
+        while stack:
+            cid = stack.pop()
+            if cid not in seen:
+                seen.add(cid)
+                count += 1
+                stack.extend(children_of.get(cid, []))
+
+        if target_id in collapsed:
+            collapsed.discard(target_id)
+            print(f"\n{CYAN}▼ Expanded {count} subtask"
+                  f"{'s' if count != 1 else ''}{RESET}")
+        else:
+            collapsed.add(target_id)
+            print(f"\n{CYAN}▶ Collapsed {count} subtask"
+                  f"{'s' if count != 1 else ''}{RESET}")
+        time.sleep(0.3)
+
     def _dispatch_all_categories(self, key, tasks_to_display):
         """Handle a keypress in ALL_CATEGORIES mode."""
         st = self.state
@@ -295,7 +380,9 @@ class DispatchMixin:
             return
 
         filtered = (
-            tasks_to_display if st.show_today_only else None)
+            tasks_to_display
+            if st.show_today_only or st.collapsed_parents
+            else None)
         if key == 'UP':
             self.task_manager.set_prev_current(filtered)
         elif key == 'DOWN':

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/app.py

@@ -20,6 +20,7 @@ from jot.utils.date_utils import (
 from jot.utils.text_utils import fuzzy_match
 from jot._dispatch_mixin import DispatchMixin
 from jot._app_navigation_mixin import AppNavigationMixin
+from jot.ui.rendering import buffered_output
 
 
 # ---------------------------------------------------------------------------
@@ -44,6 +45,7 @@ class AppState:
     filtered_tasks: list = field(default_factory=list)
     archived_task_ids: set = field(default_factory=set)
     match_positions: dict = field(default_factory=dict)
+    collapsed_parents: set = field(default_factory=set)
 
 
 # ---------------------------------------------------------------------------
@@ -80,6 +82,8 @@ class App(DispatchMixin, AppNavigationMixin):
         '#': 'reauthenticate_google_calendar',
         '\x12': 'register_current_project',     # Ctrl+R
         '*': 'toggle_highlight',
+        '~': 'quick_highlight',
+        '\x0c': 'assign_parent',                # Ctrl+L
     }
 
     def __init__(self, task_manager, command_handler, registry,
@@ -91,6 +95,7 @@ class App(DispatchMixin, AppNavigationMixin):
         self.project_name = project_name
 
         self.state = AppState()
+        self._needs_render = True
         self._last_mtime = (
             os.path.getmtime(task_manager.storage_file)
             if task_manager.storage_file.exists() else 0)
@@ -111,8 +116,12 @@ class App(DispatchMixin, AppNavigationMixin):
         """Inner event loop — separated so run() can wrap with
         try/finally."""
         while self.state.running:
-            tasks_to_display = self._prepare_tasks()
-            self._render(tasks_to_display)
+            if self._needs_render:
+                tasks_to_display = self._prepare_tasks()
+                self._render(tasks_to_display)
+                self._needs_render = False
+            else:
+                tasks_to_display = self._prepare_tasks()
 
             try:
                 key = get_key()
@@ -122,6 +131,9 @@ class App(DispatchMixin, AppNavigationMixin):
                 if self._handle_paste(key):
                     continue
 
+                # Any real key press triggers a render
+                self._needs_render = True
+
                 # Global handlers (any mode)
                 if key == '\x05':                   # Ctrl+E
                     self.command_handler.edit_current()
@@ -157,6 +169,12 @@ class App(DispatchMixin, AppNavigationMixin):
         """Fetch, filter, and sort the task list for display."""
         tasks = self.task_manager.get_tasks()
 
+        # Stash full list before collapse filtering so display can
+        # compute correct descendant counts for collapsed parents.
+        self._all_tasks = tasks
+
+        if self.state.collapsed_parents:
+            tasks = self._filter_collapsed(tasks)
         if self.state.show_today_only:
             today = get_today_day_name()
             tasks = filter_today_tasks(tasks, today)
@@ -165,6 +183,33 @@ class App(DispatchMixin, AppNavigationMixin):
 
         return self._get_filtered_tasks(tasks)
 
+    def _filter_collapsed(self, tasks):
+        """Remove descendants of collapsed parents from the task list."""
+        # Build parent→children map
+        children_of = {}
+        for task in tasks:
+            for label in task.get('labels', []):
+                if label.startswith('parent:'):
+                    pid = label.split(':', 1)[1]
+                    try:
+                        pid = int(pid)
+                    except ValueError:
+                        pass
+                    children_of.setdefault(pid, []).append(task['id'])
+                    break
+
+        # Collect all descendants of collapsed parents (BFS)
+        hidden = set()
+        for root_id in self.state.collapsed_parents:
+            stack = list(children_of.get(root_id, []))
+            while stack:
+                cid = stack.pop()
+                if cid not in hidden:
+                    hidden.add(cid)
+                    stack.extend(children_of.get(cid, []))
+
+        return [t for t in tasks if t['id'] not in hidden]
+
     def _get_filtered_tasks(self, tasks_to_display):
         """Apply fuzzy-search filtering when in FUZZY_SEARCH mode."""
         st = self.state
@@ -212,30 +257,35 @@ class App(DispatchMixin, AppNavigationMixin):
 
     def _render(self, tasks_to_display):
         """Clear screen and draw the current view."""
-        sys.stdout.write('\033[?25l\033[H\033[J')
-        st = self.state
+        with buffered_output():
+            sys.stdout.write('\033[?25l\033[H\033[J')
+            st = self.state
+
+            if st.mode == MODE_ALL_CATEGORIES:
+                self._render_all_categories()
+            else:
+                all_tasks = (
+                    self._all_tasks
+                    if st.collapsed_parents else None)
+                display_tasks(
+                    tasks_to_display, st.mode, st.input_buffer,
+                    self.project_name,
+                    category=self.task_manager.category,
+                    is_global=self.task_manager.is_global,
+                    show_archived=st.show_archived,
+                    archived_tasks=self.task_manager.archived,
+                    selected_tasks=st.selected_tasks,
+                    search_buffer=st.search_buffer,
+                    archived_task_ids=st.archived_task_ids,
+                    include_archived_in_search=st.include_archived_in_search,
+                    show_shortcuts=st.show_shortcuts,
+                    show_notes_inline=st.show_notes_inline,
+                    match_positions=st.match_positions,
+                    collapsed_parents=st.collapsed_parents,
+                    all_tasks=all_tasks,
+                )
 
-        if st.mode == MODE_ALL_CATEGORIES:
-            self._render_all_categories()
-        else:
-            display_tasks(
-                tasks_to_display, st.mode, st.input_buffer,
-                self.project_name,
-                category=self.task_manager.category,
-                is_global=self.task_manager.is_global,
-                show_archived=st.show_archived,
-                archived_tasks=self.task_manager.archived,
-                selected_tasks=st.selected_tasks,
-                search_buffer=st.search_buffer,
-                archived_task_ids=st.archived_task_ids,
-                include_archived_in_search=st.include_archived_in_search,
-                show_shortcuts=st.show_shortcuts,
-                show_notes_inline=st.show_notes_inline,
-                match_positions=st.match_positions,
-            )
-
-        sys.stdout.write('\033[?25h')
-        sys.stdout.flush()
+            sys.stdout.write('\033[?25h')
 
     def _render_all_categories(self):
         """Delegate ALL_CATEGORIES rendering to the display module."""
@@ -263,6 +313,7 @@ class App(DispatchMixin, AppNavigationMixin):
             if current_mtime != self._last_mtime:
                 self.task_manager._load_tasks()
                 self._last_mtime = current_mtime
+                self._needs_render = True
         return True
 
     def _handle_paste(self, key):
@@ -274,4 +325,5 @@ class App(DispatchMixin, AppNavigationMixin):
         if self.state.mode == MODE_QUICK_ADD:
             pasted_text = pasted_text.replace('\r', '').replace('\n', '')
             self.state.input_buffer += pasted_text
+        self._needs_render = True
         return True

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/commands/_metadata_mixin.py

@@ -3,10 +3,11 @@
 from datetime import datetime
 
 from jot.core.constants import DAY_COLORS, DAY_ABBREVIATIONS
-from jot.ui.picker import PickerItem, quick_picker
+from jot.ui.picker import PickerItem, quick_picker, fuzzy_picker
 from jot.ui.styles import (
     RESET, BOLD, DIM, GREEN, RED,
     PRIORITY_COLORS, PRIORITY_SYMBOLS, STATUS_COLORS, STATUS_SYMBOLS,
+    HIGHLIGHT_COLORS,
 )
 from jot.ui.input import restore_terminal
 
@@ -124,14 +125,52 @@ class MetadataMixin:
         return True
 
     def toggle_highlight(self):
-        """Toggle highlight on the current task."""
+        """Pick a highlight color for the current task, or clear it."""
         current_task = self.task_manager.get_current_task()
         if not current_task:
             return True
+
+        items = [PickerItem(value="_clear", label="none (clear)", color=DIM)]
+        for name, fmt in HIGHLIGHT_COLORS.items():
+            items.append(PickerItem(
+                value=name, label=name, color=fmt,
+            ))
+
+        result = quick_picker(
+            items,
+            prompt=f"Highlight color for: {current_task['text']}",
+        )
+
+        if result.value is None:
+            return True
+
+        if result.value == "_clear":
+            self.task_manager.set_highlight(color=None)
+            print(f"\n{GREEN}✓{RESET} Highlight cleared")
+        else:
+            self.task_manager.set_highlight(color=result.value)
+            fmt = HIGHLIGHT_COLORS[result.value]
+            print(f"\n{GREEN}✓{RESET} Highlight set to {fmt} {result.value} {RESET}")
+
+        print("\nPress Enter to continue...", end='', flush=True)
+        restore_terminal()
+        input()
+        return True
+
+    def quick_highlight(self):
+        """Toggle default highlight color on the current task."""
+        current_task = self.task_manager.get_current_task()
+        if not current_task:
+            return True
+        from jot.ui.styles import HIGHLIGHT_DEFAULT
         was_highlighted = current_task.get('highlight', False)
-        self.task_manager.toggle_highlight()
-        label = "unhighlighted" if was_highlighted else "highlighted"
-        print(f"\n{GREEN}✓{RESET} Task {label}")
+        if was_highlighted:
+            self.task_manager.set_highlight(color=None)
+            print(f"\n{GREEN}✓{RESET} Highlight cleared")
+        else:
+            self.task_manager.set_highlight(color=HIGHLIGHT_DEFAULT)
+            fmt = HIGHLIGHT_COLORS[HIGHLIGHT_DEFAULT]
+            print(f"\n{GREEN}✓{RESET} Highlighted {fmt} {HIGHLIGHT_DEFAULT} {RESET}")
         return True
 
     def set_priority_high(self):
@@ -176,3 +215,74 @@ class MetadataMixin:
         input()
 
         return True
+
+    def assign_parent(self):
+        """Assign current task as a subtask of another task (Ctrl+L)."""
+        current_task = self.task_manager.get_current_task()
+        if not current_task:
+            print("\n✗ No current task selected")
+            return True
+
+        task_id = current_task['id']
+        labels = current_task.get('labels', [])
+
+        # Find existing parent label
+        current_parent = None
+        for lbl in labels:
+            if lbl.startswith('parent:'):
+                current_parent = lbl.split(':', 1)[1]
+                break
+
+        # Build picker items
+        items = []
+        if current_parent is not None:
+            items.append(PickerItem(
+                value="_clear", label="Remove parent link", color=DIM,
+            ))
+
+        for task in self.task_manager.get_tasks():
+            if task['id'] == task_id:
+                continue
+            if task.get('status') == 'done':
+                continue
+            annotation = "(current parent)" if str(task['id']) == str(current_parent) else ""
+            items.append(PickerItem(
+                value=str(task['id']),
+                label=f"#{task['id']} {task['text']}",
+                annotation=annotation,
+            ))
+
+        if not items:
+            print("\n✗ No candidate tasks found")
+            return True
+
+        result = fuzzy_picker(
+            items,
+            prompt=f"Assign parent for: {current_task['text']}",
+        )
+
+        if result.value is None:
+            return True
+
+        # Strip existing parent: label
+        new_labels = [l for l in labels if not l.startswith('parent:')]
+
+        if result.value != "_clear":
+            new_labels.append(f"parent:{result.value}")
+
+        # Save updated labels
+        for task in self.task_manager.tasks:
+            if task['id'] == task_id:
+                task['labels'] = new_labels
+                self.task_manager._save_tasks()
+                break
+
+        if result.value == "_clear":
+            print(f"\n{GREEN}✓{RESET} Parent link removed")
+        else:
+            print(f"\n{GREEN}✓{RESET} Assigned as subtask of #{result.value}")
+
+        print("\nPress Enter to continue...", end='', flush=True)
+        restore_terminal()
+        input()
+        return True

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/commands/_transfer_mixin.py

@@ -5,9 +5,8 @@ from pathlib import Path
 from jot.categories.config import CategoryConfig
 from jot.categories.manager import CategoryManager
 from jot.core.task_manager import TaskManager
-from jot.ui.picker import PickerItem, fuzzy_picker
+from jot.ui.picker import PickerItem, fuzzy_picker, quick_picker
 from jot.ui.styles import RESET, RED
-from jot.ui.input import restore_terminal
 
 
 class TransferMixin:
@@ -82,7 +81,8 @@ class TransferMixin:
             task_text,
             priority=current_task.get('priority', 'none'),
             status=current_task.get('status', 'todo'),
-            labels=current_task.get('labels', []),
+            labels=[l for l in current_task.get('labels', [])
+                    if not l.startswith('parent:')],
             effort=current_task.get('effort', None),
         )
 
@@ -147,7 +147,8 @@ class TransferMixin:
             task_text,
             priority=current_task.get('priority', 'none'),
             status=current_task.get('status', 'todo'),
-            labels=current_task.get('labels', []),
+            labels=[l for l in current_task.get('labels', [])
+                    if not l.startswith('parent:')],
             effort=current_task.get('effort', None),
         )
 
@@ -211,78 +212,55 @@ class TransferMixin:
 
         cat_config = CategoryConfig(project_dir=project_dir)
 
-        print(f"\nTransfer task '{task_text}' to:")
-        for i, (display_name, cat_name, is_global) in enumerate(categories, 1):
+        items = []
+        for display_name, cat_name, is_global in categories:
             if display_name == "default":
-                cat_color = cat_config.get_color('default')
-                print(f"  {i}. {cat_color}default (no category){RESET}")
+                items.append(PickerItem(
+                    value=(None, False),
+                    label="default",
+                    annotation="(no category)",
+                    color=cat_config.get_color('default'),
+                ))
             else:
-                cat_color = cat_config.get_color(cat_name, for_global=is_global)
                 scope = "[global]" if is_global else "[local]"
-                print(f"  {i}. {cat_color}{cat_name} {scope}{RESET}")
-
-        print("\nEnter number or name (ESC to cancel): ", end='', flush=True)
-        restore_terminal()
-
-        try:
-            user_input = input().strip()
-            if not user_input or user_input == '\x1b':
-                print("✗ Cancelled")
-                return True
-
-            selected_category = None
-            selected_is_global = False
-
-            try:
-                choice_index = int(user_input) - 1
-                if 0 <= choice_index < len(categories):
-                    _, cat_name, is_global = categories[choice_index]
-                    selected_category = cat_name
-                    selected_is_global = is_global
-                else:
-                    print("✗ Invalid number")
-                    return True
-            except ValueError:
-                found = False
-                for display_name, cat_name, is_global in categories:
-                    if cat_name == user_input or display_name == user_input:
-                        selected_category = cat_name
-                        selected_is_global = is_global
-                        found = True
-                        break
-                if not found:
-                    print(f"✗ Category '{user_input}' not found")
-                    return True
-
-            if selected_is_global:
-                dest_tm = TaskManager(
-                    category=selected_category, is_global=True, project_registry=self.registry
-                )
-            else:
-                dest_tm = TaskManager(
-                    directory=project_dir,
-                    category=selected_category,
-                    is_global=False,
-                    project_registry=self.registry,
-                )
-
-            dest_tm.add_task(task_text)
-            if task_done:
-                new_task_id = dest_tm.tasks[-1]['id']
-                dest_tm.set_task_status(new_task_id, 'done')
-
-            self.task_manager.remove_task(task_id)
-
-            dest_name = selected_category or 'default'
-            if selected_is_global:
-                print(f"✓ Transferred task to global:{dest_name}")
-            else:
-                print(f"✓ Transferred task to {dest_name}")
-
-            print("\nPress Enter to continue...", end='', flush=True)
-            input()
+                items.append(PickerItem(
+                    value=(cat_name, is_global),
+                    label=cat_name,
+                    annotation=scope,
+                    color=cat_config.get_color(cat_name, for_global=is_global),
+                ))
+
+        result = quick_picker(items, prompt=f"Transfer '{task_text}' to")
+        if result.value is None:
             return True
 
-        except KeyboardInterrupt:
-            print("\n✗ Cancelled")
-            return True
+        selected_category, selected_is_global = result.value
+
+        if selected_is_global:
+            dest_tm = TaskManager(
+                category=selected_category, is_global=True, project_registry=self.registry
+            )
+        else:
+            dest_tm = TaskManager(
+                directory=project_dir,
+                category=selected_category,
+                is_global=False,
+                project_registry=self.registry,
+            )
+
+        dest_tm.add_task(task_text)
+        if task_done:
+            new_task_id = dest_tm.tasks[-1]['id']
+            dest_tm.set_task_status(new_task_id, 'done')
+
+        self.task_manager.remove_task(task_id)
+
+        dest_name = selected_category or 'default'
+        if selected_is_global:
+            print(f"✓ Transferred task to global:{dest_name}")
+        else:
+            print(f"✓ Transferred task to {dest_name}")
+
+        print("\nPress Enter to continue...", end='', flush=True)
+        input()
+        return True

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/core/_delete_mixin.py

@@ -7,8 +7,17 @@ from datetime import datetime
 class DeleteMixin:
     """Task removal, archival, and notes preservation."""
 
+    def _unlink_children(self, task_id):
+        """Remove parent:{task_id} labels from all children."""
+        parent_label = f"parent:{task_id}"
+        for task in self.tasks:
+            labels = task.get('labels', [])
+            if parent_label in labels:
+                task['labels'] = [l for l in labels if l != parent_label]
+
     def remove_task(self, task_id):
         """Archive a task by ID and set previous task as current"""
+        self._unlink_children(task_id)
         org_file = self.save_notes_to_org_file(task_id)
         if org_file:
             print(f"\n\u2713 Notes saved to {os.path.basename(org_file)}")
@@ -43,6 +52,7 @@ class DeleteMixin:
 
     def delete_task_permanently(self, task_id):
         """Permanently delete a task and release its ID for reuse"""
+        self._unlink_children(task_id)
         org_file = self.save_notes_to_org_file(task_id)
         if org_file:
             print(f"\n\u2713 Notes saved to {os.path.basename(org_file)}")

{jott_cli-0.5.1 → jott_cli-0.5.3}/jot/core/_metadata_mixin.py

@@ -61,8 +61,13 @@ class MetadataMixin:
         self._save_tasks()
         return True
 
-    def toggle_highlight(self, task_id=None):
-        """Toggle highlight on a task. Multiple tasks can be highlighted."""
+    def set_highlight(self, task_id=None, color=None):
+        """Set highlight color on a task, or clear it.
+
+        Args:
+            task_id: Task to highlight (defaults to current task).
+            color: Color name from HIGHLIGHT_COLORS, or None to clear.
+        """
         if task_id is None:
             current = self.get_current_task()
             if not current:
@@ -71,7 +76,7 @@ class MetadataMixin:
 
         for task in self.tasks:
             if task['id'] == task_id:
-                task['highlight'] = not task.get('highlight', False)
+                task['highlight'] = color if color else False
                 self._save_tasks()
                 return True
         return False