@aifabrix/builder 2.53.0 → 2.54.1

package/lib/channels/channel-add-existing.js

@@ -2,8 +2,6 @@
  * Existing-channel skip path for aifabrix channel add.
  *
  * @fileoverview Keep add-channel.js under the 500-line limit
- * @author AI Fabrix Team
- * @version 1.0.0
  */
 
 'use strict';
@@ -11,8 +9,62 @@
 const fs = require('fs');
 const path = require('path');
 const { getArtifactOutputPath } = require('./channel-artifact-generator');
-const { buildChannelApprovalGuide } = require('./channel-approval-guide');
-const { displayExistingChannelStatus } = require('./channel-status-display');
+const { printVendorChannelValidated } = require('./channel-add-remaining');
+const { applySlackOnboardToCtx } = require('./slack-channel-add');
+const { runSkippedRemoteMcpTty } = require('./channel-add-continuations');
+const { resolveChannelRuntimeValues } = require('./channel-runtime-resolver');
+const { vendorFacingUrlsFromCtx } = require('./vendor-dataplane-url');
+const { loadChannelPackageContext } = require('./channel-discovery');
+const { getDefaultChannelDescription } = require('./channel-targets');
+const {
+  applyPriorOauthPluginVaultReference,
+  hasOauthPluginVaultReference
+} = require('./microsoft-copilot-channel-add');
+
+/**
+ * @param {Object} ctx
+ * @param {Object|null} slack
+ * @param {Object|null} teamsBot
+ * @returns {Object}
+ */
+function liveInstallTtyCtx(ctx, slack, teamsBot) {
+  return {
+    ...ctx,
+    slackConnected: Boolean(slack && slack.connected),
+    slackRemaining: slack && slack.remaining,
+    slackSlashCommand: slack && slack.slashCommand,
+    slackHandshakeFailed: Boolean(slack && slack.handshakeFailed),
+    slackAppSettingsUrl: slack && slack.slackAppSettingsUrl,
+    slackInstallAppUrl: slack && slack.slackInstallAppUrl,
+    slackWorkspaceApproveUrl: slack && slack.slackWorkspaceApproveUrl,
+    teamsBotConnected: Boolean(teamsBot && teamsBot.connected),
+    teamsBotRemaining: teamsBot && teamsBot.remaining,
+    teamsBotSkipped: Boolean(teamsBot && teamsBot.skipped),
+    teamsBotOpenUrl: teamsBot && teamsBot.openUrl
+  };
+}
+
+/**
+ * @param {string} name
+ * @returns {string}
+ */
+function quoteChannelAddName(name) {
+  return `"${String(name || '').trim().replace(/"/g, '\\"')}"`;
+}
+
+/**
+ * @param {Object} params
+ * @returns {string}
+ */
+function formatReplaceExistingChannelError(params) {
+  const nameArg = quoteChannelAddName(params.baseName || params.newName);
+  return [
+    `Channel already configured as "${params.existingName}". ` +
+      `Use --force to replace with "${params.newName}".`,
+    '',
+    `aifabrix channel add ${params.channelTarget} --name ${nameArg} --force`
+  ].join('\n');
+}
 
 /**
  * True when local channel package files are present under dist/channels/<target>/.
@@ -28,45 +80,125 @@ function localChannelArtifactsExist(projectRoot, channelTarget) {
 
 /**
  * @param {Object} params
- * @returns {Object|null}
+ * @returns {string}
+ */
+function skippedAppDescription(params) {
+  const fromExisting =
+    params.existing && typeof params.existing.description === 'string'
+      ? params.existing.description.trim()
+      : '';
+  return fromExisting || getDefaultChannelDescription();
+}
+
+/**
+ * @param {Object} params
+ * @returns {Promise<Object>}
+ */
+async function resolveSkippedRuntimeValues(params) {
+  const { channelTarget, name, baseName, ctx } = params;
+  let packageContext = null;
+  try {
+    packageContext = await loadChannelPackageContext({
+      dataplaneBaseUrl: ctx.dataplaneUrl,
+      authConfig: ctx.authConfig,
+      channelTarget
+    });
+  } catch {
+    packageContext = null;
+  }
+  const vendor = vendorFacingUrlsFromCtx(ctx);
+  return resolveChannelRuntimeValues({
+    dataplaneBaseUrl: vendor.dataplaneBaseUrl,
+    controllerUrl: vendor.controllerUrl,
+    channelTarget,
+    appName: name,
+    baseName,
+    environment: ctx.environment,
+    appDescription: skippedAppDescription(params),
+    packageContext
+  });
+}
+
+/**
+ * Canonical remaining TTY without regenerating artifacts.
+ * @param {Object} params
+ * @returns {Promise<void>}
  */
-function showExistingChannelStatus(params) {
-  const { existing, options, channelTarget, name, baseName, ctx } = params;
+async function printSkippedChannelCanonicalTty(params) {
+  if (params.channelTarget === 'chatgpt' || params.channelTarget === 'claude') {
+    const runtimeValues = await resolveSkippedRuntimeValues(params);
+    await runSkippedRemoteMcpTty({ ...params, runtimeValues });
+    return;
+  }
+  let ctx = {
+    ...(params.ctx || {}),
+    projectRoot: (params.ctx && params.ctx.projectRoot) || (params.options && params.options.projectRoot)
+  };
+  if (params.channelTarget === 'slack') {
+    ctx = await applySlackOnboardToCtx(ctx, params.options || {});
+  }
+  printVendorChannelValidated(params.channelTarget, ctx, params.runtimeValues);
+}
+
+/**
+ * @param {Object} params
+ * @returns {Promise<Object|null>}
+ */
+async function showExistingChannelStatus(params) {
+  const { existing, options, channelTarget, name, baseName } = params;
   if (!existing || options.force || options.dryRun) return null;
   const sameInstall =
     (existing.baseName && existing.baseName === baseName) ||
     (!existing.baseName && existing.name === name);
   if (!sameInstall) {
     throw new Error(
-      `Channel already configured as "${existing.name}". ` +
-        `Use --force to replace with "${name}".`
+      formatReplaceExistingChannelError({
+        existingName: existing.name,
+        newName: name,
+        baseName,
+        channelTarget
+      })
     );
   }
   const projectRoot = options.projectRoot || process.cwd();
-  // Dataplane may still have the channel while local dist/ was deleted — regenerate.
   if (!localChannelArtifactsExist(projectRoot, channelTarget)) {
     return null;
   }
-  const approvalGuide =
-    existing.status === 'approvalRequired'
-      ? buildChannelApprovalGuide(channelTarget, {
-        projectRoot,
-        name: existing.name || name,
-        baseName,
-        dataplaneBaseUrl: ctx?.dataplaneUrl,
-        environment: ctx?.environment || 'dev'
-      })
-      : null;
-  displayExistingChannelStatus({
-    channelTarget,
-    name: existing.name || name,
-    channelExt: existing,
-    approvalGuide
-  });
-  return { skipped: true, channelExt: existing };
+  if (options.quiet !== true) {
+    await printSkippedChannelCanonicalTty(params);
+  }
+  return { skipped: true, channelExt: existing, runtimeValues: params.runtimeValues };
+}
+
+/**
+ * Existing Copilot CS is not complete until Teams Entra SSO is stored.
+ * Slack always regenerates and updates the remote app.
+ * @param {string} channelTarget
+ * @param {Object} options
+ * @param {Object|null} skipped
+ * @returns {boolean}
+ */
+function shouldReturnSkippedChannel(channelTarget, options, skipped) {
+  if (!skipped) {
+    return false;
+  }
+  if (channelTarget === 'slack') {
+    return false;
+  }
+  if (channelTarget !== 'microsoft-copilot') {
+    return true;
+  }
+  if (options.continueInstall === true) {
+    return false;
+  }
+  applyPriorOauthPluginVaultReference(options);
+  return hasOauthPluginVaultReference(options);
 }
 
 module.exports = {
   localChannelArtifactsExist,
-  showExistingChannelStatus
+  formatReplaceExistingChannelError,
+  liveInstallTtyCtx,
+  showExistingChannelStatus,
+  shouldReturnSkippedChannel
 };

package/lib/channels/channel-add-failure.js

@@ -0,0 +1,60 @@
+/**
+ * Shared failure-boundary formatting for channel add.
+ *
+ * @fileoverview Classify channel install errors without collapsing the original detail
+ * @author AI Fabrix Team
+ * @version 1.0.0
+ */
+
+'use strict';
+
+const { formatBlockingError } = require('../utils/cli-test-layout-chalk');
+
+const BOUNDARY_MATCHERS = [
+  {
+    boundary: 'usage',
+    tests: [/unknown channel/i, /already configured/i, /needs a terminal/i, /--name is required/i, /needs --target/i, /unknown mcp client profile/i]
+  },
+  { boundary: 'experimental', tests: [/is experimental/i] },
+  { boundary: 'preflight', tests: [/chatgpt preflight/i, /claude preflight/i, /mcp client preflight/i, /authentication required/i, /dataplanebaseurl is required/i] },
+  { boundary: 'callback', tests: [/chatgpt callback/i, /claude callback/i, /mcp client callback/i] },
+  { boundary: 'oauth', tests: [/oauth/i, /trustedissuer/i, /vault-reference/i] },
+  { boundary: 'permissions', tests: [/forbidden/i, /\b403\b/, /not allowed/i, /integration-client:/i] },
+  { boundary: 'credential', tests: [/credential/i] },
+  { boundary: 'probe', tests: [/\bprobe\b/i] },
+  { boundary: 'publication', tests: [/publication/i] }
+];
+
+/**
+ * Map an install error to a failure boundary label.
+ * @param {Error|string} error
+ * @returns {string} Boundary key (usage, oauth, install, …)
+ */
+function classifyChannelAddFailureBoundary(error) {
+  const message = error && error.message ? String(error.message) : String(error);
+  const hit = BOUNDARY_MATCHERS.find((row) => row.tests.some((re) => re.test(message)));
+  return hit ? hit.boundary : 'install';
+}
+
+/**
+ * Blocking error that keeps the original detail (does not collapse to a generic line).
+ * @param {Error|string} error
+ * @returns {string}
+ */
+function formatChannelAddFailure(error) {
+  const detail = error && error.message ? String(error.message) : String(error);
+  if (
+    /^channel install failed/i.test(detail) ||
+    /^Unknown channel:/i.test(detail) ||
+    /^Channel already configured/i.test(detail)
+  ) {
+    return formatBlockingError(detail);
+  }
+  const boundary = classifyChannelAddFailureBoundary(error);
+  return formatBlockingError(`Channel install failed (${boundary}):\n${detail}`);
+}
+
+module.exports = {
+  classifyChannelAddFailureBoundary,
+  formatChannelAddFailure
+};