diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 065f1e3..2250848 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -64,7 +64,7 @@
       "description": "A Model Context Protocol (MCP) server for Grafana providing access to dashboards, datasources, and querying capabilities",
       "source": {
         "source": "github",
-        "repo": "amondnet/grafana-plugin"
+        "repo": "amondnet/mcp-grafana"
       }
     }
   ]
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 5932d9f..5c2f17f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,8 +3,12 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/plugins/code-review" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/plugins/firebase" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/plugins/flutter" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/plugins/grafana" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/plugins/nanobanana" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/plugins/postgres" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/plugins/security" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/plugins/spec-kit" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/CLAUDE.md b/CLAUDE.md
index deab78f..411cdc1 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -83,19 +83,19 @@ The marketplace website is built with:
 cd apps/web
 
 # Install dependencies
-npm install
+bun install
 
 # Development server
-npm run dev
+bun run dev
 
 # Build for production
-npm run build
+bun run build
 
 # Preview production build
-npm run preview
+bun run preview
 
 # Generate static site
-npm run generate
+bun run generate
 ```
 
 ### Plugin Development
@@ -134,10 +134,10 @@ Users can add this marketplace and install plugins:
 ```bash
 # For plugins with tests
 cd plugins/<plugin-name>
-npm run test
+bun run test
 
 # Type checking across plugins
-npm run typecheck
+bun run typecheck
 ```
 
 ## Key Files
diff --git a/apps/web/app/components/InstallModal.vue b/apps/web/app/components/InstallModal.vue
index d1992b1..f4cb8f9 100644
--- a/apps/web/app/components/InstallModal.vue
+++ b/apps/web/app/components/InstallModal.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 interface Props {
   pluginName: string
+  marketplaceJsonName?: string
+  marketplaceRepo?: string
   open?: boolean
 }
 
@@ -19,8 +21,19 @@ const isOpen = computed({
   set: value => emit('update:open', value),
 })
 
-const marketplaceCommand = '/plugin marketplace add pleaseai/claude-code-plugins'
-const installCommand = computed(() => `/plugin install ${props.pluginName}@pleaseai`)
+// Determine marketplace command and install command based on marketplace info
+const marketplaceCommand = computed(() => {
+  // Use org/repo format for marketplace add
+  const repo = props.marketplaceRepo || 'pleaseai/claude-code-plugins'
+  return `/plugin marketplace add ${repo}`
+})
+
+const installCommand = computed(() => {
+  // Use pluginName@marketplaceJsonName format for plugin install
+  // marketplaceJsonName comes from the "name" field in marketplace.json
+  const marketplaceJsonName = props.marketplaceJsonName || 'claude-code-plugins'
+  return `/plugin install ${props.pluginName}@${marketplaceJsonName}`
+})
 
 const copiedStates = reactive({
   marketplace: false,
@@ -74,7 +87,7 @@ async function copyCommand(command: string, type: keyof typeof copiedStates) {
 }
 
 async function copyAllCommands() {
-  const allCommands = `${marketplaceCommand}\n${installCommand.value}`
+  const allCommands = `${marketplaceCommand.value}\n${installCommand.value}`
 
   try {
     // Check if clipboard API is available
@@ -92,7 +105,7 @@ async function copyAllCommands() {
   catch (err) {
     // Log error with full context for debugging
     console.error('Failed to copy all commands to clipboard:', {
-      marketplaceCommand,
+      marketplaceCommand: marketplaceCommand.value,
       installCommand: installCommand.value,
       error: err instanceof Error ? err.message : String(err),
       clipboardAvailable: isClipboardSupported.value,
diff --git a/apps/web/app/components/PluginCard.vue b/apps/web/app/components/PluginCard.vue
index 395ce6a..427a8ad 100644
--- a/apps/web/app/components/PluginCard.vue
+++ b/apps/web/app/components/PluginCard.vue
@@ -10,8 +10,10 @@ interface Plugin {
   name: string
   description: string
   version?: string
-  author?: string
-  source: PluginSource
+  author?: string | { name?: string, email?: string }
+  source: PluginSource | string
+  marketplaceRepo?: string
+  marketplaceJsonName?: string
 }
 
 interface PluginMetadata {
@@ -35,13 +37,19 @@ const isModalOpen = ref(false)
 const pluginMetadata = ref<PluginMetadata | null>(null)
 const loading = ref(false)
 
-// Fetch plugin metadata from GitHub
+// Fetch plugin metadata from GitHub (only for plugins without version in marketplace.json)
 async function fetchPluginMetadata() {
+  // If version already exists in marketplace.json, don't fetch
   if (props.plugin.version) {
-    // If version already exists in marketplace.json, don't fetch
     return
   }
 
+  // Local plugins should have metadata in marketplace.json - skip fetch
+  if (typeof props.plugin.source === 'string') {
+    return
+  }
+
+  // GitHub plugin - fetch from GitHub
   loading.value = true
   try {
     const url = `https://raw.githubusercontent.com/${props.plugin.source.repo}/main/.claude-plugin/plugin.json`
@@ -104,8 +112,22 @@ const displayDescription = computed(() => {
 
 // Extract author name from either marketplace.json or fetched metadata
 // Handles both string and object formats
-function getAuthorName(author: string | { name?: string } | undefined): string | undefined {
-  return typeof author === 'string' ? author : author?.name
+// If author email is @anthropic.com, display "Anthropic" instead of individual name
+function getAuthorName(author: string | { name?: string, email?: string } | undefined): string | undefined {
+  if (!author)
+    return undefined
+
+  // Handle string format
+  if (typeof author === 'string') {
+    return author
+  }
+
+  // Handle object format - check email domain
+  if (author.email?.endsWith('@anthropic.com')) {
+    return 'Anthropic'
+  }
+
+  return author.name
 }
 
 // Computed author - prefer marketplace.json, fallback to metadata
@@ -129,6 +151,27 @@ const hasContext = computed(() => {
   return !!pluginMetadata.value?.contextFileName
 })
 
+// Computed GitHub source URL
+const githubSourceUrl = computed(() => {
+  if (typeof props.plugin.source === 'string') {
+    // Local plugin - construct GitHub URL from marketplace repository
+    if (!props.plugin.marketplaceRepo) {
+      console.warn(`[PluginCard] No marketplace repository for local plugin: ${props.plugin.name}`)
+      return undefined
+    }
+
+    // marketplaceRepo is already in "org/repo" format
+    const repoPath = props.plugin.marketplaceRepo
+    // Convert local path to GitHub tree path (e.g., "./plugins/agent-sdk-dev" -> "tree/main/plugins/agent-sdk-dev")
+    const treePath = props.plugin.source.replace(/^\.\//, 'tree/main/')
+    const url = `https://github.com/${repoPath}/${treePath}`
+
+    return url
+  }
+  // GitHub plugin
+  return `https://github.com/${props.plugin.source.repo}`
+})
+
 // Consolidated badges configuration
 interface Badge {
   key: string
@@ -141,6 +184,18 @@ interface Badge {
 const badges = computed<Badge[]>(() => {
   const badgeList: Badge[] = []
 
+  // Marketplace badge (shown first)
+  if (props.plugin.marketplaceJsonName) {
+    const isOfficial = props.plugin.marketplaceJsonName === 'anthropic'
+    badgeList.push({
+      key: 'marketplace',
+      icon: isOfficial ? 'i-heroicons-shield-check' : 'i-heroicons-building-storefront',
+      label: props.plugin.marketplaceJsonName,
+      color: isOfficial ? 'primary' : 'success',
+      title: `From ${props.plugin.marketplaceJsonName} marketplace`,
+    })
+  }
+
   // Author badges
   if (displayAuthor.value === 'Google') {
     badgeList.push({
@@ -232,7 +287,7 @@ watch(() => props.autoOpenModal, (shouldOpen) => {
             </div>
             <div class="flex items-center gap-2 text-xs text-muted">
               <UIcon name="i-heroicons-code-bracket" class="shrink-0" />
-              <span class="truncate">{{ plugin.source.repo }}</span>
+              <span class="truncate">{{ typeof plugin.source === 'string' ? plugin.source : plugin.source.repo }}</span>
             </div>
           </div>
           <div class="shrink-0">
@@ -277,7 +332,7 @@ watch(() => props.autoOpenModal, (shouldOpen) => {
 
       <!-- Metadata -->
       <div v-if="displayAuthor || displayLicense" class="flex flex-wrap gap-2 text-xs">
-        <div v-if="displayAuthor" class="flex items-center gap-1 text-muted">
+        <div v-if="displayAuthor && displayAuthor !== 'Anthropic' && displayAuthor !== 'Google'" class="flex items-center gap-1 text-muted">
           <UIcon name="i-heroicons-user-circle" class="shrink-0" />
           <span>{{ displayAuthor }}</span>
         </div>
@@ -291,7 +346,8 @@ watch(() => props.autoOpenModal, (shouldOpen) => {
     <template #footer>
       <div class="flex flex-col sm:flex-row items-stretch sm:items-center gap-2">
         <UButton
-          :to="`https://github.com/${plugin.source.repo}`"
+          v-if="githubSourceUrl"
+          :to="githubSourceUrl"
           target="_blank"
           external
           variant="outline"
@@ -307,7 +363,7 @@ watch(() => props.autoOpenModal, (shouldOpen) => {
           color="primary"
           size="sm"
           icon="i-heroicons-arrow-down-tray"
-          class="flex-1 justify-center"
+          :class="githubSourceUrl ? 'flex-1 justify-center' : 'w-full justify-center'"
           title="View installation instructions"
           @click="openInstallModal"
         >
@@ -321,5 +377,7 @@ watch(() => props.autoOpenModal, (shouldOpen) => {
   <InstallModal
     v-model:open="isModalOpen"
     :plugin-name="plugin.name"
+    :marketplace-json-name="plugin.marketplaceJsonName"
+    :marketplace-repo="plugin.marketplaceRepo"
   />
 </template>
diff --git a/apps/web/app/pages/index.vue b/apps/web/app/pages/index.vue
index ca56894..dd6796a 100644
--- a/apps/web/app/pages/index.vue
+++ b/apps/web/app/pages/index.vue
@@ -1,31 +1,9 @@
 <script setup lang="ts">
+import type { AggregatedPlugin, MarketplaceAPIResponse, Plugin } from '~/types/marketplace'
 import { useTimeoutFn } from '@vueuse/core'
 
-interface PluginSource {
-  source: 'github'
-  repo: string
-}
-
-interface Plugin {
-  name: string
-  description: string
-  version?: string
-  author?: string
-  source: PluginSource
-}
-
-interface MarketplaceData {
-  name: string
-  version: string
-  description: string
-  owner: {
-    name: string
-    email: string
-  }
-  plugins: Plugin[]
-}
-
 const searchQuery = ref('')
+const selectedMarketplace = ref<string | null>(null) // Filter by marketplace.json name
 const route = useRoute()
 const router = useRouter()
 const toast = useToast()
@@ -57,18 +35,42 @@ const targetPluginName = computed(() => {
   return undefined
 })
 
-// Fetch marketplace data
-const { data: marketplaceData, pending, error } = await useAsyncData<MarketplaceData>(
-  'marketplace',
-  () => queryCollection('marketplace').first(),
-)
+// Fetch marketplace data from API
+const { data: apiData, pending, error } = await useFetch<MarketplaceAPIResponse>('/api/marketplaces')
+
+// Aggregate all plugins from all marketplaces
+const allPlugins = computed(() => {
+  if (!apiData.value)
+    return []
+
+  return apiData.value.marketplaces.flatMap(m =>
+    m.plugins.map(plugin => ({
+      ...plugin,
+      marketplaceRepo: m.repo,
+    })),
+  )
+})
+
+// Marketplace filter options
+const marketplaceOptions = computed(() => {
+  if (!apiData.value)
+    return []
+
+  return [
+    { label: 'All Marketplaces', value: null },
+    ...apiData.value.marketplaces.map(m => ({
+      label: `${m.marketplaceJsonName} (${m.pluginCount})`, // Use name from marketplace.json
+      value: m.marketplaceJsonName,
+    })),
+  ]
+})
 
 // Check if plugin matches search query
 function pluginMatchesSearch(plugin: Plugin, query: string): boolean {
   const searchFields = [
     plugin.name,
     plugin.description,
-    plugin.source.repo,
+    typeof plugin.source === 'string' ? plugin.source : plugin.source.repo,
   ]
 
   return searchFields.some(field =>
@@ -76,20 +78,26 @@ function pluginMatchesSearch(plugin: Plugin, query: string): boolean {
   )
 }
 
-// Filter plugins based on search query
+// Filter plugins based on search query and marketplace selection
 const filteredPlugins = computed(() => {
-  if (!marketplaceData.value?.plugins)
-    return []
+  let plugins = allPlugins.value
 
-  const query = searchQuery.value.toLowerCase().trim()
+  // Filter by marketplace
+  if (selectedMarketplace.value) {
+    plugins = plugins.filter(plugin =>
+      (plugin as AggregatedPlugin).marketplaceJsonName === selectedMarketplace.value,
+    )
+  }
 
-  if (!query) {
-    return marketplaceData.value.plugins
+  // Filter by search query
+  const query = searchQuery.value.toLowerCase().trim()
+  if (query) {
+    plugins = plugins.filter(plugin =>
+      pluginMatchesSearch(plugin, query),
+    )
   }
 
-  return marketplaceData.value.plugins.filter(plugin =>
-    pluginMatchesSearch(plugin, query),
-  )
+  return plugins
 })
 
 // Store plugin card refs for scrolling
@@ -138,7 +146,7 @@ watch([() => targetPluginName.value, pending], ([pluginName, isLoading]) => {
     return
 
   // Check if plugin exists in the data first
-  const pluginExists = marketplaceData.value?.plugins?.some(p => p.name === pluginName)
+  const pluginExists = allPlugins.value.some(p => p.name === pluginName)
 
   if (!pluginExists) {
     // Plugin doesn't exist in marketplace data
@@ -240,14 +248,26 @@ useHead({
 
     <!-- Main Content -->
     <UContainer class="py-12">
-      <!-- Search Bar -->
-      <div class="mb-8 max-w-2xl mx-auto">
+      <!-- Search Bar and Filters -->
+      <div class="mb-8 max-w-2xl mx-auto space-y-4">
         <PluginSearch v-model="searchQuery" :filtered-count="filteredPlugins.length" />
+
+        <!-- Marketplace Filter -->
+        <div v-if="marketplaceOptions.length > 0" class="flex items-center gap-2">
+          <label class="text-sm font-medium text-muted">Filter by Marketplace:</label>
+          <USelectMenu
+            v-model="selectedMarketplace"
+            :items="marketplaceOptions"
+            value-key="value"
+            placeholder="All Marketplaces"
+            class="w-64"
+          />
+        </div>
       </div>
 
       <!-- Disclaimer Alert -->
       <UAlert
-        v-if="marketplaceData"
+        v-if="apiData"
         icon="i-heroicons-information-circle"
         color="blue"
         variant="soft"
@@ -307,18 +327,18 @@ useHead({
     </UContainer>
 
     <!-- Footer Section -->
-    <UContainer v-if="marketplaceData" class="py-12 border-t border-default">
+    <UContainer v-if="apiData" class="py-12 border-t border-default">
       <div class="text-center">
         <p class="text-sm text-muted mb-2">
-          Marketplace maintained by <span class="font-semibold">{{ marketplaceData.owner.name }}</span>
+          Marketplace maintained by <span class="font-semibold">Passion Factory</span>
         </p>
         <UButton
-          :to="`mailto:${marketplaceData.owner.email}`"
+          to="mailto:support@passionfactory.ai"
           variant="ghost"
           size="sm"
           icon="i-heroicons-envelope"
         >
-          {{ marketplaceData.owner.email }}
+          support@passionfactory.ai
         </UButton>
       </div>
     </UContainer>
diff --git a/apps/web/app/types/marketplace.ts b/apps/web/app/types/marketplace.ts
new file mode 100644
index 0000000..154e455
--- /dev/null
+++ b/apps/web/app/types/marketplace.ts
@@ -0,0 +1,58 @@
+/**
+ * Multi-marketplace support types
+ */
+
+export interface MarketplaceSource {
+  name: string
+  description: string
+  url: string
+  repo: string
+  enabled: boolean
+  priority: number
+}
+
+export interface PluginSource {
+  source: 'github'
+  repo: string
+}
+
+export interface Plugin {
+  name: string
+  description: string
+  version?: string
+  author?: string | { name?: string, email?: string }
+  category?: string
+  source: PluginSource | string
+}
+
+export interface Marketplace {
+  name: string
+  version: string
+  description: string
+  homepage?: string
+  repository?: string
+  owner: {
+    name: string
+    email: string
+  }
+  plugins: Plugin[]
+}
+
+export interface AggregatedPlugin extends Plugin {
+  marketplaceRepo: string
+  marketplaceJsonName: string
+}
+
+export interface AggregatedMarketplace {
+  name: string
+  description: string
+  repo: string
+  marketplaceJsonName: string
+  pluginCount: number
+  plugins: AggregatedPlugin[]
+}
+
+export interface MarketplaceAPIResponse {
+  marketplaces: AggregatedMarketplace[]
+  totalPlugins: number
+}
diff --git a/apps/web/content.config.ts b/apps/web/content.config.ts
index a68e175..22b55af 100644
--- a/apps/web/content.config.ts
+++ b/apps/web/content.config.ts
@@ -14,6 +14,8 @@ export default defineContentConfig({
         name: z.string(),
         version: z.string(),
         description: z.string(),
+        homepage: z.string().optional(),
+        repository: z.string().optional(),
         owner: z.object({
           name: z.string(),
           email: z.string(),
@@ -23,11 +25,21 @@ export default defineContentConfig({
             name: z.string(),
             description: z.string(),
             version: z.string().optional(),
-            author: z.string().optional(),
-            source: z.object({
-              source: z.literal('github'),
-              repo: z.string(),
-            }),
+            author: z.union([
+              z.string(),
+              z.object({
+                name: z.string().optional(),
+                email: z.string().optional(),
+              }),
+            ]).optional(),
+            category: z.string().optional(),
+            source: z.union([
+              z.object({
+                source: z.literal('github'),
+                repo: z.string(),
+              }),
+              z.string(),
+            ]),
           }),
         ),
       }),
diff --git a/apps/web/marketplace-sources.json b/apps/web/marketplace-sources.json
new file mode 100644
index 0000000..a2da8db
--- /dev/null
+++ b/apps/web/marketplace-sources.json
@@ -0,0 +1,20 @@
+{
+  "sources": [
+    {
+      "name": "pleaseai",
+      "description": "Community-contributed plugins from PleaseAI",
+      "url": "https://raw.githubusercontent.com/pleaseai/claude-code-plugins/main/.claude-plugin/marketplace.json",
+      "repo": "pleaseai/claude-code-plugins",
+      "enabled": true,
+      "priority": 1
+    },
+    {
+      "name": "claude-code-plugins",
+      "description": "Bundled plugins for Claude Code including Agent SDK development tools, PR review toolkit, and commit workflows",
+      "url": "https://raw.githubusercontent.com/anthropics/claude-code/main/.claude-plugin/marketplace.json",
+      "repo": "anthropics/claude-code",
+      "enabled": true,
+      "priority": 2
+    }
+  ]
+}
diff --git a/apps/web/package.json b/apps/web/package.json
index 4c579e0..43b7228 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -23,8 +23,8 @@
     "vue": "^3.5.22",
     "vue-router": "^4.5.1"
   },
-
   "devDependencies": {
+    "@iconify-json/heroicons": "^1.2.3",
     "@nuxt/devtools": "latest",
     "@nuxt/eslint": "^1.9.0",
     "@nuxt/test-utils": "3.19.2",
diff --git a/apps/web/server/api/marketplaces.get.ts b/apps/web/server/api/marketplaces.get.ts
new file mode 100644
index 0000000..d4d3d85
--- /dev/null
+++ b/apps/web/server/api/marketplaces.get.ts
@@ -0,0 +1,123 @@
+import type { AggregatedMarketplace, AggregatedPlugin, MarketplaceAPIResponse, MarketplaceSource } from '~/types/marketplace'
+import { readFile } from 'node:fs/promises'
+import { resolve } from 'node:path'
+import process from 'node:process'
+import { marketplaceSchema, marketplaceSourcesConfigSchema } from '../utils/marketplace-schema'
+
+/**
+ * Fetch and aggregate multiple marketplaces
+ * Uses Nuxt's built-in caching with 5-minute TTL
+ */
+const fetchMarketplaces = defineCachedFunction(
+  async (): Promise<MarketplaceAPIResponse> => {
+    // Load marketplace sources configuration
+    // Resolve path relative to the web app root
+    const configPath = resolve(process.cwd(), 'marketplace-sources.json')
+    const configData = await readFile(configPath, 'utf-8')
+    const parsedConfig = JSON.parse(configData)
+
+    // Validate configuration with Zod
+    const validatedConfig = marketplaceSourcesConfigSchema.parse(parsedConfig)
+    const enabledSources = validatedConfig.sources
+      .filter(s => s.enabled)
+      .sort((a, b) => a.priority - b.priority)
+
+    // Fetch all marketplaces in parallel
+    const results = await Promise.allSettled(
+      enabledSources.map(async (source: MarketplaceSource) => {
+        try {
+          // Fetch as text first, then parse manually
+          // This handles GitHub raw URLs more reliably
+          const rawResponse = await $fetch<string>(source.url, {
+            responseType: 'text',
+          })
+
+          // Parse JSON manually
+          const response = JSON.parse(rawResponse)
+
+          // Validate marketplace data with Zod
+          const validatedMarketplace = marketplaceSchema.parse(response)
+
+          // Transform plugins to include marketplace metadata
+          const plugins: AggregatedPlugin[] = validatedMarketplace.plugins.map(plugin => ({
+            ...plugin,
+            marketplaceRepo: source.repo,
+            marketplaceJsonName: validatedMarketplace.name,
+          }))
+
+          return {
+            name: source.name,
+            description: source.description,
+            repo: source.repo,
+            marketplaceJsonName: validatedMarketplace.name,
+            pluginCount: plugins.length,
+            plugins,
+          }
+        }
+        catch (error) {
+          console.error(`Failed to fetch marketplace ${source.name}:`, error)
+          throw error
+        }
+      }),
+    )
+
+    // Filter successful results
+    const marketplaces: AggregatedMarketplace[] = results
+      .filter((r): r is PromiseFulfilledResult<AggregatedMarketplace> =>
+        r.status === 'fulfilled',
+      )
+      .map(r => r.value)
+
+    // Log failed marketplaces with details
+    const failedResults = results.filter((r): r is PromiseRejectedResult => r.status === 'rejected')
+    if (failedResults.length > 0) {
+      console.warn(`Failed to load ${failedResults.length} marketplace(s)`)
+      failedResults.forEach((result, index) => {
+        const source = enabledSources[index]
+        if (source) {
+          console.error(`Failed marketplace: ${source.name} (${source.url})`, result.reason)
+        }
+      })
+    }
+
+    // If all marketplaces failed, throw a more informative error
+    if (marketplaces.length === 0) {
+      console.error('All marketplace fetches failed')
+      throw new Error('All marketplace sources are currently unavailable')
+    }
+
+    // Calculate total plugins
+    const totalPlugins = marketplaces.reduce((sum, m) => sum + m.pluginCount, 0)
+
+    return {
+      marketplaces,
+      totalPlugins,
+    }
+  },
+  {
+    maxAge: 60 * 5, // 5 minutes cache
+    name: 'marketplaces',
+    getKey: () => 'all',
+  },
+)
+
+export default defineEventHandler(async () => {
+  try {
+    return await fetchMarketplaces()
+  }
+  catch (error) {
+    console.error('Error fetching marketplaces:', error)
+
+    // Provide more specific error messages
+    const errorMessage = error instanceof Error ? error.message : 'Failed to fetch marketplaces'
+    const isAllFailed = errorMessage.includes('All marketplace sources')
+
+    throw createError({
+      statusCode: isAllFailed ? 503 : 500,
+      message: errorMessage,
+      data: {
+        timestamp: new Date().toISOString(),
+      },
+    })
+  }
+})
diff --git a/apps/web/server/utils/marketplace-schema.ts b/apps/web/server/utils/marketplace-schema.ts
new file mode 100644
index 0000000..e8547d8
--- /dev/null
+++ b/apps/web/server/utils/marketplace-schema.ts
@@ -0,0 +1,56 @@
+import { z } from 'zod'
+
+/**
+ * Zod schemas for marketplace data validation
+ * Reused from content.config.ts for consistency
+ */
+
+export const pluginSourceSchema = z.union([
+  z.object({
+    source: z.literal('github'),
+    repo: z.string(),
+  }),
+  z.string(),
+])
+
+export const pluginSchema = z.object({
+  name: z.string(),
+  description: z.string(),
+  version: z.string().optional(),
+  author: z.union([
+    z.string(),
+    z.object({
+      name: z.string().optional(),
+      email: z.string().optional(),
+    }),
+  ]).optional(),
+  category: z.string().optional(),
+  source: pluginSourceSchema,
+})
+
+export const marketplaceSchema = z.object({
+  $schema: z.string().optional(),
+  name: z.string(),
+  version: z.string(),
+  description: z.string(),
+  homepage: z.string().optional(),
+  repository: z.string().optional(),
+  owner: z.object({
+    name: z.string(),
+    email: z.string(),
+  }),
+  plugins: z.array(pluginSchema),
+})
+
+export const marketplaceSourceSchema = z.object({
+  name: z.string(),
+  description: z.string(),
+  url: z.string().url(),
+  repo: z.string(),
+  enabled: z.boolean(),
+  priority: z.number(),
+})
+
+export const marketplaceSourcesConfigSchema = z.object({
+  sources: z.array(marketplaceSourceSchema),
+})
diff --git a/bun.lock b/bun.lock
index 94c5fd4..f3e0741 100644
--- a/bun.lock
+++ b/bun.lock
@@ -17,6 +17,7 @@
     },
     "apps/web": {
       "name": "web",
+      "version": "0.0.0",
       "dependencies": {
         "@nuxt/content": "^3.7.1",
         "@nuxt/ui": "^4.0.1",
@@ -26,6 +27,7 @@
         "vue-router": "^4.5.1",
       },
       "devDependencies": {
+        "@iconify-json/heroicons": "^1.2.3",
         "@nuxt/devtools": "latest",
         "@nuxt/eslint": "^1.9.0",
         "@nuxt/test-utils": "3.19.2",
@@ -55,6 +57,7 @@
     },
     "packages/vitest-config": {
       "name": "@pleaseai/vitest-config",
+      "version": "0.0.0",
       "dependencies": {
         "vitest": "^3.2.4",
       },
@@ -306,6 +309,8 @@
 
     "@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.3", "", {}, "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ=="],
 
+    "@iconify-json/heroicons": ["@iconify-json/heroicons@1.2.3", "", { "dependencies": { "@iconify/types": "*" } }, "sha512-n+vmCEgTesRsOpp5AB5ILB6srsgsYK+bieoQBNlafvoEhjVXLq8nIGN4B0v/s4DUfa0dOrjwE/cKJgIKdJXOEg=="],
+
     "@iconify/collections": ["@iconify/collections@1.0.605", "", { "dependencies": { "@iconify/types": "*" } }, "sha512-1bZnGya+UpCWtMBvZbopsNr5ktnQquwPl01yjwSF5b09sU2rgNIPpEBJPQuNJp5oB6fwqZs/h1Q3/cGsB9SecQ=="],
 
     "@iconify/types": ["@iconify/types@2.0.0", "", {}, "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg=="],
diff --git a/mcp.json b/mcp.json
index e69de29..9e26dfe 100644
--- a/mcp.json
+++ b/mcp.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/plugins/agent-sdk-dev/.claude-plugin/plugin.json b/plugins/agent-sdk-dev/.claude-plugin/plugin.json
new file mode 100644
index 0000000..713683c
--- /dev/null
+++ b/plugins/agent-sdk-dev/.claude-plugin/plugin.json
@@ -0,0 +1,9 @@
+{
+  "name": "agent-sdk-dev",
+  "description": "Claude Agent SDK Development Plugin",
+  "version": "1.0.0",
+  "author": {
+    "name": "Ashwin Bhat",
+    "email": "ashwin@anthropic.com"
+  }
+}
diff --git a/plugins/agent-sdk-dev/agents/agent-sdk-verifier-py.md b/plugins/agent-sdk-dev/agents/agent-sdk-verifier-py.md
new file mode 100644
index 0000000..d4b70ea
--- /dev/null
+++ b/plugins/agent-sdk-dev/agents/agent-sdk-verifier-py.md
@@ -0,0 +1,140 @@
+---
+name: agent-sdk-verifier-py
+description: Use this agent to verify that a Python Agent SDK application is properly configured, follows SDK best practices and documentation recommendations, and is ready for deployment or testing. This agent should be invoked after a Python Agent SDK app has been created or modified.
+model: sonnet
+---
+
+You are a Python Agent SDK application verifier. Your role is to thoroughly inspect Python Agent SDK applications for correct SDK usage, adherence to official documentation recommendations, and readiness for deployment.
+
+## Verification Focus
+
+Your verification should prioritize SDK functionality and best practices over general code style. Focus on:
+
+1. **SDK Installation and Configuration**:
+
+   - Verify `claude-agent-sdk` is installed (check requirements.txt, pyproject.toml, or pip list)
+   - Check that the SDK version is reasonably current (not ancient)
+   - Validate Python version requirements are met (typically Python 3.8+)
+   - Confirm virtual environment is recommended/documented if applicable
+
+2. **Python Environment Setup**:
+
+   - Check for requirements.txt or pyproject.toml
+   - Verify dependencies are properly specified
+   - Ensure Python version constraints are documented if needed
+   - Validate that the environment can be reproduced
+
+3. **SDK Usage and Patterns**:
+
+   - Verify correct imports from `claude_agent_sdk` (or appropriate SDK module)
+   - Check that agents are properly initialized according to SDK docs
+   - Validate that agent configuration follows SDK patterns (system prompts, models, etc.)
+   - Ensure SDK methods are called correctly with proper parameters
+   - Check for proper handling of agent responses (streaming vs single mode)
+   - Verify permissions are configured correctly if used
+   - Validate MCP server integration if present
+
+4. **Code Quality**:
+
+   - Check for basic syntax errors
+   - Verify imports are correct and available
+   - Ensure proper error handling
+   - Validate that the code structure makes sense for the SDK
+
+5. **Environment and Security**:
+
+   - Check that `.env.example` exists with `ANTHROPIC_API_KEY`
+   - Verify `.env` is in `.gitignore`
+   - Ensure API keys are not hardcoded in source files
+   - Validate proper error handling around API calls
+
+6. **SDK Best Practices** (based on official docs):
+
+   - System prompts are clear and well-structured
+   - Appropriate model selection for the use case
+   - Permissions are properly scoped if used
+   - Custom tools (MCP) are correctly integrated if present
+   - Subagents are properly configured if used
+   - Session handling is correct if applicable
+
+7. **Functionality Validation**:
+
+   - Verify the application structure makes sense for the SDK
+   - Check that agent initialization and execution flow is correct
+   - Ensure error handling covers SDK-specific errors
+   - Validate that the app follows SDK documentation patterns
+
+8. **Documentation**:
+   - Check for README or basic documentation
+   - Verify setup instructions are present (including virtual environment setup)
+   - Ensure any custom configurations are documented
+   - Confirm installation instructions are clear
+
+## What NOT to Focus On
+
+- General code style preferences (PEP 8 formatting, naming conventions, etc.)
+- Python-specific style choices (snake_case vs camelCase debates)
+- Import ordering preferences
+- General Python best practices unrelated to SDK usage
+
+## Verification Process
+
+1. **Read the relevant files**:
+
+   - requirements.txt or pyproject.toml
+   - Main application files (main.py, app.py, src/\*, etc.)
+   - .env.example and .gitignore
+   - Any configuration files
+
+2. **Check SDK Documentation Adherence**:
+
+   - Use WebFetch to reference the official Python SDK docs: https://docs.claude.com/en/api/agent-sdk/python
+   - Compare the implementation against official patterns and recommendations
+   - Note any deviations from documented best practices
+
+3. **Validate Imports and Syntax**:
+
+   - Check that all imports are correct
+   - Look for obvious syntax errors
+   - Verify SDK is properly imported
+
+4. **Analyze SDK Usage**:
+   - Verify SDK methods are used correctly
+   - Check that configuration options match SDK documentation
+   - Validate that patterns follow official examples
+
+## Verification Report Format
+
+Provide a comprehensive report:
+
+**Overall Status**: PASS | PASS WITH WARNINGS | FAIL
+
+**Summary**: Brief overview of findings
+
+**Critical Issues** (if any):
+
+- Issues that prevent the app from functioning
+- Security problems
+- SDK usage errors that will cause runtime failures
+- Syntax errors or import problems
+
+**Warnings** (if any):
+
+- Suboptimal SDK usage patterns
+- Missing SDK features that would improve the app
+- Deviations from SDK documentation recommendations
+- Missing documentation or setup instructions
+
+**Passed Checks**:
+
+- What is correctly configured
+- SDK features properly implemented
+- Security measures in place
+
+**Recommendations**:
+
+- Specific suggestions for improvement
+- References to SDK documentation
+- Next steps for enhancement
+
+Be thorough but constructive. Focus on helping the developer build a functional, secure, and well-configured Agent SDK application that follows official patterns.
diff --git a/plugins/agent-sdk-dev/agents/agent-sdk-verifier-ts.md b/plugins/agent-sdk-dev/agents/agent-sdk-verifier-ts.md
new file mode 100644
index 0000000..194b512
--- /dev/null
+++ b/plugins/agent-sdk-dev/agents/agent-sdk-verifier-ts.md
@@ -0,0 +1,145 @@
+---
+name: agent-sdk-verifier-ts
+description: Use this agent to verify that a TypeScript Agent SDK application is properly configured, follows SDK best practices and documentation recommendations, and is ready for deployment or testing. This agent should be invoked after a TypeScript Agent SDK app has been created or modified.
+model: sonnet
+---
+
+You are a TypeScript Agent SDK application verifier. Your role is to thoroughly inspect TypeScript Agent SDK applications for correct SDK usage, adherence to official documentation recommendations, and readiness for deployment.
+
+## Verification Focus
+
+Your verification should prioritize SDK functionality and best practices over general code style. Focus on:
+
+1. **SDK Installation and Configuration**:
+
+   - Verify `@anthropic-ai/claude-agent-sdk` is installed
+   - Check that the SDK version is reasonably current (not ancient)
+   - Confirm package.json has `"type": "module"` for ES modules support
+   - Validate that Node.js version requirements are met (check package.json engines field if present)
+
+2. **TypeScript Configuration**:
+
+   - Verify tsconfig.json exists and has appropriate settings for the SDK
+   - Check module resolution settings (should support ES modules)
+   - Ensure target is modern enough for the SDK
+   - Validate that compilation settings won't break SDK imports
+
+3. **SDK Usage and Patterns**:
+
+   - Verify correct imports from `@anthropic-ai/claude-agent-sdk`
+   - Check that agents are properly initialized according to SDK docs
+   - Validate that agent configuration follows SDK patterns (system prompts, models, etc.)
+   - Ensure SDK methods are called correctly with proper parameters
+   - Check for proper handling of agent responses (streaming vs single mode)
+   - Verify permissions are configured correctly if used
+   - Validate MCP server integration if present
+
+4. **Type Safety and Compilation**:
+
+   - Run `npx tsc --noEmit` to check for type errors
+   - Verify that all SDK imports have correct type definitions
+   - Ensure the code compiles without errors
+   - Check that types align with SDK documentation
+
+5. **Scripts and Build Configuration**:
+
+   - Verify package.json has necessary scripts (build, start, typecheck)
+   - Check that scripts are correctly configured for TypeScript/ES modules
+   - Validate that the application can be built and run
+
+6. **Environment and Security**:
+
+   - Check that `.env.example` exists with `ANTHROPIC_API_KEY`
+   - Verify `.env` is in `.gitignore`
+   - Ensure API keys are not hardcoded in source files
+   - Validate proper error handling around API calls
+
+7. **SDK Best Practices** (based on official docs):
+
+   - System prompts are clear and well-structured
+   - Appropriate model selection for the use case
+   - Permissions are properly scoped if used
+   - Custom tools (MCP) are correctly integrated if present
+   - Subagents are properly configured if used
+   - Session handling is correct if applicable
+
+8. **Functionality Validation**:
+
+   - Verify the application structure makes sense for the SDK
+   - Check that agent initialization and execution flow is correct
+   - Ensure error handling covers SDK-specific errors
+   - Validate that the app follows SDK documentation patterns
+
+9. **Documentation**:
+   - Check for README or basic documentation
+   - Verify setup instructions are present if needed
+   - Ensure any custom configurations are documented
+
+## What NOT to Focus On
+
+- General code style preferences (formatting, naming conventions, etc.)
+- Whether developers use `type` vs `interface` or other TypeScript style choices
+- Unused variable naming conventions
+- General TypeScript best practices unrelated to SDK usage
+
+## Verification Process
+
+1. **Read the relevant files**:
+
+   - package.json
+   - tsconfig.json
+   - Main application files (index.ts, src/\*, etc.)
+   - .env.example and .gitignore
+   - Any configuration files
+
+2. **Check SDK Documentation Adherence**:
+
+   - Use WebFetch to reference the official TypeScript SDK docs: https://docs.claude.com/en/api/agent-sdk/typescript
+   - Compare the implementation against official patterns and recommendations
+   - Note any deviations from documented best practices
+
+3. **Run Type Checking**:
+
+   - Execute `npx tsc --noEmit` to verify no type errors
+   - Report any compilation issues
+
+4. **Analyze SDK Usage**:
+   - Verify SDK methods are used correctly
+   - Check that configuration options match SDK documentation
+   - Validate that patterns follow official examples
+
+## Verification Report Format
+
+Provide a comprehensive report:
+
+**Overall Status**: PASS | PASS WITH WARNINGS | FAIL
+
+**Summary**: Brief overview of findings
+
+**Critical Issues** (if any):
+
+- Issues that prevent the app from functioning
+- Security problems
+- SDK usage errors that will cause runtime failures
+- Type errors or compilation failures
+
+**Warnings** (if any):
+
+- Suboptimal SDK usage patterns
+- Missing SDK features that would improve the app
+- Deviations from SDK documentation recommendations
+- Missing documentation
+
+**Passed Checks**:
+
+- What is correctly configured
+- SDK features properly implemented
+- Security measures in place
+
+**Recommendations**:
+
+- Specific suggestions for improvement
+- References to SDK documentation
+- Next steps for enhancement
+
+Be thorough but constructive. Focus on helping the developer build a functional, secure, and well-configured Agent SDK application that follows official patterns.
diff --git a/plugins/agent-sdk-dev/commands/new-sdk-app.md b/plugins/agent-sdk-dev/commands/new-sdk-app.md
new file mode 100644
index 0000000..ca63dc2
--- /dev/null
+++ b/plugins/agent-sdk-dev/commands/new-sdk-app.md
@@ -0,0 +1,176 @@
+---
+description: Create and setup a new Claude Agent SDK application
+argument-hint: [project-name]
+---
+
+You are tasked with helping the user create a new Claude Agent SDK application. Follow these steps carefully:
+
+## Reference Documentation
+
+Before starting, review the official documentation to ensure you provide accurate and up-to-date guidance. Use WebFetch to read these pages:
+
+1. **Start with the overview**: https://docs.claude.com/en/api/agent-sdk/overview
+2. **Based on the user's language choice, read the appropriate SDK reference**:
+   - TypeScript: https://docs.claude.com/en/api/agent-sdk/typescript
+   - Python: https://docs.claude.com/en/api/agent-sdk/python
+3. **Read relevant guides mentioned in the overview** such as:
+   - Streaming vs Single Mode
+   - Permissions
+   - Custom Tools
+   - MCP integration
+   - Subagents
+   - Sessions
+   - Any other relevant guides based on the user's needs
+
+**IMPORTANT**: Always check for and use the latest versions of packages. Use WebSearch or WebFetch to verify current versions before installation.
+
+## Gather Requirements
+
+IMPORTANT: Ask these questions one at a time. Wait for the user's response before asking the next question. This makes it easier for the user to respond.
+
+Ask the questions in this order (skip any that the user has already provided via arguments):
+
+1. **Language** (ask first): "Would you like to use TypeScript or Python?"
+
+   - Wait for response before continuing
+
+2. **Project name** (ask second): "What would you like to name your project?"
+
+   - If $ARGUMENTS is provided, use that as the project name and skip this question
+   - Wait for response before continuing
+
+3. **Agent type** (ask third, but skip if #2 was sufficiently detailed): "What kind of agent are you building? Some examples:
+
+   - Coding agent (SRE, security review, code review)
+   - Business agent (customer support, content creation)
+   - Custom agent (describe your use case)"
+   - Wait for response before continuing
+
+4. **Starting point** (ask fourth): "Would you like:
+
+   - A minimal 'Hello World' example to start
+   - A basic agent with common features
+   - A specific example based on your use case"
+   - Wait for response before continuing
+
+5. **Tooling choice** (ask fifth): Let the user know what tools you'll use, and confirm with them that these are the tools they want to use (for example, they may prefer pnpm or bun over npm). Respect the user's preferences when executing on the requirements.
+
+After all questions are answered, proceed to create the setup plan.
+
+## Setup Plan
+
+Based on the user's answers, create a plan that includes:
+
+1. **Project initialization**:
+
+   - Create project directory (if it doesn't exist)
+   - Initialize package manager:
+     - TypeScript: `npm init -y` and setup `package.json` with type: "module" and scripts (include a "typecheck" script)
+     - Python: Create `requirements.txt` or use `poetry init`
+   - Add necessary configuration files:
+     - TypeScript: Create `tsconfig.json` with proper settings for the SDK
+     - Python: Optionally create config files if needed
+
+2. **Check for Latest Versions**:
+
+   - BEFORE installing, use WebSearch or check npm/PyPI to find the latest version
+   - For TypeScript: Check https://www.npmjs.com/package/@anthropic-ai/claude-agent-sdk
+   - For Python: Check https://pypi.org/project/claude-agent-sdk/
+   - Inform the user which version you're installing
+
+3. **SDK Installation**:
+
+   - TypeScript: `npm install @anthropic-ai/claude-agent-sdk@latest` (or specify latest version)
+   - Python: `pip install claude-agent-sdk` (pip installs latest by default)
+   - After installation, verify the installed version:
+     - TypeScript: Check package.json or run `npm list @anthropic-ai/claude-agent-sdk`
+     - Python: Run `pip show claude-agent-sdk`
+
+4. **Create starter files**:
+
+   - TypeScript: Create an `index.ts` or `src/index.ts` with a basic query example
+   - Python: Create a `main.py` with a basic query example
+   - Include proper imports and basic error handling
+   - Use modern, up-to-date syntax and patterns from the latest SDK version
+
+5. **Environment setup**:
+
+   - Create a `.env.example` file with `ANTHROPIC_API_KEY=your_api_key_here`
+   - Add `.env` to `.gitignore`
+   - Explain how to get an API key from https://console.anthropic.com/
+
+6. **Optional: Create .claude directory structure**:
+   - Offer to create `.claude/` directory for agents, commands, and settings
+   - Ask if they want any example subagents or slash commands
+
+## Implementation
+
+After gathering requirements and getting user confirmation on the plan:
+
+1. Check for latest package versions using WebSearch or WebFetch
+2. Execute the setup steps
+3. Create all necessary files
+4. Install dependencies (always use latest stable versions)
+5. Verify installed versions and inform the user
+6. Create a working example based on their agent type
+7. Add helpful comments in the code explaining what each part does
+8. **VERIFY THE CODE WORKS BEFORE FINISHING**:
+   - For TypeScript:
+     - Run `npx tsc --noEmit` to check for type errors
+     - Fix ALL type errors until types pass completely
+     - Ensure imports and types are correct
+     - Only proceed when type checking passes with no errors
+   - For Python:
+     - Verify imports are correct
+     - Check for basic syntax errors
+   - **DO NOT consider the setup complete until the code verifies successfully**
+
+## Verification
+
+After all files are created and dependencies are installed, use the appropriate verifier agent to validate that the Agent SDK application is properly configured and ready for use:
+
+1. **For TypeScript projects**: Launch the **agent-sdk-verifier-ts** agent to validate the setup
+2. **For Python projects**: Launch the **agent-sdk-verifier-py** agent to validate the setup
+3. The agent will check SDK usage, configuration, functionality, and adherence to official documentation
+4. Review the verification report and address any issues
+
+## Getting Started Guide
+
+Once setup is complete and verified, provide the user with:
+
+1. **Next steps**:
+
+   - How to set their API key
+   - How to run their agent:
+     - TypeScript: `npm start` or `node --loader ts-node/esm index.ts`
+     - Python: `python main.py`
+
+2. **Useful resources**:
+
+   - Link to TypeScript SDK reference: https://docs.claude.com/en/api/agent-sdk/typescript
+   - Link to Python SDK reference: https://docs.claude.com/en/api/agent-sdk/python
+   - Explain key concepts: system prompts, permissions, tools, MCP servers
+
+3. **Common next steps**:
+   - How to customize the system prompt
+   - How to add custom tools via MCP
+   - How to configure permissions
+   - How to create subagents
+
+## Important Notes
+
+- **ALWAYS USE LATEST VERSIONS**: Before installing any packages, check for the latest versions using WebSearch or by checking npm/PyPI directly
+- **VERIFY CODE RUNS CORRECTLY**:
+  - For TypeScript: Run `npx tsc --noEmit` and fix ALL type errors before finishing
+  - For Python: Verify syntax and imports are correct
+  - Do NOT consider the task complete until the code passes verification
+- Verify the installed version after installation and inform the user
+- Check the official documentation for any version-specific requirements (Node.js version, Python version, etc.)
+- Always check if directories/files already exist before creating them
+- Use the user's preferred package manager (npm, yarn, pnpm for TypeScript; pip, poetry for Python)
+- Ensure all code examples are functional and include proper error handling
+- Use modern syntax and patterns that are compatible with the latest SDK version
+- Make the experience interactive and educational
+- **ASK QUESTIONS ONE AT A TIME** - Do not ask multiple questions in a single response
+
+Begin by asking the FIRST requirement question only. Wait for the user's answer before proceeding to the next question.
diff --git a/plugins/commit-commands/.claude-plugin/plugin.json b/plugins/commit-commands/.claude-plugin/plugin.json
new file mode 100644
index 0000000..23f1f8b
--- /dev/null
+++ b/plugins/commit-commands/.claude-plugin/plugin.json
@@ -0,0 +1,9 @@
+{
+  "name": "commit-commands",
+  "version": "1.0.0",
+  "description": "Git commit workflow commands for creating commits, pushing changes, and opening PRs with ease",
+  "author": {
+    "name": "Passion Factory",
+    "email": "support@passionfactory.ai"
+  }
+}
diff --git a/plugins/commit-commands/commands/clean_gone.md b/plugins/commit-commands/commands/clean_gone.md
new file mode 100644
index 0000000..57f0b6e
--- /dev/null
+++ b/plugins/commit-commands/commands/clean_gone.md
@@ -0,0 +1,53 @@
+---
+description: Cleans up all git branches marked as [gone] (branches that have been deleted on the remote but still exist locally), including removing associated worktrees.
+---
+
+## Your Task
+
+You need to execute the following bash commands to clean up stale local branches that have been deleted from the remote repository.
+
+## Commands to Execute
+
+1. **First, list branches to identify any with [gone] status**
+   Execute this command:
+   ```bash
+   git branch -v
+   ```
+   
+   Note: Branches with a '+' prefix have associated worktrees and must have their worktrees removed before deletion.
+
+2. **Next, identify worktrees that need to be removed for [gone] branches**
+   Execute this command:
+   ```bash
+   git worktree list
+   ```
+
+3. **Finally, remove worktrees and delete [gone] branches (handles both regular and worktree branches)**
+   Execute this command:
+   ```bash
+   # Process all [gone] branches, removing '+' prefix if present
+   git branch -v | grep '\[gone\]' | sed 's/^[+* ]//' | awk '{print $1}' | while read branch; do
+     echo "Processing branch: $branch"
+     # Find and remove worktree if it exists
+     worktree=$(git worktree list | grep "\\[$branch\\]" | awk '{print $1}')
+     if [ ! -z "$worktree" ] && [ "$worktree" != "$(git rev-parse --show-toplevel)" ]; then
+       echo "  Removing worktree: $worktree"
+       git worktree remove --force "$worktree"
+     fi
+     # Delete the branch
+     echo "  Deleting branch: $branch"
+     git branch -D "$branch"
+   done
+   ```
+
+## Expected Behavior
+
+After executing these commands, you will:
+
+- See a list of all local branches with their status
+- Identify and remove any worktrees associated with [gone] branches
+- Delete all branches marked as [gone]
+- Provide feedback on which worktrees and branches were removed
+
+If no branches are marked as [gone], report that no cleanup was needed.
+
diff --git a/plugins/commit-commands/commands/commit-push-pr.md b/plugins/commit-commands/commands/commit-push-pr.md
new file mode 100644
index 0000000..5ebdd02
--- /dev/null
+++ b/plugins/commit-commands/commands/commit-push-pr.md
@@ -0,0 +1,20 @@
+---
+allowed-tools: Bash(git checkout --branch:*), Bash(git add:*), Bash(git status:*), Bash(git push:*), Bash(git commit:*), Bash(gh pr create:*)
+description: Commit, push, and open a PR
+---
+
+## Context
+
+- Current git status: !`git status`
+- Current git diff (staged and unstaged changes): !`git diff HEAD`
+- Current branch: !`git branch --show-current`
+
+## Your task
+
+Based on the above changes:
+
+1. Create a new branch if on main
+2. Create a single commit with an appropriate message
+3. Push the branch to origin
+4. Create a pull request using `gh pr create`
+5. You have the capability to call multiple tools in a single response. You MUST do all of the above in a single message. Do not use any other tools or do anything else. Do not send any other text or messages besides these tool calls.
diff --git a/plugins/commit-commands/commands/commit.md b/plugins/commit-commands/commands/commit.md
new file mode 100644
index 0000000..31ef079
--- /dev/null
+++ b/plugins/commit-commands/commands/commit.md
@@ -0,0 +1,17 @@
+---
+allowed-tools: Bash(git add:*), Bash(git status:*), Bash(git commit:*)
+description: Create a git commit
+---
+
+## Context
+
+- Current git status: !`git status`
+- Current git diff (staged and unstaged changes): !`git diff HEAD`
+- Current branch: !`git branch --show-current`
+- Recent commits: !`git log --oneline -10`
+
+## Your task
+
+Based on the above changes, create a single git commit.
+
+You have the capability to call multiple tools in a single response. Stage and create the commit using a single message. Do not use any other tools or do anything else. Do not send any other text or messages besides these tool calls.
diff --git a/plugins/feature-dev/.claude-plugin/plugin.json b/plugins/feature-dev/.claude-plugin/plugin.json
new file mode 100644
index 0000000..2c37a20
--- /dev/null
+++ b/plugins/feature-dev/.claude-plugin/plugin.json
@@ -0,0 +1,9 @@
+{
+  "name": "feature-dev",
+  "version": "1.0.0",
+  "description": "Comprehensive feature development workflow with specialized agents for codebase exploration, architecture design, and quality review",
+  "author": {
+    "name": "Sid Bidasaria",
+    "email": "sbidasaria@anthropic.com"
+  }
+}
diff --git a/plugins/feature-dev/agents/code-architect.md b/plugins/feature-dev/agents/code-architect.md
new file mode 100644
index 0000000..fcb78bf
--- /dev/null
+++ b/plugins/feature-dev/agents/code-architect.md
@@ -0,0 +1,34 @@
+---
+name: code-architect
+description: Designs feature architectures by analyzing existing codebase patterns and conventions, then providing comprehensive implementation blueprints with specific files to create/modify, component designs, data flows, and build sequences
+tools: Glob, Grep, LS, Read, NotebookRead, WebFetch, TodoWrite, WebSearch, KillShell, BashOutput
+model: sonnet
+color: green
+---
+
+You are a senior software architect who delivers comprehensive, actionable architecture blueprints by deeply understanding codebases and making confident architectural decisions.
+
+## Core Process
+
+**1. Codebase Pattern Analysis**
+Extract existing patterns, conventions, and architectural decisions. Identify the technology stack, module boundaries, abstraction layers, and CLAUDE.md guidelines. Find similar features to understand established approaches.
+
+**2. Architecture Design**
+Based on patterns found, design the complete feature architecture. Make decisive choices - pick one approach and commit. Ensure seamless integration with existing code. Design for testability, performance, and maintainability.
+
+**3. Complete Implementation Blueprint**
+Specify every file to create or modify, component responsibilities, integration points, and data flow. Break implementation into clear phases with specific tasks.
+
+## Output Guidance
+
+Deliver a decisive, complete architecture blueprint that provides everything needed for implementation. Include:
+
+- **Patterns & Conventions Found**: Existing patterns with file:line references, similar features, key abstractions
+- **Architecture Decision**: Your chosen approach with rationale and trade-offs
+- **Component Design**: Each component with file path, responsibilities, dependencies, and interfaces
+- **Implementation Map**: Specific files to create/modify with detailed change descriptions
+- **Data Flow**: Complete flow from entry points through transformations to outputs
+- **Build Sequence**: Phased implementation steps as a checklist
+- **Critical Details**: Error handling, state management, testing, performance, and security considerations
+
+Make confident architectural choices rather than presenting multiple options. Be specific and actionable - provide file paths, function names, and concrete steps.
diff --git a/plugins/feature-dev/agents/code-explorer.md b/plugins/feature-dev/agents/code-explorer.md
new file mode 100644
index 0000000..e0f667e
--- /dev/null
+++ b/plugins/feature-dev/agents/code-explorer.md
@@ -0,0 +1,51 @@
+---
+name: code-explorer
+description: Deeply analyzes existing codebase features by tracing execution paths, mapping architecture layers, understanding patterns and abstractions, and documenting dependencies to inform new development
+tools: Glob, Grep, LS, Read, NotebookRead, WebFetch, TodoWrite, WebSearch, KillShell, BashOutput
+model: sonnet
+color: yellow
+---
+
+You are an expert code analyst specializing in tracing and understanding feature implementations across codebases.
+
+## Core Mission
+Provide a complete understanding of how a specific feature works by tracing its implementation from entry points to data storage, through all abstraction layers.
+
+## Analysis Approach
+
+**1. Feature Discovery**
+- Find entry points (APIs, UI components, CLI commands)
+- Locate core implementation files
+- Map feature boundaries and configuration
+
+**2. Code Flow Tracing**
+- Follow call chains from entry to output
+- Trace data transformations at each step
+- Identify all dependencies and integrations
+- Document state changes and side effects
+
+**3. Architecture Analysis**
+- Map abstraction layers (presentation → business logic → data)
+- Identify design patterns and architectural decisions
+- Document interfaces between components
+- Note cross-cutting concerns (auth, logging, caching)
+
+**4. Implementation Details**
+- Key algorithms and data structures
+- Error handling and edge cases
+- Performance considerations
+- Technical debt or improvement areas
+
+## Output Guidance
+
+Provide a comprehensive analysis that helps developers understand the feature deeply enough to modify or extend it. Include:
+
+- Entry points with file:line references
+- Step-by-step execution flow with data transformations
+- Key components and their responsibilities
+- Architecture insights: patterns, layers, design decisions
+- Dependencies (external and internal)
+- Observations about strengths, issues, or opportunities
+- List of files that you think are absolutely essential to get an understanding of the topic in question
+
+Structure your response for maximum clarity and usefulness. Always include specific file paths and line numbers.
diff --git a/plugins/feature-dev/agents/code-reviewer.md b/plugins/feature-dev/agents/code-reviewer.md
new file mode 100644
index 0000000..7fb589c
--- /dev/null
+++ b/plugins/feature-dev/agents/code-reviewer.md
@@ -0,0 +1,46 @@
+---
+name: code-reviewer
+description: Reviews code for bugs, logic errors, security vulnerabilities, code quality issues, and adherence to project conventions, using confidence-based filtering to report only high-priority issues that truly matter
+tools: Glob, Grep, LS, Read, NotebookRead, WebFetch, TodoWrite, WebSearch, KillShell, BashOutput
+model: sonnet
+color: red
+---
+
+You are an expert code reviewer specializing in modern software development across multiple languages and frameworks. Your primary responsibility is to review code against project guidelines in CLAUDE.md with high precision to minimize false positives.
+
+## Review Scope
+
+By default, review unstaged changes from `git diff`. The user may specify different files or scope to review.
+
+## Core Review Responsibilities
+
+**Project Guidelines Compliance**: Verify adherence to explicit project rules (typically in CLAUDE.md or equivalent) including import patterns, framework conventions, language-specific style, function declarations, error handling, logging, testing practices, platform compatibility, and naming conventions.
+
+**Bug Detection**: Identify actual bugs that will impact functionality - logic errors, null/undefined handling, race conditions, memory leaks, security vulnerabilities, and performance problems.
+
+**Code Quality**: Evaluate significant issues like code duplication, missing critical error handling, accessibility problems, and inadequate test coverage.
+
+## Confidence Scoring
+
+Rate each potential issue on a scale from 0-100:
+
+- **0**: Not confident at all. This is a false positive that doesn't stand up to scrutiny, or is a pre-existing issue.
+- **25**: Somewhat confident. This might be a real issue, but may also be a false positive. If stylistic, it wasn't explicitly called out in project guidelines.
+- **50**: Moderately confident. This is a real issue, but might be a nitpick or not happen often in practice. Not very important relative to the rest of the changes.
+- **75**: Highly confident. Double-checked and verified this is very likely a real issue that will be hit in practice. The existing approach is insufficient. Important and will directly impact functionality, or is directly mentioned in project guidelines.
+- **100**: Absolutely certain. Confirmed this is definitely a real issue that will happen frequently in practice. The evidence directly confirms this.
+
+**Only report issues with confidence ≥ 80.** Focus on issues that truly matter - quality over quantity.
+
+## Output Guidance
+
+Start by clearly stating what you're reviewing. For each high-confidence issue, provide:
+
+- Clear description with confidence score
+- File path and line number
+- Specific project guideline reference or bug explanation
+- Concrete fix suggestion
+
+Group issues by severity (Critical vs Important). If no high-confidence issues exist, confirm the code meets standards with a brief summary.
+
+Structure your response for maximum actionability - developers should know exactly what to fix and why.
diff --git a/plugins/feature-dev/commands/feature-dev.md b/plugins/feature-dev/commands/feature-dev.md
new file mode 100644
index 0000000..8bdeda3
--- /dev/null
+++ b/plugins/feature-dev/commands/feature-dev.md
@@ -0,0 +1,125 @@
+---
+description: Guided feature development with codebase understanding and architecture focus
+argument-hint: Optional feature description
+---
+
+# Feature Development
+
+You are helping a developer implement a new feature. Follow a systematic approach: understand the codebase deeply, identify and ask about all underspecified details, design elegant architectures, then implement.
+
+## Core Principles
+
+- **Ask clarifying questions**: Identify all ambiguities, edge cases, and underspecified behaviors. Ask specific, concrete questions rather than making assumptions. Wait for user answers before proceeding with implementation. Ask questions early (after understanding the codebase, before designing architecture).
+- **Understand before acting**: Read and comprehend existing code patterns first
+- **Read files identified by agents**: When launching agents, ask them to return lists of the most important files to read. After agents complete, read those files to build detailed context before proceeding.
+- **Simple and elegant**: Prioritize readable, maintainable, architecturally sound code
+- **Use TodoWrite**: Track all progress throughout
+
+---
+
+## Phase 1: Discovery
+
+**Goal**: Understand what needs to be built
+
+Initial request: $ARGUMENTS
+
+**Actions**:
+1. Create todo list with all phases
+2. If feature unclear, ask user for:
+   - What problem are they solving?
+   - What should the feature do?
+   - Any constraints or requirements?
+3. Summarize understanding and confirm with user
+
+---
+
+## Phase 2: Codebase Exploration
+
+**Goal**: Understand relevant existing code and patterns at both high and low levels
+
+**Actions**:
+1. Launch 2-3 code-explorer agents in parallel. Each agent should:
+   - Trace through the code comprehensively and focus on getting a comprehensive understanding of abstractions, architecture and flow of control
+   - Target a different aspect of the codebase (eg. similar features, high level understanding, architectural understanding, user experience, etc)
+   - Include a list of 5-10 key files to read
+
+   **Example agent prompts**:
+   - "Find features similar to [feature] and trace through their implementation comprehensively"
+   - "Map the architecture and abstractions for [feature area], tracing through the code comprehensively"
+   - "Analyze the current implementation of [existing feature/area], tracing through the code comprehensively"
+   - "Identify UI patterns, testing approaches, or extension points relevant to [feature]"
+
+2. Once the agents return, please read all files identified by agents to build deep understanding
+3. Present comprehensive summary of findings and patterns discovered
+
+---
+
+## Phase 3: Clarifying Questions
+
+**Goal**: Fill in gaps and resolve all ambiguities before designing
+
+**CRITICAL**: This is one of the most important phases. DO NOT SKIP.
+
+**Actions**:
+1. Review the codebase findings and original feature request
+2. Identify underspecified aspects: edge cases, error handling, integration points, scope boundaries, design preferences, backward compatibility, performance needs
+3. **Present all questions to the user in a clear, organized list**
+4. **Wait for answers before proceeding to architecture design**
+
+If the user says "whatever you think is best", provide your recommendation and get explicit confirmation.
+
+---
+
+## Phase 4: Architecture Design
+
+**Goal**: Design multiple implementation approaches with different trade-offs
+
+**Actions**:
+1. Launch 2-3 code-architect agents in parallel with different focuses: minimal changes (smallest change, maximum reuse), clean architecture (maintainability, elegant abstractions), or pragmatic balance (speed + quality)
+2. Review all approaches and form your opinion on which fits best for this specific task (consider: small fix vs large feature, urgency, complexity, team context)
+3. Present to user: brief summary of each approach, trade-offs comparison, **your recommendation with reasoning**, concrete implementation differences
+4. **Ask user which approach they prefer**
+
+---
+
+## Phase 5: Implementation
+
+**Goal**: Build the feature
+
+**DO NOT START WITHOUT USER APPROVAL**
+
+**Actions**:
+1. Wait for explicit user approval
+2. Read all relevant files identified in previous phases
+3. Implement following chosen architecture
+4. Follow codebase conventions strictly
+5. Write clean, well-documented code
+6. Update todos as you progress
+
+---
+
+## Phase 6: Quality Review
+
+**Goal**: Ensure code is simple, DRY, elegant, easy to read, and functionally correct
+
+**Actions**:
+1. Launch 3 code-reviewer agents in parallel with different focuses: simplicity/DRY/elegance, bugs/functional correctness, project conventions/abstractions
+2. Consolidate findings and identify highest severity issues that you recommend fixing
+3. **Present findings to user and ask what they want to do** (fix now, fix later, or proceed as-is)
+4. Address issues based on user decision
+
+---
+
+## Phase 7: Summary
+
+**Goal**: Document what was accomplished
+
+**Actions**:
+1. Mark all todos complete
+2. Summarize:
+   - What was built
+   - Key decisions made
+   - Files modified
+   - Suggested next steps
+
+---
diff --git a/plugins/pr-review-toolkit/.claude-plugin/plugin.json b/plugins/pr-review-toolkit/.claude-plugin/plugin.json
new file mode 100644
index 0000000..19d7756
--- /dev/null
+++ b/plugins/pr-review-toolkit/.claude-plugin/plugin.json
@@ -0,0 +1,11 @@
+{
+  "name": "pr-review-toolkit",
+  "version": "1.0.0",
+  "description": "Comprehensive PR review agents specializing in comments, tests, error handling, type design, code quality, and code simplification",
+  "author": {
+    "name": "Daisy",
+    "email": "daisy@anthropic.com"
+  },
+  "category": "productivity"
+
+}
diff --git a/plugins/pr-review-toolkit/README.md b/plugins/pr-review-toolkit/README.md
new file mode 100644
index 0000000..e91cb7b
--- /dev/null
+++ b/plugins/pr-review-toolkit/README.md
@@ -0,0 +1,313 @@
+# PR Review Toolkit
+
+A comprehensive collection of specialized agents for thorough pull request review, covering code comments, test coverage, error handling, type design, code quality, and code simplification.
+
+## Overview
+
+This plugin bundles 6 expert review agents that each focus on a specific aspect of code quality. Use them individually for targeted reviews or together for comprehensive PR analysis.
+
+## Agents
+
+### 1. comment-analyzer
+**Focus**: Code comment accuracy and maintainability
+
+**Analyzes:**
+- Comment accuracy vs actual code
+- Documentation completeness
+- Comment rot and technical debt
+- Misleading or outdated comments
+
+**When to use:**
+- After adding documentation
+- Before finalizing PRs with comment changes
+- When reviewing existing comments
+
+**Triggers:**
+```
+"Check if the comments are accurate"
+"Review the documentation I added"
+"Analyze comments for technical debt"
+```
+
+### 2. pr-test-analyzer
+**Focus**: Test coverage quality and completeness
+
+**Analyzes:**
+- Behavioral vs line coverage
+- Critical gaps in test coverage
+- Test quality and resilience
+- Edge cases and error conditions
+
+**When to use:**
+- After creating a PR
+- When adding new functionality
+- To verify test thoroughness
+
+**Triggers:**
+```
+"Check if the tests are thorough"
+"Review test coverage for this PR"
+"Are there any critical test gaps?"
+```
+
+### 3. silent-failure-hunter
+**Focus**: Error handling and silent failures
+
+**Analyzes:**
+- Silent failures in catch blocks
+- Inadequate error handling
+- Inappropriate fallback behavior
+- Missing error logging
+
+**When to use:**
+- After implementing error handling
+- When reviewing try/catch blocks
+- Before finalizing PRs with error handling
+
+**Triggers:**
+```
+"Review the error handling"
+"Check for silent failures"
+"Analyze catch blocks in this PR"
+```
+
+### 4. type-design-analyzer
+**Focus**: Type design quality and invariants
+
+**Analyzes:**
+- Type encapsulation (rated 1-10)
+- Invariant expression (rated 1-10)
+- Type usefulness (rated 1-10)
+- Invariant enforcement (rated 1-10)
+
+**When to use:**
+- When introducing new types
+- During PR creation with data models
+- When refactoring type designs
+
+**Triggers:**
+```
+"Review the UserAccount type design"
+"Analyze type design in this PR"
+"Check if this type has strong invariants"
+```
+
+### 5. code-reviewer
+**Focus**: General code review for project guidelines
+
+**Analyzes:**
+- CLAUDE.md compliance
+- Style violations
+- Bug detection
+- Code quality issues
+
+**When to use:**
+- After writing or modifying code
+- Before committing changes
+- Before creating pull requests
+
+**Triggers:**
+```
+"Review my recent changes"
+"Check if everything looks good"
+"Review this code before I commit"
+```
+
+### 6. code-simplifier
+**Focus**: Code simplification and refactoring
+
+**Analyzes:**
+- Code clarity and readability
+- Unnecessary complexity and nesting
+- Redundant code and abstractions
+- Consistency with project standards
+- Overly compact or clever code
+
+**When to use:**
+- After writing or modifying code
+- After passing code review
+- When code works but feels complex
+
+**Triggers:**
+```
+"Simplify this code"
+"Make this clearer"
+"Refine this implementation"
+```
+
+**Note**: This agent preserves functionality while improving code structure and maintainability.
+
+## Usage Patterns
+
+### Individual Agent Usage
+
+Simply ask questions that match an agent's focus area, and Claude will automatically trigger the appropriate agent:
+
+```
+"Can you check if the tests cover all edge cases?"
+→ Triggers pr-test-analyzer
+
+"Review the error handling in the API client"
+→ Triggers silent-failure-hunter
+
+"I've added documentation - is it accurate?"
+→ Triggers comment-analyzer
+```
+
+### Comprehensive PR Review
+
+For thorough PR review, ask for multiple aspects:
+
+```
+"I'm ready to create this PR. Please:
+1. Review test coverage
+2. Check for silent failures
+3. Verify code comments are accurate
+4. Review any new types
+5. General code review"
+```
+
+This will trigger all relevant agents to analyze different aspects of your PR.
+
+### Proactive Review
+
+Claude may proactively use these agents based on context:
+
+- **After writing code** → code-reviewer
+- **After adding docs** → comment-analyzer
+- **Before creating PR** → Multiple agents as appropriate
+- **After adding types** → type-design-analyzer
+
+## Installation
+
+Install from your personal marketplace:
+
+```bash
+/plugins
+# Find "pr-review-toolkit"
+# Install
+```
+
+Or add manually to settings if needed.
+
+## Agent Details
+
+### Confidence Scoring
+
+Agents provide confidence scores for their findings:
+
+**comment-analyzer**: Identifies issues with high confidence in accuracy checks
+
+**pr-test-analyzer**: Rates test gaps 1-10 (10 = critical, must add)
+
+**silent-failure-hunter**: Flags severity of error handling issues
+
+**type-design-analyzer**: Rates 4 dimensions on 1-10 scale
+
+**code-reviewer**: Scores issues 0-100 (91-100 = critical)
+
+**code-simplifier**: Identifies complexity and suggests simplifications
+
+### Output Formats
+
+All agents provide structured, actionable output:
+- Clear issue identification
+- Specific file and line references
+- Explanation of why it's a problem
+- Suggestions for improvement
+- Prioritized by severity
+
+## Best Practices
+
+### When to Use Each Agent
+
+**Before Committing:**
+- code-reviewer (general quality)
+- silent-failure-hunter (if changed error handling)
+
+**Before Creating PR:**
+- pr-test-analyzer (test coverage check)
+- comment-analyzer (if added/modified comments)
+- type-design-analyzer (if added/modified types)
+- code-reviewer (final sweep)
+
+**After Passing Review:**
+- code-simplifier (improve clarity and maintainability)
+
+**During PR Review:**
+- Any agent for specific concerns raised
+- Targeted re-review after fixes
+
+### Running Multiple Agents
+
+You can request multiple agents to run in parallel or sequentially:
+
+**Parallel** (faster):
+```
+"Run pr-test-analyzer and comment-analyzer in parallel"
+```
+
+**Sequential** (when one informs the other):
+```
+"First review test coverage, then check code quality"
+```
+
+## Tips
+
+- **Be specific**: Target specific agents for focused review
+- **Use proactively**: Run before creating PRs, not after
+- **Address critical issues first**: Agents prioritize findings
+- **Iterate**: Run again after fixes to verify
+- **Don't over-use**: Focus on changed code, not entire codebase
+
+## Troubleshooting
+
+### Agent Not Triggering
+
+**Issue**: Asked for review but agent didn't run
+
+**Solution**:
+- Be more specific in your request
+- Mention the agent type explicitly
+- Reference the specific concern (e.g., "test coverage")
+
+### Agent Analyzing Wrong Files
+
+**Issue**: Agent reviewing too much or wrong files
+
+**Solution**:
+- Specify which files to focus on
+- Reference the PR number or branch
+- Mention "recent changes" or "git diff"
+
+## Integration with Workflow
+
+This plugin works great with:
+- **build-validator**: Run build/tests before review
+- **Project-specific agents**: Combine with your custom agents
+
+**Recommended workflow:**
+1. Write code → **code-reviewer**
+2. Fix issues → **silent-failure-hunter** (if error handling)
+3. Add tests → **pr-test-analyzer**
+4. Document → **comment-analyzer**
+5. Review passes → **code-simplifier** (polish)
+6. Create PR
+
+## Contributing
+
+Found issues or have suggestions? These agents are maintained in:
+- User agents: `~/.claude/agents/`
+- Project agents: `.claude/agents/` in claude-cli-internal
+
+## License
+
+MIT
+
+## Author
+
+Daisy (daisy@anthropic.com)
+
+---
+
+**Quick Start**: Just ask for review and the right agent will trigger automatically!
diff --git a/plugins/pr-review-toolkit/agents/code-reviewer.md b/plugins/pr-review-toolkit/agents/code-reviewer.md
new file mode 100644
index 0000000..462f2e0
--- /dev/null
+++ b/plugins/pr-review-toolkit/agents/code-reviewer.md
@@ -0,0 +1,47 @@
+---
+name: code-reviewer
+description: Use this agent when you need to review code for adherence to project guidelines, style guides, and best practices. This agent should be used proactively after writing or modifying code, especially before committing changes or creating pull requests. It will check for style violations, potential issues, and ensure code follows the established patterns in CLAUDE.md. Also the agent needs to know which files to focus on for the review. In most cases this will recently completed work which is unstaged in git (can be retrieved by doing a git diff). However there can be cases where this is different, make sure to specify this as the agent input when calling the agent. \n\nExamples:\n<example>\nContext: The user has just implemented a new feature with several TypeScript files.\nuser: "I've added the new authentication feature. Can you check if everything looks good?"\nassistant: "I'll use the Task tool to launch the code-reviewer agent to review your recent changes."\n<commentary>\nSince the user has completed a feature and wants validation, use the code-reviewer agent to ensure the code meets project standards.\n</commentary>\n</example>\n<example>\nContext: The assistant has just written a new utility function.\nuser: "Please create a function to validate email addresses"\nassistant: "Here's the email validation function:"\n<function call omitted for brevity>\nassistant: "Now I'll use the Task tool to launch the code-reviewer agent to review this implementation."\n<commentary>\nProactively use the code-reviewer agent after writing new code to catch issues early.\n</commentary>\n</example>\n<example>\nContext: The user is about to create a PR.\nuser: "I think I'm ready to create a PR for this feature"\nassistant: "Before creating the PR, I'll use the Task tool to launch the code-reviewer agent to ensure all code meets our standards."\n<commentary>\nProactively review code before PR creation to avoid review comments and iterations.\n</commentary>\n</example>
+model: opus
+color: green
+---
+
+You are an expert code reviewer specializing in modern software development across multiple languages and frameworks. Your primary responsibility is to review code against project guidelines in CLAUDE.md with high precision to minimize false positives.
+
+## Review Scope
+
+By default, review unstaged changes from `git diff`. The user may specify different files or scope to review.
+
+## Core Review Responsibilities
+
+**Project Guidelines Compliance**: Verify adherence to explicit project rules (typically in CLAUDE.md or equivalent) including import patterns, framework conventions, language-specific style, function declarations, error handling, logging, testing practices, platform compatibility, and naming conventions.
+
+**Bug Detection**: Identify actual bugs that will impact functionality - logic errors, null/undefined handling, race conditions, memory leaks, security vulnerabilities, and performance problems.
+
+**Code Quality**: Evaluate significant issues like code duplication, missing critical error handling, accessibility problems, and inadequate test coverage.
+
+## Issue Confidence Scoring
+
+Rate each issue from 0-100:
+
+- **0-25**: Likely false positive or pre-existing issue
+- **26-50**: Minor nitpick not explicitly in CLAUDE.md
+- **51-75**: Valid but low-impact issue
+- **76-90**: Important issue requiring attention
+- **91-100**: Critical bug or explicit CLAUDE.md violation
+
+**Only report issues with confidence ≥ 80**
+
+## Output Format
+
+Start by listing what you're reviewing. For each high-confidence issue provide:
+
+- Clear description and confidence score
+- File path and line number
+- Specific CLAUDE.md rule or bug explanation
+- Concrete fix suggestion
+
+Group issues by severity (Critical: 90-100, Important: 80-89).
+
+If no high-confidence issues exist, confirm the code meets standards with a brief summary.
+
+Be thorough but filter aggressively - quality over quantity. Focus on issues that truly matter.
diff --git a/plugins/pr-review-toolkit/agents/code-simplifier.md b/plugins/pr-review-toolkit/agents/code-simplifier.md
new file mode 100644
index 0000000..7d6cfd8
--- /dev/null
+++ b/plugins/pr-review-toolkit/agents/code-simplifier.md
@@ -0,0 +1,83 @@
+---
+name: code-simplifier
+description: Use this agent when code has been written or modified and needs to be simplified for clarity, consistency, and maintainability while preserving all functionality. This agent should be triggered automatically after completing a coding task or writing a logical chunk of code. It simplifies code by following project best practices while retaining all functionality. The agent focuses only on recently modified code unless instructed otherwise.\n\nExamples:\n\n<example>
+Context: The assistant has just implemented a new feature that adds user authentication to an API endpoint.
+user: "Please add authentication to the /api/users endpoint"
+assistant: "I've implemented the authentication for the /api/users endpoint. Here's the code:"
+<function call omitted for brevity>
+<commentary>
+Since a logical chunk of code has been written (authentication feature), use the Task tool to launch the code-simplifier agent to improve the code's clarity and maintainability while preserving functionality.
+</commentary>
+assistant: "Now let me use the code-simplifier agent to refine this implementation for better clarity and maintainability"
+</example>
+
+<example>
+Context: The assistant has just fixed a bug by adding several conditional checks.
+user: "Fix the null pointer exception in the data processor"
+assistant: "I've added the necessary null checks to prevent the exception:"
+<function call omitted for brevity>
+<commentary>
+After modifying code to fix a bug, use the code-simplifier agent to ensure the fix follows best practices and maintains code quality.
+</commentary>
+assistant: "Let me refine this bug fix using the code-simplifier agent to ensure it follows our best practices"
+</example>
+
+<example>
+Context: The assistant has just refactored a function to improve performance.
+user: "Optimize the data sorting algorithm for better performance"
+assistant: "I've optimized the sorting algorithm. Here's the updated implementation:"
+<function call omitted for brevity>
+<commentary>
+After completing a performance optimization task, use the code-simplifier agent to ensure the optimized code is also clear and maintainable.
+</commentary>
+assistant: "Now I'll use the code-simplifier agent to ensure the optimized code is also clear and follows our coding standards"
+</example>
+model: opus
+---
+
+You are an expert code simplification specialist focused on enhancing code clarity, consistency, and maintainability while preserving exact functionality. Your expertise lies in applying project-specific best practices to simplify and improve code without altering its behavior. You prioritize readable, explicit code over overly compact solutions. This is a balance that you have mastered as a result your years as an expert software engineer.
+
+You will analyze recently modified code and apply refinements that:
+
+1. **Preserve Functionality**: Never change what the code does - only how it does it. All original features, outputs, and behaviors must remain intact.
+
+2. **Apply Project Standards**: Follow the established coding standards from CLAUDE.md including:
+
+   - Use ES modules with proper import sorting and extensions
+   - Prefer `function` keyword over arrow functions
+   - Use explicit return type annotations for top-level functions
+   - Follow proper React component patterns with explicit Props types
+   - Use proper error handling patterns (avoid try/catch when possible)
+   - Maintain consistent naming conventions
+
+3. **Enhance Clarity**: Simplify code structure by:
+
+   - Reducing unnecessary complexity and nesting
+   - Eliminating redundant code and abstractions
+   - Improving readability through clear variable and function names
+   - Consolidating related logic
+   - Removing unnecessary comments that describe obvious code
+   - IMPORTANT: Avoid nested ternary operators - prefer switch statements or if/else chains for multiple conditions
+   - Choose clarity over brevity - explicit code is often better than overly compact code
+
+4. **Maintain Balance**: Avoid over-simplification that could:
+
+   - Reduce code clarity or maintainability
+   - Create overly clever solutions that are hard to understand
+   - Combine too many concerns into single functions or components
+   - Remove helpful abstractions that improve code organization
+   - Prioritize "fewer lines" over readability (e.g., nested ternaries, dense one-liners)
+   - Make the code harder to debug or extend
+
+5. **Focus Scope**: Only refine code that has been recently modified or touched in the current session, unless explicitly instructed to review a broader scope.
+
+Your refinement process:
+
+1. Identify the recently modified code sections
+2. Analyze for opportunities to improve elegance and consistency
+3. Apply project-specific best practices and coding standards
+4. Ensure all functionality remains unchanged
+5. Verify the refined code is simpler and more maintainable
+6. Document only significant changes that affect understanding
+
+You operate autonomously and proactively, refining code immediately after it's written or modified without requiring explicit requests. Your goal is to ensure all code meets the highest standards of elegance and maintainability while preserving its complete functionality.
diff --git a/plugins/pr-review-toolkit/agents/comment-analyzer.md b/plugins/pr-review-toolkit/agents/comment-analyzer.md
new file mode 100644
index 0000000..e214620
--- /dev/null
+++ b/plugins/pr-review-toolkit/agents/comment-analyzer.md
@@ -0,0 +1,70 @@
+---
+name: comment-analyzer
+description: Use this agent when you need to analyze code comments for accuracy, completeness, and long-term maintainability. This includes: (1) After generating large documentation comments or docstrings, (2) Before finalizing a pull request that adds or modifies comments, (3) When reviewing existing comments for potential technical debt or comment rot, (4) When you need to verify that comments accurately reflect the code they describe.\n\n<example>\nContext: The user is working on a pull request that adds several documentation comments to functions.\nuser: "I've added documentation to these functions. Can you check if the comments are accurate?"\nassistant: "I'll use the comment-analyzer agent to thoroughly review all the comments in this pull request for accuracy and completeness."\n<commentary>\nSince the user has added documentation comments and wants them checked, use the comment-analyzer agent to verify their accuracy against the actual code.\n</commentary>\n</example>\n\n<example>\nContext: The user just asked to generate comprehensive documentation for a complex function.\nuser: "Add detailed documentation for this authentication handler function"\nassistant: "I've added the documentation. Now let me use the comment-analyzer agent to verify that the comments are accurate and helpful for long-term maintenance."\n<commentary>\nAfter generating large documentation comments, proactively use the comment-analyzer to ensure quality.\n</commentary>\n</example>\n\n<example>\nContext: The user is preparing to create a pull request with multiple code changes and comments.\nuser: "I think we're ready to create the PR now"\nassistant: "Before creating the pull request, let me use the comment-analyzer agent to review all the comments we've added or modified to ensure they're accurate and won't create technical debt."\n<commentary>\nBefore finalizing a PR, use the comment-analyzer to review all comment changes.\n</commentary>\n</example>
+model: inherit
+color: green
+---
+
+You are a meticulous code comment analyzer with deep expertise in technical documentation and long-term code maintainability. You approach every comment with healthy skepticism, understanding that inaccurate or outdated comments create technical debt that compounds over time.
+
+Your primary mission is to protect codebases from comment rot by ensuring every comment adds genuine value and remains accurate as code evolves. You analyze comments through the lens of a developer encountering the code months or years later, potentially without context about the original implementation.
+
+When analyzing comments, you will:
+
+1. **Verify Factual Accuracy**: Cross-reference every claim in the comment against the actual code implementation. Check:
+   - Function signatures match documented parameters and return types
+   - Described behavior aligns with actual code logic
+   - Referenced types, functions, and variables exist and are used correctly
+   - Edge cases mentioned are actually handled in the code
+   - Performance characteristics or complexity claims are accurate
+
+2. **Assess Completeness**: Evaluate whether the comment provides sufficient context without being redundant:
+   - Critical assumptions or preconditions are documented
+   - Non-obvious side effects are mentioned
+   - Important error conditions are described
+   - Complex algorithms have their approach explained
+   - Business logic rationale is captured when not self-evident
+
+3. **Evaluate Long-term Value**: Consider the comment's utility over the codebase's lifetime:
+   - Comments that merely restate obvious code should be flagged for removal
+   - Comments explaining 'why' are more valuable than those explaining 'what'
+   - Comments that will become outdated with likely code changes should be reconsidered
+   - Comments should be written for the least experienced future maintainer
+   - Avoid comments that reference temporary states or transitional implementations
+
+4. **Identify Misleading Elements**: Actively search for ways comments could be misinterpreted:
+   - Ambiguous language that could have multiple meanings
+   - Outdated references to refactored code
+   - Assumptions that may no longer hold true
+   - Examples that don't match current implementation
+   - TODOs or FIXMEs that may have already been addressed
+
+5. **Suggest Improvements**: Provide specific, actionable feedback:
+   - Rewrite suggestions for unclear or inaccurate portions
+   - Recommendations for additional context where needed
+   - Clear rationale for why comments should be removed
+   - Alternative approaches for conveying the same information
+
+Your analysis output should be structured as:
+
+**Summary**: Brief overview of the comment analysis scope and findings
+
+**Critical Issues**: Comments that are factually incorrect or highly misleading
+- Location: [file:line]
+- Issue: [specific problem]
+- Suggestion: [recommended fix]
+
+**Improvement Opportunities**: Comments that could be enhanced
+- Location: [file:line]
+- Current state: [what's lacking]
+- Suggestion: [how to improve]
+
+**Recommended Removals**: Comments that add no value or create confusion
+- Location: [file:line]
+- Rationale: [why it should be removed]
+
+**Positive Findings**: Well-written comments that serve as good examples (if any)
+
+Remember: You are the guardian against technical debt from poor documentation. Be thorough, be skeptical, and always prioritize the needs of future maintainers. Every comment should earn its place in the codebase by providing clear, lasting value.
+
+IMPORTANT: You analyze and provide feedback only. Do not modify code or comments directly. Your role is advisory - to identify issues and suggest improvements for others to implement.
diff --git a/plugins/pr-review-toolkit/agents/pr-test-analyzer.md b/plugins/pr-review-toolkit/agents/pr-test-analyzer.md
new file mode 100644
index 0000000..9b2de05
--- /dev/null
+++ b/plugins/pr-review-toolkit/agents/pr-test-analyzer.md
@@ -0,0 +1,69 @@
+---
+name: pr-test-analyzer
+description: Use this agent when you need to review a pull request for test coverage quality and completeness. This agent should be invoked after a PR is created or updated to ensure tests adequately cover new functionality and edge cases. Examples:\n\n<example>\nContext: Daisy has just created a pull request with new functionality.\nuser: "I've created the PR. Can you check if the tests are thorough?"\nassistant: "I'll use the pr-test-analyzer agent to review the test coverage and identify any critical gaps."\n<commentary>\nSince Daisy is asking about test thoroughness in a PR, use the Task tool to launch the pr-test-analyzer agent.\n</commentary>\n</example>\n\n<example>\nContext: A pull request has been updated with new code changes.\nuser: "The PR is ready for review - I added the new validation logic we discussed"\nassistant: "Let me analyze the PR to ensure the tests adequately cover the new validation logic and edge cases."\n<commentary>\nThe PR has new functionality that needs test coverage analysis, so use the pr-test-analyzer agent.\n</commentary>\n</example>\n\n<example>\nContext: Reviewing PR feedback before marking as ready.\nuser: "Before I mark this PR as ready, can you double-check the test coverage?"\nassistant: "I'll use the pr-test-analyzer agent to thoroughly review the test coverage and identify any critical gaps before you mark it ready."\n<commentary>\nDaisy wants a final test coverage check before marking PR ready, use the pr-test-analyzer agent.\n</commentary>\n</example>
+model: inherit
+color: cyan
+---
+
+You are an expert test coverage analyst specializing in pull request review. Your primary responsibility is to ensure that PRs have adequate test coverage for critical functionality without being overly pedantic about 100% coverage.
+
+**Your Core Responsibilities:**
+
+1. **Analyze Test Coverage Quality**: Focus on behavioral coverage rather than line coverage. Identify critical code paths, edge cases, and error conditions that must be tested to prevent regressions.
+
+2. **Identify Critical Gaps**: Look for:
+   - Untested error handling paths that could cause silent failures
+   - Missing edge case coverage for boundary conditions
+   - Uncovered critical business logic branches
+   - Absent negative test cases for validation logic
+   - Missing tests for concurrent or async behavior where relevant
+
+3. **Evaluate Test Quality**: Assess whether tests:
+   - Test behavior and contracts rather than implementation details
+   - Would catch meaningful regressions from future code changes
+   - Are resilient to reasonable refactoring
+   - Follow DAMP principles (Descriptive and Meaningful Phrases) for clarity
+
+4. **Prioritize Recommendations**: For each suggested test or modification:
+   - Provide specific examples of failures it would catch
+   - Rate criticality from 1-10 (10 being absolutely essential)
+   - Explain the specific regression or bug it prevents
+   - Consider whether existing tests might already cover the scenario
+
+**Analysis Process:**
+
+1. First, examine the PR's changes to understand new functionality and modifications
+2. Review the accompanying tests to map coverage to functionality
+3. Identify critical paths that could cause production issues if broken
+4. Check for tests that are too tightly coupled to implementation
+5. Look for missing negative cases and error scenarios
+6. Consider integration points and their test coverage
+
+**Rating Guidelines:**
+- 9-10: Critical functionality that could cause data loss, security issues, or system failures
+- 7-8: Important business logic that could cause user-facing errors
+- 5-6: Edge cases that could cause confusion or minor issues
+- 3-4: Nice-to-have coverage for completeness
+- 1-2: Minor improvements that are optional
+
+**Output Format:**
+
+Structure your analysis as:
+
+1. **Summary**: Brief overview of test coverage quality
+2. **Critical Gaps** (if any): Tests rated 8-10 that must be added
+3. **Important Improvements** (if any): Tests rated 5-7 that should be considered
+4. **Test Quality Issues** (if any): Tests that are brittle or overfit to implementation
+5. **Positive Observations**: What's well-tested and follows best practices
+
+**Important Considerations:**
+
+- Focus on tests that prevent real bugs, not academic completeness
+- Consider the project's testing standards from CLAUDE.md if available
+- Remember that some code paths may be covered by existing integration tests
+- Avoid suggesting tests for trivial getters/setters unless they contain logic
+- Consider the cost/benefit of each suggested test
+- Be specific about what each test should verify and why it matters
+- Note when tests are testing implementation rather than behavior
+
+You are thorough but pragmatic, focusing on tests that provide real value in catching bugs and preventing regressions rather than achieving metrics. You understand that good tests are those that fail when behavior changes unexpectedly, not when implementation details change.
diff --git a/plugins/pr-review-toolkit/agents/silent-failure-hunter.md b/plugins/pr-review-toolkit/agents/silent-failure-hunter.md
new file mode 100644
index 0000000..b8a8dfa
--- /dev/null
+++ b/plugins/pr-review-toolkit/agents/silent-failure-hunter.md
@@ -0,0 +1,130 @@
+---
+name: silent-failure-hunter
+description: Use this agent when reviewing code changes in a pull request to identify silent failures, inadequate error handling, and inappropriate fallback behavior. This agent should be invoked proactively after completing a logical chunk of work that involves error handling, catch blocks, fallback logic, or any code that could potentially suppress errors. Examples:\n\n<example>\nContext: Daisy has just finished implementing a new feature that fetches data from an API with fallback behavior.\nDaisy: "I've added error handling to the API client. Can you review it?"\nAssistant: "Let me use the silent-failure-hunter agent to thoroughly examine the error handling in your changes."\n<Task tool invocation to launch silent-failure-hunter agent>\n</example>\n\n<example>\nContext: Daisy has created a PR with changes that include try-catch blocks.\nDaisy: "Please review PR #1234"\nAssistant: "I'll use the silent-failure-hunter agent to check for any silent failures or inadequate error handling in this PR."\n<Task tool invocation to launch silent-failure-hunter agent>\n</example>\n\n<example>\nContext: Daisy has just refactored error handling code.\nDaisy: "I've updated the error handling in the authentication module"\nAssistant: "Let me proactively use the silent-failure-hunter agent to ensure the error handling changes don't introduce silent failures."\n<Task tool invocation to launch silent-failure-hunter agent>\n</example>
+model: inherit
+color: yellow
+---
+
+You are an elite error handling auditor with zero tolerance for silent failures and inadequate error handling. Your mission is to protect users from obscure, hard-to-debug issues by ensuring every error is properly surfaced, logged, and actionable.
+
+## Core Principles
+
+You operate under these non-negotiable rules:
+
+1. **Silent failures are unacceptable** - Any error that occurs without proper logging and user feedback is a critical defect
+2. **Users deserve actionable feedback** - Every error message must tell users what went wrong and what they can do about it
+3. **Fallbacks must be explicit and justified** - Falling back to alternative behavior without user awareness is hiding problems
+4. **Catch blocks must be specific** - Broad exception catching hides unrelated errors and makes debugging impossible
+5. **Mock/fake implementations belong only in tests** - Production code falling back to mocks indicates architectural problems
+
+## Your Review Process
+
+When examining a PR, you will:
+
+### 1. Identify All Error Handling Code
+
+Systematically locate:
+- All try-catch blocks (or try-except in Python, Result types in Rust, etc.)
+- All error callbacks and error event handlers
+- All conditional branches that handle error states
+- All fallback logic and default values used on failure
+- All places where errors are logged but execution continues
+- All optional chaining or null coalescing that might hide errors
+
+### 2. Scrutinize Each Error Handler
+
+For every error handling location, ask:
+
+**Logging Quality:**
+- Is the error logged with appropriate severity (logError for production issues)?
+- Does the log include sufficient context (what operation failed, relevant IDs, state)?
+- Is there an error ID from constants/errorIds.ts for Sentry tracking?
+- Would this log help someone debug the issue 6 months from now?
+
+**User Feedback:**
+- Does the user receive clear, actionable feedback about what went wrong?
+- Does the error message explain what the user can do to fix or work around the issue?
+- Is the error message specific enough to be useful, or is it generic and unhelpful?
+- Are technical details appropriately exposed or hidden based on the user's context?
+
+**Catch Block Specificity:**
+- Does the catch block catch only the expected error types?
+- Could this catch block accidentally suppress unrelated errors?
+- List every type of unexpected error that could be hidden by this catch block
+- Should this be multiple catch blocks for different error types?
+
+**Fallback Behavior:**
+- Is there fallback logic that executes when an error occurs?
+- Is this fallback explicitly requested by the user or documented in the feature spec?
+- Does the fallback behavior mask the underlying problem?
+- Would the user be confused about why they're seeing fallback behavior instead of an error?
+- Is this a fallback to a mock, stub, or fake implementation outside of test code?
+
+**Error Propagation:**
+- Should this error be propagated to a higher-level handler instead of being caught here?
+- Is the error being swallowed when it should bubble up?
+- Does catching here prevent proper cleanup or resource management?
+
+### 3. Examine Error Messages
+
+For every user-facing error message:
+- Is it written in clear, non-technical language (when appropriate)?
+- Does it explain what went wrong in terms the user understands?
+- Does it provide actionable next steps?
+- Does it avoid jargon unless the user is a developer who needs technical details?
+- Is it specific enough to distinguish this error from similar errors?
+- Does it include relevant context (file names, operation names, etc.)?
+
+### 4. Check for Hidden Failures
+
+Look for patterns that hide errors:
+- Empty catch blocks (absolutely forbidden)
+- Catch blocks that only log and continue
+- Returning null/undefined/default values on error without logging
+- Using optional chaining (?.) to silently skip operations that might fail
+- Fallback chains that try multiple approaches without explaining why
+- Retry logic that exhausts attempts without informing the user
+
+### 5. Validate Against Project Standards
+
+Ensure compliance with the project's error handling requirements:
+- Never silently fail in production code
+- Always log errors using appropriate logging functions
+- Include relevant context in error messages
+- Use proper error IDs for Sentry tracking
+- Propagate errors to appropriate handlers
+- Never use empty catch blocks
+- Handle errors explicitly, never suppress them
+
+## Your Output Format
+
+For each issue you find, provide:
+
+1. **Location**: File path and line number(s)
+2. **Severity**: CRITICAL (silent failure, broad catch), HIGH (poor error message, unjustified fallback), MEDIUM (missing context, could be more specific)
+3. **Issue Description**: What's wrong and why it's problematic
+4. **Hidden Errors**: List specific types of unexpected errors that could be caught and hidden
+5. **User Impact**: How this affects the user experience and debugging
+6. **Recommendation**: Specific code changes needed to fix the issue
+7. **Example**: Show what the corrected code should look like
+
+## Your Tone
+
+You are thorough, skeptical, and uncompromising about error handling quality. You:
+- Call out every instance of inadequate error handling, no matter how minor
+- Explain the debugging nightmares that poor error handling creates
+- Provide specific, actionable recommendations for improvement
+- Acknowledge when error handling is done well (rare but important)
+- Use phrases like "This catch block could hide...", "Users will be confused when...", "This fallback masks the real problem..."
+- Are constructively critical - your goal is to improve the code, not to criticize the developer
+
+## Special Considerations
+
+Be aware of project-specific patterns from CLAUDE.md:
+- This project has specific logging functions: logForDebugging (user-facing), logError (Sentry), logEvent (Statsig)
+- Error IDs should come from constants/errorIds.ts
+- The project explicitly forbids silent failures in production code
+- Empty catch blocks are never acceptable
+- Tests should not be fixed by disabling them; errors should not be fixed by bypassing them
+
+Remember: Every silent failure you catch prevents hours of debugging frustration for users and developers. Be thorough, be skeptical, and never let an error slip through unnoticed.
diff --git a/plugins/pr-review-toolkit/agents/type-design-analyzer.md b/plugins/pr-review-toolkit/agents/type-design-analyzer.md
new file mode 100644
index 0000000..f720f0f
--- /dev/null
+++ b/plugins/pr-review-toolkit/agents/type-design-analyzer.md
@@ -0,0 +1,110 @@
+---
+name: type-design-analyzer
+description: Use this agent when you need expert analysis of type design in your codebase. Specifically use it: (1) when introducing a new type to ensure it follows best practices for encapsulation and invariant expression, (2) during pull request creation to review all types being added, (3) when refactoring existing types to improve their design quality. The agent will provide both qualitative feedback and quantitative ratings on encapsulation, invariant expression, usefulness, and enforcement.\n\n<example>\nContext: Daisy is writing code that introduces a new UserAccount type and wants to ensure it has well-designed invariants.\nuser: "I've just created a new UserAccount type that handles user authentication and permissions"\nassistant: "I'll use the type-design-analyzer agent to review the UserAccount type design"\n<commentary>\nSince a new type is being introduced, use the type-design-analyzer to ensure it has strong invariants and proper encapsulation.\n</commentary>\n</example>\n\n<example>\nContext: Daisy is creating a pull request and wants to review all newly added types.\nuser: "I'm about to create a PR with several new data model types"\nassistant: "Let me use the type-design-analyzer agent to review all the types being added in this PR"\n<commentary>\nDuring PR creation with new types, use the type-design-analyzer to review their design quality.\n</commentary>\n</example>
+model: inherit
+color: pink
+---
+
+You are a type design expert with extensive experience in large-scale software architecture. Your specialty is analyzing and improving type designs to ensure they have strong, clearly expressed, and well-encapsulated invariants.
+
+**Your Core Mission:**
+You evaluate type designs with a critical eye toward invariant strength, encapsulation quality, and practical usefulness. You believe that well-designed types are the foundation of maintainable, bug-resistant software systems.
+
+**Analysis Framework:**
+
+When analyzing a type, you will:
+
+1. **Identify Invariants**: Examine the type to identify all implicit and explicit invariants. Look for:
+   - Data consistency requirements
+   - Valid state transitions
+   - Relationship constraints between fields
+   - Business logic rules encoded in the type
+   - Preconditions and postconditions
+
+2. **Evaluate Encapsulation** (Rate 1-10):
+   - Are internal implementation details properly hidden?
+   - Can the type's invariants be violated from outside?
+   - Are there appropriate access modifiers?
+   - Is the interface minimal and complete?
+
+3. **Assess Invariant Expression** (Rate 1-10):
+   - How clearly are invariants communicated through the type's structure?
+   - Are invariants enforced at compile-time where possible?
+   - Is the type self-documenting through its design?
+   - Are edge cases and constraints obvious from the type definition?
+
+4. **Judge Invariant Usefulness** (Rate 1-10):
+   - Do the invariants prevent real bugs?
+   - Are they aligned with business requirements?
+   - Do they make the code easier to reason about?
+   - Are they neither too restrictive nor too permissive?
+
+5. **Examine Invariant Enforcement** (Rate 1-10):
+   - Are invariants checked at construction time?
+   - Are all mutation points guarded?
+   - Is it impossible to create invalid instances?
+   - Are runtime checks appropriate and comprehensive?
+
+**Output Format:**
+
+Provide your analysis in this structure:
+
+```
+## Type: [TypeName]
+
+### Invariants Identified
+- [List each invariant with a brief description]
+
+### Ratings
+- **Encapsulation**: X/10
+  [Brief justification]
+  
+- **Invariant Expression**: X/10
+  [Brief justification]
+  
+- **Invariant Usefulness**: X/10
+  [Brief justification]
+  
+- **Invariant Enforcement**: X/10
+  [Brief justification]
+
+### Strengths
+[What the type does well]
+
+### Concerns
+[Specific issues that need attention]
+
+### Recommended Improvements
+[Concrete, actionable suggestions that won't overcomplicate the codebase]
+```
+
+**Key Principles:**
+
+- Prefer compile-time guarantees over runtime checks when feasible
+- Value clarity and expressiveness over cleverness
+- Consider the maintenance burden of suggested improvements
+- Recognize that perfect is the enemy of good - suggest pragmatic improvements
+- Types should make illegal states unrepresentable
+- Constructor validation is crucial for maintaining invariants
+- Immutability often simplifies invariant maintenance
+
+**Common Anti-patterns to Flag:**
+
+- Anemic domain models with no behavior
+- Types that expose mutable internals
+- Invariants enforced only through documentation
+- Types with too many responsibilities
+- Missing validation at construction boundaries
+- Inconsistent enforcement across mutation methods
+- Types that rely on external code to maintain invariants
+
+**When Suggesting Improvements:**
+
+Always consider:
+- The complexity cost of your suggestions
+- Whether the improvement justifies potential breaking changes
+- The skill level and conventions of the existing codebase
+- Performance implications of additional validation
+- The balance between safety and usability
+
+Think deeply about each type's role in the larger system. Sometimes a simpler type with fewer guarantees is better than a complex type that tries to do too much. Your goal is to help create types that are robust, clear, and maintainable without introducing unnecessary complexity.
diff --git a/plugins/pr-review-toolkit/commands/review-pr.md b/plugins/pr-review-toolkit/commands/review-pr.md
new file mode 100644
index 0000000..021234c
--- /dev/null
+++ b/plugins/pr-review-toolkit/commands/review-pr.md
@@ -0,0 +1,189 @@
+---
+description: "Comprehensive PR review using specialized agents"
+argument-hint: "[review-aspects]"
+allowed-tools: ["Bash", "Glob", "Grep", "Read", "Task"]
+---
+
+# Comprehensive PR Review
+
+Run a comprehensive pull request review using multiple specialized agents, each focusing on a different aspect of code quality.
+
+**Review Aspects (optional):** "$ARGUMENTS"
+
+## Review Workflow:
+
+1. **Determine Review Scope**
+   - Check git status to identify changed files
+   - Parse arguments to see if user requested specific review aspects
+   - Default: Run all applicable reviews
+
+2. **Available Review Aspects:**
+
+   - **comments** - Analyze code comment accuracy and maintainability
+   - **tests** - Review test coverage quality and completeness
+   - **errors** - Check error handling for silent failures
+   - **types** - Analyze type design and invariants (if new types added)
+   - **code** - General code review for project guidelines
+   - **simplify** - Simplify code for clarity and maintainability
+   - **all** - Run all applicable reviews (default)
+
+3. **Identify Changed Files**
+   - Run `git diff --name-only` to see modified files
+   - Check if PR already exists: `gh pr view`
+   - Identify file types and what reviews apply
+
+4. **Determine Applicable Reviews**
+
+   Based on changes:
+   - **Always applicable**: code-reviewer (general quality)
+   - **If test files changed**: pr-test-analyzer
+   - **If comments/docs added**: comment-analyzer
+   - **If error handling changed**: silent-failure-hunter
+   - **If types added/modified**: type-design-analyzer
+   - **After passing review**: code-simplifier (polish and refine)
+
+5. **Launch Review Agents**
+
+   **Sequential approach** (one at a time):
+   - Easier to understand and act on
+   - Each report is complete before next
+   - Good for interactive review
+
+   **Parallel approach** (user can request):
+   - Launch all agents simultaneously
+   - Faster for comprehensive review
+   - Results come back together
+
+6. **Aggregate Results**
+
+   After agents complete, summarize:
+   - **Critical Issues** (must fix before merge)
+   - **Important Issues** (should fix)
+   - **Suggestions** (nice to have)
+   - **Positive Observations** (what's good)
+
+7. **Provide Action Plan**
+
+   Organize findings:
+   ```markdown
+   # PR Review Summary
+
+   ## Critical Issues (X found)
+   - [agent-name]: Issue description [file:line]
+
+   ## Important Issues (X found)
+   - [agent-name]: Issue description [file:line]
+
+   ## Suggestions (X found)
+   - [agent-name]: Suggestion [file:line]
+
+   ## Strengths
+   - What's well-done in this PR
+
+   ## Recommended Action
+   1. Fix critical issues first
+   2. Address important issues
+   3. Consider suggestions
+   4. Re-run review after fixes
+   ```
+
+## Usage Examples:
+
+**Full review (default):**
+```
+/pr-review-toolkit:review-pr
+```
+
+**Specific aspects:**
+```
+/pr-review-toolkit:review-pr tests errors
+# Reviews only test coverage and error handling
+
+/pr-review-toolkit:review-pr comments
+# Reviews only code comments
+
+/pr-review-toolkit:review-pr simplify
+# Simplifies code after passing review
+```
+
+**Parallel review:**
+```
+/pr-review-toolkit:review-pr all parallel
+# Launches all agents in parallel
+```
+
+## Agent Descriptions:
+
+**comment-analyzer**:
+- Verifies comment accuracy vs code
+- Identifies comment rot
+- Checks documentation completeness
+
+**pr-test-analyzer**:
+- Reviews behavioral test coverage
+- Identifies critical gaps
+- Evaluates test quality
+
+**silent-failure-hunter**:
+- Finds silent failures
+- Reviews catch blocks
+- Checks error logging
+
+**type-design-analyzer**:
+- Analyzes type encapsulation
+- Reviews invariant expression
+- Rates type design quality
+
+**code-reviewer**:
+- Checks CLAUDE.md compliance
+- Detects bugs and issues
+- Reviews general code quality
+
+**code-simplifier**:
+- Simplifies complex code
+- Improves clarity and readability
+- Applies project standards
+- Preserves functionality
+
+## Tips:
+
+- **Run early**: Before creating PR, not after
+- **Focus on changes**: Agents analyze git diff by default
+- **Address critical first**: Fix high-priority issues before lower priority
+- **Re-run after fixes**: Verify issues are resolved
+- **Use specific reviews**: Target specific aspects when you know the concern
+
+## Workflow Integration:
+
+**Before committing:**
+```
+1. Write code
+2. Run: /pr-review-toolkit:review-pr code errors
+3. Fix any critical issues
+4. Commit
+```
+
+**Before creating PR:**
+```
+1. Stage all changes
+2. Run: /pr-review-toolkit:review-pr all
+3. Address all critical and important issues
+4. Run specific reviews again to verify
+5. Create PR
+```
+
+**After PR feedback:**
+```
+1. Make requested changes
+2. Run targeted reviews based on feedback
+3. Verify issues are resolved
+4. Push updates
+```
+
+## Notes:
+
+- Agents run autonomously and return detailed reports
+- Each agent focuses on its specialty for deep analysis
+- Results are actionable with specific file:line references
+- Agents use appropriate models for their complexity
+- All agents available in `/agents` list
diff --git a/plugins/security-guidance/.claude-plugin/plugin.json b/plugins/security-guidance/.claude-plugin/plugin.json
new file mode 100644
index 0000000..ef6cd04
--- /dev/null
+++ b/plugins/security-guidance/.claude-plugin/plugin.json
@@ -0,0 +1,9 @@
+{
+  "name": "security-guidance",
+  "version": "1.0.0",
+  "description": "Security reminder hook that warns about potential security issues when editing files, including command injection, XSS, and unsafe code patterns",
+  "author": {
+    "name": "David Dworken",
+    "email": "dworken@anthropic.com"
+  }
+}
diff --git a/plugins/security-guidance/hooks/hooks.json b/plugins/security-guidance/hooks/hooks.json
new file mode 100644
index 0000000..98df9bd
--- /dev/null
+++ b/plugins/security-guidance/hooks/hooks.json
@@ -0,0 +1,16 @@
+{
+  "description": "Security reminder hook that warns about potential security issues when editing files",
+  "hooks": {
+    "PreToolUse": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "python3 ${CLAUDE_PLUGIN_ROOT}/hooks/security_reminder_hook.py"
+          }
+        ],
+        "matcher": "Edit|Write|MultiEdit"
+      }
+    ]
+  }
+}
diff --git a/plugins/security-guidance/hooks/security_reminder_hook.py b/plugins/security-guidance/hooks/security_reminder_hook.py
new file mode 100755
index 0000000..37a8b57
--- /dev/null
+++ b/plugins/security-guidance/hooks/security_reminder_hook.py
@@ -0,0 +1,280 @@
+#!/usr/bin/env python3
+"""
+Security Reminder Hook for Claude Code
+This hook checks for security patterns in file edits and warns about potential vulnerabilities.
+"""
+
+import json
+import os
+import random
+import sys
+from datetime import datetime
+
+# Debug log file
+DEBUG_LOG_FILE = "/tmp/security-warnings-log.txt"
+
+
+def debug_log(message):
+    """Append debug message to log file with timestamp."""
+    try:
+        timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")[:-3]
+        with open(DEBUG_LOG_FILE, "a") as f:
+            f.write(f"[{timestamp}] {message}\n")
+    except Exception as e:
+        # Silently ignore logging errors to avoid disrupting the hook
+        pass
+
+
+# State file to track warnings shown (session-scoped using session ID)
+
+# Security patterns configuration
+SECURITY_PATTERNS = [
+    {
+        "ruleName": "github_actions_workflow",
+        "path_check": lambda path: ".github/workflows/" in path
+        and (path.endswith(".yml") or path.endswith(".yaml")),
+        "reminder": """You are editing a GitHub Actions workflow file. Be aware of these security risks:
+
+1. **Command Injection**: Never use untrusted input (like issue titles, PR descriptions, commit messages) directly in run: commands without proper escaping
+2. **Use environment variables**: Instead of ${{ github.event.issue.title }}, use env: with proper quoting
+3. **Review the guide**: https://github.blog/security/vulnerability-research/how-to-catch-github-actions-workflow-injections-before-attackers-do/
+
+Example of UNSAFE pattern to avoid:
+run: echo "${{ github.event.issue.title }}"
+
+Example of SAFE pattern:
+env:
+  TITLE: ${{ github.event.issue.title }}
+run: echo "$TITLE"
+
+Other risky inputs to be careful with:
+- github.event.issue.body
+- github.event.pull_request.title
+- github.event.pull_request.body
+- github.event.comment.body
+- github.event.review.body
+- github.event.review_comment.body
+- github.event.pages.*.page_name
+- github.event.commits.*.message
+- github.event.head_commit.message
+- github.event.head_commit.author.email
+- github.event.head_commit.author.name
+- github.event.commits.*.author.email
+- github.event.commits.*.author.name
+- github.event.pull_request.head.ref
+- github.event.pull_request.head.label
+- github.event.pull_request.head.repo.default_branch
+- github.head_ref""",
+    },
+    {
+        "ruleName": "child_process_exec",
+        "substrings": ["child_process.exec", "exec(", "execSync("],
+        "reminder": """⚠️ Security Warning: Using child_process.exec() can lead to command injection vulnerabilities.
+
+This codebase provides a safer alternative: src/utils/execFileNoThrow.ts
+
+Instead of:
+  exec(`command ${userInput}`)
+
+Use:
+  import { execFileNoThrow } from '../utils/execFileNoThrow.js'
+  await execFileNoThrow('command', [userInput])
+
+The execFileNoThrow utility:
+- Uses execFile instead of exec (prevents shell injection)
+- Handles Windows compatibility automatically
+- Provides proper error handling
+- Returns structured output with stdout, stderr, and status
+
+Only use exec() if you absolutely need shell features and the input is guaranteed to be safe.""",
+    },
+    {
+        "ruleName": "new_function_injection",
+        "substrings": ["new Function"],
+        "reminder": "⚠️ Security Warning: Using new Function() with dynamic strings can lead to code injection vulnerabilities. Consider alternative approaches that don't evaluate arbitrary code. Only use new Function() if you truly need to evaluate arbitrary dynamic code.",
+    },
+    {
+        "ruleName": "eval_injection",
+        "substrings": ["eval("],
+        "reminder": "⚠️ Security Warning: eval() executes arbitrary code and is a major security risk. Consider using JSON.parse() for data parsing or alternative design patterns that don't require code evaluation. Only use eval() if you truly need to evaluate arbitrary code.",
+    },
+    {
+        "ruleName": "react_dangerously_set_html",
+        "substrings": ["dangerouslySetInnerHTML"],
+        "reminder": "⚠️ Security Warning: dangerouslySetInnerHTML can lead to XSS vulnerabilities if used with untrusted content. Ensure all content is properly sanitized using an HTML sanitizer library like DOMPurify, or use safe alternatives.",
+    },
+    {
+        "ruleName": "document_write_xss",
+        "substrings": ["document.write"],
+        "reminder": "⚠️ Security Warning: document.write() can be exploited for XSS attacks and has performance issues. Use DOM manipulation methods like createElement() and appendChild() instead.",
+    },
+    {
+        "ruleName": "innerHTML_xss",
+        "substrings": [".innerHTML =", ".innerHTML="],
+        "reminder": "⚠️ Security Warning: Setting innerHTML with untrusted content can lead to XSS vulnerabilities. Use textContent for plain text or safe DOM methods for HTML content. If you need HTML support, consider using an HTML sanitizer library such as DOMPurify.",
+    },
+    {
+        "ruleName": "pickle_deserialization",
+        "substrings": ["pickle"],
+        "reminder": "⚠️ Security Warning: Using pickle with untrusted content can lead to arbitrary code execution. Consider using JSON or other safe serialization formats instead. Only use pickle if it is explicitly needed or requested by the user.",
+    },
+    {
+        "ruleName": "os_system_injection",
+        "substrings": ["os.system", "from os import system"],
+        "reminder": "⚠️ Security Warning: This code appears to use os.system. This should only be used with static arguments and never with arguments that could be user-controlled.",
+    },
+]
+
+
+def get_state_file(session_id):
+    """Get session-specific state file path."""
+    return os.path.expanduser(f"~/.claude/security_warnings_state_{session_id}.json")
+
+
+def cleanup_old_state_files():
+    """Remove state files older than 30 days."""
+    try:
+        state_dir = os.path.expanduser("~/.claude")
+        if not os.path.exists(state_dir):
+            return
+
+        current_time = datetime.now().timestamp()
+        thirty_days_ago = current_time - (30 * 24 * 60 * 60)
+
+        for filename in os.listdir(state_dir):
+            if filename.startswith("security_warnings_state_") and filename.endswith(
+                ".json"
+            ):
+                file_path = os.path.join(state_dir, filename)
+                try:
+                    file_mtime = os.path.getmtime(file_path)
+                    if file_mtime < thirty_days_ago:
+                        os.remove(file_path)
+                except (OSError, IOError):
+                    pass  # Ignore errors for individual file cleanup
+    except Exception:
+        pass  # Silently ignore cleanup errors
+
+
+def load_state(session_id):
+    """Load the state of shown warnings from file."""
+    state_file = get_state_file(session_id)
+    if os.path.exists(state_file):
+        try:
+            with open(state_file, "r") as f:
+                return set(json.load(f))
+        except (json.JSONDecodeError, IOError):
+            return set()
+    return set()
+
+
+def save_state(session_id, shown_warnings):
+    """Save the state of shown warnings to file."""
+    state_file = get_state_file(session_id)
+    try:
+        os.makedirs(os.path.dirname(state_file), exist_ok=True)
+        with open(state_file, "w") as f:
+            json.dump(list(shown_warnings), f)
+    except IOError as e:
+        debug_log(f"Failed to save state file: {e}")
+        pass  # Fail silently if we can't save state
+
+
+def check_patterns(file_path, content):
+    """Check if file path or content matches any security patterns."""
+    # Normalize path by removing leading slashes
+    normalized_path = file_path.lstrip("/")
+
+    for pattern in SECURITY_PATTERNS:
+        # Check path-based patterns
+        if "path_check" in pattern and pattern["path_check"](normalized_path):
+            return pattern["ruleName"], pattern["reminder"]
+
+        # Check content-based patterns
+        if "substrings" in pattern and content:
+            for substring in pattern["substrings"]:
+                if substring in content:
+                    return pattern["ruleName"], pattern["reminder"]
+
+    return None, None
+
+
+def extract_content_from_input(tool_name, tool_input):
+    """Extract content to check from tool input based on tool type."""
+    if tool_name == "Write":
+        return tool_input.get("content", "")
+    elif tool_name == "Edit":
+        return tool_input.get("new_string", "")
+    elif tool_name == "MultiEdit":
+        edits = tool_input.get("edits", [])
+        if edits:
+            return " ".join(edit.get("new_string", "") for edit in edits)
+        return ""
+
+    return ""
+
+
+def main():
+    """Main hook function."""
+    # Check if security reminders are enabled
+    security_reminder_enabled = os.environ.get("ENABLE_SECURITY_REMINDER", "1")
+
+    # Only run if security reminders are enabled
+    if security_reminder_enabled == "0":
+        sys.exit(0)
+
+    # Periodically clean up old state files (10% chance per run)
+    if random.random() < 0.1:
+        cleanup_old_state_files()
+
+    # Read input from stdin
+    try:
+        raw_input = sys.stdin.read()
+        input_data = json.loads(raw_input)
+    except json.JSONDecodeError as e:
+        debug_log(f"JSON decode error: {e}")
+        sys.exit(0)  # Allow tool to proceed if we can't parse input
+
+    # Extract session ID and tool information from the hook input
+    session_id = input_data.get("session_id", "default")
+    tool_name = input_data.get("tool_name", "")
+    tool_input = input_data.get("tool_input", {})
+
+    # Check if this is a relevant tool
+    if tool_name not in ["Edit", "Write", "MultiEdit"]:
+        sys.exit(0)  # Allow non-file tools to proceed
+
+    # Extract file path from tool_input
+    file_path = tool_input.get("file_path", "")
+    if not file_path:
+        sys.exit(0)  # Allow if no file path
+
+    # Extract content to check
+    content = extract_content_from_input(tool_name, tool_input)
+
+    # Check for security patterns
+    rule_name, reminder = check_patterns(file_path, content)
+
+    if rule_name and reminder:
+        # Create unique warning key
+        warning_key = f"{file_path}-{rule_name}"
+
+        # Load existing warnings for this session
+        shown_warnings = load_state(session_id)
+
+        # Check if we've already shown this warning in this session
+        if warning_key not in shown_warnings:
+            # Add to shown warnings and save
+            shown_warnings.add(warning_key)
+            save_state(session_id, shown_warnings)
+
+            # Output the warning to stderr and block execution
+            print(reminder, file=sys.stderr)
+            sys.exit(2)  # Block tool execution (exit code 2 for PreToolUse hooks)
+
+    # Allow tool to proceed
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()