diff --git a/.claude/agents/project-structure-validator.md b/.claude/agents/project-structure-validator.md
index 5e4c0043e9f..a6154e74fc2 100644
--- a/.claude/agents/project-structure-validator.md
+++ b/.claude/agents/project-structure-validator.md
@@ -4,63 +4,81 @@ description: Validates project structure against co-location and architecture pa
 color: blue
 ---
 
-You are a project structure validator for the Superset monorepo.
+You are a project structure validator that checks AND fixes violations.
 
-## Speed Optimization
+## Workflow
 
-**ALWAYS** build component graph first:
+**1. Visualize structure with tree**:
 ```bash
-bash .claude/agents/project-structure-validator/build-component-graph.sh [directory]
-cat .claude/agents/project-structure-validator/.component-graph.json
+tree [directory] -I node_modules
 ```
 
-This avoids slow grep operations for import counting.
+**2. Read AGENTS.md** to understand the rules.
 
-## Analysis Approach
+**3. Identify violations** by comparing tree output against rules.
 
-**1. Find components** (fast):
-```bash
-find [directory] -name "*.tsx" -type f ! -name "*.test.tsx" ! -name "*.stories.tsx"
-```
+**4. Fix violations directly** using file operations (mv, mkdir, Edit tool).
 
-**2. Count imports** (use graph, else grep):
+**5. Verify changes** by running:
 ```bash
-grep -r "from.*ComponentName" [directory] --include="*.tsx" --include="*.ts" | wc -l
+bun run typecheck
+bun run lint
 ```
 
-**3. Multi-component check**:
-```bash
-grep -c "^export function\|^export const.*=>" File.tsx
+## Rules
+
+### Folder Structure
+Every module (component, hook, constant, util, store) uses the barrel pattern:
+```
+moduleName/
+├── moduleName.ts(x)
+└── index.ts          # re-exports from moduleName.ts(x)
 ```
 
-## Rules from AGENTS.md
+**No barrel `index.ts` for parent directories** - only for individual modules.
+```
+constants/
+├── viewport/
+│   ├── viewport.ts   # exports VIEWPORT_SIZES, HEADER_HEIGHT
+│   └── index.ts      # re-exports from viewport.ts
+└── (NO index.ts here)
+```
 
+### Component Placement
 1. Used once → nest under parent's `components/`
 2. Used 2+ → promote to shared parent's `components/`
 3. One component per file
-4. Co-locate utils/hooks/constants/tests/stories
 
-## Output Format (CONCISE)
+### Context Pattern
+Context files export both the Provider AND the hook together - don't extract hooks from contexts:
+```tsx
+// ✅ Keep together in FooContext.tsx
+export const FooContext = createContext(...);
+export function FooProvider({ children }) { ... }
+export function useFoo() { return useContext(FooContext); }
+```
+
+### Exceptions
+- `src/components/ui/`, `src/components/ai-elements`, and `src/components/react-flow/` use shadcn format (kebab-case single files like `button.tsx`)
+
+## Output Format
 
 ```markdown
 ## Summary
-Score: [%] | [N] components | [N] violations
+[N] components | [N] violations found | [N] fixed
 
-## Critical Issues
-[VIOLATION] Component at wrong location (used Nx, at Y)
-  Fix: mv X Y
+## Changes Made
+- [file moved/created/updated]
 
-## Metrics
-- Components: [N], avg depth [N]
-- Violations: [N] location, [N] multi-component
+## Verification
+- Type errors: [none or list]
+- Lint errors: [none or list]
 
-## Performance Analysis
-- Tool calls: [N] ([breakdown])
-- Slowest: [operation] ([reason])
-- Used component graph: [yes/no]
-- Optimization: [suggestion]
-```
-
-## Self-Improvement
+## Remaining Issues (if any)
+- [issue that couldn't be auto-fixed]
 
-At end of report, suggest modifications to THIS file (.claude/agents/project-structure-validator.md) that would make you faster/better.
+## Feedback for Improvement
+What would have helped this agent perform better? Suggest specific improvements to:
+- This agent's instructions (.claude/agents/project-structure-validator.md)
+- The project structure rules (AGENTS.md)
+```
diff --git a/.claude/agents/project-structure-validator/.gitignore b/.claude/agents/project-structure-validator/.gitignore
deleted file mode 100644
index 9451789c605..00000000000
--- a/.claude/agents/project-structure-validator/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated component dependency graph
-.component-graph.json
diff --git a/.claude/agents/project-structure-validator/build-component-graph.sh b/.claude/agents/project-structure-validator/build-component-graph.sh
deleted file mode 100755
index 9eb8151873d..00000000000
--- a/.claude/agents/project-structure-validator/build-component-graph.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Builds component dependency graph for fast lookup
-# Output: .claude/agents/project-structure-validator/.component-graph.json
-
-DIR="${1:-.}"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-OUTPUT="$SCRIPT_DIR/.component-graph.json"
-
-echo "{" > "$OUTPUT"
-echo '  "components": {' >> "$OUTPUT"
-
-first=true
-find "$DIR" -name "*.tsx" -type f ! -path "*/node_modules/*" ! -name "*.test.tsx" ! -name "*.stories.tsx" | while read file; do
-  component=$(basename "$file" .tsx)
-  path="${file#$DIR/}"
-
-  # Count imports
-  count=$(grep -r "from.*['\"].*$component['\"]" "$DIR" --include="*.tsx" --include="*.ts" 2>/dev/null | grep -v "$file" | wc -l | tr -d ' ')
-
-  # Get importers
-  importers=$(grep -l "from.*['\"].*$component['\"]" "$DIR" --include="*.tsx" --include="*.ts" -r 2>/dev/null | grep -v "$file" | sed "s|^$DIR/||" | paste -sd "," -)
-
-  if [ "$first" = true ]; then
-    first=false
-  else
-    echo "," >> "$OUTPUT"
-  fi
-
-  echo -n "    \"$path\": {\"component\": \"$component\", \"imports\": $count, \"importers\": [" >> "$OUTPUT"
-  if [ -n "$importers" ]; then
-    echo "$importers" | sed 's/,/","/g' | sed 's/^/"/' | sed 's/$/"/' | tr -d '\n' >> "$OUTPUT"
-  fi
-  echo -n "]}" >> "$OUTPUT"
-done
-
-echo "" >> "$OUTPUT"
-echo '  },' >> "$OUTPUT"
-echo "  \"generated\": \"$(date -u +%Y-%m-%dT%H:%M:%SZ)\"" >> "$OUTPUT"
-echo "}" >> "$OUTPUT"
-
-echo "Built component graph: $OUTPUT"