From 2f68506b8a449d856ea000cab4272d76f38452b1 Mon Sep 17 00:00:00 2001
From: Christoph Koehler <christoph@zerodeviation.net>
Date: Mon, 25 Aug 2025 16:45:47 -0600
Subject: [PATCH] Reapply "aider-chat: fix tree-sitter query"

This reverts commit b6554c9f0eafd8248986e43ae646c344631be30b.
---
 .../ai/aider-chat/fix-tree-sitter.patch       | 21 +++++++++++++++++++
 pkgs/by-name/ai/aider-chat/package.nix        |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch

diff --git a/pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch b/pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch
new file mode 100644
index 000000000000..df06e6036294
--- /dev/null
+++ b/pkgs/by-name/ai/aider-chat/fix-tree-sitter.patch
@@ -0,0 +1,21 @@
+diff --git a/aider/repomap.py b/aider/repomap.py
+index 23eee239..0a40f2e6 100644
+--- a/aider/repomap.py
++++ b/aider/repomap.py
+@@ -16,6 +16,7 @@ from grep_ast import TreeContext, filename_to_lang
+ from pygments.lexers import guess_lexer_for_filename
+ from pygments.token import Token
+ from tqdm import tqdm
++from tree_sitter import QueryCursor
+ 
+ from aider.dump import dump
+ from aider.special import filter_important_files
+@@ -286,7 +287,7 @@ class RepoMap:
+ 
+         # Run the tags queries
+         query = language.query(query_scm)
+-        captures = query.captures(tree.root_node)
++        captures = QueryCursor(query).captures(tree.root_node)
+ 
+         saw = set()
+         if USING_TSL_PACK:
diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index 4da3540b97d6..bf3cfc8d4f8e 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -146,6 +146,8 @@ let
     ];
 
     patches = [
+      ./fix-tree-sitter.patch
+
       (replaceVars ./fix-flake8-invoke.patch {
         flake8 = lib.getExe python3Packages.flake8;
       })