codigest 0.3.3__tar.gz → 0.3.5__tar.gz

{codigest-0.3.3 → codigest-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codigest
-Version: 0.3.3
+Version: 0.3.5
 Summary: Human-Centered Codebase Context Manager for LLMs
 Project-URL: Homepage, https://github.com/SJB777/codigest
 Project-URL: Repository, https://github.com/SJB777/codigest

{codigest-0.3.3 → codigest-0.3.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codigest"
-version = "0.3.3"
+version = "0.3.5"
 description = "Human-Centered Codebase Context Manager for LLMs"
 authors = [{name = "Codigest Team", email = "sngd024@google.com"}]
 readme = "README.md"
@@ -36,4 +36,4 @@ cdg = "codigest.main:app"
 
 [build-system]
 requires = ["hatchling"]
-build-backend = "hatchling.build"
+build-backend = "hatchling.build"

{codigest-0.3.3 → codigest-0.3.5}/src/codigest/commands/diff.py

@@ -4,15 +4,13 @@ from pathlib import Path
 from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
-from ..core import scanner, prompts, shadow
-from .scan import _load_config_filters 
+from ..core import prompts, shadow, tags, common
 
 app = typer.Typer()
 console = Console()
 
 @app.callback(invoke_without_command=True)
 def handle(
-    # target 인자 추가
     target: Path = typer.Argument(
         Path.cwd(), 
         help="Target directory to check diff",
@@ -24,24 +22,29 @@ def handle(
     copy: bool = typer.Option(True, help="Auto-copy to clipboard"),
     save: bool = typer.Option(True, help="Save to .codigest/changes.diff"),
     message: str = typer.Option("", "--message", "-m", help="Add specific instruction context"),
+    # [추가] resolve 옵션
+    resolve: bool = typer.Option(False, "-r", "--resolve", help="Recursively resolve imports"),
 ):
     """
     [Context Update] Shows changes since the last 'codigest scan'.
     Useful for updating LLM context without re-uploading everything.
     """
-    root_path = target
-    anchor = shadow.ContextAnchor(root_path)
+    # [1] Context Setup
+    ctx = common.get_context(target)
+    root_path = ctx.root_path
     
-    # 1. Check Baseline Existence
+    anchor = shadow.ContextAnchor(root_path)
+
+    # Check Baseline
     last_update = anchor.get_last_update_time()
     if last_update == "Never":
-        console.print("[yellow]No scan history found.[/yellow]")
-        console.print("   Run [bold cyan]codigest scan[/bold cyan] first to establish a baseline.")
+        console.print("[yellow]⚠️  No scan history found.[/yellow]")
+        console.print("   Run [bold cyan]cdg scan[/bold cyan] first to establish a baseline.")
         raise typer.Exit(1)
 
     console.print(f"[dim]Checking changes since last scan ({last_update})...[/dim]")
 
-    # 2. Calculate Diff
+    # [2] Calculate Diff via Context
     with Progress(
         SpinnerColumn(),
         TextColumn("[bold blue]Analyzing changes...[/bold blue]"),
@@ -49,23 +52,20 @@ def handle(
         console=console
     ) as progress:
         task = progress.add_task("diff", total=None)
-        
-        # Load same filters as scan
-        extensions, extra_ignores = _load_config_filters(root_path)
-        
-        # Get current valid files (Working Tree)
-        current_files = scanner.scan_project(root_path, extensions, extra_ignores)
-        
+
+        # ★ Use common context to get files (handles config & resolve)
+        current_files = ctx.get_target_files(resolve_deps=resolve)
+
         # Compare Working Tree vs Anchor
         diff_content = anchor.get_changes(current_files)
-        
+
         progress.update(task, completed=100)
 
     if not diff_content.strip():
-        console.print("[green]✨ No changes detected since last scan.[/green]")
+        console.print("[green]No changes detected since last scan.[/green]")
         return
 
-    # 3. Render
+    # [3] Render
     prompt_engine = prompts.get_engine(root_path)
     try:
         formatted_diff = prompt_engine.render(
@@ -76,18 +76,19 @@ def handle(
             instruction=message
         )
     except Exception:
-        # Fallback if template fails
-        formatted_diff = f"<diff>\n{diff_content}\n</diff>"
+        # Fallback if template fails (using safe escaping via tags)
+        safe_content = tags.escape_xml_value(diff_content)
+        formatted_diff = f"<diff>\n{safe_content}\n</diff>"
 
-    # 4. Output
-    console.print(f"[bold green]✔ Changes Detected![/bold green] ({len(formatted_diff)} chars)")
+    # [4] Output
+    console.print(f"[bold green]Changes Detected![/bold green] ({len(formatted_diff)} chars)")
     
     if copy:
         pyperclip.copy(formatted_diff)
-        console.print("[dim]Copied to clipboard[/dim]")
+        console.print("[dim]Clipboard copied[/dim]")
 
     if save:
         out_path = root_path / ".codigest" / "changes.diff"
         out_path.parent.mkdir(exist_ok=True)
         out_path.write_text(formatted_diff, encoding="utf-8")
-        console.print(f"[dim]Saved to {out_path}[/dim]")
+        console.print(f"[dim]Saved to {out_path}[/dim]")

{codigest-0.3.3 → codigest-0.3.5}/src/codigest/commands/digest.py

@@ -4,10 +4,7 @@ from pathlib import Path
 from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
-from ..core import scanner, structure, prompts, semdiff, tags, tokenizer
-
-# Reuse config loader
-from .scan import _load_config_filters 
+from ..core import structure, prompts, semdiff, tags, tokenizer, common
 
 app = typer.Typer()
 console = Console()
@@ -18,14 +15,17 @@ def handle(
     copy: bool = typer.Option(True, help="Auto-copy to clipboard"),
     save: bool = typer.Option(True, help="Save to .codigest/digest.xml"),
     message: str = typer.Option("", "--message", "-m", help="Add specific instruction"),
+    # [추가]
+    resolve: bool = typer.Option(False, "-r", "--resolve", help="Recursively resolve imports"),
 ):
     """
     [Architectural View] Summarizes the codebase structure (Classes/Functions only).
     """
-    root_path = target.resolve()
+    # [1] Context Setup
+    ctx = common.get_context(target)
+    root_path = ctx.root_path
     
     prompt_engine = prompts.get_engine(root_path)
-    extensions, extra_ignores = _load_config_filters(root_path)
 
     with Progress(
         SpinnerColumn(),
@@ -36,19 +36,24 @@ def handle(
         
         task = progress.add_task("digest", total=None)
         
-        files = scanner.scan_project(root_path, extensions, extra_ignores)
+        # [2] File Discovery via Context
+        files = ctx.get_target_files(ignore_config=False, resolve_deps=resolve)
+        
         tree_str = structure.generate_ascii_tree(files, root_path)
 
         summary_blocks = []
         for file_path in files:
-            # Only summarize Python files via AST
             if file_path.suffix in (".py", ".pyi"):
                 try:
                     content = file_path.read_text(encoding="utf-8")
                     summary = semdiff.summarize(content)
                     
                     if summary:
-                        rel_path = file_path.relative_to(root_path).as_posix()
+                        try:
+                            rel_path = file_path.relative_to(root_path).as_posix()
+                        except ValueError:
+                            rel_path = f"[EXTERNAL]/{file_path.name}"
+
                         block = tags.file(rel_path, summary)
                         summary_blocks.append(block)
                 except Exception:
@@ -65,20 +70,20 @@ def handle(
                 instruction=message
             )
         except Exception as e:
-            console.print(f"[red]Rendering Failed:[/red] {e}")
+            console.print(f"[red]❌ Rendering Failed:[/red] {e}")
             raise typer.Exit(1)
             
         progress.update(task, completed=100)
 
     token_count = tokenizer.estimate_tokens(digest_content)
-    console.print(f"[bold green]✔ Digest Generated![/bold green] ([bold cyan]~{token_count:,} Tokens[/bold cyan])")
+    console.print(f"[bold green]Digest Generated![/bold green] ([bold cyan]~{token_count:,} Tokens[/bold cyan])")
     
     if copy:
         pyperclip.copy(digest_content)
-        console.print("[dim]Copied to clipboard[/dim]")
+        console.print("[dim]📋 Copied to clipboard[/dim]")
     
     if save:
         out_path = root_path / ".codigest" / "digest.xml"
         out_path.parent.mkdir(exist_ok=True)
         out_path.write_text(digest_content, encoding="utf-8")
-        console.print(f"[dim]Saved to {out_path}[/dim]")
+        console.print(f"[dim]💾 Saved to {out_path}[/dim]")

{codigest-0.3.3 → codigest-0.3.5}/src/codigest/commands/scan.py

@@ -1,43 +1,15 @@
 import typer
-import tomllib
 from pathlib import Path
 from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.panel import Panel
 from rich.filesize import decimal
 
-# [변경] resolver 추가
-from ..core import scanner, structure, tags, prompts, processor, shadow, tokenizer, resolver
+from ..core import structure, tags, prompts, processor, shadow, tokenizer, common
 
 app = typer.Typer()
 console = Console()
 
-def _load_config_filters(root_path: Path):
-    config_path = root_path / ".codigest" / "config.toml"
-    extensions = None
-    exclude_patterns = []
-    
-    if config_path.exists():
-        try:
-            with open(config_path, "rb") as f:
-                data = tomllib.load(f)
-                filters = data.get("filter", {})
-                ext_list = filters.get("extensions", [])
-                if ext_list:
-                    extensions = set(ext_list)
-                exclude_patterns = filters.get("exclude_patterns", [])
-        except Exception:
-            pass 
-            
-    return extensions, exclude_patterns
-
-def _find_project_root(start_path: Path) -> Path:
-    current = start_path.resolve()
-    for parent in [current] + list(current.parents):
-        if (parent / ".codigest").exists() or (parent / ".git").exists():
-            return parent
-    return start_path
-
 @app.callback(invoke_without_command=True)
 def handle(
     targets: list[Path] = typer.Argument(
@@ -51,32 +23,23 @@ def handle(
     message: str = typer.Option("", "--message", "-m", help="Add specific instruction"),
     line_numbers: bool = typer.Option(False, "--lines", "-l", help="Add line numbers to code blocks"),
     yes: bool = typer.Option(False, "-y", "--yes", help="Skip confirmation prompt"),
-    # [추가] 의존성 해결 옵션
     resolve: bool = typer.Option(False, "-r", "--resolve", help="Recursively resolve imports for local files"),
 ):
     """
     Scans the codebase. 
     If TARGETS provided, only scans those paths within the project.
     """
-    root_path = _find_project_root(Path.cwd())
-    scan_scope = targets if targets else None
-
-    # Scope validation
-    if scan_scope:
-        for p in scan_scope:
-            if not p.is_relative_to(root_path):
-                # [수정] 이모티콘 제거
-                console.print(f"[yellow][Warning] {p.name} is outside project root {root_path.name}[/yellow]")
+    # [1] Context Setup (Centralized)
+    ctx = common.get_context(targets)
+    root_path = ctx.root_path
 
     # Init check
     artifact_dir = root_path / ".codigest"
     if not artifact_dir.exists():
-        # [수정] 이모티콘 제거
         console.print(f"[yellow][Warning] .codigest directory missing in {root_path.name}. Running init...[/yellow]")
         try:
             artifact_dir.mkdir(exist_ok=True)
         except PermissionError:
-            # [수정] 이모티콘 제거
             console.print(f"[red][Error] Cannot create .codigest at {root_path}[/red]")
             raise typer.Exit(1)
 
@@ -84,83 +47,57 @@ def handle(
     prompt_engine = prompts.get_engine(root_path)
     anchor = shadow.ContextAnchor(root_path)
 
-    extensions, extra_ignores = (None, [])
-    if not all:
-        extensions, extra_ignores = _load_config_filters(root_path)
-
-    # ----------------------------------------------------------------
-    # 1. Pre-flight Scan (Fast)
-    # ----------------------------------------------------------------
+    # [2] File Discovery via Context
     with Progress(
         SpinnerColumn(),
-        # [수정] 이모티콘 제거
-        TextColumn("[bold blue]Scanning file structure...[/bold blue]"),
+        TextColumn("[bold blue]Scanning...[/bold blue]"),
         transient=True,
         console=console
     ) as progress:
         task = progress.add_task("scanning", total=None)
-        files = scanner.scan_project(
-            root_path, 
-            extensions, 
-            extra_ignores, 
-            include_paths=scan_scope
+        
+        # ★ All logic delegated to common.py
+        files = ctx.get_target_files(
+            targets=targets, 
+            ignore_config=all, 
+            resolve_deps=resolve
         )
         
-        # [추가] 의존성 해결 로직 (Resolver)
-        if resolve:
-            progress.update(task, description="[bold blue]Resolving dependencies...[/bold blue]")
-            initial_count = len(files)
-            files = resolver.resolve_dependencies(root_path, files)
-            resolved_count = len(files)
-            if resolved_count > initial_count:
-                console.print(f"[dim]Resolved {resolved_count - initial_count} dependency files.[/dim]")
-
         progress.update(task, completed=100)
 
-    # Calculate Stats
+    # [3] Pre-flight Check
     total_files = len(files)
     total_size = sum(f.stat().st_size for f in files)
     est_tokens = int(total_size / 4) 
 
-    # Display Plan
-    # [수정] 이모티콘 제거 및 레이아웃 정리
     console.print(Panel(f"""[bold]Scan Plan[/bold]
   Target: [cyan]{root_path}[/cyan]
   Scope: {total_files} files
   Est. Size: {decimal(total_size)}
   Est. Tokens: ~{est_tokens:,}""", expand=False))
 
-    # --- Smart Confirmation Logic ---
     TOKEN_THRESHOLD = 30000   
     FILE_COUNT_THRESHOLD = 100
-
     is_large_context = est_tokens > TOKEN_THRESHOLD or total_files > FILE_COUNT_THRESHOLD
 
     if yes:
-        pass  # Explicit override
+        pass 
     elif is_large_context:
-        # [수정] 이모티콘 제거
         console.print(f"[yellow][Warning] Large context detected (> {TOKEN_THRESHOLD:,} tokens or > {FILE_COUNT_THRESHOLD} files).[/yellow]")
-        # [수정] 이모티콘 제거
         if not typer.confirm("Proceed with digestion?"):
             console.print("[red]Aborted.[/red]")
             raise typer.Exit()
     else:
-        # [수정] 이모티콘 제거
         console.print("[dim]Small context detected. Automatically proceeding...[/dim]")
 
-    # ----------------------------------------------------------------
-    # 2. Execution (Heavy)
-    # ----------------------------------------------------------------
+    # [4] Execution
     with Progress(
         SpinnerColumn(),
-        # [수정] 이모티콘 제거
         TextColumn("[bold blue]Generating Snapshot...[/bold blue]"),
         transient=True,
         console=console
     ) as progress:
         
-        # Diff Report
         if anchor.has_history():
             try:
                 diff_content = anchor.get_changes(files)
@@ -170,16 +107,17 @@ def handle(
             except Exception:
                 pass
 
-        # Tree Generation
         tree_str = structure.generate_ascii_tree(files, root_path)
 
-        # Content Reading & Tagging
         file_blocks = []
         for file_path in files:
-            rel_path = file_path.relative_to(root_path).as_posix()
+            try:
+                rel_path = file_path.relative_to(root_path).as_posix()
+            except ValueError:
+                rel_path = f"[EXTERNAL]/{file_path.name}"
+
             try:
                 content = processor.read_file_content(file_path, add_line_numbers=line_numbers)
-                
                 block = tags.file(rel_path, content)
                 file_blocks.append(block)
             except Exception:
@@ -187,7 +125,6 @@ def handle(
 
         source_code_blob = "\n\n".join(file_blocks)
 
-        # Template Rendering
         try:
             snapshot_content = prompt_engine.render(
                 "snapshot",
@@ -197,23 +134,18 @@ def handle(
                 instruction=message
             )
         except Exception as e:
-            # [수정] 이모티콘 제거
             console.print(f"[red][Error] Template Rendering Failed:[/red] {e}")
             raise typer.Exit(1)
 
-    # Final Actions
     try:
         anchor.update(files)
     except Exception as e:
-        # [수정] 이모티콘 제거
         console.print(f"[yellow][Warning] Failed to update context anchor: {e}[/yellow]")
 
     try:
         output_path.write_text(snapshot_content, encoding="utf-8")
-
         final_token_count = tokenizer.estimate_tokens(snapshot_content)
 
-        # [수정] 이모티콘 제거 및 메시지 단순화
         console.print("[bold green]Snapshot Saved![/bold green]")
         console.print(f"  Path: [underline]{output_path}[/underline]")
         console.print(f"  Final Tokens: [bold cyan]~{final_token_count:,}[/bold cyan]")
@@ -221,10 +153,8 @@ def handle(
         if anchor.has_history():
             pre_diff_path = artifact_dir / "previous_changes.diff"
             if pre_diff_path.exists() and pre_diff_path.stat().st_size > 0:
-                # [수정] 이모티콘 제거
                 console.print(f"  [dim]Changes before this scan saved to: {pre_diff_path.name}[/dim]")
 
     except Exception as e:
-        # [수정] 이모티콘 제거
         console.print(f"[bold red][Error] Save Failed:[/bold red] {e}")
         raise typer.Exit(1)

{codigest-0.3.3 → codigest-0.3.5}/src/codigest/commands/semdiff.py

@@ -4,10 +4,7 @@ from pathlib import Path
 from rich.console import Console
 from rich.progress import Progress, SpinnerColumn, TextColumn
 
-from ..core import scanner, prompts, shadow, semdiff, tags, tokenizer
-
-# Reuse config loader
-from .scan import _load_config_filters 
+from ..core import prompts, shadow, semdiff, tags, tokenizer, common
 
 app = typer.Typer()
 console = Console()
@@ -18,17 +15,22 @@ def handle(
     copy: bool = typer.Option(True, help="Auto-copy to clipboard"),
     save: bool = typer.Option(True, help="Save to .codigest/semdiff.xml"),
     message: str = typer.Option("", "--message", "-m", help="Add specific instruction"),
+    # [추가] resolve 옵션
+    resolve: bool = typer.Option(False, "-r", "--resolve", help="Recursively resolve imports"),
 ):
     """
     [Advanced] Generates a Semantic Diff (AST-based) report.
     Shows ADDED/REMOVED/MODIFIED functions & classes instead of raw text lines.
     """
-    root_path = target.resolve()
+    # [1] Context Setup
+    ctx = common.get_context(target)
+    root_path = ctx.root_path
+    
     anchor = shadow.ContextAnchor(root_path)
 
     last_update = anchor.get_last_update_time()
     if last_update == "Never":
-        console.print("[yellow]No scan history found. Run [bold]codigest scan[/bold] first.[/yellow]")
+        console.print("[yellow]⚠️  No scan history found. Run [bold]cdg scan[/bold] first.[/yellow]")
         raise typer.Exit(1)
 
     console.print(f"[dim]Analyzing structural changes since ({last_update})...[/dim]")
@@ -43,10 +45,10 @@ def handle(
     ) as progress:
         task = progress.add_task("semdiff", total=None)
 
-        # 1. Scan files
-        extensions, extra_ignores = _load_config_filters(root_path)
-        current_files = scanner.scan_project(root_path, extensions, extra_ignores)
+        # [2] Get Files via Context
+        current_files = ctx.get_target_files(resolve_deps=resolve)
 
+        # Only check files that have text changes first (Optimization)
         changed_files_paths = anchor.get_changed_files(list(current_files))
 
         target_files = []
@@ -54,58 +56,62 @@ def handle(
             if p.suffix in (".py", ".pyi"):
                 target_files.append(p)
 
-        # 2. Compare Each File
+        # [3] Compare Each File
         for file_path in target_files:
-            rel_path = file_path.relative_to(root_path)
+            # Handle Path String (Support External Files)
+            try:
+                rel_path = file_path.relative_to(root_path)
+                rel_path_str = rel_path.as_posix()
+            except ValueError:
+                # External files tracked via resolve logic
+                rel_path = None # Anchor might not support reading external files yet
+                rel_path_str = f"[EXTERNAL]/{file_path.name}"
             
-            # Read Content (Handle Missing Files for Deletion)
+            # Read New Content
             try:
                 new_code = file_path.read_text(encoding="utf-8") if file_path.exists() else ""
             except:
                 new_code = ""
-                
-            old_code = anchor.read_anchor_file(rel_path)
             
-            # Case: File Added (No old code) -> All symbols ADDED
-            # Case: File Deleted (No new code) -> All symbols REMOVED
-            # Case: Modified -> Semantic Compare
+            # Read Old Content (From Anchor)
+            # Note: Anchor only stores files inside root. External files will likely return empty old_code.
+            if rel_path:
+                old_code = anchor.read_anchor_file(rel_path)
+            else:
+                old_code = "" 
 
             changes = semdiff.compare(old_code, new_code)
 
             if changes:
                 change_lines = []
                 for ch in changes:
-                    if ch.change_type == "ADDED":
-                        icon = "➕ [ADDED]   "
-                    elif ch.change_type == "REMOVED":
-                        icon = "➖ [REMOVED] "
-                    elif ch.change_type == "MODIFIED":
-                        icon = "⚠️ [SIGNATURE]" # 중요: 시그니처 변경
-                    else:
-                        icon = "✏️ [LOGIC]   "
-                        
+                    if ch.change_type == "ADDED": icon = "➕ [ADDED]   "
+                    elif ch.change_type == "REMOVED": icon = "➖ [REMOVED] "
+                    elif ch.change_type == "MODIFIED": icon = "⚠️ [SIGNATURE]"
+                    else: icon = "✏️ [LOGIC]   "
+                    
                     detail = f" :: {ch.details}" if ch.details else ""
                     line = f"{icon} {ch.symbol.type} {ch.symbol.name}{ch.symbol.signature}{detail}"
                     change_lines.append(line)
 
-                # File Deleted Tagging
+                # File Status Tag
                 file_status = ""
-                if not new_code:
-                    file_status = " (DELETED)"
-                elif not old_code:
-                    file_status = " (NEW)"
+                if not new_code: file_status = " (DELETED)"
+                elif not old_code: file_status = " (NEW)"
 
                 raw_body = chr(10).join(change_lines)
-                block = tags.file(rel_path.as_posix(), raw_body, status=file_status)
+                
+                # Use unified tags factory
+                block = tags.file(rel_path_str, raw_body, status=file_status)
                 reports.append(block)
 
         progress.update(task, completed=100)
 
     if not reports:
-        console.print("[green]✨ No structural (AST) changes detected.[/green]")
+        console.print("[green]No structural (AST) changes detected.[/green]")
         return
 
-    # Render
+    # [4] Render
     report_content = "\n".join(reports)
     prompt_engine = prompts.get_engine(root_path)
 
@@ -122,14 +128,14 @@ def handle(
         raise typer.Exit(1)
 
     token_count = tokenizer.estimate_tokens(final_output)
-    console.print(f"[bold green]✔ SemDiff Generated![/bold green] ([bold cyan]~{token_count:,} Tokens[/bold cyan])")
+    console.print(f"[bold green]SemDiff Generated![/bold green] ([bold cyan]~{token_count:,} Tokens[/bold cyan])")
     
     if copy:
         pyperclip.copy(final_output)
-        console.print("[dim]Copied to clipboard[/dim]")
+        console.print("[dim]Clipboard copied[/dim]")
     
     if save:
         out_path = root_path / ".codigest" / "semdiff.xml"
         out_path.parent.mkdir(exist_ok=True)
         out_path.write_text(final_output, encoding="utf-8")
-        console.print(f"[dim]Saved to {out_path}[/dim]")
+        console.print(f"[dim]Saved to {out_path}[/dim]")