fix(setup): correct project root when notebook lives outside repo

shadeform · shadeform · commit 1685e47642c0 · 2026-04-14T07:41:23.000Z
The condition (cwd / complete_setup_guide.ipynb).exists() incorrectly
assumed notebooks/setup layout, so ~/complete_setup_guide.ipynb made
project_root cwd.parent.parent (filesystem root).

- Use notebooks/setup only when cwd is .../notebooks/setup
- Scan cwd subdirectories for src/api + scripts/setup (sibling clone)
- Invalidate cached __project_root__ if markers missing
- Remove unreachable duplicate code after get_project_root in Step 2
- Align Step 8 fallback, API key cell, and check_env_file fallback

Made-with: Cursor
diff --git a/notebooks/setup/complete_setup_guide.ipynb b/notebooks/setup/complete_setup_guide.ipynb
@@ -453,8 +453,8 @@
     "    if (current / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (current / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
     "        return current\n",
     "    \n",
-    "    # Check if we're in notebooks/setup/ (go up 2 levels)\n",
-    "    if (current / NOTEBOOK_FILENAME).exists() or current.name == NOTEBOOK_SETUP_DIR:\n",
+    "    # notebooks/setup/ only (NOT \"notebook file in cwd\" — that breaks ~/complete_setup_guide.ipynb)\n",
+    "    if current.name == NOTEBOOK_SETUP_DIR and current.parent.name == NOTEBOOKS_DIR:\n",
     "        parent = current.parent.parent\n",
     "        if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
     "            return parent\n",
@@ -470,6 +470,14 @@
     "        if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
     "            return parent\n",
     "    \n",
+    "    # Repo cloned as a subdirectory of cwd (e.g. notebook in ~, repo in ~/Multi-Agent-...)\n",
+    "    try:\n",
+    "        for child in sorted(current.iterdir(), key=lambda p: p.name.lower()):\n",
+    "            if child.is_dir() and (child / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (child / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
+    "                return child\n",
+    "    except (OSError, PermissionError):\n",
+    "        pass\n",
+    "    \n",
     "    # Fallback: return current directory\n",
     "    return current\n",
     "\n",
@@ -484,56 +492,46 @@
     "    import os\n",
     "    from pathlib import Path\n",
     "    \n",
-    "    # Check if already stored\n",
-    "    if hasattr(builtins, '__project_root__'):\n",
-    "        return builtins.__project_root__\n",
-    "    \n",
-    "    # Try to find project root\n",
+    "    def _has_markers(path: Path) -> bool:\n",
+    "        return (\n",
+    "            (path / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists()\n",
+    "            and (path / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists()\n",
+    "        )\n",
+    "\n",
+    "    if hasattr(builtins, \"__project_root__\"):\n",
+    "        cached = Path(builtins.__project_root__)\n",
+    "        if _has_markers(cached):\n",
+    "            return cached\n",
+    "        del builtins.__project_root__\n",
+    "\n",
     "    current = Path.cwd()\n",
-    "    \n",
-    "    # Check if we're already in project root\n",
-    "    if (current / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (current / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
+    "\n",
+    "    if _has_markers(current):\n",
     "        project_root = current\n",
-    "    # Check if we're in notebooks/setup/ (go up 2 levels)\n",
-    "    elif (current / NOTEBOOK_FILENAME).exists() or current.name == NOTEBOOK_SETUP_DIR:\n",
+    "    elif current.name == NOTEBOOK_SETUP_DIR and current.parent.name == NOTEBOOKS_DIR:\n",
     "        project_root = current.parent.parent\n",
-    "    # Check if we're in notebooks/ (go up 1 level)\n",
     "    elif current.name == NOTEBOOKS_DIR:\n",
     "        project_root = current.parent\n",
     "    else:\n",
-    "        # Try going up from current directory\n",
     "        project_root = current\n",
     "        for parent in current.parents:\n",
-    "            if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
+    "            if _has_markers(parent):\n",
     "                project_root = parent\n",
     "                break\n",
-    "    \n",
-    "    # Change to project root and store it\n",
+    "\n",
+    "    if not _has_markers(project_root):\n",
+    "        try:\n",
+    "            for child in sorted(current.iterdir(), key=lambda p: p.name.lower()):\n",
+    "                if child.is_dir() and _has_markers(child):\n",
+    "                    project_root = child\n",
+    "                    break\n",
+    "        except (OSError, PermissionError):\n",
+    "            pass\n",
+    "\n",
     "    os.chdir(project_root)\n",
     "    builtins.__project_root__ = project_root\n",
     "    return project_root\n",
     "\n",
-    "    \n",
-    "    # Check if we're in notebooks/setup/ (go up 2 levels)\n",
-    "    if (current / NOTEBOOK_FILENAME).exists() or current.name == NOTEBOOK_SETUP_DIR:\n",
-    "        parent = current.parent.parent\n",
-    "        if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
-    "            return parent\n",
-    "    \n",
-    "    # Check if we're in notebooks/ (go up 1 level)\n",
-    "    if current.name == NOTEBOOKS_DIR:\n",
-    "        parent = current.parent\n",
-    "        if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
-    "            return parent\n",
-    "    \n",
-    "    # Try going up from current directory\n",
-    "    for parent in current.parents:\n",
-    "        if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
-    "            return parent\n",
-    "    \n",
-    "    # Fallback: return current directory\n",
-    "    return current\n",
-    "\n",
     "# Find and change to project root\n",
     "project_root = find_project_root()\n",
     "if project_root is None:\n",
@@ -1340,32 +1338,43 @@
     "    import builtins\n",
     "    import os\n",
     "    from pathlib import Path\n",
-    "    \n",
-    "    # Check if already stored\n",
-    "    if hasattr(builtins, '__project_root__'):\n",
-    "        return Path(builtins.__project_root__)\n",
-    "    \n",
-    "    # Try to find project root\n",
+    "\n",
+    "    def _has_markers(path: Path) -> bool:\n",
+    "        return (\n",
+    "            (path / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists()\n",
+    "            and (path / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists()\n",
+    "        )\n",
+    "\n",
+    "    if hasattr(builtins, \"__project_root__\"):\n",
+    "        cached = Path(builtins.__project_root__)\n",
+    "        if _has_markers(cached):\n",
+    "            return cached\n",
+    "        del builtins.__project_root__\n",
+    "\n",
     "    current = Path.cwd()\n",
-    "    \n",
-    "    # Check if we're already in project root\n",
-    "    if (current / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (current / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
+    "\n",
+    "    if _has_markers(current):\n",
     "        project_root = current\n",
-    "    # Check if we're in notebooks/setup/ (go up 2 levels)\n",
-    "    elif (current / NOTEBOOK_FILENAME).exists() or current.name == NOTEBOOK_SETUP_DIR:\n",
+    "    elif current.name == NOTEBOOK_SETUP_DIR and current.parent.name == NOTEBOOKS_DIR:\n",
     "        project_root = current.parent.parent\n",
-    "    # Check if we're in notebooks/ (go up 1 level)\n",
     "    elif current.name == NOTEBOOKS_DIR:\n",
     "        project_root = current.parent\n",
     "    else:\n",
-    "        # Try going up from current directory\n",
     "        project_root = current\n",
     "        for parent in current.parents:\n",
-    "            if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
+    "            if _has_markers(parent):\n",
     "                project_root = parent\n",
     "                break\n",
-    "    \n",
-    "    # Change to project root and store it\n",
+    "\n",
+    "    if not _has_markers(project_root):\n",
+    "        try:\n",
+    "            for child in sorted(current.iterdir(), key=lambda p: p.name.lower()):\n",
+    "                if child.is_dir() and _has_markers(child):\n",
+    "                    project_root = child\n",
+    "                    break\n",
+    "        except (OSError, PermissionError):\n",
+    "            pass\n",
+    "\n",
     "    os.chdir(project_root)\n",
     "    builtins.__project_root__ = project_root\n",
     "    return project_root\n",
@@ -2848,21 +2857,36 @@
     "        os.chdir(project_root)\n",
     "        builtins.__project_root__ = project_root\n",
     "    else:\n",
-    "        # Fallback: try to find project root\n",
+    "        # Fallback: try to find project root (same rules as get_project_root)\n",
+    "        def _has_markers(path: Path) -> bool:\n",
+    "            return (\n",
+    "                (path / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists()\n",
+    "                and (path / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists()\n",
+    "            )\n",
+    "\n",
     "        current = Path.cwd()\n",
-    "        # Check if we're in notebooks/setup/ (go up 2 levels)\n",
-    "        if (current / NOTEBOOK_FILENAME).exists() or current.name == NOTEBOOK_SETUP_DIR:\n",
+    "        if _has_markers(current):\n",
+    "            project_root = current\n",
+    "        elif current.name == NOTEBOOK_SETUP_DIR and current.parent.name == NOTEBOOKS_DIR:\n",
     "            project_root = current.parent.parent\n",
     "        elif current.name == NOTEBOOKS_DIR:\n",
     "            project_root = current.parent\n",
     "        else:\n",
-    "            # Try going up from current directory\n",
+    "            project_root = current\n",
     "            for parent in current.parents:\n",
-    "                if (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists() and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists():\n",
+    "                if _has_markers(parent):\n",
     "                    project_root = parent\n",
     "                    break\n",
-    "            else:\n",
-    "                project_root = current\n",
+    "\n",
+    "        if not _has_markers(project_root):\n",
+    "            try:\n",
+    "                for child in sorted(current.iterdir(), key=lambda p: p.name.lower()):\n",
+    "                    if child.is_dir() and _has_markers(child):\n",
+    "                        project_root = child\n",
+    "                        break\n",
+    "            except (OSError, PermissionError):\n",
+    "                pass\n",
+    "\n",
     "        os.chdir(project_root)\n",
     "        builtins.__project_root__ = project_root\n",
     "    \n",
@@ -3385,34 +3409,46 @@
     "    NOTEBOOK_SETUP_DIR = \"setup\"\n",
     "    NOTEBOOKS_DIR = \"notebooks\"\n",
     "\n",
+    "    def _has_markers(path: Path) -> bool:\n",
+    "        return (\n",
+    "            (path / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists()\n",
+    "            and (path / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists()\n",
+    "        )\n",
+    "\n",
     "    def get_project_root():\n",
     "        \"\"\"Detect repo root (same rules as Step 2) if that cell was not run.\"\"\"\n",
     "        import builtins\n",
     "        import os\n",
     "\n",
     "        if hasattr(builtins, \"__project_root__\"):\n",
-    "            return Path(builtins.__project_root__)\n",
+    "            cached = Path(builtins.__project_root__)\n",
+    "            if _has_markers(cached):\n",
+    "                return cached\n",
+    "            del builtins.__project_root__\n",
     "\n",
     "        current = Path.cwd()\n",
-    "        if (\n",
-    "            (current / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists()\n",
-    "            and (current / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists()\n",
-    "        ):\n",
+    "        if _has_markers(current):\n",
     "            project_root = current\n",
-    "        elif (current / NOTEBOOK_FILENAME).exists() or current.name == NOTEBOOK_SETUP_DIR:\n",
+    "        elif current.name == NOTEBOOK_SETUP_DIR and current.parent.name == NOTEBOOKS_DIR:\n",
     "            project_root = current.parent.parent\n",
     "        elif current.name == NOTEBOOKS_DIR:\n",
     "            project_root = current.parent\n",
     "        else:\n",
     "            project_root = current\n",
     "            for parent in current.parents:\n",
-    "                if (\n",
-    "                    (parent / PROJECT_ROOT_MARKERS[0][0] / PROJECT_ROOT_MARKERS[0][1]).exists()\n",
-    "                    and (parent / PROJECT_ROOT_MARKERS[1][0] / PROJECT_ROOT_MARKERS[1][1]).exists()\n",
-    "                ):\n",
+    "                if _has_markers(parent):\n",
     "                    project_root = parent\n",
     "                    break\n",
     "\n",
+    "        if not _has_markers(project_root):\n",
+    "            try:\n",
+    "                for child in sorted(current.iterdir(), key=lambda p: p.name.lower()):\n",
+    "                    if child.is_dir() and _has_markers(child):\n",
+    "                        project_root = child\n",
+    "                        break\n",
+    "            except (OSError, PermissionError):\n",
+    "                pass\n",
+    "\n",
     "        os.chdir(project_root)\n",
     "        builtins.__project_root__ = project_root\n",
     "        return project_root\n",
