@pacaf/wizard-ux 3.0.5 → 3.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pacaf/wizard-ux",
-  "version": "3.0.5",
+  "version": "3.0.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.1.0"
+    "@pacaf/wizard": "3.1.1"
   },
   "devDependencies": {
     "@types/react": "^19.0.0",

package/server/steps/03-app-registration.mjs

@@ -7,8 +7,11 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { setSecret, hasUsableSecret } from '../lib/dataverse-bridge.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..', '..', '..');
-const VALIDATE = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'validate.mjs')).href);
+// PACKAGE_DIR locates sibling @pacaf/wizard lib files (must stay __dirname-relative).
+// PROJECT_DIR is the user's working directory (where .env, .env.local, etc. live).
+const PACKAGE_DIR = resolve(__dirname, '..', '..', '..');
+const PROJECT_DIR = process.cwd();
+const VALIDATE = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'validate.mjs')).href);
 
 function hasCommand(name) {
   try {
@@ -21,7 +24,7 @@ function hasCommand(name) {
 
 function runSafe(file, args) {
   try {
-    return execFileSync(file, args, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], cwd: ROOT_DIR }).trim();
+    return execFileSync(file, args, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], cwd: PROJECT_DIR }).trim();
   } catch {
     return null;
   }
@@ -29,7 +32,7 @@ function runSafe(file, args) {
 
 function runSafeWithTimeout(file, args, timeoutMs = 2000) {
   try {
-    return execFileSync(file, args, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], cwd: ROOT_DIR, timeout: timeoutMs }).trim();
+    return execFileSync(file, args, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], cwd: PROJECT_DIR, timeout: timeoutMs }).trim();
   } catch {
     return null;
   }
@@ -428,8 +431,8 @@ export default {
 
     // Persist encrypted secret to .env.local so it survives server restarts
     try {
-      const CRYPTO = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'crypto.mjs')).href);
-      const envLocalPath = join(ROOT_DIR, '.env.local');
+      const CRYPTO = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'crypto.mjs')).href);
+      const envLocalPath = join(PROJECT_DIR, '.env.local');
       let envContent = existsSync(envLocalPath) ? readFileSync(envLocalPath, 'utf-8') : '';
       const encrypted = CRYPTO.encrypt(clientSecret);
       if (envContent.match(/^PP_CLIENT_SECRET=.*$/m)) {

package/server/steps/04-auth-setup.mjs

@@ -7,10 +7,13 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { getSecret, hasUsableSecret, recoverSecret, setSecret } from '../lib/dataverse-bridge.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..', '..', '..');
-const SHELL = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'shell.mjs')).href);
-const CRYPTO = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'crypto.mjs')).href);
-const PAC_TARGET = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
+// PACKAGE_DIR locates sibling @pacaf/wizard lib files (must stay __dirname-relative).
+// PROJECT_DIR is the user's working directory (profile names, env files, git hooks, cwd).
+const PACKAGE_DIR = resolve(__dirname, '..', '..', '..');
+const PROJECT_DIR = process.cwd();
+const SHELL = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'shell.mjs')).href);
+const CRYPTO = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'crypto.mjs')).href);
+const PAC_TARGET = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
 
 function hasCommand(name) {
   try {
@@ -41,7 +44,7 @@ function formatPacAuthCreateError(profileName, url, output = '') {
 }
 
 function createPacProfile(log, pac, targetKey, url, appId, secret, tenantId) {
-  const profileName = PAC_TARGET.buildPacProfileName({ rootDir: ROOT_DIR, targetKey, profileType: 'spn', url });
+  const profileName = PAC_TARGET.buildPacProfileName({ rootDir: PROJECT_DIR, targetKey, profileType: 'spn', url });
   const result = SHELL.runSafeCapture(pac, [
     'auth', 'create', '--name', profileName, '--environment', url,
     '--applicationId', appId, '--clientSecret', secret, '--tenant', tenantId,
@@ -70,10 +73,10 @@ function createProfiles(log, pac, credentialValues, state) {
 }
 
 function installPreCommitHook(log) {
-  const hookDir = join(ROOT_DIR, '.git', 'hooks');
+  const hookDir = join(PROJECT_DIR, '.git', 'hooks');
   const hookPath = join(hookDir, 'pre-commit');
-  const hookSource = join(ROOT_DIR, 'scripts', 'pre-commit-hook.sh');
-  if (!existsSync(join(ROOT_DIR, '.git')) || !existsSync(hookSource)) return;
+  const hookSource = join(PROJECT_DIR, 'scripts', 'pre-commit-hook.sh');
+  if (!existsSync(join(PROJECT_DIR, '.git')) || !existsSync(hookSource)) return;
   if (existsSync(hookPath)) {
     const existing = readFileSync(hookPath, 'utf-8');
     if (!existing.includes('papps-secret-guard')) return;
@@ -91,7 +94,7 @@ function installPreCommitHook(log) {
 function runLivePac(log, pac, args, opts = {}) {
   return new Promise((resolvePromise) => {
     log.info(`$ ${SHELL.formatCommandForLog(pac, args)}`);
-    const child = SHELL.spawnSafe(pac, args, { cwd: ROOT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
+    const child = SHELL.spawnSafe(pac, args, { cwd: PROJECT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
     let settled = false;
     const timeout = opts.timeoutMs
       ? setTimeout(() => {
@@ -233,7 +236,7 @@ export default {
     // ── User credentials flow ──
     if (authProfileType === 'user') {
       const method = answers.USER_SIGN_IN_METHOD === 'browser' ? 'browser' : 'deviceCode';
-      const userProfileName = PAC_TARGET.buildPacProfileName({ rootDir: ROOT_DIR, targetKey, profileType: 'user', url: devUrl });
+      const userProfileName = PAC_TARGET.buildPacProfileName({ rootDir: PROJECT_DIR, targetKey, profileType: 'user', url: devUrl });
 
       log.info('Creating user auth profile via interactive sign-in...');
       const userArgs = ['auth', 'create', '--name', userProfileName, '--environment', devUrl];
@@ -266,7 +269,7 @@ export default {
           prodUrl ? `PP_ENV_PROD=op://${vault}/${itemName}/env-prod` : '',
           '',
         ].filter((line) => line !== '').join('\n');
-        writeFileSync(join(ROOT_DIR, '.env'), `${envContent}\n`, 'utf-8');
+        writeFileSync(join(PROJECT_DIR, '.env'), `${envContent}\n`, 'utf-8');
         log.ok('Wrote .env with 1Password references');
       } else {
         const envContent = [
@@ -278,7 +281,7 @@ export default {
           prodUrl ? `PP_ENV_PROD=${prodUrl}` : '',
           '',
         ].filter((line) => line !== '').join('\n');
-        writeFileSync(join(ROOT_DIR, '.env'), `${envContent}\n`, 'utf-8');
+        writeFileSync(join(PROJECT_DIR, '.env'), `${envContent}\n`, 'utf-8');
         log.ok('Wrote .env with environment URLs');
       }
 
@@ -287,12 +290,12 @@ export default {
       // Verify the user profile
       const verification = PAC_TARGET.selectAndVerifyPacProfile({
         pac,
-        rootDir: ROOT_DIR,
+        rootDir: PROJECT_DIR,
         wizardState: { WIZARD_TARGET_ENV: targetKey, PP_ENV_DEV: devUrl, PP_ENV_TEST: testUrl, PP_ENV_PROD: prodUrl },
         targetKey,
         profileType: 'user',
         credentialValues: null,
-        powerConfigPath: join(ROOT_DIR, 'power.config.json'),
+        powerConfigPath: join(PROJECT_DIR, 'power.config.json'),
         requireCredentialMatch: false,
         requirePowerConfig: false,
         requirePowerConfigTarget: false,
@@ -335,10 +338,10 @@ export default {
         prodUrl ? `PP_ENV_PROD=op://${vault}/${itemName}/env-prod` : '',
         '',
       ].filter((line) => line !== '').join('\n');
-      writeFileSync(join(ROOT_DIR, '.env'), `${envContent}\n`, 'utf-8');
+      writeFileSync(join(PROJECT_DIR, '.env'), `${envContent}\n`, 'utf-8');
       log.ok('Wrote .env with 1Password references');
     } else {
-      const gitignorePath = join(ROOT_DIR, '.gitignore');
+      const gitignorePath = join(PROJECT_DIR, '.gitignore');
       if (existsSync(gitignorePath)) {
         const gitignore = readFileSync(gitignorePath, 'utf-8');
         if (!gitignore.includes('.env.local')) appendFileSync(gitignorePath, '\n.env.local\n');
@@ -357,15 +360,15 @@ export default {
         prodUrl ? `PP_ENV_PROD=${prodUrl}` : '',
         '',
       ].filter((line) => line !== '').join('\n');
-      writeFileSync(join(ROOT_DIR, '.env.local'), `${envLocalContent}\n`, 'utf-8');
+      writeFileSync(join(PROJECT_DIR, '.env.local'), `${envLocalContent}\n`, 'utf-8');
       if (platform() !== 'win32') {
-        try { chmodSync(join(ROOT_DIR, '.env.local'), 0o600); } catch { /* best effort */ }
+        try { chmodSync(join(PROJECT_DIR, '.env.local'), 0o600); } catch { /* best effort */ }
       }
       log.ok('Wrote .env.local');
     }
 
     const opBin = hasCommand('op') ? 'op' : null;
-    const credentialValues = PAC_TARGET.resolveCredentialValues({ rootDir: ROOT_DIR, opBin, source: authMode });
+    const credentialValues = PAC_TARGET.resolveCredentialValues({ rootDir: PROJECT_DIR, opBin, source: authMode });
     createProfiles(log, pac, credentialValues, state);
     installPreCommitHook(log);
 
@@ -381,7 +384,7 @@ export default {
       prodUrl ? `PP_ENV_PROD=${prodUrl}` : '',
       '',
     ].filter((line) => line !== '').join('\n');
-    writeFileSync(join(ROOT_DIR, '.env.template'), `${envTemplate}\n`, 'utf-8');
+    writeFileSync(join(PROJECT_DIR, '.env.template'), `${envTemplate}\n`, 'utf-8');
     log.ok('Wrote .env.template');
 
     const wizardState = {
@@ -392,12 +395,12 @@ export default {
     };
     const verification = PAC_TARGET.selectAndVerifyPacProfile({
       pac,
-      rootDir: ROOT_DIR,
+      rootDir: PROJECT_DIR,
       wizardState,
       targetKey,
       profileType: 'spn',
       credentialValues,
-      powerConfigPath: join(ROOT_DIR, 'power.config.json'),
+      powerConfigPath: join(PROJECT_DIR, 'power.config.json'),
       requireCredentialMatch: true,
       requirePowerConfig: false,
       requirePowerConfigTarget: false,
@@ -406,7 +409,7 @@ export default {
     log.info(verification.whoInfo.raw.split('\n').map((line) => `  ${line}`).join('\n'));
 
     if (answers.CREATE_USER_PROFILE === true) {
-      const userProfileName = PAC_TARGET.buildPacProfileName({ rootDir: ROOT_DIR, targetKey, profileType: 'user', url: devUrl });
+      const userProfileName = PAC_TARGET.buildPacProfileName({ rootDir: PROJECT_DIR, targetKey, profileType: 'user', url: devUrl });
       const method = answers.USER_SIGN_IN_METHOD === 'browser' ? 'browser' : 'deviceCode';
       log.warn('PAC code commands require a user auth profile. Starting user sign-in now.');
       const userArgs = ['auth', 'create', '--name', userProfileName, '--environment', devUrl];
@@ -414,7 +417,7 @@ export default {
       const userOk = await runLivePac(log, pac, userArgs, { timeoutMs: method === 'browser' ? 180000 : 0 });
       if (userOk) {
         log.ok(`User profile ${userProfileName} created`);
-        const spnProfileName = PAC_TARGET.buildPacProfileName({ rootDir: ROOT_DIR, targetKey, profileType: 'spn', url: devUrl });
+        const spnProfileName = PAC_TARGET.buildPacProfileName({ rootDir: PROJECT_DIR, targetKey, profileType: 'spn', url: devUrl });
         SHELL.runSafeCapture(pac, ['auth', 'select', '--name', spnProfileName]);
         log.ok('Switched back to SPN profile for the next setup steps');
       } else {

package/server/steps/05-publisher.mjs

@@ -6,10 +6,10 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dvGet, dvPost, hasUsableSecret, setSecret, clearSecret } from '../lib/dataverse-bridge.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..', '..', '..');
-const VALIDATE = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'validate.mjs')).href);
-const SHELL = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'shell.mjs')).href);
-const PAC_TARGET = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
+const PACKAGE_DIR = resolve(__dirname, '..', '..', '..');
+const VALIDATE = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'validate.mjs')).href);
+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 CREATE_NEW = '__create_new__';
 const PASTE_URL = '__paste_url__';

package/server/steps/07-scaffold.mjs

@@ -5,10 +5,10 @@ import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..', '..', '..');
-const SCAFFOLD = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'scaffold-foundations.mjs')).href);
-const SHELL = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'shell.mjs')).href);
-const PAC_TARGET = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
+const PACKAGE_DIR = resolve(__dirname, '..', '..', '..');
+const SCAFFOLD = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'scaffold-foundations.mjs')).href);
+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);
 
 function makeFoundationLogger(log) {
   return {
@@ -256,7 +256,7 @@ export default {
     log.ok('Folder structure created');
 
     SCAFFOLD.writeStarterFiles(projectDir, appName, foundationLogger);
-    SCAFFOLD.copyFoundationFiles(ROOT_DIR, projectDir, foundationLogger);
+    SCAFFOLD.copyFoundationFiles(PACKAGE_DIR, projectDir, foundationLogger);
 
     const pac = SHELL.pacPath();
     if (pac) {

package/server/steps/08-connectors.mjs

@@ -6,11 +6,14 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dvGet, dvPost, hasUsableSecret, setSecret } from '../lib/dataverse-bridge.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..', '..', '..');
-const VALIDATE = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'validate.mjs')).href);
-const CONNECTIONS = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'connection-discovery.mjs')).href);
-const SHELL = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'shell.mjs')).href);
-const PAC_TARGET = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
+// PACKAGE_DIR locates sibling @pacaf/wizard lib files (must stay __dirname-relative).
+// PROJECT_DIR is the user's working directory (profile names, command cwd).
+const PACKAGE_DIR = resolve(__dirname, '..', '..', '..');
+const PROJECT_DIR = process.cwd();
+const VALIDATE = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'validate.mjs')).href);
+const CONNECTIONS = await import(pathToFileURL(resolve(PACKAGE_DIR, 'wizard', 'lib', 'connection-discovery.mjs')).href);
+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 CREATE_MANUAL = '__manual__';
 const SKIP_CONNECTION = '__skip__';
@@ -103,7 +106,7 @@ function connectionOptions(connections, savedConnectionId = '') {
 
 function resolveCredentialValues(state) {
   return PAC_TARGET.resolveCredentialValues({
-    rootDir: ROOT_DIR,
+    rootDir: PROJECT_DIR,
     opBin: process.env.OP_BIN || (hasCommand('op') ? 'op' : null),
     source: state.AUTH_MODE || 'auto',
   });
@@ -112,7 +115,7 @@ function resolveCredentialValues(state) {
 function verifyUserProfile(pac, projectDir, state, credentialValues) {
   return PAC_TARGET.selectAndVerifyPacProfile({
     pac,
-    rootDir: ROOT_DIR,
+    rootDir: PROJECT_DIR,
     wizardState: {
       WIZARD_TARGET_ENV: state.WIZARD_TARGET_ENV || 'dev',
       PP_ENV_DEV: state.PP_ENV_DEV || '',
@@ -132,7 +135,7 @@ function verifyUserProfile(pac, projectDir, state, credentialValues) {
 function runFileCapture(log, file, args, opts = {}) {
   return new Promise((resolvePromise) => {
     log.info(`$ ${SHELL.formatCommandForLog(file, args)}`);
-    const child = SHELL.spawnSafe(file, args, { cwd: opts.cwd || ROOT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
+    const child = SHELL.spawnSafe(file, args, { cwd: opts.cwd || PROJECT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
     let stdout = '';
     let stderr = '';
     child.stdout.setEncoding('utf-8');
@@ -396,7 +399,7 @@ export default {
       const pac = SHELL.pacPath();
       if (!pac) throw new Error('PAC CLI was not found. Install PAC CLI before registering data sources.');
 
-      const projectDir = resolve(String(state.PROJECT_DIR || ROOT_DIR));
+      const projectDir = resolve(String(state.PROJECT_DIR || PROJECT_DIR));
       if (!existsSync(join(projectDir, 'power.config.json'))) {
         throw new Error(`power.config.json was not found in ${projectDir}. Complete Step 7 before registering data sources.`);
       }

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

@@ -5,9 +5,12 @@ import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..', '..', '..');
-const SHELL = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'shell.mjs')).href);
-const PAC_TARGET = await import(pathToFileURL(resolve(ROOT_DIR, 'wizard', 'lib', 'pac-target.mjs')).href);
+// PACKAGE_DIR locates sibling @pacaf/wizard lib files (must stay __dirname-relative).
+// PROJECT_DIR is the user's working directory (profile names, command cwd).
+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);
 
 function hasCommand(name) {
   try {
@@ -22,8 +25,8 @@ function runCommand(log, command, opts = {}) {
   return new Promise((resolvePromise) => {
     log.info(`$ ${command}`);
     const child = process.platform === 'win32'
-      ? spawn(process.env.COMSPEC || 'cmd.exe', ['/d', '/s', '/c', command], { cwd: opts.cwd || ROOT_DIR, stdio: ['ignore', 'pipe', 'pipe'] })
-      : spawn('sh', ['-c', command], { cwd: opts.cwd || ROOT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
+      ? spawn(process.env.COMSPEC || 'cmd.exe', ['/d', '/s', '/c', command], { cwd: opts.cwd || PROJECT_DIR, stdio: ['ignore', 'pipe', 'pipe'] })
+      : spawn('sh', ['-c', command], { 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()));
@@ -39,7 +42,7 @@ 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 || ROOT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
+    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()));
@@ -55,7 +58,7 @@ function runFile(log, file, args, opts = {}) {
 function runFileCapture(log, file, args, opts = {}) {
   return new Promise((resolvePromise) => {
     log.info(`$ ${SHELL.formatCommandForLog(file, args)}`);
-    const child = SHELL.spawnSafe(file, args, { cwd: opts.cwd || ROOT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
+    const child = SHELL.spawnSafe(file, args, { cwd: opts.cwd || PROJECT_DIR, stdio: ['ignore', 'pipe', 'pipe'] });
     let stdout = '';
     let stderr = '';
     child.stdout.setEncoding('utf-8');
@@ -81,7 +84,7 @@ const PAC_HTTP_ERROR_RE = /HTTP error status:\s*[45]\d\d/i;
 
 function resolveCredentialValues(state) {
   return PAC_TARGET.resolveCredentialValues({
-    rootDir: ROOT_DIR,
+    rootDir: PROJECT_DIR,
     opBin: process.env.OP_BIN || (hasCommand('op') ? 'op' : null),
     source: state.AUTH_MODE || 'auto',
   });
@@ -90,7 +93,7 @@ function resolveCredentialValues(state) {
 function verifyUserProfile(pac, projectDir, state, credentialValues) {
   return PAC_TARGET.selectAndVerifyPacProfile({
     pac,
-    rootDir: ROOT_DIR,
+    rootDir: PROJECT_DIR,
     wizardState: {
       WIZARD_TARGET_ENV: state.WIZARD_TARGET_ENV || 'dev',
       PP_ENV_DEV: state.PP_ENV_DEV || '',
@@ -153,7 +156,7 @@ export default {
   },
 
   async apply(answers, state, log) {
-    const projectDir = resolve(String(state.PROJECT_DIR || ROOT_DIR));
+    const projectDir = resolve(String(state.PROJECT_DIR || PROJECT_DIR));
     if (!existsSync(join(projectDir, 'package.json'))) throw new Error(`No package.json found in ${projectDir}. Run Step 7 first.`);
 
     log.info('Building project...');