Merge pull request #323 from automagik-dev/main

dev

Author: namastex888

.cargo/config.toml

@@ -18,8 +18,8 @@ rustflags = ["-C", "link-arg=/DEBUG:FASTLINK"]
 rustflags = ["-C", "link-arg=-Wl,-z,max-page-size=16384"]
 
 # ============================================================================
-# DEV-CORE PATCHES - TEMPORARILY DISABLED
-# This section is managed by `make dev-core` and `make dev-core-off`
+# DEV-CORE PATCHES - ENABLED
+# This section is managed by `make dev-core` (auto-disabled by pre-push hook)
 # When uncommented, Cargo uses local forge-core paths instead of crates.io
 # ============================================================================
 # [patch.crates-io]

.claude/settings.json

@@ -0,0 +1,5 @@
+{
+  "enabledPlugins": {
+    "pr-review-toolkit@claude-code-plugins": true
+  }
+}

.genie/code/spells/forge-core-workflow.md

@@ -1,158 +1,92 @@
 ---
 name: forge-core-workflow
-description: Quick reference for correct forge-core development workflow using make dev-core
+description: Quick reference for fully automatic forge-core development workflow
 maturity: stable
 load_priority: high
 ---
 
 # forge-core Development Workflow
 
-**CRITICAL:** NEVER work directly in forge-core repository. ALWAYS use `make dev-core` from automagik-forge.
+**CRITICAL:** ONLY command you need to know: `make dev-core`. Everything else is automatic.
 
-## Pre-Flight Checklist
+## The 3-Step Workflow
 
-Before ANY forge-core work, ask yourself:
+```bash
+# 1. Start dev-core mode
+make dev-core BRANCH=feat/my-feature
+
+# 2. Edit files + commit (from forge root!)
+# Edit files in both repos as needed
+git add . && git commit -m "feat: your changes"
+# → Hooks auto-commit forge-core with same message
+
+# 3. Push (FULLY AUTOMATIC!)
+git push
+# → Hooks auto-push forge-core
+# → Hooks auto-disable patches
+# → Hooks auto-regenerate Cargo.lock
+# → Hooks auto-amend commit
+# → Push proceeds!
+```
 
-1. ❓ Am I in automagik-forge directory? → `pwd` should show `.../automagik-forge`
-2. ❓ Do I have a feature branch in automagik-forge? → `git branch --show-current`
-3. ❓ Is dev-core mode enabled? → `make status` should show "Dev-core: ACTIVE"
+**That's it.** No `make dev-core-off`. No `make push-both`. Just push.
 
-If ANY answer is NO → STOP and follow correct workflow below.
+## What Happens Automatically
 
-## Correct Workflow (Step-by-Step)
+### On `git commit` (from forge root):
+1. `pre-commit` hook stages all forge-core changes
+2. `prepare-commit-msg` hook commits forge-core with same message
+3. Both repos have identical commits
 
-```bash
-# 1. Start from automagik-forge
-cd /home/namastex/workspace/automagik-forge
+### On `git push` (from forge root):
+1. `pre-push` hook pushes forge-core first (if has unpushed commits)
+2. `pre-push` hook disables Cargo [patch] overrides
+3. `pre-push` hook regenerates Cargo.lock with git deps
+4. `pre-push` hook amends commit with config changes
+5. Push proceeds to origin
 
-# 2. Create feature branch in automagik-forge
-git checkout -b feat/my-feature-name
+## Forbidden Actions
 
-# 3. Enable dev-core mode (auto-syncs forge-core to same branch)
-make dev-core
+- ❌ `cd forge-core && git commit` - BLOCKED by hook
+- ❌ `cd forge-core && git push` - BLOCKED by hook
+- ❌ Any git commands inside forge-core directory
 
-# 4. Verify dev-core is active
-make status
-# Expected output:
-#   Dev-core: ACTIVE (Cargo [patch])
-#   forge-core: On branch: feat/my-feature-name
-#   Ready to push: NO (dev-core active, use dev-core-off first)
-
-# 5. Edit forge-core files (changes hot-reload via Cargo [patch])
-# Use your editor to modify files in forge-core/ subdirectory
+## Pre-Flight Checklist
 
-# 6. Test changes
-cargo build          # Builds with local forge-core via [patch]
-cargo test           # Tests with local forge-core
+Before ANY forge-core work:
 
-# 7. Push forge-core changes and create PR
-cd forge-core
-git add .
-git commit -m "feat: your feature description"
-git push origin feat/my-feature-name
-gh pr create --title "feat: your feature" --body "Description"
-cd ..
-
-# 8. Wait for forge-core PR to merge
-# Automation will create tag and dispatch to automagik-forge
-
-# 9. Disable dev-core mode
-make dev-core-off
-
-# 10. Verify clean state
-make status
-# Expected output:
-#   Dev-core: INACTIVE
-#   forge-core: Directory removed
-#   Ready to push: YES
-```
+1. ❓ Am I in automagik-forge directory? → `pwd` should show `.../forge`
+2. ❓ Is dev-core mode enabled? → `make status` shows "Dev-core: ACTIVE"
+3. ❓ Do I have a feature branch? → `git branch --show-current`
 
 ## What `make dev-core` Does
 
-1. **Clones forge-core** to `./forge-core/` subdirectory (if not exists)
-2. **Syncs to your branch** - checks out same branch as automagik-forge (creates if doesn't exist)
-3. **Enables Cargo [patch]** - modifies `.cargo/config.toml` to redirect git dependencies to local paths
-4. **Regenerates Cargo.lock** - updates lockfile to use local paths
-5. **Installs pre-push hook** - blocks accidental pushes from automagik-forge while dev-core active
+1. **Clones forge-core** to `./forge-core/` (if not exists)
+2. **Syncs to your branch** - same branch as automagik-forge
+3. **Enables Cargo [patch]** - redirects git deps to local paths
+4. **Regenerates Cargo.lock** - uses local paths
+5. **Installs hooks** - pre-commit, prepare-commit-msg, pre-push
 
 ## Common Pitfalls
 
-### ❌ WRONG: Creating branch directly in forge-core
+### ❌ WRONG: Working directly in forge-core
 ```bash
 cd forge-core
-git checkout -b feat/my-feature  # ❌ BYPASSES AUTOMATION
-gh pr create                      # ❌ BREAKS VERSION SYNC
+git commit                        # ❌ BLOCKED
+git push                          # ❌ BLOCKED
 ```
 
-**Why wrong:** forge-core PRs bypass the automation chain that syncs versions between repos.
-
-### ❌ WRONG: Working in standalone forge-core clone
+### ✅ CORRECT: All operations from forge root
 ```bash
-cd ~/workspace/forge-core         # ❌ STANDALONE CLONE
-git checkout -b feat/my-feature  # ❌ NOT INTEGRATED
+cd /path/to/forge                 # ✅ ALWAYS from root
+git add . && git commit           # ✅ Hooks sync forge-core
+git push                          # ✅ Hooks handle everything
 ```
 
-**Why wrong:** Changes won't hot-reload in automagik-forge, can't test integration.
-
-### ✅ CORRECT: Using make dev-core workflow
-```bash
-cd ~/workspace/automagik-forge   # ✅ START FROM automagik-forge
-git checkout -b feat/my-feature  # ✅ BRANCH IN automagik-forge FIRST
-make dev-core                     # ✅ AUTO-SYNCS forge-core
-```
-
-**Why correct:** Automation handles branch sync, Cargo [patch] enables hot reload, version sync preserved.
-
-## Why This Workflow Matters
-
-### CI/CD Pipeline
-- automagik-forge PR (labeled 'rc') → triggers `auto-version-bump.yml`
-- auto-version-bump → bumps version → creates commit + tag
-- GitHub Actions → `repository_dispatch` to forge-core
-- forge-core `pre-release.yml` → creates release
-
-**If you bypass this:** Versions desync, releases break, automation fails.
-
-### Integration Testing
-- automagik-forge tests run against forge-core via git dependency
-- `make dev-core` redirects to local path via Cargo [patch]
-- Changes hot-reload without waiting for PR merge
-- Test integration before creating PR
-
-**If you bypass this:** Can't test integration, PRs may break production.
-
-### Version Synchronization
-- Both repos must maintain identical version numbers
-- Automation ensures atomic version bumps across repos
-- Direct forge-core PRs can bump version independently
-- Version mismatch breaks dependency resolution
-
-**If you bypass this:** Cargo can't resolve dependencies, builds fail.
-
-## Emergency Recovery
-
-If you accidentally worked directly in forge-core:
-
-1. **Stop immediately** - don't create more commits
-2. **Close any forge-core PRs** - `gh pr close PR_NUMBER` in forge-core
-3. **Return to automagik-forge** - `cd ~/workspace/automagik-forge`
-4. **Clean up** - `make dev-core-off && rm -rf forge-core`
-5. **Start over** - follow correct workflow above
-
-## Key Files Reference
-
-- `Makefile` (lines 706-815) - dev-core lifecycle implementation
-- `.cargo/config.toml` (lines 21-33) - [patch] section
-- `docs/DUAL_REPO_WORKFLOW.md` - Complete workflow documentation
-- `AGENTS.md` (Amendment #11) - Framework rule documentation
-
-## Documented Violations
-
-**2025-12-05: Direct forge-core PR violation**
-- Created branch `feat/rmcp-0.10.0-upgrade` directly in forge-core
-- Pushed PR #23 directly to forge-core (bypassed automation)
-- Merged PR #26 directly, caused version desync (0.8.8-rc.2 vs 0.8.6-rc.2)
-- Had to manually revert 5 commits and fix version sync
-- **Total violations in one session:** 5 times
+## Key Files
 
-**Lesson learned:** The automation exists for a reason. Use it.
+- `scripts/hooks/pre-commit` - Auto-stages forge-core changes
+- `scripts/hooks/prepare-commit-msg` - Auto-commits forge-core
+- `scripts/hooks/pre-push` - Auto-push + auto-disable patches
+- `docs/DUAL_REPO_WORKFLOW.md` - Complete documentation
+- `AGENTS.md` (Amendment #11) - Framework rule

.github/actions/setup-node/action.yml

@@ -10,10 +10,16 @@ runs:
         node-version: ${{ env.NODE_VERSION }}
         registry-url: 'https://registry.npmjs.org'
 
+    - name: Clean pnpm cache (self-hosted runner fix)
+      shell: bash
+      run: |
+        rm -rf ~/setup-pnpm $HOME/setup-pnpm 2>/dev/null || true
+
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
       with:
-        version: ${{ env.PNPM_VERSION }}
+        standalone: true
+        dest: ~/setup-pnpm
 
     - name: Get pnpm store directory
       shell: bash

.github/workflows/build-all-platforms.yml

@@ -83,7 +83,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: npx-cli/dist/${{ matrix.platform }}
-          key: binaries-${{ matrix.platform }}-${{ matrix.target }}-${{ runner.os }}${{ env.ZIG_SUFFIX }}-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'forge-extensions/**/*.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
+          key: binaries-${{ matrix.platform }}-${{ matrix.target }}-${{ runner.os }}${{ env.ZIG_SUFFIX }}-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
 
       - name: Check if build can be skipped
         id: check-skip
@@ -374,7 +374,7 @@ jobs:
         uses: actions/cache/save@v4
         with:
           path: npx-cli/dist/${{ matrix.platform }}
-          key: binaries-${{ matrix.platform }}-${{ matrix.target }}-${{ runner.os }}${{ env.ZIG_SUFFIX }}-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'forge-extensions/**/*.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
+          key: binaries-${{ matrix.platform }}-${{ matrix.target }}-${{ runner.os }}${{ env.ZIG_SUFFIX }}-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -423,25 +423,25 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: npx-cli/dist/linux-x64
-          key: binaries-linux-x64-x86_64-unknown-linux-gnu-Linux-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'forge-extensions/**/*.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
+          key: binaries-linux-x64-x86_64-unknown-linux-gnu-Linux-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
 
       - name: Restore linux-arm64 cache
         uses: actions/cache/restore@v4
         with:
           path: npx-cli/dist/linux-arm64
-          key: binaries-linux-arm64-aarch64-unknown-linux-gnu-Linux-zig-0.13.0-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'forge-extensions/**/*.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
+          key: binaries-linux-arm64-aarch64-unknown-linux-gnu-Linux-zig-0.13.0-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
 
       - name: Restore windows-x64 cache
         uses: actions/cache/restore@v4
         with:
           path: npx-cli/dist/windows-x64
-          key: binaries-windows-x64-x86_64-pc-windows-msvc-Windows-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'forge-extensions/**/*.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
+          key: binaries-windows-x64-x86_64-pc-windows-msvc-Windows-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
 
       - name: Restore macos-arm64 cache
         uses: actions/cache/restore@v4
         with:
           path: npx-cli/dist/macos-arm64
-          key: binaries-macos-arm64-aarch64-apple-darwin-macOS-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'forge-extensions/**/*.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
+          key: binaries-macos-arm64-aarch64-apple-darwin-macOS-${{ hashFiles('pnpm-lock.yaml', 'Cargo.lock', '**/Cargo.toml', 'forge-app/**/*.rs', 'forge-app/build.rs', 'upstream/crates/**/*.rs', 'upstream/crates/**/Cargo.toml', 'shared/**/*.ts', 'frontend/src/**', 'frontend/public/**', 'frontend/index.html', 'frontend/vite.config.ts', 'frontend/tailwind.config.js', 'frontend/postcss.config.js', 'frontend/tsconfig*.json', 'frontend/package.json') }}
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4

.github/workflows/playwright-e2e.yml

@@ -25,18 +25,14 @@ jobs:
         run: |
           rm -rf "$GITHUB_WORKSPACE"/* "$GITHUB_WORKSPACE"/.[!.]* 2>/dev/null || true
           rm -f .git/index.lock 2>/dev/null || true
+          # Clean pnpm setup directory (self-hosted runner cruft)
+          rm -rf ~/setup-pnpm 2>/dev/null || true
+          # Kill any leftover processes on test port (8887 backend serves frontend in CI)
+          fuser -k 8887/tcp 2>/dev/null || true
 
       - uses: actions/checkout@v4
 
-      - name: Cache cargo
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: cargo-${{ runner.os }}-${{ hashFiles('Cargo.lock') }}
-          restore-keys: cargo-${{ runner.os }}-
+      # Note: No cargo cache needed - self-hosted runner persists ~/.cargo and target/
 
       - name: Setup Node
         uses: ./.github/actions/setup-node