borisxdave 0.3.5__tar.gz → 0.3.6__tar.gz

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

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

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

@@ -1181,21 +1181,36 @@ def main():
                     # Process verdicts sequentially (corrections/retries run sequentially)
                     batch_summary = {}
                     for milestone, result in parallel_results:
-                        print(f"[Boris] TURBO: Checking verdict for {milestone.id}...", flush=True)
-                        verdict_result = engine.check(result, milestone)
-                        logger.info(
-                            "TURBO milestone %s verdict: %s - %s",
-                            milestone.id,
-                            verdict_result.verdict.value,
-                            verdict_result.reason,
-                        )
-
-                        _process_milestone_verdict(
-                            verdict_result, result, milestone, plan, st,
-                            project_dir, args, logger, prompt_map[milestone.id]
-                        )
+                        try:
+                            print(f"[Boris] TURBO: Checking verdict for {milestone.id}...", flush=True)
+                            verdict_result = engine.check(result, milestone)
+                            logger.info(
+                                "TURBO milestone %s verdict: %s - %s",
+                                milestone.id,
+                                verdict_result.verdict.value,
+                                verdict_result.reason,
+                            )
+
+                            _process_milestone_verdict(
+                                verdict_result, result, milestone, plan, st,
+                                project_dir, args, logger, prompt_map[milestone.id]
+                            )
+                        except Exception as e:
+                            print(f"[Boris] TURBO: Error processing verdict for {milestone.id}: {e}", flush=True)
+                            logger.error("Verdict processing error for %s: %s", milestone.id, e)
+                            milestone.status = "skipped"
+                            state_module.save(st)
                         batch_summary[milestone.id] = milestone.status.upper()
 
+                    # Safety net: any milestone still in_progress after batch must be marked skipped
+                    for m in ready:
+                        if m.status == "in_progress":
+                            print(f"[Boris] TURBO: {m.id} still in_progress after batch - marking skipped", flush=True)
+                            logger.warning("Milestone %s stuck in_progress after batch, marking skipped", m.id)
+                            m.status = "skipped"
+                            batch_summary[m.id] = "SKIPPED"
+                    state_module.save(st)
+
                     # Convergence phase: reconcile type conflicts from parallel workers
                     if not getattr(args, 'no_converge', False):
                         completed_in_batch = [m for m, r in parallel_results if m.status == "completed"]

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

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

{borisxdave-0.3.5 → borisxdave-0.3.6}/engine.py

@@ -609,19 +609,27 @@ def run_parallel(tasks: list, project_dir: str, max_iterations: int = None,
         with concurrent.futures.ThreadPoolExecutor(max_workers=len(tasks)) as executor:
             futures = {executor.submit(_run_one_worktree, t): t for t in tasks}
             for future in concurrent.futures.as_completed(futures):
-                milestone, result = future.result()
-                # Merge worktree back if it was used
-                wt_info = worktree_map.get(milestone.id)
-                if wt_info and result.resolved:
-                    wt_path, branch = wt_info
-                    merge_ok = _merge_worktree(project_dir, wt_path, branch, milestone.id)
-                    if not merge_ok:
-                        print(f"  [Boris] WARNING: Merge conflict for {milestone.id} worktree", flush=True)
-                        logger.warning("Worktree merge conflict for %s", milestone.id)
-                elif wt_info:
-                    # Failed milestone - just clean up worktree
-                    _cleanup_worktree(project_dir, wt_info[0], wt_info[1])
-                results.append((milestone, result))
+                try:
+                    milestone, result = future.result()
+                    # Merge worktree back if it was used
+                    wt_info = worktree_map.get(milestone.id)
+                    if wt_info and result.resolved:
+                        wt_path, branch = wt_info
+                        merge_ok = _merge_worktree(project_dir, wt_path, branch, milestone.id)
+                        if not merge_ok:
+                            print(f"  [Boris] WARNING: Merge conflict for {milestone.id} worktree", flush=True)
+                            logger.warning("Worktree merge conflict for %s", milestone.id)
+                    elif wt_info:
+                        # Failed milestone - just clean up worktree
+                        _cleanup_worktree(project_dir, wt_info[0], wt_info[1])
+                    results.append((milestone, result))
+                except Exception as e:
+                    # Worker crashed - return a failed result
+                    _, crashed_milestone = futures[future]
+                    print(f"  [Boris] Worker for {crashed_milestone.id} crashed: {e}", flush=True)
+                    logger.error("Worker crashed for %s: %s", crashed_milestone.id, e)
+                    failed_result = ExecutionResult(output=f"Worker crashed: {e}", resolved=False, exit_code=1)
+                    results.append((crashed_milestone, failed_result))
 
     else:
         # No isolation or single task - original behavior
@@ -633,7 +641,14 @@ def run_parallel(tasks: list, project_dir: str, max_iterations: int = None,
         with concurrent.futures.ThreadPoolExecutor(max_workers=len(tasks)) as executor:
             futures = {executor.submit(_run_one, t): t for t in tasks}
             for future in concurrent.futures.as_completed(futures):
-                results.append(future.result())
+                try:
+                    results.append(future.result())
+                except Exception as e:
+                    _, crashed_milestone = futures[future]
+                    print(f"  [Boris] Worker for {crashed_milestone.id} crashed: {e}", flush=True)
+                    logger.error("Worker crashed for %s: %s", crashed_milestone.id, e)
+                    failed_result = ExecutionResult(output=f"Worker crashed: {e}", resolved=False, exit_code=1)
+                    results.append((crashed_milestone, failed_result))
 
     return results
 

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

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