wip

Author: Claude Dev

.claude/skills/mendix/generate-domain-model.md

@@ -201,7 +201,7 @@ create persistent entity Module.Photo (
 ) extends System.Image;
 ```
 
-**Note:** `mxcli syntax entity` output may show EXTENDS after `)` — this is misleading. Always place EXTENDS before `(`.
+**Note:** EXTENDS must always be placed **before** the opening parenthesis — never after `)`. The `mxcli syntax` reference now correctly shows `[EXTENDS Module.Parent]` in the primary template before `(`.
 
 #### System Attributes (Auditing)
 

Makefile

@@ -54,7 +54,7 @@ TEST_PARALLEL ?= $(_85PCT)
 # Hard ceiling on how long the full test suite may run.
 TEST_TIMEOUT ?= 180s
 
-.PHONY: build mdlrun build-local install-local build-debug release release-launcher release-daemon release-local-bins clean test _test-inner test-mdl report report-bench report-reset-baseline bench-baseline grammar sync-skills sync-commands sync-lint-rules sync-changelog sync-examples sync-all docs documentation docs-site docs-serve source-tree sbom sbom-report lint lint-go fmt vet update-helpdesk-golden test-helpdesk-regression setup install install-daemon install-global test-section-check update-snapshots validate-snapshots validate-academy-capstone test-integration-profiled test-profile-check test-profile-record
+.PHONY: build mdlrun build-local install-local build-debug release release-mxcli release-win-amd64 release-launcher release-daemon release-local-bins clean test _test-inner test-mdl report report-bench report-reset-baseline bench-baseline grammar sync-skills sync-commands sync-lint-rules sync-changelog sync-examples sync-all docs documentation docs-site docs-serve source-tree sbom sbom-report lint lint-go fmt vet update-helpdesk-golden test-helpdesk-regression setup install install-daemon install-global test-section-check update-snapshots validate-snapshots validate-academy-capstone test-integration-profiled test-profile-check test-profile-record
 
 setup:
 	git config core.hooksPath .githooks
@@ -196,6 +196,12 @@ release-mxcli: sync-all
 	CGO_ENABLED=0 GOOS=windows GOARCH=arm64 go build $(RELEASE_LDFLAGS) -trimpath -o $(BUILD_DIR)/$(BINARY_NAME)-windows-arm64.exe $(CMD_PATH)
 	@echo "mxcli binaries built in $(BUILD_DIR)/."
 
+# Build mxcli for Windows amd64 only.
+release-win-amd64: sync-all
+	@mkdir -p $(BUILD_DIR)
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build $(RELEASE_LDFLAGS) -trimpath -o $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe $(CMD_PATH)
+	@echo "Built $(BUILD_DIR)/$(BINARY_NAME)-windows-amd64.exe"
+
 # Run tests. TEST_P/TEST_PARALLEL default to 85% nproc.
 # Uses nice(1) — NOT cpulimit(1), whose SIGSTOP/SIGCONT breaks Go's runtime.
 test: test-showcase

cmd/mxcli/cmd_new.go

@@ -7,7 +7,10 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"runtime"
+	"sort"
+	"strings"
 
 	"github.com/mendixlabs/mxcli/cmd/mxcli/docker"
 	"github.com/spf13/cobra"
@@ -28,13 +31,26 @@ Examples:
   mxcli new MyApp
   mxcli new MyApp --version 11.8.0
   mxcli new MyApp --version 10.24.0 --output-dir ./projects/my-app
+  mxcli new --list-versions
 `,
-	Args: cobra.ExactArgs(1),
+	Args: cobra.MaximumNArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
+		listVersions, _ := cmd.Flags().GetBool("list-versions")
+		if listVersions {
+			listMendixVersions()
+			return
+		}
+
+		if len(args) < 1 {
+			fmt.Fprintln(os.Stderr, "Error: app name is required")
+			fmt.Fprintln(os.Stderr, "Usage: mxcli new <app-name> [--version X.Y.Z]")
+			os.Exit(1)
+		}
 		appName := args[0]
 		mendixVersion, _ := cmd.Flags().GetString("version")
 		outputDir, _ := cmd.Flags().GetString("output-dir")
 		skipInit, _ := cmd.Flags().GetBool("skip-init")
+		force, _ := cmd.Flags().GetBool("force")
 
 		if mendixVersion == "" {
 			fmt.Fprintln(os.Stderr, "Error: --version is required (e.g., --version 11.8.0)")
@@ -53,8 +69,13 @@ Examples:
 
 		// Check if directory already exists and has content
 		if entries, err := os.ReadDir(absDir); err == nil && len(entries) > 0 {
-			fmt.Fprintf(os.Stderr, "Error: directory %s already exists and is not empty\n", absDir)
-			os.Exit(1)
+			if force {
+				fmt.Printf("  Directory %s is not empty (--force), proceeding...\n", absDir)
+			} else {
+				fmt.Fprintf(os.Stderr, "Error: directory %s already exists and is not empty\n", absDir)
+				fmt.Fprintf(os.Stderr, "  Use --force to override, or choose a different --output-dir\n")
+				os.Exit(1)
+			}
 		}
 
 		// Step 1: Resolve mx binary.
@@ -154,6 +175,96 @@ Examples:
 	},
 }
 
+// listMendixVersions lists available Mendix versions from all sources.
+func listMendixVersions() {
+	all := map[string]string{} // version → source label
+	add := func(version, source string) {
+		if version != "" {
+			all[version] = source
+		}
+	}
+
+	// 1. Cached downloads (~/.mxcli/mxbuild/<version>/)
+	for _, v := range allCachedMxBuildVersions() {
+		add(v, "cached download")
+	}
+
+	// 2. Windows: C:\Program Files\Mendix\<version>\modeler\mxbuild.exe
+	if runtime.GOOS == "windows" {
+		for _, env := range []string{"PROGRAMFILES", "PROGRAMW6432", "PROGRAMFILES(X86)"} {
+			if d := os.Getenv(env); d != "" {
+				entries, _ := os.ReadDir(filepath.Join(d, "Mendix"))
+				for _, e := range entries {
+					if e.IsDir() {
+						if _, err := os.Stat(filepath.Join(d, "Mendix", e.Name(), "modeler", "mxbuild.exe")); err == nil {
+							add(e.Name(), "Studio Pro")
+						}
+					}
+				}
+			}
+		}
+		if sd := os.Getenv("SystemDrive"); sd != "" {
+			root := sd + string(os.PathSeparator)
+			for _, dir := range []string{"Program Files", "Program Files (x86)"} {
+				entries, _ := os.ReadDir(filepath.Join(root, dir, "Mendix"))
+				for _, e := range entries {
+					if e.IsDir() {
+						if _, err := os.Stat(filepath.Join(root, dir, "Mendix", e.Name(), "modeler", "mxbuild.exe")); err == nil {
+							add(e.Name(), "Studio Pro")
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// 3. macOS: /Applications/Mendix Studio Pro *.app
+	if runtime.GOOS == "darwin" {
+		matches, _ := filepath.Glob("/Applications/Mendix Studio Pro *.app")
+		re := regexp.MustCompile(`^Mendix Studio Pro (\d+\.\d+\.\d+)`)
+		for _, match := range matches {
+			base := strings.TrimSuffix(filepath.Base(match), ".app")
+			if m := re.FindStringSubmatch(base); m != nil {
+				add(m[1], "Studio Pro")
+			}
+		}
+	}
+
+	if len(all) == 0 {
+		fmt.Println("No Mendix versions found.")
+		fmt.Println()
+		fmt.Println("To find available Mendix versions, visit:")
+		fmt.Println("  https://docs.mendix.com/releasenotes/studio-pro/")
+		fmt.Println()
+		fmt.Println("Usage:")
+		fmt.Println("  mxcli new MyApp --version X.Y.Z")
+		fmt.Println()
+		fmt.Println("mxcli automatically downloads the required version on first use.")
+		return
+	}
+
+	var versions []string
+	for v := range all {
+		versions = append(versions, v)
+	}
+	sort.Slice(versions, func(i, j int) bool {
+		// Prefer newer versions first (simple semver comparison by string).
+		// This works for X.Y.Z format when all are the same length.
+		return versions[i] > versions[j]
+	})
+
+	fmt.Println("Available Mendix versions:")
+	for _, v := range versions {
+		fmt.Printf("  %-12s  (%s)\n", v, all[v])
+	}
+	fmt.Println()
+	fmt.Println("Usage:")
+	fmt.Println("  mxcli new MyApp --version X.Y.Z")
+	fmt.Println()
+	fmt.Println("Cached downloads are stored in ~/.mxcli/mxbuild/<version>/.")
+	fmt.Println("mxcli automatically downloads the required version on first use.")
+}
+
 // cleanupDuplicateLocaleFiles removes duplicate locale files that mx create-project
 // generates in themesource/atlas_core/. MxBuild crashes when multiple translation.json
 // files map to the same locale key (e.g., "en-US").
@@ -201,9 +312,11 @@ func cleanupDuplicateLocaleFiles(projectDir string) int {
 }
 
 func init() {
+	newCmd.Flags().Bool("list-versions", false, "List cached Mendix versions and show how to find available ones")
 	newCmd.Flags().String("version", "", "Mendix version (e.g., 11.8.0) — required")
 	newCmd.Flags().String("output-dir", "", "Output directory (default: ./<app-name>)")
 	newCmd.Flags().Bool("skip-init", false, "Skip AI tooling initialization (mxcli init)")
+	newCmd.Flags().Bool("force", false, "Allow creating project in a non-empty directory")
 
 	rootCmd.AddCommand(newCmd)
 }

cmd/mxcli/init_claudemd.go

@@ -289,6 +289,25 @@ func generateClaudeMD(projectName, mprFile string, inDevcontainer bool) string {
 	w(bt3 + "bash\n./mxcli check script.mdl -p " + mprPath + " --references\n" + bt3 + "\n\n")
 	w("The reference checker is smart - it automatically skips references to objects that are created within the same script.\n\n")
 
+	// ── Build & Run ──────────────────────────────────────────────────
+	w("## Build & Run the App\n\n")
+	w("After making MDL changes, build and run the app locally (no Docker required):\n\n")
+	w(bt3 + "bash\n")
+	w("# Build PAD package (compiles SCSS, runs mxbuild)\n./mxcli build -p " + mprPath + "\n\n")
+	w("# Start the app (HSQLDB embedded)\n./mxcli run -p " + mprPath + " --admin-password MyPassword\n")
+	w(bt3 + "\n\n")
+	w("The app is available at **http://localhost:8080**. Login: " + bt + "MxAdmin" + bt + " / " + bt + "MyPassword" + bt + ".\n\n")
+	w("### Hot Reload\n\n")
+	w("After applying MDL changes while the app is running, use reload (no restart needed):\n\n")
+	w(bt3 + "bash\n")
+	w("./mxcli exec changes.mdl -p " + mprPath + "     # Apply MDL changes\n")
+	w("./mxcli reload -p " + mprPath + "                # Build + hot reload (~55s)\n")
+	w("./mxcli reload -p " + mprPath + " --model-only   # Reload only (~100ms)\n")
+	w(bt3 + "\n\n")
+	w("### Use PostgreSQL (instead of HSQLDB)\n\n")
+	w(bt3 + "bash\n./mxcli run -p " + mprPath + " --db postgres://user:pass@localhost:5432/mendix\n" + bt3 + "\n\n")
+	w("See the " + bt + "run-app" + bt + " skill for Docker-based workflows and detailed options.\n\n")
+
 	// ── Linting ─────────────────────────────────────────────────────
 	w("## Linting\n\n")
 	w("Check your project for common issues:\n\n")

cmd/mxcli/setup.go

@@ -285,18 +285,19 @@ Examples:
 
 // setupCompletionsCmd installs shell completion scripts.
 var setupCompletionsCmd = &cobra.Command{
-	Use:       "completions [bash|zsh|fish]",
+	Use:       "completions [bash|zsh|fish|powershell]",
 	Short:     "Install shell completion scripts for bash/zsh/fish/powershell",
 	Args:      cobra.MaximumNArgs(1),
-	ValidArgs: []string{"bash", "zsh", "fish"},
+	ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
 	RunE: func(cmd *cobra.Command, args []string) error {
 		shell := detectShell()
 		if len(args) > 0 {
 			shell = args[0]
 		}
+
 		path := completionPath(shell)
 		if path == "" {
-			return fmt.Errorf("unsupported shell: %s (try: mxcli setup completions bash|zsh|fish, or mxcli completion bash|zsh|fish|powershell)", shell)
+			return fmt.Errorf("unsupported shell: %s (supported: bash, zsh, fish, powershell)", shell)
 		}
 
 		dir := filepath.Dir(path)
@@ -323,6 +324,15 @@ var setupCompletionsCmd = &cobra.Command{
 			if err := rootCmd.GenFishCompletion(f, true); err != nil {
 				return err
 			}
+		case "powershell":
+			if err := rootCmd.GenPowerShellCompletionWithDesc(f); err != nil {
+				return err
+			}
+			if msg, err := installPowerShellCompletion(path); err != nil {
+				fmt.Fprintf(os.Stderr, "  Warning: %v\n", err)
+			} else if msg != "" {
+				fmt.Fprint(os.Stdout, msg)
+			}
 		}
 		fmt.Fprintf(os.Stdout, "Shell completions installed: %s\n", path)
 		fmt.Fprintf(os.Stdout, "Restart your shell or run: source %s\n", path)
@@ -358,8 +368,64 @@ func completionPath(shell string) string {
 		return filepath.Join(home, ".zsh", "completions", "_mxcli")
 	case "fish":
 		return filepath.Join(home, ".config", "fish", "completions", "mxcli.fish")
+	case "powershell":
+		return filepath.Join(home, ".config", "powershell", "completions", "mxcli.ps1")
 	}
 	return ""
+	}
+
+// installPowerShellCompletion adds a dot-source line to the PowerShell profile
+// to load the completion script. Idempotent: skips if the marker already exists.
+func installPowerShellCompletion(completionPath string) (string, error) {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return "", fmt.Errorf("find home dir: %w", err)
+	}
+
+	// Determine profile path: prefer PowerShell 7, fall back to 5.1 on Windows.
+	profilePaths := []string{
+		filepath.Join(home, ".config", "powershell", "Microsoft.PowerShell_profile.ps1"),
+	}
+	if runtime.GOOS == "windows" {
+		profilePaths = []string{
+			filepath.Join(home, "Documents", "PowerShell", "Microsoft.PowerShell_profile.ps1"),
+			filepath.Join(home, "Documents", "WindowsPowerShell", "Microsoft.PowerShell_profile.ps1"),
+		}
+	}
+
+	dotSourceLine := ". \"" + completionPath + "\""
+	marker := "# mxcli completion"
+
+	for _, profilePath := range profilePaths {
+		// Read existing profile.
+		data, err := os.ReadFile(profilePath)
+		if err != nil {
+			if !os.IsNotExist(err) {
+				continue // permission error, try next path
+			}
+			// Profile doesn't exist — create directory.
+			if err := os.MkdirAll(filepath.Dir(profilePath), 0755); err != nil {
+				continue
+			}
+		} else if strings.Contains(string(data), marker) {
+			// Already installed — skip silently for all paths.
+			return "", nil
+		}
+
+		// Append with marker block.
+		block := "\n" + marker + "\n" + dotSourceLine + "\n# mxcli completion (end)\n"
+		f, err := os.OpenFile(profilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+		if err != nil {
+			continue
+		}
+		if _, err := f.WriteString(block); err != nil {
+			f.Close()
+			continue
+		}
+		f.Close()
+		return fmt.Sprintf("  Added to PowerShell profile: %s\n", profilePath), nil
+	}
+	return "", nil
 }
 
 func init() {

cmd/mxcli/syntax/features_domain_model.go

@@ -24,7 +24,7 @@ func init() {
 			"entity", "create entity", "persistent", "non-persistent",
 			"generalization", "extends", "event handler", "attribute",
 		},
-		Syntax:  "CREATE PERSISTENT ENTITY Module.Name (\n  Attr: Type [constraints],\n  ...\n) [INDEX (attr1)] [COMMENT 'text'];\n\nCREATE NON_PERSISTENT ENTITY Module.Name (...);\n\nCREATE PERSISTENT ENTITY Module.Name EXTENDS Module.Parent (...);",
+		Syntax:  "CREATE PERSISTENT ENTITY Module.Name [EXTENDS Module.Parent] (\n  Attr: Type [constraints],\n  ...\n) [INDEX (attr1)] [COMMENT 'text'];\n\nCREATE NON_PERSISTENT ENTITY Module.Name (...);\n\nCREATE PERSISTENT ENTITY Module.Name EXTENDS Module.Parent (...);",
 		Example: "CREATE PERSISTENT ENTITY MyModule.Customer (\n  Name: String(100) NOT NULL ERROR 'Name is required',\n  Email: String(200) UNIQUE,\n  Balance: Decimal DEFAULT 0,\n  IsActive: Boolean DEFAULT true,\n  Status: Enumeration(MyModule.CustomerType)\n)\nINDEX (Email)\nCOMMENT 'Stores customer information';",
 		SeeAlso: []string{"domain-model.entity.create", "domain-model.entity.alter", "domain-model.entity.attributes"},
 	})
@@ -37,7 +37,7 @@ func init() {
 			"non-persistent", "extends", "generalization",
 			"index", "event handler", "before commit", "after commit",
 		},
-		Syntax:  "CREATE PERSISTENT ENTITY Module.Name (\n  Attr: Type [NOT NULL [ERROR 'msg']] [UNIQUE [ERROR 'msg']] [DEFAULT val],\n  ...\n)\n[INDEX (attr1, attr2)]\n[ON BEFORE|AFTER CREATE|COMMIT|DELETE|ROLLBACK CALL Module.MF [RAISE ERROR]]\n[COMMENT 'text'];\n\nCREATE NON_PERSISTENT ENTITY Module.Name (...);\nCREATE PERSISTENT ENTITY Module.Name EXTENDS Module.Parent (...);",
+		Syntax:  "CREATE PERSISTENT ENTITY Module.Name [EXTENDS Module.Parent] (\n  Attr: Type [NOT NULL [ERROR 'msg']] [UNIQUE [ERROR 'msg']] [DEFAULT val],\n  ...\n)\n[INDEX (attr1, attr2)]\n[ON BEFORE|AFTER CREATE|COMMIT|DELETE|ROLLBACK CALL Module.MF [RAISE ERROR]]\n[COMMENT 'text'];\n\nCREATE NON_PERSISTENT ENTITY Module.Name (...);\nCREATE PERSISTENT ENTITY Module.Name EXTENDS Module.Parent (...);",
 		Example: "-- Persistent with constraints and index\nCREATE PERSISTENT ENTITY Shop.Order (\n  OrderNumber: String(20) NOT NULL,\n  Total: Decimal DEFAULT 0,\n  CreatedAt: DateTime\n)\nINDEX (OrderNumber)\nON BEFORE COMMIT CALL Shop.ValidateOrder($currentObject) RAISE ERROR;\n\n-- With generalization\nCREATE PERSISTENT ENTITY Shop.ProductImage EXTENDS System.Image (\n  Caption: String(200)\n);",
 		SeeAlso: []string{"domain-model.entity.alter", "domain-model.entity.attributes"},
 	})