todo-agent 0.2.6__py3-none-any.whl → 0.2.9__py3-none-any.whl

todo_agent/infrastructure/todo_shell.py

@@ -142,12 +142,335 @@ class TodoShell:
         """Archive completed tasks."""
         return self.execute(["todo.sh", "-f", "archive"])
 
-    def deduplicate(self) -> str:
-        """Remove duplicate tasks."""
-        try:
-            return self.execute(["todo.sh", "-f", "deduplicate"])
-        except TodoShellError as e:
-            # Handle the case where no duplicates are found (not really an error)
-            if "No duplicate tasks found" in str(e):
-                return "No duplicate tasks found"
-            raise
+    def set_due_date(self, task_number: int, due_date: str) -> str:
+        """
+        Set or update due date for a task by intelligently rewriting it.
+
+        Args:
+            task_number: The task number to modify
+            due_date: Due date in YYYY-MM-DD format, or empty string to remove due date
+
+        Returns:
+            The updated task description
+        """
+        # First, get the current task to parse its components
+        tasks_output = self.list_tasks()
+        task_lines = tasks_output.strip().split("\n")
+
+        # Find the task by its actual number (not array index)
+        current_task = None
+        for line in task_lines:
+            if line.strip():
+                # Extract task number from the beginning of the line (handling ANSI codes)
+                extracted_number = self._extract_task_number(line)
+                if extracted_number == task_number:
+                    current_task = line
+                    break
+
+        if not current_task:
+            raise TodoShellError(f"Task number {task_number} not found")
+
+        # Parse the current task components
+        components = self._parse_task_components(current_task)
+
+        # Update the due date (empty string removes it)
+        if due_date.strip():
+            components["due"] = due_date
+        else:
+            components["due"] = None
+
+        # Reconstruct the task
+        new_description = self._reconstruct_task(components)
+
+        # Replace the task with the new description
+        return self.replace(task_number, new_description)
+
+    def set_context(self, task_number: int, context: str) -> str:
+        """
+        Set or update context for a task by intelligently rewriting it.
+
+        Args:
+            task_number: The task number to modify
+            context: Context name (without @ symbol), or empty string to remove context
+
+        Returns:
+            The updated task description
+        """
+        # First, get the current task to parse its components
+        tasks_output = self.list_tasks()
+        task_lines = tasks_output.strip().split("\n")
+
+        # Find the task by its actual number (not array index)
+        current_task = None
+        for line in task_lines:
+            if line.strip():
+                # Extract task number from the beginning of the line (handling ANSI codes)
+                extracted_number = self._extract_task_number(line)
+                if extracted_number == task_number:
+                    current_task = line
+                    break
+
+        if not current_task:
+            raise TodoShellError(f"Task number {task_number} not found")
+
+        # Parse the current task components
+        components = self._parse_task_components(current_task)
+
+        # Update the context (empty string removes it)
+        if context.strip():
+            # Remove any existing @ symbols to prevent duplication
+            clean_context = context.strip().lstrip("@")
+            if not clean_context:
+                raise TodoShellError(
+                    "Context name cannot be empty after removing @ symbol."
+                )
+            context_tag = f"@{clean_context}"
+            # Only add if not already present (deduplication)
+            if context_tag not in components["contexts"]:
+                components["contexts"] = [context_tag]
+            else:
+                # Context already exists, no change needed
+                return self._reconstruct_task(components)
+        else:
+            components["contexts"] = []
+
+        # Reconstruct the task
+        new_description = self._reconstruct_task(components)
+
+        # Replace the task with the new description
+        return self.replace(task_number, new_description)
+
+    def _extract_task_number(self, line: str) -> Optional[int]:
+        """
+        Extract task number from a line that may contain ANSI color codes.
+        
+        Args:
+            line: Task line that may contain ANSI color codes
+            
+        Returns:
+            Task number if found, None otherwise
+        """
+        from rich.text import Text
+        
+        # Use rich to properly handle ANSI color codes
+        text = Text.from_ansi(line)
+        clean_line = text.plain
+        
+        # Split on first space and check if first part is a number
+        parts = clean_line.split(" ", 1)
+        if parts and parts[0].isdigit():
+            return int(parts[0])
+        return None
+
+    def set_project(self, task_number: int, projects: list) -> str:
+        """
+        Set or update projects for a task by intelligently rewriting it.
+
+        Args:
+            task_number: The task number to modify
+            projects: List of project operations. Each item can be:
+                     - "project" (add project)
+                     - "-project" (remove project)
+                     - Empty string is a NOOP
+
+        Returns:
+            The updated task description
+        """
+        # First, get the current task to parse its components
+        tasks_output = self.list_tasks()
+        task_lines = tasks_output.strip().split("\n")
+
+        # Find the task by its actual number (not array index)
+        current_task = None
+        for line in task_lines:
+            if line.strip():
+                # Extract task number from the beginning of the line (handling ANSI codes)
+                extracted_number = self._extract_task_number(line)
+                if extracted_number == task_number:
+                    current_task = line
+                    break
+
+        if not current_task:
+            raise TodoShellError(f"Task number {task_number} not found")
+
+        # Parse the current task components
+        components = self._parse_task_components(current_task)
+
+        # Store original projects to check if any changes were made
+        original_projects = components["projects"].copy()
+
+        # Handle project operations
+        if not projects:
+            # Empty list is a NOOP - return original task unchanged
+            return self._reconstruct_task(components)
+        else:
+            # Process each project operation
+            for project in projects:
+                if not project.strip():
+                    # Empty string is a NOOP - skip this operation
+                    continue
+                elif project.startswith("-"):
+                    # Remove project
+                    clean_project = project[1:].strip().lstrip("+")
+                    if not clean_project:
+                        raise TodoShellError(
+                            "Project name cannot be empty after removing - and + symbols."
+                        )
+                    # Remove the project if it exists (with or without + prefix)
+                    project_to_remove = f"+{clean_project}"
+                    components["projects"] = [
+                        p for p in components["projects"] 
+                        if p != project_to_remove and p != clean_project
+                    ]
+                else:
+                    # Add project
+                    clean_project = project.strip().lstrip("+")
+                    if not clean_project:
+                        raise TodoShellError(
+                            "Project name cannot be empty after removing + symbol."
+                        )
+                    project_tag = f"+{clean_project}"
+                    # Only add if not already present (deduplication)
+                    if project_tag not in components["projects"]:
+                        components["projects"].append(project_tag)
+
+        # Check if any changes were actually made
+        if components["projects"] == original_projects:
+            # No changes made - return original task unchanged
+            return self._reconstruct_task(components)
+
+        # Reconstruct the task
+        new_description = self._reconstruct_task(components)
+
+        # Replace the task with the new description
+        return self.replace(task_number, new_description)
+
+    def _parse_task_components(self, task_line: str) -> dict:
+        """
+        Parse a todo.txt task line into its components.
+
+        Args:
+            task_line: Raw task line from todo.txt
+
+        Returns:
+            Dictionary with parsed components
+        """
+        # Remove ANSI color codes first using rich
+        from rich.text import Text
+        text = Text.from_ansi(task_line)
+        task_line = text.plain
+        
+        # Remove task number prefix if present (e.g., "1 " or "1. ")
+        # First try the format without dot (standard todo.sh format)
+        if " " in task_line and task_line.split(" ")[0].isdigit():
+            task_line = task_line.split(" ", 1)[1]
+        # Fallback to dot format if present
+        elif ". " in task_line:
+            task_line = task_line.split(". ", 1)[1]
+
+        components = {
+            "priority": None,
+            "description": "",
+            "projects": [],
+            "contexts": [],
+            "due": None,
+            "recurring": None,
+            "other_tags": [],
+        }
+
+        # Use sets to automatically deduplicate projects and contexts
+        projects_set = set()
+        contexts_set = set()
+        other_tags_set = set()
+
+        # Split by spaces to process each word
+        words = task_line.split()
+
+        for word in words:
+            # Priority: (A), (B), etc.
+            if word.startswith("(") and word.endswith(")") and len(word) == 3:
+                priority = word[1]
+                if priority.isalpha() and priority.isupper():
+                    components["priority"] = priority
+                    continue
+
+            # Projects: +project
+            if word.startswith("+"):
+                projects_set.add(word)
+                continue
+
+            # Contexts: @context
+            if word.startswith("@"):
+                contexts_set.add(word)
+                continue
+
+            # Due date: due:YYYY-MM-DD
+            if word.startswith("due:"):
+                components["due"] = word[4:]  # Remove 'due:' prefix
+                continue
+
+            # Recurring: rec:frequency[:interval]
+            if word.startswith("rec:"):
+                components["recurring"] = word
+                continue
+
+            # Other tags (like custom tags)
+            if (
+                ":" in word
+                and not word.startswith("due:")
+                and not word.startswith("rec:")
+            ):
+                other_tags_set.add(word)
+                continue
+
+            # Regular description text
+            if components["description"]:
+                components["description"] += " " + word
+            else:
+                components["description"] = word
+
+        # Convert sets back to sorted lists for consistent ordering
+        components["projects"] = sorted(list(projects_set))
+        components["contexts"] = sorted(list(contexts_set))
+        components["other_tags"] = sorted(list(other_tags_set))
+
+        return components
+
+    def _reconstruct_task(self, components: dict) -> str:
+        """
+        Reconstruct a task description from parsed components.
+
+        Args:
+            components: Dictionary with task components
+
+        Returns:
+            Reconstructed task description
+        """
+        parts = []
+
+        # Add priority if present
+        if components["priority"]:
+            parts.append(f"({components['priority']})")
+
+        # Add description
+        if components["description"]:
+            parts.append(components["description"])
+
+        # Add projects
+        parts.extend(components["projects"])
+
+        # Add contexts
+        parts.extend(components["contexts"])
+
+        # Add due date
+        if components["due"]:
+            parts.append(f"due:{components['due']}")
+
+        # Add recurring pattern
+        if components["recurring"]:
+            parts.append(components["recurring"])
+
+        # Add other tags
+        parts.extend(components["other_tags"])
+
+        return " ".join(parts)

todo_agent/interface/cli.py

@@ -138,8 +138,8 @@ class CLI:
         conversation_manager = self.inference.get_conversation_manager()
 
         # Get current usage from conversation summary
-        summary = conversation_manager.get_conversation_summary()
-        current_tokens = summary.get("estimated_tokens", 0)
+        summary = self.inference.get_conversation_summary()
+        current_tokens = summary.get("request_tokens", 0)  # Use request_tokens
         current_messages = summary.get("total_messages", 0)
 
         # Get limits from conversation manager
@@ -166,7 +166,7 @@ class CLI:
         while True:
             try:
                 # Print prompt character on separate line to prevent deletion
-                self.console.print("\n[bold cyan]▶[/bold cyan]", end="\n")
+                self.console.print("\n[bold cyan]▶[/bold cyan]", end=" ")
                 user_input = self.console.input().strip()
 
                 if user_input.lower() in ["quit", "exit", "q"]:
@@ -209,9 +209,7 @@ class CLI:
                     try:
                         output = self.todo_shell.list_tasks()
                         formatted_output = TaskFormatter.format_task_list(output)
-                        task_panel = PanelFormatter.create_task_panel(
-                            formatted_output
-                        )
+                        task_panel = PanelFormatter.create_task_panel(formatted_output)
                         self.console.print(task_panel)
                     except Exception as e:
                         self.logger.error(f"Error listing tasks: {e!s}")
@@ -246,8 +244,10 @@ class CLI:
                 # Format the response and create a panel
                 formatted_response = ResponseFormatter.format_response(response)
 
-                # Get memory usage
-                memory_usage = self._get_memory_usage()
+                # Get memory usage 
+                # DISABLED FOR NOW
+                # memory_usage = self._get_memory_usage()
+                memory_usage = None 
 
                 # Create response panel with memory usage
                 response_panel = PanelFormatter.create_response_panel(

todo_agent/interface/formatters.py

@@ -36,8 +36,6 @@ class TaskFormatter:
         formatted_text = Text()
         task_count = 0
 
-
-
         for line in lines:
             line = line.strip()
             # Skip empty lines, separators, and todo.sh's own summary line
@@ -57,8 +55,6 @@ class TaskFormatter:
 
         return formatted_text
 
-
-
     @staticmethod
     def format_completed_tasks(raw_tasks: str) -> Text:
         """
@@ -77,8 +73,6 @@ class TaskFormatter:
         formatted_text = Text()
         task_count = 0
 
-
-
         for line in lines:
             line = line.strip()
             # Skip empty lines, separators, and todo.sh's own summary line
@@ -97,8 +91,6 @@ class TaskFormatter:
 
         return formatted_text
 
-
-
     @staticmethod
     def _format_single_task(task_line: str, task_number: int) -> str:
         """
@@ -404,7 +396,9 @@ class PanelFormatter:
         )
 
     @staticmethod
-    def create_task_panel(content: str | Text, title: str = "📋 Current Tasks") -> Panel:
+    def create_task_panel(
+        content: str | Text, title: str = "📋 Current Tasks"
+    ) -> Panel:
         """Create a panel for displaying task lists."""
         return Panel(
             content, title=title, border_style="dim", box=ROUNDED, width=PANEL_WIDTH