Fix extended thinking and allow per-repo context files (AGENTS.md, CLAUDE.md, etc.) to be included as context#2387
Open
avidspartan1 wants to merge 15 commits into
Open
Conversation
Contributor
Review Summary by QodoSupport Claude model overrides and repository context files in AI prompts
WalkthroughsDescription• Add support for overriding Claude extended thinking models via config • Include repository context files (AGENTS.md, CLAUDE.md, etc.) in AI prompts • Extend git provider interface with repo file content retrieval capability • Add comprehensive tests for new features and fix minor code issues Diagramflowchart LR
A["Config Settings"] -->|claude_extended_thinking_models_override| B["LiteLLM Handler"]
C["Repo Context Files"] -->|repo_context_files config| D["build_repo_context"]
D -->|fetches files| E["Git Provider"]
D -->|renders context| F["Instruction Files"]
F -->|injected into| G["AI Prompts"]
B -->|uses models| G
File Changes1. pr_agent/algo/__init__.py
|
Contributor
Code Review by Qodo
Context used 1. claude_extended_thinking_models_override undocumented
|
![qodo-free-for-open-source-projects[bot]](https://avatars.githubusercontent.com/in/1068000?s=60&v=4){kind=small}
Contributor
|
Persistent review updated to latest commit 2b313ad |
avidspartan1
force-pushed
the
feat/improvements
branch
from
2b313ad to
50de2c6
Compare
Contributor
|
Persistent review updated to latest commit 50de2c6 |
avidspartan1
force-pushed
the
feat/improvements
branch
from
50de2c6 to
e93cad2
Compare
Contributor
|
Persistent review updated to latest commit e93cad2 |
|
Hey, could you adjust your implementation for Gitea in I made it manually for now, but I think it would be interesting to include it in this PR as well. |
Contributor
Code Review by QodoNew Review StartedThis review has been superseded by a new analysis |
Author
done! |
avidspartan1
force-pushed
the
feat/improvements
branch
from
aae35a9 to
2e11c1f
Compare
Contributor
|
Persistent review updated to latest commit 2e11c1f |
Contributor
|
Persistent review updated to latest commit 145b93f |
Contributor
|
Persistent review updated to latest commit a92f7b3 |
Contributor
|
Persistent review updated to latest commit 982821f |
avidspartan1
force-pushed
the
feat/improvements
branch
from
982821f to
817fa77
Compare
Contributor
|
Persistent review updated to latest commit 817fa77 |
avidspartan1
force-pushed
the
feat/improvements
branch
from
817fa77 to
f30a860
Compare
Contributor
|
Code review by qodo was updated up to the latest commit f30a860 |
Contributor
|
Code review by qodo was updated up to the latest commit 5dde4dc |
Author
|
/describe |
Contributor
|
PR Description updated to latest commit (5dde4dc)
|
avidspartan1
force-pushed
the
feat/improvements
branch
from
5dde4dc to
92189c3
Compare
Contributor
|
Code review by qodo was updated up to the latest commit 92189c3 |
avidspartan1
force-pushed
the
feat/improvements
branch
from
92189c3 to
ca612dc
Compare
Contributor
|
Code review by qodo was updated up to the latest commit ca612dc |
Member
|
Hey @avidspartan1, Can you please rebase onto main and resolve the leftover Qodo comments? 🙏 |
avidspartan1
force-pushed
the
feat/improvements
branch
from
ca612dc to
b7c6a5c
Compare
Contributor
Looking for bugs?Check back in a few minutes. Qodo's review agents are on it. |
Author
Thanks, @naorpeled! I've prioritized the "Action required" comments from the review, but left the "Review recommended". I think I've pushed quite a few times, so PR Agent has been generating a lot of comments. 😆 If you'd like me to resolve all of them I can give that a shot; I'm just afraid of introducing too many changes / scope creep from my original goals. Let me know! |
Comment on lines
+673
to
+683
| <<<<<<< feat/improvements | ||
| target_file = file | ||
| break | ||
| ======= | ||
| if file.filename == relevant_file: | ||
| target_file = file | ||
| break | ||
| if target_file is None: | ||
| get_logger().warning(f"Skipping suggestion: file '{relevant_file}' not found in diff") | ||
| continue | ||
| >>>>>>> main |
Contributor
There was a problem hiding this comment.
1. Merge conflict markers committed 📘 Rule violation ≡ Correctness
Unresolved Git merge conflict markers (<<<<<<<, =======, >>>>>>>) were committed into pr_agent/git_providers/gitlab_provider.py within publish_code_suggestions(), leaving the file in an invalid/ambiguous state. This makes the module syntactically invalid, breaking imports and potentially crashing runtime paths and CI linting/testing.
Agent Prompt
## Issue description
Resolve the committed merge conflict in `pr_agent/git_providers/gitlab_provider.py` where `publish_code_suggestions()` still contains `<<<<<<< / ======= / >>>>>>>` markers, making the module syntactically invalid.
## Issue Context
The PR diff includes conflict markers like `<<<<<<< feat/improvements`, `=======`, and `>>>>>>> main` within `publish_code_suggestions()`. This will cause a hard failure (syntax error) and must be fixed by choosing the intended logic and removing the markers so the file is valid Python and CI/runtime imports succeed.
## Fix Focus Areas
- pr_agent/git_providers/gitlab_provider.py[669-684]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
Comment on lines
+766
to
+767
| # contents = self.repo_obj.get_contents(".pr_agent.toml", ref=self.pr.head.sha).decoded_content | ||
| # more logical to take 'pr_agent.toml' from the default branch |
Contributor
There was a problem hiding this comment.
2. Commented-out settings fetch code 📘 Rule violation ⚙ Maintainability
Commented-out code was added in GithubProvider.get_repo_settings, which violates the requirement to avoid dead/commented-out code. Leaving this in place increases maintenance burden and can confuse future behavior expectations.
Agent Prompt
## Issue description
New commented-out code was introduced in `get_repo_settings()`.
## Issue Context
The PR adds commented lines about loading `.pr_agent.toml` from `self.pr.head.sha`, but the code path now uses the default branch instead.
## Fix Focus Areas
- pr_agent/git_providers/github_provider.py[766-767]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
Comment on lines
+791
to
799
| def get_repo_file_content(self, file_path: str): | ||
| try: | ||
| contents = self.repo_obj.get_contents(file_path).decoded_content | ||
| if isinstance(contents, bytes): | ||
| return contents.decode("utf-8", errors="replace") | ||
| return contents | ||
| except Exception: | ||
| except Exception as e: | ||
| get_logger().warning(f"Failed to load repo file: {file_path}, error: {e}") | ||
| return "" |
Contributor
There was a problem hiding this comment.
4. Github repo context wrong branch 🐞 Bug ≡ Correctness
GithubProvider.get_repo_file_content() fetches files with no ref, which reads from the repo default branch and can return the wrong instruction files when the PR targets a non-default base branch. This makes the new repo_context_files feature supply incorrect context to prompts for such PRs.
Agent Prompt
## Issue description
Repo-context files for GitHub are fetched from the default branch because `get_contents(file_path)` is called without a `ref`. For PRs targeting release branches or non-default branches, instruction files can differ and the model will receive the wrong guidance.
## Issue Context
Other providers (e.g., Gitea) explicitly prefer the PR target/base ref when available.
## Fix Focus Areas
- pr_agent/git_providers/github_provider.py[791-799]
- pr_agent/git_providers/gitea_provider.py[747-763]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
Contributor
|
Code review by qodo was updated up to the latest commit 70895f1 |
Contributor
Code Review by QodoNew Review StartedThis review has been superseded by a new analysis |
Contributor
|
Code review by qodo was updated up to the latest commit 48338a2 |
Comment on lines
+69
to
+72
| # Optional: override the built-in list of Claude models that receive the extended-thinking payload. | ||
| # When non-empty, this list fully replaces the built-in defaults (see CLAUDE_EXTENDED_THINKING_MODELS | ||
| # in pr_agent/algo/__init__.py). Leave empty to use the defaults. | ||
| claude_extended_thinking_models_override = [] |
Contributor
There was a problem hiding this comment.
1. claude_extended_thinking_models_override undocumented 📎 Requirement gap ⚙ Maintainability
A new operator-facing config key claude_extended_thinking_models_override was added, but the docs section describing Claude extended-thinking parameters does not mention it. Operators may not discover or correctly use the override behavior.
Agent Prompt
## Issue description
The new config key `claude_extended_thinking_models_override` is not documented for operators in the docs section that describes Claude extended-thinking settings.
## Issue Context
The defaults file adds the key and explains replacement/empty semantics in comments, but operators typically rely on MkDocs pages (e.g., the model/Anthropic section) to learn available configuration.
## Fix Focus Areas
- docs/docs/usage-guide/changing_a_model.md[440-447]
- pr_agent/settings/configuration.toml[69-72]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
| }, | ||
| { | ||
| "settings": b"[pr_reviewer]\nnum_max_findings =", | ||
| "settings": b"[github]\nuser_token = \"secret-token\"\n[pr_reviewer]\nnum_max_findings =", |
Contributor
There was a problem hiding this comment.
2. Hardcoded secret-token test value 📘 Rule violation ⛨ Security
A token-like secret value is committed in a unit test (user_token = "secret-token"). Even as a placeholder, it can trip secret scanners and violates the requirement to avoid committing secrets/tokens in tracked files.
Agent Prompt
## Issue description
The unit test embeds a token-like value (`secret-token`) in TOML content, which violates the "no hardcoded secrets/tokens" requirement.
## Issue Context
Even dummy tokens can be flagged by security tooling and should be replaced with clearly non-secret placeholders.
## Fix Focus Areas
- tests/unittest/test_git_provider_utils.py[123-146]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
|
|
||
|
|
||
| class _RepoContextCache: | ||
| def __init__(self, max_size: int = REPO_CONTEXT_CACHE_MAX_SIZE, ttl_seconds: int = REPO_CONTEXT_CACHE_TTL_SECONDS): |
Contributor
There was a problem hiding this comment.
4. Long lines in repo_context.py 📘 Rule violation ⚙ Maintainability
New code introduces lines likely exceeding the 120-character Ruff limit (e.g., the _RepoContextCache.__init__ signature). This can cause Ruff/pre-commit failures and adds style inconsistency.
Agent Prompt
## Issue description
At least one newly added line in `repo_context.py` exceeds typical Ruff line-length constraints (120), risking CI/pre-commit failures.
## Issue Context
This repository enforces Ruff style (120 max line length). Long signatures and f-strings should be wrapped across lines.
## Fix Focus Areas
- pr_agent/algo/repo_context.py[21-23]
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
Contributor
|
Code review by qodo was updated up to the latest commit c7d0812 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
User description
Resolves #2357.
I backed out my other PR because it was too many changes (previously included "de-dupe inline comments") in one PR.
PR Type
Enhancement, Bug fix
Description
Add support for per-repository context files (AGENTS.md, CLAUDE.md, etc.) included in AI prompts
Allow overriding Claude extended thinking models via configuration
Support GitHub organization-level global settings repository
Implement repo context caching with TTL and size limits
Add repo file fetching for Gitea, GitLab, and GitHub providers
Diagram Walkthrough
File Walkthrough
15 files
Expand Claude extended thinking model supportAdd configurable Claude extended thinking model overrideNew module for repository context file handlingAdd base method for repository file content retrievalImplement repository file content fetching for GiteaAdd GitHub org-level settings and repo file fetchingImplement repository file content fetching for GitLabSupport multiple repository settings files with mergingInclude repository context in code suggestions promptsInclude repository context in description promptsInclude repository context in review promptsAdd repository context section to code suggestions templateAdd repository context section to non-decoupled templateAdd repository context section to description templateAdd repository context section to review template1 files
Add repo context and Claude model override configuration options6 files
Add tests for merged global and local settingsAdd tests for Gitea repository file content fetchingNew tests for GitHub org-level settings supportAdd tests for GitLab repository file content fetchingNew tests for Claude extended thinking model overrideComprehensive tests for repository context functionality2 files
Document GitHub organization-level settings supportDocument global settings and GitHub Enterprise support