diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index e5a2495..da58abc 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -4,18 +4,18 @@
     "name": "Alireza Rezvani",
     "url": "https://alirezarezvani.com"
   },
-  "description": "149 production-ready skill packages for Claude AI across 9 domains: marketing (42), engineering (23+25), C-level advisory (28), regulatory/QMS (12), product (8), project management (6), business growth (4), and finance (1). Includes 213 Python tools, 314 reference documents, 9 agents, and 5 slash commands.",
+  "description": "149 production-ready skill packages for Claude AI across 9 domains: marketing (42), engineering (23+25), C-level advisory (28), regulatory/QMS (12), product (8), project management (6), business growth (4), and finance (1). Includes 224 Python tools, 341 reference documents, 14 agents, and 12 slash commands.",
   "homepage": "https://github.com/alirezarezvani/claude-skills",
   "repository": "https://github.com/alirezarezvani/claude-skills",
   "metadata": {
-    "description": "149 production-ready skill packages across 9 domains with 213 Python tools, 314 reference documents, 9 agents, and 5 slash commands. Compatible with Claude Code, Codex CLI, Gemini CLI, and OpenClaw.",
+    "description": "149 production-ready skill packages across 9 domains with 224 Python tools, 341 reference documents, 14 agents, and 12 slash commands. Compatible with Claude Code, Codex CLI, Gemini CLI, and OpenClaw.",
     "version": "2.1.1"
   },
   "plugins": [
     {
       "name": "marketing-skills",
       "source": "./marketing-skill",
-      "description": "42 marketing skills across 7 pods: Content, SEO, CRO, Channels, Growth, Intelligence, and Sales enablement. 27 Python tools, 60 reference docs.",
+      "description": "42 marketing skills across 7 pods: Content, SEO, CRO, Channels, Growth, Intelligence, and Sales enablement. 46 Python tools, 72 reference docs.",
       "version": "2.1.1",
       "author": {
         "name": "Alireza Rezvani"
@@ -122,7 +122,7 @@
     {
       "name": "product-skills",
       "source": "./product-team",
-      "description": "8 product skills: product manager toolkit (RICE, PRDs), agile product owner, product strategist, UX researcher designer, UI design system, competitive teardown, landing page generator, SaaS scaffolder.",
+      "description": "8 product skills with 9 Python tools: product manager toolkit (RICE, PRDs), agile product owner, product strategist, UX researcher designer, UI design system, competitive teardown, landing page generator, SaaS scaffolder.",
       "version": "2.1.1",
       "author": {
         "name": "Alireza Rezvani"
@@ -142,7 +142,7 @@
     {
       "name": "pm-skills",
       "source": "./project-management",
-      "description": "6 project management skills: senior PM, scrum master, Jira expert, Confluence expert, Atlassian admin, template creator.",
+      "description": "6 project management skills with 12 Python tools: senior PM, scrum master, Jira expert, Confluence expert, Atlassian admin, template creator.",
       "version": "2.1.1",
       "author": {
         "name": "Alireza Rezvani"
diff --git a/agents/business-growth/cs-growth-strategist.md b/agents/business-growth/cs-growth-strategist.md
index 0437165..0e8e05a 100644
--- a/agents/business-growth/cs-growth-strategist.md
+++ b/agents/business-growth/cs-growth-strategist.md
@@ -1,6 +1,10 @@
 ---
 name: cs-growth-strategist
 description: Growth Strategist agent for revenue operations, sales engineering, customer success, and business development. Orchestrates business-growth skills. Spawn when users need pipeline analysis, churn prevention, expansion scoring, sales demos, or proposal writing.
+skills: business-growth
+domain: business-growth
+model: sonnet
+tools: [Read, Write, Bash, Grep, Glob]
 ---
 
 # cs-growth-strategist
@@ -48,3 +52,15 @@ Growth-focused operator covering the full revenue lifecycle: pipeline management
 - Pipeline reports → JSON with visual summary
 - Health scores → segment-aware (Enterprise/Mid-Market/SMB)
 - Proposals → structured with pricing tables and ROI projections
+
+## Success Metrics
+
+- **Pipeline Coverage:** Maintain 3x+ pipeline-to-quota ratio across segments
+- **Churn Rate:** Reduce gross churn by 15%+ quarter-over-quarter
+- **Expansion Revenue:** Achieve 120%+ net revenue retention (NRR)
+- **Forecast Accuracy:** Weighted forecast within 10% of actual bookings
+
+## Related Agents
+
+- [cs-product-manager](../product/cs-product-manager.md) -- Product roadmap alignment for sales positioning and feature prioritization
+- [cs-financial-analyst](../finance/cs-financial-analyst.md) -- Revenue forecasting validation and financial modeling support
diff --git a/agents/c-level/cs-ceo-advisor.md b/agents/c-level/cs-ceo-advisor.md
index 853c3e7..7ff7af0 100644
--- a/agents/c-level/cs-ceo-advisor.md
+++ b/agents/c-level/cs-ceo-advisor.md
@@ -344,7 +344,7 @@ esac
 
 - [cs-cto-advisor](cs-cto-advisor.md) - Technology strategy and engineering leadership (CTO counterpart)
 - [cs-product-manager](../product/cs-product-manager.md) - Product strategy and roadmap execution (planned)
-- [cs-growth-strategist](../marketing/cs-growth-strategist.md) - Growth strategy and market expansion (planned)
+- [cs-growth-strategist](../business-growth/cs-growth-strategist.md) - Growth strategy and market expansion (planned)
 
 ## References
 
diff --git a/agents/engineering-team/cs-engineering-lead.md b/agents/engineering-team/cs-engineering-lead.md
index 3eed039..55e5ca7 100644
--- a/agents/engineering-team/cs-engineering-lead.md
+++ b/agents/engineering-team/cs-engineering-lead.md
@@ -1,6 +1,10 @@
 ---
 name: cs-engineering-lead
 description: Engineering Team Lead agent for coordinating QA, security, data engineering, ML, and frontend/backend teams. Orchestrates engineering-team skills for team-level technical decisions. Spawn when users need team coordination, tech stack evaluation, incident response, or cross-functional engineering work.
+skills: engineering-team
+domain: engineering
+model: sonnet
+tools: [Read, Write, Bash, Grep, Glob]
 ---
 
 # cs-engineering-lead
@@ -68,3 +72,15 @@ Engineering team lead coordinating across specializations: frontend, backend, QA
 - Incident reports → timeline, RCA, 5-Why, action items with owners
 - Evaluations → scoring matrix with weighted dimensions
 - Feature plans → RACI matrix with milestone dates
+
+## Success Metrics
+
+- **Incident MTTR:** Mean time to resolve P1/P2 incidents under 2 hours
+- **Deployment Frequency:** Ship to production 5+ times per week
+- **Cross-Team Delivery:** 90%+ of cross-functional features delivered on schedule
+- **Engineering Health:** Test coverage >80%, CI pipeline green rate >95%
+
+## Related Agents
+
+- [cs-senior-engineer](../engineering/cs-senior-engineer.md) -- Architecture decisions, code review, and CI/CD pipeline setup
+- [cs-product-manager](../product/cs-product-manager.md) -- Feature prioritization and requirements alignment
diff --git a/agents/engineering/cs-senior-engineer.md b/agents/engineering/cs-senior-engineer.md
index ca48044..ef488ea 100644
--- a/agents/engineering/cs-senior-engineer.md
+++ b/agents/engineering/cs-senior-engineer.md
@@ -1,6 +1,10 @@
 ---
 name: cs-senior-engineer
 description: Senior Engineer agent for architecture decisions, code review, DevOps, and API design. Orchestrates engineering and engineering-team skills for technical implementation work. Spawn when users need system design, code quality review, CI/CD pipeline setup, or infrastructure decisions.
+skills: engineering
+domain: engineering
+model: sonnet
+tools: [Read, Write, Bash, Grep, Glob]
 ---
 
 # cs-senior-engineer
@@ -71,6 +75,14 @@ Cross-cutting senior engineer covering architecture, backend, DevOps, security,
 - Pipeline configs → validated YAML with comments
 - All recommendations include tradeoff analysis
 
+## Success Metrics
+
+- **Code Review Turnaround:** PR reviews completed within 4 hours during business hours
+- **Architecture Decision Quality:** ADRs reviewed and approved with no major reversals within 6 months
+- **Pipeline Reliability:** CI/CD pipeline success rate >95%, deploy rollback rate <2%
+- **Technical Debt Ratio:** Maintain tech debt backlog below 15% of total sprint capacity
+
 ## Related Agents
-- `cs-cto-advisor` — Strategic technology decisions
-- `cs-product-manager` — Feature prioritization context
+
+- [cs-engineering-lead](../engineering-team/cs-engineering-lead.md) -- Team coordination, incident response, and cross-functional delivery
+- [cs-product-manager](../product/cs-product-manager.md) -- Feature prioritization and requirements context
diff --git a/agents/finance/cs-financial-analyst.md b/agents/finance/cs-financial-analyst.md
index 28d0950..32f155a 100644
--- a/agents/finance/cs-financial-analyst.md
+++ b/agents/finance/cs-financial-analyst.md
@@ -1,6 +1,10 @@
 ---
 name: cs-financial-analyst
 description: Financial Analyst agent for DCF valuation, financial modeling, budgeting, and forecasting. Orchestrates finance skills. Spawn when users need financial statements analysis, valuation models, budget planning, ratio analysis, or industry benchmarking.
+skills: finance
+domain: finance
+model: sonnet
+tools: [Read, Write, Bash, Grep, Glob]
 ---
 
 # cs-financial-analyst
@@ -12,20 +16,20 @@ Financial analyst covering valuation, ratio analysis, forecasting, and industry-
 ## Skill Integration
 
 - `finance/financial-analyst` — DCF modeling, ratio analysis, forecasting, scenario planning
-  - Scripts: `dcf_calculator.py`, `ratio_analyzer.py`, `forecast_generator.py`, `scenario_modeler.py`
+  - Scripts: `dcf_valuation.py`, `ratio_calculator.py`, `forecast_builder.py`, `budget_variance_analyzer.py`
   - References: `financial-ratios-guide.md`, `valuation-methodology.md`, `forecasting-best-practices.md`, `industry-adaptations.md`
 
 ## Core Workflows
 
 ### 1. Company Valuation
 1. Gather financial data (revenue, costs, growth rate, WACC)
-2. Run DCF model via `dcf_calculator.py`
+2. Run DCF model via `dcf_valuation.py`
 3. Calculate comparables (EV/EBITDA, P/E, EV/Revenue)
 4. Adjust for industry via `industry-adaptations.md`
 5. Present valuation range with sensitivity analysis
 
 ### 2. Financial Health Assessment
-1. Run ratio analysis via `ratio_analyzer.py`
+1. Run ratio analysis via `ratio_calculator.py`
 2. Assess liquidity (current, quick ratio)
 3. Assess profitability (gross margin, EBITDA margin, ROE)
 4. Assess leverage (debt/equity, interest coverage)
@@ -33,8 +37,8 @@ Financial analyst covering valuation, ratio analysis, forecasting, and industry-
 
 ### 3. Revenue Forecasting
 1. Analyze historical trends
-2. Generate forecast via `forecast_generator.py`
-3. Run scenarios (bull/base/bear) via `scenario_modeler.py`
+2. Generate forecast via `forecast_builder.py`
+3. Run scenarios (bull/base/bear) via `budget_variance_analyzer.py`
 4. Calculate confidence intervals
 5. Present with assumptions clearly stated
 
@@ -50,3 +54,15 @@ Financial analyst covering valuation, ratio analysis, forecasting, and industry-
 - Ratios → benchmarked against industry with trend arrows
 - Forecasts → 3 scenarios with probability weights
 - All models include key assumptions section
+
+## Success Metrics
+
+- **Forecast Accuracy:** Revenue forecasts within 5% of actuals over trailing 4 quarters
+- **Valuation Precision:** DCF valuations within 15% of market transaction comparables
+- **Budget Variance:** Departmental budgets maintained within 10% of plan
+- **Analysis Turnaround:** Financial models delivered within 48 hours of data receipt
+
+## Related Agents
+
+- [cs-ceo-advisor](../c-level/cs-ceo-advisor.md) -- Strategic financial decisions, board reporting, and fundraising planning
+- [cs-growth-strategist](../business-growth/cs-growth-strategist.md) -- Revenue operations data and pipeline forecasting inputs
diff --git a/agents/marketing/cs-content-creator.md b/agents/marketing/cs-content-creator.md
index 252027a..f03b744 100644
--- a/agents/marketing/cs-content-creator.md
+++ b/agents/marketing/cs-content-creator.md
@@ -23,19 +23,7 @@ The cs-content-creator agent bridges the gap between creative content production
 
 ### Python Tools
 
-1. **Brand Voice Analyzer**
-   - **Purpose:** Analyzes text for formality, tone, perspective, and readability to ensure brand consistency
-   - **Path:** `../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py`
-   - **Usage:** `python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py content.txt`
-   - **Output Formats:** Human-readable report or JSON for integrations
-   - **Use Cases:** Pre-publish content review, brand audit, voice consistency checking
-
-2. **SEO Optimizer**
-   - **Purpose:** Comprehensive SEO analysis with keyword density, structure evaluation, and actionable recommendations
-   - **Path:** `../../marketing-skill/content-creator/scripts/seo_optimizer.py`
-   - **Usage:** `python ../../marketing-skill/content-creator/scripts/seo_optimizer.py article.md "primary keyword" "secondary,keywords"`
-   - **Features:** Keyword analysis, content structure, meta tags, SEO score (0-100), improvement recommendations
-   - **Use Cases:** Blog post optimization, landing page SEO, content audit
+No Python tools — this skill relies on SKILL.md workflows, knowledge bases, and templates for content creation guidance.
 
 ### Knowledge Bases
 
@@ -54,20 +42,17 @@ The cs-content-creator agent bridges the gap between creative content production
    - **Content:** Platform-specific best practices for LinkedIn (1,300 chars, professional tone), Twitter/X (280 chars, concise), Instagram (visual-first, caption strategy), Facebook (engagement tactics), TikTok (short-form video)
    - **Use Case:** Platform optimization, social media strategy, content adaptation
 
+4. **Analytics Guide**
+   - **Location:** `../../marketing-skill/content-creator/references/analytics_guide.md`
+   - **Content:** Content performance analytics and measurement frameworks
+   - **Use Case:** Content performance tracking, reporting, data-driven optimization
+
 ### Templates
 
 1. **Content Calendar Template**
-   - **Location:** `../../marketing-skill/content-creator/assets/content-calendar.md`
+   - **Location:** `../../marketing-skill/content-creator/assets/content_calendar_template.md`
    - **Use Case:** Planning monthly content, tracking production pipeline
 
-2. **SEO Checklist**
-   - **Location:** `../../marketing-skill/content-creator/assets/seo-checklist.md`
-   - **Use Case:** Pre-publish validation, SEO audit
-
-3. **Content Brief Template**
-   - **Location:** `../../marketing-skill/content-creator/assets/content-brief.md`
-   - **Use Case:** Writer briefing, stakeholder alignment
-
 ## Workflows
 
 ### Workflow 1: Blog Post Creation & Optimization
@@ -76,28 +61,27 @@ The cs-content-creator agent bridges the gap between creative content production
 
 **Steps:**
 1. **Draft Content** - Write initial blog post draft in markdown format
-2. **Analyze Brand Voice** - Run brand voice analyzer to check tone and readability
+2. **Reference Brand Guidelines** - Review brand voice requirements for tone and readability
    ```bash
-   python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py draft-post.md
+   cat ../../marketing-skill/content-creator/references/brand_guidelines.md
    ```
-3. **Review Feedback** - Adjust content based on formality score, tone, and readability metrics
-4. **Optimize for SEO** - Run SEO optimizer with target keywords
+3. **Review Content Frameworks** - Select appropriate blog post template (how-to, listicle, case study)
    ```bash
-   python ../../marketing-skill/content-creator/scripts/seo_optimizer.py draft-post.md "target keyword" "secondary,keywords,here"
+   cat ../../marketing-skill/content-creator/references/content_frameworks.md
    ```
+4. **Optimize for SEO** - Apply SEO best practices from SKILL.md workflows (keyword placement, structure, meta description)
 5. **Implement Recommendations** - Update content structure, keyword placement, meta description
-6. **Final Validation** - Re-run both analyzers to verify improvements
+6. **Final Validation** - Review against brand guidelines and content frameworks
 
-**Expected Output:** SEO score 80+ with consistent brand voice alignment
+**Expected Output:** SEO-optimized blog post with consistent brand voice alignment
 
 **Time Estimate:** 2-3 hours for 1,500-word blog post
 
 **Example:**
 ```bash
-# Complete workflow
-echo "# Blog Post Draft" > post.md
-python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py post.md
-python ../../marketing-skill/content-creator/scripts/seo_optimizer.py post.md "content marketing" "SEO,strategy"
+# Review guidelines before writing
+cat ../../marketing-skill/content-creator/references/brand_guidelines.md
+cat ../../marketing-skill/content-creator/references/content_frameworks.md
 ```
 
 ### Workflow 2: Multi-Platform Content Adaptation
@@ -113,10 +97,9 @@ python ../../marketing-skill/content-creator/scripts/seo_optimizer.py post.md "c
 3. **Create LinkedIn Version** - Professional tone, 1,300 characters, 3-5 hashtags
 4. **Create Twitter/X Thread** - Break into 280-char tweets, engaging hook
 5. **Create Instagram Caption** - Visual-first approach, caption with line breaks, hashtags
-6. **Validate Brand Voice** - Ensure consistency across all versions
+6. **Validate Brand Voice** - Ensure consistency across all versions by reviewing against brand guidelines
    ```bash
-   python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py linkedin-post.txt
-   python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py twitter-thread.txt
+   cat ../../marketing-skill/content-creator/references/brand_guidelines.md
    ```
 
 **Expected Output:** 4-5 platform-optimized versions from single source
@@ -129,19 +112,14 @@ python ../../marketing-skill/content-creator/scripts/seo_optimizer.py post.md "c
 
 **Steps:**
 1. **Collect Content** - Gather markdown files for all published content
-2. **Batch Brand Voice Analysis** - Run analyzer on all content pieces
+2. **Brand Voice Review** - Review each content piece against brand guidelines for consistency
    ```bash
-   for file in content/*.md; do
-     echo "Analyzing: $file"
-     python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py "$file" json >> audit-results.json
-   done
+   cat ../../marketing-skill/content-creator/references/brand_guidelines.md
    ```
-3. **Identify Inconsistencies** - Review formality scores, tone patterns, readability metrics
-4. **SEO Audit** - Run SEO optimizer on key landing pages and blog posts
+3. **Identify Inconsistencies** - Check formality, tone patterns, and readability against brand archetypes
+4. **SEO Audit** - Review content structure against content frameworks best practices
    ```bash
-   for file in landing-pages/*.md; do
-     python ../../marketing-skill/content-creator/scripts/seo_optimizer.py "$file" "target-keyword"
-   done
+   cat ../../marketing-skill/content-creator/references/content_frameworks.md
    ```
 5. **Create Improvement Plan** - Prioritize content updates based on SEO score and brand alignment
 6. **Implement Updates** - Revise content following brand guidelines and SEO recommendations
@@ -152,12 +130,9 @@ python ../../marketing-skill/content-creator/scripts/seo_optimizer.py post.md "c
 
 **Example:**
 ```bash
-# Quick audit of top 5 blog posts
-ls -t blog/*.md | head -5 | while read file; do
-  echo "=== $file ==="
-  python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py "$file"
-  python ../../marketing-skill/content-creator/scripts/seo_optimizer.py "$file" "main-keyword"
-done
+# Review brand guidelines and frameworks before auditing content
+cat ../../marketing-skill/content-creator/references/brand_guidelines.md
+cat ../../marketing-skill/content-creator/references/analytics_guide.md
 ```
 
 ### Workflow 4: Campaign Content Planning
@@ -171,7 +146,7 @@ done
    ```
 2. **Copy Content Calendar** - Use template for campaign planning
    ```bash
-   cp ../../marketing-skill/content-creator/assets/content-calendar.md campaign-calendar.md
+   cp ../../marketing-skill/content-creator/assets/content_calendar_template.md campaign-calendar.md
    ```
 3. **Define Brand Voice Target** - Reference brand guidelines for campaign tone
    ```bash
@@ -179,10 +154,10 @@ done
    ```
 4. **Create Content Briefs** - Use brief template for each content piece
 5. **Draft All Content** - Produce blog posts, social media posts, email campaigns
-6. **Validate Before Publishing** - Run analyzers on all campaign content
+6. **Validate Before Publishing** - Review all campaign content against brand guidelines and social media optimization guides
    ```bash
-   python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py campaign-email.md
-   python ../../marketing-skill/content-creator/scripts/seo_optimizer.py campaign-landing-page.md "campaign keyword"
+   cat ../../marketing-skill/content-creator/references/brand_guidelines.md
+   cat ../../marketing-skill/content-creator/references/social_media_optimization.md
    ```
 
 **Expected Output:** Complete campaign content library with consistent brand voice and optimized SEO
@@ -191,52 +166,47 @@ done
 
 ## Integration Examples
 
-### Example 1: Real-Time Content Feedback Loop
+### Example 1: Content Quality Review Workflow
 
 ```bash
 #!/bin/bash
-# content-feedback.sh - Automated content quality check
+# content-review.sh - Content quality review using knowledge bases
 
 CONTENT_FILE=$1
-PRIMARY_KEYWORD=$2
 
-echo "🎨 Checking brand voice..."
-python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py "$CONTENT_FILE"
+echo "Reviewing brand voice guidelines..."
+cat ../../marketing-skill/content-creator/references/brand_guidelines.md
 
 echo ""
-echo "🔍 Checking SEO optimization..."
-python ../../marketing-skill/content-creator/scripts/seo_optimizer.py "$CONTENT_FILE" "$PRIMARY_KEYWORD"
+echo "Reviewing content frameworks..."
+cat ../../marketing-skill/content-creator/references/content_frameworks.md
 
 echo ""
-echo "✅ Analysis complete! Review feedback above and revise content."
+echo "Review complete. Compare $CONTENT_FILE against the guidelines above."
 ```
 
-**Usage:** `./content-feedback.sh blog-post.md "target keyword"`
+**Usage:** `./content-review.sh blog-post.md`
 
-### Example 2: JSON Output for CMS Integration
+### Example 2: Platform-Specific Content Adaptation
 
 ```bash
-# Generate JSON reports for automated publishing pipeline
-python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py article.md json > voice-report.json
-python ../../marketing-skill/content-creator/scripts/seo_optimizer.py article.md "keyword" --json > seo-report.json
+# Review platform guidelines before adapting content
+cat ../../marketing-skill/content-creator/references/social_media_optimization.md
 
-# Use in CI/CD pipeline to block publishing if quality thresholds not met
-SEO_SCORE=$(jq '.overall_score' seo-report.json)
-if [ "$SEO_SCORE" -lt 70 ]; then
-  echo "❌ SEO score too low: $SEO_SCORE. Minimum required: 70"
-  exit 1
-fi
+# Key platform limits to follow:
+# - LinkedIn: 1,300 chars, professional tone, 3-5 hashtags
+# - Twitter/X: 280 chars per tweet, engaging hook
+# - Instagram: Visual-first, caption with line breaks
 ```
 
-### Example 3: Weekly Content Performance Review
+### Example 3: Campaign Content Planning
 
 ```bash
-# Analyze all content published this week
-WEEK_START="2025-11-01"
-find blog/ -name "*.md" -newermt "$WEEK_START" | while read file; do
-  echo "=== Weekly Review: $file ==="
-  python ../../marketing-skill/content-creator/scripts/brand_voice_analyzer.py "$file"
-done
+# Set up content calendar from template
+cp ../../marketing-skill/content-creator/assets/content_calendar_template.md campaign-calendar.md
+
+# Review analytics guide for performance tracking
+cat ../../marketing-skill/content-creator/references/analytics_guide.md
 ```
 
 ## Success Metrics
@@ -259,8 +229,8 @@ done
 ## Related Agents
 
 - [cs-demand-gen-specialist](cs-demand-gen-specialist.md) - Demand generation and acquisition campaigns
-- [cs-product-marketing](../product/cs-product-marketing.md) - Product positioning and messaging (planned)
-- [cs-social-media-manager](cs-social-media-manager.md) - Social media management and scheduling (planned)
+- cs-product-marketing - Product positioning and messaging (planned)
+- cs-social-media-manager - Social media management and scheduling (planned)
 
 ## References
 
diff --git a/agents/marketing/cs-demand-gen-specialist.md b/agents/marketing/cs-demand-gen-specialist.md
index 5e08e4e..0e91e39 100644
--- a/agents/marketing/cs-demand-gen-specialist.md
+++ b/agents/marketing/cs-demand-gen-specialist.md
@@ -34,30 +34,29 @@ The cs-demand-gen-specialist agent bridges the gap between marketing strategy an
 
 ### Knowledge Bases
 
-1. **Acquisition Frameworks**
-   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/acquisition_frameworks.md`
-   - **Content:** Lead generation strategies, conversion optimization frameworks, acquisition funnel templates
-   - **Use Case:** Campaign planning, strategy development, funnel design
+1. **Attribution Guide**
+   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/attribution-guide.md`
+   - **Content:** Marketing attribution models, channel attribution, ROI measurement frameworks
+   - **Use Case:** Campaign attribution, channel performance analysis, budget justification
 
-2. **Channel Best Practices**
-   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/channel_best_practices.md`
-   - **Content:** Paid search (Google Ads), paid social (LinkedIn, Facebook), content marketing, email campaigns
-   - **Use Case:** Channel-specific optimization, budget allocation, A/B testing
+2. **Campaign Templates**
+   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/campaign-templates.md`
+   - **Content:** Reusable campaign structures, launch checklists, multi-channel campaign blueprints
+   - **Use Case:** Campaign planning, rapid campaign setup, standardized launch processes
 
-3. **Conversion Optimization**
-   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/conversion_optimization.md`
-   - **Content:** Landing page best practices, CTA optimization, form optimization, lead magnets
-   - **Use Case:** Conversion rate improvement, landing page design, lead capture optimization
+3. **HubSpot Workflows**
+   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/hubspot-workflows.md`
+   - **Content:** HubSpot automation workflows, lead nurturing sequences, CRM integration patterns
+   - **Use Case:** Marketing automation, lead scoring, nurture campaign setup
+
+4. **International Playbooks**
+   - **Location:** `../../marketing-skill/marketing-demand-acquisition/references/international-playbooks.md`
+   - **Content:** International market expansion strategies, localization best practices, regional channel optimization
+   - **Use Case:** Global campaign planning, market entry strategy, cross-border demand generation
 
 ### Templates
 
-1. **Campaign Planning Template**
-   - **Location:** `../../marketing-skill/marketing-demand-acquisition/assets/campaign-plan.md`
-   - **Use Case:** Multi-channel campaign planning, goal setting
-
-2. **Funnel Analysis Template**
-   - **Location:** `../../marketing-skill/marketing-demand-acquisition/assets/funnel-analysis.md`
-   - **Use Case:** Conversion funnel mapping, bottleneck identification
+No asset templates currently available — use campaign-templates.md reference for campaign structure guidance.
 
 ## Workflows
 
@@ -67,21 +66,21 @@ The cs-demand-gen-specialist agent bridges the gap between marketing strategy an
 
 **Steps:**
 1. **Define Campaign Goals** - Set targets for leads, MQLs, SQLs, conversion rates
-2. **Reference Acquisition Frameworks** - Review proven lead generation strategies
+2. **Reference Campaign Templates** - Review proven campaign structures and launch checklists
    ```bash
-   cat ../../marketing-skill/marketing-demand-acquisition/references/acquisition_frameworks.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/campaign-templates.md
    ```
-3. **Select Channels** - Choose optimal mix based on target audience and budget
+3. **Select Channels** - Choose optimal mix based on target audience, budget, and attribution models
    ```bash
-   cat ../../marketing-skill/marketing-demand-acquisition/references/channel_best_practices.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/attribution-guide.md
    ```
-4. **Create Campaign Plan** - Use template to structure multi-channel approach
+4. **Set Up Automation** - Configure HubSpot workflows for lead nurturing
    ```bash
-   cp ../../marketing-skill/marketing-demand-acquisition/assets/campaign-plan.md q4-demand-gen-campaign.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/hubspot-workflows.md
    ```
-5. **Design Landing Pages** - Reference conversion optimization best practices
+5. **Plan International Reach** - Reference international playbooks if targeting multiple markets
    ```bash
-   cat ../../marketing-skill/marketing-demand-acquisition/references/conversion_optimization.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/international-playbooks.md
    ```
 6. **Launch and Monitor** - Deploy campaigns, track metrics, collect data
 
@@ -99,18 +98,18 @@ The cs-demand-gen-specialist agent bridges the gap between marketing strategy an
    ```bash
    python ../../marketing-skill/marketing-demand-acquisition/scripts/calculate_cac.py campaign-spend.csv conversions.csv
    ```
-3. **Map Conversion Funnel** - Use template to visualize drop-off points
+3. **Map Conversion Funnel** - Visualize drop-off points using campaign templates as structure guide
    ```bash
-   cp ../../marketing-skill/marketing-demand-acquisition/assets/funnel-analysis.md current-funnel-analysis.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/campaign-templates.md
    ```
 4. **Identify Bottlenecks** - Analyze conversion rates at each funnel stage:
    - Awareness → Interest (CTR)
    - Interest → Consideration (landing page conversion)
    - Consideration → Intent (form completion)
    - Intent → Purchase/MQL (qualification rate)
-5. **Reference Optimization Guides** - Review best practices for problem areas
+5. **Reference Attribution Guide** - Review attribution models to identify problem areas
    ```bash
-   cat ../../marketing-skill/marketing-demand-acquisition/references/conversion_optimization.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/attribution-guide.md
    ```
 6. **Implement A/B Tests** - Test hypotheses for improvement
 7. **Re-calculate CAC Post-Optimization** - Measure cost efficiency improvements
@@ -145,9 +144,9 @@ cat cac-report.txt
    ```bash
    python ../../marketing-skill/marketing-demand-acquisition/scripts/calculate_cac.py channel-spend.csv channel-conversions.csv
    ```
-3. **Reference Channel Best Practices** - Understand benchmarks for each channel
+3. **Reference Attribution Guide** - Understand attribution models and benchmarks for each channel
    ```bash
-   cat ../../marketing-skill/marketing-demand-acquisition/references/channel_best_practices.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/attribution-guide.md
    ```
 4. **Calculate Key Metrics:**
    - CAC (Customer Acquisition Cost) by channel
@@ -167,9 +166,9 @@ cat cac-report.txt
 
 **Steps:**
 1. **Define Lead Magnet** - Choose format: ebook, webinar, template, assessment, free trial
-2. **Reference Conversion Best Practices** - Review lead capture optimization strategies
+2. **Reference Campaign Templates** - Review lead capture and campaign structure best practices
    ```bash
-   cat ../../marketing-skill/marketing-demand-acquisition/references/conversion_optimization.md
+   cat ../../marketing-skill/marketing-demand-acquisition/references/campaign-templates.md
    ```
 3. **Create Landing Page** - Design high-converting landing page with:
    - Clear value proposition
@@ -273,8 +272,8 @@ fi
 ## Related Agents
 
 - [cs-content-creator](cs-content-creator.md) - Content creation for demand gen campaigns
-- [cs-product-marketing](../product/cs-product-marketing.md) - Product positioning and messaging (planned)
-- [cs-growth-marketer](cs-growth-marketer.md) - Growth hacking and viral acquisition (planned)
+- cs-product-marketing - Product positioning and messaging (planned)
+- cs-growth-marketer - Growth hacking and viral acquisition (planned)
 
 ## References
 
diff --git a/agents/ra-qm-team/cs-quality-regulatory.md b/agents/ra-qm-team/cs-quality-regulatory.md
index 405ec0d..7581ff1 100644
--- a/agents/ra-qm-team/cs-quality-regulatory.md
+++ b/agents/ra-qm-team/cs-quality-regulatory.md
@@ -1,6 +1,10 @@
 ---
 name: cs-quality-regulatory
 description: Quality & Regulatory agent for ISO 13485 QMS, MDR compliance, FDA submissions, GDPR/DSGVO, and ISMS audits. Orchestrates ra-qm-team skills. Spawn when users need regulatory strategy, audit preparation, CAPA management, risk management, or compliance documentation.
+skills: ra-qm-team
+domain: ra-qm
+model: sonnet
+tools: [Read, Write, Bash, Grep, Glob]
 ---
 
 # cs-quality-regulatory
@@ -68,3 +72,15 @@ Regulatory affairs and quality management specialist for medical device and heal
 - Technical files → structured per Annex II/III with cross-references
 - CAPAs → ISO 13485 Section 8.5.2/8.5.3 compliant format
 - All outputs traceable to regulatory requirements
+
+## Success Metrics
+
+- **Audit Readiness:** Zero critical findings in external audits (ISO 13485, ISO 27001)
+- **CAPA Effectiveness:** 95%+ of CAPAs closed within target timeline with verified effectiveness
+- **Regulatory Submission Success:** First-time acceptance rate >90% for MDR/FDA submissions
+- **Compliance Coverage:** 100% of processing activities documented with valid legal basis (GDPR)
+
+## Related Agents
+
+- [cs-engineering-lead](../engineering-team/cs-engineering-lead.md) -- Engineering process alignment for design controls and software validation
+- [cs-product-manager](../product/cs-product-manager.md) -- Product requirements traceability and risk-benefit analysis coordination
diff --git a/commands/changelog.md b/commands/changelog.md
index befbf17..e9b04f2 100644
--- a/commands/changelog.md
+++ b/commands/changelog.md
@@ -10,21 +10,21 @@ Generate Keep a Changelog entries from git history and validate commit message f
 ## Usage
 
 ```
-/changelog generate [--from <tag>] [--to HEAD]    Generate changelog entries
-/changelog lint [--range <from>..<to>]             Lint commit messages
+/changelog generate [--from-tag <tag>] [--to-tag <tag>]    Generate changelog entries
+/changelog lint [--from-ref <ref>] [--to-ref <ref>]       Lint commit messages
 ```
 
 ## Examples
 
 ```
-/changelog generate --from v2.0.0
-/changelog lint --range main..dev
-/changelog generate --from v2.0.0 --to v2.1.0 --format markdown
+/changelog generate --from-tag v2.0.0
+/changelog lint --from-ref main --to-ref dev
+/changelog generate --from-tag v2.0.0 --to-tag v2.1.0 --format markdown
 ```
 
 ## Scripts
-- `engineering/changelog-generator/scripts/generate_changelog.py` — Parse commits, render changelog
-- `engineering/changelog-generator/scripts/commit_linter.py` — Validate conventional commit format
+- `engineering/changelog-generator/scripts/generate_changelog.py` — Parse commits, render changelog (`--from-tag`, `--to-tag`, `--from-ref`, `--to-ref`, `--format markdown|json`)
+- `engineering/changelog-generator/scripts/commit_linter.py` — Validate conventional commit format (`--from-ref`, `--to-ref`, `--strict`, `--format text|json`)
 
 ## Skill Reference
 → `engineering/changelog-generator/SKILL.md`
diff --git a/commands/okr.md b/commands/okr.md
index 660190f..5d5f910 100644
--- a/commands/okr.md
+++ b/commands/okr.md
@@ -13,7 +13,7 @@ Generate cascaded OKR frameworks from company-level strategy down to team-level
 /okr generate <strategy>                                     Generate OKR cascade
 ```
 
-Supported strategies: `growth`, `retention`, `revenue`, `innovation`
+Supported strategies: `growth`, `retention`, `revenue`, `innovation`, `operational`
 
 ## Input Format
 
@@ -26,11 +26,12 @@ Pass a strategy keyword directly. The generator produces company, department, an
 /okr generate retention
 /okr generate revenue
 /okr generate innovation
-/okr generate growth --format json --output okrs.json
+/okr generate operational
+/okr generate growth --json
 ```
 
 ## Scripts
-- `product-team/product-strategist/scripts/okr_cascade_generator.py` — OKR cascade generator
+- `product-team/product-strategist/scripts/okr_cascade_generator.py` — OKR cascade generator (`<strategy> [--teams "A,B,C"] [--contribution 0.3] [--json]`)
 
 ## Skill Reference
 > `product-team/product-strategist/SKILL.md`
diff --git a/commands/persona.md b/commands/persona.md
index f3bc235..c37b1e0 100644
--- a/commands/persona.md
+++ b/commands/persona.md
@@ -11,7 +11,7 @@ Generate structured user personas with demographics, goals, pain points, and beh
 
 ```
 /persona generate                                            Generate persona (interactive)
-/persona generate --output json                              Generate persona as JSON
+/persona generate json                                       Generate persona as JSON
 ```
 
 ## Input Format
@@ -29,12 +29,12 @@ Interactive mode prompts for product context. Alternatively, provide context inl
 
 ```
 /persona generate
-/persona generate --output json
-/persona generate --output json > persona-eng-manager.json
+/persona generate json
+/persona generate json > persona-eng-manager.json
 ```
 
 ## Scripts
-- `product-team/ux-researcher-designer/scripts/persona_generator.py` — Persona generator
+- `product-team/ux-researcher-designer/scripts/persona_generator.py` — Persona generator (positional `json` arg for JSON output)
 
 ## Skill Reference
 > `product-team/ux-researcher-designer/SKILL.md`
diff --git a/commands/pipeline.md b/commands/pipeline.md
index 11f73ef..727f868 100644
--- a/commands/pipeline.md
+++ b/commands/pipeline.md
@@ -10,21 +10,21 @@ Detect project stack and generate CI/CD pipeline configurations for GitHub Actio
 ## Usage
 
 ```
-/pipeline detect [<project-dir>]                    Detect stack, tools, and services
-/pipeline generate [--platform github|gitlab]       Generate pipeline YAML
+/pipeline detect [--repo <project-dir>]               Detect stack, tools, and services
+/pipeline generate --platform github|gitlab [--repo <project-dir>]  Generate pipeline YAML
 ```
 
 ## Examples
 
 ```
-/pipeline detect ./my-project
-/pipeline generate --platform github
-/pipeline generate --platform gitlab --stages build,test,deploy
+/pipeline detect --repo ./my-project
+/pipeline generate --platform github --repo .
+/pipeline generate --platform gitlab --repo .
 ```
 
 ## Scripts
-- `engineering/ci-cd-pipeline-builder/scripts/stack_detector.py` — Detect stack and tooling
-- `engineering/ci-cd-pipeline-builder/scripts/pipeline_generator.py` — Generate pipeline YAML
+- `engineering/ci-cd-pipeline-builder/scripts/stack_detector.py` — Detect stack and tooling (`--repo <path>`, `--format text|json`)
+- `engineering/ci-cd-pipeline-builder/scripts/pipeline_generator.py` — Generate pipeline YAML (`--platform github|gitlab`, `--repo <path>`, `--input <stack.json>`, `--output <file>`)
 
 ## Skill Reference
 → `engineering/ci-cd-pipeline-builder/SKILL.md`
diff --git a/commands/project-health.md b/commands/project-health.md
index 92c73d9..9bc4d4c 100644
--- a/commands/project-health.md
+++ b/commands/project-health.md
@@ -32,12 +32,12 @@ Generate portfolio health dashboards and risk matrices for project oversight.
 ```
 /project-health dashboard portfolio-q2.json
 /project-health risk risk-register.json
-/project-health dashboard portfolio-q2.json --format json --output dashboard.json
+/project-health dashboard portfolio-q2.json --format json
 ```
 
 ## Scripts
-- `project-management/senior-pm/scripts/project_health_dashboard.py` — Health dashboard
-- `project-management/senior-pm/scripts/risk_matrix_analyzer.py` — Risk matrix analyzer
+- `project-management/senior-pm/scripts/project_health_dashboard.py` — Health dashboard (`<data_file> [--format text|json]`)
+- `project-management/senior-pm/scripts/risk_matrix_analyzer.py` — Risk matrix analyzer (`<data_file> [--format text|json]`)
 
 ## Skill Reference
 > `project-management/senior-pm/SKILL.md`
diff --git a/commands/retro.md b/commands/retro.md
index bde72aa..c765662 100644
--- a/commands/retro.md
+++ b/commands/retro.md
@@ -32,11 +32,11 @@ Analyze retrospective data for recurring themes, sentiment trends, and action it
 
 ```
 /retro analyze sprint-24-retro.json
-/retro analyze sprint-24-retro.json --format json --output retro-report.json
+/retro analyze sprint-24-retro.json --format json
 ```
 
 ## Scripts
-- `project-management/scrum-master/scripts/retrospective_analyzer.py` — Retrospective analyzer
+- `project-management/scrum-master/scripts/retrospective_analyzer.py` — Retrospective analyzer (`<data_file> [--format text|json]`)
 
 ## Skill Reference
 > `project-management/scrum-master/SKILL.md`
diff --git a/commands/rice.md b/commands/rice.md
index fa59cf0..726e0f9 100644
--- a/commands/rice.md
+++ b/commands/rice.md
@@ -29,11 +29,11 @@ Mobile app,20000,3,0.5,13
 ```
 /rice prioritize features.csv
 /rice prioritize features.csv --capacity 20
-/rice prioritize features.csv --format json --output prioritized.json
+/rice prioritize features.csv --output json
 ```
 
 ## Scripts
-- `product-team/product-manager-toolkit/scripts/rice_prioritizer.py` — RICE prioritizer
+- `product-team/product-manager-toolkit/scripts/rice_prioritizer.py` — RICE prioritizer (`<input.csv> [--capacity N] [--output text|json|csv]`)
 
 ## Skill Reference
 > `product-team/product-manager-toolkit/SKILL.md`
diff --git a/commands/sprint-health.md b/commands/sprint-health.md
index a2fced7..76708e7 100644
--- a/commands/sprint-health.md
+++ b/commands/sprint-health.md
@@ -32,12 +32,12 @@ Score sprint health across delivery, quality, and team metrics with velocity tre
 ```
 /sprint-health analyze sprint-24.json
 /sprint-health velocity last-6-sprints.json
-/sprint-health analyze sprint-24.json --format json --output report.json
+/sprint-health analyze sprint-24.json --format json
 ```
 
 ## Scripts
-- `project-management/scrum-master/scripts/sprint_health_scorer.py` — Sprint health scorer
-- `project-management/scrum-master/scripts/velocity_analyzer.py` — Velocity analyzer
+- `project-management/scrum-master/scripts/sprint_health_scorer.py` — Sprint health scorer (`<data_file> [--format text|json]`)
+- `project-management/scrum-master/scripts/velocity_analyzer.py` — Velocity analyzer (`<data_file> [--format text|json]`)
 
 ## Skill Reference
 > `project-management/scrum-master/SKILL.md`
diff --git a/commands/tdd.md b/commands/tdd.md
index b387bd6..9eb41c6 100644
--- a/commands/tdd.md
+++ b/commands/tdd.md
@@ -24,9 +24,13 @@ Generate tests, analyze coverage, and validate test quality using the TDD Guide
 ```
 
 ## Scripts
-- `engineering-team/tdd-guide/scripts/test_generator.py` — Generate test cases
-- `engineering-team/tdd-guide/scripts/coverage_analyzer.py` — Coverage analysis
-- `engineering-team/tdd-guide/scripts/test_quality_checker.py` — Quality validation
+- `engineering-team/tdd-guide/scripts/test_generator.py` — Test case generation (library module)
+- `engineering-team/tdd-guide/scripts/coverage_analyzer.py` — Coverage analysis (library module)
+- `engineering-team/tdd-guide/scripts/tdd_workflow.py` — TDD workflow orchestration (library module)
+- `engineering-team/tdd-guide/scripts/fixture_generator.py` — Test fixture generation (library module)
+- `engineering-team/tdd-guide/scripts/metrics_calculator.py` — TDD metrics calculation (library module)
+
+> **Note:** These scripts are library modules without CLI entry points. Import them in Python or use via the SKILL.md workflow guidance.
 
 ## Skill Reference
 → `engineering-team/tdd-guide/SKILL.md`
diff --git a/commands/tech-debt.md b/commands/tech-debt.md
index 50ff346..9fe0cab 100644
--- a/commands/tech-debt.md
+++ b/commands/tech-debt.md
@@ -11,24 +11,22 @@ Scan codebases for technical debt, score severity, and generate prioritized reme
 
 ```
 /tech-debt scan <project-dir>           Scan for debt indicators
-/tech-debt score <project-dir>          Calculate debt score (0-100)
-/tech-debt report <project-dir>         Full report with remediation plan
+/tech-debt prioritize <inventory.json>  Prioritize debt backlog
+/tech-debt report <project-dir>         Full dashboard with trends
 ```
 
 ## Examples
 
 ```
 /tech-debt scan ./src
-/tech-debt score . --format json
-/tech-debt report . --output debt-report.md
+/tech-debt scan . --format json
+/tech-debt report . --format json --output debt-report.json
 ```
 
 ## Scripts
-- `engineering/tech-debt-tracker/scripts/debt_scanner.py` — Detect debt patterns
-- `engineering/tech-debt-tracker/scripts/debt_scorer.py` — Calculate severity scores
-- `engineering/tech-debt-tracker/scripts/remediation_planner.py` — Generate fix plans
-- `engineering/tech-debt-tracker/scripts/trend_tracker.py` — Track debt over time
-- `engineering/tech-debt-tracker/scripts/cost_estimator.py` — Estimate remediation cost
+- `engineering/tech-debt-tracker/scripts/debt_scanner.py` — Scan for debt patterns (`debt_scanner.py <directory> [--format json] [--output file]`)
+- `engineering/tech-debt-tracker/scripts/debt_prioritizer.py` — Prioritize debt backlog (`debt_prioritizer.py <inventory.json> [--framework cost_of_delay|wsjf|rice] [--format json]`)
+- `engineering/tech-debt-tracker/scripts/debt_dashboard.py` — Generate debt dashboard (`debt_dashboard.py [files...] [--input-dir dir] [--period weekly|monthly|quarterly] [--format json]`)
 
 ## Skill Reference
 → `engineering/tech-debt-tracker/SKILL.md`
diff --git a/commands/user-story.md b/commands/user-story.md
index b9984ce..4a4d97e 100644
--- a/commands/user-story.md
+++ b/commands/user-story.md
@@ -32,13 +32,12 @@ Interactive mode prompts for feature context. For sprint planning, provide capac
 
 ```
 /user-story generate
-/user-story generate --output json
 /user-story sprint 34
-/user-story sprint 21 --format json --output sprint-plan.json
+/user-story sprint 21
 ```
 
 ## Scripts
-- `product-team/agile-product-owner/scripts/user_story_generator.py` — User story generator
+- `product-team/agile-product-owner/scripts/user_story_generator.py` — User story generator (positional args: `sprint <capacity>`)
 
 ## Skill Reference
 > `product-team/agile-product-owner/SKILL.md`