framework-m-studio 0.18.1__tar.gz → 0.18.2__tar.gz

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/CHANGELOG.md

@@ -1,3 +1,18 @@
+## framework-m-studio v0.18.2
+
+### Bug Fixes
+
+- remove flat structure fallback from doctype cli generator (0cb29c4)
+- resolve TODO comments and improve tests (f06be12)
+- pin Docker service version (674f106)
+- stabilize CI service tests (156684f)
+- satisfy pr lint checks (d3044f0)
+- stabilize screenshot pipeline (78ed7cf)
+- align release cli and orchestrator with standard auth refactor (b345860)
+- prevent empty dependency commits when lockfile content is unchanged (f327735)
+- prevent staging ignored static assets on release (8e46578)
+- sync platform dependencies in templates (72be8c1)
+
 **framework-m-studio** v0.18.1: internal dependency bump due to **framework-m-core** update## framework-m-studio v0.18.0
 
 ### Features

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: framework-m-studio
-Version: 0.18.1
+Version: 0.18.2
 Summary: Framework M Studio - Visual DocType Builder & Developer Tools
 Project-URL: Homepage, https://gitlab.com/castlecraft/framework-m
 Project-URL: Documentation, https://gitlab.com/castlecraft/framework-m#readme
@@ -20,23 +20,23 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Requires-Dist: bandit>=1.9.4
 Requires-Dist: build>=1.5.0
-Requires-Dist: framework-m-core>=0.27.0
-Requires-Dist: framework-m>=0.14.1
+Requires-Dist: framework-m-core>=0.28.0
+Requires-Dist: framework-m>=0.14.2
 Requires-Dist: honcho>=2.0.0
 Requires-Dist: httpx>=0.28.1
-Requires-Dist: ipython>=9.14.1
+Requires-Dist: ipython>=9.15.0
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: libcst>=1.8.6
 Requires-Dist: mypy>=2.1.0
-Requires-Dist: playwright>=1.60.0
+Requires-Dist: playwright>=1.61.0
 Requires-Dist: pydantic>=2.13.4
 Requires-Dist: pytest-asyncio>=1.4.0
 Requires-Dist: pytest-cov>=7.1.0
-Requires-Dist: pytest>=9.1.0
+Requires-Dist: pytest>=9.1.1
 Requires-Dist: python-dotenv>=1.2.2
-Requires-Dist: python-semantic-release>=10.5.3
+Requires-Dist: python-semantic-release>=10.6.0
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: ruff>=0.15.17
+Requires-Dist: ruff>=0.15.20
 Requires-Dist: twine>=6.2.0
 Description-Content-Type: text/markdown
 

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "framework-m-studio"
-version = "0.18.1"
+version = "0.18.2"
 description = "Framework M Studio - Visual DocType Builder & Developer Tools"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -21,26 +21,26 @@ classifiers = [
 ]
 
 dependencies = [
-    "framework-m-core>=0.27.0",
-    "framework-m>=0.14.1",
+    "framework-m-core>=0.28.0",
+    "framework-m>=0.14.2",
     # Code generation
     "libcst>=1.8.6",
     "jinja2>=3.1.6",
     # Process management for dev command
     "honcho>=2.0.0",
-    "playwright>=1.60.0",
+    "playwright>=1.61.0",
     "pyyaml>=6.0.3",
-    "ipython>=9.14.1",
+    "ipython>=9.15.0",
     # Developer Tooling (wrapped by Studio CLI)
-    "pytest>=9.1.0",
+    "pytest>=9.1.1",
     "pytest-asyncio>=1.4.0",
     "pytest-cov>=7.1.0",
     "mypy>=2.1.0",
-    "ruff>=0.15.17",
+    "ruff>=0.15.20",
     "bandit>=1.9.4",
     "httpx>=0.28.1",
     # Release tools
-    "python-semantic-release>=10.5.3",
+    "python-semantic-release>=10.6.0",
     "build>=1.5.0",
     "twine>=6.2.0",
     "pydantic>=2.13.4",

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/app.py

@@ -24,6 +24,32 @@ from litestar.static_files import create_static_files_router
 STATIC_DIR = Path(__file__).parent / "static"
 
 
+def _get_studio_locale_dirs() -> list[Path | os.PathLike[Any] | str]:
+    """Resolve locale directories that Studio should expose at ``/locales``.
+
+    Studio reuses shared desk/ui i18n assets that are generated into the
+    workspace frontend locale directory. In local dev and CI screenshot jobs,
+    the Studio app runs as a separate service on port 9999, so it needs to
+    serve those root-level locale files itself.
+    """
+    candidates: list[Path | os.PathLike[Any] | str] = []
+    seen: set[Path] = set()
+
+    def add_candidate(path: Path) -> None:
+        resolved = path.resolve()
+        if resolved.exists() and resolved.is_dir() and resolved not in seen:
+            seen.add(resolved)
+            candidates.append(resolved)
+
+    add_candidate(STATIC_DIR / "locales")
+
+    for base in [Path.cwd(), *Path.cwd().parents]:
+        add_candidate(base / "frontend" / "dist" / "locales")
+        add_candidate(base / "frontend" / "public" / "locales")
+
+    return candidates
+
+
 # =============================================================================
 # Studio API Routes (Health & Field Types)
 # =============================================================================
@@ -389,6 +415,16 @@ def create_app() -> Litestar:
                 html_mode=False,
             )
         )
+    locale_dirs = _get_studio_locale_dirs()
+    if locale_dirs:
+        route_handlers.append(
+            create_static_files_router(
+                path="/locales",
+                directories=locale_dirs,
+                name="studio_locales",
+                html_mode=False,
+            )
+        )
 
     # We mount the serve_studio_root handler which has path="/studio" and "/studio/"
     route_handlers.append(serve_studio_root)

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/cli/deps.py

@@ -229,7 +229,7 @@ async def deps_upgrade_command(
         cyclopts.Parameter(name="package", help="Package to upgrade (omit for all)"),
     ] = None,
     manager: Annotated[
-        str, cyclopts.Parameter(name="--manager", help="uv or pnpm")
+        str, cyclopts.Parameter(name="--manager", help="uv, pnpm, or all")
     ] = "uv",
     provider: Annotated[
         str, cyclopts.Parameter(name="--provider", help="Git provider")
@@ -267,132 +267,126 @@ async def deps_upgrade_command(
         ),
     ] = True,
 ) -> None:
-    """Upgrade a dependency and create a merge request."""
+    if manager not in ["uv", "pnpm", "all"]:
+        CLIConsole().error(f"Unknown manager: {manager}")
+        return
+
     root_path = Path(root) if root else Path.cwd()
     final_token = (
-        token
-        or os.environ.get("CITADEL_CI_TOKEN")
-        or os.environ.get("GITLAB_TOKEN")
-        or ""
+        token or os.environ.get("M_CI_TOKEN") or os.environ.get("GITLAB_TOKEN") or ""
     )
     final_project_id = project_id or os.environ.get("CI_PROJECT_ID") or ""
 
-    # Check for changes in lockfiles and git status
-    uv_lock = root_path / "uv.lock"
-    pnpm_lock = root_path / "pnpm-lock.yaml"
-
-    uv_mtime = uv_lock.stat().st_mtime if uv_lock.exists() else 0
-    pnpm_mtime = pnpm_lock.stat().st_mtime if pnpm_lock.exists() else 0
+    timestamp = datetime.now(UTC).strftime("%Y%m%d%H%M%S")
+    branch_name = f"deps/{manager}-{package or 'all'}-{timestamp}"
 
-    if not package:
-        CLIConsole().info(f"Checking for all outdated packages using {manager}...")
-        if manager == "uv":
-            if latest:
-                run_cmd("uvx uv-upx upgrade run", cwd=root_path)
+    # Create and switch to new branch upfront
+    if not (dry_run or skip_branch):
+        run_cmd("git checkout main", cwd=root_path)
+        run_cmd(f"git branch -D {branch_name}", cwd=root_path, check=False)
+        run_cmd(f"git checkout -b {branch_name}", cwd=root_path)
+
+    managers = ["uv", "pnpm"] if manager == "all" else [manager]
+    any_changes = False
+    commits_made = False
+
+    for m in managers:
+        CLIConsole().info(f"Checking for updates using {m}...")
+        if m == "uv":
+            if not package:
+                if latest:
+                    run_cmd("uvx uv-upx upgrade run", cwd=root_path)
+                else:
+                    run_cmd("uv lock --upgrade", cwd=root_path)
             else:
-                run_cmd("uv lock --upgrade", cwd=root_path)
-        elif manager == "pnpm":
-            # Capture workspace versions before pnpm strips them in v11+
-            ws_versions = _capture_pnpm_workspace_versions(root_path)
-            cmd = "pnpm update -r --latest" if latest else "pnpm update -r"
-            run_cmd(cmd, cwd=root_path)
-            # Restore the explicit workspace versions
-            _restore_pnpm_workspace_versions(ws_versions)
-            run_cmd("pnpm install --no-frozen-lockfile", cwd=root_path)
-            CLIConsole().info("Running pnpm audit fix...")
-            run_cmd("pnpm audit fix", cwd=root_path, check=False)
-        else:  # pragma: no cover
-            CLIConsole().error(f"Unknown manager: {manager}")  # pragma: no cover
-            return  # pragma: no cover
-        package = "all"
-    else:
-        if manager == "uv":
-            run_cmd(f"uv lock --upgrade-package {package}", cwd=root_path)
-        elif manager == "pnpm":
-            ws_versions = _capture_pnpm_workspace_versions(root_path)
-            cmd = (
-                f"pnpm update -r {package} --latest"
-                if latest
-                else f"pnpm update -r {package}"
-            )
-            run_cmd(cmd, cwd=root_path)
-            _restore_pnpm_workspace_versions(ws_versions)
-            run_cmd("pnpm install --no-frozen-lockfile", cwd=root_path)
-        else:  # pragma: no cover
-            CLIConsole().error(f"Unknown manager: {manager}")  # pragma: no cover
-            return  # pragma: no cover
-
-    # Check if anything actually changed
-    new_uv_mtime = uv_lock.stat().st_mtime if uv_lock.exists() else 0
-    new_pnpm_mtime = pnpm_lock.stat().st_mtime if pnpm_lock.exists() else 0
-
-    lock_changed = (new_uv_mtime != uv_mtime) or (new_pnpm_mtime != pnpm_mtime)
-    git_status = run_cmd("git status --short", cwd=root_path)
-
-    if not (git_status or lock_changed):
+                run_cmd(f"uv lock --upgrade-package {package}", cwd=root_path)
+        elif m == "pnpm":
+            if not package:
+                ws_versions = _capture_pnpm_workspace_versions(root_path)
+                cmd = "pnpm update -r --latest" if latest else "pnpm update -r"
+                run_cmd(cmd, cwd=root_path)
+                _restore_pnpm_workspace_versions(ws_versions)
+                run_cmd("pnpm install --no-frozen-lockfile", cwd=root_path)
+                CLIConsole().info("Running pnpm audit fix...")
+                run_cmd("pnpm audit fix", cwd=root_path, check=False)
+            else:
+                ws_versions = _capture_pnpm_workspace_versions(root_path)
+                cmd = (
+                    f"pnpm update -r {package} --latest"
+                    if latest
+                    else f"pnpm update -r {package}"
+                )
+                run_cmd(cmd, cwd=root_path)
+                _restore_pnpm_workspace_versions(ws_versions)
+                run_cmd("pnpm install --no-frozen-lockfile", cwd=root_path)
+
+        git_status = run_cmd("git status --short", cwd=root_path)
+
+        if git_status:
+            any_changes = True
+            if dry_run or skip_branch:
+                if dry_run:
+                    CLIConsole().info(f"[DRY RUN] Detected changes for {m}.")
+                else:
+                    CLIConsole().success(
+                        f"Changes applied for {m} to lockfiles. skipping branch/commit as requested."
+                    )
+            else:
+                # Stage changes
+                run_cmd("git add .", cwd=root_path)
+                if package == "all" or not package:
+                    mr_title = f"fix({m}): update dependencies"
+                    body = f"Automated upgrade of all {m} dependencies.\n\nReleases: *"
+                else:
+                    mr_title = f"fix({m}): update {package}"
+                    body = f"Automated upgrade of {package}.\n\nReleases: *"
+
+                run_cmd(["git", "commit", "-m", mr_title, "-m", body], cwd=root_path)
+                commits_made = True
+                CLIConsole().success(f"Committed updates for {m}.")
+
+    if not any_changes:
+        if not (dry_run or skip_branch):
+            run_cmd("git checkout main", cwd=root_path)
+            run_cmd(f"git branch -D {branch_name}", cwd=root_path, check=False)
         CLIConsole().success(
             f"No changes found after updating {package or 'all'}. Skipping MR."
         )
         return
 
-    # Discovery
-    updated_pkgs = [package] if package != "all" else None
-    projects = _get_workspace_projects(root_path, manager, dirs, updated_pkgs)
-
-    # Resolve scopes from release-config.json for the commit message
-    scopes = _get_scopes_from_projects(root_path, projects)
-
-    # Generate commit message and discover affected projects
-    if package == "all":
-        mr_title = f"fix({manager}): update dependencies"
-        body = f"Automated upgrade of all {manager} dependencies."
-    else:
-        mr_title = f"fix({manager}): update {package}"
-        body = f"Automated upgrade of {package}."
-
-    tags = scopes if scopes else projects
-    if tags:
-        releases = ", ".join(tags)
-        body += f"\n\nReleases: {releases}"
-
-    if dry_run or skip_branch:
-        if dry_run:
-            CLIConsole().info("[DRY RUN] Would create MR:")
-            CLIConsole().info(f"Title: {mr_title}")
-            CLIConsole().info(f"Body:\n{body}\n")
-        else:
-            CLIConsole().success(
-                "Changes applied to lockfiles. skipping branch/commit as requested."
-            )
-        return
-
-    # Create and switch to new branch
-    timestamp = datetime.now(UTC).strftime("%Y%m%d%H%M%S")
-    branch_name = f"deps/{manager}-{package or 'all'}-{timestamp}"
-
-    # Check for existing branch and delete it
-    run_cmd(f"git branch -D {branch_name}", cwd=root_path, check=False)
-    run_cmd(f"git checkout -b {branch_name}", cwd=root_path)
-
-    run_cmd("git add .", cwd=root_path)
-
-    run_cmd(["git", "commit", "-m", mr_title, "-m", body], cwd=root_path)
-
-    if final_token:
+    if commits_made and final_token:
         _push_branch(branch_name, final_token)
 
         if provider == "gitlab" and final_project_id:
             client = GitLabProvider(token=final_token, project_id=final_project_id)
+            if manager == "all":
+                mr_title = "fix(deps): update all dependencies"
+                body = (
+                    "Automated upgrade of both uv and pnpm dependencies.\n\nReleases: *"
+                )
+            elif package == "all" or not package:
+                mr_title = f"fix({manager}): update dependencies"
+                body = (
+                    f"Automated upgrade of all {manager} dependencies.\n\nReleases: *"
+                )
+            else:
+                mr_title = f"fix({manager}): update {package}"
+                body = f"Automated upgrade of {package}.\n\nReleases: *"
+
             await client.create_mr(
                 title=mr_title,
                 description=body,
                 source_branch=branch_name,
                 target_branch="main",
             )
-    else:
+    elif not final_token and any_changes and not (dry_run or skip_branch):
         CLIConsole().error("Skipping push and MR: No token provided.")
 
-    run_cmd("git checkout main", cwd=root_path)
+    if not (dry_run or skip_branch):
+        run_cmd("git checkout main", cwd=root_path)
+        if not commits_made:
+            run_cmd(f"git branch -D {branch_name}", cwd=root_path, check=False)
+            CLIConsole().success("No changes to commit. Deleted temporary branch.")
 
 
 __all__ = ["deps_app", "deps_check_command", "deps_upgrade_command"]

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/cli/new.py

@@ -435,20 +435,10 @@ def new_doctype_command(
         # Use app_root (not CWD) to construct paths
         # This ensures correct paths even when running from subdirectory
         app_namespace_doctypes = app_root / "src" / detected_app / "doctypes"
-        src_doctypes = app_root / "src" / "doctypes"
-
-        if app_namespace_doctypes.exists():
-            # Namespaced structure: src/<app>/doctypes/<doctype>/
-            output_dir = app_namespace_doctypes / snake_name
-            test_output_dir = app_root / "tests" / "doctypes" / snake_name
-        elif src_doctypes.exists():
-            # Legacy flat structure: src/doctypes/<doctype>/
-            output_dir = src_doctypes / snake_name
-            test_output_dir = app_root / "tests" / "doctypes" / snake_name
-        else:
-            # Default: create in namespaced location
-            output_dir = app_namespace_doctypes / snake_name
-            test_output_dir = app_root / "tests" / "doctypes" / snake_name
+
+        # Always output to namespaced location src/<app>/doctypes/
+        output_dir = app_namespace_doctypes / snake_name
+        test_output_dir = app_root / "tests" / "doctypes" / snake_name
     else:
         output_dir = Path.cwd() / snake_name
         test_output_dir = Path.cwd() / "tests" / snake_name

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/cli/release/cli.py

@@ -37,7 +37,7 @@ async def release_auto_command(
     await run_release_orchestration(
         provider=provider,
         token=token
-        or os.environ.get("CITADEL_CI_TOKEN")
+        or os.environ.get("M_CI_TOKEN")
         or os.environ.get("GITLAB_TOKEN")
         or "",
         project_id=project_id or os.environ.get("CI_PROJECT_ID") or "",
@@ -118,7 +118,7 @@ def release_push_command(
     final_host = host or os.environ.get("CI_SERVER_HOST", "gitlab.com")
     final_path = project_path or os.environ.get("CI_PROJECT_PATH", "")
     final_token = (
-        token or os.environ.get("CITADEL_CI_TOKEN") or os.environ.get("GITLAB_TOKEN")
+        token or os.environ.get("M_CI_TOKEN") or os.environ.get("GITLAB_TOKEN")
     )
     if dry_run:
         CLIConsole().info(
@@ -143,7 +143,7 @@ async def release_mr_command(
 ) -> None:
     """Create or update a merge request."""
     final_token = (
-        token or os.environ.get("CITADEL_CI_TOKEN") or os.environ.get("GITLAB_TOKEN")
+        token or os.environ.get("M_CI_TOKEN") or os.environ.get("GITLAB_TOKEN")
     )
     final_project_id = project_id or os.environ.get("CI_PROJECT_ID")
 
@@ -175,7 +175,7 @@ async def release_tag_command(
 ) -> None:
     """Create tags and releases for updated components."""
     final_token = (
-        token or os.environ.get("CITADEL_CI_TOKEN") or os.environ.get("GITLAB_TOKEN")
+        token or os.environ.get("M_CI_TOKEN") or os.environ.get("GITLAB_TOKEN")
     )
     final_project_id = project_id or os.environ.get("CI_PROJECT_ID")
     root_path = Path.cwd()

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/cli/release/graph.py

@@ -92,16 +92,21 @@ class DependencyGraph:
 
             # Find which package owns the sync target
             # A package owns it if its 'paths' contains the base of the sync file path
+            # Map to the package with the longest matching prefix path to avoid nested path conflicts
+            best_target_pkg = None
+            best_pkg_len = -1
             for pkg in self.config.packages:
                 for p_path in pkg.paths:
                     # Normalize paths for comparison
                     norm_sync = Path(sync_file_path).parts
                     norm_pkg = Path(p_path).parts
-                    if norm_sync[: len(norm_pkg)] == norm_pkg:
-                        target_pkg = pkg.name
-                        break
-                if target_pkg:
-                    break
+                    if (
+                        norm_sync[: len(norm_pkg)] == norm_pkg
+                        and len(norm_pkg) > best_pkg_len
+                    ):
+                        best_pkg_len = len(norm_pkg)
+                        best_target_pkg = pkg.name
+            target_pkg = best_target_pkg
 
             if target_pkg and target_pkg != dependency:
                 self.add_edge(dependency, target_pkg)

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/cli/release/orchestrator.py

@@ -310,7 +310,7 @@ def _stage_release_files(
                     valid_files.append(rel_f)
 
         if valid_files:
-            run_cmd(["git", "add", *valid_files])
+            run_cmd(["git", "add", "-f", *valid_files])
 
 
 async def run_release_orchestration(
@@ -369,7 +369,7 @@ async def run_release_orchestration(
 
     if not token:
         raise ValueError(
-            "No Git token found. Please set CITADEL_CI_TOKEN or GITLAB_TOKEN environment variable."
+            "No Git token found. Please set M_CI_TOKEN or GITLAB_TOKEN environment variable."
         )
     project_path = os.environ.get("CI_PROJECT_PATH", "")
     host = os.environ.get("CI_SERVER_HOST", "gitlab.com")
@@ -416,19 +416,21 @@ def lint_release_scopes(config_path: str, root: Path, base: str, head: str) -> N
         line.strip() for line in res_diff.stdout.splitlines() if line.strip()
     ]
 
-    # 2. Map changed files to packages
+    # 2. Map changed files to packages (taking longest matching path to handle nested paths)
     modified_packages = []
-    for pkg in config.packages:
-        pkg_modified = False
-        for path in pkg.paths:
-            norm_path = path.strip("/") + "/"
-            if any(
-                f.startswith(norm_path) or f == path.strip("/") for f in changed_files
-            ):
-                pkg_modified = True
-                break
-        if pkg_modified:
-            modified_packages.append(pkg)
+    for f in changed_files:
+        best_pkg = None
+        best_path_len = -1
+        for pkg in config.packages:
+            for path in pkg.paths:
+                norm_path = path.strip("/")
+                if (f == norm_path or f.startswith(norm_path + "/")) and len(
+                    norm_path
+                ) > best_path_len:
+                    best_path_len = len(norm_path)
+                    best_pkg = pkg
+        if best_pkg and best_pkg not in modified_packages:
+            modified_packages.append(best_pkg)
 
     if not modified_packages:
         CLIConsole().success("✅ No packages modified in this range.")

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/routers/doctypes.py

@@ -67,7 +67,9 @@ class DocTypeController(Controller):
                     ],
                     meta=final_meta,
                 )
-        raise NotFoundException(f"DocType '{name}' not found")  # pragma: no cover
+        from framework_m_core.interfaces.i18n import t
+
+        raise NotFoundException(str(t("DocType '{name}' not found").format(name=name)))
 
     @post("/doctypes/{name:str}")
     async def create_or_update_doctype(
@@ -126,4 +128,6 @@ class DocTypeController(Controller):
                         message=f"DocType '{name}' deleted successfully",  # pragma: no cover
                         file_path=str(file_path),  # pragma: no cover
                     )  # pragma: no cover
-        raise NotFoundException(f"DocType '{name}' not found")  # pragma: no cover
+        from framework_m_core.interfaces.i18n import t
+
+        raise NotFoundException(str(t("DocType '{name}' not found").format(name=name)))

{framework_m_studio-0.18.1 → framework_m_studio-0.18.2}/src/framework_m_studio/routers/print.py

@@ -28,7 +28,15 @@ class PrintController(Controller):
     ) -> PrintLayoutResponse:
         target = print_service.get_print_repo_path() / doctype / f"{template_name}.html"
         if not target.exists():
-            raise NotFoundException(f"Print template '{template_name}' not found.")
+            from framework_m_core.interfaces.i18n import t
+
+            raise NotFoundException(
+                str(
+                    t("Print template '{template_name}' not found.").format(
+                        template_name=template_name
+                    )
+                )
+            )
         return PrintLayoutResponse(
             doctype=doctype,
             template_name=template_name,