@memberjunction/codegen-lib 5.29.0 → 5.30.0

package/dist/Misc/codegen-reporter.js

@@ -0,0 +1,492 @@
+import { BaseSingleton } from '@memberjunction/global';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+/**
+ * Maximum number of run files to keep in `~/.mj/codegen-state/`. Older files are
+ * pruned on each `endRun()`. Plain constant — not externally configurable yet.
+ */
+const MAX_RETAINED_RUNS = 50;
+// ----------------------------------------------------------------------------
+// Reporter
+// ----------------------------------------------------------------------------
+/**
+ * Singleton reporter for CodeGen runs. Holds state for a single run at a time;
+ * call `startRun()` to begin, `endRun()` to emit and reset.
+ */
+export class CodeGenReporter extends BaseSingleton {
+    constructor() {
+        super();
+        // ------------------------------------------------------------------------
+        // Run state (reset per run)
+        // ------------------------------------------------------------------------
+        this._active = false;
+        this._runStartMs = 0;
+        this._runStartIso = '';
+        this._phases = [];
+        this._phaseStack = [];
+        this._entities = new Map();
+        this._llmCalls = [];
+        this._counters = this.emptyCounters();
+        this._context = {};
+        this._notes = [];
+        this._currentEntity = null;
+    }
+    static get Instance() {
+        return super.getInstance();
+    }
+    /** True if a run is currently in progress. */
+    get IsActive() {
+        return this._active;
+    }
+    /** Begin capturing a new run. Resets all state from any prior run. */
+    startRun() {
+        this._active = true;
+        this._runStartMs = Date.now();
+        this._runStartIso = new Date(this._runStartMs).toISOString();
+        this._phases = [];
+        this._phaseStack = [];
+        this._entities = new Map();
+        this._llmCalls = [];
+        this._counters = this.emptyCounters();
+        this._context = {};
+        this._notes = [];
+        this._currentEntity = null;
+    }
+    // ------------------------------------------------------------------------
+    // Instrumentation API
+    // ------------------------------------------------------------------------
+    /**
+     * Wrap an async block as a named phase. Phases nest automatically: any
+     * phases started while another is open are recorded as its children.
+     *
+     * If no run is active this becomes a pass-through — safe to call
+     * unconditionally.
+     */
+    async phase(name, fn) {
+        if (!this._active)
+            return fn();
+        const parent = this._phaseStack[this._phaseStack.length - 1];
+        const parentStart = parent ? this.phaseStartAbs(parent) : this._runStartMs;
+        const span = {
+            name,
+            startMs: Date.now() - parentStart,
+            durationMs: 0,
+            children: [],
+        };
+        if (parent) {
+            parent.children.push(span);
+        }
+        else {
+            this._phases.push(span);
+        }
+        this._phaseStack.push(span);
+        const startedAt = Date.now();
+        try {
+            return await fn();
+        }
+        finally {
+            span.durationMs = Date.now() - startedAt;
+            this._phaseStack.pop();
+        }
+    }
+    /**
+     * Wrap per-entity work. Accumulates total time and sub-phase time on the
+     * entity record. Also sets the "current entity" so LLM calls recorded
+     * inside this block get attributed correctly.
+     */
+    async entityPhase(entityName, phaseName, fn) {
+        if (!this._active)
+            return fn();
+        const entry = this.getOrCreateEntity(entityName);
+        const prevEntity = this._currentEntity;
+        this._currentEntity = entityName;
+        const startedAt = Date.now();
+        try {
+            return await this.phase(`entity:${entityName}:${phaseName}`, fn);
+        }
+        finally {
+            const elapsed = Date.now() - startedAt;
+            entry.totalMs += elapsed;
+            if (phaseName === 'advancedGeneration') {
+                entry.advancedGenerationMs += elapsed;
+            }
+            this._currentEntity = prevEntity;
+        }
+    }
+    /**
+     * Record a single LLM call. Attribution falls back to the entity set by
+     * the most recent `entityPhase()` if the caller doesn't supply one.
+     */
+    recordLLMCall(call) {
+        if (!this._active)
+            return;
+        const entityName = call.entityName ?? this._currentEntity;
+        const entry = {
+            entityName,
+            promptName: call.promptName,
+            model: call.model ?? null,
+            tokensIn: call.tokensIn ?? 0,
+            tokensOut: call.tokensOut ?? 0,
+            costUSD: call.costUSD ?? 0,
+            latencyMs: call.latencyMs,
+            tsMs: Date.now() - this._runStartMs,
+        };
+        this._llmCalls.push(entry);
+        if (entityName) {
+            const ent = this.getOrCreateEntity(entityName);
+            ent.llmCalls += 1;
+            ent.tokensIn += entry.tokensIn;
+            ent.tokensOut += entry.tokensOut;
+            ent.costUSD += entry.costUSD;
+        }
+    }
+    /** Increment a named counter (default 1). Unknown counter names are allowed. */
+    counter(name, delta = 1) {
+        if (!this._active)
+            return;
+        const current = this._counters[name];
+        if (typeof current === 'number') {
+            this._counters[name] = current + delta;
+        }
+        else if (current === undefined) {
+            this._counters[name] = delta;
+        }
+        // If it's a Record (e.g., spCalls), callers should use spCallCounter instead.
+    }
+    /** Increment a specific stored-procedure call count. */
+    spCallCounter(spName, delta = 1) {
+        if (!this._active)
+            return;
+        const current = this._counters.spCalls[spName] ?? 0;
+        this._counters.spCalls[spName] = current + delta;
+    }
+    /** Set a one-time context value (platform, mjVersion, etc.). */
+    mark(key, value) {
+        if (!this._active)
+            return;
+        this._context[key] = value;
+    }
+    /** Flag an entity's change status. Used for attribution in the report. */
+    flagEntity(entityName, flag, value = true) {
+        if (!this._active)
+            return;
+        const ent = this.getOrCreateEntity(entityName);
+        ent.flags[flag] = value;
+    }
+    /** Append a free-form note (warnings, unexpected conditions, etc.). */
+    note(message) {
+        if (!this._active)
+            return;
+        this._notes.push(message);
+    }
+    // ------------------------------------------------------------------------
+    // Emission
+    // ------------------------------------------------------------------------
+    /**
+     * Finalize the run, write the JSON report to disk, and reset state.
+     * Returns the written file path (or null) and the report object.
+     *
+     * Safe to call even if `startRun()` wasn't called (becomes a no-op).
+     */
+    async endRun(success) {
+        if (!this._active)
+            return { filePath: null, report: null };
+        const finishedAtMs = Date.now();
+        const report = {
+            runId: this.makeRunId(),
+            startedAt: this._runStartIso,
+            finishedAt: new Date(finishedAtMs).toISOString(),
+            totalMs: finishedAtMs - this._runStartMs,
+            success,
+            context: { ...this._context },
+            phases: this._phases,
+            entities: Array.from(this._entities.values()),
+            llmCalls: this._llmCalls,
+            counters: this._counters,
+            totalCostUSD: this._llmCalls.reduce((sum, c) => sum + c.costUSD, 0),
+            totalTokensIn: this._llmCalls.reduce((sum, c) => sum + c.tokensIn, 0),
+            totalTokensOut: this._llmCalls.reduce((sum, c) => sum + c.tokensOut, 0),
+            notes: this._notes,
+        };
+        let writtenPath = null;
+        try {
+            const dir = CodeGenReporter.stateDir();
+            await fs.mkdir(dir, { recursive: true });
+            writtenPath = path.join(dir, `run-${report.runId}.json`);
+            await fs.writeFile(writtenPath, JSON.stringify(report, null, 2), 'utf8');
+            await CodeGenReporter.pruneOldRuns();
+        }
+        catch (err) {
+            // Don't fail the CodeGen run because we couldn't write telemetry.
+            // eslint-disable-next-line no-console
+            console.warn(`[codegen-reporter] Failed to write report: ${err.message}`);
+            writtenPath = null;
+        }
+        finally {
+            this._active = false;
+        }
+        return { filePath: writtenPath, report };
+    }
+    /** Get the current in-memory report (snapshot). Mostly for tests. */
+    snapshot() {
+        return {
+            runId: this.makeRunId(),
+            startedAt: this._runStartIso,
+            finishedAt: new Date().toISOString(),
+            totalMs: Date.now() - this._runStartMs,
+            success: true,
+            context: { ...this._context },
+            phases: JSON.parse(JSON.stringify(this._phases)),
+            entities: Array.from(this._entities.values()).map((e) => ({ ...e, flags: { ...e.flags } })),
+            llmCalls: [...this._llmCalls],
+            counters: {
+                ...this._counters,
+                spCalls: { ...this._counters.spCalls },
+            },
+            totalCostUSD: this._llmCalls.reduce((sum, c) => sum + c.costUSD, 0),
+            totalTokensIn: this._llmCalls.reduce((sum, c) => sum + c.tokensIn, 0),
+            totalTokensOut: this._llmCalls.reduce((sum, c) => sum + c.tokensOut, 0),
+            notes: [...this._notes],
+        };
+    }
+    /**
+     * Print a human-readable summary of the completed run to stdout.
+     * Call after `endRun()` — operates on the saved report.
+     */
+    static printSummary(report) {
+        const totalSec = report.totalMs / 1000;
+        const entCount = report.counters.entitiesProcessed ?? report.entities.length;
+        const lines = [
+            '',
+            `MJ CodeGen run ${report.startedAt} — ${formatDuration(report.totalMs)} total, ${entCount} entities`,
+            '',
+            'Top-level phases                Time        %',
+            '─'.repeat(52),
+        ];
+        const phaseTime = CodeGenReporter.sumPhaseTime(report.phases);
+        const accounted = phaseTime;
+        function renderPhases(phases, indent, parentTotal) {
+            for (const p of phases) {
+                const pct = parentTotal > 0 ? ((p.durationMs / report.totalMs) * 100).toFixed(1) : '';
+                const time = formatDuration(p.durationMs);
+                const padPct = pct ? `${pct}%`.padStart(6) : '';
+                lines.push(`${indent}${p.name.padEnd(32)}${time.padStart(8)}${padPct}`);
+                if (p.children.length > 0) {
+                    renderPhases(p.children, indent + '  ├─ ', p.durationMs);
+                }
+            }
+        }
+        renderPhases(report.phases, '', report.totalMs);
+        const otherMs = report.totalMs - accounted;
+        if (otherMs > 100) {
+            const pct = ((otherMs / report.totalMs) * 100).toFixed(1);
+            lines.push(`${'other'.padEnd(32)}${formatDuration(otherMs).padStart(8)}${`${pct}%`.padStart(6)}`);
+        }
+        if (report.entities.length > 0) {
+            const top = [...report.entities].sort((a, b) => b.advancedGenerationMs - a.advancedGenerationMs).slice(0, 10);
+            lines.push('');
+            lines.push('Top 10 slowest entities (advanced generation):');
+            for (const e of top) {
+                if (e.advancedGenerationMs < 1)
+                    break;
+                const cost = e.costUSD > 0 ? `$${e.costUSD.toFixed(4)}` : '';
+                const llm = e.llmCalls > 0 ? `${e.llmCalls} LLM` : '';
+                const meta = [llm, cost].filter(Boolean).join(', ');
+                lines.push(`  ${e.name.padEnd(24)}${formatDuration(e.advancedGenerationMs).padStart(8)}  ${meta}`);
+            }
+        }
+        if (report.llmCalls.length > 0) {
+            lines.push('');
+            const tokensIn = report.totalTokensIn.toLocaleString();
+            const tokensOut = report.totalTokensOut.toLocaleString();
+            lines.push(`LLM totals: ${report.llmCalls.length} calls | ${tokensIn} tokens in | ${tokensOut} out | $${report.totalCostUSD.toFixed(4)}`);
+        }
+        const c = report.counters;
+        const counterParts = [];
+        if (c.entitiesNew)
+            counterParts.push(`${c.entitiesNew} new`);
+        if (c.entitiesModified)
+            counterParts.push(`${c.entitiesModified} modified`);
+        if (c.entitiesRegenerated)
+            counterParts.push(`${c.entitiesRegenerated} late-regen`);
+        if (c.sqlStatements)
+            counterParts.push(`${c.sqlStatements.toLocaleString()} SQL stmts`);
+        if (c.filesWritten)
+            counterParts.push(`${c.filesWritten.toLocaleString()} files`);
+        if (counterParts.length > 0) {
+            lines.push(`Counters:   ${counterParts.join(' | ')}`);
+        }
+        lines.push('');
+        // eslint-disable-next-line no-console
+        console.log(lines.join('\n'));
+    }
+    static sumPhaseTime(phases) {
+        let total = 0;
+        for (const p of phases) {
+            total += p.durationMs;
+        }
+        return total;
+    }
+    // ------------------------------------------------------------------------
+    // Static helpers (used by `mj codegen-report` CLI and by tests)
+    // ------------------------------------------------------------------------
+    /** The directory where run JSON files are stored. */
+    static stateDir() {
+        return path.join(os.homedir(), '.mj', 'codegen-state');
+    }
+    /** List recent runs, newest first, with compact summaries. */
+    static async listRuns(limit) {
+        const dir = CodeGenReporter.stateDir();
+        let files;
+        try {
+            files = (await fs.readdir(dir)).filter((f) => f.startsWith('run-') && f.endsWith('.json'));
+        }
+        catch (err) {
+            const code = err.code;
+            if (code === 'ENOENT')
+                return [];
+            throw err;
+        }
+        const summaries = [];
+        for (const file of files) {
+            try {
+                const report = await CodeGenReporter.loadRun(file);
+                if (!report)
+                    continue;
+                summaries.push({
+                    runId: report.runId,
+                    startedAt: report.startedAt,
+                    totalMs: report.totalMs,
+                    success: report.success,
+                    entitiesProcessed: report.counters.entitiesProcessed ?? 0,
+                    llmCalls: report.llmCalls.length,
+                    totalCostUSD: report.totalCostUSD,
+                    filePath: path.join(dir, file),
+                });
+            }
+            catch {
+                // Skip malformed files silently
+            }
+        }
+        summaries.sort((a, b) => b.startedAt.localeCompare(a.startedAt));
+        return typeof limit === 'number' ? summaries.slice(0, limit) : summaries;
+    }
+    /** Load a single run by file name OR run id. Returns null if not found. */
+    static async loadRun(runIdOrFile) {
+        const dir = CodeGenReporter.stateDir();
+        const file = runIdOrFile.endsWith('.json') ? runIdOrFile : `run-${runIdOrFile}.json`;
+        const full = path.join(dir, file);
+        try {
+            const raw = await fs.readFile(full, 'utf8');
+            return JSON.parse(raw);
+        }
+        catch (err) {
+            const code = err.code;
+            if (code === 'ENOENT')
+                return null;
+            throw err;
+        }
+    }
+    /**
+     * Prune `~/.mj/codegen-state/` to the most recent MAX_RETAINED_RUNS files.
+     * Non-fatal on errors.
+     */
+    static async pruneOldRuns() {
+        try {
+            const dir = CodeGenReporter.stateDir();
+            const files = (await fs.readdir(dir))
+                .filter((f) => f.startsWith('run-') && f.endsWith('.json'))
+                .sort()
+                .reverse();
+            const toDelete = files.slice(MAX_RETAINED_RUNS);
+            await Promise.all(toDelete.map((f) => fs.unlink(path.join(dir, f)).catch((err) => {
+                // eslint-disable-next-line no-console
+                console.warn(`[codegen-reporter] Failed to prune ${f}: ${err.message}`);
+            })));
+        }
+        catch {
+            // Directory may not exist yet — safe to ignore.
+        }
+    }
+    // ------------------------------------------------------------------------
+    // Internals
+    // ------------------------------------------------------------------------
+    getOrCreateEntity(name) {
+        let entry = this._entities.get(name);
+        if (!entry) {
+            entry = {
+                name,
+                totalMs: 0,
+                advancedGenerationMs: 0,
+                llmCalls: 0,
+                tokensIn: 0,
+                tokensOut: 0,
+                costUSD: 0,
+                flags: { new: false, modified: false, regenerated: false },
+            };
+            this._entities.set(name, entry);
+        }
+        return entry;
+    }
+    emptyCounters() {
+        return {
+            entitiesProcessed: 0,
+            entitiesNew: 0,
+            entitiesModified: 0,
+            entitiesRegenerated: 0,
+            sqlStatements: 0,
+            filesWritten: 0,
+            spCalls: {},
+        };
+    }
+    makeRunId() {
+        // Filename-safe ISO: replace colons and dots so the string is valid on
+        // all common file systems. Example: "2026-04-15T19-42-03-104Z".
+        return this._runStartIso.replace(/[:.]/g, '-');
+    }
+    /**
+     * Absolute start time of a phase (ms since epoch). The phase's own
+     * startMs is stored relative to its parent (or run start), so we have
+     * to walk up the stack to get an absolute.
+     */
+    phaseStartAbs(phase) {
+        let abs = this._runStartMs;
+        for (const s of this._phaseStack) {
+            abs += s.startMs;
+            if (s === phase)
+                break;
+        }
+        return abs;
+    }
+}
+// ----------------------------------------------------------------------------
+// Convenience wrappers (mirrors status_logging.ts style)
+// ----------------------------------------------------------------------------
+/** Shortcut: wrap a phase using the singleton. */
+export function reportPhase(name, fn) {
+    return CodeGenReporter.Instance.phase(name, fn);
+}
+/** Shortcut: wrap a per-entity phase using the singleton. */
+export function reportEntityPhase(entityName, phaseName, fn) {
+    return CodeGenReporter.Instance.entityPhase(entityName, phaseName, fn);
+}
+/** Shortcut: increment a counter using the singleton. */
+export function reportCounter(name, delta = 1) {
+    CodeGenReporter.Instance.counter(name, delta);
+}
+/** Shortcut: set a context mark using the singleton. */
+export function reportMark(key, value) {
+    CodeGenReporter.Instance.mark(key, value);
+}
+function formatDuration(ms) {
+    if (ms < 1000)
+        return `${ms.toFixed(0)}ms`;
+    const sec = ms / 1000;
+    if (sec < 60)
+        return `${sec.toFixed(1)}s`;
+    const m = Math.floor(sec / 60);
+    const s = Math.round(sec % 60);
+    return `${m}m ${s}s`;
+}
+//# sourceMappingURL=codegen-reporter.js.map

package/dist/Misc/codegen-reporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codegen-reporter.js","sourceRoot":"","sources":["../../src/Misc/codegen-reporter.ts"],"names":[],"mappings":"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"}

package/dist/Misc/createNewUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createNewUser.d.ts","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;GAEG;AACH,qBAAa,iBAAiB;IACb,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;KAAC,CAAC;CA0JlJ"}
+{"version":3,"file":"createNewUser.d.ts","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;GAEG;AACH,qBAAa,iBAAiB;IACb,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;KAAC,CAAC;CA2JlJ"}

package/dist/Misc/createNewUser.js

@@ -31,8 +31,16 @@ export class CreateNewUserBase {
                         user.Email = newUserSetup.Email;
                         user.Type = 'Owner';
                         user.IsActive = true;
-                        if (await user.Save()) {
-                            // save was successful, so we can create the User Roles
+                        // Create the user and all of its role/application/app-entity records atomically.
+                        // If any Save fails partway through, the whole provisioning rolls back so we never
+                        // leave a half-created user with partial roles/applications behind.
+                        const provider = Metadata.Provider;
+                        await provider.BeginTransaction();
+                        try {
+                            if (!await user.Save()) {
+                                throw new Error("Failed to save new user: " + newUserSetup.Email);
+                            }
+                            // User Roles
                             for (let i = 0; i < newUserSetup.Roles.length; i++) {
                                 const roleName = newUserSetup.Roles[i];
                                 const roleID = md.Roles.find(r => r.Name === roleName)?.ID;
@@ -44,14 +52,12 @@ export class CreateNewUserBase {
                                 userRole.NewRecord();
                                 userRole.UserID = user.ID;
                                 userRole.RoleID = roleID;
-                                if (await userRole.Save()) {
-                                    logStatus("   Created User Role: " + roleName);
-                                }
-                                else {
-                                    logError("   Failed to create User Role: " + roleName);
+                                if (!await userRole.Save()) {
+                                    throw new Error(`Failed to create User Role '${roleName}': ${userRole.LatestResult?.CompleteMessage ?? 'unknown error'}`);
                                 }
+                                logStatus("   Created User Role: " + roleName);
                             }
-                            // Create UserApplication records if specified in the config
+                            // User Applications + nested User Application Entities
                             if (newUserSetup.CreateUserApplicationRecords) {
                                 logStatus("Creating User Applications for new user: " + user.Name);
                                 for (const appName of newUserSetup.UserApplications) {
@@ -66,40 +72,35 @@ export class CreateNewUserBase {
                                     userApplication.UserID = user.ID;
                                     userApplication.ApplicationID = application.ID;
                                     userApplication.IsActive = true;
-                                    const userApplicationSaveResult = await userApplication.Save();
-                                    if (userApplicationSaveResult) {
-                                        logStatus(`Created User Application ${appName} for new user ${user.Name}`);
-                                        //now create a MJUserApplicationEntity records for each entity in the application
-                                        const rv = new RunView();
-                                        const rvResult = await rv.RunView({
-                                            EntityName: 'MJ: Application Entities',
-                                            ExtraFilter: `ApplicationID = '${application.ID}' and DefaultForNewUser = 1`,
-                                        }, currentUser);
-                                        if (!rvResult.Success) {
-                                            LogError(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
-                                            continue;
-                                        }
-                                        LogStatus(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
-                                        for (const [index, appEntity] of rvResult.Results.entries()) {
-                                            const userAppEntity = await md.GetEntityObject('MJ: User Application Entities', currentUser);
-                                            userAppEntity.NewRecord();
-                                            userAppEntity.UserApplicationID = userApplication.ID;
-                                            userAppEntity.EntityID = appEntity.EntityID;
-                                            userAppEntity.Sequence = index;
-                                            const userAppEntitySaveResult = await userAppEntity.Save();
-                                            if (userAppEntitySaveResult) {
-                                                LogStatus(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
-                                            }
-                                            else {
-                                                LogError(`Failed to create User Application Entity for new user ${user.Name}:`, undefined, userAppEntity.LatestResult);
-                                            }
-                                        }
+                                    if (!await userApplication.Save()) {
+                                        throw new Error(`Failed to create User Application ${appName} for new user ${user.Name}: ${userApplication.LatestResult?.CompleteMessage ?? 'unknown error'}`);
                                     }
-                                    else {
-                                        logError(`Failed to create User Application ${appName} for new user ${user.Name}:`, undefined, userApplication.LatestResult);
+                                    logStatus(`Created User Application ${appName} for new user ${user.Name}`);
+                                    //now create MJUserApplicationEntity records for each entity in the application
+                                    const rv = new RunView();
+                                    const rvResult = await rv.RunView({
+                                        EntityName: 'MJ: Application Entities',
+                                        ExtraFilter: `ApplicationID = '${application.ID}' and DefaultForNewUser = 1`,
+                                    }, currentUser);
+                                    if (!rvResult.Success) {
+                                        LogError(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
+                                        continue;
+                                    }
+                                    LogStatus(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
+                                    for (const [index, appEntity] of rvResult.Results.entries()) {
+                                        const userAppEntity = await md.GetEntityObject('MJ: User Application Entities', currentUser);
+                                        userAppEntity.NewRecord();
+                                        userAppEntity.UserApplicationID = userApplication.ID;
+                                        userAppEntity.EntityID = appEntity.EntityID;
+                                        userAppEntity.Sequence = index;
+                                        if (!await userAppEntity.Save()) {
+                                            throw new Error(`Failed to create User Application Entity for new user ${user.Name}: ${userAppEntity.LatestResult?.CompleteMessage ?? 'unknown error'}`);
+                                        }
+                                        LogStatus(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
                                     }
                                 }
                             }
+                            await provider.CommitTransaction();
                             logStatus("Finished creating new user: " + newUserSetup.Email);
                             return {
                                 Success: true,
@@ -107,11 +108,11 @@ export class CreateNewUserBase {
                                 Severity: undefined
                             };
                         }
-                        else {
-                            // saving the user failed, so we don't atempt to create User Roles, throw error
+                        catch (txErr) {
+                            await provider.RollbackTransaction();
                             return {
                                 Success: false,
-                                Message: "Failed to save new user: " + newUserSetup.Email,
+                                Message: txErr instanceof Error ? txErr.message : String(txErr),
                                 Severity: 'error'
                             };
                         }