diff --git a/.claude/commands/analyze.md b/.claude/commands/analyze.md
index c6f99b3..3b3e3ed 100644
--- a/.claude/commands/analyze.md
+++ b/.claude/commands/analyze.md
@@ -1,14 +1,10 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | anlz | analyze |
-| & | and/with | | perf | performance |
-| w/ | with | | arch | architecture |
+@include shared/constants.yml#Process_Symbols
 
 @include shared/command-templates.yml#Command_Header
 
 Multi-dimensional analysis on code, arch, or problem in $ARGUMENTS.
 
+@include shared/command-templates.yml#Universal_Flags
 @see shared/thinking-modes.yml ∀ thinking flags
 @see shared/mcp-flags.yml ∀ MCP controls
 
@@ -33,8 +29,8 @@ Analysis modes:
 
 **--interactive:** Guided exploration | Step-by-step fixes | Live improvement
 
-@see shared/research-first.yml ∀ research requirements
+@include shared/command-templates.yml#Research_Requirements
 
-Report: `.claudedocs/reports/analysis-<type>-<timestamp>.md` | Create dir: `mkdir -p .claudedocs/reports/` | Ref: "📄 Analysis report→[path]"
+@include shared/command-templates.yml#Report_Output
 
-Deliverables: Analysis report, root causes, prioritized action plan w/ recommendations.
\ No newline at end of file
+Deliverables: @include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/build.md b/.claude/commands/build.md
index e666087..bd40281 100644
--- a/.claude/commands/build.md
+++ b/.claude/commands/build.md
@@ -1,14 +1,10 @@
-## Legend  
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | bld | build |
-| & | and/with | | impl | implementation |
-| w/ | with | | TDD | test-driven development |
+@include shared/constants.yml#Process_Symbols
 
 @include shared/command-templates.yml#Command_Header
 
 Build project/feature based on req in $ARGUMENTS.
 
+@include shared/command-templates.yml#Universal_Flags
 @see shared/mcp-flags.yml ∀ MCP controls
 
 Examples:
@@ -33,8 +29,7 @@ Templates:
 **--watch:** Continuous build | Real-time feedback | Incremental | Live reload
 **--interactive:** Step-by-step cfg | Interactive deps | Build customization
 
-@see shared/research-first.yml ∀ research req
+@include shared/command-templates.yml#Research_Requirements
+@include shared/execution-lifecycle.yml#Standard_Lifecycle
 
-Workflow: Research→Setup→Impl→Test→Integrate
-
-Deliverables: Working code, tests, docs, integration instructions.
\ No newline at end of file
+Deliverables: @include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/cleanup.md b/.claude/commands/cleanup.md
index 7d259ac..6ace4c8 100644
--- a/.claude/commands/cleanup.md
+++ b/.claude/commands/cleanup.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | cfg | configuration |
-| & | and/with | | deps | dependencies |
-| w/ | with | | perf | performance |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Clean up project artifacts, code & cfg specified in $ARGUMENTS.
 
@@ -41,13 +36,9 @@ Clean up project artifacts, code & cfg specified in $ARGUMENTS.
 
 ## Integration & Best Practices
 
-Research requirements:
-- Project patterns→C7 framework-specific cleanup | Build tools→verify safe procedures for stack
-- Git ops→WebSearch safe practices & warnings | Deps mgmt→check official package mgr guidance
-- Never cleanup w/o understanding impact - verify patterns | Cite sources: // Source: [cleanup guide ref]
+@include shared/command-templates.yml#Research_Requirements
 
-Report Output:
-- Cleanup summaries: `.claudedocs/reports/cleanup-<type>-<timestamp>.md`
+@include shared/command-templates.yml#Report_Output
 - Space savings: `.claudedocs/metrics/cleanup-savings-<timestamp>.md`
 - Ensure dirs: `mkdir -p .claudedocs/reports/ .claudedocs/metrics/`
 - Include location: "📄 Cleanup report saved to: [path]"
diff --git a/.claude/commands/deploy.md b/.claude/commands/deploy.md
index 9de31e1..03064d9 100644
--- a/.claude/commands/deploy.md
+++ b/.claude/commands/deploy.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | env | environment |
-| & | and/with | | prod | production |
-| w/ | with | | perf | performance |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Deploy application to env specified in $ARGUMENTS.
 
@@ -53,16 +48,8 @@ Safety:
 - Always have rollback plan | Backups before deployment
 - Monitor key metrics during deployment | Gradual rollout→major changes
 
-Research requirements:
-- Infrastructure patterns→WebSearch cloud provider practices & docs
-- CI/CD patterns→verify w/ platform-specific guides | Monitoring→research observability patterns
-- Security hardening→check security guides & compliance | Never deploy on assumptions
-- All cfg cite sources: // Source: [deployment guide ref]
+@include shared/command-templates.yml#Research_Requirements
 
-Report Output:
-- Deployment logs: `.claudedocs/reports/deployment-<env>-<timestamp>.md`
-- Health checks: `.claudedocs/metrics/health-check-<timestamp>.md`
-- Ensure dirs: `mkdir -p .claudedocs/reports/ .claudedocs/metrics/`
-- Include location: "📄 Deployment report saved to: [path]"
+@include shared/command-templates.yml#Report_Output
 
-Deliverables: Deployment log w/ timestamps, health check results, perf metrics comparison, rollback instructions & verification report.
\ No newline at end of file
+@include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/design.md b/.claude/commands/design.md
index 707a17a..3dd059c 100644
--- a/.claude/commands/design.md
+++ b/.claude/commands/design.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | API | application programming interface |
-| & | and/with | | DDD | domain-driven design |
-| w/ | with | | PRD | product requirements document |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Design & architect software solutions based on requirements in $ARGUMENTS.
 
diff --git a/.claude/commands/dev-setup.md b/.claude/commands/dev-setup.md
index 391c073..4402675 100644
--- a/.claude/commands/dev-setup.md
+++ b/.claude/commands/dev-setup.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | CI/CD | continuous integration/deployment |
-| & | and/with | | cfg | configuration |
-| w/ | with | | env | environment |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Setup comprehensive dev env or CI/CD pipeline based on $ARGUMENTS.
 
@@ -35,15 +30,8 @@ Examples:
 
 Ensure all cfgs follow security practices & include comprehensive docs.
 
-Research requirements:
-- Dev tools→C7 docs for installation & cfg patterns | CI/CD platforms→WebSearch platform-specific practices & guides
-- Security tools→research OWASP & security scanning docs | Monitoring→check official observability platform docs
-- Never cfg w/o docs - verify setup patterns | All cfgs cite sources: // Source: [setup guide ref]
+@include shared/command-templates.yml#Research_Requirements
 
-Report Output:
-- Setup logs: `.claudedocs/reports/dev-setup-<timestamp>.md`
-- Cfg summaries: `.claudedocs/summaries/environment-config-<timestamp>.md`
-- Ensure dirs: `mkdir -p .claudedocs/reports/ .claudedocs/summaries/`
-- Include location: "📄 Setup report saved to: [path]"
+@include shared/command-templates.yml#Report_Output
 
-Deliverables: Cfg scripts, CI/CD pipeline files, setup docs, env-specific cfgs & security validation report.
\ No newline at end of file
+@include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/document.md b/.claude/commands/document.md
index 2b33695..664bf69 100644
--- a/.claude/commands/document.md
+++ b/.claude/commands/document.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | API | application programming interface |
-| & | and/with | | UX | user experience |
-| w/ | with | | FAQ | frequently asked questions |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Create comprehensive docs for code, API, or system specified in $ARGUMENTS.
 
diff --git a/.claude/commands/estimate.md b/.claude/commands/estimate.md
index 8844cf4..fbb290f 100644
--- a/.claude/commands/estimate.md
+++ b/.claude/commands/estimate.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | E2E | end-to-end |
-| & | and/with | | deps | dependencies |
-| w/ | with | | impl | implementation |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Provide comprehensive time & complexity estimates for task in $ARGUMENTS.
 
diff --git a/.claude/commands/explain.md b/.claude/commands/explain.md
index 81096e2..d0de1fe 100644
--- a/.claude/commands/explain.md
+++ b/.claude/commands/explain.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | MCP | model context protocol |
-| & | and/with | | impl | implementation |
-| w/ | with | | perf | performance |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Provide comprehensive explanations of concepts, code, or systems in $ARGUMENTS.
 
diff --git a/.claude/commands/git.md b/.claude/commands/git.md
index 6f80c22..ca30f5f 100644
--- a/.claude/commands/git.md
+++ b/.claude/commands/git.md
@@ -40,7 +40,7 @@ Git operations:
 
 @see shared/git-workflow.yml ∀ best practices
 @see shared/checkpoint.yml ∀ checkpoint system
-@see shared/error-recovery-enhanced.yml ∀ safety checks
+@see shared/error-handling.yml ∀ safety checks
 
 Workflow: Check status→Create chkpt→Execute→Verify→Sync
 
diff --git a/.claude/commands/improve.md b/.claude/commands/improve.md
index 969a486..b78669b 100644
--- a/.claude/commands/improve.md
+++ b/.claude/commands/improve.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | perf | performance |
-| & | and/with | | ops | operations |
-| w/ | with | | impl | implementation |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Improve code, perf, or quality of system specified in $ARGUMENTS.
 
@@ -160,24 +155,8 @@ Balance considerations:
 - Speed vs correctness
 - Present vs future needs
 
-## Research Requirements
+@include shared/command-templates.yml#Research_Requirements
 
-All optimization patterns must be verified:
-- Performance optimizations → Research benchmarks and best practices via WebSearch
-- Framework-specific improvements → C7 documentation lookup required
-- Algorithm changes → Verify complexity analysis with authoritative sources
-- Caching strategies → Check official recommendations for the platform
-- Never apply "common" optimizations without documentation backing
-- All improvements must cite sources: // Source: [optimization guide reference]
+@include shared/command-templates.yml#Report_Output
 
-Report Output:
-- Quality metrics: `.claudedocs/metrics/quality-<timestamp>.md`
-- Performance benchmarks: `.claudedocs/metrics/performance-<timestamp>.md`
-- Iteration logs: `.claudedocs/summaries/iteration-log-<timestamp>.md`
-- Ensure directory exists: `mkdir -p .claudedocs/metrics/ .claudedocs/summaries/`
-- Include report location in output: "📄 Report saved to: [path]"
-
-Deliverables:
-- For quality: Refactored code, quality metrics report, improvement documentation
-- For performance: Optimized system, performance benchmarks, bottleneck analysis
-- For iterate: Final metrics, iteration log, recommendations for future improvements
\ No newline at end of file
+@include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/index.md b/.claude/commands/index.md
index a9ff2a0..0136354 100644
--- a/.claude/commands/index.md
+++ b/.claude/commands/index.md
@@ -1,11 +1,6 @@
 # SuperClaude Commands Index
 
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | MCP | model context protocol |
-| & | and/with | | UI | user interface |
-| w/ | with | | docs | documentation |
+@include shared/constants.yml#Process_Symbols
 
 ## Command Usage
 All commands use `/user:` prefix. Examples:
@@ -132,23 +127,28 @@ Planning for Complex Operations:
   Cleanup: cleanup --all --dry-run → review → cleanup --all
 ```
 
-## Shared Resources (22 files)
+## Shared Resources (37 files)
 - `ambiguity-check.yml`: Ambiguity detection & resolution
 - `audit.yml`: Audit configurations & logging
 - `checkpoint.yml`: Checkpoint management & rollback
 - `cleanup-patterns.yml`: Cleanup safety rules & patterns
 - `command-memory.yml`: Enhanced command result sharing & context management
+- `command-templates.yml`: Token-optimized reusable command patterns
+- `constants.yml`: Universal constants & shared values
 - `documentation-dirs.yml`: Documentation directory standards
-- `error-recovery.yml`: Error handling & resilience patterns (NEW)
+- `error-handling.yml`: Error handling & resilience patterns
 - `evidence.yml`: Evidence tracking & validation
+- `execution-lifecycle.yml`: Command execution flow & lifecycle management
 - `git-workflow.yml`: Git integration patterns
 - `implementation.yml`: Implementation hooks & behaviors
 - `loading-config.yml`: Token optimization & lazy loading
 - `mcp-flags.yml`: Enhanced MCP server control via flags
 - `patterns.yml`: Enhanced common workflows & command integration patterns
-- `performance-monitoring.yml`: Self-monitoring metrics
+- `performance.yml`: Performance monitoring & metrics
 - `planning-mode.yml`: Risk assessment & planning configuration
 - `research-first.yml`: Mandatory research & documentation requirements
+- `severity-levels.yml`: Severity classification & escalation paths
+- `task-system.yml`: Comprehensive task management & workflow system
 - `thinking-modes.yml`: Thinking depth configuration & flags
 - `ultracompressed.yml`: ~70% token reduction documentation mode
 - `user-experience.yml`: User interface & interaction patterns (NEW)
diff --git a/.claude/commands/load.md b/.claude/commands/load.md
index f9d9511..e619223 100644
--- a/.claude/commands/load.md
+++ b/.claude/commands/load.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | cfg | configuration |
-| & | and/with | | deps | dependencies |
-| w/ | with | | CI/CD | continuous integration/deployment |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Load & analyze project context in $ARGUMENTS→build comprehensive understanding.
 
diff --git a/.claude/commands/migrate.md b/.claude/commands/migrate.md
index 6dcc7a5..448fd30 100644
--- a/.claude/commands/migrate.md
+++ b/.claude/commands/migrate.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | DB | database |
-| & | and/with | | perf | performance |
-| w/ | with | | arch | architecture |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Execute comprehensive DB or code migration based on specs in $ARGUMENTS.
 
diff --git a/.claude/commands/scan.md b/.claude/commands/scan.md
index f2173b6..aa00df7 100644
--- a/.claude/commands/scan.md
+++ b/.claude/commands/scan.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | cfg | configuration |
-| & | and/with | | deps | dependencies |
-| w/ | with | | vuln | vulnerability |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Scan code, ops, or systems→security vulns & safety issues in $ARGUMENTS.
 
@@ -163,12 +158,6 @@ Best practices:
 - Automate where possible
 - Document exceptions with justification
 
-Report Output:
-- Safety reports: `.claudedocs/reports/safety-scan-<timestamp>.md`
-- Security reports: `.claudedocs/reports/security-scan-<timestamp>.md`
-- Ensure directory exists: `mkdir -p .claudedocs/reports/`
-- Include report location in output: "📄 Scan report saved to: [path]"
+@include shared/command-templates.yml#Report_Output
 
-Deliverables:
-- For validate: Safety report, risk score, proceed/block recommendation
-- For security: Vulnerability report, remediation guide, risk assessment, compliance status
\ No newline at end of file
+@include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/spawn.md b/.claude/commands/spawn.md
index bbabc43..fb19509 100644
--- a/.claude/commands/spawn.md
+++ b/.claude/commands/spawn.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | UI/UX | user interface/experience |
-| & | and/with | | auth | authentication |
-| w/ | with | | impl | implementation |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Spawn specialized sub-agent→handle specific task in $ARGUMENTS.
 
diff --git a/.claude/commands/task.md b/.claude/commands/task.md
index 9b27781..c653c28 100644
--- a/.claude/commands/task.md
+++ b/.claude/commands/task.md
@@ -1,6 +1,6 @@
 # /task: - Task Management & Session Recovery
 
-@task-management.yml
+@see shared/task-system.yml
 
 ## Purpose
 Manage complex features & requirements across sessions with automatic breakdown, context preservation & recovery.
diff --git a/.claude/commands/test.md b/.claude/commands/test.md
index 69bcf2c..6bc9e4a 100644
--- a/.claude/commands/test.md
+++ b/.claude/commands/test.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | E2E | end-to-end |
-| & | and/with | | MCP | model context protocol |
-| w/ | with | | DB | database |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Create or run comprehensive tests for code in $ARGUMENTS.
 
@@ -65,18 +60,8 @@ Follow testing standards:
 - Create fixtures for consistent test data
 - Ensure tests are independent and can run in any order
 
-Research requirements for testing:
-- Testing frameworks → C7 documentation lookup for framework-specific patterns
-- Test patterns → Must verify with official testing guides and best practices
-- E2E testing → WebSearch for accessibility and user experience standards
-- Performance testing → Research benchmarking patterns for the specific stack
-- Never implement test patterns without documentation backing
-- All test implementations must cite sources: // Source: [testing guide reference]
+@include shared/command-templates.yml#Research_Requirements
 
-Report Output:
-- Coverage reports: `.claudedocs/metrics/coverage-<timestamp>.html`
-- Test summaries: `.claudedocs/summaries/test-results-<timestamp>.md`
-- Ensure directory exists: `mkdir -p .claudedocs/metrics/ .claudedocs/summaries/`
-- Include report location in output: "📄 Coverage report saved to: [path]"
+@include shared/command-templates.yml#Report_Output
 
-Deliverables: Comprehensive test suite, coverage reports, testing documentation, and test strategy guide.
\ No newline at end of file
+@include shared/constants.yml#Success_Messages
\ No newline at end of file
diff --git a/.claude/commands/troubleshoot.md b/.claude/commands/troubleshoot.md
index 9c4e0cf..13ce784 100644
--- a/.claude/commands/troubleshoot.md
+++ b/.claude/commands/troubleshoot.md
@@ -1,11 +1,6 @@
-## Legend
-| Symbol | Meaning | | Abbrev | Meaning |
-|--------|---------|---|--------|---------|
-| → | leads to | | prod | production |
-| & | and/with | | impl | implementation |
-| w/ | with | | info | information |
+@include shared/constants.yml#Process_Symbols
 
-Execute immediately. Add --plan flag if user wants to see plan first.
+@include shared/command-templates.yml#Universal_Flags
 
 Troubleshoot & resolve issues in code or system in $ARGUMENTS.
 
@@ -91,21 +86,8 @@ For production issues:
 - Analyze resource utilization
 - Consider rollback if critical
 
-Research before fixing:
-- Search for known issues → WebSearch "[error message] [library version]"
-- Check library bug trackers → C7 documentation for known problems
-- Verify error patterns → Official troubleshooting guides required
-- Framework-specific issues → Must check official documentation first
-- Never assume root cause without researching similar cases
-- Document all research sources in fix explanation
+@include shared/command-templates.yml#Research_Requirements
 
-Report Output:
-- Root cause analysis: `.claudedocs/incidents/rca-<timestamp>.md`
-- Incident documentation: `.claudedocs/incidents/incident-<timestamp>.md`
-- Investigation findings: `.claudedocs/reports/investigation-<timestamp>.md`
-- Ensure directory exists: `mkdir -p .claudedocs/incidents/ .claudedocs/reports/`
-- Include report location in output: "📄 Report saved to: [path]"
+@include shared/command-templates.yml#Report_Output
 
-Deliverables: 
-- For investigation: Root cause analysis, detailed findings report, recommended solutions
-- For fix: Implemented solution with tests, prevention measures, incident documentation
\ No newline at end of file
+@include shared/constants.yml#Success_Messages
\ No newline at end of file