@codeyam/codeyam-cli 0.1.0-staging.28f73cf → 0.1.0-staging.2a88920

package/codeyam-cli/templates/rule-reflection-hook.py

@@ -0,0 +1,160 @@
+#!/usr/bin/env python3
+"""
+Rule reflection hook for Claude Code.
+
+Reads the session transcript to find new conversation since last check,
+then prompts Claude to consider rule updates if there was substantive content.
+"""
+
+import json
+import sys
+from pathlib import Path
+
+MIN_USER_TURNS = 5  # Fire after N user turns
+
+def main():
+    # Read hook input from stdin
+    try:
+        hook_input = json.load(sys.stdin)
+    except json.JSONDecodeError:
+        # No valid input, exit silently
+        return
+
+    session_id = hook_input.get('session_id', '')
+    transcript_path = hook_input.get('transcript_path', '')
+    stop_hook_active = hook_input.get('stop_hook_active', False)
+
+    # Prevent infinite loops - if we're already in a stop hook continuation, exit silently
+    if stop_hook_active:
+        return
+
+    if not session_id or not transcript_path:
+        return
+
+    # Marker file tracks last checked line per session
+    marker_dir = Path('/tmp/claude-rule-markers')
+    marker_dir.mkdir(exist_ok=True)
+    marker_file = marker_dir / f'{session_id}.marker'
+
+    # Read last checked line
+    last_line = 0
+    if marker_file.exists():
+        try:
+            last_line = int(marker_file.read_text().strip())
+        except (ValueError, IOError):
+            last_line = 0
+
+    # Read transcript and get new lines
+    try:
+        with open(transcript_path, 'r') as f:
+            all_lines = f.readlines()
+    except IOError:
+        return
+
+    current_line_count = len(all_lines)
+    new_lines = all_lines[last_line:]
+
+    if not new_lines:
+        return
+
+    # Count user turns and extract conversation content from new lines
+    user_turn_count = 0
+    conversation_snippets = []
+
+    for line in new_lines:
+        try:
+            obj = json.loads(line)
+            msg_type = obj.get('type')
+
+            if msg_type not in ('user', 'assistant'):
+                continue
+
+            message = obj.get('message', {})
+            content = message.get('content', '')
+            is_external_user = msg_type == 'user' and obj.get('userType') == 'external'
+
+            # Handle string content
+            if isinstance(content, str):
+                # Skip meta messages and very short content
+                if obj.get('isMeta') or len(content) < 20:
+                    continue
+                # Skip tool results (they show up as user messages)
+                if content.startswith('[{') or '<tool_result' in content:
+                    continue
+
+                # Count substantive user turns
+                if is_external_user and not content.startswith('<'):
+                    user_turn_count += 1
+
+                conversation_snippets.append({
+                    'role': message.get('role', msg_type),
+                    'content': content[:500]  # Truncate long messages
+                })
+
+            # Handle array content (tool calls, etc.)
+            elif isinstance(content, list):
+                for item in content:
+                    if isinstance(item, dict):
+                        if item.get('type') == 'text':
+                            text = item.get('text', '')
+                            if len(text) > 20:
+                                conversation_snippets.append({
+                                    'role': message.get('role', msg_type),
+                                    'content': text[:500]
+                                })
+        except (json.JSONDecodeError, KeyError):
+            continue
+
+    # Only fire after enough user turns
+    if user_turn_count < MIN_USER_TURNS:
+        return
+
+    # Update marker with current line count
+    marker_file.write_text(str(current_line_count))
+
+    # If not enough substantive conversation, exit silently
+    if len(conversation_snippets) < 3:
+        return
+
+    # Build a summary of the recent conversation for the rule check
+    summary_lines = []
+    for snippet in conversation_snippets[-15:]:  # Last 15 messages
+        role = snippet['role']
+        content = snippet['content'].replace('\n', ' ')[:300]
+        summary_lines.append(f"[{role}]: {content}")
+
+    summary = '\n'.join(summary_lines)
+
+    # Write detailed context to a file (keeps displayed output short)
+    context_file = marker_dir / f'{session_id}.context'
+    context = f"""Recent conversation to review for rule-worthy learnings:
+
+{summary}
+
+---
+Guidelines:
+- Did Claude get confused during this session in any way?
+- How exactly did it get confused and what information would have resolved that confusion. No additional detail is needed especially if it is something that Claude likely already knows.
+- Only update rules for patterns of confusion that will likely recur in future sessions.
+- Document knowledge not easily evident from code
+    - Locations of tests
+    - Commands that can be run that are relevant to the task at hand
+    - Architectural design, where to look for, fix, or add certain things
+- Do not document bugs being fixed as they will likely be resolved.
+- Issues that are abandoned as known issues can be noted.
+- Keep rules concise (<50 lines), use bullets/tables where appropriate.
+- Clean up, summarize, and delete existing rules as needed.
+- If no changes are needed, just say "No rule updates needed."
+"""
+    context_file.write_text(context)
+
+    # Output blocking decision - just trigger background agent
+    # Keep reason minimal since main agent will spawn background worker
+    output = {
+        "decision": "block",
+        "reason": f"RULE_CHECK:{context_file}"
+    }
+    print(json.dumps(output))
+
+if __name__ == '__main__':
+    main()

package/codeyam-cli/templates/rules-instructions.md

@@ -0,0 +1,93 @@
+# Claude Rules Guide
+
+Rules provide context-specific guidance when working in files matching their `paths` patterns.
+
+## Core Principles
+
+1. **One concept per rule** - Each rule should cover a single topic. If you're documenting two unrelated things, create two rules.
+2. **Paths must match content scope** - A rule about one specific file should have that file in `paths`, not a broad `**/*.ts` pattern.
+3. **Be concise** - Every word costs context. Use bullets and tables.
+
+## When to Create a New Rule
+
+Create a new rule when:
+
+- You learn something non-obvious about the codebase
+- You make a mistake and want to prevent it in the future
+- The user explains something that isn't clear from the code
+- An existing rule is covering multiple unrelated topics (split it)
+
+## Path Specificity
+
+The `paths` field controls when the rule is shown. Match the scope of your content:
+
+| Content Scope | Path Pattern            | Example                                                |
+| ------------- | ----------------------- | ------------------------------------------------------ |
+| Single file   | `'path/to/file.ts'`     | Rule about `processExpression.ts` specifically         |
+| Related files | `'path/to/feature*.ts'` | Rule about `generateExecutionFlows*.ts` files          |
+| Directory     | `'path/to/dir/**/*.ts'` | Rule about the queue system in `utils/queue/`          |
+| Cross-cutting | Multiple specific paths | Testing rule with paths to test configs and test files |
+
+**Anti-pattern**: Don't use `'**/*.ts'` for a rule about one specific feature.
+
+## File Structure
+
+Rules mirror the source code structure:
+
+| Source Location      | Rule Location                           |
+| -------------------- | --------------------------------------- |
+| `src/api/auth.ts`    | `.claude/rules/src/api/auth.md`         |
+| `src/utils/queue/**` | `.claude/rules/src/utils/queue.md`      |
+| Test configuration   | `.claude/rules/testing/jest-configs.md` |
+
+## Required Frontmatter
+
+```yaml
+---
+paths:
+  - 'specific/path/to/file.ts'
+  - 'another/specific/path/*.ts'
+category: architecture | testing | faq
+timestamp: 2026-01-30T00:00:00Z
+---
+```
+
+| Field       | Purpose                                                                                            |
+| ----------- | -------------------------------------------------------------------------------------------------- |
+| `paths`     | Glob patterns - be specific to avoid loading rules unnecessarily                                   |
+| `category`  | `architecture` (design/data flow), `testing` (test commands/patterns), `faq` (gotchas/workarounds) |
+| `timestamp` | ISO 8601 - update when rule is reviewed                                                            |
+
+## Content Guidelines
+
+### Be Actionable
+
+- Good: "Run `pnpm test:api` for API tests"
+- Bad: "Make sure to run the appropriate tests"
+
+### Focus on What, Not What Not
+
+- Good: "Auth tokens are stored in httpOnly cookies via `src/auth/cookies.ts`"
+- Bad: "WARNING: Don't store tokens in localStorage!"
+
+### Keep Rules Short
+
+- Target 30-50 lines
+- If a rule exceeds 60 lines, consider splitting it
+
+## Categories
+
+**architecture** - Design decisions, file relationships, data flow
+
+- "These three files must change together because..."
+- "Data flows from X → Y → Z"
+
+**testing** - Test commands, mock patterns, fixtures
+
+- "Run tests with: `pnpm test path/to/test.ts`"
+- "Must run `pnpm pretest` first because..."
+
+**faq** - Gotchas, workarounds, common questions
+
+- "If you see error X, it means Y"
+- "This looks wrong but is intentional because..."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeyam/codeyam-cli",
-  "version": "0.1.0-staging.28f73cf",
+  "version": "0.1.0-staging.2a88920",
   "description": "Local development CLI for CodeYam analysis",
   "type": "module",
   "bin": {
@@ -10,24 +10,24 @@
     "postinstall": "node ./scripts/finalize-analyzer.cjs"
   },
   "dependencies": {
-    "@anthropic-ai/claude-code": "^2.0.22",
+    "@anthropic-ai/claude-code": "^2.0.76",
     "@anthropic-ai/sdk": "^0.71.0",
-    "@aws-sdk/client-dynamodb": "^3.899.0",
-    "@aws-sdk/s3-request-presigner": "^3.899.0",
-    "@aws-sdk/util-dynamodb": "^3.902.0",
-    "@modelcontextprotocol/sdk": "^1.24.0",
+    "@aws-sdk/client-dynamodb": "^3.956.0",
+    "@aws-sdk/s3-request-presigner": "^3.940.0",
+    "@aws-sdk/util-dynamodb": "^3.971.0",
+    "@modelcontextprotocol/sdk": "^1.25.3",
     "@octokit/auth-app": "^8.1.0",
     "@octokit/request": "^10.0.3",
     "@octokit/rest": "^22.0.0",
-    "@react-router/express": "^7.10.1",
-    "@react-router/node": "^7.10.1",
-    "react-router": "^7.10.1",
+    "@react-router/express": "^7.11.0",
+    "@react-router/node": "^7.11.0",
+    "react-router": "^7.12.0",
     "@sendgrid/mail": "^8.1.4",
-    "@supabase/supabase-js": "2.52.1",
+    "@supabase/supabase-js": "2.88.0",
     "better-sqlite3": "^12.4.1",
     "chalk": "^5.6.2",
     "chokidar": "^4.0.3",
-    "cli-spinners": "^3.3.0",
+    "cli-spinners": "^3.4.0",
     "domhandler": "^5.0.3",
     "dotenv": "^17.2.3",
     "express": "^5.2.1",
@@ -35,26 +35,29 @@
     "get-port": "^7.1.0",
     "htmlparser2": "^10.0.0",
     "isbot": "^4",
-    "jsdom": "^27.3.0",
+    "jsdom": "^27.4.0",
     "json5": "^2.2.3",
     "jsonc-parser": "^3.2.1",
     "kysely": "^0.28.5",
     "lru-cache": "^11.2.4",
     "lucide-react": "^0.556.0",
-    "openai": "^6.9.0",
+    "minimatch": "^10.0.1",
+    "openai": "^6.16.0",
     "p-queue": "^8.1.0",
-    "p-retry": "^6.2.1",
+    "p-retry": "^7.1.1",
     "pg": "^8.16.3",
     "piscina": "^5.1.4",
     "pixelmatch": "^5.3.0",
-    "playwright": "^1.56.1",
+    "playwright": "1.58.0",
     "pluralize": "^8.0.0",
     "prompts": "^2.4.2",
-    "react": "~18.2.0",
-    "react-diff-viewer-continued": "^3.4.0",
-    "react-dom": "~18.2.0",
+    "react": "^19.2.3",
+    "react-diff-viewer-continued": "^4.0.6",
+    "react-dom": "^19.2.3",
+    "react-markdown": "^10.1.0",
     "react-resizable": "^3.0.5",
-    "react-syntax-highlighter": "^15.5.13",
+    "react-syntax-highlighter": "^15.6.1",
+    "remark-gfm": "^4.0.1",
     "sharp": "^0.34.5",
     "simple-git": "^3.28.0",
     "typescript": "^5.9.3",

package/packages/ai/index.js

@@ -14,8 +14,7 @@ export { default as generateEntityScenarios } from "./src/lib/generateEntityScen
 export { default as generateEntityScenarioData, generateDataForScenario, } from "./src/lib/generateEntityScenarioData.js";
 export { default as generateChangesEntityScenarios } from "./src/lib/generateChangesEntityScenarios.js";
 export { default as generateChangesEntityScenarioData } from "./src/lib/generateChangesEntityScenarioData.js";
-export { default as generateEntityKeyAttributes } from "./src/lib/generateEntityKeyAttributes.js";
-export { default as generateChangesEntityKeyAttributes } from "./src/lib/generateChangesEntityKeyAttributes.js";
+export { default as generateExecutionFlows } from "./src/lib/generateExecutionFlows.js";
 export { default as guessScenarioDataFromName, } from "./src/lib/guessScenarioDataFromName.js";
 export { default as guessScenarioDataFromDescription, } from "./src/lib/guessScenarioDataFromDescription.js";
 export { default as generateBranchSummary } from "./src/lib/generateBranchSummary.js";
@@ -27,20 +26,23 @@ export { default as describeCodeChange } from "./src/lib/describeCodeChange.js";
 export { default as validateTypeStructure } from "./src/lib/validateTypeStructure.js";
 export { default as validateDataStructure } from "./src/lib/validateDataStructure.js";
 export { default as isolateScopes } from "./src/lib/isolateScopes.js";
-export { default as analyzeScope } from "./src/lib/analyzeScope.js";
+export { default as analyzeScope, destroyWorkerPool, } from "./src/lib/analyzeScope.js";
 export { default as logOrderedMap } from "./src/lib/logOrderedMap.js";
 export { default as splitOutsideParentheses, splitOutsideParenthesesAndArrays, joinParenthesesAndArrays, functionArguments, } from "./src/lib/splitOutsideParentheses.js";
 export { cleanKnownObjectFunctionsFromMapping } from "./src/lib/dataStructure/helpers/cleanKnownObjectFunctions.js";
-export { clearAttributesFromMapping } from "./src/lib/dataStructure/helpers/cleanNonObjectFunctions.js";
+export { clearAttributesFromMapping, removeDuplicateFunctionCalls, } from "./src/lib/dataStructure/helpers/cleanNonObjectFunctions.js";
 export { default as convertDotNotation } from "./src/lib/dataStructure/helpers/convertDotNotation.js";
+export { default as convertTypeAnnotationsToValues } from "./src/lib/dataStructure/helpers/convertTypeAnnotationsToValues.js";
 export { default as cleanOutBoundary } from "./src/lib/cleanOutBoundary.js";
-export { fillInDirectSchemaGapsAndUnknowns } from "./src/lib/dataStructure/helpers/fillInSchemaGapsAndUnknowns.js";
+export { fillInDirectSchemaGapsAndUnknowns, buildSchemaIndexes, } from "./src/lib/dataStructure/helpers/fillInSchemaGapsAndUnknowns.js";
 export { default as deduplicateFunctionSchemas } from "./src/lib/dataStructure/helpers/deduplicateFunctionSchemas.js";
-export { default as gatherRelevantDependentKeyAttributes } from "./src/lib/gatherRelevantDependentKeyAttributes.js";
 export { default as getConditionalUsagesFromCode } from "./src/lib/getConditionalUsagesFromCode.js";
-export { getExternalFunctionCallInfo, getFunctionSignature, getReturnValue, getUsageEquivalencies, getSourceEquivalencies, getEquivalentSignatureVariables, getConditionalUsages, } from "./src/lib/worker/SerializableDataStructure.js";
+export { getExternalFunctionCallInfo, getFunctionSignature, getReturnValue, getUsageEquivalencies, getSourceEquivalencies, getEquivalentSignatureVariables, getConditionalUsages, getConditionalEffects, getCompoundConditionals, getChildBoundaryGatingConditions, getJsxRenderingUsages, } from "./src/lib/worker/SerializableDataStructure.js";
 export { parseJsonSafe } from "./src/lib/parsers/parseJsonSafe.js";
 export { default as completionCall } from "./src/lib/completionCall.js";
+// NOTE: E2E data tracking utilities (e2eDataTracking.ts) are NOT exported here
+// because they use Node.js 'crypto' module which breaks browser builds.
+// Import directly from "../../packages/ai/src/lib/e2eDataTracking.js" when needed in Node.js tests.
 // Wrapper detection
 export { default as detectWrapperRequirements } from "./src/lib/wrapperDetection/detectWrapperRequirements.js";
 export { KNOWN_LIBRARY_HOOKS } from "./src/lib/wrapperDetection/knownLibraryHooks.js";

package/packages/ai/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/ai/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/ai/index.ts"],"names":[],"mappings":"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"}

package/packages/ai/src/lib/analyzeScope.js

@@ -21,11 +21,12 @@ import generateStatementAnalysis from "./generateStatementAnalysis.js";
 import mergeStatements from "./mergeStatements.js";
 import { analyzeScopeWithAst } from "./astScopes.js";
 import { writeFile } from 'fs/promises';
-import { saveEntityStatements } from "../../../../packages/supabase/index.js";
+import { saveEntityStatements } from "../../../../packages/database/index.js";
 import { ScopeDataStructure, } from "./dataStructure/ScopeDataStructure.js";
 import FunctionCallManager from "./dataStructure/equivalencyManagers/FunctionCallManager.js";
 import { ReactFrameworkManager } from "./dataStructure/equivalencyManagers/frameworks/ReactFrameworkManager.js";
 import { JavascriptFrameworkManager } from "./dataStructure/equivalencyManagers/frameworks/JavascriptFrameworkManager.js";
+import { MuiManager } from "./dataStructure/equivalencyManagers/frameworks/MuiManager.js";
 import ParentScopeManager from "./dataStructure/equivalencyManagers/ParentScopeManager.js";
 import Piscina from 'piscina';
 import analyzeScopeWorkerPaths from "./worker/analyzeScopeWorkerPaths.js";
@@ -33,6 +34,7 @@ import { isMainThread } from 'worker_threads';
 import fs from 'fs';
 // Worker pool for offloading analyzeScope to worker threads
 let workerPool = null;
+let workerPoolDestroyed = false;
 /**
  * Check if we're in Node.js main thread
  * Returns true for browser environments (where workers don't apply)
@@ -45,11 +47,42 @@ function getIsMainThread() {
     }
     return isMainThread;
 }
+/**
+ * Destroy the worker pool, freeing its ~2GB heap.
+ * Called after data structure preparation completes (the producing phase transition).
+ * The worker is not needed after this point — subsequent calls to ensureWorkerPool() will throw.
+ */
+export async function destroyWorkerPool() {
+    if (workerPool) {
+        const memBefore = process.memoryUsage();
+        console.log('CodeYam: Destroying worker pool...', {
+            rssBefore: `${Math.round(memBefore.rss / 1024 / 1024)}MB`,
+            heapBefore: `${Math.round(memBefore.heapUsed / 1024 / 1024)}MB`,
+        });
+        await workerPool.destroy();
+        workerPool = null;
+        // Force GC if available to reclaim worker memory faster
+        if (global.gc) {
+            global.gc();
+        }
+        const memAfter = process.memoryUsage();
+        console.log('CodeYam: Worker pool destroyed', {
+            rssAfter: `${Math.round(memAfter.rss / 1024 / 1024)}MB`,
+            heapAfter: `${Math.round(memAfter.heapUsed / 1024 / 1024)}MB`,
+            rssDelta: `${Math.round((memAfter.rss - memBefore.rss) / 1024 / 1024)}MB`,
+        });
+    }
+    workerPoolDestroyed = true;
+}
 /**
  * Lazy initialization of worker pool.
  * Called on first use to ensure environment variables are set.
  */
 function ensureWorkerPool() {
+    if (workerPoolDestroyed) {
+        throw new Error('CodeYam: Worker pool was destroyed (post-producing phase). ' +
+            'analyzeScope should not be called after data structure preparation completes.');
+    }
     if (workerPool !== null)
         return;
     // Only initialize worker pool in Node.js environment
@@ -114,6 +147,16 @@ export async function analyzeScopeLocal({ entity, fileAnalyzer, scope, scopeData
         const allEnvironmentVariables = new Set();
         // Collect conditional usages from all statement analyses
         const allConditionalUsages = {};
+        // Collect conditional effects (setter calls inside conditionals)
+        const allConditionalEffects = [];
+        // Collect compound conditionals (grouped conditions that must all be true)
+        const allCompoundConditionals = [];
+        // Collect derived variables (variables computed from boolean expressions)
+        const allDerivedVariables = {};
+        // Collect child boundary gating conditions across all statements
+        const allChildBoundaryGatingConditions = {};
+        // Collect JSX rendering usages (arrays via .map(), strings via interpolation)
+        const allJsxRenderingUsages = [];
         const astAnalysisResultWithStatements = statementScopes.map((statementScope) => {
             const astAnalysisResult = analyzeScopeWithAst(fileAnalyzer, statementScope);
             // Collect environment variables from AST analysis
@@ -125,6 +168,33 @@ export async function analyzeScopeLocal({ entity, fileAnalyzer, scope, scopeData
                 }
                 allConditionalUsages[path].push(...usages);
             }
+            // Collect conditional effects from AST analysis
+            if (astAnalysisResult.conditionalEffects?.length > 0) {
+                allConditionalEffects.push(...astAnalysisResult.conditionalEffects);
+            }
+            // Collect compound conditionals from AST analysis
+            if (astAnalysisResult.compoundConditionals?.length > 0) {
+                allCompoundConditionals.push(...astAnalysisResult.compoundConditionals);
+            }
+            // Collect derived variables from AST analysis
+            if (astAnalysisResult.derivedVariables) {
+                for (const [varName, derivationInfo] of Object.entries(astAnalysisResult.derivedVariables)) {
+                    allDerivedVariables[varName] = derivationInfo;
+                }
+            }
+            // Collect child boundary gating conditions from AST analysis
+            if (astAnalysisResult.childBoundaryGatingConditions) {
+                for (const [childName, usages] of Object.entries(astAnalysisResult.childBoundaryGatingConditions)) {
+                    if (!allChildBoundaryGatingConditions[childName]) {
+                        allChildBoundaryGatingConditions[childName] = [];
+                    }
+                    allChildBoundaryGatingConditions[childName].push(...usages);
+                }
+            }
+            // Collect JSX rendering usages from AST analysis
+            if (astAnalysisResult.jsxRenderingUsages?.length) {
+                allJsxRenderingUsages.push(...astAnalysisResult.jsxRenderingUsages);
+            }
             return {
                 statementScope,
                 astAnalysisResult,
@@ -174,8 +244,23 @@ export async function analyzeScopeLocal({ entity, fileAnalyzer, scope, scopeData
                 const sortedEntries = Object.entries(relevantChildScopes).sort(([_a, aScope], [_b, bScope]) => {
                     return bScope.end - bScope.start - (aScope.end - aScope.start);
                 });
+                // DEBUG: Log child scope replacement context for fetcher statements
+                if (statementScope.text.includes('Fetcher') ||
+                    statementScope.text.includes('fetcher')) {
+                    console.log('CodeYam DEBUG childScope replacement:', JSON.stringify({
+                        statementText: statementScope.text.slice(0, 80),
+                        statementStart: statementScope.start,
+                        statementEnd: statementScope.end,
+                        childBoundaries: statementScope.childBoundaries,
+                        relevantChildScopes: Object.keys(relevantChildScopes),
+                        astStructure: astAnalysisResult.structure,
+                        astEquivalentVariables: astAnalysisResult.equivalentVariables,
+                        astIsComplete: astAnalysisResult.isComplete,
+                        equivalentVariables,
+                    }, null, 2));
+                }
                 for (const mapping of [structure, equivalentVariables]) {
-                    for (let [key, value] of Object.entries(mapping)) {
+                    for (let [key, rawValue] of Object.entries(mapping)) {
                         for (const [childScopeId, childScope] of sortedEntries) {
                             const scopeText = fileAnalyzer.sourceFile.text.slice(childScope.start, childScope.end);
                             const replaceChildScopeId = (text) => {
@@ -190,9 +275,35 @@ export async function analyzeScopeLocal({ entity, fileAnalyzer, scope, scopeData
                                 }
                                 return text;
                             };
-                            if (value.includes(scopeText)) {
-                                value = replaceChildScopeId(value);
-                                mapping[key] = value;
+                            // Handle both string and string[] values (for OR expressions)
+                            const processValue = (value) => {
+                                if (value.includes(scopeText)) {
+                                    // DEBUG: Log when replacement happens
+                                    if (key.includes('Fetcher') || key.includes('fetcher')) {
+                                        console.log('CodeYam DEBUG value replacement:', JSON.stringify({
+                                            key,
+                                            oldValue: value,
+                                            childScopeId,
+                                            scopeTextPreview: scopeText.slice(0, 50),
+                                        }));
+                                    }
+                                    return replaceChildScopeId(value);
+                                }
+                                return value;
+                            };
+                            if (Array.isArray(rawValue)) {
+                                const newValues = rawValue.map(processValue);
+                                mapping[key] =
+                                    newValues;
+                                rawValue = newValues;
+                            }
+                            else if (typeof rawValue === 'string') {
+                                const newValue = processValue(rawValue);
+                                if (newValue !== rawValue) {
+                                    mapping[key] =
+                                        newValue;
+                                    rawValue = newValue;
+                                }
                             }
                             if (key.includes(scopeText)) {
                                 const oldKey = key;
@@ -309,16 +420,76 @@ export async function analyzeScopeLocal({ entity, fileAnalyzer, scope, scopeData
                 new FunctionCallManager(),
                 new ReactFrameworkManager(),
                 new JavascriptFrameworkManager(),
+                new MuiManager(),
                 new ParentScopeManager(),
             ], scope.name, scope.text, scopeAnalysis);
         }
         else {
             scopeDataStructure.addScopeAnalysis(scope.name, scope.text, scopeAnalysis, parentScopeName, scope.isStatic);
         }
+        // Enrich conditional usages with derived variable info
+        // This must happen after all statements are processed so derived variables from
+        // earlier statements can be used to enrich usages from later statements
+        if (Object.keys(allDerivedVariables).length > 0) {
+            for (const [path, usages] of Object.entries(allConditionalUsages)) {
+                for (const usage of usages) {
+                    if (!usage.derivedFrom && allDerivedVariables[path]) {
+                        usage.derivedFrom = allDerivedVariables[path];
+                    }
+                }
+            }
+        }
         // Add conditional usages from this scope's analysis
         if (Object.keys(allConditionalUsages).length > 0) {
             scopeDataStructure.addConditionalUsages(allConditionalUsages);
         }
+        // Add conditional effects from this scope's analysis
+        if (allConditionalEffects.length > 0) {
+            scopeDataStructure.addConditionalEffects(allConditionalEffects);
+        }
+        // Add compound conditionals from this scope's analysis
+        if (allCompoundConditionals.length > 0) {
+            scopeDataStructure.addCompoundConditionals(allCompoundConditionals);
+        }
+        // Merge extracted gating conditions from JSX extraction (processJSXForScope)
+        // These were detected BEFORE JSX was simplified, so they have the full context
+        if (scope.extractedGatingConditions) {
+            for (const [childName, conditions] of Object.entries(scope.extractedGatingConditions)) {
+                if (!allChildBoundaryGatingConditions[childName]) {
+                    allChildBoundaryGatingConditions[childName] = [];
+                }
+                for (const condition of conditions) {
+                    // Convert to full ConditionalUsage format
+                    allChildBoundaryGatingConditions[childName].push({
+                        path: condition.path,
+                        conditionType: condition.conditionType,
+                        location: condition.location,
+                        isNegated: condition.isNegated,
+                        controlsJsxRendering: true,
+                    });
+                }
+            }
+        }
+        // Enrich child boundary gating conditions with derived variable info
+        // This must happen after all statements are processed so derived variables from
+        // earlier statements can be used to enrich gating conditions from later statements
+        if (Object.keys(allDerivedVariables).length > 0) {
+            for (const [_childName, conditions] of Object.entries(allChildBoundaryGatingConditions)) {
+                for (const condition of conditions) {
+                    if (!condition.derivedFrom && allDerivedVariables[condition.path]) {
+                        condition.derivedFrom = allDerivedVariables[condition.path];
+                    }
+                }
+            }
+        }
+        // Add child boundary gating conditions from this scope's analysis
+        if (Object.keys(allChildBoundaryGatingConditions).length > 0) {
+            scopeDataStructure.addChildBoundaryGatingConditions(allChildBoundaryGatingConditions);
+        }
+        // Add JSX rendering usages from this scope's analysis
+        if (allJsxRenderingUsages.length > 0) {
+            scopeDataStructure.addJsxRenderingUsages(allJsxRenderingUsages);
+        }
         await Promise.all(Object.values(scope.childScopes).map(async (childScope) => {
             // This is awkward but need to identify class scopes
             if (Object.values(isolatedStructure).some((val) => val === 'class')) {
@@ -376,6 +547,7 @@ export default async function analyzeScope(args) {
                 end: scope.end,
                 variables: scope.variables,
                 childScopes: scope.childScopes,
+                extractedGatingConditions: scope.extractedGatingConditions,
             },
             model: args.model,
         };