diff --git a/.claude/agents/action-planning-agent.md b/.claude/agents/action-planning-agent.md
index afddc4d6..cb26b061 100644
--- a/.claude/agents/action-planning-agent.md
+++ b/.claude/agents/action-planning-agent.md
@@ -268,7 +268,7 @@ Generate `TODO_LIST.md` at `.workflow/{session_id}/TODO_LIST.md`:
 - Completed tasks → summaries: `[✅](./.summaries/IMPL-XXX-summary.md)`
 - Consistent ID schemes: IMPL-XXX, IMPL-XXX.Y (max 2 levels)
 
-**Format Specifications**: @~/.claude/workflows/workflow-architecture.md
+
 
 ### 5. Complexity Assessment & Document Structure
 Use `analysis_results.complexity` or task count to determine structure:
@@ -299,7 +299,6 @@ Use `analysis_results.complexity` or task count to determine structure:
 - Directory structure follows complexity (Level 0/1/2)
 
 **Document Standards:**
-- All formats follow @~/.claude/workflows/workflow-architecture.md
 - Proper linking between documents
 - Consistent navigation and references
 
diff --git a/.claude/agents/code-developer.md b/.claude/agents/code-developer.md
index 221e237e..c3003bec 100644
--- a/.claude/agents/code-developer.md
+++ b/.claude/agents/code-developer.md
@@ -254,7 +254,7 @@ When step contains `command` field with Codex CLI, execute via Bash tool. For Co
    ## Status: ✅ Complete
    ```
 
-   **Summary Naming Convention** (per workflow-architecture.md):
+   **Summary Naming Convention**:
    - **Main tasks**: `IMPL-[task-id]-summary.md` (e.g., `IMPL-001-summary.md`)
    - **Subtasks**: `IMPL-[task-id].[subtask-id]-summary.md` (e.g., `IMPL-001.1-summary.md`)
    - **Location**: Always in `.summaries/` directory within session workflow folder
diff --git a/.claude/commands/cli/analyze.md b/.claude/commands/cli/analyze.md
index 4b5d0f6e..2652b28b 100644
--- a/.claude/commands/cli/analyze.md
+++ b/.claude/commands/cli/analyze.md
@@ -147,5 +147,4 @@ RULES: [auto-selected template] | Focus on [analysis aspect]
 ## Notes
 
 - Command templates, file patterns, and best practices: see intelligent-tools-strategy.md (loaded in memory)
-- Scratchpad directory details: see workflow-architecture.md
 - Scratchpad files can be promoted to workflow sessions if analysis proves valuable
diff --git a/.claude/commands/cli/chat.md b/.claude/commands/cli/chat.md
index f797dbf2..a6b6777c 100644
--- a/.claude/commands/cli/chat.md
+++ b/.claude/commands/cli/chat.md
@@ -145,5 +145,4 @@ RULES: Focus on clarity and accuracy
 ## Notes
 
 - Command templates and file patterns: see intelligent-tools-strategy.md (loaded in memory)
-- Scratchpad directory details: see workflow-architecture.md
 - Scratchpad conversations preserved for future reference
diff --git a/.claude/commands/cli/codex-execute.md b/.claude/commands/cli/codex-execute.md
index 75f9f307..840af018 100644
--- a/.claude/commands/cli/codex-execute.md
+++ b/.claude/commands/cli/codex-execute.md
@@ -515,6 +515,5 @@ AskUserQuestion({
 **Context Window**: `codex exec "..." resume --last` maintains conversation history, ensuring consistency across subtasks without redundant context injection.
 
 **Output Details**:
-- Output routing and scratchpad details: see workflow-architecture.md
 - Session management: see intelligent-tools-strategy.md
 - **⚠️ Code Modification**: This command performs multi-stage code modifications - execution log tracks all changes
diff --git a/.claude/commands/cli/discuss-plan.md b/.claude/commands/cli/discuss-plan.md
index a23a8729..5180e67d 100644
--- a/.claude/commands/cli/discuss-plan.md
+++ b/.claude/commands/cli/discuss-plan.md
@@ -317,5 +317,4 @@ Each round's output is structured as:
 -   **Priority System**: Ensures Gemini leads analysis, Codex provides critique, Claude synthesizes
 -   **Output Quality**: Multi-perspective discussion produces more robust plans than single-model analysis
 -   Command patterns and session management: see intelligent-tools-strategy.md (loaded in memory)
--   Output routing details: see workflow-architecture.md
 -   For implementation after discussion, use `/cli:execute` or `/cli:codex-execute` separately
diff --git a/.claude/commands/cli/execute.md b/.claude/commands/cli/execute.md
index 124bae73..34c83a43 100644
--- a/.claude/commands/cli/execute.md
+++ b/.claude/commands/cli/execute.md
@@ -218,5 +218,4 @@ The agent handles all phases internally, including complexity-based tool selecti
 ## Notes
 
 - Command templates, YOLO mode details, and session management: see intelligent-tools-strategy.md (loaded in memory)
-- Output routing and scratchpad details: see workflow-architecture.md
 - **⚠️ Code Modification**: This command modifies code - execution logs document changes made
diff --git a/.claude/commands/cli/mode/bug-index.md b/.claude/commands/cli/mode/bug-index.md
index 83e94f69..8fa03708 100644
--- a/.claude/commands/cli/mode/bug-index.md
+++ b/.claude/commands/cli/mode/bug-index.md
@@ -159,6 +159,5 @@ rg "error|exception" -g "*.ts"
 ## Notes
 
 - Command templates and file patterns: see intelligent-tools-strategy.md (loaded in memory)
-- Scratchpad directory details: see workflow-architecture.md
 - Template path: `~/.claude/prompt-templates/bug-fix.md`
 - Uses `@**/*` for in CONTEXT field for comprehensive codebase context
diff --git a/.claude/commands/cli/mode/code-analysis.md b/.claude/commands/cli/mode/code-analysis.md
index 639910e8..49812cab 100644
--- a/.claude/commands/cli/mode/code-analysis.md
+++ b/.claude/commands/cli/mode/code-analysis.md
@@ -165,6 +165,5 @@ rg "authenticate|login" -g "*.ts"
 ## Notes
 
 - Command templates and file patterns: see intelligent-tools-strategy.md (loaded in memory)
-- Scratchpad directory details: see workflow-architecture.md
 - Template path: `~/.claude/prompt-templates/code-analysis.md`
 - Uses `@**/*` for in CONTEXT field for comprehensive code context
diff --git a/.claude/commands/cli/mode/plan.md b/.claude/commands/cli/mode/plan.md
index 16792e9d..2474f4c2 100644
--- a/.claude/commands/cli/mode/plan.md
+++ b/.claude/commands/cli/mode/plan.md
@@ -163,6 +163,5 @@ rg "architecture|design" --files-with-matches
 ## Notes
 
 - Command templates and file patterns: see intelligent-tools-strategy.md (loaded in memory)
-- Scratchpad directory details: see workflow-architecture.md
 - Template path: `~/.claude/prompt-templates/plan.md`
 - Uses `@**/*` for in CONTEXT field for comprehensive project context
diff --git a/.claude/commands/task/breakdown.md b/.claude/commands/task/breakdown.md
index b241c525..14b6f213 100644
--- a/.claude/commands/task/breakdown.md
+++ b/.claude/commands/task/breakdown.md
@@ -10,7 +10,6 @@ argument-hint: "task-id"
 Breaks down complex tasks into executable subtasks with context inheritance and agent assignment.
 
 ## Core Principles
-**Task System:** @~/.claude/workflows/workflow-architecture.md
 **File Cohesion:** Related files must stay in same task
 **10-Task Limit:** Total tasks cannot exceed 10 (triggers re-scoping)
 
@@ -138,7 +137,6 @@ Files updated: .task/IMPL-1.json + 2 subtask files + TODO_LIST.md
 
 ## Implementation Details
 
-See @~/.claude/workflows/workflow-architecture.md for:
 - Complete task JSON schema
 - Implementation field structure
 - Context inheritance rules
diff --git a/.claude/commands/task/execute.md b/.claude/commands/task/execute.md
index b9dac6a7..ace5cb79 100644
--- a/.claude/commands/task/execute.md
+++ b/.claude/commands/task/execute.md
@@ -7,7 +7,7 @@ argument-hint: "task-id"
 ### 🚀 **Command Overview: `/task:execute`**
 
 -   **Purpose**: Executes tasks using intelligent agent selection, context preparation, and progress tracking.
--   **Core Principles**: @~/.claude/workflows/workflow-architecture.md
+
 
 ### ⚙️ **Execution Modes**
 
diff --git a/.claude/commands/workflow/brainstorm/auto-parallel.md b/.claude/commands/workflow/brainstorm/auto-parallel.md
index df3dc6be..1a320aa7 100644
--- a/.claude/commands/workflow/brainstorm/auto-parallel.md
+++ b/.claude/commands/workflow/brainstorm/auto-parallel.md
@@ -337,4 +337,4 @@ EXECUTE: /workflow:brainstorm:artifacts "{topic}" --count {count_value}
 ```
 
 **Template Source**: `~/.claude/workflows/cli-templates/planning-roles/`
-**Architecture**: `~/.claude/workflows/workflow-architecture.md`
+
diff --git a/.claude/workflows/task-core.md b/.claude/workflows/task-core.md
index fac2ef3d..17a3f574 100644
--- a/.claude/workflows/task-core.md
+++ b/.claude/workflows/task-core.md
@@ -4,7 +4,7 @@
 Task commands provide single-execution workflow capabilities with full context awareness, hierarchical organization, and agent orchestration.
 
 ## Task JSON Schema
-All task files use this simplified 5-field schema (aligned with workflow-architecture.md):
+All task files use this simplified 5-field schema:
 
 ```json
 {
diff --git a/.claude/workflows/workflow-architecture.md b/.claude/workflows/workflow-architecture.md
index 9dafc349..14f785d6 100644
--- a/.claude/workflows/workflow-architecture.md
+++ b/.claude/workflows/workflow-architecture.md
@@ -104,13 +104,14 @@ IMPL-2.1            # Subtask of IMPL-2 (dynamically created)
 - **Status inheritance**: Parent status derived from subtask completion
 
 ### Enhanced Task JSON Schema
-All task files use this unified 5-field schema with optional artifacts enhancement:
+All task files use this unified 6-field schema with optional artifacts enhancement:
 
 ```json
 {
   "id": "IMPL-1.2",
   "title": "Implement JWT authentication",
   "status": "pending|active|completed|blocked|container",
+  "context_package_path": ".workflow/WFS-session/.process/context-package.json",
 
   "meta": {
     "type": "feature|bugfix|refactor|test-gen|test-fix|docs",
@@ -228,6 +229,13 @@ All task files use this unified 5-field schema with optional artifacts enhanceme
 
 ### Focus Paths & Context Management
 
+#### Context Package Path (Top-Level Field)
+The **context_package_path** field provides the location of the smart context package:
+- **Location**: Top-level field (not in `artifacts` array)
+- **Path**: `.workflow/WFS-session/.process/context-package.json`
+- **Purpose**: References the comprehensive context package containing project structure, dependencies, and brainstorming artifacts catalog
+- **Usage**: Loaded in `pre_analysis` steps via `Read({{context_package_path}})`
+
 #### Focus Paths Format
 The **focus_paths** field specifies concrete project paths for task implementation:
 - **Array of strings**: `["folder1", "folder2", "specific_file.ts"]`