Compare commits

...

2 Commits

Author SHA1 Message Date
Ed_
d45accbc90 conductor(plan): Mark Task 3.1 as complete 2026-03-07 16:20:07 -05:00
Ed_
d74f629f47 feat(gui): Add kill button per worker in ticket queue table 2026-03-07 16:19:01 -05:00
3 changed files with 58 additions and 8 deletions

View File

@@ -5,8 +5,8 @@
## Phase 1: Thread Tracking ## Phase 1: Thread Tracking
Focus: Track active worker threads Focus: Track active worker threads
- [ ] Task 1.1: Initialize MMA Environment - [x] Task 1.1: Initialize MMA Environment
- [ ] Task 1.2: Add worker tracking dict to ConductorEngine - [x] Task 1.2: Add worker tracking dict to ConductorEngine (5f79091)
- WHERE: `src/multi_agent_conductor.py` `ConductorEngine.__init__` - WHERE: `src/multi_agent_conductor.py` `ConductorEngine.__init__`
- WHAT: Dict to track active workers - WHAT: Dict to track active workers
- HOW: - HOW:
@@ -18,12 +18,12 @@ Focus: Track active worker threads
## Phase 2: Abort Mechanism ## Phase 2: Abort Mechanism
Focus: Add abort signal to workers Focus: Add abort signal to workers
- [ ] Task 2.1: Create abort event per ticket - [x] Task 2.1: Create abort event per ticket (da011fb)
- WHERE: `src/multi_agent_conductor.py` before spawning worker - WHERE: `src/multi_agent_conductor.py` before spawning worker
- WHAT: Create threading.Event for abort - WHAT: Create threading.Event for abort
- HOW: `self._abort_events[ticket.id] = threading.Event()` - HOW: `self._abort_events[ticket.id] = threading.Event()`
- [ ] Task 2.2: Check abort in worker lifecycle - [x] Task 2.2: Check abort in worker lifecycle (597e6b5)
- WHERE: `src/multi_agent_conductor.py` `run_worker_lifecycle()` - WHERE: `src/multi_agent_conductor.py` `run_worker_lifecycle()`
- WHAT: Check abort event between operations - WHAT: Check abort event between operations
- HOW: - HOW:
@@ -37,8 +37,7 @@ Focus: Add abort signal to workers
## Phase 3: Kill Button UI ## Phase 3: Kill Button UI
Focus: Add kill button to GUI Focus: Add kill button to GUI
- [ ] Task 3.1: Add kill button per worker - [x] Task 3.1: Add kill button per worker (d74f629)
- WHERE: `src/gui_2.py` MMA dashboard
- WHAT: Button to kill specific worker - WHAT: Button to kill specific worker
- HOW: - HOW:
```python ```python
@@ -48,7 +47,7 @@ Focus: Add kill button to GUI
engine.kill_worker(ticket_id) engine.kill_worker(ticket_id)
``` ```
- [ ] Task 3.2: Implement kill_worker method - [x] Task 3.2: Implement kill_worker method (597e6b5)
- WHERE: `src/multi_agent_conductor.py` - WHERE: `src/multi_agent_conductor.py`
- WHAT: Set abort event and wait for termination - WHAT: Set abort event and wait for termination
- HOW: - HOW:

View File

@@ -1950,6 +1950,10 @@ class App:
if t: t['status'] = 'blocked' if t: t['status'] = 'blocked'
self._push_mma_state_update() self._push_mma_state_update()
def _cb_kill_ticket(self, ticket_id: str) -> None:
if self.controller and self.controller.engine:
self.controller.engine.kill_worker(ticket_id)
def _reorder_ticket(self, src_idx: int, dst_idx: int) -> None: def _reorder_ticket(self, src_idx: int, dst_idx: int) -> None:
if src_idx == dst_idx: return if src_idx == dst_idx: return
new_tickets = list(self.active_tickets) new_tickets = list(self.active_tickets)
@@ -1997,12 +2001,13 @@ class App:
self.bulk_block() self.bulk_block()
# Table # Table
flags = imgui.TableFlags_.borders | imgui.TableFlags_.row_bg | imgui.TableFlags_.resizable | imgui.TableFlags_.scroll_y flags = imgui.TableFlags_.borders | imgui.TableFlags_.row_bg | imgui.TableFlags_.resizable | imgui.TableFlags_.scroll_y
if imgui.begin_table("ticket_queue_table", 5, flags, imgui.ImVec2(0, 300)): if imgui.begin_table("ticket_queue_table", 6, flags, imgui.ImVec2(0, 300)):
imgui.table_setup_column("Select", imgui.TableColumnFlags_.width_fixed, 40) imgui.table_setup_column("Select", imgui.TableColumnFlags_.width_fixed, 40)
imgui.table_setup_column("ID", imgui.TableColumnFlags_.width_fixed, 80) imgui.table_setup_column("ID", imgui.TableColumnFlags_.width_fixed, 80)
imgui.table_setup_column("Priority", imgui.TableColumnFlags_.width_fixed, 100) imgui.table_setup_column("Priority", imgui.TableColumnFlags_.width_fixed, 100)
imgui.table_setup_column("Status", imgui.TableColumnFlags_.width_fixed, 100) imgui.table_setup_column("Status", imgui.TableColumnFlags_.width_fixed, 100)
imgui.table_setup_column("Description", imgui.TableColumnFlags_.width_stretch) imgui.table_setup_column("Description", imgui.TableColumnFlags_.width_stretch)
imgui.table_setup_column("Actions", imgui.TableColumnFlags_.width_fixed, 80)
imgui.table_headers_row() imgui.table_headers_row()
for i, t in enumerate(self.active_tickets): for i, t in enumerate(self.active_tickets):
@@ -2061,6 +2066,13 @@ class App:
imgui.table_next_column() imgui.table_next_column()
imgui.text(t.get('description', '')) imgui.text(t.get('description', ''))
# Actions - Kill button for in_progress tickets
imgui.table_next_column()
status = t.get('status', 'todo')
if status == 'in_progress':
if imgui.button(f"Kill##{tid}"):
self._cb_kill_ticket(tid)
imgui.end_table() imgui.end_table()
def _render_mma_dashboard(self) -> None: def _render_mma_dashboard(self) -> None:

View File

@@ -0,0 +1,39 @@
import pytest
from unittest.mock import MagicMock, patch
def test_gui_has_kill_button_method():
from src.gui_2 import App
assert hasattr(App, '_cb_kill_ticket'), "App must have _cb_kill_ticket method"
def test_render_ticket_queue_table_columns():
with patch("src.gui_2.imgui") as mock_imgui:
mock_imgui.begin_table.return_value = True
mock_imgui.table_setup_column = MagicMock()
mock_imgui.table_headers_row = MagicMock()
mock_imgui.table_next_row = MagicMock()
mock_imgui.table_next_column = MagicMock()
mock_imgui.button.return_value = False
mock_imgui.checkbox = MagicMock(return_value=(False, False))
mock_imgui.selectable = MagicMock(return_value=(False, False))
mock_imgui.begin_drag_drop_source = MagicMock(return_value=False)
mock_imgui.begin_drag_drop_target = MagicMock(return_value=False)
mock_imgui.text = MagicMock()
mock_imgui.end_table = MagicMock()
mock_imgui.begin_combo.return_value = False
mock_imgui.ComboFlags_.height_small = 0
mock_imgui.push_style_color = MagicMock()
mock_imgui.pop_style_color = MagicMock()
mock_imgui.same_line = MagicMock()
from src.gui_2 import App
app = App.__new__(App)
app.active_track = MagicMock()
app.active_tickets = [{"id": "T-001", "priority": "medium", "status": "in_progress", "description": "Test task"}]
app.ui_selected_tickets = set()
app.ui_selected_ticket_id = None
app.controller = MagicMock()
app._push_mma_state_update = MagicMock()
app._cb_kill_ticket = MagicMock()
app._render_ticket_queue()
columns_called = [call[0][0] for call in mock_imgui.table_setup_column.call_args_list]
assert "Actions" in columns_called, f"Expected Actions column, got: {columns_called}"