feat(main): replace glob with git ls-files for file completions

Author: lzwjava

iclaw/main.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
-import glob
 import json
 import os
 import re
+import subprocess
 import sys
 import time
 from pathlib import Path
@@ -18,6 +18,23 @@
 from iclaw.commands.search_provider import handle_search_provider_command
 from iclaw.commands.utils import handle_copy_command
 
+
+def _get_git_files():
+    """Return files from git ls-files, natively respecting .gitignore."""
+    try:
+        result = subprocess.run(
+            ["git", "ls-files", "--cached", "--others", "--exclude-standard"],
+            capture_output=True,
+            text=True,
+            timeout=5,
+        )
+        if result.returncode == 0:
+            return result.stdout.splitlines()
+    except (FileNotFoundError, subprocess.TimeoutExpired):
+        pass
+    return []
+
+
 COMMANDS = [
     "/model_provider",
     "/model",
@@ -39,15 +56,13 @@ def get_completions(self, document, complete_event):
         if at_pos != -1:
             prefix = text[at_pos + 1 :]
             if " " not in prefix:
-                pattern = f"{prefix}*"
-                matches = glob.glob(pattern) + glob.glob(
-                    os.path.join("**", pattern), recursive=True
-                )
-                seen = set()
-                for path in sorted(matches)[:20]:
-                    if path in seen:
-                        continue
-                    seen.add(path)
+                all_files = _get_git_files()
+                matches = [f for f in all_files if prefix.lower() in f.lower()]
+                count = 0
+                for path in sorted(matches):
+                    if count >= 20:
+                        break
+                    count += 1
                     meta = "dir" if os.path.isdir(path) else "file"
                     yield Completion(
                         path,

tests/test_at_mention.py

@@ -62,20 +62,27 @@ def test_unreadable_file_skipped(self):
         self.assertEqual(result, text)
 
 
+TEST_FILES = ["alpha.py", "alpha_test.py", "beta.txt", "subdir/gamma.py"]
+
+
 class TestIclawCompleter(unittest.TestCase):
     def setUp(self):
         self.completer = IclawCompleter()
         self.tmpdir = tempfile.mkdtemp()
         self.orig_cwd = os.getcwd()
         os.chdir(self.tmpdir)
-        # Create test files in the temp dir
+        # Create actual files so os.path.isdir/isfile work in meta checks
         Path("alpha.py").write_text("")
         Path("alpha_test.py").write_text("")
         Path("beta.txt").write_text("")
         os.makedirs("subdir", exist_ok=True)
         Path("subdir/gamma.py").write_text("")
+        # Patch _get_git_files so tests don't require a real git repo
+        self.patcher = patch("iclaw.main._get_git_files", return_value=TEST_FILES)
+        self.patcher.start()
 
     def tearDown(self):
+        self.patcher.stop()
         os.chdir(self.orig_cwd)
 
     def _completions(self, text):
@@ -121,12 +128,22 @@ def test_at_with_space_after_at_returns_nothing(self):
         self.assertEqual(completions, [])
 
     def test_at_limits_to_20_results(self):
-        # Create 25 files
-        for i in range(25):
-            Path(f"zfile{i:02d}.py").write_text("")
-        completions = self._completions("@zfile")
+        many_files = [f"zfile{i:02d}.py" for i in range(25)]
+        with patch("iclaw.main._get_git_files", return_value=many_files):
+            completions = self._completions("@zfile")
         self.assertLessEqual(len(completions), 20)
 
+    def test_at_excludes_gitignored_files(self):
+        # git ls-files naturally excludes ignored files; simulate this by
+        # returning only non-ignored files from _get_git_files.
+        clean_files = ["visible.py", "README.md"]
+        with patch("iclaw.main._get_git_files", return_value=clean_files):
+            completions = self._completions("@")
+        paths = [c.text for c in completions]
+        self.assertNotIn("visible.pyc", paths)
+        self.assertNotIn("__pycache__", paths)
+        self.assertIn("visible.py", paths)
+
     # --- / command completion ---
 
     def test_slash_alone_returns_all_commands(self):