@pacaf/wizard-ux 3.3.5 → 3.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pacaf/wizard-ux",
-  "version": "3.3.5",
+  "version": "3.3.7",
   "private": false,
   "type": "module",
   "description": "Browser-based setup wizard for Power Apps Code Apps (parallel to @pacaf/wizard CLI).",
@@ -38,7 +38,7 @@
     "react-dom": "^19.0.0",
     "react-resizable-panels": "^2.1.7",
     "react-router-dom": "^7.1.0",
-    "@pacaf/wizard": "3.3.7"
+    "@pacaf/wizard": "3.3.8"
   },
   "devDependencies": {
     "@types/react": "^19.0.0",

package/server/steps/09-verify-deploy.mjs

@@ -1,5 +1,5 @@
 // Step 9 - Verify & Deploy. Browser-native build and optional pac code push.
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync } from 'node:fs';
 import { spawn, execFileSync } from 'node:child_process';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -11,6 +11,7 @@ const PACKAGE_DIR = resolve(__dirname, '..', '..', '..');
 const PROJECT_DIR = process.cwd();
 const SHELL = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'shell.mjs')).href);
 const PAC_TARGET = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
+const SOLUTION_MEMBERSHIP = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'solution-membership.mjs')).href);
 
 function hasCommand(name) {
   try {
@@ -39,22 +40,6 @@ function runCommand(log, command, opts = {}) {
   });
 }
 
-function runFile(log, file, args, opts = {}) {
-  return new Promise((resolvePromise) => {
-    log.info(`$ ${SHELL.formatCommandForLog(file, args)}`);
-    const child = SHELL.spawnSafe(file, args, { cwd: opts.cwd || PROJECT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
-    child.stdout.setEncoding('utf-8');
-    child.stderr.setEncoding('utf-8');
-    child.stdout.on('data', (chunk) => log.info(String(chunk).trimEnd()));
-    child.stderr.on('data', (chunk) => log.warn(String(chunk).trimEnd()));
-    child.on('error', (error) => {
-      log.fail(`Failed to start ${file}: ${error.message}`);
-      resolvePromise(false);
-    });
-    child.on('close', (code) => resolvePromise(code === 0));
-  });
-}
-
 function runFileCapture(log, file, args, opts = {}) {
   return new Promise((resolvePromise) => {
     log.info(`$ ${SHELL.formatCommandForLog(file, args)}`);
@@ -120,21 +105,39 @@ function verifyUserProfile(pac, projectDir, state, credentialValues) {
   });
 }
 
-async function addAppToSolution(log, pac, projectDir, solutionName) {
-  if (!solutionName) return;
-  let appId = '';
-  try {
-    appId = JSON.parse(readFileSync(join(projectDir, 'power.config.json'), 'utf-8')).appId || '';
-  } catch {
-    // ignore
+// Verify the deployed Code App joined the selected solution.
+//
+// Association happens during `pac code push -s <UNIQUE name>` on the FIRST
+// push — it is what creates the Dataverse `canvasapps` record inside the
+// solution. A later `-s` re-push does NOT retroactively associate an app that
+// was first pushed bare, and there is no reliable post-hoc CLI fix: the old
+// `solution add-solution-component -ct 300` path passed the Code App's
+// play-URL appId where the canvasapp record GUID is expected and always failed
+// with "...because it does not exist" (issue #81). So we verify and guide
+// recovery instead of pretending to repair.
+//
+// This is an AUTHORITATIVE check: it exports the solution and counts Canvas App
+// (type 300) components. The old `pac solution list` check was a FALSE POSITIVE
+// — it only proved the solution exists, not that the app is inside it, which is
+// exactly how an app could be left orphaned while the wizard reported success.
+async function verifyAppInSolution(log, pac, projectDir, solutionUniqueName, { phase, appDisplayName } = {}) {
+  if (!solutionUniqueName) return { status: 'unknown' };
+  log.info(`Verifying app is a component of solution "${solutionUniqueName}" (exporting solution to inspect components)...`);
+  const runCapture = (file, args, opts) => runFileCapture(log, file, args, opts);
+  const membership = await SOLUTION_MEMBERSHIP.checkAppInSolution({ pac, projectDir, solutionUniqueName, runCapture });
+  if (membership.status === 'member') {
+    log.ok(`Confirmed: the app is a component of solution "${solutionUniqueName}" (${membership.canvasComponentCount} Canvas App component(s)).`);
+    return membership;
   }
-  if (!appId) {
-    log.warn('Could not read appId from power.config.json; skipping solution component registration.');
-    return;
+  if (membership.status === 'absent') {
+    const steps = SOLUTION_MEMBERSHIP.orphanRecoverySteps(solutionUniqueName, appDisplayName || 'this Code App');
+    for (const line of steps) log.fail(line);
+    // A confirmed orphan is a hard error in BOTH phases: pre-push (an UPDATE
+    // cannot fix it) and post-create (the create silently failed to associate).
+    throw new Error(`Code App is orphaned — NOT a component of solution "${solutionUniqueName}". ${phase === 'pre-push' ? 'A re-push will not fix this.' : 'The create did not associate it.'} See the recovery steps above.`);
   }
-  const ok = await runFile(log, pac, ['solution', 'add-solution-component', '-sn', solutionName, '-c', appId, '-ct', '300'], { cwd: projectDir });
-  if (ok) log.ok(`App added to solution ${solutionName}`);
-  else log.warn(`Could not add app to solution ${solutionName}. It may already be present, or you can add it manually.`);
+  log.warn(`Could not confirm solution membership for "${solutionUniqueName}" (${membership.detail}). Verify in the Maker Portal that the app is listed under it.`);
+  return membership;
 }
 
 export default {
@@ -197,8 +200,32 @@ export default {
     const verification = verifyUserProfile(pac, projectDir, state, credentialValues);
     log.ok(`Verified user profile ${verification.profileName}`);
 
+    // -s MUST be the solution UNIQUE name. Passing the friendly display name
+    // (e.g. "AI PMO" with a space) silently no-ops and leaves the app OUTSIDE
+    // the solution — association only happens on the first push WITH the unique
+    // name, and a later -s re-push cannot fix it (issue #81).
+    const solutionUniqueName = String(state.SOLUTION_UNIQUE_NAME || '').trim();
+    const appDisplayName = String(state.APP_NAME || 'this Code App').trim();
     const pushArgs = ['code', 'push'];
-    if (state.SOLUTION_DISPLAY_NAME) pushArgs.push('-s', state.SOLUTION_DISPLAY_NAME);
+    if (solutionUniqueName) {
+      pushArgs.push('-s', solutionUniqueName);
+    } else {
+      throw new Error('No solution unique name (SOLUTION_UNIQUE_NAME) is available. Refusing to run a bare `pac code push`, which would create the Code App outside any solution (a silent failure a later -s re-push cannot fix). Re-run the wizard solution step so the unique name is captured before deploying.');
+    }
+
+    // PRE-PUSH ORPHAN GUARD. Solution membership is decided ONLY on the CREATE
+    // (first push, when power.config.json has no appId). If an appId already
+    // exists this push is an UPDATE and -s is ignored — so if the app is not
+    // already a component of the selected solution, NO push can ever fix it.
+    // Catch that here and hard-stop with recovery instructions instead of
+    // wasting an update that silently leaves the app orphaned.
+    const preInfo = PAC_TARGET.loadPowerConfigInfo(powerConfigPath);
+    const isFirstPush = !preInfo.appId;
+    if (!isFirstPush && solutionUniqueName) {
+      log.info(`Existing appId detected (${preInfo.appId}) — this push is an UPDATE. Confirming the app is already in solution "${solutionUniqueName}" before pushing...`);
+      await verifyAppInSolution(log, pac, projectDir, solutionUniqueName, { phase: 'pre-push', appDisplayName });
+    }
+
     const pushResult = await runFileCapture(log, pac, pushArgs, { cwd: projectDir });
     const pushOutput = `${pushResult.stdout}\n${pushResult.stderr}`;
     if (!pushResult.ok || PAC_HTTP_ERROR_RE.test(pushOutput)) throw new Error('pac code push failed. Check the live output above, then retry.');
@@ -220,7 +247,13 @@ export default {
       log.warn('Could not detect deployed app URL in pac output. Open the app from Power Apps Maker Portal.');
     }
 
-    await addAppToSolution(log, pac, projectDir, state.SOLUTION_UNIQUE_NAME || '');
+    // POST-CREATE VERIFICATION. On a first push (CREATE) the -s flag is what
+    // associates the app. Authoritatively confirm it actually landed in the
+    // solution; if not, the create silently failed to associate and we hard-stop
+    // rather than report a false success (the bug that orphaned AI-PMOv3).
+    if (isFirstPush) {
+      await verifyAppInSolution(log, pac, projectDir, solutionUniqueName, { phase: 'post-create', appDisplayName });
+    }
 
     return { stateUpdate, completedStep: 9 };
   },