From f5021360f1dee591df3cce5daab0b96e29dc486a Mon Sep 17 00:00:00 2001 From: Ed_ Date: Wed, 10 Jun 2026 08:43:18 -0400 Subject: [PATCH] wip: pre-mma-tier-usage-reset-fix (preserve inherited working tree) --- config.toml | 16 ++++++++-------- manualslop_layout.ini | 24 ++++++++++++------------ project_history.toml | 2 +- src/app_controller.py | 29 +++++++++++++++++++++-------- 4 files changed, 42 insertions(+), 29 deletions(-) diff --git a/config.toml b/config.toml index 7b455b4b..5042cf5c 100644 --- a/config.toml +++ b/config.toml @@ -70,20 +70,20 @@ scale = 1.0 transparency = 1.0 child_transparency = 1.0 -[theme.tone_mapping."Solarized Light"] -brightness = 0.4699999988079071 -contrast = 0.800000011920929 -gamma = 0.6700000166893005 +[theme.tone_mapping.solarized_light] +brightness = 0.6899999976158142 +contrast = 0.8600000143051147 +gamma = 0.7699999809265137 [theme.tone_mapping.gray_variations] brightness = 0.7699999809265137 contrast = 0.7200000286102295 gamma = 0.6899999976158142 -[theme.tone_mapping.solarized_light] -brightness = 0.6899999976158142 -contrast = 0.8600000143051147 -gamma = 0.7699999809265137 +[theme.tone_mapping."Solarized Light"] +brightness = 0.4699999988079071 +contrast = 0.800000011920929 +gamma = 0.6700000166893005 [theme.tone_mapping.Binks] brightness = 0.47999998927116394 diff --git a/manualslop_layout.ini b/manualslop_layout.ini index 4552409d..8e070ea6 100644 --- a/manualslop_layout.ini +++ b/manualslop_layout.ini @@ -77,7 +77,7 @@ DockId=0xAFC85805,2 [Window][Theme] Pos=0,28 -Size=1407,1700 +Size=203,1172 Collapsed=0 DockId=0x00000010,0 @@ -105,26 +105,26 @@ Collapsed=0 DockId=0x0000000D,0 [Window][Discussion Hub] -Pos=1409,28 -Size=1663,1700 +Pos=205,28 +Size=1475,1172 Collapsed=0 DockId=0x00000006,0 [Window][Operations Hub] Pos=0,28 -Size=1407,1700 +Size=203,1172 Collapsed=0 DockId=0x00000010,4 [Window][Files & Media] Pos=0,28 -Size=1407,1700 +Size=203,1172 Collapsed=0 DockId=0x00000010,2 [Window][AI Settings] Pos=0,28 -Size=1407,1700 +Size=203,1172 Collapsed=0 DockId=0x00000010,3 @@ -140,8 +140,8 @@ Collapsed=0 DockId=0x00000006,2 [Window][Log Management] -Pos=1409,28 -Size=1663,1700 +Pos=205,28 +Size=1475,1172 Collapsed=0 DockId=0x00000006,1 @@ -410,7 +410,7 @@ DockId=0x00000006,1 [Window][Project Settings] Pos=0,28 -Size=1407,1700 +Size=203,1172 Collapsed=0 DockId=0x00000010,1 @@ -834,13 +834,13 @@ Column 2 Weight=1.0000 DockNode ID=0x00000008 Pos=3125,170 Size=593,1157 Split=Y DockNode ID=0x00000009 Parent=0x00000008 SizeRef=1029,147 Selected=0x0469CA7A DockNode ID=0x0000000A Parent=0x00000008 SizeRef=1029,145 Selected=0xDF822E02 -DockSpace ID=0xAFC85805 Window=0x079D3A04 Pos=0,28 Size=3072,1700 Split=X +DockSpace ID=0xAFC85805 Window=0x079D3A04 Pos=0,28 Size=1680,1172 Split=X DockNode ID=0x00000003 Parent=0xAFC85805 SizeRef=2357,1183 Split=X DockNode ID=0x0000000B Parent=0x00000003 SizeRef=404,1186 Split=X Selected=0xF4139CA2 - DockNode ID=0x00000005 Parent=0x0000000B SizeRef=1407,1681 Split=Y Selected=0x3F1379AF + DockNode ID=0x00000005 Parent=0x0000000B SizeRef=1246,1681 Split=Y Selected=0x3F1379AF DockNode ID=0x00000010 Parent=0x00000005 SizeRef=983,1140 CentralNode=1 Selected=0x418C7449 DockNode ID=0x00000011 Parent=0x00000005 SizeRef=983,184 Selected=0x432BAE4E - DockNode ID=0x00000006 Parent=0x0000000B SizeRef=1663,1681 Selected=0x6F2B5B04 + DockNode ID=0x00000006 Parent=0x0000000B SizeRef=1475,1681 Selected=0x2C0206CE DockNode ID=0x0000000D Parent=0x00000003 SizeRef=435,1186 Selected=0x363E93D6 DockNode ID=0x00000004 Parent=0xAFC85805 SizeRef=488,1183 Selected=0x3AEC3498 diff --git a/project_history.toml b/project_history.toml index 21314a22..cbba29b1 100644 --- a/project_history.toml +++ b/project_history.toml @@ -9,5 +9,5 @@ active = "main" [discussions.main] git_commit = "" -last_updated = "2026-06-09T19:48:12" +last_updated = "2026-06-10T00:49:11" history = [] diff --git a/src/app_controller.py b/src/app_controller.py index c4a42016..b0836b0f 100644 --- a/src/app_controller.py +++ b/src/app_controller.py @@ -1252,16 +1252,29 @@ class AppController: "ui_new_ticket_target", "ui_new_ticket_deps", "ui_output_dir", "ui_files_base_dir", "ui_shots_base_dir", "ui_project_git_dir", "ui_project_system_prompt", "ui_project_execution_mode", - "ui_gemini_cli_path", "ui_word_wrap", "ui_auto_add_history", - "ui_separate_message_panel", "ui_separate_response_panel", - "ui_separate_tool_calls_panel", "ui_global_system_prompt", - "ui_base_system_prompt", "ui_use_default_base_prompt", - "ui_project_context_marker", "ui_agent_tools", "ui_manual_approve", - "ui_disc_truncate_pairs", "ui_auto_scroll_comms", - "ui_auto_scroll_tool_calls", "ui_focus_agent", "ui_active_persona", - } + "ui_base_system_prompt", "ui_use_default_base_prompt", + "ui_project_context_marker", "ui_agent_tools", "ui_manual_approve", + "ui_disc_truncate_pairs", "ui_auto_scroll_comms", + "ui_auto_scroll_tool_calls", "ui_focus_agent", "ui_active_persona", + } + # Manager attributes that are initialized by init_state() but are absent + # on a bare AppController() (which some tests construct). Return None + # for these so test code that references them without calling init_state + # does not crash. hasattr() still returns False for non-mocked access + # paths because callers wrap in try/except for AttributeError when they + # need to distinguish "lazy" from "absent". + _LAZY_MANAGER_DEFAULTS = { + "context_preset_manager", + "persona_manager", + "tool_preset_manager", + "preset_manager", + "vendor_state", + "perf_monitor", + } if name in _UI_FLAG_DEFAULTS or name == "rag_engine": return None + if name in _LAZY_MANAGER_DEFAULTS: + return None raise AttributeError(name) @property