fix: update output file name

Author: jaywang98

.mergeignore

@@ -209,4 +209,4 @@ __marimo__/
 # Exclude this tool's output
 merged_code_context.txt
 .git
-
+flatcode_context.txt

src/flatcode/config.py

@@ -14,4 +14,5 @@
     ".DS_Store",
     "*.log",
     "logs/",
+    "*_context.txt",
 ]

src/flatcode/core/ignore.py

@@ -6,63 +6,82 @@
 from flatcode.config import DEFAULT_IGNORE_PATTERNS
 
 def bootstrap_mergeignore(root_dir: Path, output_filename: str) -> Path:
-    """Checks for .mergeignore; creates one if it doesn't exist."""
+    """
+    Checks for .mergeignore.
+    1. If missing, create it with defaults + output_filename.
+    2. If exists, check if output_filename is ignored. If not, append it.
+    """
     mergeignore_file = root_dir / ".mergeignore"
-    if mergeignore_file.exists():
-        print(f"Found existing: {mergeignore_file.name}")
-        return mergeignore_file
-
-    print(f"'{mergeignore_file.name}' not found. Initializing...")
-    gitignore_file = root_dir / ".gitignore"
 
-    try:
-        patterns_to_write = []
-        if gitignore_file.exists():
-            # In a real app, dependency injection for input() is better
-            choice = input(f"> Found .gitignore. Copy rules to .mergeignore? (Y/n): ").strip().lower()
-            if choice != 'n':
-                with open(gitignore_file, "r", encoding="utf-8") as f_git:
-                    patterns_to_write.extend(f_git.read().splitlines())
-                print(f"Copied rules from .gitignore.")
+    # --- Case 1: Create new .mergeignore ---
+    if not mergeignore_file.exists():
+        print(f"'{mergeignore_file.name}' not found. Initializing...")
+        gitignore_file = root_dir / ".gitignore"
 
-        if not patterns_to_write:
-            patterns_to_write = DEFAULT_IGNORE_PATTERNS
-        
-        # Ensure the output file itself is always ignored
-        if output_filename not in patterns_to_write:
-            patterns_to_write.append(f"\n# Exclude this tool's output\n{output_filename}")
+        try:
+            patterns_to_write = []
+            if gitignore_file.exists():
+                # Side-effect: input() for interactive mode
+                choice = input(f"> Found .gitignore. Copy rules to .mergeignore? (Y/n): ").strip().lower()
+                if choice != 'n':
+                    with open(gitignore_file, "r", encoding="utf-8") as f_git:
+                        patterns_to_write.extend(f_git.read().splitlines())
+                    print(f"Copied rules from .gitignore.")
+            
+            if not patterns_to_write:
+                patterns_to_write = list(DEFAULT_IGNORE_PATTERNS) # Copy list
+            
+            # Add the output file explicitly
+            if output_filename not in patterns_to_write:
+                patterns_to_write.append(f"\n# Exclude this tool's output\n{output_filename}")
+
+            with open(mergeignore_file, "w", encoding="utf-8") as f:
+                f.write("\n".join(patterns_to_write))
+            
+            print(f"Successfully created: {mergeignore_file.name}")
+            return mergeignore_file
+
+        except Exception as e:
+            print(f"Error creating .mergeignore: {e}", file=sys.stderr)
+            sys.exit(1)
 
-        with open(mergeignore_file, "w", encoding="utf-8") as f:
-            f.write("\n".join(patterns_to_write))
+    # --- Case 2: Update existing .mergeignore ---
+    else:
+        try:
+            # Check if the current output filename is already ignored by existing rules
+            with open(mergeignore_file, "r", encoding="utf-8") as f:
+                lines = f.readlines()
+            
+            spec = pathspec.PathSpec.from_lines("gitwildmatch", lines)
+            
+            # If the output file is NOT ignored by current rules, append it.
+            if not spec.match_file(output_filename):
+                print(f"Updating .mergeignore: Adding '{output_filename}' to ignore list.")
+                with open(mergeignore_file, "a", encoding="utf-8") as f:
+                    f.write(f"\n# Auto-added output file\n{output_filename}\n")
+            
+        except Exception as e:
+            print(f"Warning: Could not update .mergeignore: {e}", file=sys.stderr)
 
-        print(f"Successfully created: {mergeignore_file.name}")
         return mergeignore_file
 
-    except Exception as e:
-        print(f"Error creating .mergeignore: {e}", file=sys.stderr)
-        sys.exit(1)
-
 def load_ignore_spec(mergeignore_file: Path, extra_patterns: Optional[List[str]] = None) -> pathspec.PathSpec:
     """
     Loads rules from .mergeignore and creates a PathSpec object.
-    Includes any extra patterns (like the output filename).
+    Includes any extra patterns (like the output filename) for runtime safety.
     """
     lines = []
 
-    # 1. Read file if exists
     if mergeignore_file.exists():
         with open(mergeignore_file, "r", encoding="utf-8") as f:
             lines = f.readlines()
 
-    # 2. Add extra patterns (e.g., output file)
     if extra_patterns:
         lines.extend(extra_patterns)
 
-    # 3. Create spec using GitWildMatch (standard git behavior)
     try:
         spec = pathspec.PathSpec.from_lines("gitwildmatch", lines)
         return spec
     except Exception as e:
         print(f"Error parsing ignore rules: {e}", file=sys.stderr)
-        # Return an empty spec on failure to prevent crash, though risky
         return pathspec.PathSpec.from_lines("gitwildmatch", [])

tests/test_refactored.py

@@ -147,4 +147,42 @@ def test_cli_dynamic_naming(complex_project, monkeypatch):
         main()
 
     assert expected_file_path.exists()
-    print(f"Successfully generated dynamic file: {expected_file_path.name}")
+    print(f"Successfully generated dynamic file: {expected_file_path.name}")
+
+def test_mergeignore_auto_append(tmp_path):
+    """
+    [New] 验证如果 .mergeignore 存在但缺少当前输出文件，会自动追加。
+    """
+    # 1. 创建现有的 .mergeignore，只包含 *.log
+    ignore_file = tmp_path / ".mergeignore"
+    ignore_file.write_text("*.log\n", encoding="utf-8")
+    
+    # 2. 模拟运行 flatcode，输出文件为 custom_context.txt
+    from flatcode.core.ignore import bootstrap_mergeignore
+    output_name = "custom_context.txt"
+    
+    bootstrap_mergeignore(tmp_path, output_name)
+    
+    # 3. 验证文件内容被修改
+    content = ignore_file.read_text(encoding="utf-8")
+    assert "custom_context.txt" in content
+    assert "# Auto-added output file" in content
+
+def test_mergeignore_no_duplication(tmp_path):
+    """
+    [New] 验证如果文件已经被忽略（例如通过通配符），则不会重复追加。
+    """
+    # 1. 规则包含 *_context.txt
+    ignore_file = tmp_path / ".mergeignore"
+    ignore_file.write_text("*_context.txt\n", encoding="utf-8")
+    
+    # 2. 运行，输出 my_project_context.txt (符合通配符)
+    from flatcode.core.ignore import bootstrap_mergeignore
+    output_name = "my_project_context.txt"
+    
+    bootstrap_mergeignore(tmp_path, output_name)
+    
+    # 3. 验证没有重复添加
+    content = ignore_file.read_text(encoding="utf-8")
+    # 应该只出现一次（即原有的规则），不会有具体的 my_project_context.txt
+    assert "my_project_context.txt" not in content