diff --git a/aider/args_formatter.py b/aider/args_formatter.py index 5b458fec2..30a21a7b6 100644 --- a/aider/args_formatter.py +++ b/aider/args_formatter.py @@ -152,7 +152,10 @@ class YamlHelpFormatter(argparse.HelpFormatter): parts.append(f"# - yyy") parts.append(f"# - zzz") else: - parts.append(f"#{switch}: xxx\n") + if switch.endswith("color"): + parts.append(f'#{switch}: "xxx"\n') + else: + parts.append(f"#{switch}: xxx\n") ### # parts.append(str(action)) diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index 6abd14132..57dc31148 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -1,85 +1,3 @@ -{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290692} -{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290692} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290706} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290706} -{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290706} -{"event": "command_model", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290708} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290709} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 10014, "completion_tokens": 36, "total_tokens": 10050, "cost": 0.009045, "total_cost": 0.009045}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290713} -{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290729} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290729} -{"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": "ask", "prompt_tokens": 32206, "completion_tokens": 525, "total_tokens": 32731, "cost": 0.104493, "total_cost": 0.7327170000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290745} -{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290771} -{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290771} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290777} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290777} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290777} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290781} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 10014, "completion_tokens": 34, "total_tokens": 10048, "cost": 0.0090432, "total_cost": 0.0090432}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290785} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290792} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290876} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290876} -{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290876} -{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290881} -{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290884} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290907} -{"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": 28088, "completion_tokens": 986, "total_tokens": 29074, "cost": 0.099054, "total_cost": 0.099054}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290929} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290932} -{"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": 29414, "completion_tokens": 85, "total_tokens": 29499, "cost": 0.089517, "total_cost": 0.188571}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290939} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290940} -{"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": 29648, "completion_tokens": 101, "total_tokens": 29749, "cost": 0.09045900000000001, "total_cost": 0.27903}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290949} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290950} -{"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": 29902, "completion_tokens": 98, "total_tokens": 30000, "cost": 0.09117600000000001, "total_cost": 0.37020600000000004}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290956} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741290966} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291019} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291020} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291020} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291022} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 7157, "completion_tokens": 37, "total_tokens": 7194, "cost": 0.0064746, "total_cost": 0.0064746}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291026} -{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291035} -{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291035} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291046} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291047} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291047} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291048} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 10016, "completion_tokens": 34, "total_tokens": 10050, "cost": 0.009045, "total_cost": 0.009045}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291052} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291064} -{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291066} -{"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": 30036, "completion_tokens": 140, "total_tokens": 30176, "cost": 0.09220800000000001, "total_cost": 0.46241400000000005}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291071} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291071} -{"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": 30328, "completion_tokens": 110, "total_tokens": 30438, "cost": 0.092634, "total_cost": 0.555048}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291077} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291077} -{"event": "command_clear", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291080} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291081} -{"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": 28136, "completion_tokens": 119, "total_tokens": 28255, "cost": 0.08619299999999999, "total_cost": 0.641241}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291091} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291091} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291110} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291111} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291111} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291111} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 10014, "completion_tokens": 36, "total_tokens": 10050, "cost": 0.009045, "total_cost": 0.009045}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291122} -{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291123} -{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291123} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291129} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291129} -{"event": "cli session", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291129} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291129} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 10014, "completion_tokens": 36, "total_tokens": 10050, "cost": 0.009045, "total_cost": 0.009045}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291134} -{"event": "exit", "properties": {"reason": "Completed main CLI coder.run"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291144} -{"event": "command_clear", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291161} -{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291181} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291184} -{"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": 28157, "completion_tokens": 1618, "total_tokens": 29775, "cost": 0.108741, "total_cost": 0.7499819999999999}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291216} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291247} -{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291256} -{"event": "repo", "properties": {"num_files": 441}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291256} -{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291256} -{"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": 29939, "completion_tokens": 157, "total_tokens": 30096, "cost": 0.092172, "total_cost": 0.842154}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291260} -{"event": "command_model", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291261} -{"event": "command_model", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291262} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291263} -{"event": "message_send", "properties": {"main_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "fireworks_ai/accounts/fireworks/models/deepseek-v3", "edit_format": "diff", "prompt_tokens": 10016, "completion_tokens": 34, "total_tokens": 10050, "cost": 0.009045, "total_cost": 0.009045}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291270} -{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291277} {"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291305} {"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": 30478, "completion_tokens": 124, "total_tokens": 30602, "cost": 0.093294, "total_cost": 0.935448}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291309} {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741291309} @@ -998,3 +916,85 @@ {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295287} {"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": 28155, "completion_tokens": 460, "total_tokens": 28615, "cost": 0.091365, "total_cost": 0.091365}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295304} {"event": "exit", "properties": {"reason": "Completed --message"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295304} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295714} +{"event": "repo", "properties": {"num_files": 442}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295714} +{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295714} +{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295715} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295755} +{"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": "ask", "prompt_tokens": 8117, "completion_tokens": 223, "total_tokens": 8340, "cost": 0.027696000000000002, "total_cost": 0.027696000000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295763} +{"event": "command_code", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295782} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295782} +{"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": 10656, "completion_tokens": 809, "total_tokens": 11465, "cost": 0.044103, "total_cost": 0.071799}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295800} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295859} +{"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": "ask", "prompt_tokens": 9259, "completion_tokens": 715, "total_tokens": 9974, "cost": 0.038502, "total_cost": 0.11030100000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295876} +{"event": "command_clear", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295934} +{"event": "command_model", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295936} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295938} +{"event": "message_send", "properties": {"main_model": "o3-mini", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "gpt-4o", "edit_format": "ask", "prompt_tokens": 7969, "completion_tokens": 123, "total_tokens": 8092, "cost": 0.0093071, "total_cost": 0.11960810000000001}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295949} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295964} +{"event": "message_send", "properties": {"main_model": "o3-mini", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "gpt-4o", "edit_format": "ask", "prompt_tokens": 8117, "completion_tokens": 426, "total_tokens": 8543, "cost": 0.010803100000000001, "total_cost": 0.1304112}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741295973} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741296000} +{"event": "message_send", "properties": {"main_model": "o3-mini", "weak_model": "anthropic/claude-3-5-haiku-20241022", "editor_model": "gpt-4o", "edit_format": "ask", "prompt_tokens": 8564, "completion_tokens": 347, "total_tokens": 8911, "cost": 0.0109472, "total_cost": 0.1413584}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741296009} +{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741299312} +{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741299312} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305140} +{"event": "repo", "properties": {"num_files": 1}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305141} +{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305141} +{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305142} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305145} +{"event": "repo", "properties": {"num_files": 1}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305146} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741305147} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741306967} +{"event": "repo", "properties": {"num_files": 442}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741306967} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741306971} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307001} +{"event": "repo", "properties": {"num_files": 417}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307001} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307004} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307077} +{"event": "repo", "properties": {"num_files": 400}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307077} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307080} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307595} +{"event": "repo", "properties": {"num_files": 400}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307595} +{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307595} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307643} +{"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": 7112, "completion_tokens": 740, "total_tokens": 7852, "cost": 0.032436, "total_cost": 0.032436}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307658} +{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307687} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307687} +{"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": "ask", "prompt_tokens": 5264, "completion_tokens": 386, "total_tokens": 5650, "cost": 0.021582, "total_cost": 0.054018}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307695} +{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307705} +{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307705} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307740} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307741} +{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307742} +{"event": "command_ask", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307749} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307749} +{"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": "ask", "prompt_tokens": 4441, "completion_tokens": 147, "total_tokens": 4588, "cost": 0.015528, "total_cost": 0.015528}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307755} +{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307773} +{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307773} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307793} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307793} +{"event": "exit", "properties": {"reason": "Completed lint/test/commit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741307797} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308004} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308005} +{"event": "exit", "properties": {"reason": "Completed lint/test/commit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308008} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308332} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308333} +{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308333} +{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308334} +{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308362} +{"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": 6550, "completion_tokens": 162, "total_tokens": 6712, "cost": 0.022080000000000002, "total_cost": 0.022080000000000002}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308367} +{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308434} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308714} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308715} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308732} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308841} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308841} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308844} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308870} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308870} +{"event": "exit", "properties": {"reason": "Showed repo map"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741308873} +{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741309096} +{"event": "repo", "properties": {"num_files": 401}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741309097} +{"event": "cli session", "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"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741309097} +{"event": "command_add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741309100} +{"event": "exit", "properties": {"reason": "Completed main CLI coder.run"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1741309337} diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml index 531714838..d93b69669 100644 --- a/aider/website/assets/sample.aider.conf.yml +++ b/aider/website/assets/sample.aider.conf.yml @@ -198,7 +198,7 @@ #user-input-color: #00cc00 ## Set the color for tool output (default: None) -#tool-output-color: xxx +#tool-output-color: "xxx" ## Set the color for tool error messages (default: #FF2222) #tool-error-color: #FF2222 @@ -210,16 +210,16 @@ #assistant-output-color: #0088ff ## Set the color for the completion menu (default: terminal's default text color) -#completion-menu-color: xxx +#completion-menu-color: "xxx" ## Set the background color for the completion menu (default: terminal's default background color) -#completion-menu-bg-color: xxx +#completion-menu-bg-color: "xxx" ## Set the color for the current item in the completion menu (default: terminal's default background color) -#completion-menu-current-color: xxx +#completion-menu-current-color: "xxx" ## Set the background color for the current item in the completion menu (default: terminal's default text color) -#completion-menu-current-bg-color: xxx +#completion-menu-current-bg-color: "xxx" ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light, or a Pygments builtin style, see https://pygments.org/styles for available themes) #code-theme: default diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md index 68976ef47..683de1f9d 100644 --- a/aider/website/docs/config/aider_conf.md +++ b/aider/website/docs/config/aider_conf.md @@ -252,7 +252,7 @@ cog.outl("```") #user-input-color: #00cc00 ## Set the color for tool output (default: None) -#tool-output-color: xxx +#tool-output-color: "xxx" ## Set the color for tool error messages (default: #FF2222) #tool-error-color: #FF2222 @@ -264,16 +264,16 @@ cog.outl("```") #assistant-output-color: #0088ff ## Set the color for the completion menu (default: terminal's default text color) -#completion-menu-color: xxx +#completion-menu-color: "xxx" ## Set the background color for the completion menu (default: terminal's default background color) -#completion-menu-bg-color: xxx +#completion-menu-bg-color: "xxx" ## Set the color for the current item in the completion menu (default: terminal's default background color) -#completion-menu-current-color: xxx +#completion-menu-current-color: "xxx" ## Set the background color for the current item in the completion menu (default: terminal's default text color) -#completion-menu-current-bg-color: xxx +#completion-menu-current-bg-color: "xxx" ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light, or a Pygments builtin style, see https://pygments.org/styles for available themes) #code-theme: default diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md index 86ee52144..b5da950e5 100644 --- a/aider/website/docs/faq.md +++ b/aider/website/docs/faq.md @@ -249,9 +249,10 @@ tr:hover { background-color: #f5f5f5; } - - - + + + +
Model NameTotal TokensPercent
anthropic/claude-3-7-sonnet-20250219593,82961.8%
openrouter/REDACTED259,57027.0%
fireworks_ai/accounts/fireworks/models/deepseek-v3107,71911.2%
anthropic/claude-3-7-sonnet-20250219348,61751.7%
openrouter/REDACTED259,57038.5%
fireworks_ai/accounts/fireworks/models/deepseek-v340,2276.0%
o3-mini25,5463.8%
{: .note :} diff --git a/aider/website/docs/languages.md b/aider/website/docs/languages.md index 09eb1b4e0..731a7c7d5 100644 --- a/aider/website/docs/languages.md +++ b/aider/website/docs/languages.md @@ -57,10 +57,10 @@ cog.out(get_supported_languages_md()) |:--------:|:--------------:|:--------:|:------:| | bash | .bash | | ✓ | | c | .c | ✓ | ✓ | -| c_sharp | .cs | ✓ | ✓ | | commonlisp | .cl | | ✓ | | cpp | .cc | ✓ | ✓ | | cpp | .cpp | ✓ | ✓ | +| csharp | .cs | ✓ | ✓ | | css | .css | | ✓ | | dockerfile | .dockerfile | | ✓ | | dot | .dot | | ✓ | @@ -85,12 +85,11 @@ cog.out(get_supported_languages_md()) | kotlin | .kt | ✓ | ✓ | | lua | .lua | | ✓ | | make | .mk | | ✓ | +| markdown | .md | | ✓ | | objc | .m | | ✓ | -| ocaml | .ml | ✓ | ✓ | | perl | .pl | | ✓ | | php | .php | ✓ | ✓ | | python | .py | ✓ | ✓ | -| ql | .ql | ✓ | ✓ | | r | .R | | ✓ | | r | .r | | ✓ | | regex | .regex | | ✓ |