fix: handle <think> tags from Ollama reasoning models that stream into terminal#5397
Open
Sarthak816 wants to merge 6 commits into
Open
fix: handle <think> tags from Ollama reasoning models that stream into terminal#5397Sarthak816 wants to merge 6 commits into
Sarthak816 wants to merge 6 commits into
Conversation
Fixes Aider-AI#5307 - on OpenBSD and other platforms without pre-built wheels, tree-sitter-c-sharp builds from source. Versions 0.23.1-0.23.4 do not bundle the tree_sitter/parser.h header, causing the C compiler to fail with 'fatal error: tree_sitter/parser.h not found'. Updated tree-sitter-c-sharp to 0.23.5 which includes the necessary headers for source builds. Changes: - requirements.txt: 0.23.1 -> 0.23.5 - requirements/common-constraints.txt: 0.23.1 -> 0.23.5 - requirements/tree-sitter.in: added tree-sitter-c-sharp>=0.23.5 constraint with explanatory comment
Fixes Aider-AI#5358 - adds type annotations to all public functions across 4 core modules: - aider/main.py: ~20 functions typed (entry points, argument parsing, git setup) - aider/commands.py: ~45 methods typed (all user-facing / commands + helpers) - aider/io.py: ~25 methods typed (InputOutput class + helpers) - aider/models.py: ~40 methods typed (ModelInfoManager, Model class, module-level functions) Key implementation decisions: - Added from __future__ import annotations to all files for forward reference support - Used Optional, Union, Any, Callable, TextIO from typing as appropriate - NoRuntime for functions that always raise exceptions (Sys.exit, SwitchCoder) - Used None return type for functions that sometimes return and sometimes raise
Fixes Aider-AI#5376 - Aider was silently bypassing pre-commit hooks by applying --no-verify to all git commits. This is a security risk for projects relying on pre-commit hooks for SAST scanning, secret detection, and code formatting. Changed the default of --git-commit-verify from False to True in aider/args.py, so pre-commit hooks are now honored by default. Users who need to bypass hooks can explicitly opt in with --no-git-commit-verify.
Fixes Aider-AI#5375 - Remote Code Execution via unescaped cmd parameter with shell=True Changes: 1. aider/run_cmd.py: - Added _has_shell_operators() helper that detects shell metacharacters outside of quoted strings - Modified run_cmd_subprocess to prefer list-based subprocess execution (shell=False) for commands without shell operators - Falls back to shell=True only for commands containing pipes, redirects, chaining, or other shell features 2. aider/commands.py: - Modified cmd_git() to use shlex.split() + list-based subprocess.run with shell=False - Git commands don't need shell features, so shell=True was unnecessary
…o terminal Fixes Aider-AI#5396 - Ollama reasoning models (e.g. Qwen3.6) embed <think> reasoning blocks in the regular content field rather than the reasoning_content field, causing raw XML in terminal output and corrupted formatting. Changes: 1. aider/coders/base_coder.py: - Added _normalize_think_tags() helper that converts raw <think> tags to the internal REASONING_TAG format when reasoning_tag_name != 'think' - Applied in show_send_output_stream (streaming path) before accumulation and display - Applied in show_send_output (non-streaming path) before display - Applied in remove_reasoning_content as a safety net before stripping 2. aider/models.py: - Added generic settings for Ollama reasoning models (qwq, r1, reasoning, think, deepseek, qwen3) to set reasoning_tag='think' with appropriate defaults
Fixes Aider-AI#5393 - Uncaught ImportError when scipy's native _spropack binary fails to load on macOS (section __DATA/__thread_bss linker issue). networkx 3.x's pagerank() calls _pagerank_scipy() directly with no try/except fallback. When scipy's deep import chain fails (e.g. _svdp.py -> _propack._spropack.so), the ImportError propagates uncaught. Added except (ImportError, OSError) around nx.pagerank() that falls back to networkx's pure-Python _pagerank_python implementation. User gets warning messages in both the fallback and failure paths.
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
1 participant
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.
Fixes #5396 - Ollama reasoning models stream blocks into terminal and corrupt UI formatting
Ollama reasoning models (e.g., Qwen3.6) embed
<think>reasoning blocks directly in the regular content field rather than thereasoning_contentfield. Aider was not handling these tags, causing raw XML in terminal output and corrupted formatting.Changes:
1.
aider/coders/base_coder.py— Core fix that works for ALL models:_normalize_think_tags()helper that converts raw<think>tags to the internalREASONING_TAGformat whenreasoning_tag_name != 'think'show_send_output_stream(streaming path) before accumulation and displayshow_send_output(non-streaming path) before displayremove_reasoning_content(post-processing) as a safety net2.
aider/models.py— Bonus defaults for known Ollama reasoning models:reasoning_tag='think'with appropriate defaults