kopipasta 0.30.0__tar.gz → 0.31.0__tar.gz

{kopipasta-0.30.0/kopipasta.egg-info → kopipasta-0.31.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kopipasta
-Version: 0.30.0
+Version: 0.31.0
 Summary: A CLI tool to generate prompts with project structure and file contents
 Home-page: https://github.com/mkorpela/kopipasta
 Author: Mikko Korpela

kopipasta-0.31.0/kopipasta/cache.py

@@ -0,0 +1,37 @@
+import json
+import os
+from pathlib import Path
+from typing import List, Tuple
+
+# Define FileTuple for type hinting
+FileTuple = Tuple[str, bool, List[str] | None, str]
+
+def get_cache_file_path() -> Path:
+    """Gets the cross-platform path to the cache file for the last selection."""
+    cache_dir = Path.home() / ".cache" / "kopipasta"
+    cache_dir.mkdir(parents=True, exist_ok=True)
+    return cache_dir / "last_selection.json"
+
+def save_selection_to_cache(files_to_include: List[FileTuple]):
+    """Saves the list of selected file relative paths to the cache."""
+    cache_file = get_cache_file_path()
+    relative_paths = sorted([os.path.relpath(f[0]) for f in files_to_include])
+    try:
+        with open(cache_file, 'w', encoding='utf-8') as f:
+            json.dump(relative_paths, f, indent=2)
+    except IOError as e:
+        print(f"\nWarning: Could not save selection to cache: {e}")
+
+def load_selection_from_cache() -> List[str]:
+    """Loads the list of selected files from the cache file."""
+    cache_file = get_cache_file_path()
+    if not cache_file.exists():
+        return []
+    try:
+        with open(cache_file, 'r', encoding='utf-8') as f:
+            paths = json.load(f)
+            # Filter out paths that no longer exist
+            return [p for p in paths if os.path.exists(p)]
+    except (IOError, json.JSONDecodeError) as e:
+        print(f"\nWarning: Could not load previous selection from cache: {e}")
+        return []

{kopipasta-0.30.0 → kopipasta-0.31.0}/kopipasta/main.py

@@ -18,6 +18,7 @@ from kopipasta.file import FileTuple, get_human_readable_size, is_binary, is_ign
 import kopipasta.import_parser as import_parser
 from kopipasta.tree_selector import TreeSelector
 from kopipasta.prompt import generate_prompt_template, get_file_snippet, get_language_for_file
+from kopipasta.cache import save_selection_to_cache
 
 def _propose_and_add_dependencies(
     file_just_added: str,
@@ -993,10 +994,14 @@ def open_editor_for_input(template: str, cursor_position: int) -> str:
 
 def main():
     parser = argparse.ArgumentParser(description="Generate a prompt with project structure, file contents, and web content.")
-    parser.add_argument('inputs', nargs='+', help='Files, directories, or URLs to include in the prompt')
+    parser.add_argument('inputs', nargs='*', help='Files, directories, or URLs to include. Defaults to current directory.')
     parser.add_argument('-t', '--task', help='Task description for the AI prompt')
     args = parser.parse_args()
 
+    # Default to the current directory if no inputs are provided
+    if not args.inputs:
+        args.inputs.append('.')
+
     ignore_patterns = read_gitignore()
     env_vars = read_env_file()
     project_root_abs = os.path.abspath(os.getcwd())
@@ -1054,7 +1059,7 @@ def main():
     # Use tree selector for file/directory selection
     if paths_for_tree:
         print("\nStarting interactive file selection...")
-        print("Use arrow keys to navigate, Space to select, 'q' to finish. Press 'h' for help.\n")
+        print("Use arrow keys to navigate, Space to select, 'q' to finish. See all keys below.\n")
         
         tree_selector = TreeSelector(ignore_patterns, project_root_abs)
         try:
@@ -1069,6 +1074,10 @@ def main():
         print("No files or web content were selected. Exiting.")
         return
 
+    # Save the final selection for the next run
+    if files_to_include:
+        save_selection_to_cache(files_to_include)
+
     print("\nFile and web content selection complete.")
     print_char_count(current_char_count)
 

{kopipasta-0.30.0 → kopipasta-0.31.0}/kopipasta/tree_selector.py

@@ -9,6 +9,7 @@ import click
 
 from kopipasta.file import FileTuple, is_binary, is_ignored, get_human_readable_size
 from kopipasta.prompt import get_file_snippet, get_language_for_file
+from kopipasta.cache import load_selection_from_cache
 
 
 class FileNode:
@@ -253,15 +254,16 @@ class TreeSelector:
     def _show_help(self) -> Panel:
         """Create help panel"""
         help_text = """[bold]Navigation:[/bold]
-↑/k: Up  ↓/j: Down  →/l/Enter: Expand  ←/h: Collapse  PgUp/PgDn: Page  G/End: Bottom
+↑/k: Up  ↓/j: Down  →/l/Enter: Expand  ←/h: Collapse
 
 [bold]Selection:[/bold]  
 Space: Toggle file/dir     a: Add all in dir     s: Snippet mode
 
 [bold]Actions:[/bold]
-g: Grep in directory     d: Show dependencies     q: Quit selection"""
+r: Reuse last selection  g: Grep in directory   d: Show dependencies
+q: Quit and finalize"""
         
-        return Panel(help_text, title="Keys", border_style="dim", expand=False)
+        return Panel(help_text, title="Keyboard Controls", border_style="dim", expand=False)
     
     def _get_status_bar(self) -> str:
         """Create status bar with selection info"""
@@ -352,7 +354,7 @@ g: Grep in directory     d: Show dependencies     q: Quit selection"""
                     self.char_count += node.size
     
     def _toggle_directory(self, node: FileNode):
-        """Toggle all files in a directory"""
+        """Toggle all files in a directory, now fully recursive."""
         if not node.is_dir:
             return
             
@@ -365,6 +367,9 @@ g: Grep in directory     d: Show dependencies     q: Quit selection"""
         
         def collect_files(n: FileNode):
             if n.is_dir:
+                # CRITICAL FIX: Ensure sub-directory children are loaded before recursing
+                if not n.children:
+                    self._scan_directory(n.path, n)
                 for child in n.children:
                     collect_files(child)
             else:
@@ -376,16 +381,92 @@ g: Grep in directory     d: Show dependencies     q: Quit selection"""
         any_unselected = any(os.path.abspath(f.path) not in self.selected_files for f in all_files)
         
         if any_unselected:
-            # Select all unselected
+            # Select all unselected files
             for file_node in all_files:
-                if file_node.path not in self.selected_files:
-                    self._toggle_selection(file_node)
+                abs_path = os.path.abspath(file_node.path)
+                if abs_path not in self.selected_files:
+                    self.selected_files[abs_path] = (False, None)
+                    self.char_count += file_node.size
         else:
-            # Unselect all
+            # Unselect all files
             for file_node in all_files:
-                if file_node.path in self.selected_files:
-                    self._toggle_selection(file_node)
-    
+                abs_path = os.path.abspath(file_node.path)
+                if abs_path in self.selected_files:
+                    is_snippet, _ = self.selected_files[abs_path]
+                    del self.selected_files[abs_path]
+                    if is_snippet:
+                        self.char_count -= len(get_file_snippet(file_node.path))
+                    else:
+                        self.char_count -= file_node.size
+
+    def _propose_and_apply_last_selection(self):
+        """Loads paths from cache, shows a confirmation dialog, and applies the selection if confirmed."""
+        cached_paths = load_selection_from_cache()
+
+        if not cached_paths:
+            self.console.print(Panel("[yellow]No cached selection found to reuse.[/yellow]", title="Info", border_style="dim"))
+            click.pause("Press any key to continue...")
+            return
+
+        # Categorize cached paths for the preview
+        files_to_add = []
+        files_already_selected = []
+        files_not_found = []
+
+        for rel_path in cached_paths:
+            abs_path = os.path.abspath(rel_path)
+            if not os.path.isfile(abs_path):
+                files_not_found.append(rel_path)
+                continue
+
+            if abs_path in self.selected_files:
+                files_already_selected.append(rel_path)
+            else:
+                files_to_add.append(rel_path)
+        
+        # Build the rich text for the confirmation panel
+        preview_text = Text()
+        if files_to_add:
+            preview_text.append("The following files will be ADDED:\n", style="bold")
+            for path in sorted(files_to_add):
+                preview_text.append("  ")
+                preview_text.append("+", style="cyan")
+                preview_text.append(f" {path}\n")
+        
+        if files_already_selected:
+            preview_text.append("\nAlready selected (no change):\n", style="bold dim")
+            for path in sorted(files_already_selected):
+                preview_text.append(f"  ✓ {path}\n")
+
+        if files_not_found:
+            preview_text.append("\nNot found on disk (will be skipped):\n", style="bold dim")
+            for path in sorted(files_not_found):
+                preview_text.append("  ")
+                preview_text.append("-", style="red")
+                preview_text.append(f" {path}\n")
+
+        # Display the confirmation panel and prompt
+        self.console.clear()
+        self.console.print(Panel(preview_text, title="[bold cyan]Reuse Last Selection?", border_style="cyan", padding=(1, 2)))
+        
+        if not files_to_add:
+            self.console.print("\n[yellow]No new files to add from the last selection.[/yellow]")
+            click.pause("Press any key to continue...")
+            return
+
+        # Use click.confirm for a simple and effective y/n prompt
+        if not click.confirm(f"\nAdd {len(files_to_add)} file(s) to your current selection?", default=True):
+            return
+
+        # If confirmed, apply the changes
+        for rel_path in files_to_add:
+            abs_path = os.path.abspath(rel_path)
+            if os.path.isfile(abs_path) and abs_path not in self.selected_files:
+                file_size = os.path.getsize(abs_path)
+                self.selected_files[abs_path] = (False, None)
+                self.char_count += file_size
+                self._ensure_path_visible(abs_path)
+
     def _ensure_path_visible(self, file_path: str):
         """Ensure a file path is visible in the tree by expanding parent directories"""
         abs_file_path = os.path.abspath(file_path)
@@ -529,10 +610,11 @@ g: Grep in directory     d: Show dependencies     q: Quit selection"""
                         self._toggle_directory(current_node)
                         
                 # Handle actions
+                elif key == 'r':  # Reuse last selection
+                    self._propose_and_apply_last_selection()
                 elif key == 'g':  # Grep
                     self.console.print()  # Add some space
                     self._handle_grep(current_node)
-                    click.pause("Press any key to continue...")
                 elif key == 'd':  # Dependencies
                     self.console.print()  # Add some space
                     self._show_dependencies(current_node)

{kopipasta-0.30.0 → kopipasta-0.31.0/kopipasta.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kopipasta
-Version: 0.30.0
+Version: 0.31.0
 Summary: A CLI tool to generate prompts with project structure and file contents
 Home-page: https://github.com/mkorpela/kopipasta
 Author: Mikko Korpela

{kopipasta-0.30.0 → kopipasta-0.31.0}/kopipasta.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.md
 requirements.txt
 setup.py
 kopipasta/__init__.py
+kopipasta/cache.py
 kopipasta/file.py
 kopipasta/import_parser.py
 kopipasta/main.py

{kopipasta-0.30.0 → kopipasta-0.31.0}/setup.py

@@ -10,7 +10,7 @@ with open("requirements.txt", "r", encoding="utf-8") as f:
 
 setup(
     name="kopipasta",
-    version="0.30.0",
+    version="0.31.0",
     author="Mikko Korpela",
     author_email="mikko.korpela@gmail.com",
     description="A CLI tool to generate prompts with project structure and file contents",