Fixed-IgnoreDir/IgnoreFiles Issue

Author: Vic

.gitignore

@@ -18,4 +18,4 @@ SYMBOLS.json
 ANALYSIS.md
 build_env
 *.dmg
-NoClaw.spec
+*.spec

autoreviewer.py

@@ -836,31 +836,37 @@ def implement_feature(self, feature_content: str) -> bool:
         if not match:
             logger.error("Could not determine target file from FEATURE.md formatting.")
             return False
+
         rel_path = match.group(1)
         target_path = os.path.join(self.target_dir, rel_path)
         lang_name, lang_tag = self.get_language_info(target_path)
-        with open(target_path, "r", encoding="utf-8") as f:
-            source_code = f.read()
 
-        # --- NEW: ARCHITECTURAL SPLIT SUPPORT ---
-        # Look for a <CREATE_FILE> tag in the AI proposal
-        new_file_match = re.search(
+        with open(target_path, "r", encoding="utf-8") as f_handle:
+            source_code = f_handle.read()
+
+        # --- TRANSACTIONAL STORAGE ---
+        created_files: list[str] = []
+
+        # Look for <CREATE_FILE> tags in the AI proposal
+        new_file_matches = re.finditer(
             r'<CREATE_FILE path="(.*?)">(.*?)</CREATE_FILE>', feature_content, re.DOTALL
         )
-        if new_file_match:
-            new_path_rel = new_file_match.group(1)
-            new_code_payload = new_file_match.group(2).strip()
+
+        for file_match in new_file_matches:
+            new_path_rel = file_match.group(1)
+            new_code_payload = file_match.group(2).strip()
             new_path_abs = os.path.join(self.target_dir, new_path_rel)
+
             if not os.path.exists(new_path_abs):
-                logger.warning(
-                    f"🏗️ ARCHITECTURAL SPLIT: Spawning new module `{new_path_rel}`"
-                )
-                with open(new_path_abs, "w", encoding="utf-8") as f:
-                    f.write(new_code_payload)
-                self.session_context.append(
-                    f"Created new architectural module: `{new_path_rel}`"
-                )
-        # ----------------------------------------
+                try:
+                    logger.warning(
+                        f"🏗️ ARCHITECTURAL SPLIT: Spawning new module `{new_path_rel}`"
+                    )
+                    with open(new_path_abs, "w", encoding="utf-8") as f_new:
+                        f_new.write(new_code_payload)
+                    created_files.append(new_path_abs)
+                except Exception as e:
+                    logger.error(f"Failed to create new module {new_path_rel}: {e}")
 
         exp_match = re.search(
             r"\*\*Explanation:\*\*(.*?)(?:###|---|>)",
@@ -872,6 +878,7 @@ def implement_feature(self, feature_content: str) -> bool:
             if exp_match
             else f"Implemented a new structural feature for: [{rel_path}]..."
         )
+
         logger.info(
             f"Implementing approved feature seamlessly directly into {rel_path}..."
         )
@@ -885,30 +892,58 @@ def implement_feature(self, feature_content: str) -> bool:
             source_code=source_code,
             rel_path=rel_path,
         )
+
         new_code, _, _ = self.get_valid_edit(
             prompt, source_code, require_edit=True, target_filepath=target_path
         )
+
         if new_code == source_code:
-            logger.error("Implementation failed. LLM did not apply valid changes.")
+            logger.error("Implementation failed. Rolling back created modules.")
+            # FIXED: Used 'file_path' instead of 'f' to avoid Mypy TextIOWrapper collision
+            for file_path in created_files:
+                if os.path.exists(file_path):
+                    os.remove(file_path)
             return False
+
         if lang_tag == "python":
             new_code = self.ensure_imports_retained(source_code, new_code, target_path)
-        with open(target_path, "w", encoding="utf-8") as f:
-            f.write(new_code)
+
+        with open(target_path, "w", encoding="utf-8") as f_out:
+            f_out.write(new_code)
+
         if lang_tag == "python":
+            # If verification fails, clean up the newly spawned files
             if not self.run_linter_fix_loop(
                 context_of_change=feature_content
             ) or not self.run_and_verify_app(context_of_change=feature_content):
+                # FIXED: Used 'file_path' instead of 'f'
+                for file_path in created_files:
+                    if os.path.exists(file_path):
+                        os.remove(file_path)
                 return False
+
             if not self.check_downstream_breakages(target_path, rel_path):
-                logger.error(
-                    "❌ Feature implementation failed downstream type checks (Mypy)."
-                )
+                # FIXED: Used 'file_path' instead of 'f'
+                for file_path in created_files:
+                    if os.path.exists(file_path):
+                        os.remove(file_path)
                 return False
+
         logger.info(f"✅ Successfully implemented feature directly into {rel_path}.")
+
         self.session_context.append(
-            f"Successfully implemented feature directly into `{rel_path}` -> {feature_explanation}"
+            f"SUCCESSFUL CHANGE in `{rel_path}`: {feature_explanation}"
         )
+
+        if created_files:
+            # FIXED: Used 'file_path' in list comprehension
+            self.session_context.append(
+                "Created new modules: "
+                + ", ".join(
+                    [os.path.basename(file_path) for file_path in created_files]
+                )
+            )
+
         if os.path.exists(self.feature_file):
             os.remove(self.feature_file)
         return True
@@ -1064,6 +1099,10 @@ def run_pipeline(self, current_iteration: int):
                     if not success:
                         self.restore_workspace(backup_state)
                         logger.warning("🔄 Rollback performed due to unfixable errors.")
+                        self.session_context.append(
+                            "CRITICAL: The last refactor/feature attempt FAILED and was ROLLED BACK. "
+                            "The files on disk have NOT changed. Check FAILED_FEATURE.md for error logs."
+                        )
 
                         failure_report = f"\n\n### ❌ FAILURE ATTEMPT LOGS ({time.strftime('%Y-%m-%d %H:%M:%S')})\n"
                         failure_report += "\n".join(self.session_context[-3:])

build_pyinstaller_multiOS.py

@@ -9,7 +9,7 @@ def main():
     project_root = Path(__file__).parent.absolute()
 
     # --- Configuration ---
-    VERSION = "0.2.0"
+    VERSION = "0.2.1-beta1"
     APP_NAME = "PyOuroBoros"
 
     print(f"🚀 Forging {APP_NAME} v{VERSION} for {os_name}...")
@@ -54,7 +54,7 @@ def main():
             + [
                 "--onefile",
                 "--console",
-                "--icon=no-claw.ico",
+                "--icon=pyob.ico", # convert pyob.png or pyob.icns to .ico
             ]
         )
         dist_output = project_root / "dist" / f"{APP_NAME}.exe"

core_utils.py

@@ -233,8 +233,14 @@ def _edit_prompt_with_external_editor(self, initial_prompt: str) -> str:
     def backup_workspace(self) -> dict[str, str]:
         state: dict[str, str] = {}
         for root, dirs, files in os.walk(self.target_dir):
+            # Prune directories using the global set
             dirs[:] = [d for d in dirs if d not in IGNORE_DIRS]
+
             for file in files:
+                # Skip ignored files
+                if file in IGNORE_FILES:
+                    continue
+
                 if any(file.endswith(ext) for ext in SUPPORTED_EXTENSIONS):
                     path = os.path.join(root, file)
                     try:
@@ -605,7 +611,7 @@ def normalize(t):
         return new_code, explanation, all_edits_succeeded
 
     def _find_entry_file(self) -> str | None:
-        FORBIDDEN = {"venv", ".venv", "autovenv", "__pycache__", "node_modules", ".git"}
+        # PRIORITY SEARCH
         priority_files = [
             "entrance.py",
             "main.py",
@@ -617,24 +623,32 @@ def _find_entry_file(self) -> str | None:
             target = os.path.join(self.target_dir, f_name)
             if os.path.exists(target):
                 try:
-                    with open(target, "r", encoding="utf-8") as f:
+                    with open(target, "r", encoding="utf-8", errors="ignore") as f:
                         if 'if __name__ == "__main__":' in f.read():
                             return target
                 except Exception:
                     continue
+
+        # DEEP SEARCH
         for root, dirs, files in os.walk(self.target_dir):
-            dirs[:] = [d for d in dirs if d not in FORBIDDEN and not d.startswith(".")]
+            # --- FIXED: Use the GLOBAL IGNORE_DIRS here ---
+            dirs[:] = [
+                d for d in dirs if d not in IGNORE_DIRS and not d.startswith(".")
+            ]
+
             for file in files:
-                if file in [
-                    "autoreviewer.py",
-                    "core_utils.py",
-                    "prompts_and_memory.py",
-                ] or not file.endswith(".py"):
+                # --- FIXED: Use the GLOBAL IGNORE_FILES here ---
+                if file in IGNORE_FILES or not file.endswith(".py"):
+                    continue
+
+                # Double-check that we aren't inside an ignore dir (backup safety)
+                if any(x in root for x in IGNORE_DIRS):
                     continue
+
                 file_path = os.path.join(root, file)
                 try:
-                    with open(file_path, "r", encoding="utf-8") as f:
-                        if 'if __name__ == "__main__":' in f.read():
+                    with open(file_path, "r", encoding="utf-8") as f_obj:
+                        if 'if __name__ == "__main__":' in f_obj.read():
                             return file_path
                 except Exception:
                     continue

entrance.py

@@ -224,9 +224,7 @@ def execute_targeted_iteration(self, iteration: int):
         if any(f in target_rel_path for f in engine_files):
             timestamp = time.strftime("%Y%m%d_%H%M%S")
             project_name = os.path.basename(self.target_dir)
-            base_backup_path = (
-                Path.home() / "Documents" / "PYOB_Backups" / project_name
-            )
+            base_backup_path = Path.home() / "Documents" / "PYOB_Backups" / project_name
             pod_path = base_backup_path / f"safety_pod_v{iteration}_{timestamp}"
 
             try:
@@ -501,21 +499,41 @@ def update_analysis_for_single_file(self, target_abs_path: str, rel_path: str):
 
     def update_ledger_for_file(self, rel_path: str, code: str):
         ext = os.path.splitext(rel_path)[1]
+        # Clear existing definitions for this file before re-populating
+        definitions_to_remove = [
+            name
+            for name, path in self.ledger["definitions"].items()
+            if path == rel_path
+        ]
+        for name in definitions_to_remove:
+            del self.ledger["definitions"][name]
+
         if ext == ".py":
             try:
                 tree = ast.parse(code)
                 for n in ast.walk(tree):
                     if isinstance(n, (ast.FunctionDef, ast.ClassDef)):
                         self.ledger["definitions"][n.name] = rel_path
+                    elif isinstance(n, ast.Assign):
+                        # Add top-level global variables and constants as definitions.
+                        # This aligns with the stated bug fix and the logic in _parse_python.
+                        for target in n.targets:
+                            if isinstance(target, ast.Name) and target.id.isupper():
+                                self.ledger["definitions"][target.id] = rel_path
             except Exception as e:
                 logger.warning(f"Failed to parse Python AST for {rel_path}: {e}")
         elif ext in [".js", ".ts"]:
             defs = re.findall(
                 r"(?:function|class|const|var|let)\s+([a-zA-Z0-9_$]+)", code
             )
             for d in defs:
-                if len(d) > 3:
+                if len(d) > 3:  # Minimum length for a symbol
                     self.ledger["definitions"][d] = rel_path
+
+        # Clear existing references for this file before re-populating
+        if rel_path in self.ledger["references"]:
+            del self.ledger["references"][rel_path]
+
         potential_refs = re.findall(r"([a-zA-Z0-9_$]{4,})(?=\s*\(|\s*\.)", code)
         self.ledger["references"][rel_path] = list(set(potential_refs))
         self.save_ledger()

prompts_and_memory.py

@@ -14,7 +14,7 @@ class PromptsAndMemoryMixin:
 
     def _ensure_prompt_files(self) -> None:
         templates = {
-            "UM.md": "You are the PYOB Memory Manager. Your job is to update MEMORY.md.\n\n### Current Memory:\n{current_memory}\n\n### Recent Actions:\n{session_summary}\n\n### INSTRUCTIONS:\n1. Update the memory with the Recent Actions.\n2. CRITICAL: Keep the ENTIRE document under 250 words. Be ruthless. Delete old, irrelevant details.\n3. Keep lists strictly to bullet points. No long paragraphs.\n4. Respond EXCLUSIVELY with the raw markdown for MEMORY.md. Do not use ```markdown fences or <THOUGHT> blocks.",
+            "UM.md": "You are the PyOB Memory Manager. Your job is to update MEMORY.md.\n\n### Current Memory:\n{current_memory}\n\n### Recent Actions:\n{session_summary}\n\n### INSTRUCTIONS:\n1. Update the memory with the Recent Actions.\n2. TRANSACTIONAL RECORDING: Only record changes as 'Implemented' if the actions specifically state 'SUCCESSFUL CHANGE'. If you see 'CRITICAL: FAILED' or 'ROLLED BACK', record this as a 'Failed Attempt' with the reason, so the engine knows to try a different approach next time.\n3. BREVITY: Keep the ENTIRE document under 200 words. Be ruthless. Delete old, irrelevant details.\n4. FORMAT: Keep lists strictly to bullet points. No long paragraphs.\n5. Respond EXCLUSIVELY with the raw markdown for MEMORY.md. Do not use ```markdown fences or <THOUGHT> blocks.",
             "RM.md": "You are the PYOB Memory Manager. The current MEMORY.md is too bloated and is breaking the AI context window.\n\n### Bloated Memory:\n{current_memory}\n\n### INSTRUCTIONS:\n1. AGGRESSIVELY COMPRESS this memory. \n2. Delete duplicate information, repetitive logs, and obvious statements.\n3. Keep ONLY the core architectural rules and crucial file dependencies.\n4. The final output MUST BE UNDER 150 WORDS.\n5. Respond EXCLUSIVELY with the raw markdown. No fences, no thoughts.",
             "PP.md": "You are an elite PYOB Software Engineer. Analyze the code for bugs or architectural gaps.\n\n{memory_section}{ruff_section}{mypy_section}{custom_issues_section}### Source Code:\n```{lang_tag}\n{content}\n```\n\n### CRITICAL RULES:\n1. **SURGICAL FIXES**: Every <SEARCH> block must be exactly 2-5 lines.\n2. **NO HALLUCINATIONS**: Do not invent bugs. If the code is functional, state 'The code looks good.'\n3. **ARCHITECTURAL BLOAT**: If 'Code Quality Issues' flags bloat (>800 lines), your Evaluation MUST prioritize identifying which classes or methods can be moved to a new file to restore modularity.\n4. **MISSING IMPORTS**: If you use a new module/type, you MUST add an <EDIT> block to import it at the top.\n5. **INDENTATION IS SYNTAX**: Your <REPLACE> blocks must have perfect, absolute indentation.\n6. **DEFEATING MYPY**: If fixing a `[union-attr]` error, use `assert variable is not None` or `# type: ignore`.\n\n### HOW TO RESPOND (CHOOSE ONE):\n\n**SCENARIO A: Code has bugs/bloat and needs edits:**\n<THOUGHT>\nSummary: ...\nEvaluation: [Address bloat here if flagged]\nImports Required: ...\nAction: I will fix X by doing Y.\n</THOUGHT>\n<EDIT>\n<SEARCH>\nExact lines to replace\n</SEARCH>\n<REPLACE>\nNew lines\n</REPLACE>\n</EDIT>\n\n**SCENARIO B: Code is perfect. NO EDITS NEEDED:**\n<THOUGHT>\nSummary: ...\nEvaluation: ...\nAction: The code looks good. No fixes needed.\n</THOUGHT>",
             "ALF.md": "You are an elite developer fixing syntax errors.\nThe file `{rel_path}` failed validation with these exact errors:\n{err_text}\n\n### Current Code:\n```\n{code}\n```\n\n### Instructions:\n1. Fix the syntax errors (like stray brackets, unexpected tokens, or indentation) using surgical XML edits.\n2. Respond EXCLUSIVELY with a <THOUGHT> block followed by ONE OR MORE <EDIT> blocks.\n3. Ensure your edits perfectly align with the surrounding brackets.",

pyob_launcher.py

@@ -26,9 +26,7 @@ def load_config():
 
     # 2. Models with Warning
     print("\n🤖 Step 2: Model Configuration")
-    print(
-        "⚠️  WARNING: PYOB is optimized for 'gemini-2.5-flash' and 'qwen3-coder:30b'."
-    )
+    print("⚠️  WARNING: PYOB is optimized for 'gemini-2.5-flash' and 'qwen3-coder:30b'.")
     print("   Changing these may result in parsing errors or logic loops.")
 
     g_model = input("\nEnter Gemini Model [default: gemini-2.5-flash]: ").strip()