borisxdave 0.3.3__tar.gz → 0.3.5__tar.gz

{borisxdave-0.3.3/borisxdave.egg-info → borisxdave-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: borisxdave
-Version: 0.3.3
+Version: 0.3.5
 Summary: Boris - Autonomous Project Orchestrator
 Requires-Python: >=3.8
 Dynamic: requires-python

{borisxdave-0.3.3 → borisxdave-0.3.5}/boris.py

@@ -14,6 +14,8 @@ if hasattr(sys.stdout, "reconfigure"):
         pass
 os.environ["PYTHONUNBUFFERED"] = "1"
 
+import threading
+import time as _time
 import engine
 import git_manager
 import prompts
@@ -811,30 +813,39 @@ def _print_swarm_dashboard(project_dir: str, batch_num: int, batch_milestones: l
         return
 
     active = sum(1 for s in statuses.values() if s.get("state") in ("starting", "working"))
+    done = sum(1 for s in statuses.values() if s.get("state") == "done")
     total_actions = sum(s.get("actions", 0) for s in statuses.values())
 
+    elapsed = ""
+    started_times = [s.get("started_at", 0) for s in statuses.values() if s.get("started_at")]
+    if started_times:
+        elapsed_sec = int(_time.time() - min(started_times))
+        elapsed = f" | Elapsed: {elapsed_sec // 60}m {elapsed_sec % 60}s"
+
     print(flush=True)
-    print("=== BORIS SWARM STATUS ===", flush=True)
-    print(f"Batch {batch_num} | Workers: {active} active / {len(statuses)} total | Actions: {total_actions}", flush=True)
-    print(flush=True)
+    print("╔══════════════════════════════════════════════════════════════════╗", flush=True)
+    print(f"║  BORIS SWARM DASHBOARD  │  Batch {batch_num}  │  {active} active / {done} done / {len(statuses)} total{elapsed}", flush=True)
+    print("╠══════════════════════════════════════════════════════════════════╣", flush=True)
 
     for m in batch_milestones:
         status = statuses.get(m.id, {})
-        state = status.get("state", "unknown")
+        state = status.get("state", "waiting")
         actions = status.get("actions", 0)
         reasoning = status.get("reasoning_blocks", 0)
         interrupts = status.get("interrupts", 0)
         last = status.get("last_action", "")
 
         # Progress indicator based on reasoning blocks (rough proxy)
-        bar_len = min(reasoning, 10)
-        bar = "#" * bar_len + "-" * (10 - bar_len)
+        bar_len = min(reasoning, 20)
+        bar = "█" * bar_len + "░" * (20 - bar_len)
 
+        state_icons = {"starting": "⏳", "working": "⚙️", "done": "✅", "failed": "❌"}
+        icon = state_icons.get(state, "⏸️")
         state_str = state.upper()
-        interrupt_str = f" | {interrupts} interrupts" if interrupts > 0 else ""
-        print(f"[{m.id}] {m.title[:30]:<30} [{bar}] {state_str} | {actions} actions{interrupt_str}", flush=True)
+        interrupt_str = f" │ ⚠ {interrupts} interrupts" if interrupts > 0 else ""
+        print(f"║  {icon} [{m.id}] {m.title[:28]:<28} [{bar}] {state_str:>8} │ {actions:>3} actions{interrupt_str}", flush=True)
         if last:
-            print(f"      Last: {last}", flush=True)
+            print(f"║       └─ {last[:60]}", flush=True)
 
     # Show file locks if file_lock.py is available
     try:
@@ -843,14 +854,29 @@ def _print_swarm_dashboard(project_dir: str, batch_num: int, batch_milestones: l
         locks = flm.get_locked_files()
         if locks:
             lock_strs = [f"{os.path.basename(f)} ({owner})" for f, owner in locks.items()]
-            print(f"\nFile locks: {', '.join(lock_strs)}", flush=True)
+            print(f"║  🔒 Locks: {', '.join(lock_strs)}", flush=True)
     except ImportError:
         pass
 
-    print("===========================", flush=True)
+    print("╚══════════════════════════════════════════════════════════════════╝", flush=True)
     print(flush=True)
 
 
+def _start_live_dashboard(project_dir: str, batch_num: int, batch_milestones: list, interval: float = 10.0):
+    """Start a background thread that prints the swarm dashboard periodically."""
+    stop_event = threading.Event()
+
+    def _loop():
+        while not stop_event.is_set():
+            stop_event.wait(interval)
+            if not stop_event.is_set():
+                _print_swarm_dashboard(project_dir, batch_num, batch_milestones)
+
+    t = threading.Thread(target=_loop, daemon=True)
+    t.start()
+    return stop_event
+
+
 def _apply_preset(args):
     """Apply a swarm preset to args if specified. Preset implies --swarm."""
     if not args.preset:
@@ -907,15 +933,29 @@ def main():
             print("[Boris] Error: No saved state found. Cannot resume.", flush=True)
             sys.exit(1)
         plan = st.plan
-        start_index = st.current_milestone_index
+
+        # Reset skipped milestones to pending so they get retried
+        retried = []
+        for m in plan.milestones:
+            if m.status == "skipped":
+                m.status = "pending"
+                retried.append(m.id)
+        if retried:
+            print(f"[Boris] Retrying previously skipped milestones: {', '.join(retried)}", flush=True)
+            logger.info("Reset skipped milestones to pending: %s", retried)
+
+        # Start from 0 so we scan all milestones (completed ones are skipped automatically)
+        start_index = 0
+        st.current_milestone_index = 0
+        state_module.save(st)
 
         # If already in UI testing phase, skip straight to UI loop
         if st.phase == "ui_testing":
             print(f"[Boris] Resuming UI Testing phase...", flush=True)
             logger.info("Resuming UI testing phase")
         else:
-            print(f"[Boris] Resuming from milestone {start_index + 1}...", flush=True)
-            logger.info("Resuming from milestone %d", start_index + 1)
+            print(f"[Boris] Resuming - {len(retried)} skipped milestone(s) queued for retry...", flush=True)
+            logger.info("Resuming with %d milestones to retry", len(retried))
     elif args.exec_only:
         # Exec-only mode - load an existing plan file and execute it
         plan_file = os.path.abspath(args.exec_only)
@@ -1127,11 +1167,14 @@ def main():
                         tasks.append((prompt, m))
                         prompt_map[m.id] = prompt
 
-                    # Run all DaveLoops in parallel
+                    # Run all DaveLoops in parallel with live dashboard
                     isolation = getattr(args, 'isolation', 'none') if getattr(args, 'swarm', False) else 'none'
+                    _print_swarm_dashboard(project_dir, batch_num, ready)
+                    dashboard_stop = _start_live_dashboard(project_dir, batch_num, ready, interval=15.0)
                     parallel_results = engine.run_parallel(tasks, project_dir, args.max_iter, isolation=isolation)
+                    dashboard_stop.set()
 
-                    # Print swarm dashboard after parallel run completes (B7)
+                    # Print final swarm dashboard after parallel run completes (B7)
                     _print_swarm_dashboard(project_dir, batch_num, ready)
                     engine.clear_worker_statuses(project_dir)
 

{borisxdave-0.3.3 → borisxdave-0.3.5/borisxdave.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: borisxdave
-Version: 0.3.3
+Version: 0.3.5
 Summary: Boris - Autonomous Project Orchestrator
 Requires-Python: >=3.8
 Dynamic: requires-python

{borisxdave-0.3.3 → borisxdave-0.3.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="borisxdave",
-    version="0.3.3",
+    version="0.3.5",
     description="Boris - Autonomous Project Orchestrator",
     py_modules=["boris", "engine", "git_manager", "prompts", "state", "planner", "config", "file_lock", "boris_prompt_data"],
     python_requires=">=3.8",