@topy-ai/maggie 0.7.36 → 0.7.38

package/bundled-tools/clis/maggie_dash.py

@@ -12,6 +12,7 @@ from __future__ import annotations
 import argparse
 import json
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -145,9 +146,137 @@ def manifest_root_file_pairs(source: Path, manifest: dict[str, object], root: Pa
     return pairs
 
 
-def command_install_diff(source: Path, manifest: dict[str, object], target: Path, compare_dir: Path | None, force: bool) -> dict[str, object]:
+def manifest_workspace_file_pairs(source: Path, manifest: dict[str, object], root: Path) -> list[tuple[Path, Path, Path]]:
+    """Return additional installable workspaces such as ./_maggie/booking."""
+    pairs: list[tuple[Path, Path, Path]] = []
+    for item in manifest.get("workspaces", []):
+        if not isinstance(item, dict):
+            raise RuntimeError("MaggieDash workspaces entries must be objects")
+        source_relative = Path(str(item.get("source", "")))
+        target_relative = Path(str(item.get("target", "")))
+        if not source_relative.parts or not target_relative.parts:
+            raise RuntimeError("MaggieDash workspaces entries require source and target")
+        if source_relative.is_absolute() or target_relative.is_absolute() or ".." in source_relative.parts or ".." in target_relative.parts:
+            raise RuntimeError("unsafe MaggieDash workspace path")
+        source_item = source / source_relative
+        if not source_item.is_dir():
+            raise RuntimeError(f"MaggieDash workspace source is missing: {source_relative}")
+        for path in sorted(source_item.rglob("*")):
+            if path.is_file():
+                child = path.relative_to(source_item)
+                pairs.append((path, root / target_relative / child, source_relative / child))
+    return pairs
+
+
+def detect_host_framework(root: Path, requested: str) -> str | None:
+    """Resolve the optional host scaffold without guessing unsupported apps."""
+    if requested == "none":
+        return None
+    if requested != "auto":
+        return requested
+    package = root / "package.json"
+    try:
+        value = json.loads(package.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        value = {}
+    dependencies = set((value.get("dependencies") or {})) | set((value.get("devDependencies") or {}))
+    if "astro" in dependencies or any(root.glob("src/**/*.astro")):
+        return "astro"
+    return None
+
+
+ASTRO_MIDDLEWARE_MARKER = "maggie-auto-rewrite-v1"
+
+
+def merge_astro_middleware(path: Path) -> dict[str, object]:
+    """Add the stable Maggie paths to an existing conventional Astro middleware.
+
+    The installer must preserve host-owned auth/redirect logic. This narrow
+    merge only handles the common `onRequest = defineMiddleware((context,
+    next) => { ... })` shape and is idempotent. Unknown middleware shapes are
+    reported to the caller instead of being rewritten heuristically.
+    """
+    try:
+        content = path.read_text(encoding="utf-8")
+    except OSError as error:
+        return {"status": "manual", "reason": f"could not read {path}: {error}"}
+    if ASTRO_MIDDLEWARE_MARKER in content:
+        return {"status": "unchanged", "reason": "Maggie rewrite block already present"}
+    required_patterns = ("/_maggie/booking", "/_maggie/login", "/_maggie/register", "/_maggie/reset-password")
+    if all(pattern in content for pattern in required_patterns) and "context.rewrite" in content:
+        return {"status": "unchanged", "reason": "existing middleware already exposes Maggie paths"}
+    match = re.search(
+        r"export\s+const\s+onRequest\s*=\s*defineMiddleware\(\s*\(\s*context\s*,\s*next\s*\)\s*=>\s*\{",
+        content,
+    )
+    if not match:
+        return {"status": "manual", "reason": "middleware is not the supported defineMiddleware((context, next) => {}) shape"}
+    block = r'''
+  // maggie-auto-rewrite-v1: generated by `maggie booking install`; keep host auth below.
+  const maggieRewrites: Array<[RegExp, (path: string) => string]> = [
+    [/^\/_maggie\/login\/?$/, () => "/maggie/login"],
+    [/^\/_maggie\/register\/?$/, () => "/maggie/register"],
+    [/^\/_maggie\/reset-password\/?$/, () => "/maggie/reset-password"],
+    [/^\/_maggie\/booking\/book\/?$/, () => "/maggie/booking/book"],
+    [/^\/_maggie\/booking(\/.*)?$/, (path) => "/maggie/booking" + path.replace(/^\/_maggie\/booking/, "")],
+  ];
+  for (const [pattern, target] of maggieRewrites) {
+    if (pattern.test(context.url.pathname)) {
+      const destination = new URL(target(context.url.pathname), context.url);
+      destination.search = context.url.search;
+      return context.rewrite(destination.pathname + destination.search);
+    }
+  }
+'''
+    merged = content[:match.end()] + block + content[match.end():]
+    try:
+        path.write_text(merged, encoding="utf-8")
+    except OSError as error:
+        return {"status": "manual", "reason": f"could not update {path}: {error}"}
+    return {"status": "updated", "reason": "inserted idempotent Maggie rewrite block"}
+
+
+def manifest_host_file_pairs(source: Path, manifest: dict[str, object], root: Path, framework: str | None) -> list[tuple[Path, Path, Path]]:
+    """Return non-destructive host files for a declared framework adapter."""
+    if not framework:
+        return []
+    bootstrap = manifest.get("hostBootstrap", {})
+    if not isinstance(bootstrap, dict):
+        return []
+    spec = bootstrap.get(framework)
+    if not isinstance(spec, dict):
+        raise RuntimeError(
+            f"MaggieDash distribution at {source} does not provide a {framework} host bootstrap; "
+            f"release a source with manifest.hostBootstrap.{framework} or pass --source to a released checkout"
+        )
+    source_relative = Path(str(spec.get("source", "")))
+    target_relative = Path(str(spec.get("target", ".")))
+    if not source_relative.parts or source_relative.is_absolute() or ".." in source_relative.parts:
+        raise RuntimeError("unsafe MaggieDash host bootstrap source")
+    if target_relative.as_posix() not in {".", ""} and (target_relative.is_absolute() or ".." in target_relative.parts):
+        raise RuntimeError("unsafe MaggieDash host bootstrap target")
+    source_item = source / source_relative
+    if not source_item.is_dir():
+        raise RuntimeError(f"MaggieDash host bootstrap source is missing: {source_relative}")
+    pairs: list[tuple[Path, Path, Path]] = []
+    for path in sorted(source_item.rglob("*")):
+        if path.is_file():
+            child = path.relative_to(source_item)
+            # A deployment config is host-owned. The default Node config is
+            # useful for a blank Astro project, but adding a second config to
+            # a host that already has astro.config.ts/cloudflare/etc. can make
+            # Astro ambiguous or change its deployment target.
+            if framework == "astro" and child.name == "astro.config.mjs" and any(root.glob("astro.config.*")):
+                continue
+            pairs.append((path, root / target_relative / child, source_relative / child))
+    return pairs
+
+
+def command_install_diff(source: Path, manifest: dict[str, object], target: Path, compare_dir: Path | None, force: bool, host_pairs: list[tuple[Path, Path, Path]] | None = None, host_framework: str | None = None) -> dict[str, object]:
     pairs = manifest_file_pairs(source, manifest, target)
     root_pairs = manifest_root_file_pairs(source, manifest, target.parents[1])
+    workspace_pairs = manifest_workspace_file_pairs(source, manifest, target.parents[1])
+    host_pairs = host_pairs or []
     files: list[dict[str, str]] = []
     source_relative = {relative for _, _, relative in pairs}
     for source_file, destination, relative in pairs:
@@ -172,6 +301,24 @@ def command_install_diff(source: Path, manifest: dict[str, object], target: Path
         else:
             action = "update" if force else "preserve"
         files.append({"path": str(relative), "action": action, "comparePath": str(compare_file)})
+    for source_file, destination, relative in workspace_pairs:
+        compare_file = destination
+        if not compare_file.exists():
+            action = "add"
+        elif compare_file.read_bytes() == source_file.read_bytes():
+            action = "unchanged"
+        else:
+            action = "update" if force else "preserve"
+        files.append({"path": str(relative), "action": action, "comparePath": str(compare_file)})
+    for source_file, destination, relative in host_pairs:
+        compare_file = destination
+        if not compare_file.exists():
+            action = "add"
+        elif compare_file.read_bytes() == source_file.read_bytes():
+            action = "unchanged"
+        else:
+            action = "update" if force else "preserve"
+        files.append({"path": f"host/{host_framework}/{relative}", "action": action, "comparePath": str(compare_file)})
     if compare_dir and compare_dir.exists():
         for existing in sorted(compare_dir.rglob("*")):
             if not existing.is_file():
@@ -183,13 +330,14 @@ def command_install_diff(source: Path, manifest: dict[str, object], target: Path
     summary: dict[str, int] = {}
     for item in files:
         summary[item["action"]] = summary.get(item["action"], 0) + 1
-    return {"status": "dry-run", "version": manifest.get("version"), "target": str(target), "compareDir": str(compare_dir) if compare_dir else None, "summary": summary, "files": files}
+    return {"status": "dry-run", "version": manifest.get("version"), "target": str(target), "hostFramework": host_framework, "compareDir": str(compare_dir) if compare_dir else None, "summary": summary, "files": files}
 
 
 def command_install(args: argparse.Namespace) -> int:
     if not args.dry_run and not args.diff:
         require_confirm(args)
     root = project_root(args)
+    host_framework = detect_host_framework(root, args.host)
     source_value = args.source or os.environ.get("MAGGIE_DASH_SOURCE") or DEFAULT_DASH_SOURCE
     ref = args.ref
     target_relative = Path(args.target)
@@ -222,6 +370,7 @@ def command_install(args: argparse.Namespace) -> int:
             raise RuntimeError("unsupported MaggieDash distribution schema")
         if manifest.get("target") != "_maggie/admin" and args.target == "_maggie/admin":
             raise RuntimeError("MaggieDash manifest target is not ./_maggie/admin")
+        host_pairs = manifest_host_file_pairs(source, manifest, root, host_framework)
         compare_dir = None
         if args.existing_dir:
             compare_dir = Path(args.existing_dir).expanduser()
@@ -229,7 +378,7 @@ def command_install(args: argparse.Namespace) -> int:
                 compare_dir = root / compare_dir
             compare_dir = compare_dir.resolve()
         if args.dry_run or args.diff:
-            emit(command_install_diff(source, manifest, target, compare_dir, args.force))
+            emit(command_install_diff(source, manifest, target, compare_dir, args.force, host_pairs, host_framework))
             return 0
         installed: list[str] = []
         preserved: list[str] = []
@@ -264,6 +413,32 @@ def command_install(args: argparse.Namespace) -> int:
                 destination.parent.mkdir(parents=True, exist_ok=True)
                 shutil.copy2(source_file, destination)
                 installed.append(str(destination))
+        for source_file, destination, _ in manifest_workspace_file_pairs(source, manifest, root):
+            if destination.exists() and not args.force:
+                preserved.append(str(destination))
+            else:
+                destination.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(source_file, destination)
+                installed.append(str(destination))
+        host_installed: list[str] = []
+        host_preserved: list[str] = []
+        host_updated: list[str] = []
+        host_warnings: list[str] = []
+        for source_file, destination, _ in host_pairs:
+            if destination.exists() and not args.force:
+                host_preserved.append(str(destination))
+            else:
+                destination.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(source_file, destination)
+                host_installed.append(str(destination))
+        if host_framework == "astro":
+            middleware = root / "src" / "middleware.ts"
+            if middleware.exists():
+                merge_result = merge_astro_middleware(middleware)
+                if merge_result.get("status") == "updated":
+                    host_updated.append(str(middleware))
+                elif merge_result.get("status") == "manual":
+                    host_warnings.append(str(merge_result.get("reason")))
         state = {
             "schemaVersion": "maggiedash-install.v1",
             "status": "installed",
@@ -274,13 +449,19 @@ def command_install(args: argparse.Namespace) -> int:
             "target": str(target),
             "installed": sorted(set(installed)),
             "preserved": sorted(set(preserved)),
+            "hostFramework": host_framework,
+            "hostBootstrap": "installed" if host_framework else "skipped",
+            "hostInstalled": sorted(set(host_installed)),
+            "hostPreserved": sorted(set(host_preserved)),
+            "hostUpdated": sorted(set(host_updated)),
+            "hostWarnings": sorted(set(host_warnings)),
             "updatedAt": utc_now(),
         }
         state_path = root / ".maggie" / "dash-install.json"
         state_path.parent.mkdir(parents=True, exist_ok=True)
         state_path.write_text(json.dumps(state, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
-        emit({"status": "installed", "version": manifest.get("version"), "target": str(target), "installed": len(set(installed)), "preserved": len(set(preserved)), "state": str(state_path)})
-        return 0
+        emit({"status": "needs-attention" if host_warnings else "installed", "version": manifest.get("version"), "target": str(target), "hostFramework": host_framework, "hostInstalled": len(set(host_installed)), "hostPreserved": len(set(host_preserved)), "hostUpdated": len(set(host_updated)), "hostWarnings": host_warnings, "installed": len(set(installed)), "preserved": len(set(preserved)), "state": str(state_path)})
+        return 1 if host_warnings else 0
     finally:
         if temporary is not None:
             temporary.cleanup()
@@ -630,6 +811,7 @@ def parser() -> argparse.ArgumentParser:
     install.add_argument("--source", help="local checkout or Git URL; defaults to MaggieDash repository")
     install.add_argument("--ref", default="main", help="Git ref when installing from a remote source")
     install.add_argument("--target", default="_maggie/admin", help="installation target relative to the project")
+    install.add_argument("--host", choices=["auto", "astro", "none"], default="auto", help="install the matching non-destructive host scaffold (default: auto-detect Astro)")
     install.add_argument("--force", action="store_true", help="replace existing dashboard files")
     install.add_argument("--dry-run", action="store_true", help="show the install plan without writing files")
     install.add_argument("--diff", action="store_true", help="show the install plan and compare with an existing workspace")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@topy-ai/maggie",
-  "version": "0.7.36",
+  "version": "0.7.38",
   "description": "Install and manage Maggie Skills for AI coding agents",
   "license": "MIT",
   "type": "module",