diff --git a/HISTORY.md b/HISTORY.md index 33aa113d8..96a410590 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,6 +4,7 @@ - Added `/think-tokens` command to set thinking token budget with support for human-readable formats (8k, 10.5k, 0.5M). - Added `/reasoning-effort` command to control model reasoning level. +- The `/think-tokens` and `/reasoning-effort` commands now display current settings when called without arguments. - Improved display of thinking token budget in model information. - Added reasoning effort level display in model information. - Changed `--thinking-tokens` argument to accept string values with human-readable formats. diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index 97b87b387..c86f447f6 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -27,11 +27,10 @@ cog.out(text) - Added `/think-tokens` command to set thinking token budget with support for human-readable formats (8k, 10.5k, 0.5M). - Added `/reasoning-effort` command to control model reasoning level. +- The `/think-tokens` and `/reasoning-effort` commands now display current settings when called without arguments. - Improved display of thinking token budget in model information. - Added reasoning effort level display in model information. - Changed `--thinking-tokens` argument to accept string values with human-readable formats. -- Added short command aliases `/think` and `/reason` for `/think-tokens` and `/reasoning-effort` respectively. -- Commands `/think` and `/reason` now display current values when called without arguments. - The bare `/drop` command now preserves original read-only files provided via args.read. - Aider wrote 96% of the code in this release. diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index 2409c1506..955bd9831 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -1,12 +1,3 @@ -{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552853} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552860} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552860} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552860} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-r1", "weak_model": "claude-3-5-sonnet-20241022", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "ask", "prompt_tokens": 79, "completion_tokens": 178, "total_tokens": 257, "cost": 0.0020559999999999997, "total_cost": 0.0020559999999999997}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552865} -{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552865} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552934} -{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552934} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552934} {"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-r1", "weak_model": "claude-3-5-sonnet-20241022", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "ask", "prompt_tokens": 79, "completion_tokens": 156, "total_tokens": 235, "cost": 0.00188, "total_cost": 0.00188}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552939} {"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552939} {"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741552942} @@ -998,3 +989,12 @@ {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739807} {"event": "message_send", "properties": {"main_model": "anthropic/claude-3-7-sonnet-20250219", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "anthropic/claude-3-7-sonnet-20250219", "edit_format": "diff", "prompt_tokens": 16776, "completion_tokens": 742, "total_tokens": 17518, "cost": 0.061458000000000006, "total_cost": 0.061458000000000006}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739825} {"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739825} +{"event": "ai-comments file-add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739826} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739887} +{"event": "repo", "properties": {"num_files": 407}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739887} +{"event": "exit", "properties": {"reason": "Completed lint/test/commit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739893} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739904} +{"event": "no-repo", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739904} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739904} +{"event": "message_send", "properties": {"main_model": "anthropic/claude-3-7-sonnet-20250219", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "anthropic/claude-3-7-sonnet-20250219", "edit_format": "diff", "prompt_tokens": 17142, "completion_tokens": 551, "total_tokens": 17693, "cost": 0.059691, "total_cost": 0.059691}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739917} +{"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741739917} diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index 86d09fd72..2acdc0d76 100644 --- a/aider/website/docs/faq.md +++ b/aider/website/docs/faq.md @@ -249,10 +249,10 @@ tr:hover { background-color: #f5f5f5; } - + - +
Model NameTotal TokensPercent
anthropic/claude-3-7-sonnet-202502191,452,31297.2%
anthropic/claude-3-7-sonnet-202502191,470,00597.2%
o3-mini32,7282.2%
gpt-4o8,0920.5%
fireworks_ai/accounts/fireworks/models/deepseek-r11,1770.1%
fireworks_ai/accounts/fireworks/models/deepseek-r19200.1%
diff --git a/aider/website/docs/usage/commands.md b/aider/website/docs/usage/commands.md index f88b3cd37..8ff37c29a 100644 --- a/aider/website/docs/usage/commands.md +++ b/aider/website/docs/usage/commands.md @@ -47,7 +47,6 @@ cog.out(get_help_md()) | **/paste** | Paste image/text from the clipboard into the chat. Optionally provide a name for the image. | | **/quit** | Exit the application | | **/read-only** | Add files to the chat that are for reference only, or turn added files to read-only | -| **/reason** | Alias for reasoning-effort command to set or display the reasoning effort | | **/reasoning-effort** | Set the reasoning effort level (values: number or low/medium/high depending on model) | | **/report** | Report a problem by opening a GitHub Issue | | **/reset** | Drop all files and clear the chat history | @@ -55,7 +54,6 @@ cog.out(get_help_md()) | **/save** | Save commands to a file that can reconstruct the current chat session's files | | **/settings** | Print out the current settings | | **/test** | Run a shell command and add the output to the chat on non-zero exit code | -| **/think** | Alias for think-tokens command to set or display the thinking token budget | | **/think-tokens** | Set the thinking token budget (supports formats like 8096, 8k, 10.5k, 0.5M) | | **/tokens** | Report on the number of tokens used by the current chat context | | **/undo** | Undo the last git commit if it was done by aider |