@microsoft/managed-apps-cli 0.6.1 → 0.8.0

package/dist/Verbs/AddTable.js

@@ -1,23 +1,16 @@
 /*!
  * Copyright (C) Microsoft Corporation. All rights reserved.
  */
-import { addConnectorTableAsync, getPlayerServiceConfig, listDatasetsAsync, listTablesAsync, } from '@microsoft/managed-apps-actions';
-import { getCliLogger, getSettings } from '../CliSettings.js';
-import { createDefaultStringOption, promptSelectOrInput } from '../CliUtils.js';
+import { createDefaultStringOption } from '../CliUtils.js';
 import { CLI_BINARY_NAME } from '../Constants/CliConstants.js';
 import { HelpStrings } from '../Constants/HelpStrings.js';
 import { UsageError } from '../Errors/CliError.js';
-import { printInfo, printSuccess, printTable } from '../Utils/ConsoleOutput.js';
-import { resolveConnectionInteractivelyAsync, runConnectorDlpPreflightAsync, } from './ConnectorHelpers.js';
+import { isTabularConnector, runAddTableFlowAsync } from './AddConnectorFlows.js';
+import { runConnectorDlpPreflightAsync } from './ConnectorHelpers.js';
 import { AddTableArguments, SharedArguments } from './VerbConstants.js';
 export async function addTableAsync(argumentProvider) {
-    const settings = getSettings();
-    const { fileConfig, cliFs } = settings;
     createOptionSchema(argumentProvider);
     await argumentProvider.runVerb();
-    const playerServiceConfig = getPlayerServiceConfig();
-    const authProvider = argumentProvider.getAuthenticationProvider();
-    const logger = getCliLogger();
     const apiId = await argumentProvider.getOption('apiId');
     const connectionIdFlag = await argumentProvider.getOption('connectionId', true);
     const datasetFlag = await argumentProvider.getOption('dataset', true);
@@ -27,97 +20,19 @@ export async function addTableAsync(argumentProvider) {
     // ── Preflight: connector + DLP policy (throws on not-found or blocked) ────
     const { connector } = await runConnectorDlpPreflightAsync(argumentProvider, apiId);
     // ── Tabular capability check ──────────────────────────────────────────────
-    const isTabular = connector.properties.capabilities?.includes('tabular') ?? false;
-    if (!isTabular) {
-        throw new UsageError(`Connector '${connector.properties.displayName ?? apiId}' does not support tabular data sources. Use '${CLI_BINARY_NAME} app add action' instead.`);
+    if (!isTabularConnector(connector)) {
+        throw new UsageError(`Connector '${connector.properties.displayName ?? apiId}' does not support tabular data sources. Use '${CLI_BINARY_NAME} app add connector --as action' instead.`);
     }
-    const localFilePaths = {
-        appConfigPath: fileConfig.appConfigPath,
-        schemaPath: fileConfig.schemaPath,
-        codeGenPath: fileConfig.codeGenPath,
-    };
-    const baseContext = {
-        vfs: cliFs,
-        authProvider,
-        httpClient: argumentProvider.getHttpClient(),
-        region: playerServiceConfig.region,
-        environmentName: playerServiceConfig.environmentName,
-        localFilePaths,
-        logger,
-    };
-    // ── Step 1: Connection resolution ─────────────────────────────────────────
-    let connectionId = connectionIdFlag;
-    if (!connectionId) {
-        connectionId = await resolveConnectionInteractivelyAsync({
-            argumentProvider,
-            apiId,
-            connector,
-        });
-    }
-    // ── Step 2: Dataset resolution ────────────────────────────────────────────
-    let dataset = datasetFlag;
-    if (!dataset) {
-        const datasetsCtx = {
-            ...baseContext,
-            actionsParams: { apiId, connectionId },
-        };
-        const { value: datasets } = await listDatasetsAsync(datasetsCtx);
-        if (!settings.interactive) {
-            printTable({
-                title: `Available datasets for ${connector.properties.displayName ?? apiId}`,
-                columns: [{ header: 'Display Name', maxWidth: 40 }, { header: 'Dataset Name' }],
-                rows: datasets.map((d) => [d.DisplayName || d.Name, d.Name]),
-                emptyMessage: 'No datasets found for this connection.',
-                totalLabel: 'dataset(s) found',
-            });
-            throw new UsageError(`Re-run with --dataset <name> or -d <name>.`);
-        }
-        dataset = await promptSelectOrInput({
-            message: 'Select a dataset:',
-            options: datasets.map((d) => ({
-                value: d.Name,
-                label: d.DisplayName || d.Name,
-                hint: d.Name,
-            })),
-            manualPromptMessage: 'Enter dataset name:',
-        });
-    }
-    // ── Step 3: Table resolution ──────────────────────────────────────────────
-    let tableName = tableFlag;
-    if (!tableName) {
-        const tablesCtx = {
-            ...baseContext,
-            actionsParams: { apiId, connectionId, dataset },
-        };
-        const { value: tables } = await listTablesAsync(tablesCtx);
-        if (!settings.interactive) {
-            printTable({
-                title: `Available tables in dataset '${dataset}'`,
-                columns: [{ header: 'Display Name', maxWidth: 40 }, { header: 'Table Name' }],
-                rows: tables.map((t) => [t.DisplayName || t.Name, t.Name]),
-                emptyMessage: 'No tables found in this dataset.',
-                totalLabel: 'table(s) found',
-            });
-            throw new UsageError(`Re-run with --table <name> or -t <name>.`);
-        }
-        tableName = await promptSelectOrInput({
-            message: 'Select a table:',
-            options: tables.map((t) => ({
-                value: t.Name,
-                label: t.DisplayName || t.Name,
-                hint: t.Name,
-            })),
-            manualPromptMessage: 'Enter table name:',
-        });
-    }
-    // ── Step 4: Add the table ─────────────────────────────────────────────────
-    const context = {
-        ...baseContext,
-        actionsParams: { apiId, connectionId, dataset, tableName, skipCodegen, useV1Codegen },
-    };
-    await addConnectorTableAsync(context);
-    printSuccess(`Table '${tableName}' from connector '${connector.properties.displayName ?? apiId}' added successfully.`);
-    printInfo(`Hint: Run 'npx ${CLI_BINARY_NAME} dev' to test locally, or 'npx ${CLI_BINARY_NAME} push' to deploy.`);
+    await runAddTableFlowAsync({
+        argumentProvider,
+        connector,
+        apiId,
+        connectionIdFlag,
+        datasetFlag,
+        tableFlag,
+        skipCodegen,
+        useV1Codegen,
+    });
 }
 function createOptionSchema(argumentProvider) {
     argumentProvider.setDescription(HelpStrings.app.add.table.description);

package/dist/Verbs/AddTable.js.map

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

package/dist/Verbs/AuthStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AuthStatus.d.ts","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,wBAAsB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAYvF"}
+{"version":3,"file":"AuthStatus.d.ts","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAK5D,wBAAsB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8CvF"}

package/dist/Verbs/AuthStatus.js

@@ -1,18 +1,46 @@
 /*!
  * Copyright (C) Microsoft Corporation. All rights reserved.
  */
+import { CLI_BINARY_NAME } from '../Constants/CliConstants.js';
 import { HelpStrings } from '../Constants/HelpStrings.js';
-import { printInfo, printWarning } from '../Utils/ConsoleOutput.js';
+import { printInfo, printJsonSuccess, printTable, printWarning } from '../Utils/ConsoleOutput.js';
 export async function authStatusAsync(argumentProvider) {
     argumentProvider.setDescription(HelpStrings.auth.status.description);
     argumentProvider.addExamples(HelpStrings.auth.status.examples);
     await argumentProvider.runVerb();
-    const email = await argumentProvider.getAuthenticationProvider().getCachedAccountAsync();
-    if (email) {
-        printInfo(`Signed in as ${email}`);
+    const accounts = await argumentProvider.getAccountManager().listCachedAccountsAsync();
+    const jsonMode = argumentProvider.isJsonMode();
+    if (jsonMode) {
+        const active = accounts.find((a) => a.isActive);
+        printJsonSuccess({
+            signedIn: accounts.length > 0,
+            activeAccount: active
+                ? { username: active.username, homeAccountId: active.homeAccountId }
+                : null,
+            accounts: accounts.map((a) => ({
+                username: a.username,
+                homeAccountId: a.homeAccountId,
+                isActive: a.isActive,
+            })),
+        });
+        return;
     }
-    else {
-        printWarning('Not signed in. Run `ms auth login` to authenticate.');
+    if (accounts.length === 0) {
+        printWarning(`Not signed in. Run \`${CLI_BINARY_NAME} auth login\` to authenticate.`);
+        return;
+    }
+    if (accounts.length === 1) {
+        printInfo(`Signed in as ${accounts[0].username}`);
+        return;
+    }
+    const hasActive = accounts.some((a) => a.isActive);
+    printTable({
+        title: 'Cached accounts',
+        columns: [{ header: 'Active' }, { header: 'Username' }],
+        rows: accounts.map((a) => [a.isActive ? '*' : '', a.username]),
+    });
+    if (!hasActive) {
+        printWarning(`No active account selected. Run \`${CLI_BINARY_NAME} auth switch\` to choose one.`);
     }
 }
 //# sourceMappingURL=AuthStatus.js.map

package/dist/Verbs/AuthStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuthStatus.js","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,gBAAkC;IACtE,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrE,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE/D,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,KAAK,GAAG,MAAM,gBAAgB,CAAC,yBAAyB,EAAE,CAAC,qBAAqB,EAAE,CAAC;IACzF,IAAI,KAAK,EAAE,CAAC;QACV,SAAS,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,qDAAqD,CAAC,CAAC;IACtE,CAAC;AACH,CAAC"}
+{"version":3,"file":"AuthStatus.js","sourceRoot":"","sources":["../../src/Verbs/AuthStatus.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE/F,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,gBAAkC;IACtE,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrE,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE/D,MAAM,gBAAgB,CAAC,OAAO,EAAE,CAAC;IAEjC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,uBAAuB,EAAE,CAAC;IACtF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,EAAE,CAAC;IAE/C,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChD,gBAAgB,CAAC;YACf,QAAQ,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC;YAC7B,aAAa,EAAE,MAAM;gBACnB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE;gBACpE,CAAC,CAAC,IAAI;YACR,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7B,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,aAAa,EAAE,CAAC,CAAC,aAAa;gBAC9B,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC,CAAC;SACJ,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,YAAY,CAAC,wBAAwB,eAAe,gCAAgC,CAAC,CAAC;QACtF,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,SAAS,CAAC,gBAAgB,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnD,UAAU,CAAC;QACT,KAAK,EAAE,iBAAiB;QACxB,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QACvD,IAAI,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;KAC/D,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,YAAY,CACV,qCAAqC,eAAe,+BAA+B,CACpF,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/Verbs/AuthSwitch.d.ts

@@ -0,0 +1,6 @@
+/*!
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ */
+import type { ArgumentProvider } from '../ArgumentProvider.js';
+export declare function authSwitchAsync(argumentProvider: ArgumentProvider): Promise<void>;
+//# sourceMappingURL=AuthSwitch.d.ts.map

package/dist/Verbs/AuthSwitch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AuthSwitch.d.ts","sourceRoot":"","sources":["../../src/Verbs/AuthSwitch.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAS5D,wBAAsB,eAAe,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyDvF"}

package/dist/Verbs/AuthSwitch.js

@@ -0,0 +1,67 @@
+/*!
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ */
+import { getSettings } from '../CliSettings.js';
+import { promptSelect } from '../CliUtils.js';
+import { CLI_BINARY_NAME } from '../Constants/CliConstants.js';
+import { HelpStrings } from '../Constants/HelpStrings.js';
+import { UsageError } from '../Errors/CliError.js';
+import { printJsonSuccess, printSuccess, printWarning } from '../Utils/ConsoleOutput.js';
+import { AccountArguments } from './VerbConstants.js';
+export async function authSwitchAsync(argumentProvider) {
+    argumentProvider.setDescription(HelpStrings.auth.switch.description);
+    argumentProvider.addExamples(HelpStrings.auth.switch.examples);
+    argumentProvider.addOption({
+        flags: { key: AccountArguments.Account.name },
+        description: HelpStrings.auth.switch.options.account,
+        optionalInNonInteractive: true,
+    });
+    await argumentProvider.runVerb();
+    const accountManager = argumentProvider.getAccountManager();
+    const requested = await argumentProvider.getOption(AccountArguments.Account.name, true);
+    const jsonMode = argumentProvider.isJsonMode();
+    const accounts = await accountManager.listCachedAccountsAsync();
+    if (accounts.length === 0) {
+        if (jsonMode) {
+            printJsonSuccess({ activeAccount: null });
+            return;
+        }
+        printWarning(`No cached accounts. Run \`${CLI_BINARY_NAME} auth login\` first.`);
+        return;
+    }
+    let target = requested;
+    if (!target) {
+        if (accounts.length === 1) {
+            // No-op confirmation: the only account is also the active one.
+            const onlyAccount = await accountManager.setActiveAccountAsync(accounts[0].homeAccountId);
+            _emitSuccess(onlyAccount.username, onlyAccount.homeAccountId, jsonMode);
+            return;
+        }
+        // JSON-mode callers can't sensibly answer an interactive picker, so we treat
+        // `--json` as implying non-interactive for the disambiguation prompt — same
+        // way we treat `--non-interactive` itself.
+        if (jsonMode || !getSettings().interactive) {
+            throw new UsageError(`Multiple accounts are cached. Pass --account <email> to choose one.\n` +
+                accounts.map((a) => `  - ${a.username}`).join('\n'));
+        }
+        target = await promptSelect({
+            message: 'Choose the active account:',
+            options: accounts.map((a) => ({
+                value: a.homeAccountId,
+                label: a.username,
+                hint: a.isActive ? 'currently active' : undefined,
+            })),
+        });
+    }
+    const resolved = await accountManager.setActiveAccountAsync(target);
+    _emitSuccess(resolved.username, resolved.homeAccountId, jsonMode);
+}
+function _emitSuccess(username, homeAccountId, jsonMode) {
+    if (jsonMode) {
+        printJsonSuccess({ activeAccount: { username, homeAccountId } });
+    }
+    else {
+        printSuccess(`Active account is ${username}.`);
+    }
+}
+//# sourceMappingURL=AuthSwitch.js.map

package/dist/Verbs/AuthSwitch.js.map

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

package/dist/Verbs/BuildMaafApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BuildMaafApp.d.ts","sourceRoot":"","sources":["../../src/Verbs/BuildMaafApp.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAS5D,wBAAsB,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuEzF"}
+{"version":3,"file":"BuildMaafApp.d.ts","sourceRoot":"","sources":["../../src/Verbs/BuildMaafApp.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAW5D,wBAAsB,iBAAiB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoIzF"}

package/dist/Verbs/BuildMaafApp.js

@@ -3,11 +3,13 @@
  */
 import { buildAsync } from '@microsoft/managed-apps-actions';
 import { AppConfigFileName } from '@microsoft/managed-apps-common/config';
-import { getCliLogger } from '../CliSettings.js';
+import { getCliLogger, getSettings } from '../CliSettings.js';
 import { resolveAppNameAsync } from '../CliUtils.js';
 import { HelpStrings } from '../Constants/HelpStrings.js';
 import { UsageError } from '../Errors/CliError.js';
-import { printInfo, printJsonSuccess, printSuccess } from '../Utils/ConsoleOutput.js';
+import { waitForBuildStatusAsync } from '../Utils/BuildPolling.js';
+import { printInfo, printJsonLine, printJsonSuccess, printSuccess } from '../Utils/ConsoleOutput.js';
+import { withGitHubDcfRecoveryAsync } from '../Utils/DcfRecovery.js';
 import { resolveGitDefaults } from '../Utils/GitUtils.js';
 import { BuildMaafAppArguments } from './VerbConstants.js';
 export async function buildMaafAppAsync(argumentProvider) {
@@ -25,6 +27,7 @@ export async function buildMaafAppAsync(argumentProvider) {
         throw new UsageError('Unable to determine tenant ID. Ensure you are logged in.');
     }
     const appName = await resolveAppNameAsync(argumentProvider);
+    const noWait = (await argumentProvider.getOption('noWait')) === true;
     // Resolve commit SHA: --commit flag → current HEAD → error
     const commitFromFlag = await argumentProvider.getOption('commit', 
     /* ignorePrompt */ true);
@@ -42,44 +45,85 @@ export async function buildMaafAppAsync(argumentProvider) {
         branch = gitDefaults.detached ? undefined : gitDefaults.branch;
         resolvedFromGit = true;
     }
-    if (resolvedFromGit && !argumentProvider.isJsonMode()) {
+    const jsonMode = argumentProvider.isJsonMode();
+    if (resolvedFromGit && !jsonMode) {
         printInfo(branch
             ? `Using branch '${branch}' at commit ${commitSha}.`
             : `Detached HEAD at commit ${commitSha}.`);
     }
-    const result = await buildAsync({
-        tenantId,
-        environmentId,
+    // repoType / externalRepoUrl drive the catch-and-retry branch. Both come
+    // from ms.config.json via CliSettings; absent or non-github → no DCF.
+    const appConfig = getSettings().appConfig;
+    const repoType = appConfig?.repoType;
+    const externalRepoUrl = appConfig?.externalRepoUrl;
+    const openBrowser = (await argumentProvider.getOption(BuildMaafAppArguments.OpenBrowser.camelName, 
+    /* ignorePrompt */ true)) ?? false;
+    // Forces DCF re-authentication even when a valid mapping exists.
+    const forceReauth = (await argumentProvider.getOption(BuildMaafAppArguments.ForceReauth.camelName, 
+    /* ignorePrompt */ true)) ?? false;
+    // Emit a `build-validation` boundary in NDJSON output for github-bound apps so
+    // automation can distinguish the validation phase from the catch-and-retry DCF.
+    // Gated to github + json to keep the wire contract unchanged for native/none and
+    // for pretty-output consumers.
+    if (jsonMode && repoType === 'github') {
+        printJsonLine({ phase: 'build-validation' });
+    }
+    // On `repoType: 'github'`, wrap buildAsync with the DCF catch-and-retry:
+    // a missing/expired GitHub identity mapping is recovered in-band by running
+    // DCF and retrying once; any other recognized server error is mapped to a
+    // friendly CLI error. Non-github flows pass through untouched. See
+    // `withGitHubDcfRecoveryAsync` for the full contract.
+    const runBuild = ({ isRetry }) => buildAsync({
         logger: getCliLogger(),
-        actionsParams: { appName, commitSha },
+        actionsParams: {
+            appName,
+            commitSha,
+            ...(forceReauth && !isRetry && repoType === 'github' && { forceReauth: true }),
+        },
+    });
+    const result = await withGitHubDcfRecoveryAsync(runBuild, {
+        repoType,
+        externalRepoUrl,
+        tenantId,
+        jsonMode,
+        openBrowser,
+        verb: 'app build',
     });
     if (result === null) {
-        if (argumentProvider.isJsonMode()) {
-            printJsonSuccess({ cached: true });
-        }
-        else {
-            printSuccess('Build already up to date for this commit.');
-        }
+        printCachedBuildMessage(argumentProvider.isJsonMode(), commitSha);
+        return;
+    }
+    if (noWait) {
+        printNoWaitMessage(argumentProvider.isJsonMode(), appName, commitSha);
+        return;
+    }
+    const finalStatus = await waitForBuildStatusAsync({
+        appName,
+        commitSha,
+        initialWaitMs: result.retryAfterMs ?? 1000,
+        isJsonMode: argumentProvider.isJsonMode(),
+    });
+    if (argumentProvider.isJsonMode()) {
+        printJsonSuccess(finalStatus);
     }
     else {
-        if (argumentProvider.isJsonMode()) {
-            printJsonSuccess({ operationId: result.operationId, retryAfterMs: result.retryAfterMs });
-        }
-        else {
-            printSuccess(`Build started. Operation ID: ${result.operationId}`);
+        printSuccess(`Build status: ${finalStatus.status}`);
+        if (finalStatus.status === 'Succeeded') {
+            printInfo(`Run \`ms app dev\` to run your app locally, or ` +
+                `\`ms app deploy --commit ${commitSha}\` to make this app live.`);
         }
     }
 }
 function createOptionSchema(argumentProvider) {
-    argumentProvider.setDescription(HelpStrings.deprecated.Verbs['Build-app'].Description);
-    argumentProvider.addExamples(HelpStrings.deprecated.Verbs['Build-app'].Examples);
+    argumentProvider.setDescription(HelpStrings.app.build.description);
+    argumentProvider.addExamples(HelpStrings.app.build.examples);
     argumentProvider.addOptions([
         {
             flags: {
                 key: BuildMaafAppArguments.AppName.name,
             },
             env: BuildMaafAppArguments.AppName.envVar,
-            description: HelpStrings.deprecated.Verbs['Build-app'].Options.AppName,
+            description: HelpStrings.app.build.options.appName,
             optionalInNonInteractive: true,
         },
         {
@@ -88,9 +132,41 @@ function createOptionSchema(argumentProvider) {
                 alias: BuildMaafAppArguments.CommitSha.alias,
             },
             env: BuildMaafAppArguments.CommitSha.envVar,
-            description: HelpStrings.deprecated.Verbs['Build-app'].Options.CommitSha,
+            description: HelpStrings.app.build.options.commitSha,
+            optionalInNonInteractive: true,
+        },
+        {
+            flags: {
+                key: BuildMaafAppArguments.NoWait.name,
+            },
+            description: HelpStrings.app.build.options.noWait,
             optionalInNonInteractive: true,
         },
     ]);
+    argumentProvider.addSwitch({
+        flags: { key: BuildMaafAppArguments.OpenBrowser.name },
+        description: HelpStrings.app.build.options.openBrowser,
+    });
+    argumentProvider.addSwitch({
+        flags: { key: BuildMaafAppArguments.ForceReauth.name },
+        description: HelpStrings.app.build.options.forceReauth,
+    });
+}
+function printNoWaitMessage(isJsonMode, appName, commitSha) {
+    if (isJsonMode) {
+        printJsonSuccess({
+            commitSha,
+            buildStatusCommand: `ms app build-status --app ${appName} --commit ${commitSha}`,
+        });
+        return;
+    }
+    printSuccess(`Build started for commit ${commitSha}. Run \`ms app build-status --app ${appName} --commit ${commitSha}\` to check status.`);
+}
+function printCachedBuildMessage(isJsonMode, commitSha) {
+    if (isJsonMode) {
+        printJsonSuccess({ cached: true, commitSha });
+        return;
+    }
+    printSuccess('Build already up to date for this commit.');
 }
 //# sourceMappingURL=BuildMaafApp.js.map

package/dist/Verbs/BuildMaafApp.js.map

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

package/dist/Verbs/ConnectorHelpers.d.ts

@@ -1,7 +1,8 @@
 /*!
  * Copyright (C) Microsoft Corporation. All rights reserved.
  */
-import type { Api } from '@microsoft/managed-apps-actions';
+import type { Api, EffectiveConnectorDataPolicy } from '@microsoft/managed-apps-actions';
+import type { Region } from '@microsoft/managed-apps-common/services';
 import type { ArgumentProvider } from '../ArgumentProvider.js';
 /**
  * Preflight step shared by `app add action` and `app add table`. Fetches the
@@ -22,6 +23,7 @@ import type { ArgumentProvider } from '../ArgumentProvider.js';
 export declare function runConnectorDlpPreflightAsync(argumentProvider: ArgumentProvider, apiId: string): Promise<{
     connector: Api;
     tenantId: string | undefined;
+    policy: EffectiveConnectorDataPolicy;
 }>;
 /**
  * Resolves a connection for a connector. In interactive mode, lists the
@@ -34,4 +36,55 @@ export declare function resolveConnectionInteractivelyAsync(options: {
     apiId: string;
     connector: Api;
 }): Promise<string>;
+/**
+ * Best-effort request that the calling application be added to a connection's
+ * API Hubs ACL via the Power Platform user-consent endpoint. The server reads
+ * the calling app's `appid` from the bearer token, and the gateway resolves
+ * tenant + environment from the auth context and its routing config — so the
+ * CLI only needs to supply connector + connection identifiers, no body.
+ *
+ * Gating: requires the opt-in feature flag
+ * `MS_CLI_ENABLE_CONNECTOR_USER_CONSENT=true` (off by default while the
+ * consent endpoint is rolling out). When the flag is unset, the call is
+ * silently skipped — no warning, no telemetry, no HTTP traffic.
+ *
+ * Failure modes:
+ *  - HTTP 403: emits a permission-specific warning explaining that the tenant
+ *    admin must grant the calling app the
+ *    `Connectivity.Connections.UserConsent` delegated permission, then returns.
+ *  - Any other HTTP / network error: surfaces a generic warning and returns.
+ *    The underlying `ConnectivityService` already records its own
+ *    `scenario.failure` telemetry, so this helper doesn't re-emit a duplicate
+ *    error event.
+ *
+ * Silent on success: a 200 OK does not guarantee the ACL was modified (the
+ * server has feature-gated silent-skip paths), so the success path emits no
+ * user-facing message.
+ *
+ * Never throws.
+ */
+export declare function requestCliUserConsentAsync(opts: {
+    apiId: string;
+    connectionId: string;
+}): Promise<void>;
+type ConnectionServerConfig = {
+    connectorName: string;
+    environmentId: string;
+    region: Region;
+};
+type ConnectionResult = {
+    status: 'created' | 'cancelled' | 'error';
+    connectionId?: string;
+    connectionName?: string;
+    displayName?: string;
+    errorMessage?: string;
+};
+/**
+ * Starts a local HTTP server, opens the maaf-player connection page in the
+ * browser, and waits for a callback with the result. Uses the same pattern
+ * as an OAuth authorization code flow: nonce for CSRF, protocol version for
+ * drift detection, and a timeout for cleanup.
+ */
+export declare function startConnectionServerAsync(config: ConnectionServerConfig): Promise<ConnectionResult>;
+export {};
 //# sourceMappingURL=ConnectorHelpers.d.ts.map

package/dist/Verbs/ConnectorHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectorHelpers.d.ts","sourceRoot":"","sources":["../../src/Verbs/ConnectorHelpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAgC,MAAM,iCAAiC,CAAC;AASzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAc5D;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,6BAA6B,CACjD,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,SAAS,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC,CA6C3D;AAED;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,OAAO,EAAE;IACjE,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,GAAG,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsDlB"}
+{"version":3,"file":"ConnectorHelpers.d.ts","sourceRoot":"","sources":["../../src/Verbs/ConnectorHelpers.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAUzF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yCAAyC,CAAC;AAKtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAiB5D;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,6BAA6B,CACjD,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IACT,SAAS,EAAE,GAAG,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,MAAM,EAAE,4BAA4B,CAAC;CACtC,CAAC,CA6CD;AAED;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,OAAO,EAAE;IACjE,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,GAAG,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CA0FlB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BhB;AAMD,KAAK,sBAAsB,GAAG;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAqH3B"}