dataface 0.1.6.dev76__py3-none-any.whl → 0.1.6.dev129__py3-none-any.whl

dataface/agent_api/_paths.py

@@ -6,9 +6,8 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from dataface.core.project_roots import (
-    discover_render_context as discover_render_context,
-    discovery_boundary_for_face as discovery_boundary_for_face,
     find_dft_root as find_dft_root,
+    find_project_root as find_project_root,
 )
 from dataface.core.scoped_paths import (
     resolve_scoped_path as resolve_scoped_path,
@@ -60,8 +59,8 @@ class FaceRenderContext:
     """Path resolution result from a face path + project root.
 
     Adapter registry is built by `ProjectSession.open`, not by the context — call sites
-    open a `ProjectSession` with `project_root` + `dbt_project_path` and read the
-    registry off `project.adapter_registry`.
+    open a `ProjectSession` with `project_root` and read the registry off
+    `project.adapter_registry`.
     """
 
     face_file: Path
@@ -69,18 +68,16 @@ class FaceRenderContext:
     scoped_base: Path
     project_root: Path
     output_dir: Path
-    dbt_project_path: Path | None = None
 
 
 def build_face_render_context(
     face_path: Path,
     project_dir: Path,
 ) -> FaceRenderContext:
-    """Resolve a face path and walk for dbt context.
+    """Resolve a face path against the given project root.
 
-    ``project_dir`` is authoritative; the walk only contributes the dbt project
-    path. Callers must resolve their project dir first (e.g. via
-    ``resolve_project_dir(raw_dir)`` at the CLI boundary).
+    ``project_dir`` is authoritative. Callers must resolve their project dir first
+    (e.g. via ``resolve_project_dir(raw_dir)`` at the CLI boundary).
     """
     if face_path.is_absolute():
         face_file = face_path.resolve()
@@ -89,10 +86,6 @@ def build_face_render_context(
     else:
         face_file = (project_dir / face_path).resolve()
 
-    _, dbt_project_path = discover_render_context(
-        face_file.parent,
-        discovery_boundary_for_face(face_file.parent, project_dir),
-    )
     project_root = project_dir
 
     try:
@@ -109,7 +102,6 @@ def build_face_render_context(
         scoped_base=project_root,
         project_root=project_root,
         output_dir=project_root,
-        dbt_project_path=dbt_project_path,
     )
 
 
@@ -122,21 +114,18 @@ class YamlRenderContext:
 
     project_root: Path
     output_dir: Path
-    dbt_project_path: Path | None = None
 
 
 def build_yaml_render_context(
     project_dir: Path,
 ) -> YamlRenderContext:
-    """Walk for dbt context anchored at the given project root.
+    """Resolve the project root for rendering inline YAML.
 
     ``project_dir`` is authoritative. Callers must resolve their project dir
     first (e.g. via ``resolve_project_dir(raw_dir)`` at the CLI boundary).
     """
     project_root = project_dir.resolve()
-    _, dbt_project_path = discover_render_context(project_root, None)
     return YamlRenderContext(
         project_root=project_root,
         output_dir=project_root,
-        dbt_project_path=dbt_project_path,
     )

dataface/agent_api/data_paths.py

@@ -25,6 +25,7 @@ from dataface.core.registered_views.data_urls import (
 
 if TYPE_CHECKING:
     from dataface.agent_api.schema import SchemaResponse
+    from dataface.core.project import Project
     from dataface.core.serve.alias_index import AliasIndex
 
 
@@ -186,22 +187,15 @@ def data_paths_list(
     return result
 
 
-def build_alias_index_for_project(project_dir: Path) -> AliasIndex:
-    """Build an AliasIndex from a project directory.
+def build_alias_index_for_project(project: Project) -> AliasIndex:
+    """Build an AliasIndex from a project.
 
-    Uses the same faces_at_root detection logic as the server. Intended for
-    CLI commands (dft schema --data-paths) that need alias lookup without
-    starting a server.
+    Intended for CLI commands (dft schema --data-paths) that need alias lookup
+    without starting a server.
     """
     from dataface.core.serve.alias_index import AliasIndex
 
-    faces_dir = project_dir / "faces"
-    faces_at_root = faces_dir.is_dir()
-    return AliasIndex.build(
-        project_dir=project_dir,
-        faces_dir=faces_dir,
-        faces_at_root=faces_at_root,
-    )
+    return AliasIndex.build(project, faces_at_root=project.faces_dir.is_dir())
 
 
 def data_alias_errors_for_file(

dataface/agent_api/docs/yaml-reference.md

@@ -128,8 +128,8 @@ Authored patch for bar and histogram charts.
 | `sort` | [ChartSort](#chartsort) | ✓ | Sort configuration: field to sort by and direction (asc/desc). |
 | `labels` | [ChartLabels](#chartlabels) | ✓ | Per-row text annotations near each data anchor. |
 | `data_table` | [ChartDataTable](#chartdatatable) | ✓ | Optional mini data-grid attached below/above the chart. |
-| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
-| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
+| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
+| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
 | `style` | [BarChartStyle](#barchartstyle) | ✓ | Chart-local style overrides. |
 
 <a id="linechart"></a>
@@ -156,8 +156,8 @@ Authored patch for line charts.
 | `sort` | [ChartSort](#chartsort) | ✓ | Sort configuration: field to sort by and direction (asc/desc). |
 | `labels` | [ChartLabels](#chartlabels) | ✓ | Per-row text annotations near each data anchor. |
 | `data_table` | [ChartDataTable](#chartdatatable) | ✓ | Optional mini data-grid attached below/above the chart. |
-| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
-| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
+| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
+| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
 | `style` | [LineChartStyle](#linechartstyle) | ✓ | Chart-local style overrides. |
 
 <a id="areachart"></a>
@@ -184,8 +184,8 @@ Authored patch for area charts.
 | `sort` | [ChartSort](#chartsort) | ✓ | Sort configuration: field to sort by and direction (asc/desc). |
 | `labels` | [ChartLabels](#chartlabels) | ✓ | Per-row text annotations near each data anchor. |
 | `data_table` | [ChartDataTable](#chartdatatable) | ✓ | Optional mini data-grid attached below/above the chart. |
-| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
-| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
+| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
+| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
 | `style` | [AreaChartStyle](#areachartstyle) | ✓ | Chart-local style overrides. |
 
 <a id="scatterchart"></a>
@@ -212,8 +212,8 @@ Authored patch for scatter charts.
 | `sort` | [ChartSort](#chartsort) | ✓ | Sort configuration: field to sort by and direction (asc/desc). |
 | `labels` | [ChartLabels](#chartlabels) | ✓ | Per-row text annotations near each data anchor. |
 | `data_table` | [ChartDataTable](#chartdatatable) | ✓ | Optional mini data-grid attached below/above the chart. |
-| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
-| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
+| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
+| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
 | `size` | str | ✓ | Field used to size-encode data points (quantitative). |
 | `shape` | str | ✓ | Field used to shape-encode data points (categorical). |
 | `style` | [ScatterChartStyle](#scatterchartstyle) | ✓ | Chart-local style overrides. |
@@ -242,8 +242,8 @@ Authored patch for heatmap charts.
 | `sort` | [ChartSort](#chartsort) | ✓ | Sort configuration: field to sort by and direction (asc/desc). |
 | `labels` | [ChartLabels](#chartlabels) | ✓ | Per-row text annotations near each data anchor. |
 | `data_table` | [ChartDataTable](#chartdatatable) | ✓ | Optional mini data-grid attached below/above the chart. |
-| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
-| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Not valid on kpi, table, callout, or spark_bar — those renderers own their own sizing contracts. |
+| `height` | int \| float | ✓ | Explicit chart height in pixels. Positive number only. When set, overrides aspect_ratio and theme cascade. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
+| `width` | int \| float | ✓ | Chart width hint in pixels. Positive number only. Used by the label-overlap heuristic to determine whether x-axis labels need tilting. Does not override the layout slot width — the chart still fills its allocated container. Only valid on cartesian chart families: area, bar, heatmap, histogram, line, and scatter. Other chart families use renderer-owned or layout-owned sizing contracts. |
 | `style` | [HeatmapChartStyle](#heatmapchartstyle) | ✓ | Chart-local style overrides. |
 
 <a id="piechart"></a>
@@ -1081,7 +1081,7 @@ Authored overlay for TitleStyle. Board and face titles.
 | Field | Type | Optional | Description |
 |-------|------|:--------:|-------------|
 | `font` | [FontStyle](#fontstyle) | ✓ | Title font style overrides. |
-| `line_height` | float | ✓ | Line height multiplier for titles and markdown headings. Headings typically want a tighter multiplier than body prose (~1.1-1.25 vs the body 1.5-1.6). |
+| `line_height` | float | ✓ | Line height multiplier for titles and markdown headings. Headings typically want a tighter multiplier than body prose. |
 | `sizes` | list[float] | ✓ | Font sizes for the H1–H6 heading ramp, indexed by ``face.level - 1``. Combined with ``width_offsets`` at render time to size titles responsively by card width. |
 | `width_offsets` | [TitleWidthOffsetsStyle](#titlewidthoffsetsstyle) | ✓ | Additive level offsets by card width (tiny/narrow/medium/wide). Added to the title's base level before indexing ``sizes``. Consumed by chart_title_spec / face_title_spec. |
 | `min_height` | float | ✓ | Minimum title row height in pixels. |
@@ -2372,10 +2372,11 @@ Authored overlay for SparkAreaStyle.
 
 <a id="geoshapemarkstyle"></a>
 ## GeoshapeMarkStyle
-Authored overlay for GeoshapeMarkStyle. Geoshape (choropleth) mark boundary stroke.
+Authored overlay for GeoshapeMarkStyle. Geoshape (choropleth) mark fill and boundary stroke.
 
 | Field | Type | Optional | Description |
 |-------|------|:--------:|-------------|
+| `fill` | str | ✓ | Neutral geoshape fill color. |
 | `stroke` | [StrokeStyle](#strokestyle) | ✓ | Geoshape boundary stroke style. |
 
 <a id="circlemarkstyle"></a>

dataface/agent_api/files.py

@@ -16,6 +16,8 @@ from pathlib import Path
 
 from pydantic import BaseModel, Field
 
+from dataface.core.project import Project
+
 # Cap grep/glob payloads — read_file returns full content (model must handle size).
 _MAX_GREP_MATCHES = 200
 _MAX_GLOB_MATCHES = 500
@@ -146,9 +148,9 @@ def _walk_project(root: Path) -> list[Path]:
     return result
 
 
-def read_file(path: str, project_dir: Path) -> ReadFileResult:
+def read_file(path: str, project: Project) -> ReadFileResult:
     try:
-        target = _resolve_within(project_dir, path)
+        target = _resolve_within(project.root, path)
     except ValueError as exc:
         return ReadFileResult(success=False, path=path, error=str(exc))
     if not target.is_file():
@@ -157,12 +159,14 @@ def read_file(path: str, project_dir: Path) -> ReadFileResult:
         content = target.read_text(encoding="utf-8")
     except (OSError, UnicodeDecodeError) as exc:
         return ReadFileResult(success=False, path=path, error=str(exc))
-    return ReadFileResult(success=True, path=_rel(project_dir, target), content=content)
+    return ReadFileResult(
+        success=True, path=_rel(project.root, target), content=content
+    )
 
 
-def write_file(path: str, content: str, project_dir: Path) -> WriteFileResult:
+def write_file(path: str, content: str, project: Project) -> WriteFileResult:
     try:
-        target = _resolve_within(project_dir, path)
+        target = _resolve_within(project.root, path)
     except ValueError as exc:
         return WriteFileResult(success=False, path=path, error=str(exc))
     try:
@@ -172,16 +176,16 @@ def write_file(path: str, content: str, project_dir: Path) -> WriteFileResult:
         return WriteFileResult(success=False, path=path, error=str(exc))
     return WriteFileResult(
         success=True,
-        path=_rel(project_dir, target),
+        path=_rel(project.root, target),
         bytes_written=len(content.encode("utf-8")),
     )
 
 
 def edit_file(
-    path: str, old_string: str, new_string: str, project_dir: Path
+    path: str, old_string: str, new_string: str, project: Project
 ) -> EditFileResult:
     try:
-        target = _resolve_within(project_dir, path)
+        target = _resolve_within(project.root, path)
     except ValueError as exc:
         return EditFileResult(success=False, path=path, error=str(exc))
     if not target.is_file():
@@ -205,11 +209,11 @@ def edit_file(
         target.write_text(original.replace(old_string, new_string), encoding="utf-8")
     except OSError as exc:
         return EditFileResult(success=False, path=path, error=str(exc))
-    return EditFileResult(success=True, path=_rel(project_dir, target), replacements=1)
+    return EditFileResult(success=True, path=_rel(project.root, target), replacements=1)
 
 
-def glob_files(pattern: str, project_dir: Path) -> GlobResult:
-    root = project_dir.resolve()
+def glob_files(pattern: str, project: Project) -> GlobResult:
+    root = project.root.resolve()
     matches: list[str] = []
     try:
         candidates = root.glob(pattern)
@@ -228,8 +232,8 @@ def glob_files(pattern: str, project_dir: Path) -> GlobResult:
     return GlobResult(success=True, matches=matches)
 
 
-def grep_files(pattern: str, project_dir: Path, glob: str | None = None) -> GrepResult:
-    root = project_dir.resolve()
+def grep_files(pattern: str, project: Project, glob: str | None = None) -> GrepResult:
+    root = project.root.resolve()
     matches: list[GrepMatch] = []
     try:
         candidates: list[Path] = (

dataface/agent_api/pack.py

@@ -446,8 +446,8 @@ def apply_proposal(
     )
 
     # Ensure base dirs exist
-    (project.root / "faces").mkdir(exist_ok=True)
-    (project.root / "faces" / "partials").mkdir(exist_ok=True)
+    project.faces_dir.mkdir(exist_ok=True)
+    (project.faces_dir / "partials").mkdir(exist_ok=True)
 
     # Write partials — skipped by validate_paths (_*.yml convention)
     for partial_filename, partial_path, rel in partial_targets:

dataface/agent_api/project_session.py

@@ -17,7 +17,6 @@ else:
 # Verb-forwarder imports use SUBMODULES so test monkeypatches on the
 # module attribute affect the call site.
 from dataface.agent_api import (
-    dashboards as _dashboards,
     describe as _describe,
     describe_query as _describe_query,
     query as _query,
@@ -42,7 +41,7 @@ from dataface.core.inspect.query_validator import (
     validate_query as _core_validate_query,
 )
 from dataface.core.project import Project
-from dataface.core.project_roots import discover_render_context
+from dataface.core.project_roots import find_project_root
 
 if TYPE_CHECKING:
     from dataface.core.dashboard import RenderedDashboard, RenderFormat
@@ -71,7 +70,6 @@ class ProjectSession:
     cache: DuckDBCache | None
     _owns_registry: bool
     _read_only: bool
-    _dbt_project_path: Path | None
     _connection_string: str | None
     _dialect: str
     _target: str
@@ -96,7 +94,6 @@ class ProjectSession:
             # short-circuit the build on first access.
             self.__dict__["adapter_registry"] = adapter_registry
         self._read_only = read_only
-        self._dbt_project_path = None
         self._connection_string = None
         self._dialect = "duckdb"
         self._target = "dev"
@@ -111,7 +108,6 @@ class ProjectSession:
         *,
         cache: DuckDBCache | None = None,
         read_only: bool = True,
-        dbt_project_path: Path | None = None,
         connection_string: str | None = None,
         dialect: str = "duckdb",
         target: str = "dev",
@@ -135,7 +131,6 @@ class ProjectSession:
             cache=cache,
             read_only=read_only,
         )
-        session._dbt_project_path = dbt_project_path
         session._connection_string = connection_string
         session._dialect = dialect
         session._target = target
@@ -151,7 +146,6 @@ class ProjectSession:
         *,
         cache: DuckDBCache | None = None,
         read_only: bool = True,
-        dbt_project_path: Path | None = None,
         connection_string: str | None = None,
         dialect: str = "duckdb",
         target: str = "dev",
@@ -166,7 +160,6 @@ class ProjectSession:
         this method stores it directly without re-wrapping.
         """
         session = cls(project=project, cache=cache, read_only=read_only)
-        session._dbt_project_path = dbt_project_path
         session._connection_string = connection_string
         session._dialect = dialect
         session._target = target
@@ -185,13 +178,8 @@ class ProjectSession:
     ) -> Self:
         """Open a ProjectSession rooted at the project directory discovered upward from face_file."""
         resolved = Path(face_file).resolve()
-        project_root, dbt_project_path = discover_render_context(resolved.parent, None)
-        return cls.open(
-            project_root,
-            read_only=read_only,
-            cache=cache,
-            dbt_project_path=dbt_project_path,
-        )
+        project_root = find_project_root(resolved.parent, boundary=None)
+        return cls.open(project_root, read_only=read_only, cache=cache)
 
     def __enter__(self) -> Self:
         return self
@@ -210,7 +198,6 @@ class ProjectSession:
         return build_adapter_registry(
             self.project,
             read_only=self._read_only,
-            dbt_project_path=self._dbt_project_path,
             connection_string=self._connection_string,
             profile_type=self._dialect,
             target=self._target,
@@ -253,6 +240,10 @@ class ProjectSession:
     def warnings_ignore(self) -> frozenset[str]:
         return self.project.warnings_ignore
 
+    @property
+    def faces_dir(self) -> Path:
+        return self.project.faces_dir
+
     @cached_property
     def _relationship_context(self) -> RelationshipContext | None:
         """Load relationship context from the super-schema cache (lazy, per-instance).
@@ -275,11 +266,6 @@ class ProjectSession:
 
     # ── Verb forwarders ──────────────────────────────────────────────────────
 
-    def validate(self, face_path: Path) -> ValidateResult:
-        result = _validate.validate(face_path, project=self.project)
-        annotated = _validate.annotate_with_data_lint([result], project_session=self)
-        return annotated[0]
-
     def validate_paths(self, paths: list[Path] | None) -> list[ValidateResult]:
         results = _validate.validate_paths(paths, project=self.project)
         return _validate.annotate_with_data_lint(results, project_session=self)
@@ -342,32 +328,9 @@ class ProjectSession:
             relationship_context=self._relationship_context,
         )
 
-    def describe_face(self, path: Path) -> _describe.DescribeFaceResult:
-        return _describe.describe_face(path, project=self.project)
-
     def describe_paths(self, paths: list[Path]) -> list[_describe.DescribeFaceResult]:
         return _describe.describe_paths(paths, project=self.project)
 
-    def list_dashboards(
-        self,
-        directory: Path | None = None,
-        recursive: bool = True,
-    ) -> _dashboards.ListDashboardsResult:
-        """When ``directory`` is None, defaults to ``self.project.root``. When provided, callers are responsible for passing an absolute path; relative paths resolve against the process working directory."""
-        return _dashboards.list_dashboards(
-            directory=directory if directory is not None else self.project.root,
-            recursive=recursive,
-        )
-
-    def get_dashboard(
-        self,
-        path: Path,
-        include_raw: bool = False,
-    ) -> _dashboards.CompiledDashboard:
-        return _dashboards.get_dashboard(
-            path, include_raw=include_raw, project=self.project
-        )
-
     def lookup_face_query_sql(
         self,
         name: str,

dataface/agent_api/render_face.py

@@ -15,10 +15,6 @@ from dataface.core.compile.markdown import (
 )
 from dataface.core.execute.duckdb_cache import DuckDBCache
 from dataface.core.project import Project
-from dataface.core.project_roots import (
-    discover_render_context,
-    discovery_boundary_for_face,
-)
 from dataface.core.render.face_api import compile_and_render
 
 
@@ -72,16 +68,7 @@ def render_face(
     if project is not None:
         if warnings_ignore is None:
             warnings_ignore = project.warnings_ignore
-        # Discover dbt_project.yml between the face and the project root.
-        # build_adapter_registry's own fallback would only walk upward from
-        # project.root, missing nested dbt projects under it.
-        _, dbt_project_path = discover_render_context(
-            face_file.parent,
-            discovery_boundary_for_face(face_file.parent, project.root),
-        )
-        project_session = ProjectSession.open(
-            project.root, cache=cache, dbt_project_path=dbt_project_path
-        )
+        project_session = ProjectSession.open(project.root, cache=cache)
     else:
         if warnings_ignore is None:
             warnings_ignore = frozenset()

dataface/agent_api/validate.py

@@ -90,7 +90,7 @@ def _validate_one_path(
     # detectors. Keep this lazy so `dft --help` doesn't pay that startup cost.
     from dataface.core.inspect.manifest_utils import INSPECT_TEMPLATE_MANIFEST
 
-    raw_path = path if path is not None else project.root / "faces"
+    raw_path = path if path is not None else project.faces_dir
 
     try:
         resolved = resolve_scoped_path(raw_path, project.root)

dataface/ai/context.py

@@ -21,6 +21,7 @@ class DatafaceAIContext:
     # `dft chat` after binding; consumed by `_view_url` to build clickable
     # localhost URLs in `render_dashboard` responses (including as_link=True).
     server_port: int | None = None
+    prompt_context: dict[str, str] | None = None
 
     def resolve_dashboard_path(self, path: Path) -> Path:
         """Resolve a dashboard path inside the scoped dashboards directory.
@@ -31,7 +32,7 @@ class DatafaceAIContext:
         if path.is_absolute():
             raise ValueError(f"Dashboard path must be relative: {path}")
         if self.dashboards_directory is None:
-            base_dir = (self.project_session.project.root / "faces").resolve()
+            base_dir = self.project_session.faces_dir.resolve()
         else:
             base_dir = self.dashboards_directory.resolve()
         resolved = (base_dir / path).resolve()

dataface/ai/tools/__init__.py

@@ -293,14 +293,14 @@ def _handle_get_warning_code(
 def _handle_read_file(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str, Any]:
     parsed = _files.ReadFileArgs.model_validate(args)
     return _files.read_file(
-        parsed.path, project_dir=_render_project_dir(args, ctx)
+        parsed.path, project=Project(_render_project_dir(args, ctx))
     ).model_dump(mode="json", exclude_none=True)
 
 
 def _handle_write_file(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str, Any]:
     parsed = _files.WriteFileArgs.model_validate(args)
     return _files.write_file(
-        parsed.path, parsed.content, project_dir=_render_project_dir(args, ctx)
+        parsed.path, parsed.content, project=Project(_render_project_dir(args, ctx))
     ).model_dump(mode="json", exclude_none=True)
 
 
@@ -310,14 +310,14 @@ def _handle_edit_file(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str,
         parsed.path,
         parsed.old_string,
         parsed.new_string,
-        project_dir=_render_project_dir(args, ctx),
+        project=Project(_render_project_dir(args, ctx)),
     ).model_dump(mode="json", exclude_none=True)
 
 
 def _handle_glob_files(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str, Any]:
     parsed = _files.GlobFilesArgs.model_validate(args)
     return _files.glob_files(
-        parsed.pattern, project_dir=_render_project_dir(args, ctx)
+        parsed.pattern, project=Project(_render_project_dir(args, ctx))
     ).model_dump(mode="json", exclude_none=True)
 
 
@@ -325,7 +325,7 @@ def _handle_grep_files(args: dict[str, Any], ctx: DatafaceAIContext) -> dict[str
     parsed = _files.GrepFilesArgs.model_validate(args)
     return _files.grep_files(
         parsed.pattern,
-        project_dir=_render_project_dir(args, ctx),
+        project=Project(_render_project_dir(args, ctx)),
         glob=parsed.glob,
     ).model_dump(mode="json", exclude_none=True)
 

dataface/cli/commands/render.py

@@ -129,11 +129,7 @@ def render_command(
 
     with (
         cache_from_env() as cache,
-        ProjectSession.open(
-            ctx.project_root,
-            cache=cache,
-            dbt_project_path=ctx.dbt_project_path,
-        ) as project_session,
+        ProjectSession.open(ctx.project_root, cache=cache) as project_session,
     ):
         result = project_session.render_dashboard(
             path=ctx.scoped_path,
@@ -219,11 +215,7 @@ def render_command_from_yaml(
 
     with (
         cache_from_env() as cache,
-        ProjectSession.open(
-            ctx.project_root,
-            cache=cache,
-            dbt_project_path=ctx.dbt_project_path,
-        ) as project_session,
+        ProjectSession.open(ctx.project_root, cache=cache) as project_session,
     ):
         result = project_session.render_dashboard(
             yaml_content=yaml_content,

dataface/cli/commands/schema.py

@@ -193,32 +193,31 @@ def schema_command(
             lineage_depth=lineage_depth,
             surface="cli",
         )
-
-    if data_paths:
-        if not drill_result.success:
-            print_structured_errors(
-                drill_result.structured_errors
-                or [
-                    StructuredError(
-                        code=DF_UNKNOWN_INTERNAL.code,
-                        domain=DF_UNKNOWN_INTERNAL.domain,
-                        doc_url=DF_UNKNOWN_INTERNAL.doc_url,
-                        docs_topic=DF_UNKNOWN_INTERNAL.docs_topic,
-                        message="; ".join(drill_result.errors),
-                    )
-                ]
+        if data_paths:
+            if not drill_result.success:
+                print_structured_errors(
+                    drill_result.structured_errors
+                    or [
+                        StructuredError(
+                            code=DF_UNKNOWN_INTERNAL.code,
+                            domain=DF_UNKNOWN_INTERNAL.domain,
+                            doc_url=DF_UNKNOWN_INTERNAL.doc_url,
+                            docs_topic=DF_UNKNOWN_INTERNAL.docs_topic,
+                            message="; ".join(drill_result.errors),
+                        )
+                    ]
+                )
+                raise typer.Exit(1)
+            from dataface.agent_api.data_paths import (
+                build_alias_index_for_project,
+                data_paths_list,
             )
-            raise typer.Exit(1)
-        from dataface.agent_api.data_paths import (
-            build_alias_index_for_project,
-            data_paths_list,
-        )
 
-        alias_index = build_alias_index_for_project(project_root)
-        ep_list = data_paths_list(drill_result, alias_index=alias_index)
-        wire = [p.to_dict() for p in ep_list]
-        typer.echo(json.dumps(wire, indent=2))
-        return
+            alias_index = build_alias_index_for_project(project_session.project)
+            ep_list = data_paths_list(drill_result, alias_index=alias_index)
+            wire = [p.to_dict() for p in ep_list]
+            typer.echo(json.dumps(wire, indent=2))
+            return
 
     if json_output:
         typer.echo(