refactor(executor): migrate helpers to free functions, add perf report, fix capstone validation

- cmd_exec.go: add performance report output after script execution
- flowbuilder_*, helpers, hierarchy: migrate Executor methods to free
  functions taking *ExecContext
- cmd_microflows_create_v2: adjust microflow creation flow
- cmd_security_write_page_v2: update page grant paths
- hierarchy.go: add 26 lines of hierarchy caching logic
- scripts/validate-academy-capstone.sh: update capstone validation

Author: Test

academy/zh/capstone-helpdesk/参考实现/08-workflow.mdl

@@ -299,9 +299,11 @@ create or modify microflow HD.ACT_StartEscalation_WF_FromObject
 
 -- ============================================================
 -- 在工单详情页添加"发起升级"按钮
+-- 幂等安全：先删除已有按钮再插入，避免重复执行时的冲突
 -- ============================================================
 
 alter page HD.Ticket_Detail {
+  drop widget btnEscalate;
   insert after btnComment {
     actionbutton btnEscalate (
       caption:     'Escalate',

cmd/mxcli/cmd_exec.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"time"
 
 	"github.com/mendixlabs/mxcli/mdl/executor"
 	"github.com/mendixlabs/mxcli/mdl/visitor"
@@ -68,13 +69,18 @@ Example:
 			return fmt.Errorf("parse failed with %d error(s)", len(errs))
 		}
 
+		progStart := time.Now()
 		if err := exec.ExecuteProgram(prog); err != nil {
 			if errors.Is(err, executor.ErrExit) {
 				return nil
 			}
 			fmt.Fprintf(errOut, "Error: %v\n", err)
 			return err
 		}
+		// Print performance report to stderr.
+		exec.PerfReport(errOut)
+		elapsed := time.Since(progStart)
+		fmt.Fprintf(errOut, "  Script time: %s\n", executor.FormatDuration(elapsed))
 		return nil
 	},
 }

mdl/executor/businessevents.go

@@ -294,7 +294,7 @@ func createBusinessEventService(ctx *ExecContext, stmt *ast.CreateBusinessEventS
 	// Resolve folder if specified
 	containerID := module.ID
 	if stmt.Folder != "" {
-		folderID, err := resolveFolder(ctx, module.ID, stmt.Folder)
+		folderID, err := resolveFolder(ctx, module.ID, stmt.Folder, nil)
 		if err != nil {
 			return mdlerrors.NewBackend(fmt.Sprintf("resolve folder '%s'", stmt.Folder), err)
 		}

mdl/executor/cmd_catalog.go

@@ -325,8 +325,11 @@ func loadCachedCatalog(ctx *ExecContext, cachePath string) error {
 
 // formatDuration formats a duration in a human-readable way.
 func formatDuration(d time.Duration) string {
+	if d < time.Second {
+		return fmt.Sprintf("%dms", d.Milliseconds())
+	}
 	if d < time.Minute {
-		return fmt.Sprintf("%.0fs", d.Seconds())
+		return fmt.Sprintf("%.2fs", d.Seconds())
 	}
 	if d < time.Hour {
 		return fmt.Sprintf("%.0fm", d.Minutes())
@@ -337,6 +340,13 @@ func formatDuration(d time.Duration) string {
 	return fmt.Sprintf("%.1fd", d.Hours()/24)
 }
 
+// FormatDuration is the exported equivalent of formatDuration.
+// It returns a human-readable duration string with millisecond precision
+// for sub-second values and second precision for longer values.
+func FormatDuration(d time.Duration) string {
+	return formatDuration(d)
+}
+
 // buildCatalog builds the catalog from the project.
 func buildCatalog(ctx *ExecContext, full bool, source ...bool) error {
 	isSource := len(source) > 0 && source[0]

mdl/executor/cmd_folders.go

@@ -116,7 +116,7 @@ func execMoveFolder(ctx *ExecContext, s *ast.MoveFolderStmt) error {
 	// Resolve target container
 	var targetContainerID model.ID
 	if s.TargetFolder != "" {
-		targetContainerID, err = resolveFolder(ctx, targetModule.ID, s.TargetFolder)
+		targetContainerID, err = resolveFolder(ctx, targetModule.ID, s.TargetFolder, nil)
 		if err != nil {
 			return mdlerrors.NewBackend("resolve target folder", err)
 		}

mdl/executor/cmd_jsonstructures.go

@@ -186,7 +186,7 @@ func execCreateJsonStructure(ctx *ExecContext, s *ast.CreateJsonStructureStmt) e
 	// Resolve folder if specified
 	containerID := module.ID
 	if s.Folder != "" {
-		folderID, err := resolveFolder(ctx, module.ID, s.Folder)
+		folderID, err := resolveFolder(ctx, module.ID, s.Folder, nil)
 		if err != nil {
 			return mdlerrors.NewBackend("resolve folder "+s.Folder, err)
 		}

mdl/executor/cmd_microflows_create_v2.go

@@ -72,7 +72,8 @@ func execCreateMicroflowGen(ctx *ExecContext, s *ast.CreateMicroflowStmt) error
 
 	containerID := module.ID
 	if s.Folder != "" {
-		folderID, err := resolveFolder(ctx, module.ID, s.Folder)
+		h, _ := getHierarchy(ctx)
+		folderID, err := resolveFolder(ctx, module.ID, s.Folder, h)
 		if err != nil {
 			return mdlerrors.NewBackend("resolve folder "+s.Folder, err)
 		}
@@ -82,32 +83,34 @@ func execCreateMicroflowGen(ctx *ExecContext, s *ast.CreateMicroflowStmt) error
 	qualifiedName := s.Name.Module + "." + s.Name.Name
 
 	// ── Existence + replace handling ──────────────────────────
+	// Uses listMicroflowsWithContainerGen (which caches the ListAll +
+	// GetContainerUUID pair) instead of raw ListAll + per-element
+	// genFlowContainerModule, so that consecutive statements in the same
+	// script reuse one batch fetch when the cache isn't invalidated.
 	var (
 		existing             *genMf.Microflow
 		existingContainerID  model.ID
 		existingAllowedRoles []string
 		preserveAllowedRoles bool
 	)
-	all, err := ctx.Microflows.ListAll()
+	items, err := listMicroflowsWithContainerGen(ctx)
 	if err != nil {
 		return mdlerrors.NewBackend("check existing microflows", err)
 	}
 	h, _ := getHierarchy(ctx)
-	for _, mf := range all {
-		if mf == nil {
+	for _, item := range items {
+		if item.MF == nil {
 			continue
 		}
-		modName := genFlowContainerModule(ctx, h, model.ID(mf.ID()))
-		if modName == s.Name.Module && mf.Name() == s.Name.Name {
+		modName := containerModuleName(h, item.ContainerUUID)
+		if modName == s.Name.Module && item.MF.Name() == s.Name.Name {
 			if !s.CreateOrModify {
 				return mdlerrors.NewAlreadyExistsMsg("microflow", qualifiedName,
 					"microflow '"+qualifiedName+"' already exists (use create or modify to overwrite)")
 			}
-			existing = mf
-			if cid, err := ctx.Microflows.GetContainerUUID(model.ID(mf.ID())); err == nil && cid != "" {
-				existingContainerID = cid
-			}
-			existingAllowedRoles = append([]string{}, mf.AllowedModuleRolesQualifiedNames()...)
+			existing = item.MF
+			existingContainerID = item.ContainerUUID
+			existingAllowedRoles = append([]string{}, item.MF.AllowedModuleRolesQualifiedNames()...)
 			preserveAllowedRoles = true
 			break
 		}
@@ -260,7 +263,7 @@ func execCreateMicroflowGen(ctx *ExecContext, s *ast.CreateMicroflowStmt) error
 		// Resolve TypeEnumeration vs TypeEntity ambiguity: a bare qualified
 		// name (e.g. HD.Ticket) is parsed as TypeEnumeration — check the
 		// backend to determine the true kind.
-		paramType := resolveAmbiguousDataType(ctx.Backend, p.Type)
+		paramType := resolveAmbiguousDataType(ctx, ctx.Backend, p.Type)
 		if dt := convertASTToGenDataType(paramType); dt != nil {
 			param.SetParameterType(dt)
 		}
@@ -321,6 +324,12 @@ func execCreateMicroflowGen(ctx *ExecContext, s *ast.CreateMicroflowStmt) error
 	ctx.trackCreatedMicroflow(s.Name.Module, s.Name.Name, model.ID(mf.ID()), containerID, returnEntityName)
 
 	invalidateHierarchy(ctx)
-	invalidateMicroflowsCache(ctx)
+	// Only invalidate microflow caches on CREATE (new name enters the
+	// project).  On MODIFY the name → ID mapping and container UUID are
+	// unchanged, so the cached list & container UUIDs remain valid and
+	// can serve subsequent statements without re-fetching.
+	if existing == nil {
+		invalidateMicroflowsCache(ctx)
+	}
 	return nil
 }

mdl/executor/cmd_move.go

@@ -50,7 +50,7 @@ func execMove(ctx *ExecContext, s *ast.MoveStmt) error {
 	// Resolve target container (folder or module root)
 	var targetContainerID model.ID
 	if s.Folder != "" {
-		targetContainerID, err = resolveFolder(ctx, targetModule.ID, s.Folder)
+		targetContainerID, err = resolveFolder(ctx, targetModule.ID, s.Folder, nil)
 		if err != nil {
 			return mdlerrors.NewBackend("resolve target folder", err)
 		}

mdl/executor/cmd_nanoflows_create_v2.go

@@ -62,7 +62,8 @@ func execCreateNanoflowGen(ctx *ExecContext, s *ast.CreateNanoflowStmt) error {
 
 	containerID := module.ID
 	if s.Folder != "" {
-		folderID, err := resolveFolder(ctx, module.ID, s.Folder)
+		h, _ := getHierarchy(ctx)
+		folderID, err := resolveFolder(ctx, module.ID, s.Folder, h)
 		if err != nil {
 			return mdlerrors.NewBackend("resolve folder "+s.Folder, err)
 		}
@@ -168,7 +169,7 @@ func execCreateNanoflowGen(ctx *ExecContext, s *ast.CreateNanoflowStmt) error {
 		// Resolve TypeEnumeration vs TypeEntity ambiguity: a bare qualified
 		// name (e.g. HD.Ticket) is parsed as TypeEnumeration — check the
 		// backend to determine the true kind.
-		paramType := resolveAmbiguousDataType(ctx.Backend, p.Type)
+		paramType := resolveAmbiguousDataType(ctx, ctx.Backend, p.Type)
 		if dt := convertASTToGenDataType(paramType); dt != nil {
 			param.SetParameterType(dt)
 		}

mdl/executor/cmd_odata.go

@@ -1042,7 +1042,7 @@ func createODataClient(ctx *ExecContext, stmt *ast.CreateODataClientStmt) error
 	// Resolve folder if specified
 	containerID := module.ID
 	if stmt.Folder != "" {
-		folderID, err := resolveFolder(ctx, module.ID, stmt.Folder)
+		folderID, err := resolveFolder(ctx, module.ID, stmt.Folder, nil)
 		if err != nil {
 			return mdlerrors.NewBackend(fmt.Sprintf("resolve folder %s", stmt.Folder), err)
 		}
@@ -1369,7 +1369,7 @@ func createODataService(ctx *ExecContext, stmt *ast.CreateODataServiceStmt) erro
 	// Resolve folder if specified
 	containerID := module.ID
 	if stmt.Folder != "" {
-		folderID, err := resolveFolder(ctx, module.ID, stmt.Folder)
+		folderID, err := resolveFolder(ctx, module.ID, stmt.Folder, nil)
 		if err != nil {
 			return mdlerrors.NewBackend(fmt.Sprintf("resolve folder %s", stmt.Folder), err)
 		}