docs: nest generated docs under docs/lib and docs/mcp

.drone.yml

@@ -32,6 +32,26 @@ steps:
           echo "🆕 New version detected: $PACKAGE_NAME==$VERSION"
         fi
 
+  - name: quality-gate
+    image: python:3.13-slim
+    environment:
+      PIP_REPO_URL:
+        from_secret: PIP_REPO_URL
+      PIP_USERNAME:
+        from_secret: PIP_USERNAME
+      PIP_PASSWORD:
+        from_secret: PIP_PASSWORD
+    commands:
+      - pip install --upgrade pip build
+      - |
+        AUTH_URL="https://${PIP_USERNAME}:${PIP_PASSWORD}@$(echo "${PIP_REPO_URL#*://}" | sed 's:/*$::')/simple"
+        pip install --index-url "$AUTH_URL" --extra-index-url https://pypi.org/simple/ -U ".[dev]"
+      - echo "🛡️ Running quality gate..."
+      - python -m black --check .
+      - python -m ruff check .
+      - python -m mypy
+      - python -m pytest
+
   - name: build-package
     image: python:3.13-slim
     commands:

.gitignore

@@ -87,3 +87,8 @@ Thumbs.db
 # =========================
 .env
 .env.*
+
+# =========================
+# Testing artifacts
+# =========================
+coverage.xml

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+- `py.typed` marker for PEP 561 type information.
+- `.drone.yml` CI with a quality-gate step (black, ruff, mypy, pytest).
+- MIT `LICENSE`.
+
+### Changed
+- Standardized `pyproject.toml` (canonical packaging, lint tool config, extras).
+- Pinned the `mcp` extra to `mcp>=1.0.0,<2.0.0` to restore compatibility with
+  the current MCP server API used by doc-forge.
+
+### Fixed
+- Stub fixes for typed API surfaces.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Aetoskia Platform
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

docforge/__init__.pyi

@@ -1,7 +1,7 @@
-from .loaders import GriffeLoader, discover_module_paths
-from .renderers import MkDocsRenderer, MCPRenderer
-from .cli import main
 from . import models
+from .cli import main
+from .loaders import GriffeLoader, discover_module_paths
+from .renderers import MCPRenderer, MkDocsRenderer
 
 __all__ = [
     "GriffeLoader",

docforge/cli/__init__.py

@@ -37,6 +37,4 @@ Example:
 
 from .main import main
 
-__all__ = [
+__all__ = ["main"]
-    "main"
-]

docforge/cli/__init__.pyi

@@ -1,5 +1,3 @@
 from .main import main
 
-__all__ = [
+__all__ = ["main"]
-    "main"
-]

docforge/cli/commands.py

@@ -6,12 +6,12 @@ Command definitions for the doc-forge CLI.
 Provides the CLI structure using Click, including build, serve, and tree commands.
 """
 
-import click
 from pathlib import Path
-from typing import Sequence, Optional
+
+import click
+
+from docforge.cli import mcp_utils, mkdocs_utils
 from docforge.loaders import GriffeLoader
-from docforge.cli import mkdocs_utils
-from docforge.cli import mcp_utils
 
 
 @click.group()
@@ -28,26 +28,52 @@ def cli() -> None:
 @cli.command()
 @click.option("--mcp", is_flag=True, help="Build MCP resources")
 @click.option("--mkdocs", is_flag=True, help="Build MkDocs site")
-@click.option("--module-is-source", is_flag=True, help="Module is source folder and to be treated as root folder")
+@click.option(
+    "--module-is-source",
+    is_flag=True,
+    help="Module is source folder and to be treated as root folder",
+)
 @click.option("--module", help="Python module to document")
 @click.option("--project-name", help="Project name override")
 @click.option("--site-name", help="MkDocs site name")
-@click.option("--docs-dir", type=click.Path(path_type=Path), default=Path("docs"), help="Directory for MD sources")
+@click.option(
-@click.option("--nav", "nav_file", type=click.Path(path_type=Path), default=Path("docforge.nav.yml"),
+    "--docs-dir",
-              help="Nav spec path")
+    type=click.Path(path_type=Path),
-@click.option("--template", type=click.Path(path_type=Path), help="MkDocs template path")
+    default=Path("docs/lib"),
-@click.option("--mkdocs-yml", type=click.Path(path_type=Path), default=Path("mkdocs.yml"), help="Output config path")
+    help="Directory for MD sources",
-@click.option("--out-dir", type=click.Path(path_type=Path), default=Path("mcp_docs"), help="MCP output directory")
+)
+@click.option(
+    "--nav",
+    "nav_file",
+    type=click.Path(path_type=Path),
+    default=Path("docforge.nav.yml"),
+    help="Nav spec path",
+)
+@click.option(
+    "--template", type=click.Path(path_type=Path), help="MkDocs template path"
+)
+@click.option(
+    "--mkdocs-yml",
+    type=click.Path(path_type=Path),
+    default=Path("mkdocs.yml"),
+    help="Output config path",
+)
+@click.option(
+    "--out-dir",
+    type=click.Path(path_type=Path),
+    default=Path("docs/mcp"),
+    help="MCP output directory",
+)
 def build(
     mcp: bool,
     mkdocs: bool,
     module_is_source: bool,
-    module: Optional[str],
+    module: str | None,
-    project_name: Optional[str],
+    project_name: str | None,
-    site_name: Optional[str],
+    site_name: str | None,
     docs_dir: Path,
     nav_file: Path,
-    template: Optional[Path],
+    template: Path | None,
     mkdocs_yml: Path,
     out_dir: Path,
 ) -> None:
@@ -118,10 +144,13 @@ def build(
             docs_dir,
             project_name,
             module_is_source,
+            readme_dir=mkdocs_yml.parent,
         )
 
         click.echo(f"Generating MkDocs config {mkdocs_yml}...")
-        mkdocs_utils.generate_config(docs_dir, nav_file, template, mkdocs_yml, site_name)
+        mkdocs_utils.generate_config(
+            docs_dir, nav_file, template, mkdocs_yml, site_name
+        )
 
         click.echo("Running MkDocs build...")
         mkdocs_utils.build(mkdocs_yml)
@@ -140,12 +169,22 @@ def build(
 @click.option("--mcp", is_flag=True, help="Serve MCP documentation")
 @click.option("--mkdocs", is_flag=True, help="Serve MkDocs site")
 @click.option("--module", help="Python module to serve")
-@click.option("--mkdocs-yml", type=click.Path(path_type=Path), default=Path("mkdocs.yml"), help="MkDocs config path")
+@click.option(
-@click.option("--out-dir", type=click.Path(path_type=Path), default=Path("mcp_docs"), help="MCP root directory")
+    "--mkdocs-yml",
+    type=click.Path(path_type=Path),
+    default=Path("mkdocs.yml"),
+    help="MkDocs config path",
+)
+@click.option(
+    "--out-dir",
+    type=click.Path(path_type=Path),
+    default=Path("docs/mcp"),
+    help="MCP root directory",
+)
 def serve(
     mcp: bool,
     mkdocs: bool,
-    module: Optional[str],
+    module: str | None,
     mkdocs_yml: Path,
     out_dir: Path,
 ) -> None:
@@ -202,7 +241,7 @@ def serve(
 )
 def tree(
     module: str,
-    project_name: Optional[str],
+    project_name: str | None,
 ) -> None:
     """
     Display the documentation object tree for a module.

docforge/cli/commands.pyi

@@ -1,6 +1,7 @@
-from click.core import Group
 from pathlib import Path
-from typing import Sequence, Optional, Any
+from typing import Any
+
+from click.core import Group
 
 cli: Group
 
@@ -8,27 +9,24 @@ def build(
     mcp: bool,
     mkdocs: bool,
     module_is_source: bool,
-    module: Optional[str],
+    module: str | None,
-    project_name: Optional[str],
+    project_name: str | None,
-    site_name: Optional[str],
+    site_name: str | None,
     docs_dir: Path,
     nav_file: Path,
-    template: Optional[Path],
+    template: Path | None,
     mkdocs_yml: Path,
     out_dir: Path,
 ) -> None: ...
-
 def serve(
     mcp: bool,
     mkdocs: bool,
-    module: Optional[str],
+    module: str | None,
     mkdocs_yml: Path,
     out_dir: Path,
 ) -> None: ...
-
 def tree(
     module: str,
-    project_name: Optional[str],
+    project_name: str | None,
 ) -> None: ...
-
 def _print_object(obj: Any, indent: str) -> None: ...

docforge/cli/mcp_utils.py

@@ -5,7 +5,9 @@ Utilities for working with MCP in the doc-forge CLI.
 """
 
 from pathlib import Path
+
 import click
+
 from docforge.loaders import GriffeLoader, discover_module_paths
 from docforge.renderers import MCPRenderer
 from docforge.servers import MCPServer
@@ -61,7 +63,7 @@ def serve(module: str, mcp_root: Path) -> None:
             If the MCP documentation bundle is missing required files or directories.
     """
     if not mcp_root.exists():
-        raise click.ClickException(f"mcp_docs directory not found: {mcp_root}")
+        raise click.ClickException(f"MCP docs directory not found: {mcp_root}")
 
     required = [
         mcp_root / "index.json",

docforge/cli/mcp_utils.pyi

@@ -1,4 +1,6 @@
 from pathlib import Path
 
-def generate_resources(module: str, project_name: str | None, out_dir: Path) -> None: ...
+def generate_resources(
+    module: str, project_name: str | None, out_dir: Path
+) -> None: ...
 def serve(module: str, mcp_root: Path) -> None: ...

docforge/cli/mkdocs_utils.py

@@ -4,13 +4,16 @@
 Utilities for working with MkDocs in the doc-forge CLI.
 """
 
-from pathlib import Path
+import os
 from importlib import resources
+from pathlib import Path
+
 import click
 import yaml
+
 from docforge.loaders import GriffeLoader, discover_module_paths
+from docforge.nav import MkDocsNavEmitter, load_nav_spec, resolve_nav
 from docforge.renderers import MkDocsRenderer
-from docforge.nav import load_nav_spec, resolve_nav, MkDocsNavEmitter
 
 
 def generate_sources(
@@ -18,6 +21,7 @@ def generate_sources(
     docs_dir: Path,
     project_name: str | None = None,
     module_is_source: bool | None = None,
+    readme_dir: Path | None = None,
 ) -> None:
     """
     Generate MkDocs Markdown sources for a Python module.
@@ -40,6 +44,10 @@ def generate_sources(
         module_is_source (Optional[bool]):
             If True, treat the specified module directory as the project root
             rather than a nested module.
+
+        readme_dir (Optional[Path]):
+            Directory where the generated README.md should be written. If not
+            provided, defaults to the parent of ``docs_dir``.
     """
     loader = GriffeLoader()
     discovered_paths = discover_module_paths(module)
@@ -56,6 +64,7 @@ def generate_sources(
         project,
         docs_dir,
         module_is_source,
+        readme_dir,
     )
 
 
@@ -115,6 +124,7 @@ def generate_config(
         data = yaml.safe_load(text)
 
     data["site_name"] = site_name
+    data["docs_dir"] = Path(os.path.relpath(docs_dir, out.parent)).as_posix()
     data["nav"] = nav_block
 
     out.write_text(yaml.safe_dump(data, sort_keys=False), encoding="utf-8")
@@ -138,8 +148,8 @@ def build(mkdocs_yml: Path) -> None:
     if not mkdocs_yml.exists():
         raise click.ClickException(f"mkdocs.yml not found: {mkdocs_yml}")
 
-    from mkdocs.config import load_config
     from mkdocs.commands.build import build as mkdocs_build
+    from mkdocs.config import load_config
 
     mkdocs_build(load_config(str(mkdocs_yml)))
 
@@ -163,4 +173,5 @@ def serve(mkdocs_yml: Path) -> None:
         raise click.ClickException(f"mkdocs.yml not found: {mkdocs_yml}")
 
     from mkdocs.commands.serve import serve as mkdocs_serve
+
     mkdocs_serve(config_file=str(mkdocs_yml))

docforge/cli/mkdocs_utils.pyi

@@ -6,6 +6,8 @@ def generate_sources(
     project_name: str | None = None,
     module_is_source: bool | None = None,
 ) -> None: ...
-def generate_config(docs_dir: Path, nav_file: Path, template: Path | None, out: Path, site_name: str) -> None: ...
+def generate_config(
+    docs_dir: Path, nav_file: Path, template: Path | None, out: Path, site_name: str
+) -> None: ...
 def build(mkdocs_yml: Path) -> None: ...
 def serve(mkdocs_yml: Path) -> None: ...

docforge/loaders/griffe_loader.py

@@ -10,17 +10,18 @@ into doc-forge documentation models.
 
 import logging
 from pathlib import Path
-from typing import List, Optional
 
 from griffe import (
-    GriffeLoader as _GriffeLoader,
-    ModulesCollection,
-    LinesCollection,
-    Object,
     AliasResolutionError,
+    LinesCollection,
+    ModulesCollection,
+    Object,
+)
+from griffe import (
+    GriffeLoader as _GriffeLoader,
 )
 
-from docforge.models import Module, Project, DocObject
+from docforge.models import DocObject, Module, Project
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +29,7 @@ logger = logging.getLogger(__name__)
 def discover_module_paths(
     module_name: str,
     project_root: Path | None = None,
-) -> List[str]:
+) -> list[str]:
     """
     Discover Python modules within a package directory.
 
@@ -65,7 +66,7 @@ def discover_module_paths(
     if not pkg_dir.exists():
         raise FileNotFoundError(f"Package not found: {pkg_dir}")
 
-    module_paths: List[str] = []
+    module_paths: list[str] = []
 
     for path in pkg_dir.rglob("*.py"):
         if path.name == "__init__.py":
@@ -102,10 +103,10 @@ class GriffeLoader:
         )
 
     def load_project(
-            self,
+        self,
-            module_paths: List[str],
+        module_paths: list[str],
-            project_name: Optional[str] = None,
+        project_name: str | None = None,
-            skip_import_errors: bool = None,
+        skip_import_errors: bool = None,
     ) -> Project:
         """
         Load multiple modules and assemble them into a Project model.
@@ -250,7 +251,7 @@ class GriffeLoader:
     # Safe extractors
     # -------------------------
 
-    def _safe_docstring(self, obj: Object) -> Optional[str]:
+    def _safe_docstring(self, obj: Object) -> str | None:
         """
         Safely extract a docstring from a Griffe object.
 
@@ -267,7 +268,7 @@ class GriffeLoader:
         except AliasResolutionError:
             return None
 
-    def _safe_signature(self, obj: Object) -> Optional[str]:
+    def _safe_signature(self, obj: Object) -> str | None:
         """
         Safely extract the signature of a Griffe object.
 

docforge/loaders/griffe_loader.pyi

@@ -1,15 +1,11 @@
-from typing import List, Optional
 from pathlib import Path
 
 from docforge.models import Module, Project
 
-
 def discover_module_paths(
     module_name: str,
     project_root: Path | None = None,
-) -> List[str]:
+) -> list[str]: ...
-    ...
-
 
 class GriffeLoader:
     """Griffe-based introspection loaders.
@@ -18,11 +14,10 @@ class GriffeLoader:
     """
 
     def __init__(self) -> None: ...
-
     def load_project(
         self,
-        module_paths: List[str],
+        module_paths: list[str],
-        project_name: Optional[str] = ...,
+        project_name: str | None = ...,
         skip_import_errors: bool = ...,
     ) -> Project:
         """Load a documentation project from Python modules."""

docforge/models/__init__.pyi

@@ -1,6 +1,6 @@
-from .project import Project
 from .module import Module
 from .object import DocObject
+from .project import Project
 
 __all__ = [
     "Project",

docforge/models/module.py

@@ -9,7 +9,7 @@ model. A `Module` acts as a container for top-level documented objects
 introspection.
 """
 
-from typing import Dict, Iterable, Optional
+from collections.abc import Iterable
 
 from docforge.models.object import DocObject
 
@@ -36,7 +36,7 @@ class Module:
     def __init__(
         self,
         path: str,
-        docstring: Optional[str] = None,
+        docstring: str | None = None,
     ) -> None:
         """
         Initialize a Module instance.
@@ -50,7 +50,7 @@ class Module:
         """
         self.path = path
         self.docstring = docstring
-        self.members: Dict[str, DocObject] = {}
+        self.members: dict[str, DocObject] = {}
 
     def add_object(self, obj: DocObject) -> None:
         """

docforge/models/module.pyi

@@ -1,23 +1,19 @@
-from typing import Dict, Iterable, Optional
+from collections.abc import Iterable
 
 from docforge.models.object import DocObject
 
-
 class Module:
     """Represents a documented Python module."""
 
     path: str
-    docstring: Optional[str]
+    docstring: str | None
-    members: Dict[str, DocObject]
+    members: dict[str, DocObject]
 
     def __init__(
         self,
         path: str,
-        docstring: Optional[str] = ...,
+        docstring: str | None = ...,
     ) -> None: ...
-
     def add_object(self, obj: DocObject) -> None: ...
-
     def get_object(self, name: str) -> DocObject: ...
-
     def get_all_objects(self) -> Iterable[DocObject]: ...

docforge/models/object.py

@@ -9,7 +9,7 @@ entity such as a class, function, method, or attribute, and may contain nested
 members that form a hierarchical documentation structure.
 """
 
-from typing import Dict, Iterable, Optional
+from collections.abc import Iterable
 
 
 class DocObject:
@@ -45,8 +45,8 @@ class DocObject:
         name: str,
         kind: str,
         path: str,
-        signature: Optional[str] = None,
+        signature: str | None = None,
-        docstring: Optional[str] = None,
+        docstring: str | None = None,
     ) -> None:
         """
         Initialize a DocObject instance.
@@ -72,7 +72,7 @@ class DocObject:
         self.path = path
         self.signature = signature
         self.docstring = docstring
-        self.members: Dict[str, "DocObject"] = {}
+        self.members: dict[str, DocObject] = {}
 
     def add_member(self, obj: "DocObject") -> None:
         """

docforge/models/object.pyi

@@ -1,5 +1,4 @@
-from typing import Dict, Iterable, Optional
+from collections.abc import Iterable
-
 
 class DocObject:
     """Represents a documented Python object."""
@@ -7,21 +6,18 @@ class DocObject:
     name: str
     kind: str
     path: str
-    signature: Optional[str]
+    signature: str | None
-    docstring: Optional[str]
+    docstring: str | None
-    members: Dict[str, "DocObject"]
+    members: dict[str, DocObject]
 
     def __init__(
         self,
         name: str,
         kind: str,
         path: str,
-        signature: Optional[str] = ...,
+        signature: str | None = ...,
-        docstring: Optional[str] = ...,
+        docstring: str | None = ...,
     ) -> None: ...
-
+    def add_member(self, obj: DocObject) -> None: ...
-    def add_member(self, obj: "DocObject") -> None: ...
+    def get_member(self, name: str) -> DocObject: ...
-
+    def get_all_members(self) -> Iterable[DocObject]: ...
-    def get_member(self, name: str) -> "DocObject": ...
-
-    def get_all_members(self) -> Iterable["DocObject"]: ...

docforge/models/project.py

@@ -8,7 +8,7 @@ doc-forge to represent a documented codebase. A `Project` aggregates multiple
 modules and provides access to them through a unified interface.
 """
 
-from typing import Dict, Iterable
+from collections.abc import Iterable
 
 from docforge.models.module import Module
 
@@ -37,7 +37,7 @@ class Project:
                 Name used to identify the documentation project.
         """
         self.name = name
-        self.modules: Dict[str, Module] = {}
+        self.modules: dict[str, Module] = {}
 
     def add_module(self, module: Module) -> None:
         """

docforge/models/project.pyi

@@ -1,20 +1,15 @@
-from typing import Dict, Iterable
+from collections.abc import Iterable
 
 from docforge.models.module import Module
 
-
 class Project:
     """Represents a documentation project."""
 
     name: str
-    modules: Dict[str, Module]
+    modules: dict[str, Module]
 
     def __init__(self, name: str) -> None: ...
-
     def add_module(self, module: Module) -> None: ...
-
     def get_module(self, path: str) -> Module: ...
-
     def get_all_modules(self) -> Iterable[Module]: ...
-
     def get_module_list(self) -> list[str]: ...

docforge/nav/__init__.pyi

@@ -1,6 +1,6 @@
-from .spec import NavSpec, load_nav_spec
-from .resolver import ResolvedNav, resolve_nav
 from .mkdocs import MkDocsNavEmitter
+from .resolver import ResolvedNav, resolve_nav
+from .spec import NavSpec, load_nav_spec
 
 __all__ = [
     "NavSpec",

docforge/nav/mkdocs.py

@@ -7,7 +7,7 @@ MkDocs ``nav`` configuration.
 """
 
 from pathlib import Path
-from typing import List, Dict, Any
+from typing import Any
 
 from docforge.nav.resolver import ResolvedNav
 
@@ -20,7 +20,7 @@ class MkDocsNavEmitter:
     list structure expected by the MkDocs ``nav`` configuration field.
     """
 
-    def emit(self, nav: ResolvedNav) -> List[Dict[str, Any]]:
+    def emit(self, nav: ResolvedNav) -> list[dict[str, Any]]:
         """
         Generate a navigation structure for ``mkdocs.yml``.
 
@@ -33,7 +33,7 @@ class MkDocsNavEmitter:
             Each dictionary maps a navigation label to a page or a list of
             pages.
         """
-        result: List[Dict[str, Any]] = []
+        result: list[dict[str, Any]] = []
 
         # Home entry (semantic path)
         if nav.home:
@@ -41,7 +41,7 @@ class MkDocsNavEmitter:
 
         # Group entries
         for group, paths in nav.groups.items():
-            entries: List[str] = []
+            entries: list[str] = []
             for p in paths:
                 # Convert filesystem path back to docs-relative path
                 rel_path = self._to_relative(p, nav._docs_root)
@@ -75,7 +75,7 @@ class MkDocsNavEmitter:
             path_str = path.as_posix()
             docs_root_str = docs_root.as_posix()
             if path_str.startswith(docs_root_str + "/"):
-                return path_str[len(docs_root_str) + 1:]
+                return path_str[len(docs_root_str) + 1 :]
 
         # Fallback for other cases
         return path.as_posix().split("/docs/", 1)[-1]

docforge/nav/mkdocs.pyi

@@ -1,15 +1,14 @@
-from typing import Dict, List, Any
 from pathlib import Path
+from typing import Any
 
 from docforge.nav.resolver import ResolvedNav
 
-
 class MkDocsNavEmitter:
     """
     Converts a ResolvedNav into MkDocs-compatible `nav` data.
     """
 
-    def emit(self, nav: ResolvedNav) -> List[Dict[str, Any]]:
+    def emit(self, nav: ResolvedNav) -> list[dict[str, Any]]:
         """
         Emit a structure suitable for insertion into mkdocs.yml.
 

docforge/nav/resolver.py

@@ -5,10 +5,9 @@ This module resolves a ``NavSpec`` against the filesystem by expanding glob
 patterns and validating that referenced documentation files exist.
 """
 
-from pathlib import Path
-from typing import Dict, Iterable, List
-
 import glob
+from collections.abc import Iterable
+from pathlib import Path
 
 from docforge.nav.spec import NavSpec
 
@@ -29,7 +28,7 @@ class ResolvedNav:
     def __init__(
         self,
         home: str | None,
-        groups: Dict[str, List[Path]],
+        groups: dict[str, list[Path]],
         docs_root: Path | None = None,
     ) -> None:
         """
@@ -61,8 +60,7 @@ class ResolvedNav:
             yield self._docs_root / self.home
 
         for paths in self.groups.values():
-            for p in paths:
+            yield from paths
-                yield p
 
 
 def resolve_nav(
@@ -89,7 +87,7 @@ def resolve_nav(
     if not docs_root.exists():
         raise FileNotFoundError(docs_root)
 
-    def resolve_pattern(pattern: str) -> List[Path]:
+    def resolve_pattern(pattern: str) -> list[Path]:
         """
         Resolve a glob pattern relative to the documentation root.
 
@@ -103,9 +101,7 @@ def resolve_nav(
             FileNotFoundError: If the pattern does not match any files.
         """
         full = docs_root / pattern
-        matches = sorted(
+        matches = sorted(Path(p) for p in glob.glob(str(full), recursive=True))
-            Path(p) for p in glob.glob(str(full), recursive=True)
-        )
 
         if not matches:
             raise FileNotFoundError(pattern)
@@ -121,10 +117,10 @@ def resolve_nav(
         home = spec.home
 
     # Resolve navigation groups
-    resolved_groups: Dict[str, List[Path]] = {}
+    resolved_groups: dict[str, list[Path]] = {}
 
     for group, patterns in spec.groups.items():
-        files: List[Path] = []
+        files: list[Path] = []
         for pattern in patterns:
             files.extend(resolve_pattern(pattern))
         resolved_groups[group] = files

docforge/nav/resolver.pyi

@@ -1,9 +1,8 @@
+from collections.abc import Iterable
 from pathlib import Path
-from typing import Dict, List, Iterable, Optional
 
 from docforge.nav.spec import NavSpec
 
-
 class ResolvedNav:
     """
     Fully-resolved navigation tree.
@@ -13,17 +12,16 @@ class ResolvedNav:
     - Order is preserved
     """
 
-    home: Optional[str]
+    home: str | None
-    groups: Dict[str, List[Path]]
+    groups: dict[str, list[Path]]
-    _docs_root: Optional[Path]
+    _docs_root: Path | None
 
     def __init__(
         self,
         home: str | None,
-        groups: Dict[str, List[Path]],
+        groups: dict[str, list[Path]],
         docs_root: Path | None = ...,
     ) -> None: ...
-
     def all_files(self) -> Iterable[Path]:
         """
         Return all resolved documentation files in nav order.
@@ -33,7 +31,6 @@ class ResolvedNav:
         """
         ...
 
-
 def resolve_nav(
     spec: NavSpec,
     docs_root: Path,

docforge/nav/spec.py

@@ -7,7 +7,6 @@ structure defined by the user in the doc-forge navigation specification
 """
 
 from pathlib import Path
-from typing import Dict, List, Optional
 
 import yaml
 
@@ -28,8 +27,8 @@ class NavSpec:
 
     def __init__(
         self,
-        home: Optional[str],
+        home: str | None,
-        groups: Dict[str, List[str]],
+        groups: dict[str, list[str]],
     ) -> None:
         """
         Initialize a NavSpec instance.
@@ -85,7 +84,7 @@ class NavSpec:
 
         return cls(home=home, groups=groups)
 
-    def all_patterns(self) -> List[str]:
+    def all_patterns(self) -> list[str]:
         """
         Return all path patterns referenced by the specification.
 
@@ -93,7 +92,7 @@ class NavSpec:
             A list containing the home document (if defined) and all
             group pattern entries.
         """
-        patterns: List[str] = []
+        patterns: list[str] = []
 
         if self.home:
             patterns.append(self.home)

docforge/nav/spec.pyi

@@ -1,6 +1,4 @@
 from pathlib import Path
-from typing import Dict, List, Optional
-
 
 class NavSpec:
     """
@@ -10,18 +8,16 @@ class NavSpec:
     of filesystem structure or MkDocs specifics.
     """
 
-    home: Optional[str]
+    home: str | None
-    groups: Dict[str, List[str]]
+    groups: dict[str, list[str]]
 
     def __init__(
         self,
-        home: Optional[str],
+        home: str | None,
-        groups: Dict[str, List[str]],
+        groups: dict[str, list[str]],
-    ) -> None:
+    ) -> None: ...
-        ...
-
     @classmethod
-    def load(cls, path: Path) -> "NavSpec":
+    def load(cls, path: Path) -> NavSpec:
         """
         Load and validate a nav specification from YAML.
 
@@ -31,12 +27,11 @@ class NavSpec:
         """
         ...
 
-    def all_patterns(self) -> List[str]:
+    def all_patterns(self) -> list[str]:
         """
         Return all path patterns referenced by the spec
         (including home and group entries).
         """
         ...
 
-
 def load_nav_spec(path: Path) -> NavSpec: ...

docforge/renderers/__init__.pyi

@@ -1,5 +1,5 @@
-from .mkdocs_renderer import MkDocsRenderer
 from .mcp_renderer import MCPRenderer
+from .mkdocs_renderer import MkDocsRenderer
 
 __all__ = [
     "MkDocsRenderer",

docforge/renderers/base.pyi

@@ -3,7 +3,6 @@ from typing import Protocol
 
 from docforge.models import Project
 
-
 class RendererConfig:
     """Renderer configuration container."""
 
@@ -12,7 +11,6 @@ class RendererConfig:
 
     def __init__(self, out_dir: Path, project: Project) -> None: ...
 
-
 class DocRenderer(Protocol):
     """Renderer interface."""
 

docforge/renderers/mcp_renderer.py

@@ -9,9 +9,8 @@ resources compatible with the Model Context Protocol (MCP).
 
 import json
 from pathlib import Path
-from typing import Dict, List
 
-from docforge.models import Project, Module, DocObject
+from docforge.models import DocObject, Module, Project
 
 
 class MCPRenderer:
@@ -42,15 +41,17 @@ class MCPRenderer:
         modules_dir = out_dir / "modules"
         modules_dir.mkdir(parents=True, exist_ok=True)
 
-        nav: List[Dict[str, str]] = []
+        nav: list[dict[str, str]] = []
 
         for module in project.get_all_modules():
             self._write_module(module, modules_dir)
 
-            nav.append({
+            nav.append(
-                "module": module.path,
+                {
-                "resource": f"doc://modules/{module.path}",
+                    "module": module.path,
-            })
+                    "resource": f"doc://modules/{module.path}",
+                }
+            )
 
         # Write nav.json
         (out_dir / "nav.json").write_text(
@@ -91,7 +92,7 @@ class MCPRenderer:
         out.parent.mkdir(parents=True, exist_ok=True)
         out.write_text(self._json(payload), encoding="utf-8")
 
-    def _render_module(self, module: Module) -> Dict:
+    def _render_module(self, module: Module) -> dict:
         """
         Convert a Module model into MCP-compatible structured data.
 
@@ -103,7 +104,7 @@ class MCPRenderer:
             Dict:
                 Dictionary representing the module and its documented objects.
         """
-        data: Dict = {
+        data: dict = {
             "path": module.path,
             "docstring": module.docstring,
             "objects": {},
@@ -114,7 +115,7 @@ class MCPRenderer:
 
         return data
 
-    def _render_object(self, obj: DocObject) -> Dict:
+    def _render_object(self, obj: DocObject) -> dict:
         """
         Recursively convert a DocObject into structured MCP data.
 
@@ -126,7 +127,7 @@ class MCPRenderer:
             Dict:
                 Dictionary describing the object and any nested members.
         """
-        data: Dict = {
+        data: dict = {
             "name": obj.name,
             "kind": obj.kind,
             "path": obj.path,
@@ -137,14 +138,13 @@ class MCPRenderer:
         members = list(obj.get_all_members())
         if members:
             data["members"] = {
-                member.name: self._render_object(member)
+                member.name: self._render_object(member) for member in members
-                for member in members
             }
 
         return data
 
     @staticmethod
-    def _json(data: Dict) -> str:
+    def _json(data: dict) -> str:
         """
         Serialize data to formatted JSON.
 

docforge/renderers/mcp_renderer.pyi

@@ -1,8 +1,7 @@
 from pathlib import Path
-from typing import Dict, List
+from typing import Any
-
-from docforge.models import Project, Module, DocObject
 
+from docforge.models import DocObject, Module, Project
 
 class MCPRenderer:
     """Renderer that emits MCP-native JSON resources from docforge models."""
@@ -15,12 +14,12 @@ class MCPRenderer:
     def _write_module(self, module: Module, modules_dir: Path) -> None:
         """Serialize a module into an MCP JSON resource."""
 
-    def _render_module(self, module: Module) -> Dict:
+    def _render_module(self, module: Module) -> dict[str, Any]:
         """Render a Module into MCP-friendly structured data."""
 
-    def _render_object(self, obj: DocObject) -> Dict:
+    def _render_object(self, obj: DocObject) -> dict[str, Any]:
         """Recursively render a DocObject into structured MCP data."""
 
     @staticmethod
-    def _json(data: Dict) -> str:
+    def _json(data: dict[str, Any]) -> str:
         """Serialize structured data to formatted JSON."""

docforge/renderers/mkdocs_renderer.py

@@ -16,7 +16,8 @@ The renderer ensures a consistent documentation structure by:
 """
 
 from pathlib import Path
-from docforge.models import Project, Module
+
+from docforge.models import Module, Project
 
 
 class MkDocsRenderer:
@@ -65,8 +66,7 @@ class MkDocsRenderer:
 
         # Detect packages (modules with children)
         packages = {
-            p for p in paths
+            p for p in paths if any(other.startswith(p + ".") for other in paths)
-            if any(other.startswith(p + ".") for other in paths)
         }
 
         for module in modules:
@@ -82,6 +82,7 @@ class MkDocsRenderer:
         project: Project,
         docs_dir: Path,
         module_is_source: bool | None = None,
+        readme_dir: Path | None = None,
     ) -> None:
         """
         Generate a `README.md` file from the root module docstring.
@@ -99,15 +100,20 @@ class MkDocsRenderer:
             docs_dir (Path):
                 Directory containing generated documentation sources.
 
-            module_is_source (bool, optional):
+            module_is_source (Optional[bool]):
                 Whether the module is treated as the project source root.
+
+            readme_dir (Optional[Path]):
+                Directory where the generated README.md should be written.
+                Defaults to the parent of `docs_dir`.
         """
 
         if not module_is_source:
             # Future: support README generation per module
             return
 
-        readme_path = docs_dir.parent / "README.md"
+        readme_root = readme_dir if readme_dir is not None else docs_dir.parent
+        readme_path = readme_root / "README.md"
 
         root_module = None
         for module in project.get_all_modules():
@@ -127,12 +133,12 @@ class MkDocsRenderer:
                 str(root_module.docstring),
             )
 
-        content = (
+        content = f"# {project.name}\n\n" f"{doc.strip()}\n"
-            f"# {project.name}\n\n"
-            f"{doc.strip()}\n"
-        )
 
-        if not readme_path.exists() or readme_path.read_text(encoding="utf-8") != content:
+        if (
+            not readme_path.exists()
+            or readme_path.read_text(encoding="utf-8") != content
+        ):
             readme_path.write_text(
                 content,
                 encoding="utf-8",
@@ -231,10 +237,7 @@ class MkDocsRenderer:
             str:
                 Markdown source containing a mkdocstrings directive.
         """
-        return (
+        return f"# {title}\n\n" f"::: {module_path}\n"
-            f"# {title}\n\n"
-            f"::: {module_path}\n"
-        )
 
     def _ensure_root_index(
         self,
@@ -255,8 +258,7 @@ class MkDocsRenderer:
 
         if not root_index.exists():
             root_index.write_text(
-                f"# {project.name}\n\n"
+                f"# {project.name}\n\n" "## Modules\n\n",
-                "## Modules\n\n",
                 encoding="utf-8",
             )
 

docforge/renderers/mkdocs_renderer.pyi

@@ -1,6 +1,6 @@
 from pathlib import Path
-from docforge.models import Project, Module
 
+from docforge.models import Module, Project
 
 class MkDocsRenderer:
     name: str
@@ -11,14 +11,12 @@ class MkDocsRenderer:
         out_dir: Path,
         module_is_source: bool | None = None,
     ) -> None: ...
-
     def generate_readme(
         self,
         project: Project,
         docs_dir: Path,
         module_is_source: bool | None = None,
-    ) -> None:
+    ) -> None: ...
-
     def _write_module(
         self,
         module: Module,
@@ -26,9 +24,8 @@ class MkDocsRenderer:
         out_dir: Path,
         module_is_source: bool | None = None,
     ) -> None: ...
-
     def _render_markdown(self, title: str, module_path: str) -> str: ...
-
+    def _ensure_root_index(self, project: Project, out_dir: Path) -> None: ...
-    def _ensure_root_index(self, project, out_dir) -> None: ...
+    def _ensure_parent_index(
-
+        self, parts: list[str], out_dir: Path, link_target: str, title: str
-    def _ensure_parent_index(self, parts, out_dir, link_target, title) -> None: ...
+    ) -> None: ...

docforge/servers/mcp_server.py

@@ -96,9 +96,7 @@ class MCPServer:
 
         @self.app.resource("docs://modules/{module}")
         def module(module: str):
-            return self._read_json(
+            return self._read_json(self.mcp_root / "modules" / f"{module}.json")
-                self.mcp_root / "modules" / f"{module}.json"
-            )
 
     # ------------------------------------------------------------------
     # MCP tools

docforge/servers/mcp_server.pyi

@@ -1,9 +1,8 @@
 from pathlib import Path
-from typing import Literal, Any
+from typing import Any, Literal
 
 from mcp.server.fastmcp import FastMCP
 
-
 class MCPServer:
     """MCP server for serving documentation."""
 
@@ -11,12 +10,8 @@ class MCPServer:
     app: FastMCP
 
     def __init__(self, mcp_root: Path, name: str) -> None: ...
-
     def _read_json(self, path: Path) -> Any: ...
-
     def _register_resources(self) -> None: ...
-
     def _register_tools(self) -> None: ...
-
     def run(self, transport: Literal["stdio", "sse", "streamable-http"] = ...) -> None:
         """Start the MCP server."""

docs/mcp/modules/docforge.cli.commands.json

@@ -4,13 +4,6 @@
     "path": "docforge.cli.commands",
     "docstring": "# Summary\n\nCommand definitions for the doc-forge CLI.\n\nProvides the CLI structure using Click, including build, serve, and tree commands.",
     "objects": {
-      "click": {
-        "name": "click",
-        "kind": "alias",
-        "path": "docforge.cli.commands.click",
-        "signature": "<bound method Alias.signature of Alias('click', 'click')>",
-        "docstring": null
-      },
       "Path": {
         "name": "Path",
         "kind": "alias",
@@ -18,198 +11,13 @@
         "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
         "docstring": null
       },
-      "Sequence": {
+      "click": {
-        "name": "Sequence",
+        "name": "click",
         "kind": "alias",
-        "path": "docforge.cli.commands.Sequence",
+        "path": "docforge.cli.commands.click",
-        "signature": "<bound method Alias.signature of Alias('Sequence', 'typing.Sequence')>",
+        "signature": "<bound method Alias.signature of Alias('click', 'click')>",
         "docstring": null
       },
-      "Optional": {
-        "name": "Optional",
-        "kind": "alias",
-        "path": "docforge.cli.commands.Optional",
-        "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-        "docstring": null
-      },
-      "GriffeLoader": {
-        "name": "GriffeLoader",
-        "kind": "class",
-        "path": "docforge.cli.commands.GriffeLoader",
-        "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.loaders.GriffeLoader')>",
-        "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
-        "members": {
-          "load_project": {
-            "name": "load_project",
-            "kind": "function",
-            "path": "docforge.cli.commands.GriffeLoader.load_project",
-            "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
-            "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
-          },
-          "load_module": {
-            "name": "load_module",
-            "kind": "function",
-            "path": "docforge.cli.commands.GriffeLoader.load_module",
-            "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
-            "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
-          }
-        }
-      },
-      "mkdocs_utils": {
-        "name": "mkdocs_utils",
-        "kind": "module",
-        "path": "docforge.cli.commands.mkdocs_utils",
-        "signature": "<bound method Alias.signature of Alias('mkdocs_utils', 'docforge.cli.mkdocs_utils')>",
-        "docstring": "# Summary\n\nUtilities for working with MkDocs in the doc-forge CLI.",
-        "members": {
-          "Path": {
-            "name": "Path",
-            "kind": "alias",
-            "path": "docforge.cli.commands.mkdocs_utils.Path",
-            "signature": "<bound method Alias.signature of Alias('Path', 'docforge.cli.mkdocs_utils.Path')>",
-            "docstring": null
-          },
-          "resources": {
-            "name": "resources",
-            "kind": "alias",
-            "path": "docforge.cli.commands.mkdocs_utils.resources",
-            "signature": "<bound method Alias.signature of Alias('resources', 'docforge.cli.mkdocs_utils.resources')>",
-            "docstring": null
-          },
-          "click": {
-            "name": "click",
-            "kind": "alias",
-            "path": "docforge.cli.commands.mkdocs_utils.click",
-            "signature": "<bound method Alias.signature of Alias('click', 'docforge.cli.mkdocs_utils.click')>",
-            "docstring": null
-          },
-          "yaml": {
-            "name": "yaml",
-            "kind": "alias",
-            "path": "docforge.cli.commands.mkdocs_utils.yaml",
-            "signature": "<bound method Alias.signature of Alias('yaml', 'docforge.cli.mkdocs_utils.yaml')>",
-            "docstring": null
-          },
-          "GriffeLoader": {
-            "name": "GriffeLoader",
-            "kind": "class",
-            "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader",
-            "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.cli.mkdocs_utils.GriffeLoader')>",
-            "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
-            "members": {
-              "load_project": {
-                "name": "load_project",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_project",
-                "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
-                "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
-              },
-              "load_module": {
-                "name": "load_module",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_module",
-                "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
-                "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
-              }
-            }
-          },
-          "discover_module_paths": {
-            "name": "discover_module_paths",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.discover_module_paths",
-            "signature": "<bound method Alias.signature of Alias('discover_module_paths', 'docforge.cli.mkdocs_utils.discover_module_paths')>",
-            "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
-          },
-          "MkDocsRenderer": {
-            "name": "MkDocsRenderer",
-            "kind": "class",
-            "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer",
-            "signature": "<bound method Alias.signature of Alias('MkDocsRenderer', 'docforge.cli.mkdocs_utils.MkDocsRenderer')>",
-            "docstring": "Renderer that produces Markdown documentation for MkDocs.\n\nGenerated pages use mkdocstrings directives to reference Python modules,\nallowing MkDocs to render API documentation dynamically.",
-            "members": {
-              "name": {
-                "name": "name",
-                "kind": "attribute",
-                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.name",
-                "signature": "<bound method Alias.signature of Alias('name', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.name')>",
-                "docstring": null
-              },
-              "generate_sources": {
-                "name": "generate_sources",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_sources",
-                "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_sources')>",
-                "docstring": "Generate Markdown documentation files for a project.\n\nThis method renders a documentation structure from the provided\nproject model and writes the resulting Markdown files to the\nspecified output directory.\n\nArgs:\n    project (Project):\n        Project model containing modules to document.\n\n    out_dir (Path):\n        Directory where generated Markdown files will be written.\n\n    module_is_source (bool, optional):\n        If True, treat the specified module as the documentation root\n        rather than nesting it inside a folder."
-              },
-              "generate_readme": {
-                "name": "generate_readme",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_readme",
-                "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
-                "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
-              }
-            }
-          },
-          "load_nav_spec": {
-            "name": "load_nav_spec",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.load_nav_spec",
-            "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.cli.mkdocs_utils.load_nav_spec')>",
-            "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
-          },
-          "resolve_nav": {
-            "name": "resolve_nav",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.resolve_nav",
-            "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.cli.mkdocs_utils.resolve_nav')>",
-            "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
-          },
-          "MkDocsNavEmitter": {
-            "name": "MkDocsNavEmitter",
-            "kind": "class",
-            "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter",
-            "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.cli.mkdocs_utils.MkDocsNavEmitter')>",
-            "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
-            "members": {
-              "emit": {
-                "name": "emit",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter.emit",
-                "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
-                "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
-              }
-            }
-          },
-          "generate_sources": {
-            "name": "generate_sources",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.generate_sources",
-            "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.cli.mkdocs_utils.generate_sources')>",
-            "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module."
-          },
-          "generate_config": {
-            "name": "generate_config",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.generate_config",
-            "signature": "<bound method Alias.signature of Alias('generate_config', 'docforge.cli.mkdocs_utils.generate_config')>",
-            "docstring": "Generate an `mkdocs.yml` configuration file.\n\nThe configuration is created by combining a template configuration\nwith a navigation structure derived from the docforge navigation\nspecification.\n\nArgs:\n    docs_dir (Path):\n        Directory containing generated documentation Markdown files.\n\n    nav_file (Path):\n        Path to the `docforge.nav.yml` navigation specification.\n\n    template (Optional[Path]):\n        Optional path to a custom MkDocs configuration template. If not\n        provided, a built-in template will be used.\n\n    out (Path):\n        Destination path where the generated `mkdocs.yml` file will be written.\n\n    site_name (str):\n        Display name for the generated documentation site.\n\nRaises:\n    click.FileError:\n        If the navigation specification or template file cannot be found."
-          },
-          "build": {
-            "name": "build",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.build",
-            "signature": "<bound method Alias.signature of Alias('build', 'docforge.cli.mkdocs_utils.build')>",
-            "docstring": "Build the MkDocs documentation site.\n\nThis function loads the MkDocs configuration and runs the MkDocs\nbuild command to generate the final static documentation site.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
-          },
-          "serve": {
-            "name": "serve",
-            "kind": "function",
-            "path": "docforge.cli.commands.mkdocs_utils.serve",
-            "signature": "<bound method Alias.signature of Alias('serve', 'docforge.cli.mkdocs_utils.serve')>",
-            "docstring": "Start an MkDocs development server with live reload.\n\nThe server watches documentation files and automatically reloads\nthe site when changes are detected.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
-          }
-        }
-      },
       "mcp_utils": {
         "name": "mcp_utils",
         "kind": "module",
@@ -330,6 +138,191 @@
           }
         }
       },
+      "mkdocs_utils": {
+        "name": "mkdocs_utils",
+        "kind": "module",
+        "path": "docforge.cli.commands.mkdocs_utils",
+        "signature": "<bound method Alias.signature of Alias('mkdocs_utils', 'docforge.cli.mkdocs_utils')>",
+        "docstring": "# Summary\n\nUtilities for working with MkDocs in the doc-forge CLI.",
+        "members": {
+          "os": {
+            "name": "os",
+            "kind": "alias",
+            "path": "docforge.cli.commands.mkdocs_utils.os",
+            "signature": "<bound method Alias.signature of Alias('os', 'docforge.cli.mkdocs_utils.os')>",
+            "docstring": null
+          },
+          "resources": {
+            "name": "resources",
+            "kind": "alias",
+            "path": "docforge.cli.commands.mkdocs_utils.resources",
+            "signature": "<bound method Alias.signature of Alias('resources', 'docforge.cli.mkdocs_utils.resources')>",
+            "docstring": null
+          },
+          "Path": {
+            "name": "Path",
+            "kind": "alias",
+            "path": "docforge.cli.commands.mkdocs_utils.Path",
+            "signature": "<bound method Alias.signature of Alias('Path', 'docforge.cli.mkdocs_utils.Path')>",
+            "docstring": null
+          },
+          "click": {
+            "name": "click",
+            "kind": "alias",
+            "path": "docforge.cli.commands.mkdocs_utils.click",
+            "signature": "<bound method Alias.signature of Alias('click', 'docforge.cli.mkdocs_utils.click')>",
+            "docstring": null
+          },
+          "yaml": {
+            "name": "yaml",
+            "kind": "alias",
+            "path": "docforge.cli.commands.mkdocs_utils.yaml",
+            "signature": "<bound method Alias.signature of Alias('yaml', 'docforge.cli.mkdocs_utils.yaml')>",
+            "docstring": null
+          },
+          "GriffeLoader": {
+            "name": "GriffeLoader",
+            "kind": "class",
+            "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader",
+            "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.cli.mkdocs_utils.GriffeLoader')>",
+            "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
+            "members": {
+              "load_project": {
+                "name": "load_project",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_project",
+                "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
+                "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
+              },
+              "load_module": {
+                "name": "load_module",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_module",
+                "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
+                "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
+              }
+            }
+          },
+          "discover_module_paths": {
+            "name": "discover_module_paths",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.discover_module_paths",
+            "signature": "<bound method Alias.signature of Alias('discover_module_paths', 'docforge.cli.mkdocs_utils.discover_module_paths')>",
+            "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
+          },
+          "MkDocsNavEmitter": {
+            "name": "MkDocsNavEmitter",
+            "kind": "class",
+            "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter",
+            "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.cli.mkdocs_utils.MkDocsNavEmitter')>",
+            "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
+            "members": {
+              "emit": {
+                "name": "emit",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter.emit",
+                "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
+                "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
+              }
+            }
+          },
+          "load_nav_spec": {
+            "name": "load_nav_spec",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.load_nav_spec",
+            "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.cli.mkdocs_utils.load_nav_spec')>",
+            "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
+          },
+          "resolve_nav": {
+            "name": "resolve_nav",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.resolve_nav",
+            "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.cli.mkdocs_utils.resolve_nav')>",
+            "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
+          },
+          "MkDocsRenderer": {
+            "name": "MkDocsRenderer",
+            "kind": "class",
+            "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer",
+            "signature": "<bound method Alias.signature of Alias('MkDocsRenderer', 'docforge.cli.mkdocs_utils.MkDocsRenderer')>",
+            "docstring": "Renderer that produces Markdown documentation for MkDocs.\n\nGenerated pages use mkdocstrings directives to reference Python modules,\nallowing MkDocs to render API documentation dynamically.",
+            "members": {
+              "name": {
+                "name": "name",
+                "kind": "attribute",
+                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.name",
+                "signature": "<bound method Alias.signature of Alias('name', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.name')>",
+                "docstring": null
+              },
+              "generate_sources": {
+                "name": "generate_sources",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_sources",
+                "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_sources')>",
+                "docstring": "Generate Markdown documentation files for a project.\n\nThis method renders a documentation structure from the provided\nproject model and writes the resulting Markdown files to the\nspecified output directory.\n\nArgs:\n    project (Project):\n        Project model containing modules to document.\n\n    out_dir (Path):\n        Directory where generated Markdown files will be written.\n\n    module_is_source (bool, optional):\n        If True, treat the specified module as the documentation root\n        rather than nesting it inside a folder."
+              },
+              "generate_readme": {
+                "name": "generate_readme",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_readme",
+                "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
+                "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
+              }
+            }
+          },
+          "generate_sources": {
+            "name": "generate_sources",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.generate_sources",
+            "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.cli.mkdocs_utils.generate_sources')>",
+            "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written. If not\n        provided, defaults to the parent of ``docs_dir``."
+          },
+          "generate_config": {
+            "name": "generate_config",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.generate_config",
+            "signature": "<bound method Alias.signature of Alias('generate_config', 'docforge.cli.mkdocs_utils.generate_config')>",
+            "docstring": "Generate an `mkdocs.yml` configuration file.\n\nThe configuration is created by combining a template configuration\nwith a navigation structure derived from the docforge navigation\nspecification.\n\nArgs:\n    docs_dir (Path):\n        Directory containing generated documentation Markdown files.\n\n    nav_file (Path):\n        Path to the `docforge.nav.yml` navigation specification.\n\n    template (Optional[Path]):\n        Optional path to a custom MkDocs configuration template. If not\n        provided, a built-in template will be used.\n\n    out (Path):\n        Destination path where the generated `mkdocs.yml` file will be written.\n\n    site_name (str):\n        Display name for the generated documentation site.\n\nRaises:\n    click.FileError:\n        If the navigation specification or template file cannot be found."
+          },
+          "build": {
+            "name": "build",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.build",
+            "signature": "<bound method Alias.signature of Alias('build', 'docforge.cli.mkdocs_utils.build')>",
+            "docstring": "Build the MkDocs documentation site.\n\nThis function loads the MkDocs configuration and runs the MkDocs\nbuild command to generate the final static documentation site.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
+          },
+          "serve": {
+            "name": "serve",
+            "kind": "function",
+            "path": "docforge.cli.commands.mkdocs_utils.serve",
+            "signature": "<bound method Alias.signature of Alias('serve', 'docforge.cli.mkdocs_utils.serve')>",
+            "docstring": "Start an MkDocs development server with live reload.\n\nThe server watches documentation files and automatically reloads\nthe site when changes are detected.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
+          }
+        }
+      },
+      "GriffeLoader": {
+        "name": "GriffeLoader",
+        "kind": "class",
+        "path": "docforge.cli.commands.GriffeLoader",
+        "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.loaders.GriffeLoader')>",
+        "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
+        "members": {
+          "load_project": {
+            "name": "load_project",
+            "kind": "function",
+            "path": "docforge.cli.commands.GriffeLoader.load_project",
+            "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
+            "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
+          },
+          "load_module": {
+            "name": "load_module",
+            "kind": "function",
+            "path": "docforge.cli.commands.GriffeLoader.load_module",
+            "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
+            "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
+          }
+        }
+      },
       "cli": {
         "name": "cli",
         "kind": "attribute",
@@ -341,36 +334,36 @@
         "name": "build",
         "kind": "function",
         "path": "docforge.cli.commands.build",
-        "signature": "<bound method Function.signature of Function('build', 28, 136)>",
+        "signature": "<bound method Function.signature of Function('build', 28, 165)>",
         "docstring": "Build documentation artifacts.\n\nThis command performs the full documentation build pipeline:\n\n1. Introspects the Python project using Griffe\n2. Generates renderer-specific documentation sources\n3. Optionally builds the final documentation output\n\nDepending on the selected options, the build can target:\n\n- MkDocs static documentation sites\n- MCP structured documentation resources\n\nArgs:\n    mcp (bool):\n        Enable MCP documentation generation.\n\n    mkdocs (bool):\n        Enable MkDocs documentation generation.\n\n    module_is_source (bool):\n        Treat the specified module directory as the project root.\n\n    module (Optional[str]):\n        Python module import path to document.\n\n    project_name (Optional[str]):\n        Optional override for the project name.\n\n    site_name (Optional[str]):\n        Display name for the MkDocs site.\n\n    docs_dir (Path):\n        Directory where Markdown documentation sources will be generated.\n\n    nav_file (Path):\n        Path to the navigation specification file.\n\n    template (Optional[Path]):\n        Optional custom MkDocs configuration template.\n\n    mkdocs_yml (Path):\n        Output path for the generated MkDocs configuration.\n\n    out_dir (Path):\n        Output directory for generated MCP resources.\n\nRaises:\n    click.UsageError:\n        If required options are missing or conflicting."
       },
       "serve": {
         "name": "serve",
         "kind": "function",
         "path": "docforge.cli.commands.serve",
-        "signature": "<bound method Function.signature of Function('serve', 139, 190)>",
+        "signature": "<bound method Function.signature of Function('serve', 168, 229)>",
         "docstring": "Serve generated documentation locally.\n\nDepending on the selected mode, this command starts either:\n\n- A MkDocs development server for browsing documentation\n- An MCP server exposing structured documentation resources\n\nArgs:\n    mcp (bool):\n        Serve documentation using the MCP server.\n\n    mkdocs (bool):\n        Serve the MkDocs development site.\n\n    module (Optional[str]):\n        Python module import path to serve via MCP.\n\n    mkdocs_yml (Path):\n        Path to the MkDocs configuration file.\n\n    out_dir (Path):\n        Root directory containing MCP documentation resources.\n\nRaises:\n    click.UsageError:\n        If invalid or conflicting options are provided."
       },
       "tree": {
         "name": "tree",
         "kind": "function",
         "path": "docforge.cli.commands.tree",
-        "signature": "<bound method Function.signature of Function('tree', 193, 229)>",
+        "signature": "<bound method Function.signature of Function('tree', 232, 268)>",
         "docstring": "Display the documentation object tree for a module.\n\nThis command introspects the specified module and prints a\nhierarchical representation of the discovered documentation\nobjects, including modules, classes, functions, and members.\n\nArgs:\n    module (str):\n        Python module import path to introspect.\n\n    project_name (Optional[str]):\n        Optional name to display as the project root."
       },
-      "Group": {
-        "name": "Group",
-        "kind": "alias",
-        "path": "docforge.cli.commands.Group",
-        "signature": "<bound method Alias.signature of Alias('Group', 'click.core.Group')>",
-        "docstring": null
-      },
       "Any": {
         "name": "Any",
         "kind": "alias",
         "path": "docforge.cli.commands.Any",
         "signature": "<bound method Alias.signature of Alias('Any', 'typing.Any')>",
         "docstring": null
+      },
+      "Group": {
+        "name": "Group",
+        "kind": "alias",
+        "path": "docforge.cli.commands.Group",
+        "signature": "<bound method Alias.signature of Alias('Group', 'click.core.Group')>",
+        "docstring": null
       }
     }
   }

docs/mcp/modules/docforge.cli.json

@@ -34,13 +34,6 @@
         "signature": null,
         "docstring": "# Summary\n\nCommand definitions for the doc-forge CLI.\n\nProvides the CLI structure using Click, including build, serve, and tree commands.",
         "members": {
-          "click": {
-            "name": "click",
-            "kind": "alias",
-            "path": "docforge.cli.commands.click",
-            "signature": "<bound method Alias.signature of Alias('click', 'click')>",
-            "docstring": null
-          },
           "Path": {
             "name": "Path",
             "kind": "alias",
@@ -48,198 +41,13 @@
             "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
             "docstring": null
           },
-          "Sequence": {
+          "click": {
-            "name": "Sequence",
+            "name": "click",
             "kind": "alias",
-            "path": "docforge.cli.commands.Sequence",
+            "path": "docforge.cli.commands.click",
-            "signature": "<bound method Alias.signature of Alias('Sequence', 'typing.Sequence')>",
+            "signature": "<bound method Alias.signature of Alias('click', 'click')>",
             "docstring": null
           },
-          "Optional": {
-            "name": "Optional",
-            "kind": "alias",
-            "path": "docforge.cli.commands.Optional",
-            "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-            "docstring": null
-          },
-          "GriffeLoader": {
-            "name": "GriffeLoader",
-            "kind": "class",
-            "path": "docforge.cli.commands.GriffeLoader",
-            "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.loaders.GriffeLoader')>",
-            "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
-            "members": {
-              "load_project": {
-                "name": "load_project",
-                "kind": "function",
-                "path": "docforge.cli.commands.GriffeLoader.load_project",
-                "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
-                "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
-              },
-              "load_module": {
-                "name": "load_module",
-                "kind": "function",
-                "path": "docforge.cli.commands.GriffeLoader.load_module",
-                "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
-                "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
-              }
-            }
-          },
-          "mkdocs_utils": {
-            "name": "mkdocs_utils",
-            "kind": "module",
-            "path": "docforge.cli.commands.mkdocs_utils",
-            "signature": "<bound method Alias.signature of Alias('mkdocs_utils', 'docforge.cli.mkdocs_utils')>",
-            "docstring": "# Summary\n\nUtilities for working with MkDocs in the doc-forge CLI.",
-            "members": {
-              "Path": {
-                "name": "Path",
-                "kind": "alias",
-                "path": "docforge.cli.commands.mkdocs_utils.Path",
-                "signature": "<bound method Alias.signature of Alias('Path', 'docforge.cli.mkdocs_utils.Path')>",
-                "docstring": null
-              },
-              "resources": {
-                "name": "resources",
-                "kind": "alias",
-                "path": "docforge.cli.commands.mkdocs_utils.resources",
-                "signature": "<bound method Alias.signature of Alias('resources', 'docforge.cli.mkdocs_utils.resources')>",
-                "docstring": null
-              },
-              "click": {
-                "name": "click",
-                "kind": "alias",
-                "path": "docforge.cli.commands.mkdocs_utils.click",
-                "signature": "<bound method Alias.signature of Alias('click', 'docforge.cli.mkdocs_utils.click')>",
-                "docstring": null
-              },
-              "yaml": {
-                "name": "yaml",
-                "kind": "alias",
-                "path": "docforge.cli.commands.mkdocs_utils.yaml",
-                "signature": "<bound method Alias.signature of Alias('yaml', 'docforge.cli.mkdocs_utils.yaml')>",
-                "docstring": null
-              },
-              "GriffeLoader": {
-                "name": "GriffeLoader",
-                "kind": "class",
-                "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader",
-                "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.cli.mkdocs_utils.GriffeLoader')>",
-                "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
-                "members": {
-                  "load_project": {
-                    "name": "load_project",
-                    "kind": "function",
-                    "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_project",
-                    "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
-                    "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
-                  },
-                  "load_module": {
-                    "name": "load_module",
-                    "kind": "function",
-                    "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_module",
-                    "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
-                    "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
-                  }
-                }
-              },
-              "discover_module_paths": {
-                "name": "discover_module_paths",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.discover_module_paths",
-                "signature": "<bound method Alias.signature of Alias('discover_module_paths', 'docforge.cli.mkdocs_utils.discover_module_paths')>",
-                "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
-              },
-              "MkDocsRenderer": {
-                "name": "MkDocsRenderer",
-                "kind": "class",
-                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer",
-                "signature": "<bound method Alias.signature of Alias('MkDocsRenderer', 'docforge.cli.mkdocs_utils.MkDocsRenderer')>",
-                "docstring": "Renderer that produces Markdown documentation for MkDocs.\n\nGenerated pages use mkdocstrings directives to reference Python modules,\nallowing MkDocs to render API documentation dynamically.",
-                "members": {
-                  "name": {
-                    "name": "name",
-                    "kind": "attribute",
-                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.name",
-                    "signature": "<bound method Alias.signature of Alias('name', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.name')>",
-                    "docstring": null
-                  },
-                  "generate_sources": {
-                    "name": "generate_sources",
-                    "kind": "function",
-                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_sources",
-                    "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_sources')>",
-                    "docstring": "Generate Markdown documentation files for a project.\n\nThis method renders a documentation structure from the provided\nproject model and writes the resulting Markdown files to the\nspecified output directory.\n\nArgs:\n    project (Project):\n        Project model containing modules to document.\n\n    out_dir (Path):\n        Directory where generated Markdown files will be written.\n\n    module_is_source (bool, optional):\n        If True, treat the specified module as the documentation root\n        rather than nesting it inside a folder."
-                  },
-                  "generate_readme": {
-                    "name": "generate_readme",
-                    "kind": "function",
-                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_readme",
-                    "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
-                    "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
-                  }
-                }
-              },
-              "load_nav_spec": {
-                "name": "load_nav_spec",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.load_nav_spec",
-                "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.cli.mkdocs_utils.load_nav_spec')>",
-                "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
-              },
-              "resolve_nav": {
-                "name": "resolve_nav",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.resolve_nav",
-                "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.cli.mkdocs_utils.resolve_nav')>",
-                "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
-              },
-              "MkDocsNavEmitter": {
-                "name": "MkDocsNavEmitter",
-                "kind": "class",
-                "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter",
-                "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.cli.mkdocs_utils.MkDocsNavEmitter')>",
-                "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
-                "members": {
-                  "emit": {
-                    "name": "emit",
-                    "kind": "function",
-                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter.emit",
-                    "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
-                    "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
-                  }
-                }
-              },
-              "generate_sources": {
-                "name": "generate_sources",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.generate_sources",
-                "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.cli.mkdocs_utils.generate_sources')>",
-                "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module."
-              },
-              "generate_config": {
-                "name": "generate_config",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.generate_config",
-                "signature": "<bound method Alias.signature of Alias('generate_config', 'docforge.cli.mkdocs_utils.generate_config')>",
-                "docstring": "Generate an `mkdocs.yml` configuration file.\n\nThe configuration is created by combining a template configuration\nwith a navigation structure derived from the docforge navigation\nspecification.\n\nArgs:\n    docs_dir (Path):\n        Directory containing generated documentation Markdown files.\n\n    nav_file (Path):\n        Path to the `docforge.nav.yml` navigation specification.\n\n    template (Optional[Path]):\n        Optional path to a custom MkDocs configuration template. If not\n        provided, a built-in template will be used.\n\n    out (Path):\n        Destination path where the generated `mkdocs.yml` file will be written.\n\n    site_name (str):\n        Display name for the generated documentation site.\n\nRaises:\n    click.FileError:\n        If the navigation specification or template file cannot be found."
-              },
-              "build": {
-                "name": "build",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.build",
-                "signature": "<bound method Alias.signature of Alias('build', 'docforge.cli.mkdocs_utils.build')>",
-                "docstring": "Build the MkDocs documentation site.\n\nThis function loads the MkDocs configuration and runs the MkDocs\nbuild command to generate the final static documentation site.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
-              },
-              "serve": {
-                "name": "serve",
-                "kind": "function",
-                "path": "docforge.cli.commands.mkdocs_utils.serve",
-                "signature": "<bound method Alias.signature of Alias('serve', 'docforge.cli.mkdocs_utils.serve')>",
-                "docstring": "Start an MkDocs development server with live reload.\n\nThe server watches documentation files and automatically reloads\nthe site when changes are detected.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
-              }
-            }
-          },
           "mcp_utils": {
             "name": "mcp_utils",
             "kind": "module",
@@ -360,6 +168,191 @@
               }
             }
           },
+          "mkdocs_utils": {
+            "name": "mkdocs_utils",
+            "kind": "module",
+            "path": "docforge.cli.commands.mkdocs_utils",
+            "signature": "<bound method Alias.signature of Alias('mkdocs_utils', 'docforge.cli.mkdocs_utils')>",
+            "docstring": "# Summary\n\nUtilities for working with MkDocs in the doc-forge CLI.",
+            "members": {
+              "os": {
+                "name": "os",
+                "kind": "alias",
+                "path": "docforge.cli.commands.mkdocs_utils.os",
+                "signature": "<bound method Alias.signature of Alias('os', 'docforge.cli.mkdocs_utils.os')>",
+                "docstring": null
+              },
+              "resources": {
+                "name": "resources",
+                "kind": "alias",
+                "path": "docforge.cli.commands.mkdocs_utils.resources",
+                "signature": "<bound method Alias.signature of Alias('resources', 'docforge.cli.mkdocs_utils.resources')>",
+                "docstring": null
+              },
+              "Path": {
+                "name": "Path",
+                "kind": "alias",
+                "path": "docforge.cli.commands.mkdocs_utils.Path",
+                "signature": "<bound method Alias.signature of Alias('Path', 'docforge.cli.mkdocs_utils.Path')>",
+                "docstring": null
+              },
+              "click": {
+                "name": "click",
+                "kind": "alias",
+                "path": "docforge.cli.commands.mkdocs_utils.click",
+                "signature": "<bound method Alias.signature of Alias('click', 'docforge.cli.mkdocs_utils.click')>",
+                "docstring": null
+              },
+              "yaml": {
+                "name": "yaml",
+                "kind": "alias",
+                "path": "docforge.cli.commands.mkdocs_utils.yaml",
+                "signature": "<bound method Alias.signature of Alias('yaml', 'docforge.cli.mkdocs_utils.yaml')>",
+                "docstring": null
+              },
+              "GriffeLoader": {
+                "name": "GriffeLoader",
+                "kind": "class",
+                "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader",
+                "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.cli.mkdocs_utils.GriffeLoader')>",
+                "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
+                "members": {
+                  "load_project": {
+                    "name": "load_project",
+                    "kind": "function",
+                    "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_project",
+                    "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
+                    "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
+                  },
+                  "load_module": {
+                    "name": "load_module",
+                    "kind": "function",
+                    "path": "docforge.cli.commands.mkdocs_utils.GriffeLoader.load_module",
+                    "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
+                    "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
+                  }
+                }
+              },
+              "discover_module_paths": {
+                "name": "discover_module_paths",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.discover_module_paths",
+                "signature": "<bound method Alias.signature of Alias('discover_module_paths', 'docforge.cli.mkdocs_utils.discover_module_paths')>",
+                "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
+              },
+              "MkDocsNavEmitter": {
+                "name": "MkDocsNavEmitter",
+                "kind": "class",
+                "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter",
+                "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.cli.mkdocs_utils.MkDocsNavEmitter')>",
+                "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
+                "members": {
+                  "emit": {
+                    "name": "emit",
+                    "kind": "function",
+                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsNavEmitter.emit",
+                    "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
+                    "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
+                  }
+                }
+              },
+              "load_nav_spec": {
+                "name": "load_nav_spec",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.load_nav_spec",
+                "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.cli.mkdocs_utils.load_nav_spec')>",
+                "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
+              },
+              "resolve_nav": {
+                "name": "resolve_nav",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.resolve_nav",
+                "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.cli.mkdocs_utils.resolve_nav')>",
+                "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
+              },
+              "MkDocsRenderer": {
+                "name": "MkDocsRenderer",
+                "kind": "class",
+                "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer",
+                "signature": "<bound method Alias.signature of Alias('MkDocsRenderer', 'docforge.cli.mkdocs_utils.MkDocsRenderer')>",
+                "docstring": "Renderer that produces Markdown documentation for MkDocs.\n\nGenerated pages use mkdocstrings directives to reference Python modules,\nallowing MkDocs to render API documentation dynamically.",
+                "members": {
+                  "name": {
+                    "name": "name",
+                    "kind": "attribute",
+                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.name",
+                    "signature": "<bound method Alias.signature of Alias('name', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.name')>",
+                    "docstring": null
+                  },
+                  "generate_sources": {
+                    "name": "generate_sources",
+                    "kind": "function",
+                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_sources",
+                    "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_sources')>",
+                    "docstring": "Generate Markdown documentation files for a project.\n\nThis method renders a documentation structure from the provided\nproject model and writes the resulting Markdown files to the\nspecified output directory.\n\nArgs:\n    project (Project):\n        Project model containing modules to document.\n\n    out_dir (Path):\n        Directory where generated Markdown files will be written.\n\n    module_is_source (bool, optional):\n        If True, treat the specified module as the documentation root\n        rather than nesting it inside a folder."
+                  },
+                  "generate_readme": {
+                    "name": "generate_readme",
+                    "kind": "function",
+                    "path": "docforge.cli.commands.mkdocs_utils.MkDocsRenderer.generate_readme",
+                    "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
+                    "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
+                  }
+                }
+              },
+              "generate_sources": {
+                "name": "generate_sources",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.generate_sources",
+                "signature": "<bound method Alias.signature of Alias('generate_sources', 'docforge.cli.mkdocs_utils.generate_sources')>",
+                "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written. If not\n        provided, defaults to the parent of ``docs_dir``."
+              },
+              "generate_config": {
+                "name": "generate_config",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.generate_config",
+                "signature": "<bound method Alias.signature of Alias('generate_config', 'docforge.cli.mkdocs_utils.generate_config')>",
+                "docstring": "Generate an `mkdocs.yml` configuration file.\n\nThe configuration is created by combining a template configuration\nwith a navigation structure derived from the docforge navigation\nspecification.\n\nArgs:\n    docs_dir (Path):\n        Directory containing generated documentation Markdown files.\n\n    nav_file (Path):\n        Path to the `docforge.nav.yml` navigation specification.\n\n    template (Optional[Path]):\n        Optional path to a custom MkDocs configuration template. If not\n        provided, a built-in template will be used.\n\n    out (Path):\n        Destination path where the generated `mkdocs.yml` file will be written.\n\n    site_name (str):\n        Display name for the generated documentation site.\n\nRaises:\n    click.FileError:\n        If the navigation specification or template file cannot be found."
+              },
+              "build": {
+                "name": "build",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.build",
+                "signature": "<bound method Alias.signature of Alias('build', 'docforge.cli.mkdocs_utils.build')>",
+                "docstring": "Build the MkDocs documentation site.\n\nThis function loads the MkDocs configuration and runs the MkDocs\nbuild command to generate the final static documentation site.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
+              },
+              "serve": {
+                "name": "serve",
+                "kind": "function",
+                "path": "docforge.cli.commands.mkdocs_utils.serve",
+                "signature": "<bound method Alias.signature of Alias('serve', 'docforge.cli.mkdocs_utils.serve')>",
+                "docstring": "Start an MkDocs development server with live reload.\n\nThe server watches documentation files and automatically reloads\nthe site when changes are detected.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
+              }
+            }
+          },
+          "GriffeLoader": {
+            "name": "GriffeLoader",
+            "kind": "class",
+            "path": "docforge.cli.commands.GriffeLoader",
+            "signature": "<bound method Alias.signature of Alias('GriffeLoader', 'docforge.loaders.GriffeLoader')>",
+            "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
+            "members": {
+              "load_project": {
+                "name": "load_project",
+                "kind": "function",
+                "path": "docforge.cli.commands.GriffeLoader.load_project",
+                "signature": "<bound method Alias.signature of Alias('load_project', 'docforge.loaders.griffe_loader.GriffeLoader.load_project')>",
+                "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
+              },
+              "load_module": {
+                "name": "load_module",
+                "kind": "function",
+                "path": "docforge.cli.commands.GriffeLoader.load_module",
+                "signature": "<bound method Alias.signature of Alias('load_module', 'docforge.loaders.griffe_loader.GriffeLoader.load_module')>",
+                "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
+              }
+            }
+          },
           "cli": {
             "name": "cli",
             "kind": "attribute",
@@ -371,36 +364,36 @@
             "name": "build",
             "kind": "function",
             "path": "docforge.cli.commands.build",
-            "signature": "<bound method Function.signature of Function('build', 28, 136)>",
+            "signature": "<bound method Function.signature of Function('build', 28, 165)>",
             "docstring": "Build documentation artifacts.\n\nThis command performs the full documentation build pipeline:\n\n1. Introspects the Python project using Griffe\n2. Generates renderer-specific documentation sources\n3. Optionally builds the final documentation output\n\nDepending on the selected options, the build can target:\n\n- MkDocs static documentation sites\n- MCP structured documentation resources\n\nArgs:\n    mcp (bool):\n        Enable MCP documentation generation.\n\n    mkdocs (bool):\n        Enable MkDocs documentation generation.\n\n    module_is_source (bool):\n        Treat the specified module directory as the project root.\n\n    module (Optional[str]):\n        Python module import path to document.\n\n    project_name (Optional[str]):\n        Optional override for the project name.\n\n    site_name (Optional[str]):\n        Display name for the MkDocs site.\n\n    docs_dir (Path):\n        Directory where Markdown documentation sources will be generated.\n\n    nav_file (Path):\n        Path to the navigation specification file.\n\n    template (Optional[Path]):\n        Optional custom MkDocs configuration template.\n\n    mkdocs_yml (Path):\n        Output path for the generated MkDocs configuration.\n\n    out_dir (Path):\n        Output directory for generated MCP resources.\n\nRaises:\n    click.UsageError:\n        If required options are missing or conflicting."
           },
           "serve": {
             "name": "serve",
             "kind": "function",
             "path": "docforge.cli.commands.serve",
-            "signature": "<bound method Function.signature of Function('serve', 139, 190)>",
+            "signature": "<bound method Function.signature of Function('serve', 168, 229)>",
             "docstring": "Serve generated documentation locally.\n\nDepending on the selected mode, this command starts either:\n\n- A MkDocs development server for browsing documentation\n- An MCP server exposing structured documentation resources\n\nArgs:\n    mcp (bool):\n        Serve documentation using the MCP server.\n\n    mkdocs (bool):\n        Serve the MkDocs development site.\n\n    module (Optional[str]):\n        Python module import path to serve via MCP.\n\n    mkdocs_yml (Path):\n        Path to the MkDocs configuration file.\n\n    out_dir (Path):\n        Root directory containing MCP documentation resources.\n\nRaises:\n    click.UsageError:\n        If invalid or conflicting options are provided."
           },
           "tree": {
             "name": "tree",
             "kind": "function",
             "path": "docforge.cli.commands.tree",
-            "signature": "<bound method Function.signature of Function('tree', 193, 229)>",
+            "signature": "<bound method Function.signature of Function('tree', 232, 268)>",
             "docstring": "Display the documentation object tree for a module.\n\nThis command introspects the specified module and prints a\nhierarchical representation of the discovered documentation\nobjects, including modules, classes, functions, and members.\n\nArgs:\n    module (str):\n        Python module import path to introspect.\n\n    project_name (Optional[str]):\n        Optional name to display as the project root."
           },
-          "Group": {
-            "name": "Group",
-            "kind": "alias",
-            "path": "docforge.cli.commands.Group",
-            "signature": "<bound method Alias.signature of Alias('Group', 'click.core.Group')>",
-            "docstring": null
-          },
           "Any": {
             "name": "Any",
             "kind": "alias",
             "path": "docforge.cli.commands.Any",
             "signature": "<bound method Alias.signature of Alias('Any', 'typing.Any')>",
             "docstring": null
+          },
+          "Group": {
+            "name": "Group",
+            "kind": "alias",
+            "path": "docforge.cli.commands.Group",
+            "signature": "<bound method Alias.signature of Alias('Group', 'click.core.Group')>",
+            "docstring": null
           }
         }
       },
@@ -512,14 +505,14 @@
             "name": "generate_resources",
             "kind": "function",
             "path": "docforge.cli.mcp_utils.generate_resources",
-            "signature": "<bound method Function.signature of Function('generate_resources', 14, 40)>",
+            "signature": "<bound method Function.signature of Function('generate_resources', 16, 42)>",
             "docstring": "Generate MCP documentation resources from a Python module.\n\nThe function performs project introspection, builds the internal\ndocumentation model, and renders MCP-compatible JSON resources\nto the specified output directory.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in generated\n        documentation metadata.\n\n    out_dir (Path):\n        Directory where MCP resources (index.json, nav.json, and module data)\n        will be written."
           },
           "serve": {
             "name": "serve",
             "kind": "function",
             "path": "docforge.cli.mcp_utils.serve",
-            "signature": "<bound method Function.signature of Function('serve', 43, 80)>",
+            "signature": "<bound method Function.signature of Function('serve', 45, 82)>",
             "docstring": "Start an MCP server for a pre-generated documentation bundle.\n\nThe server exposes documentation resources such as project metadata,\nnavigation structure, and module documentation through MCP endpoints.\n\nArgs:\n    module (str):\n        Python module import path used to identify the served\n        documentation instance.\n\n    mcp_root (Path):\n        Path to the directory containing the MCP documentation\n        bundle (index.json, nav.json, and modules/).\n\nRaises:\n    click.ClickException:\n        If the MCP documentation bundle is missing required files or directories."
           }
         }
@@ -531,11 +524,11 @@
         "signature": null,
         "docstring": "# Summary\n\nUtilities for working with MkDocs in the doc-forge CLI.",
         "members": {
-          "Path": {
+          "os": {
-            "name": "Path",
+            "name": "os",
             "kind": "alias",
-            "path": "docforge.cli.mkdocs_utils.Path",
+            "path": "docforge.cli.mkdocs_utils.os",
-            "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
+            "signature": "<bound method Alias.signature of Alias('os', 'os')>",
             "docstring": null
           },
           "resources": {
@@ -545,6 +538,13 @@
             "signature": "<bound method Alias.signature of Alias('resources', 'importlib.resources')>",
             "docstring": null
           },
+          "Path": {
+            "name": "Path",
+            "kind": "alias",
+            "path": "docforge.cli.mkdocs_utils.Path",
+            "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
+            "docstring": null
+          },
           "click": {
             "name": "click",
             "kind": "alias",
@@ -589,6 +589,36 @@
             "signature": "<bound method Alias.signature of Alias('discover_module_paths', 'docforge.loaders.discover_module_paths')>",
             "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
           },
+          "MkDocsNavEmitter": {
+            "name": "MkDocsNavEmitter",
+            "kind": "class",
+            "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter",
+            "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.nav.MkDocsNavEmitter')>",
+            "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
+            "members": {
+              "emit": {
+                "name": "emit",
+                "kind": "function",
+                "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter.emit",
+                "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
+                "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
+              }
+            }
+          },
+          "load_nav_spec": {
+            "name": "load_nav_spec",
+            "kind": "function",
+            "path": "docforge.cli.mkdocs_utils.load_nav_spec",
+            "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.nav.load_nav_spec')>",
+            "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
+          },
+          "resolve_nav": {
+            "name": "resolve_nav",
+            "kind": "function",
+            "path": "docforge.cli.mkdocs_utils.resolve_nav",
+            "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.nav.resolve_nav')>",
+            "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
+          },
           "MkDocsRenderer": {
             "name": "MkDocsRenderer",
             "kind": "class",
@@ -615,37 +645,7 @@
                 "kind": "function",
                 "path": "docforge.cli.mkdocs_utils.MkDocsRenderer.generate_readme",
                 "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
-                "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
+                "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
-              }
-            }
-          },
-          "load_nav_spec": {
-            "name": "load_nav_spec",
-            "kind": "function",
-            "path": "docforge.cli.mkdocs_utils.load_nav_spec",
-            "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.nav.load_nav_spec')>",
-            "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
-          },
-          "resolve_nav": {
-            "name": "resolve_nav",
-            "kind": "function",
-            "path": "docforge.cli.mkdocs_utils.resolve_nav",
-            "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.nav.resolve_nav')>",
-            "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
-          },
-          "MkDocsNavEmitter": {
-            "name": "MkDocsNavEmitter",
-            "kind": "class",
-            "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter",
-            "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.nav.MkDocsNavEmitter')>",
-            "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
-            "members": {
-              "emit": {
-                "name": "emit",
-                "kind": "function",
-                "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter.emit",
-                "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
-                "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
               }
             }
           },
@@ -653,28 +653,28 @@
             "name": "generate_sources",
             "kind": "function",
             "path": "docforge.cli.mkdocs_utils.generate_sources",
-            "signature": "<bound method Function.signature of Function('generate_sources', 16, 59)>",
+            "signature": "<bound method Function.signature of Function('generate_sources', 19, 68)>",
-            "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module."
+            "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written. If not\n        provided, defaults to the parent of ``docs_dir``."
           },
           "generate_config": {
             "name": "generate_config",
             "kind": "function",
             "path": "docforge.cli.mkdocs_utils.generate_config",
-            "signature": "<bound method Function.signature of Function('generate_config', 62, 120)>",
+            "signature": "<bound method Function.signature of Function('generate_config', 71, 130)>",
             "docstring": "Generate an `mkdocs.yml` configuration file.\n\nThe configuration is created by combining a template configuration\nwith a navigation structure derived from the docforge navigation\nspecification.\n\nArgs:\n    docs_dir (Path):\n        Directory containing generated documentation Markdown files.\n\n    nav_file (Path):\n        Path to the `docforge.nav.yml` navigation specification.\n\n    template (Optional[Path]):\n        Optional path to a custom MkDocs configuration template. If not\n        provided, a built-in template will be used.\n\n    out (Path):\n        Destination path where the generated `mkdocs.yml` file will be written.\n\n    site_name (str):\n        Display name for the generated documentation site.\n\nRaises:\n    click.FileError:\n        If the navigation specification or template file cannot be found."
           },
           "build": {
             "name": "build",
             "kind": "function",
             "path": "docforge.cli.mkdocs_utils.build",
-            "signature": "<bound method Function.signature of Function('build', 123, 144)>",
+            "signature": "<bound method Function.signature of Function('build', 133, 154)>",
             "docstring": "Build the MkDocs documentation site.\n\nThis function loads the MkDocs configuration and runs the MkDocs\nbuild command to generate the final static documentation site.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
           },
           "serve": {
             "name": "serve",
             "kind": "function",
             "path": "docforge.cli.mkdocs_utils.serve",
-            "signature": "<bound method Function.signature of Function('serve', 147, 166)>",
+            "signature": "<bound method Function.signature of Function('serve', 157, 177)>",
             "docstring": "Start an MkDocs development server with live reload.\n\nThe server watches documentation files and automatically reloads\nthe site when changes are detected.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
           }
         }

docs/mcp/modules/docforge.cli.mcp_utils.json

@@ -105,14 +105,14 @@
         "name": "generate_resources",
         "kind": "function",
         "path": "docforge.cli.mcp_utils.generate_resources",
-        "signature": "<bound method Function.signature of Function('generate_resources', 14, 40)>",
+        "signature": "<bound method Function.signature of Function('generate_resources', 16, 42)>",
         "docstring": "Generate MCP documentation resources from a Python module.\n\nThe function performs project introspection, builds the internal\ndocumentation model, and renders MCP-compatible JSON resources\nto the specified output directory.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in generated\n        documentation metadata.\n\n    out_dir (Path):\n        Directory where MCP resources (index.json, nav.json, and module data)\n        will be written."
       },
       "serve": {
         "name": "serve",
         "kind": "function",
         "path": "docforge.cli.mcp_utils.serve",
-        "signature": "<bound method Function.signature of Function('serve', 43, 80)>",
+        "signature": "<bound method Function.signature of Function('serve', 45, 82)>",
         "docstring": "Start an MCP server for a pre-generated documentation bundle.\n\nThe server exposes documentation resources such as project metadata,\nnavigation structure, and module documentation through MCP endpoints.\n\nArgs:\n    module (str):\n        Python module import path used to identify the served\n        documentation instance.\n\n    mcp_root (Path):\n        Path to the directory containing the MCP documentation\n        bundle (index.json, nav.json, and modules/).\n\nRaises:\n    click.ClickException:\n        If the MCP documentation bundle is missing required files or directories."
       }
     }

docs/mcp/modules/docforge.cli.mkdocs_utils.json

@@ -4,11 +4,11 @@
     "path": "docforge.cli.mkdocs_utils",
     "docstring": "# Summary\n\nUtilities for working with MkDocs in the doc-forge CLI.",
     "objects": {
-      "Path": {
+      "os": {
-        "name": "Path",
+        "name": "os",
         "kind": "alias",
-        "path": "docforge.cli.mkdocs_utils.Path",
+        "path": "docforge.cli.mkdocs_utils.os",
-        "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
+        "signature": "<bound method Alias.signature of Alias('os', 'os')>",
         "docstring": null
       },
       "resources": {
@@ -18,6 +18,13 @@
         "signature": "<bound method Alias.signature of Alias('resources', 'importlib.resources')>",
         "docstring": null
       },
+      "Path": {
+        "name": "Path",
+        "kind": "alias",
+        "path": "docforge.cli.mkdocs_utils.Path",
+        "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
+        "docstring": null
+      },
       "click": {
         "name": "click",
         "kind": "alias",
@@ -62,6 +69,36 @@
         "signature": "<bound method Alias.signature of Alias('discover_module_paths', 'docforge.loaders.discover_module_paths')>",
         "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
       },
+      "MkDocsNavEmitter": {
+        "name": "MkDocsNavEmitter",
+        "kind": "class",
+        "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter",
+        "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.nav.MkDocsNavEmitter')>",
+        "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
+        "members": {
+          "emit": {
+            "name": "emit",
+            "kind": "function",
+            "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter.emit",
+            "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
+            "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
+          }
+        }
+      },
+      "load_nav_spec": {
+        "name": "load_nav_spec",
+        "kind": "function",
+        "path": "docforge.cli.mkdocs_utils.load_nav_spec",
+        "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.nav.load_nav_spec')>",
+        "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
+      },
+      "resolve_nav": {
+        "name": "resolve_nav",
+        "kind": "function",
+        "path": "docforge.cli.mkdocs_utils.resolve_nav",
+        "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.nav.resolve_nav')>",
+        "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
+      },
       "MkDocsRenderer": {
         "name": "MkDocsRenderer",
         "kind": "class",
@@ -88,37 +125,7 @@
             "kind": "function",
             "path": "docforge.cli.mkdocs_utils.MkDocsRenderer.generate_readme",
             "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
-            "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
+            "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
-          }
-        }
-      },
-      "load_nav_spec": {
-        "name": "load_nav_spec",
-        "kind": "function",
-        "path": "docforge.cli.mkdocs_utils.load_nav_spec",
-        "signature": "<bound method Alias.signature of Alias('load_nav_spec', 'docforge.nav.load_nav_spec')>",
-        "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
-      },
-      "resolve_nav": {
-        "name": "resolve_nav",
-        "kind": "function",
-        "path": "docforge.cli.mkdocs_utils.resolve_nav",
-        "signature": "<bound method Alias.signature of Alias('resolve_nav', 'docforge.nav.resolve_nav')>",
-        "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
-      },
-      "MkDocsNavEmitter": {
-        "name": "MkDocsNavEmitter",
-        "kind": "class",
-        "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter",
-        "signature": "<bound method Alias.signature of Alias('MkDocsNavEmitter', 'docforge.nav.MkDocsNavEmitter')>",
-        "docstring": "Emit MkDocs navigation structures from resolved navigation data.\n\nThe emitter transforms a ``ResolvedNav`` object into the YAML-compatible\nlist structure expected by the MkDocs ``nav`` configuration field.",
-        "members": {
-          "emit": {
-            "name": "emit",
-            "kind": "function",
-            "path": "docforge.cli.mkdocs_utils.MkDocsNavEmitter.emit",
-            "signature": "<bound method Alias.signature of Alias('emit', 'docforge.nav.mkdocs.MkDocsNavEmitter.emit')>",
-            "docstring": "Generate a navigation structure for ``mkdocs.yml``.\n\nArgs:\n    nav: Resolved navigation data describing documentation groups\n        and their associated Markdown files.\n\nReturns:\n    A list of dictionaries representing the MkDocs navigation layout.\n    Each dictionary maps a navigation label to a page or a list of\n    pages."
           }
         }
       },
@@ -126,28 +133,28 @@
         "name": "generate_sources",
         "kind": "function",
         "path": "docforge.cli.mkdocs_utils.generate_sources",
-        "signature": "<bound method Function.signature of Function('generate_sources', 16, 59)>",
+        "signature": "<bound method Function.signature of Function('generate_sources', 19, 68)>",
-        "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module."
+        "docstring": "Generate MkDocs Markdown sources for a Python module.\n\nThis function introspects the specified module, builds the internal\ndocumentation model, and renders Markdown documentation files for\nuse with MkDocs.\n\nArgs:\n    module (str):\n        Python module import path used as the entry point for\n        documentation generation.\n\n    docs_dir (Path):\n        Directory where the generated Markdown files will be written.\n\n    project_name (Optional[str]):\n        Optional override for the project name used in documentation metadata.\n\n    module_is_source (Optional[bool]):\n        If True, treat the specified module directory as the project root\n        rather than a nested module.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written. If not\n        provided, defaults to the parent of ``docs_dir``."
       },
       "generate_config": {
         "name": "generate_config",
         "kind": "function",
         "path": "docforge.cli.mkdocs_utils.generate_config",
-        "signature": "<bound method Function.signature of Function('generate_config', 62, 120)>",
+        "signature": "<bound method Function.signature of Function('generate_config', 71, 130)>",
         "docstring": "Generate an `mkdocs.yml` configuration file.\n\nThe configuration is created by combining a template configuration\nwith a navigation structure derived from the docforge navigation\nspecification.\n\nArgs:\n    docs_dir (Path):\n        Directory containing generated documentation Markdown files.\n\n    nav_file (Path):\n        Path to the `docforge.nav.yml` navigation specification.\n\n    template (Optional[Path]):\n        Optional path to a custom MkDocs configuration template. If not\n        provided, a built-in template will be used.\n\n    out (Path):\n        Destination path where the generated `mkdocs.yml` file will be written.\n\n    site_name (str):\n        Display name for the generated documentation site.\n\nRaises:\n    click.FileError:\n        If the navigation specification or template file cannot be found."
       },
       "build": {
         "name": "build",
         "kind": "function",
         "path": "docforge.cli.mkdocs_utils.build",
-        "signature": "<bound method Function.signature of Function('build', 123, 144)>",
+        "signature": "<bound method Function.signature of Function('build', 133, 154)>",
         "docstring": "Build the MkDocs documentation site.\n\nThis function loads the MkDocs configuration and runs the MkDocs\nbuild command to generate the final static documentation site.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
       },
       "serve": {
         "name": "serve",
         "kind": "function",
         "path": "docforge.cli.mkdocs_utils.serve",
-        "signature": "<bound method Function.signature of Function('serve', 147, 166)>",
+        "signature": "<bound method Function.signature of Function('serve', 157, 177)>",
         "docstring": "Start an MkDocs development server with live reload.\n\nThe server watches documentation files and automatically reloads\nthe site when changes are detected.\n\nArgs:\n    mkdocs_yml (Path):\n        Path to the `mkdocs.yml` configuration file.\n\nRaises:\n    click.ClickException:\n        If the configuration file does not exist."
       }
     }

docs/mcp/modules/docforge.loaders.griffe_loader.json

@@ -18,25 +18,11 @@
         "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
         "docstring": null
       },
-      "List": {
+      "AliasResolutionError": {
-        "name": "List",
+        "name": "AliasResolutionError",
         "kind": "alias",
-        "path": "docforge.loaders.griffe_loader.List",
+        "path": "docforge.loaders.griffe_loader.AliasResolutionError",
-        "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
+        "signature": "<bound method Alias.signature of Alias('AliasResolutionError', 'griffe.AliasResolutionError')>",
-        "docstring": null
-      },
-      "Optional": {
-        "name": "Optional",
-        "kind": "alias",
-        "path": "docforge.loaders.griffe_loader.Optional",
-        "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-        "docstring": null
-      },
-      "ModulesCollection": {
-        "name": "ModulesCollection",
-        "kind": "alias",
-        "path": "docforge.loaders.griffe_loader.ModulesCollection",
-        "signature": "<bound method Alias.signature of Alias('ModulesCollection', 'griffe.ModulesCollection')>",
         "docstring": null
       },
       "LinesCollection": {
@@ -46,6 +32,13 @@
         "signature": "<bound method Alias.signature of Alias('LinesCollection', 'griffe.LinesCollection')>",
         "docstring": null
       },
+      "ModulesCollection": {
+        "name": "ModulesCollection",
+        "kind": "alias",
+        "path": "docforge.loaders.griffe_loader.ModulesCollection",
+        "signature": "<bound method Alias.signature of Alias('ModulesCollection', 'griffe.ModulesCollection')>",
+        "docstring": null
+      },
       "Object": {
         "name": "Object",
         "kind": "alias",
@@ -53,12 +46,77 @@
         "signature": "<bound method Alias.signature of Alias('Object', 'griffe.Object')>",
         "docstring": null
       },
-      "AliasResolutionError": {
+      "DocObject": {
-        "name": "AliasResolutionError",
+        "name": "DocObject",
-        "kind": "alias",
+        "kind": "class",
-        "path": "docforge.loaders.griffe_loader.AliasResolutionError",
+        "path": "docforge.loaders.griffe_loader.DocObject",
-        "signature": "<bound method Alias.signature of Alias('AliasResolutionError', 'griffe.AliasResolutionError')>",
+        "signature": "<bound method Alias.signature of Alias('DocObject', 'docforge.models.DocObject')>",
-        "docstring": null
+        "docstring": "Representation of a documented Python object.\n\nA `DocObject` models a single Python entity discovered during\nintrospection. Objects may contain nested members, allowing the structure\nof modules, classes, and other containers to be represented recursively.\n\nAttributes:\n    name (str):\n        Local name of the object.\n\n    kind (str):\n        Type of object (for example `class`, `function`, `method`, or `attribute`).\n\n    path (str):\n        Fully qualified dotted path to the object.\n\n    signature (Optional[str]):\n        Callable signature if the object represents a callable.\n\n    docstring (Optional[str]):\n        Raw docstring text extracted from the source code.\n\n    members (Dict[str, DocObject]):\n        Mapping of member names to child `DocObject` instances.",
+        "members": {
+          "name": {
+            "name": "name",
+            "kind": "attribute",
+            "path": "docforge.loaders.griffe_loader.DocObject.name",
+            "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.object.DocObject.name')>",
+            "docstring": null
+          },
+          "kind": {
+            "name": "kind",
+            "kind": "attribute",
+            "path": "docforge.loaders.griffe_loader.DocObject.kind",
+            "signature": "<bound method Alias.signature of Alias('kind', 'docforge.models.object.DocObject.kind')>",
+            "docstring": null
+          },
+          "path": {
+            "name": "path",
+            "kind": "attribute",
+            "path": "docforge.loaders.griffe_loader.DocObject.path",
+            "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.object.DocObject.path')>",
+            "docstring": null
+          },
+          "signature": {
+            "name": "signature",
+            "kind": "attribute",
+            "path": "docforge.loaders.griffe_loader.DocObject.signature",
+            "signature": "<bound method Alias.signature of Alias('signature', 'docforge.models.object.DocObject.signature')>",
+            "docstring": null
+          },
+          "docstring": {
+            "name": "docstring",
+            "kind": "attribute",
+            "path": "docforge.loaders.griffe_loader.DocObject.docstring",
+            "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.object.DocObject.docstring')>",
+            "docstring": null
+          },
+          "members": {
+            "name": "members",
+            "kind": "attribute",
+            "path": "docforge.loaders.griffe_loader.DocObject.members",
+            "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.object.DocObject.members')>",
+            "docstring": null
+          },
+          "add_member": {
+            "name": "add_member",
+            "kind": "function",
+            "path": "docforge.loaders.griffe_loader.DocObject.add_member",
+            "signature": "<bound method Alias.signature of Alias('add_member', 'docforge.models.object.DocObject.add_member')>",
+            "docstring": "Add a child documentation object.\n\nThis is typically used when attaching methods to classes or\nnested objects to their parent containers.\n\nArgs:\n    obj: Documentation object to add as a member."
+          },
+          "get_member": {
+            "name": "get_member",
+            "kind": "function",
+            "path": "docforge.loaders.griffe_loader.DocObject.get_member",
+            "signature": "<bound method Alias.signature of Alias('get_member', 'docforge.models.object.DocObject.get_member')>",
+            "docstring": "Retrieve a member object by name.\n\nArgs:\n    name (str):\n        Name of the member to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If the member does not exist."
+          },
+          "get_all_members": {
+            "name": "get_all_members",
+            "kind": "function",
+            "path": "docforge.loaders.griffe_loader.DocObject.get_all_members",
+            "signature": "<bound method Alias.signature of Alias('get_all_members', 'docforge.models.object.DocObject.get_all_members')>",
+            "docstring": "Return all child members of the object.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing nested members."
+          }
+        }
       },
       "Module": {
         "name": "Module",
@@ -162,78 +220,6 @@
           }
         }
       },
-      "DocObject": {
-        "name": "DocObject",
-        "kind": "class",
-        "path": "docforge.loaders.griffe_loader.DocObject",
-        "signature": "<bound method Alias.signature of Alias('DocObject', 'docforge.models.DocObject')>",
-        "docstring": "Representation of a documented Python object.\n\nA `DocObject` models a single Python entity discovered during\nintrospection. Objects may contain nested members, allowing the structure\nof modules, classes, and other containers to be represented recursively.\n\nAttributes:\n    name (str):\n        Local name of the object.\n\n    kind (str):\n        Type of object (for example `class`, `function`, `method`, or `attribute`).\n\n    path (str):\n        Fully qualified dotted path to the object.\n\n    signature (Optional[str]):\n        Callable signature if the object represents a callable.\n\n    docstring (Optional[str]):\n        Raw docstring text extracted from the source code.\n\n    members (Dict[str, DocObject]):\n        Mapping of member names to child `DocObject` instances.",
-        "members": {
-          "name": {
-            "name": "name",
-            "kind": "attribute",
-            "path": "docforge.loaders.griffe_loader.DocObject.name",
-            "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.object.DocObject.name')>",
-            "docstring": null
-          },
-          "kind": {
-            "name": "kind",
-            "kind": "attribute",
-            "path": "docforge.loaders.griffe_loader.DocObject.kind",
-            "signature": "<bound method Alias.signature of Alias('kind', 'docforge.models.object.DocObject.kind')>",
-            "docstring": null
-          },
-          "path": {
-            "name": "path",
-            "kind": "attribute",
-            "path": "docforge.loaders.griffe_loader.DocObject.path",
-            "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.object.DocObject.path')>",
-            "docstring": null
-          },
-          "signature": {
-            "name": "signature",
-            "kind": "attribute",
-            "path": "docforge.loaders.griffe_loader.DocObject.signature",
-            "signature": "<bound method Alias.signature of Alias('signature', 'docforge.models.object.DocObject.signature')>",
-            "docstring": null
-          },
-          "docstring": {
-            "name": "docstring",
-            "kind": "attribute",
-            "path": "docforge.loaders.griffe_loader.DocObject.docstring",
-            "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.object.DocObject.docstring')>",
-            "docstring": null
-          },
-          "members": {
-            "name": "members",
-            "kind": "attribute",
-            "path": "docforge.loaders.griffe_loader.DocObject.members",
-            "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.object.DocObject.members')>",
-            "docstring": null
-          },
-          "add_member": {
-            "name": "add_member",
-            "kind": "function",
-            "path": "docforge.loaders.griffe_loader.DocObject.add_member",
-            "signature": "<bound method Alias.signature of Alias('add_member', 'docforge.models.object.DocObject.add_member')>",
-            "docstring": "Add a child documentation object.\n\nThis is typically used when attaching methods to classes or\nnested objects to their parent containers.\n\nArgs:\n    obj: Documentation object to add as a member."
-          },
-          "get_member": {
-            "name": "get_member",
-            "kind": "function",
-            "path": "docforge.loaders.griffe_loader.DocObject.get_member",
-            "signature": "<bound method Alias.signature of Alias('get_member', 'docforge.models.object.DocObject.get_member')>",
-            "docstring": "Retrieve a member object by name.\n\nArgs:\n    name (str):\n        Name of the member to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If the member does not exist."
-          },
-          "get_all_members": {
-            "name": "get_all_members",
-            "kind": "function",
-            "path": "docforge.loaders.griffe_loader.DocObject.get_all_members",
-            "signature": "<bound method Alias.signature of Alias('get_all_members', 'docforge.models.object.DocObject.get_all_members')>",
-            "docstring": "Return all child members of the object.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing nested members."
-          }
-        }
-      },
       "logger": {
         "name": "logger",
         "kind": "attribute",
@@ -245,28 +231,28 @@
         "name": "discover_module_paths",
         "kind": "function",
         "path": "docforge.loaders.griffe_loader.discover_module_paths",
-        "signature": "<bound method Function.signature of Function('discover_module_paths', 28, 80)>",
+        "signature": "<bound method Function.signature of Function('discover_module_paths', 29, 81)>",
         "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
       },
       "GriffeLoader": {
         "name": "GriffeLoader",
         "kind": "class",
         "path": "docforge.loaders.griffe_loader.GriffeLoader",
-        "signature": "<bound method Class.signature of Class('GriffeLoader', 83, 287)>",
+        "signature": "<bound method Class.signature of Class('GriffeLoader', 84, 288)>",
         "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
         "members": {
           "load_project": {
             "name": "load_project",
             "kind": "function",
             "path": "docforge.loaders.griffe_loader.GriffeLoader.load_project",
-            "signature": "<bound method Function.signature of Function('load_project', 104, 158)>",
+            "signature": "<bound method Function.signature of Function('load_project', 105, 159)>",
             "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
           },
           "load_module": {
             "name": "load_module",
             "kind": "function",
             "path": "docforge.loaders.griffe_loader.GriffeLoader.load_module",
-            "signature": "<bound method Function.signature of Function('load_module', 160, 178)>",
+            "signature": "<bound method Function.signature of Function('load_module', 161, 179)>",
             "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
           }
         }

docs/mcp/modules/docforge.loaders.json

@@ -55,25 +55,11 @@
             "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
             "docstring": null
           },
-          "List": {
+          "AliasResolutionError": {
-            "name": "List",
+            "name": "AliasResolutionError",
             "kind": "alias",
-            "path": "docforge.loaders.griffe_loader.List",
+            "path": "docforge.loaders.griffe_loader.AliasResolutionError",
-            "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
+            "signature": "<bound method Alias.signature of Alias('AliasResolutionError', 'griffe.AliasResolutionError')>",
-            "docstring": null
-          },
-          "Optional": {
-            "name": "Optional",
-            "kind": "alias",
-            "path": "docforge.loaders.griffe_loader.Optional",
-            "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-            "docstring": null
-          },
-          "ModulesCollection": {
-            "name": "ModulesCollection",
-            "kind": "alias",
-            "path": "docforge.loaders.griffe_loader.ModulesCollection",
-            "signature": "<bound method Alias.signature of Alias('ModulesCollection', 'griffe.ModulesCollection')>",
             "docstring": null
           },
           "LinesCollection": {
@@ -83,6 +69,13 @@
             "signature": "<bound method Alias.signature of Alias('LinesCollection', 'griffe.LinesCollection')>",
             "docstring": null
           },
+          "ModulesCollection": {
+            "name": "ModulesCollection",
+            "kind": "alias",
+            "path": "docforge.loaders.griffe_loader.ModulesCollection",
+            "signature": "<bound method Alias.signature of Alias('ModulesCollection', 'griffe.ModulesCollection')>",
+            "docstring": null
+          },
           "Object": {
             "name": "Object",
             "kind": "alias",
@@ -90,12 +83,77 @@
             "signature": "<bound method Alias.signature of Alias('Object', 'griffe.Object')>",
             "docstring": null
           },
-          "AliasResolutionError": {
+          "DocObject": {
-            "name": "AliasResolutionError",
+            "name": "DocObject",
-            "kind": "alias",
+            "kind": "class",
-            "path": "docforge.loaders.griffe_loader.AliasResolutionError",
+            "path": "docforge.loaders.griffe_loader.DocObject",
-            "signature": "<bound method Alias.signature of Alias('AliasResolutionError', 'griffe.AliasResolutionError')>",
+            "signature": "<bound method Alias.signature of Alias('DocObject', 'docforge.models.DocObject')>",
-            "docstring": null
+            "docstring": "Representation of a documented Python object.\n\nA `DocObject` models a single Python entity discovered during\nintrospection. Objects may contain nested members, allowing the structure\nof modules, classes, and other containers to be represented recursively.\n\nAttributes:\n    name (str):\n        Local name of the object.\n\n    kind (str):\n        Type of object (for example `class`, `function`, `method`, or `attribute`).\n\n    path (str):\n        Fully qualified dotted path to the object.\n\n    signature (Optional[str]):\n        Callable signature if the object represents a callable.\n\n    docstring (Optional[str]):\n        Raw docstring text extracted from the source code.\n\n    members (Dict[str, DocObject]):\n        Mapping of member names to child `DocObject` instances.",
+            "members": {
+              "name": {
+                "name": "name",
+                "kind": "attribute",
+                "path": "docforge.loaders.griffe_loader.DocObject.name",
+                "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.object.DocObject.name')>",
+                "docstring": null
+              },
+              "kind": {
+                "name": "kind",
+                "kind": "attribute",
+                "path": "docforge.loaders.griffe_loader.DocObject.kind",
+                "signature": "<bound method Alias.signature of Alias('kind', 'docforge.models.object.DocObject.kind')>",
+                "docstring": null
+              },
+              "path": {
+                "name": "path",
+                "kind": "attribute",
+                "path": "docforge.loaders.griffe_loader.DocObject.path",
+                "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.object.DocObject.path')>",
+                "docstring": null
+              },
+              "signature": {
+                "name": "signature",
+                "kind": "attribute",
+                "path": "docforge.loaders.griffe_loader.DocObject.signature",
+                "signature": "<bound method Alias.signature of Alias('signature', 'docforge.models.object.DocObject.signature')>",
+                "docstring": null
+              },
+              "docstring": {
+                "name": "docstring",
+                "kind": "attribute",
+                "path": "docforge.loaders.griffe_loader.DocObject.docstring",
+                "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.object.DocObject.docstring')>",
+                "docstring": null
+              },
+              "members": {
+                "name": "members",
+                "kind": "attribute",
+                "path": "docforge.loaders.griffe_loader.DocObject.members",
+                "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.object.DocObject.members')>",
+                "docstring": null
+              },
+              "add_member": {
+                "name": "add_member",
+                "kind": "function",
+                "path": "docforge.loaders.griffe_loader.DocObject.add_member",
+                "signature": "<bound method Alias.signature of Alias('add_member', 'docforge.models.object.DocObject.add_member')>",
+                "docstring": "Add a child documentation object.\n\nThis is typically used when attaching methods to classes or\nnested objects to their parent containers.\n\nArgs:\n    obj: Documentation object to add as a member."
+              },
+              "get_member": {
+                "name": "get_member",
+                "kind": "function",
+                "path": "docforge.loaders.griffe_loader.DocObject.get_member",
+                "signature": "<bound method Alias.signature of Alias('get_member', 'docforge.models.object.DocObject.get_member')>",
+                "docstring": "Retrieve a member object by name.\n\nArgs:\n    name (str):\n        Name of the member to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If the member does not exist."
+              },
+              "get_all_members": {
+                "name": "get_all_members",
+                "kind": "function",
+                "path": "docforge.loaders.griffe_loader.DocObject.get_all_members",
+                "signature": "<bound method Alias.signature of Alias('get_all_members', 'docforge.models.object.DocObject.get_all_members')>",
+                "docstring": "Return all child members of the object.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing nested members."
+              }
+            }
           },
           "Module": {
             "name": "Module",
@@ -199,78 +257,6 @@
               }
             }
           },
-          "DocObject": {
-            "name": "DocObject",
-            "kind": "class",
-            "path": "docforge.loaders.griffe_loader.DocObject",
-            "signature": "<bound method Alias.signature of Alias('DocObject', 'docforge.models.DocObject')>",
-            "docstring": "Representation of a documented Python object.\n\nA `DocObject` models a single Python entity discovered during\nintrospection. Objects may contain nested members, allowing the structure\nof modules, classes, and other containers to be represented recursively.\n\nAttributes:\n    name (str):\n        Local name of the object.\n\n    kind (str):\n        Type of object (for example `class`, `function`, `method`, or `attribute`).\n\n    path (str):\n        Fully qualified dotted path to the object.\n\n    signature (Optional[str]):\n        Callable signature if the object represents a callable.\n\n    docstring (Optional[str]):\n        Raw docstring text extracted from the source code.\n\n    members (Dict[str, DocObject]):\n        Mapping of member names to child `DocObject` instances.",
-            "members": {
-              "name": {
-                "name": "name",
-                "kind": "attribute",
-                "path": "docforge.loaders.griffe_loader.DocObject.name",
-                "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.object.DocObject.name')>",
-                "docstring": null
-              },
-              "kind": {
-                "name": "kind",
-                "kind": "attribute",
-                "path": "docforge.loaders.griffe_loader.DocObject.kind",
-                "signature": "<bound method Alias.signature of Alias('kind', 'docforge.models.object.DocObject.kind')>",
-                "docstring": null
-              },
-              "path": {
-                "name": "path",
-                "kind": "attribute",
-                "path": "docforge.loaders.griffe_loader.DocObject.path",
-                "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.object.DocObject.path')>",
-                "docstring": null
-              },
-              "signature": {
-                "name": "signature",
-                "kind": "attribute",
-                "path": "docforge.loaders.griffe_loader.DocObject.signature",
-                "signature": "<bound method Alias.signature of Alias('signature', 'docforge.models.object.DocObject.signature')>",
-                "docstring": null
-              },
-              "docstring": {
-                "name": "docstring",
-                "kind": "attribute",
-                "path": "docforge.loaders.griffe_loader.DocObject.docstring",
-                "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.object.DocObject.docstring')>",
-                "docstring": null
-              },
-              "members": {
-                "name": "members",
-                "kind": "attribute",
-                "path": "docforge.loaders.griffe_loader.DocObject.members",
-                "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.object.DocObject.members')>",
-                "docstring": null
-              },
-              "add_member": {
-                "name": "add_member",
-                "kind": "function",
-                "path": "docforge.loaders.griffe_loader.DocObject.add_member",
-                "signature": "<bound method Alias.signature of Alias('add_member', 'docforge.models.object.DocObject.add_member')>",
-                "docstring": "Add a child documentation object.\n\nThis is typically used when attaching methods to classes or\nnested objects to their parent containers.\n\nArgs:\n    obj: Documentation object to add as a member."
-              },
-              "get_member": {
-                "name": "get_member",
-                "kind": "function",
-                "path": "docforge.loaders.griffe_loader.DocObject.get_member",
-                "signature": "<bound method Alias.signature of Alias('get_member', 'docforge.models.object.DocObject.get_member')>",
-                "docstring": "Retrieve a member object by name.\n\nArgs:\n    name (str):\n        Name of the member to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If the member does not exist."
-              },
-              "get_all_members": {
-                "name": "get_all_members",
-                "kind": "function",
-                "path": "docforge.loaders.griffe_loader.DocObject.get_all_members",
-                "signature": "<bound method Alias.signature of Alias('get_all_members', 'docforge.models.object.DocObject.get_all_members')>",
-                "docstring": "Return all child members of the object.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing nested members."
-              }
-            }
-          },
           "logger": {
             "name": "logger",
             "kind": "attribute",
@@ -282,28 +268,28 @@
             "name": "discover_module_paths",
             "kind": "function",
             "path": "docforge.loaders.griffe_loader.discover_module_paths",
-            "signature": "<bound method Function.signature of Function('discover_module_paths', 28, 80)>",
+            "signature": "<bound method Function.signature of Function('discover_module_paths', 29, 81)>",
             "docstring": "Discover Python modules within a package directory.\n\nThe function scans the filesystem for `.py` files inside the specified\npackage and converts them into dotted module import paths.\n\nDiscovery rules:\n\n- Directories containing `__init__.py` are treated as packages.\n- Each `.py` file is treated as a module.\n- Results are returned as dotted import paths.\n\nArgs:\n    module_name (str):\n        Top-level package name to discover modules from.\n\n    project_root (Path, optional):\n        Root directory used to resolve module paths. If not provided, the\n        current working directory is used.\n\nReturns:\n    List[str]:\n        A sorted list of unique dotted module import paths.\n\nRaises:\n    FileNotFoundError:\n        If the specified package directory does not exist."
           },
           "GriffeLoader": {
             "name": "GriffeLoader",
             "kind": "class",
             "path": "docforge.loaders.griffe_loader.GriffeLoader",
-            "signature": "<bound method Class.signature of Class('GriffeLoader', 83, 287)>",
+            "signature": "<bound method Class.signature of Class('GriffeLoader', 84, 288)>",
             "docstring": "Load Python modules using Griffe and convert them into doc-forge models.\n\nThis loader uses the Griffe introspection engine to analyze Python source\ncode and transform the extracted information into `Project`, `Module`,\nand `DocObject` instances used by doc-forge.",
             "members": {
               "load_project": {
                 "name": "load_project",
                 "kind": "function",
                 "path": "docforge.loaders.griffe_loader.GriffeLoader.load_project",
-                "signature": "<bound method Function.signature of Function('load_project', 104, 158)>",
+                "signature": "<bound method Function.signature of Function('load_project', 105, 159)>",
                 "docstring": "Load multiple modules and assemble them into a Project model.\n\nEach module path is introspected and converted into a `Module`\ninstance. All modules are then aggregated into a single `Project`\nobject.\n\nArgs:\n    module_paths (List[str]):\n        List of dotted module import paths to load.\n\n    project_name (str, optional):\n        Optional override for the project name. Defaults to the top-level\n        name of the first module.\n\n    skip_import_errors (bool, optional):\n        If True, modules that fail to load will be skipped instead of raising an error.\n\nReturns:\n    Project:\n        A populated `Project` instance containing the loaded modules.\n\nRaises:\n    ValueError:\n        If no module paths are provided.\n\n    ImportError:\n        If a module fails to load and `skip_import_errors` is False."
               },
               "load_module": {
                 "name": "load_module",
                 "kind": "function",
                 "path": "docforge.loaders.griffe_loader.GriffeLoader.load_module",
-                "signature": "<bound method Function.signature of Function('load_module', 160, 178)>",
+                "signature": "<bound method Function.signature of Function('load_module', 161, 179)>",
                 "docstring": "Load and convert a single Python module.\n\nThe module is introspected using Griffe and then transformed into\na doc-forge `Module` model.\n\nArgs:\n    path (str):\n        Dotted import path of the module.\n\nReturns:\n    Module:\n        A populated `Module` instance."
               }
             }

docs/mcp/modules/docforge.models.json

@@ -185,25 +185,11 @@
         "signature": null,
         "docstring": "# Summary\n\nDocumentation model representing a Python module or package.\n\nThis module defines the `Module` class used in the doc-forge documentation\nmodel. A `Module` acts as a container for top-level documented objects\n(classes, functions, variables, and other members) discovered during\nintrospection.",
         "members": {
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.models.module.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-            "docstring": null
-          },
           "Iterable": {
             "name": "Iterable",
             "kind": "alias",
             "path": "docforge.models.module.Iterable",
-            "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+            "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
-            "docstring": null
-          },
-          "Optional": {
-            "name": "Optional",
-            "kind": "alias",
-            "path": "docforge.models.module.Optional",
-            "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
             "docstring": null
           },
           "DocObject": {
@@ -338,25 +324,11 @@
         "signature": null,
         "docstring": "# Summary\n\nDocumentation model representing individual Python objects.\n\nThis module defines the `DocObject` class, the fundamental recursive unit of\nthe doc-forge documentation model. Each `DocObject` represents a Python\nentity such as a class, function, method, or attribute, and may contain nested\nmembers that form a hierarchical documentation structure.",
         "members": {
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.models.object.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-            "docstring": null
-          },
           "Iterable": {
             "name": "Iterable",
             "kind": "alias",
             "path": "docforge.models.object.Iterable",
-            "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+            "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
-            "docstring": null
-          },
-          "Optional": {
-            "name": "Optional",
-            "kind": "alias",
-            "path": "docforge.models.object.Optional",
-            "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
             "docstring": null
           },
           "DocObject": {
@@ -440,18 +412,11 @@
         "signature": null,
         "docstring": "# Summary\n\nDocumentation model representing a project.\n\nThis module defines the `Project` class, the top-level container used by\ndoc-forge to represent a documented codebase. A `Project` aggregates multiple\nmodules and provides access to them through a unified interface.",
         "members": {
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.models.project.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-            "docstring": null
-          },
           "Iterable": {
             "name": "Iterable",
             "kind": "alias",
             "path": "docforge.models.project.Iterable",
-            "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+            "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
             "docstring": null
           },
           "Module": {

docs/mcp/modules/docforge.models.module.json

@@ -4,25 +4,11 @@
     "path": "docforge.models.module",
     "docstring": "# Summary\n\nDocumentation model representing a Python module or package.\n\nThis module defines the `Module` class used in the doc-forge documentation\nmodel. A `Module` acts as a container for top-level documented objects\n(classes, functions, variables, and other members) discovered during\nintrospection.",
     "objects": {
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.models.module.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-        "docstring": null
-      },
       "Iterable": {
         "name": "Iterable",
         "kind": "alias",
         "path": "docforge.models.module.Iterable",
-        "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+        "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
-        "docstring": null
-      },
-      "Optional": {
-        "name": "Optional",
-        "kind": "alias",
-        "path": "docforge.models.module.Optional",
-        "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
         "docstring": null
       },
       "DocObject": {

docs/mcp/modules/docforge.models.object.json

@@ -4,25 +4,11 @@
     "path": "docforge.models.object",
     "docstring": "# Summary\n\nDocumentation model representing individual Python objects.\n\nThis module defines the `DocObject` class, the fundamental recursive unit of\nthe doc-forge documentation model. Each `DocObject` represents a Python\nentity such as a class, function, method, or attribute, and may contain nested\nmembers that form a hierarchical documentation structure.",
     "objects": {
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.models.object.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-        "docstring": null
-      },
       "Iterable": {
         "name": "Iterable",
         "kind": "alias",
         "path": "docforge.models.object.Iterable",
-        "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+        "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
-        "docstring": null
-      },
-      "Optional": {
-        "name": "Optional",
-        "kind": "alias",
-        "path": "docforge.models.object.Optional",
-        "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
         "docstring": null
       },
       "DocObject": {

docs/mcp/modules/docforge.models.project.json

@@ -4,18 +4,11 @@
     "path": "docforge.models.project",
     "docstring": "# Summary\n\nDocumentation model representing a project.\n\nThis module defines the `Project` class, the top-level container used by\ndoc-forge to represent a documented codebase. A `Project` aggregates multiple\nmodules and provides access to them through a unified interface.",
     "objects": {
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.models.project.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-        "docstring": null
-      },
       "Iterable": {
         "name": "Iterable",
         "kind": "alias",
         "path": "docforge.models.project.Iterable",
-        "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+        "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
         "docstring": null
       },
       "Module": {

docs/mcp/modules/docforge.nav.json

@@ -115,20 +115,6 @@
             "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
             "docstring": null
           },
-          "List": {
-            "name": "List",
-            "kind": "alias",
-            "path": "docforge.nav.mkdocs.List",
-            "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
-            "docstring": null
-          },
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.nav.mkdocs.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-            "docstring": null
-          },
           "Any": {
             "name": "Any",
             "kind": "alias",
@@ -191,39 +177,25 @@
         "signature": null,
         "docstring": "Navigation resolution utilities.\n\nThis module resolves a ``NavSpec`` against the filesystem by expanding glob\npatterns and validating that referenced documentation files exist.",
         "members": {
-          "Path": {
+          "glob": {
-            "name": "Path",
+            "name": "glob",
             "kind": "alias",
-            "path": "docforge.nav.resolver.Path",
+            "path": "docforge.nav.resolver.glob",
-            "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
+            "signature": "<bound method Alias.signature of Alias('glob', 'glob')>",
-            "docstring": null
-          },
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.nav.resolver.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
             "docstring": null
           },
           "Iterable": {
             "name": "Iterable",
             "kind": "alias",
             "path": "docforge.nav.resolver.Iterable",
-            "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+            "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
             "docstring": null
           },
-          "List": {
+          "Path": {
-            "name": "List",
+            "name": "Path",
             "kind": "alias",
-            "path": "docforge.nav.resolver.List",
+            "path": "docforge.nav.resolver.Path",
-            "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
+            "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
-            "docstring": null
-          },
-          "glob": {
-            "name": "glob",
-            "kind": "alias",
-            "path": "docforge.nav.resolver.glob",
-            "signature": "<bound method Alias.signature of Alias('glob', 'glob')>",
             "docstring": null
           },
           "NavSpec": {
@@ -267,7 +239,7 @@
             "name": "ResolvedNav",
             "kind": "class",
             "path": "docforge.nav.resolver.ResolvedNav",
-            "signature": "<bound method Class.signature of Class('ResolvedNav', 16, 65)>",
+            "signature": "<bound method Class.signature of Class('ResolvedNav', 15, 63)>",
             "docstring": "Resolved navigation structure.\n\nA ``ResolvedNav`` represents navigation data after glob patterns have been\nexpanded and paths validated against the filesystem.\n\nAttributes:\n    home: Relative path to the documentation home page.\n    groups: Mapping of navigation group titles to lists of resolved\n        documentation file paths.",
             "members": {
               "home": {
@@ -288,7 +260,7 @@
                 "name": "all_files",
                 "kind": "function",
                 "path": "docforge.nav.resolver.ResolvedNav.all_files",
-                "signature": "<bound method Function.signature of Function('all_files', 47, 65)>",
+                "signature": "<bound method Function.signature of Function('all_files', 46, 63)>",
                 "docstring": "Iterate over all files referenced by the navigation structure.\n\nReturns:\n    An iterable of ``Path`` objects representing documentation files.\n\nRaises:\n    RuntimeError: If the home page is defined but the documentation\n        root is not available for resolution."
               }
             }
@@ -297,15 +269,8 @@
             "name": "resolve_nav",
             "kind": "function",
             "path": "docforge.nav.resolver.resolve_nav",
-            "signature": "<bound method Function.signature of Function('resolve_nav', 68, 136)>",
+            "signature": "<bound method Function.signature of Function('resolve_nav', 66, 132)>",
             "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
-          },
-          "Optional": {
-            "name": "Optional",
-            "kind": "alias",
-            "path": "docforge.nav.resolver.Optional",
-            "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-            "docstring": null
           }
         }
       },
@@ -323,27 +288,6 @@
             "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
             "docstring": null
           },
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.nav.spec.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-            "docstring": null
-          },
-          "List": {
-            "name": "List",
-            "kind": "alias",
-            "path": "docforge.nav.spec.List",
-            "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
-            "docstring": null
-          },
-          "Optional": {
-            "name": "Optional",
-            "kind": "alias",
-            "path": "docforge.nav.spec.Optional",
-            "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-            "docstring": null
-          },
           "yaml": {
             "name": "yaml",
             "kind": "alias",
@@ -355,7 +299,7 @@
             "name": "NavSpec",
             "kind": "class",
             "path": "docforge.nav.spec.NavSpec",
-            "signature": "<bound method Class.signature of Class('NavSpec', 15, 104)>",
+            "signature": "<bound method Class.signature of Class('NavSpec', 14, 103)>",
             "docstring": "Parsed representation of a navigation specification.\n\nA ``NavSpec`` describes the intended documentation navigation layout before\nit is resolved against the filesystem.\n\nAttributes:\n    home: Relative path to the documentation home page (for example\n        ``index.md``).\n    groups: Mapping of navigation group titles to lists of file patterns\n        or glob expressions.",
             "members": {
               "home": {
@@ -376,14 +320,14 @@
                 "name": "load",
                 "kind": "function",
                 "path": "docforge.nav.spec.NavSpec.load",
-                "signature": "<bound method Function.signature of Function('load', 45, 86)>",
+                "signature": "<bound method Function.signature of Function('load', 44, 85)>",
                 "docstring": "Load a navigation specification from a YAML file.\n\nArgs:\n    path: Filesystem path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed configuration.\n\nRaises:\n    FileNotFoundError: If the specified file does not exist.\n    ValueError: If the file contents are not a valid navigation\n        specification."
               },
               "all_patterns": {
                 "name": "all_patterns",
                 "kind": "function",
                 "path": "docforge.nav.spec.NavSpec.all_patterns",
-                "signature": "<bound method Function.signature of Function('all_patterns', 88, 104)>",
+                "signature": "<bound method Function.signature of Function('all_patterns', 87, 103)>",
                 "docstring": "Return all path patterns referenced by the specification.\n\nReturns:\n    A list containing the home document (if defined) and all\n    group pattern entries."
               }
             }
@@ -392,7 +336,7 @@
             "name": "load_nav_spec",
             "kind": "function",
             "path": "docforge.nav.spec.load_nav_spec",
-            "signature": "<bound method Function.signature of Function('load_nav_spec', 107, 135)>",
+            "signature": "<bound method Function.signature of Function('load_nav_spec', 106, 134)>",
             "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
           }
         }

docs/mcp/modules/docforge.nav.mkdocs.json

@@ -11,20 +11,6 @@
         "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
         "docstring": null
       },
-      "List": {
-        "name": "List",
-        "kind": "alias",
-        "path": "docforge.nav.mkdocs.List",
-        "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
-        "docstring": null
-      },
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.nav.mkdocs.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-        "docstring": null
-      },
       "Any": {
         "name": "Any",
         "kind": "alias",

docs/mcp/modules/docforge.nav.resolver.json

@@ -4,39 +4,25 @@
     "path": "docforge.nav.resolver",
     "docstring": "Navigation resolution utilities.\n\nThis module resolves a ``NavSpec`` against the filesystem by expanding glob\npatterns and validating that referenced documentation files exist.",
     "objects": {
-      "Path": {
+      "glob": {
-        "name": "Path",
+        "name": "glob",
         "kind": "alias",
-        "path": "docforge.nav.resolver.Path",
+        "path": "docforge.nav.resolver.glob",
-        "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
+        "signature": "<bound method Alias.signature of Alias('glob', 'glob')>",
-        "docstring": null
-      },
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.nav.resolver.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
         "docstring": null
       },
       "Iterable": {
         "name": "Iterable",
         "kind": "alias",
         "path": "docforge.nav.resolver.Iterable",
-        "signature": "<bound method Alias.signature of Alias('Iterable', 'typing.Iterable')>",
+        "signature": "<bound method Alias.signature of Alias('Iterable', 'collections.abc.Iterable')>",
         "docstring": null
       },
-      "List": {
+      "Path": {
-        "name": "List",
+        "name": "Path",
         "kind": "alias",
-        "path": "docforge.nav.resolver.List",
+        "path": "docforge.nav.resolver.Path",
-        "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
+        "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
-        "docstring": null
-      },
-      "glob": {
-        "name": "glob",
-        "kind": "alias",
-        "path": "docforge.nav.resolver.glob",
-        "signature": "<bound method Alias.signature of Alias('glob', 'glob')>",
         "docstring": null
       },
       "NavSpec": {
@@ -80,7 +66,7 @@
         "name": "ResolvedNav",
         "kind": "class",
         "path": "docforge.nav.resolver.ResolvedNav",
-        "signature": "<bound method Class.signature of Class('ResolvedNav', 16, 65)>",
+        "signature": "<bound method Class.signature of Class('ResolvedNav', 15, 63)>",
         "docstring": "Resolved navigation structure.\n\nA ``ResolvedNav`` represents navigation data after glob patterns have been\nexpanded and paths validated against the filesystem.\n\nAttributes:\n    home: Relative path to the documentation home page.\n    groups: Mapping of navigation group titles to lists of resolved\n        documentation file paths.",
         "members": {
           "home": {
@@ -101,7 +87,7 @@
             "name": "all_files",
             "kind": "function",
             "path": "docforge.nav.resolver.ResolvedNav.all_files",
-            "signature": "<bound method Function.signature of Function('all_files', 47, 65)>",
+            "signature": "<bound method Function.signature of Function('all_files', 46, 63)>",
             "docstring": "Iterate over all files referenced by the navigation structure.\n\nReturns:\n    An iterable of ``Path`` objects representing documentation files.\n\nRaises:\n    RuntimeError: If the home page is defined but the documentation\n        root is not available for resolution."
           }
         }
@@ -110,15 +96,8 @@
         "name": "resolve_nav",
         "kind": "function",
         "path": "docforge.nav.resolver.resolve_nav",
-        "signature": "<bound method Function.signature of Function('resolve_nav', 68, 136)>",
+        "signature": "<bound method Function.signature of Function('resolve_nav', 66, 132)>",
         "docstring": "Resolve a navigation specification against the filesystem.\n\nThe function expands glob patterns defined in a ``NavSpec`` and verifies\nthat referenced documentation files exist within the documentation root.\n\nArgs:\n    spec: Navigation specification describing documentation layout.\n    docs_root: Root directory containing documentation Markdown files.\n\nReturns:\n    A ``ResolvedNav`` instance containing validated navigation paths.\n\nRaises:\n    FileNotFoundError: If the documentation root does not exist or a\n        navigation pattern does not match any files."
-      },
-      "Optional": {
-        "name": "Optional",
-        "kind": "alias",
-        "path": "docforge.nav.resolver.Optional",
-        "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-        "docstring": null
       }
     }
   }

docs/mcp/modules/docforge.nav.spec.json

@@ -11,27 +11,6 @@
         "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
         "docstring": null
       },
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.nav.spec.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-        "docstring": null
-      },
-      "List": {
-        "name": "List",
-        "kind": "alias",
-        "path": "docforge.nav.spec.List",
-        "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
-        "docstring": null
-      },
-      "Optional": {
-        "name": "Optional",
-        "kind": "alias",
-        "path": "docforge.nav.spec.Optional",
-        "signature": "<bound method Alias.signature of Alias('Optional', 'typing.Optional')>",
-        "docstring": null
-      },
       "yaml": {
         "name": "yaml",
         "kind": "alias",
@@ -43,7 +22,7 @@
         "name": "NavSpec",
         "kind": "class",
         "path": "docforge.nav.spec.NavSpec",
-        "signature": "<bound method Class.signature of Class('NavSpec', 15, 104)>",
+        "signature": "<bound method Class.signature of Class('NavSpec', 14, 103)>",
         "docstring": "Parsed representation of a navigation specification.\n\nA ``NavSpec`` describes the intended documentation navigation layout before\nit is resolved against the filesystem.\n\nAttributes:\n    home: Relative path to the documentation home page (for example\n        ``index.md``).\n    groups: Mapping of navigation group titles to lists of file patterns\n        or glob expressions.",
         "members": {
           "home": {
@@ -64,14 +43,14 @@
             "name": "load",
             "kind": "function",
             "path": "docforge.nav.spec.NavSpec.load",
-            "signature": "<bound method Function.signature of Function('load', 45, 86)>",
+            "signature": "<bound method Function.signature of Function('load', 44, 85)>",
             "docstring": "Load a navigation specification from a YAML file.\n\nArgs:\n    path: Filesystem path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed configuration.\n\nRaises:\n    FileNotFoundError: If the specified file does not exist.\n    ValueError: If the file contents are not a valid navigation\n        specification."
           },
           "all_patterns": {
             "name": "all_patterns",
             "kind": "function",
             "path": "docforge.nav.spec.NavSpec.all_patterns",
-            "signature": "<bound method Function.signature of Function('all_patterns', 88, 104)>",
+            "signature": "<bound method Function.signature of Function('all_patterns', 87, 103)>",
             "docstring": "Return all path patterns referenced by the specification.\n\nReturns:\n    A list containing the home document (if defined) and all\n    group pattern entries."
           }
         }
@@ -80,7 +59,7 @@
         "name": "load_nav_spec",
         "kind": "function",
         "path": "docforge.nav.spec.load_nav_spec",
-        "signature": "<bound method Function.signature of Function('load_nav_spec', 107, 135)>",
+        "signature": "<bound method Function.signature of Function('load_nav_spec', 106, 134)>",
         "docstring": "Load a navigation specification file.\n\nThis helper function reads a YAML navigation file and constructs a\ncorresponding ``NavSpec`` instance.\n\nArgs:\n    path: Path to the navigation specification file.\n\nReturns:\n    A ``NavSpec`` instance representing the parsed specification.\n\nRaises:\n    FileNotFoundError: If the specification file does not exist.\n    ValueError: If the YAML structure is invalid."
       }
     }

docs/mcp/modules/docforge.renderers.json

@@ -30,7 +30,7 @@
             "kind": "function",
             "path": "docforge.renderers.MkDocsRenderer.generate_readme",
             "signature": "<bound method Alias.signature of Alias('generate_readme', 'docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme')>",
-            "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
+            "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
           }
         }
       },
@@ -198,122 +198,6 @@
             "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
             "docstring": null
           },
-          "Dict": {
-            "name": "Dict",
-            "kind": "alias",
-            "path": "docforge.renderers.mcp_renderer.Dict",
-            "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-            "docstring": null
-          },
-          "List": {
-            "name": "List",
-            "kind": "alias",
-            "path": "docforge.renderers.mcp_renderer.List",
-            "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
-            "docstring": null
-          },
-          "Project": {
-            "name": "Project",
-            "kind": "class",
-            "path": "docforge.renderers.mcp_renderer.Project",
-            "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
-            "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
-            "members": {
-              "name": {
-                "name": "name",
-                "kind": "attribute",
-                "path": "docforge.renderers.mcp_renderer.Project.name",
-                "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
-                "docstring": null
-              },
-              "modules": {
-                "name": "modules",
-                "kind": "attribute",
-                "path": "docforge.renderers.mcp_renderer.Project.modules",
-                "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
-                "docstring": null
-              },
-              "add_module": {
-                "name": "add_module",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Project.add_module",
-                "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
-                "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
-              },
-              "get_module": {
-                "name": "get_module",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Project.get_module",
-                "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
-                "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
-              },
-              "get_all_modules": {
-                "name": "get_all_modules",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Project.get_all_modules",
-                "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
-                "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
-              },
-              "get_module_list": {
-                "name": "get_module_list",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Project.get_module_list",
-                "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
-                "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
-              }
-            }
-          },
-          "Module": {
-            "name": "Module",
-            "kind": "class",
-            "path": "docforge.renderers.mcp_renderer.Module",
-            "signature": "<bound method Alias.signature of Alias('Module', 'docforge.models.Module')>",
-            "docstring": "Representation of a documented Python module or package.\n\nA `Module` stores metadata about the module itself and maintains a\ncollection of top-level documentation objects discovered during\nintrospection.\n\nAttributes:\n    path (str):\n        Dotted import path of the module.\n\n    docstring (Optional[str]):\n        Module-level documentation string, if present.\n\n    members (Dict[str, DocObject]):\n        Mapping of object names to their corresponding `DocObject` representations.",
-            "members": {
-              "path": {
-                "name": "path",
-                "kind": "attribute",
-                "path": "docforge.renderers.mcp_renderer.Module.path",
-                "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.module.Module.path')>",
-                "docstring": null
-              },
-              "docstring": {
-                "name": "docstring",
-                "kind": "attribute",
-                "path": "docforge.renderers.mcp_renderer.Module.docstring",
-                "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.module.Module.docstring')>",
-                "docstring": null
-              },
-              "members": {
-                "name": "members",
-                "kind": "attribute",
-                "path": "docforge.renderers.mcp_renderer.Module.members",
-                "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.module.Module.members')>",
-                "docstring": null
-              },
-              "add_object": {
-                "name": "add_object",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Module.add_object",
-                "signature": "<bound method Alias.signature of Alias('add_object', 'docforge.models.module.Module.add_object')>",
-                "docstring": "Add a documented object to the module.\n\nArgs:\n    obj (DocObject):\n        Documentation object to register as a top-level member of the module."
-              },
-              "get_object": {
-                "name": "get_object",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Module.get_object",
-                "signature": "<bound method Alias.signature of Alias('get_object', 'docforge.models.module.Module.get_object')>",
-                "docstring": "Retrieve a documented object by name.\n\nArgs:\n    name (str):\n        Name of the object to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If no object with the given name exists."
-              },
-              "get_all_objects": {
-                "name": "get_all_objects",
-                "kind": "function",
-                "path": "docforge.renderers.mcp_renderer.Module.get_all_objects",
-                "signature": "<bound method Alias.signature of Alias('get_all_objects', 'docforge.models.module.Module.get_all_objects')>",
-                "docstring": "Return all top-level documentation objects in the module.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing the module's public members."
-              }
-            }
-          },
           "DocObject": {
             "name": "DocObject",
             "kind": "class",
@@ -386,11 +270,113 @@
               }
             }
           },
+          "Module": {
+            "name": "Module",
+            "kind": "class",
+            "path": "docforge.renderers.mcp_renderer.Module",
+            "signature": "<bound method Alias.signature of Alias('Module', 'docforge.models.Module')>",
+            "docstring": "Representation of a documented Python module or package.\n\nA `Module` stores metadata about the module itself and maintains a\ncollection of top-level documentation objects discovered during\nintrospection.\n\nAttributes:\n    path (str):\n        Dotted import path of the module.\n\n    docstring (Optional[str]):\n        Module-level documentation string, if present.\n\n    members (Dict[str, DocObject]):\n        Mapping of object names to their corresponding `DocObject` representations.",
+            "members": {
+              "path": {
+                "name": "path",
+                "kind": "attribute",
+                "path": "docforge.renderers.mcp_renderer.Module.path",
+                "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.module.Module.path')>",
+                "docstring": null
+              },
+              "docstring": {
+                "name": "docstring",
+                "kind": "attribute",
+                "path": "docforge.renderers.mcp_renderer.Module.docstring",
+                "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.module.Module.docstring')>",
+                "docstring": null
+              },
+              "members": {
+                "name": "members",
+                "kind": "attribute",
+                "path": "docforge.renderers.mcp_renderer.Module.members",
+                "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.module.Module.members')>",
+                "docstring": null
+              },
+              "add_object": {
+                "name": "add_object",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Module.add_object",
+                "signature": "<bound method Alias.signature of Alias('add_object', 'docforge.models.module.Module.add_object')>",
+                "docstring": "Add a documented object to the module.\n\nArgs:\n    obj (DocObject):\n        Documentation object to register as a top-level member of the module."
+              },
+              "get_object": {
+                "name": "get_object",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Module.get_object",
+                "signature": "<bound method Alias.signature of Alias('get_object', 'docforge.models.module.Module.get_object')>",
+                "docstring": "Retrieve a documented object by name.\n\nArgs:\n    name (str):\n        Name of the object to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If no object with the given name exists."
+              },
+              "get_all_objects": {
+                "name": "get_all_objects",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Module.get_all_objects",
+                "signature": "<bound method Alias.signature of Alias('get_all_objects', 'docforge.models.module.Module.get_all_objects')>",
+                "docstring": "Return all top-level documentation objects in the module.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing the module's public members."
+              }
+            }
+          },
+          "Project": {
+            "name": "Project",
+            "kind": "class",
+            "path": "docforge.renderers.mcp_renderer.Project",
+            "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
+            "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
+            "members": {
+              "name": {
+                "name": "name",
+                "kind": "attribute",
+                "path": "docforge.renderers.mcp_renderer.Project.name",
+                "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
+                "docstring": null
+              },
+              "modules": {
+                "name": "modules",
+                "kind": "attribute",
+                "path": "docforge.renderers.mcp_renderer.Project.modules",
+                "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
+                "docstring": null
+              },
+              "add_module": {
+                "name": "add_module",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Project.add_module",
+                "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
+                "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
+              },
+              "get_module": {
+                "name": "get_module",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Project.get_module",
+                "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
+                "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
+              },
+              "get_all_modules": {
+                "name": "get_all_modules",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Project.get_all_modules",
+                "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
+                "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
+              },
+              "get_module_list": {
+                "name": "get_module_list",
+                "kind": "function",
+                "path": "docforge.renderers.mcp_renderer.Project.get_module_list",
+                "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
+                "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
+              }
+            }
+          },
           "MCPRenderer": {
             "name": "MCPRenderer",
             "kind": "class",
             "path": "docforge.renderers.mcp_renderer.MCPRenderer",
-            "signature": "<bound method Class.signature of Class('MCPRenderer', 17, 159)>",
+            "signature": "<bound method Class.signature of Class('MCPRenderer', 16, 159)>",
             "docstring": "Renderer that generates MCP-compatible documentation resources.\n\nThis renderer converts doc-forge project models into structured JSON\nresources suitable for consumption by systems implementing the Model\nContext Protocol (MCP).",
             "members": {
               "name": {
@@ -404,10 +390,17 @@
                 "name": "generate_sources",
                 "kind": "function",
                 "path": "docforge.renderers.mcp_renderer.MCPRenderer.generate_sources",
-                "signature": "<bound method Function.signature of Function('generate_sources', 28, 72)>",
+                "signature": "<bound method Function.signature of Function('generate_sources', 27, 73)>",
                 "docstring": "Generate MCP documentation resources for a project.\n\nThe renderer serializes each module into a JSON resource and produces\nsupporting metadata files such as `nav.json` and `index.json`.\n\nArgs:\n    project (Project):\n        Documentation project model to render.\n\n    out_dir (Path):\n        Directory where MCP resources will be written."
               }
             }
+          },
+          "Any": {
+            "name": "Any",
+            "kind": "alias",
+            "path": "docforge.renderers.mcp_renderer.Any",
+            "signature": "<bound method Alias.signature of Alias('Any', 'typing.Any')>",
+            "docstring": null
           }
         }
       },
@@ -425,57 +418,6 @@
             "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
             "docstring": null
           },
-          "Project": {
-            "name": "Project",
-            "kind": "class",
-            "path": "docforge.renderers.mkdocs_renderer.Project",
-            "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
-            "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
-            "members": {
-              "name": {
-                "name": "name",
-                "kind": "attribute",
-                "path": "docforge.renderers.mkdocs_renderer.Project.name",
-                "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
-                "docstring": null
-              },
-              "modules": {
-                "name": "modules",
-                "kind": "attribute",
-                "path": "docforge.renderers.mkdocs_renderer.Project.modules",
-                "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
-                "docstring": null
-              },
-              "add_module": {
-                "name": "add_module",
-                "kind": "function",
-                "path": "docforge.renderers.mkdocs_renderer.Project.add_module",
-                "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
-                "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
-              },
-              "get_module": {
-                "name": "get_module",
-                "kind": "function",
-                "path": "docforge.renderers.mkdocs_renderer.Project.get_module",
-                "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
-                "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
-              },
-              "get_all_modules": {
-                "name": "get_all_modules",
-                "kind": "function",
-                "path": "docforge.renderers.mkdocs_renderer.Project.get_all_modules",
-                "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
-                "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
-              },
-              "get_module_list": {
-                "name": "get_module_list",
-                "kind": "function",
-                "path": "docforge.renderers.mkdocs_renderer.Project.get_module_list",
-                "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
-                "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
-              }
-            }
-          },
           "Module": {
             "name": "Module",
             "kind": "class",
@@ -527,11 +469,62 @@
               }
             }
           },
+          "Project": {
+            "name": "Project",
+            "kind": "class",
+            "path": "docforge.renderers.mkdocs_renderer.Project",
+            "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
+            "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
+            "members": {
+              "name": {
+                "name": "name",
+                "kind": "attribute",
+                "path": "docforge.renderers.mkdocs_renderer.Project.name",
+                "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
+                "docstring": null
+              },
+              "modules": {
+                "name": "modules",
+                "kind": "attribute",
+                "path": "docforge.renderers.mkdocs_renderer.Project.modules",
+                "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
+                "docstring": null
+              },
+              "add_module": {
+                "name": "add_module",
+                "kind": "function",
+                "path": "docforge.renderers.mkdocs_renderer.Project.add_module",
+                "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
+                "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
+              },
+              "get_module": {
+                "name": "get_module",
+                "kind": "function",
+                "path": "docforge.renderers.mkdocs_renderer.Project.get_module",
+                "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
+                "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
+              },
+              "get_all_modules": {
+                "name": "get_all_modules",
+                "kind": "function",
+                "path": "docforge.renderers.mkdocs_renderer.Project.get_all_modules",
+                "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
+                "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
+              },
+              "get_module_list": {
+                "name": "get_module_list",
+                "kind": "function",
+                "path": "docforge.renderers.mkdocs_renderer.Project.get_module_list",
+                "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
+                "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
+              }
+            }
+          },
           "MkDocsRenderer": {
             "name": "MkDocsRenderer",
             "kind": "class",
             "path": "docforge.renderers.mkdocs_renderer.MkDocsRenderer",
-            "signature": "<bound method Class.signature of Class('MkDocsRenderer', 22, 305)>",
+            "signature": "<bound method Class.signature of Class('MkDocsRenderer', 23, 307)>",
             "docstring": "Renderer that produces Markdown documentation for MkDocs.\n\nGenerated pages use mkdocstrings directives to reference Python modules,\nallowing MkDocs to render API documentation dynamically.",
             "members": {
               "name": {
@@ -545,15 +538,15 @@
                 "name": "generate_sources",
                 "kind": "function",
                 "path": "docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_sources",
-                "signature": "<bound method Function.signature of Function('generate_sources', 36, 78)>",
+                "signature": "<bound method Function.signature of Function('generate_sources', 37, 78)>",
                 "docstring": "Generate Markdown documentation files for a project.\n\nThis method renders a documentation structure from the provided\nproject model and writes the resulting Markdown files to the\nspecified output directory.\n\nArgs:\n    project (Project):\n        Project model containing modules to document.\n\n    out_dir (Path):\n        Directory where generated Markdown files will be written.\n\n    module_is_source (bool, optional):\n        If True, treat the specified module as the documentation root\n        rather than nesting it inside a folder."
               },
               "generate_readme": {
                 "name": "generate_readme",
                 "kind": "function",
                 "path": "docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme",
-                "signature": "<bound method Function.signature of Function('generate_readme', 80, 139)>",
+                "signature": "<bound method Function.signature of Function('generate_readme', 80, 145)>",
-                "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
+                "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
               }
             }
           }

docs/mcp/modules/docforge.renderers.mcp_renderer.json

@@ -18,122 +18,6 @@
         "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
         "docstring": null
       },
-      "Dict": {
-        "name": "Dict",
-        "kind": "alias",
-        "path": "docforge.renderers.mcp_renderer.Dict",
-        "signature": "<bound method Alias.signature of Alias('Dict', 'typing.Dict')>",
-        "docstring": null
-      },
-      "List": {
-        "name": "List",
-        "kind": "alias",
-        "path": "docforge.renderers.mcp_renderer.List",
-        "signature": "<bound method Alias.signature of Alias('List', 'typing.List')>",
-        "docstring": null
-      },
-      "Project": {
-        "name": "Project",
-        "kind": "class",
-        "path": "docforge.renderers.mcp_renderer.Project",
-        "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
-        "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
-        "members": {
-          "name": {
-            "name": "name",
-            "kind": "attribute",
-            "path": "docforge.renderers.mcp_renderer.Project.name",
-            "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
-            "docstring": null
-          },
-          "modules": {
-            "name": "modules",
-            "kind": "attribute",
-            "path": "docforge.renderers.mcp_renderer.Project.modules",
-            "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
-            "docstring": null
-          },
-          "add_module": {
-            "name": "add_module",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Project.add_module",
-            "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
-            "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
-          },
-          "get_module": {
-            "name": "get_module",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Project.get_module",
-            "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
-            "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
-          },
-          "get_all_modules": {
-            "name": "get_all_modules",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Project.get_all_modules",
-            "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
-            "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
-          },
-          "get_module_list": {
-            "name": "get_module_list",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Project.get_module_list",
-            "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
-            "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
-          }
-        }
-      },
-      "Module": {
-        "name": "Module",
-        "kind": "class",
-        "path": "docforge.renderers.mcp_renderer.Module",
-        "signature": "<bound method Alias.signature of Alias('Module', 'docforge.models.Module')>",
-        "docstring": "Representation of a documented Python module or package.\n\nA `Module` stores metadata about the module itself and maintains a\ncollection of top-level documentation objects discovered during\nintrospection.\n\nAttributes:\n    path (str):\n        Dotted import path of the module.\n\n    docstring (Optional[str]):\n        Module-level documentation string, if present.\n\n    members (Dict[str, DocObject]):\n        Mapping of object names to their corresponding `DocObject` representations.",
-        "members": {
-          "path": {
-            "name": "path",
-            "kind": "attribute",
-            "path": "docforge.renderers.mcp_renderer.Module.path",
-            "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.module.Module.path')>",
-            "docstring": null
-          },
-          "docstring": {
-            "name": "docstring",
-            "kind": "attribute",
-            "path": "docforge.renderers.mcp_renderer.Module.docstring",
-            "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.module.Module.docstring')>",
-            "docstring": null
-          },
-          "members": {
-            "name": "members",
-            "kind": "attribute",
-            "path": "docforge.renderers.mcp_renderer.Module.members",
-            "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.module.Module.members')>",
-            "docstring": null
-          },
-          "add_object": {
-            "name": "add_object",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Module.add_object",
-            "signature": "<bound method Alias.signature of Alias('add_object', 'docforge.models.module.Module.add_object')>",
-            "docstring": "Add a documented object to the module.\n\nArgs:\n    obj (DocObject):\n        Documentation object to register as a top-level member of the module."
-          },
-          "get_object": {
-            "name": "get_object",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Module.get_object",
-            "signature": "<bound method Alias.signature of Alias('get_object', 'docforge.models.module.Module.get_object')>",
-            "docstring": "Retrieve a documented object by name.\n\nArgs:\n    name (str):\n        Name of the object to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If no object with the given name exists."
-          },
-          "get_all_objects": {
-            "name": "get_all_objects",
-            "kind": "function",
-            "path": "docforge.renderers.mcp_renderer.Module.get_all_objects",
-            "signature": "<bound method Alias.signature of Alias('get_all_objects', 'docforge.models.module.Module.get_all_objects')>",
-            "docstring": "Return all top-level documentation objects in the module.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing the module's public members."
-          }
-        }
-      },
       "DocObject": {
         "name": "DocObject",
         "kind": "class",
@@ -206,11 +90,113 @@
           }
         }
       },
+      "Module": {
+        "name": "Module",
+        "kind": "class",
+        "path": "docforge.renderers.mcp_renderer.Module",
+        "signature": "<bound method Alias.signature of Alias('Module', 'docforge.models.Module')>",
+        "docstring": "Representation of a documented Python module or package.\n\nA `Module` stores metadata about the module itself and maintains a\ncollection of top-level documentation objects discovered during\nintrospection.\n\nAttributes:\n    path (str):\n        Dotted import path of the module.\n\n    docstring (Optional[str]):\n        Module-level documentation string, if present.\n\n    members (Dict[str, DocObject]):\n        Mapping of object names to their corresponding `DocObject` representations.",
+        "members": {
+          "path": {
+            "name": "path",
+            "kind": "attribute",
+            "path": "docforge.renderers.mcp_renderer.Module.path",
+            "signature": "<bound method Alias.signature of Alias('path', 'docforge.models.module.Module.path')>",
+            "docstring": null
+          },
+          "docstring": {
+            "name": "docstring",
+            "kind": "attribute",
+            "path": "docforge.renderers.mcp_renderer.Module.docstring",
+            "signature": "<bound method Alias.signature of Alias('docstring', 'docforge.models.module.Module.docstring')>",
+            "docstring": null
+          },
+          "members": {
+            "name": "members",
+            "kind": "attribute",
+            "path": "docforge.renderers.mcp_renderer.Module.members",
+            "signature": "<bound method Alias.signature of Alias('members', 'docforge.models.module.Module.members')>",
+            "docstring": null
+          },
+          "add_object": {
+            "name": "add_object",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Module.add_object",
+            "signature": "<bound method Alias.signature of Alias('add_object', 'docforge.models.module.Module.add_object')>",
+            "docstring": "Add a documented object to the module.\n\nArgs:\n    obj (DocObject):\n        Documentation object to register as a top-level member of the module."
+          },
+          "get_object": {
+            "name": "get_object",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Module.get_object",
+            "signature": "<bound method Alias.signature of Alias('get_object', 'docforge.models.module.Module.get_object')>",
+            "docstring": "Retrieve a documented object by name.\n\nArgs:\n    name (str):\n        Name of the object to retrieve.\n\nReturns:\n    DocObject:\n        The corresponding `DocObject` instance.\n\nRaises:\n    KeyError:\n        If no object with the given name exists."
+          },
+          "get_all_objects": {
+            "name": "get_all_objects",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Module.get_all_objects",
+            "signature": "<bound method Alias.signature of Alias('get_all_objects', 'docforge.models.module.Module.get_all_objects')>",
+            "docstring": "Return all top-level documentation objects in the module.\n\nReturns:\n    Iterable[DocObject]:\n        An iterable of `DocObject` instances representing the module's public members."
+          }
+        }
+      },
+      "Project": {
+        "name": "Project",
+        "kind": "class",
+        "path": "docforge.renderers.mcp_renderer.Project",
+        "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
+        "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
+        "members": {
+          "name": {
+            "name": "name",
+            "kind": "attribute",
+            "path": "docforge.renderers.mcp_renderer.Project.name",
+            "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
+            "docstring": null
+          },
+          "modules": {
+            "name": "modules",
+            "kind": "attribute",
+            "path": "docforge.renderers.mcp_renderer.Project.modules",
+            "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
+            "docstring": null
+          },
+          "add_module": {
+            "name": "add_module",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Project.add_module",
+            "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
+            "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
+          },
+          "get_module": {
+            "name": "get_module",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Project.get_module",
+            "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
+            "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
+          },
+          "get_all_modules": {
+            "name": "get_all_modules",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Project.get_all_modules",
+            "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
+            "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
+          },
+          "get_module_list": {
+            "name": "get_module_list",
+            "kind": "function",
+            "path": "docforge.renderers.mcp_renderer.Project.get_module_list",
+            "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
+            "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
+          }
+        }
+      },
       "MCPRenderer": {
         "name": "MCPRenderer",
         "kind": "class",
         "path": "docforge.renderers.mcp_renderer.MCPRenderer",
-        "signature": "<bound method Class.signature of Class('MCPRenderer', 17, 159)>",
+        "signature": "<bound method Class.signature of Class('MCPRenderer', 16, 159)>",
         "docstring": "Renderer that generates MCP-compatible documentation resources.\n\nThis renderer converts doc-forge project models into structured JSON\nresources suitable for consumption by systems implementing the Model\nContext Protocol (MCP).",
         "members": {
           "name": {
@@ -224,10 +210,17 @@
             "name": "generate_sources",
             "kind": "function",
             "path": "docforge.renderers.mcp_renderer.MCPRenderer.generate_sources",
-            "signature": "<bound method Function.signature of Function('generate_sources', 28, 72)>",
+            "signature": "<bound method Function.signature of Function('generate_sources', 27, 73)>",
             "docstring": "Generate MCP documentation resources for a project.\n\nThe renderer serializes each module into a JSON resource and produces\nsupporting metadata files such as `nav.json` and `index.json`.\n\nArgs:\n    project (Project):\n        Documentation project model to render.\n\n    out_dir (Path):\n        Directory where MCP resources will be written."
           }
         }
+      },
+      "Any": {
+        "name": "Any",
+        "kind": "alias",
+        "path": "docforge.renderers.mcp_renderer.Any",
+        "signature": "<bound method Alias.signature of Alias('Any', 'typing.Any')>",
+        "docstring": null
       }
     }
   }

docs/mcp/modules/docforge.renderers.mkdocs_renderer.json

@@ -11,57 +11,6 @@
         "signature": "<bound method Alias.signature of Alias('Path', 'pathlib.Path')>",
         "docstring": null
       },
-      "Project": {
-        "name": "Project",
-        "kind": "class",
-        "path": "docforge.renderers.mkdocs_renderer.Project",
-        "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
-        "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
-        "members": {
-          "name": {
-            "name": "name",
-            "kind": "attribute",
-            "path": "docforge.renderers.mkdocs_renderer.Project.name",
-            "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
-            "docstring": null
-          },
-          "modules": {
-            "name": "modules",
-            "kind": "attribute",
-            "path": "docforge.renderers.mkdocs_renderer.Project.modules",
-            "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
-            "docstring": null
-          },
-          "add_module": {
-            "name": "add_module",
-            "kind": "function",
-            "path": "docforge.renderers.mkdocs_renderer.Project.add_module",
-            "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
-            "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
-          },
-          "get_module": {
-            "name": "get_module",
-            "kind": "function",
-            "path": "docforge.renderers.mkdocs_renderer.Project.get_module",
-            "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
-            "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
-          },
-          "get_all_modules": {
-            "name": "get_all_modules",
-            "kind": "function",
-            "path": "docforge.renderers.mkdocs_renderer.Project.get_all_modules",
-            "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
-            "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
-          },
-          "get_module_list": {
-            "name": "get_module_list",
-            "kind": "function",
-            "path": "docforge.renderers.mkdocs_renderer.Project.get_module_list",
-            "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
-            "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
-          }
-        }
-      },
       "Module": {
         "name": "Module",
         "kind": "class",
@@ -113,11 +62,62 @@
           }
         }
       },
+      "Project": {
+        "name": "Project",
+        "kind": "class",
+        "path": "docforge.renderers.mkdocs_renderer.Project",
+        "signature": "<bound method Alias.signature of Alias('Project', 'docforge.models.Project')>",
+        "docstring": "Representation of a documentation project.\n\nA `Project` serves as the root container for all modules discovered during\nintrospection. Each module is stored by its dotted import path.\n\nAttributes:\n    name (str):\n        Name of the project.\n\n    modules (Dict[str, Module]):\n        Mapping of module paths to `Module` instances.",
+        "members": {
+          "name": {
+            "name": "name",
+            "kind": "attribute",
+            "path": "docforge.renderers.mkdocs_renderer.Project.name",
+            "signature": "<bound method Alias.signature of Alias('name', 'docforge.models.project.Project.name')>",
+            "docstring": null
+          },
+          "modules": {
+            "name": "modules",
+            "kind": "attribute",
+            "path": "docforge.renderers.mkdocs_renderer.Project.modules",
+            "signature": "<bound method Alias.signature of Alias('modules', 'docforge.models.project.Project.modules')>",
+            "docstring": null
+          },
+          "add_module": {
+            "name": "add_module",
+            "kind": "function",
+            "path": "docforge.renderers.mkdocs_renderer.Project.add_module",
+            "signature": "<bound method Alias.signature of Alias('add_module', 'docforge.models.project.Project.add_module')>",
+            "docstring": "Register a module in the project.\n\nArgs:\n    module (Module):\n        Module instance to add to the project."
+          },
+          "get_module": {
+            "name": "get_module",
+            "kind": "function",
+            "path": "docforge.renderers.mkdocs_renderer.Project.get_module",
+            "signature": "<bound method Alias.signature of Alias('get_module', 'docforge.models.project.Project.get_module')>",
+            "docstring": "Retrieve a module by its dotted path.\n\nArgs:\n    path (str):\n        Fully qualified dotted module path (for example `pkg.module`).\n\nReturns:\n    Module:\n        The corresponding `Module` instance.\n\nRaises:\n    KeyError:\n        If the module does not exist in the project."
+          },
+          "get_all_modules": {
+            "name": "get_all_modules",
+            "kind": "function",
+            "path": "docforge.renderers.mkdocs_renderer.Project.get_all_modules",
+            "signature": "<bound method Alias.signature of Alias('get_all_modules', 'docforge.models.project.Project.get_all_modules')>",
+            "docstring": "Return all modules contained in the project.\n\nReturns:\n    Iterable[Module]:\n        An iterable of `Module` instances."
+          },
+          "get_module_list": {
+            "name": "get_module_list",
+            "kind": "function",
+            "path": "docforge.renderers.mkdocs_renderer.Project.get_module_list",
+            "signature": "<bound method Alias.signature of Alias('get_module_list', 'docforge.models.project.Project.get_module_list')>",
+            "docstring": "Return the list of module import paths.\n\nReturns:\n    list[str]:\n        A list containing the dotted paths of all modules in the project."
+          }
+        }
+      },
       "MkDocsRenderer": {
         "name": "MkDocsRenderer",
         "kind": "class",
         "path": "docforge.renderers.mkdocs_renderer.MkDocsRenderer",
-        "signature": "<bound method Class.signature of Class('MkDocsRenderer', 22, 305)>",
+        "signature": "<bound method Class.signature of Class('MkDocsRenderer', 23, 307)>",
         "docstring": "Renderer that produces Markdown documentation for MkDocs.\n\nGenerated pages use mkdocstrings directives to reference Python modules,\nallowing MkDocs to render API documentation dynamically.",
         "members": {
           "name": {
@@ -131,15 +131,15 @@
             "name": "generate_sources",
             "kind": "function",
             "path": "docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_sources",
-            "signature": "<bound method Function.signature of Function('generate_sources', 36, 78)>",
+            "signature": "<bound method Function.signature of Function('generate_sources', 37, 78)>",
             "docstring": "Generate Markdown documentation files for a project.\n\nThis method renders a documentation structure from the provided\nproject model and writes the resulting Markdown files to the\nspecified output directory.\n\nArgs:\n    project (Project):\n        Project model containing modules to document.\n\n    out_dir (Path):\n        Directory where generated Markdown files will be written.\n\n    module_is_source (bool, optional):\n        If True, treat the specified module as the documentation root\n        rather than nesting it inside a folder."
           },
           "generate_readme": {
             "name": "generate_readme",
             "kind": "function",
             "path": "docforge.renderers.mkdocs_renderer.MkDocsRenderer.generate_readme",
-            "signature": "<bound method Function.signature of Function('generate_readme', 80, 139)>",
+            "signature": "<bound method Function.signature of Function('generate_readme', 80, 145)>",
-            "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (bool, optional):\n        Whether the module is treated as the project source root."
+            "docstring": "Generate a `README.md` file from the root module docstring.\n\nBehavior:\n\n- If `module_is_source` is True, `README.md` is written to the project\n  root directory.\n- If False, README generation is currently not implemented.\n\nArgs:\n    project (Project):\n        Project model containing documentation metadata.\n\n    docs_dir (Path):\n        Directory containing generated documentation sources.\n\n    module_is_source (Optional[bool]):\n        Whether the module is treated as the project source root.\n\n    readme_dir (Optional[Path]):\n        Directory where the generated README.md should be written.\n        Defaults to the parent of `docs_dir`."
           }
         }
       }

docs/mcp/modules/docforge.servers.json

@@ -87,7 +87,7 @@
             "name": "MCPServer",
             "kind": "class",
             "path": "docforge.servers.mcp_server.MCPServer",
-            "signature": "<bound method Class.signature of Class('MCPServer', 19, 136)>",
+            "signature": "<bound method Class.signature of Class('MCPServer', 19, 134)>",
             "docstring": "MCP server for serving a pre-generated documentation bundle.\n\nThe server exposes documentation resources and diagnostic tools through\nMCP endpoints backed by JSON files generated by the MCP renderer.",
             "members": {
               "mcp_root": {
@@ -108,7 +108,7 @@
                 "name": "run",
                 "kind": "function",
                 "path": "docforge.servers.mcp_server.MCPServer.run",
-                "signature": "<bound method Function.signature of Function('run', 124, 136)>",
+                "signature": "<bound method Function.signature of Function('run', 122, 134)>",
                 "docstring": "Start the MCP server.\n\nArgs:\n    transport (Literal[\"stdio\", \"sse\", \"streamable-http\"]):\n        Transport mechanism used by the MCP server. Supported options\n        include `stdio`, `sse`, and `streamable-http`."
               }
             }

docs/mcp/modules/docforge.servers.mcp_server.json

@@ -50,7 +50,7 @@
         "name": "MCPServer",
         "kind": "class",
         "path": "docforge.servers.mcp_server.MCPServer",
-        "signature": "<bound method Class.signature of Class('MCPServer', 19, 136)>",
+        "signature": "<bound method Class.signature of Class('MCPServer', 19, 134)>",
         "docstring": "MCP server for serving a pre-generated documentation bundle.\n\nThe server exposes documentation resources and diagnostic tools through\nMCP endpoints backed by JSON files generated by the MCP renderer.",
         "members": {
           "mcp_root": {
@@ -71,7 +71,7 @@
             "name": "run",
             "kind": "function",
             "path": "docforge.servers.mcp_server.MCPServer.run",
-            "signature": "<bound method Function.signature of Function('run', 124, 136)>",
+            "signature": "<bound method Function.signature of Function('run', 122, 134)>",
             "docstring": "Start the MCP server.\n\nArgs:\n    transport (Literal[\"stdio\", \"sse\", \"streamable-http\"]):\n        Transport mechanism used by the MCP server. Supported options\n        include `stdio`, `sse`, and `streamable-http`."
           }
         }

mkdocs.yml

@@ -63,6 +63,7 @@ markdown_extensions:
 - pymdownx.tilde
 - pymdownx.mark
 site_name: docforge
+docs_dir: docs/lib
 nav:
 - Home: index.md
 - Loaders:

pyproject.toml

@@ -17,6 +17,19 @@ authors = [
 maintainers = [
     { name = "Aetos Skia", email = "dev@aetoskia.com" }
 ]
+
+
+keywords = [
+    "documentation",
+    "docs",
+    "compiler",
+    "mkdocs",
+    "mcp",
+    "griffe",
+    "docstrings",
+    "sphinx",
+]
+
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
@@ -25,9 +38,12 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Framework :: FastAPI",
     "Topic :: Software Development :: Libraries",
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+    "Topic :: Documentation",
+    "Typing :: Typed",
 ]
 
 
@@ -57,14 +73,25 @@ sphinx = [
     "sphinx-autodoc-typehints>=1.19.0",
 ]
 mcp = [
-    "mcp>=1.0.0",
+    "mcp>=1.0.0,<2.0.0",
 ]
 dev = [
-    "pytest>=7.0.0",
+    "pytest>=8.0.0",
-    "pytest-cov>=4.0.0",
+    "pytest-asyncio>=0.21.0",
+    "pytest-cov>=4.1.0",
     "black>=23.0.0",
-    "ruff>=0.1.0",
+    "ruff>=0.3.0",
-    "mypy>=1.0.0",
+    "mypy>=1.8.0",
+    "build>=1.0.0",
+    "twine>=4.0.0",
+    "pre-commit>=3.4.0",
+]
+docs = [
+    "doc-forge[mkdocs]",
+]
+
+all = [
+    "doc-forge[dev,docs,mcp]",
 ]
 
 
@@ -80,15 +107,100 @@ Versions = "https://git.aetoskia.com/aetos/doc-forge/tags"
 packages = { find = { include = ["docforge*"] } }
 
 [tool.setuptools.package-data]
-docforge = ["templates/*.yml"]
+docforge = ["py.typed", "templates/*.yml"]
+
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+asyncio_mode = "auto"
+python_files = ["test_*.py"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
+addopts = [
+    "--strict-markers",
+    "--strict-config",
+    "--cov=docforge",
+    "--cov-report=term-missing",
+    "--cov-report=html",
+    "--cov-report=xml",
+]
+
+
+[tool.black]
+line-length = 88
+target-version = ["py310", "py311", "py312", "py313"]
+include = '\.pyi?$'
+extend-exclude = '''
+/(
+  \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | build
+  | dist
+)/
+'''
 
 
 [tool.ruff]
-line-length = 100
+line-length = 88
 target-version = "py310"
 
+[tool.ruff.lint]
+select = [
+    "E",
+    "W",
+    "F",
+    "I",
+    "B",
+    "C4",
+    "UP",
+]
+ignore = [
+    "E501",
+    "B008",
+    "C901",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401", "I001"]
+"tests/*" = ["B008"]
+
 
 [tool.mypy]
 python_version = "3.10"
 strict = true
+exclude = [
+    "tests/",
+]
+files = ["docforge"]
+
+[[tool.mypy.overrides]]
+module = [
+    "griffe.*",
+    "mcp.*",
+    "click",
+    "pydantic",
+]
 ignore_missing_imports = true
+
+
+[tool.coverage.run]
+source = ["docforge"]
+omit = [
+    "*/tests/*",
+    "*/test_*.py",
+]
+
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "def __repr__",
+    "if __name__ == .__main__.:",
+    "raise AssertionError",
+    "raise NotImplementedError",
+    "if TYPE_CHECKING:",
+    "@abstractmethod",
+]

tests/cli/test_build_mcp.py

@@ -1,6 +1,8 @@
 from pathlib import Path
+
 from docforge.cli.main import cli
 
+
 def test_mcp_build(cli_runner):
     with cli_runner.isolated_filesystem():
         cwd = Path.cwd()
@@ -9,7 +11,7 @@ def test_mcp_build(cli_runner):
         (pkg / "__init__.py").write_text("")
         (pkg / "mod.py").write_text("def f(): ...\n")
 
-        out_dir = cwd / "mcp_docs"
+        out_dir = cwd / "docs" / "mcp"
 
         result = cli_runner.invoke(
             cli,
@@ -18,8 +20,6 @@ def test_mcp_build(cli_runner):
                 "--mcp",
                 "--module",
                 "testpkg",
-                "--out-dir",
-                str(out_dir),
             ],
         )
 

tests/cli/test_build_mkdocs.py

@@ -1,6 +1,8 @@
 from pathlib import Path
+
 from docforge.cli.main import cli
 
+
 def test_mkdocs_build_full_flow(
     cli_runner,
     mock_mkdocs_build,
@@ -31,8 +33,6 @@ def test_mkdocs_build_full_flow(
                 "testpkg",
                 "--site-name",
                 "Test Site",
-                "--docs-dir",
-                "docs",
                 "--mkdocs-yml",
                 "mkdocs.yml",
             ],
@@ -41,13 +41,16 @@ def test_mkdocs_build_full_flow(
         assert result.exit_code == 0
         assert mock_mkdocs_build() is True
         assert (cwd / "mkdocs.yml").exists()
-        assert (cwd / "docs" / "testpkg" / "mod.md").exists()
+        assert (cwd / "docs" / "lib" / "testpkg" / "mod.md").exists()
+        assert "docs_dir: docs/lib" in (cwd / "mkdocs.yml").read_text()
+
 
 def test_mkdocs_build_missing_module_fails(cli_runner):
     result = cli_runner.invoke(cli, ["build", "--mkdocs", "--site-name", "Test"])
     assert result.exit_code != 0
     assert "--module is required" in result.output
 
+
 def test_mkdocs_build_without_site_name_uses_module_as_default_full_flow(
     cli_runner,
     mock_mkdocs_build,
@@ -77,8 +80,6 @@ def test_mkdocs_build_without_site_name_uses_module_as_default_full_flow(
                 "--mkdocs",
                 "--module",
                 "testpkg",
-                "--docs-dir",
-                "docs",
                 "--mkdocs-yml",
                 "mkdocs.yml",
             ],
@@ -95,5 +96,5 @@ def test_mkdocs_build_without_site_name_uses_module_as_default_full_flow(
         content = mkdocs_yml.read_text()
         assert "site_name: testpkg" in content
 
-        # Docs must be generated
+        # Docs must be generated under the nested docs/lib dir
-        assert (cwd / "docs" / "testpkg" / "mod.md").exists()
+        assert (cwd / "docs" / "lib" / "testpkg" / "mod.md").exists()

tests/cli/test_serve_mcp.py

@@ -1,5 +1,6 @@
 from docforge.cli.main import cli
 
+
 def test_mcp_serve(
     cli_runner,
     fake_mcp_docs,

tests/cli/test_serve_mkdocs.py

@@ -1,5 +1,6 @@
 from docforge.cli.main import cli
 
+
 def test_mkdocs_serve(
     cli_runner,
     fake_mkdocs_yml,

tests/conftest.py

@@ -1,8 +1,8 @@
-import sys
 import json
-import pytest
+import sys
 from pathlib import Path
 
+import pytest
 from click.testing import CliRunner
 
 
@@ -45,6 +45,7 @@ plugins:
 @pytest.fixture
 def mock_mkdocs_load_config(monkeypatch):
     """Mock mkdocs.config.load_config."""
+
     def fake_load_config(path):
         return object()  # dummy config object
 
@@ -81,6 +82,7 @@ def mock_mkdocs_serve(monkeypatch):
     )
     return lambda: called["value"]
 
+
 @pytest.fixture
 def fake_mcp_docs(tmp_path: Path) -> Path:
     """

tests/introspection/test_alias_safety.py

@@ -2,11 +2,9 @@ from docforge import GriffeLoader
 
 
 def test_alias_does_not_crash(temp_package):
-    (temp_package / "alias.py").write_text(
+    (temp_package / "alias.py").write_text("""from typing import List
-        '''from typing import List
 Alias = List[int]
-'''
+""")
-    )
 
     loader = GriffeLoader()
     project = loader.load_project(["testpkg.alias"])

tests/introspection/test_classes_and_methods.py

@@ -2,15 +2,13 @@ from docforge import GriffeLoader
 
 
 def test_class_and_methods(temp_package):
-    (temp_package / "cls.py").write_text(
+    (temp_package / "cls.py").write_text('''class MyClass:
-        '''class MyClass:
     """Class doc."""
 
     def method(self, x: int) -> int:
         """Method doc."""
         return x
-'''
+''')
-    )
 
     loader = GriffeLoader()
     project = loader.load_project(["testpkg.cls"])

tests/introspection/test_functions_and_signatures.py

@@ -2,12 +2,10 @@ from docforge import GriffeLoader
 
 
 def test_function_signature(temp_package):
-    (temp_package / "fn.py").write_text(
+    (temp_package / "fn.py").write_text('''def add(a: int, b: int = 1) -> int:
-        '''def add(a: int, b: int = 1) -> int:
     """Adds numbers."""
     return a + b
-'''
+''')
-    )
 
     loader = GriffeLoader()
     project = loader.load_project(["testpkg.fn"])

tests/introspection/test_import_failures.py

@@ -1,4 +1,5 @@
 import pytest
+
 from docforge import GriffeLoader
 
 
@@ -6,9 +7,8 @@ def test_load_project_raises_on_missing_module_by_default():
     loader = GriffeLoader()
 
     with pytest.raises(ImportError):
-        loader.load_project(
+        loader.load_project(["nonexistent.module", "sys"])
-            ["nonexistent.module", "sys"]
+
-        )
 
 def test_load_project_skips_missing_modules_when_enabled():
     loader = GriffeLoader()

tests/introspection/test_missing_docstrings.py

@@ -2,9 +2,7 @@ from docforge import GriffeLoader
 
 
 def test_missing_docstrings(temp_package):
-    (temp_package / "nodoc.py").write_text(
+    (temp_package / "nodoc.py").write_text("""def f(): pass""")
-        '''def f(): pass'''
-    )
 
     loader = GriffeLoader()
     project = loader.load_project(["testpkg.nodoc"])

tests/introspection/test_private_members.py

@@ -2,11 +2,9 @@ from docforge import GriffeLoader
 
 
 def test_private_members_excluded(temp_package):
-    (temp_package / "priv.py").write_text(
+    (temp_package / "priv.py").write_text("""def _hidden(): pass
-        '''def _hidden(): pass
 def visible(): pass
-'''
+""")
-    )
 
     loader = GriffeLoader()
     project = loader.load_project(["testpkg.priv"])

tests/introspection/test_single_module.py

@@ -2,13 +2,11 @@ from docforge import GriffeLoader
 
 
 def test_load_single_module(temp_package):
-    (temp_package / "mod.py").write_text(
+    (temp_package / "mod.py").write_text('''"""Module docstring."""\n
-        '''"""Module docstring."""\n
 def foo():
     """Foo docstring."""
     pass
-'''
+''')
-    )
 
     loader = GriffeLoader()
     project = loader.load_project(["testpkg.mod"])

tests/nav/test_mkdocs.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 
-from docforge.nav import ResolvedNav
+from docforge.nav import MkDocsNavEmitter, ResolvedNav
-from docforge.nav import MkDocsNavEmitter
 
 
 def test_emit_mkdocs_nav():

tests/nav/test_resolver.py

@@ -2,8 +2,7 @@ from pathlib import Path
 
 import pytest
 
-from docforge.nav import NavSpec
+from docforge.nav import NavSpec, resolve_nav
-from docforge.nav import resolve_nav
 
 
 def _write_docs(root: Path, paths: list[str]) -> None: