@quiltdata/benchling-webhook 0.7.2-20251106T010445Z → 0.7.3-20251106T131511Z

package/dist/bin/commands/setup-wizard.js

@@ -53,32 +53,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupWizardCommand = setupWizardCommand;
 const https = __importStar(require("https"));
-const fs_1 = require("fs");
-const path_1 = require("path");
 const inquirer_1 = __importDefault(require("inquirer"));
 const chalk_1 = __importDefault(require("chalk"));
-const boxen_1 = __importDefault(require("boxen"));
-const ora_1 = __importDefault(require("ora"));
 const client_s3_1 = require("@aws-sdk/client-s3");
 const xdg_config_1 = require("../../lib/xdg-config");
 const infer_quilt_config_1 = require("../commands/infer-quilt-config");
+const sqs_1 = require("../../lib/utils/sqs");
 const manifest_1 = require("./manifest");
-const sync_secrets_1 = require("./sync-secrets");
-const deploy_1 = require("./deploy");
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const pkg = require("../../package.json");
-const MANIFEST_FILENAME = "benchling-app-manifest.yaml";
-function getAccountFromStackArn(stackArn) {
-    if (!stackArn) {
-        return undefined;
-    }
-    const parts = stackArn.split(":");
-    if (parts.length < 5) {
-        return undefined;
-    }
-    const account = parts[4];
-    return /^[0-9]{12}$/.test(account) ? account : undefined;
-}
 // =============================================================================
 // VALIDATION FUNCTIONS (from scripts/config/validator.ts)
 // =============================================================================
@@ -285,311 +266,195 @@ async function runConfigWizard(options = {}) {
         console.log(`Creating profile inheriting from: ${inheritFrom}\n`);
     }
     const config = { ...existingConfig };
+    let awsAccountId;
     // If non-interactive, validate that all required fields are present
     if (nonInteractive) {
         if (!config.benchling?.tenant || !config.benchling?.clientId || !config.benchling?.clientSecret) {
             throw new Error("Non-interactive mode requires benchlingTenant, benchlingClientId, and benchlingClientSecret to be already configured");
         }
-        return config;
+        // Add metadata and inheritance marker before returning
+        const now = new Date().toISOString();
+        const finalConfig = config;
+        finalConfig._metadata = {
+            version: "0.7.0",
+            createdAt: config._metadata?.createdAt || now,
+            updatedAt: now,
+            source: "wizard",
+        };
+        if (inheritFrom) {
+            finalConfig._inherits = inheritFrom;
+        }
+        return finalConfig;
     }
     // Prompt for Quilt configuration (if not inherited)
     if (!inheritFrom) {
-        // Check if all required Quilt fields are already present (from inference)
-        // Note: bucket is optional and can be inferred from other sources if missing
-        const hasAllQuiltFields = config.quilt?.stackArn &&
-            config.quilt?.catalog &&
-            config.quilt?.database &&
-            config.quilt?.queueArn;
-        let shouldPromptForQuilt = !hasAllQuiltFields;
-        if (hasAllQuiltFields) {
-            console.log("Step 1: Quilt Configuration (inferred from AWS)\n");
-            console.log(`  Stack ARN: ${config.quilt.stackArn}`);
-            console.log(`  Catalog: ${config.quilt.catalog}`);
-            console.log(`  Database: ${config.quilt.database}`);
-            console.log(`  Queue ARN: ${config.quilt.queueArn}`);
-            if (config.quilt.bucket) {
-                console.log(`  Bucket: ${config.quilt.bucket}`);
-            }
-            console.log("");
-            const { confirmQuilt } = await inquirer_1.default.prompt([
-                {
-                    type: "confirm",
-                    name: "confirmQuilt",
-                    message: "Use these inferred Quilt settings?",
-                    default: true,
-                },
-            ]);
-            if (!confirmQuilt) {
-                console.log("\nPlease enter Quilt configuration manually:\n");
-                shouldPromptForQuilt = true;
-            }
-        }
-        // Only prompt for Quilt fields if not all are present OR user chose to enter manually
-        if (shouldPromptForQuilt) {
-            if (!hasAllQuiltFields) {
-                console.log("Step 1: Quilt Configuration\n");
-                console.log("Note: Run 'npm run setup:infer' first to auto-detect Quilt stack\n");
-            }
-            const quiltAnswers = await inquirer_1.default.prompt([
-                {
-                    type: "input",
-                    name: "stackArn",
-                    message: "Quilt Stack ARN:",
-                    default: config.quilt?.stackArn,
-                    validate: (input) => input.trim().length > 0 && input.startsWith("arn:aws:cloudformation:") ||
-                        "Stack ARN is required and must start with arn:aws:cloudformation:",
-                },
-                {
-                    type: "input",
-                    name: "catalog",
-                    message: "Quilt Catalog URL (domain or full URL):",
-                    default: config.quilt?.catalog,
-                    validate: (input) => {
-                        const trimmed = input.trim();
-                        if (trimmed.length === 0) {
-                            return "Catalog URL is required";
-                        }
-                        return true;
-                    },
-                    filter: (input) => {
-                        // Strip protocol if present, store only domain
-                        return input.trim().replace(/^https?:\/\//, "").replace(/\/$/, "");
-                    },
-                },
-                {
-                    type: "input",
-                    name: "bucket",
-                    message: "Quilt S3 Bucket:",
-                    default: config.quilt?.bucket,
-                    validate: (input) => input.trim().length > 0 || "Bucket name is required",
+        console.log("Step 1: Quilt Configuration\n");
+        const quiltAnswers = await inquirer_1.default.prompt([
+            {
+                type: "input",
+                name: "stackArn",
+                message: "Quilt Stack ARN:",
+                default: config.quilt?.stackArn,
+                validate: (input) => input.trim().length > 0 && input.startsWith("arn:aws:cloudformation:") ||
+                    "Stack ARN is required and must start with arn:aws:cloudformation:",
+            },
+            {
+                type: "input",
+                name: "catalog",
+                message: "Quilt Catalog URL (domain or full URL):",
+                default: config.quilt?.catalog,
+                validate: (input) => {
+                    const trimmed = input.trim();
+                    if (trimmed.length === 0) {
+                        return "Catalog URL is required";
+                    }
+                    return true;
                 },
-                {
-                    type: "input",
-                    name: "database",
-                    message: "Quilt Athena Database:",
-                    default: config.quilt?.database || "quilt_catalog",
-                    validate: (input) => input.trim().length > 0 || "Database name is required",
+                filter: (input) => {
+                    // Strip protocol if present, store only domain
+                    return input.trim().replace(/^https?:\/\//, "").replace(/\/$/, "");
                 },
-                {
-                    type: "input",
-                    name: "queueArn",
-                    message: "SQS Queue ARN:",
-                    default: config.quilt?.queueArn,
-                    validate: (input) => input.trim().length > 0 && input.startsWith("arn:aws:sqs:") ||
-                        "Queue ARN is required and must start with arn:aws:sqs:",
+            },
+            {
+                type: "input",
+                name: "database",
+                message: "Quilt Athena Database:",
+                default: config.quilt?.database || "quilt_catalog",
+                validate: (input) => input.trim().length > 0 || "Database name is required",
+            },
+            {
+                type: "input",
+                name: "queueUrl",
+                message: "SQS Queue URL:",
+                default: config.quilt?.queueUrl,
+                validate: (input) => {
+                    return (0, sqs_1.isQueueUrl)(input) ||
+                        "Queue URL is required and must look like https://sqs.<region>.amazonaws.com/<account>/<queue>";
                 },
-            ]);
-            // Extract region from stack ARN
-            const arnMatch = quiltAnswers.stackArn.match(/^arn:aws:cloudformation:([^:]+):/);
-            const quiltRegion = arnMatch ? arnMatch[1] : "us-east-1";
-            config.quilt = {
-                stackArn: quiltAnswers.stackArn,
-                catalog: quiltAnswers.catalog,
-                bucket: quiltAnswers.bucket,
-                database: quiltAnswers.database,
-                queueArn: quiltAnswers.queueArn,
-                region: quiltRegion,
-            };
-        }
+            },
+        ]);
+        // Extract region and account ID from stack ARN
+        // ARN format: arn:aws:cloudformation:REGION:ACCOUNT_ID:stack/STACK_NAME/STACK_ID
+        const arnMatch = quiltAnswers.stackArn.match(/^arn:aws:cloudformation:([^:]+):(\d{12}):/);
+        const quiltRegion = arnMatch ? arnMatch[1] : "us-east-1";
+        awsAccountId = arnMatch ? arnMatch[2] : undefined;
+        config.quilt = {
+            stackArn: quiltAnswers.stackArn,
+            catalog: quiltAnswers.catalog,
+            database: quiltAnswers.database,
+            queueUrl: quiltAnswers.queueUrl,
+            region: quiltRegion,
+        };
     }
-    // Prompt for Benchling configuration & guide app setup
-    console.log("\nStep 2: Create Benchling App\n");
-    let benchlingTenant = config.benchling?.tenant?.trim();
-    benchlingTenant = benchlingTenant && benchlingTenant.length > 0 ? benchlingTenant : undefined;
-    if (nonInteractive) {
-        if (!benchlingTenant) {
-            throw new Error("Benchling tenant must be provided in non-interactive mode");
-        }
+    // Prompt for Benchling configuration
+    console.log("\nStep 2: Benchling Configuration\n");
+    // First, get tenant
+    const tenantAnswer = await inquirer_1.default.prompt([
+        {
+            type: "input",
+            name: "tenant",
+            message: "Benchling Tenant:",
+            default: config.benchling?.tenant,
+            validate: (input) => input.trim().length > 0 || "Tenant is required",
+        },
+    ]);
+    // Ask if they have an app_definition_id BEFORE asking for credentials
+    const hasAppDefId = await inquirer_1.default.prompt([
+        {
+            type: "confirm",
+            name: "hasIt",
+            message: "Do you have a Benchling App Definition ID for this app?",
+            default: !!config.benchling?.appDefinitionId,
+        },
+    ]);
+    let appDefinitionId;
+    if (hasAppDefId.hasIt) {
+        // They have it, ask for it
+        const appDefAnswer = await inquirer_1.default.prompt([
+            {
+                type: "input",
+                name: "appDefinitionId",
+                message: "Benchling App Definition ID:",
+                default: config.benchling?.appDefinitionId,
+                validate: (input) => input.trim().length > 0 || "App definition ID is required",
+            },
+        ]);
+        appDefinitionId = appDefAnswer.appDefinitionId;
     }
     else {
-        while (!benchlingTenant) {
-            const tenantAnswer = await inquirer_1.default.prompt([
-                {
-                    type: "input",
-                    name: "tenant",
-                    message: "Benchling tenant (e.g., 'acme' for acme.benchling.com):",
-                    default: config.benchling?.tenant || "",
-                    filter: (value) => value.trim(),
-                    validate: (input) => input.trim().length > 0 || "Tenant is required",
-                },
-            ]);
-            const candidateTenant = tenantAnswer.tenant.trim();
-            const tenantValidation = await validateBenchlingTenant(candidateTenant);
-            if (tenantValidation.isValid) {
-                benchlingTenant = candidateTenant;
-                if (tenantValidation.warnings && tenantValidation.warnings.length > 0) {
-                    console.warn("");
-                    console.warn("⚠ Tenant validation warnings:");
-                    tenantValidation.warnings.forEach((warning) => console.warn(`  - ${warning}`));
-                    console.warn("");
-                }
-            }
-            else {
-                console.error("\n❌ Benchling tenant validation failed:");
-                tenantValidation.errors.forEach((err) => console.error(`  - ${err}`));
-                console.log("");
-            }
-        }
-    }
-    let manifestPath = (0, path_1.join)(process.cwd(), MANIFEST_FILENAME);
-    if (!nonInteractive) {
-        const manifestContent = (0, manifest_1.generateBenchlingManifest)({
-            catalogDomain: config.quilt?.catalog,
-            version: pkg.version,
+        // They don't have it, create the manifest and show instructions
+        console.log("\n" + chalk_1.default.blue("Creating app manifest...") + "\n");
+        // Create manifest using the existing command
+        await (0, manifest_1.manifestCommand)({
+            catalog: config.quilt?.catalog,
+            output: "app-manifest.yaml",
         });
-        let shouldWriteManifest = true;
-        if ((0, fs_1.existsSync)(manifestPath)) {
-            const { overwrite } = await inquirer_1.default.prompt([
-                {
-                    type: "confirm",
-                    name: "overwrite",
-                    message: `A manifest already exists at ${manifestPath}. Overwrite it?`,
-                    default: false,
-                },
-            ]);
-            shouldWriteManifest = overwrite;
-            if (!overwrite) {
-                console.log(`\nUsing existing manifest: ${manifestPath}`);
-            }
-        }
-        if (shouldWriteManifest) {
-            (0, fs_1.writeFileSync)(manifestPath, manifestContent, "utf-8");
-            console.log(`\n✓ Generated app manifest: ${manifestPath}`);
-        }
-        const manifestAppName = config.quilt?.catalog && config.quilt.catalog.length > 0
-            ? config.quilt.catalog.replace(/[.:]/g, "-")
-            : "Quilt Integration";
-        const instructions = chalk_1.default.bold("Create your Benchling app:\n\n") +
-            `1. Open ${chalk_1.default.cyan(`https://${benchlingTenant}.benchling.com/admin/apps`)}\n` +
-            "2. Click 'Create New App'\n" +
-            `3. Upload the manifest: ${chalk_1.default.cyan(manifestPath)}\n` +
-            "4. Create OAuth credentials and copy the Client ID / Secret\n" +
-            "5. Install the app (leave webhook URL blank for now)\n" +
-            "6. Copy the App Definition ID from the overview page\n";
-        console.log();
-        console.log((0, boxen_1.default)(instructions, {
-            padding: 1,
-            borderColor: "blue",
-            borderStyle: "round",
-        }));
-        console.log();
-        const { ready } = await inquirer_1.default.prompt([
+        console.log("\n" + chalk_1.default.yellow("After you have installed the app in Benchling and have the App Definition ID, you can continue.") + "\n");
+        // Now ask for the app definition ID
+        const appDefAnswer = await inquirer_1.default.prompt([
             {
-                type: "confirm",
-                name: "ready",
-                message: "Have you created and installed the Benchling app?",
-                default: true,
+                type: "input",
+                name: "appDefinitionId",
+                message: "Benchling App Definition ID:",
+                validate: (input) => input.trim().length > 0 || "App definition ID is required",
             },
         ]);
-        if (!ready) {
-            console.log("\n⏸  Setup paused. Re-run when ready:\n");
-            console.log(`  ${chalk_1.default.cyan("npx @quiltdata/benchling-webhook setup")}\n`);
-            process.exit(0);
-        }
-        console.log(`Using manifest app name: ${manifestAppName}\n`);
+        appDefinitionId = appDefAnswer.appDefinitionId;
     }
-    let benchlingClientId = config.benchling?.clientId?.trim();
-    let benchlingClientSecret = config.benchling?.clientSecret?.trim();
-    let benchlingAppDefinitionId = config.benchling?.appDefinitionId?.trim();
-    let benchlingTestEntryId = config.benchling?.testEntryId?.trim();
-    if (nonInteractive) {
-        if (!benchlingClientId || !benchlingClientSecret || !benchlingAppDefinitionId) {
-            throw new Error("Non-interactive mode requires Benchling clientId, clientSecret, and appDefinitionId to be configured");
-        }
-    }
-    else {
-        let credentialsValid = false;
-        while (!credentialsValid) {
-            const credentialAnswers = await inquirer_1.default.prompt([
-                {
-                    type: "input",
-                    name: "clientId",
-                    message: "Benchling OAuth Client ID:",
-                    default: benchlingClientId || "",
-                    filter: (value) => value.trim(),
-                    validate: (input) => input.trim().length > 0 || "Client ID is required",
-                },
-                {
-                    type: "password",
-                    name: "clientSecret",
-                    message: benchlingClientSecret
-                        ? "Benchling OAuth Client Secret (press Enter to keep existing):"
-                        : "Benchling OAuth Client Secret:",
-                },
-                {
-                    type: "input",
-                    name: "appDefinitionId",
-                    message: "Benchling App Definition ID:",
-                    default: benchlingAppDefinitionId || "",
-                    filter: (value) => value.trim(),
-                    validate: (input) => input.trim().length > 0 || "App Definition ID is required",
-                },
-                {
-                    type: "input",
-                    name: "testEntryId",
-                    message: "Benchling Test Entry ID (optional):",
-                    default: benchlingTestEntryId || "",
-                    filter: (value) => value.trim(),
-                },
-            ]);
-            const candidateSecret = credentialAnswers.clientSecret.trim().length === 0 && benchlingClientSecret
-                ? benchlingClientSecret
-                : credentialAnswers.clientSecret.trim();
-            if (!candidateSecret) {
-                console.error("\n❌ Benchling OAuth client secret is required\n");
-                continue;
-            }
-            const spinner = (0, ora_1.default)("Validating Benchling credentials...").start();
-            const validation = await validateBenchlingCredentials(benchlingTenant, credentialAnswers.clientId.trim(), candidateSecret);
-            if (validation.isValid) {
-                spinner.succeed("Benchling credentials validated");
-                if (validation.warnings && validation.warnings.length > 0) {
-                    console.warn("\n⚠ Credential validation warnings:");
-                    validation.warnings.forEach((warn) => console.warn(`  - ${warn}`));
-                    console.warn("");
-                }
-                benchlingClientId = credentialAnswers.clientId.trim();
-                benchlingClientSecret = candidateSecret;
-                benchlingAppDefinitionId = credentialAnswers.appDefinitionId.trim();
-                benchlingTestEntryId = credentialAnswers.testEntryId || undefined;
-                credentialsValid = true;
-            }
-            else {
-                spinner.fail("Benchling credential validation failed");
-                console.error("");
-                validation.errors.forEach((err) => console.error(`  - ${err}`));
-                console.error("");
-                const { retry } = await inquirer_1.default.prompt([
-                    {
-                        type: "confirm",
-                        name: "retry",
-                        message: "Credentials invalid. Try again?",
-                        default: true,
-                    },
-                ]);
-                if (!retry) {
-                    throw new Error("Setup aborted due to invalid Benchling credentials");
+    // Now ask for OAuth credentials (which must come from the app)
+    const credentialAnswers = await inquirer_1.default.prompt([
+        {
+            type: "input",
+            name: "clientId",
+            message: "Benchling OAuth Client ID (from the app above):",
+            default: config.benchling?.clientId,
+            validate: (input) => input.trim().length > 0 || "Client ID is required",
+        },
+        {
+            type: "password",
+            name: "clientSecret",
+            message: config.benchling?.clientSecret
+                ? "Benchling OAuth Client Secret (press Enter to keep existing):"
+                : "Benchling OAuth Client Secret (from the app above):",
+            validate: (input) => {
+                // If there's an existing secret and input is empty, we'll keep the existing one
+                if (config.benchling?.clientSecret && input.trim().length === 0) {
+                    return true;
                 }
-            }
-        }
+                return input.trim().length > 0 || "Client secret is required";
+            },
+        },
+    ]);
+    // Ask for optional test entry ID
+    const testEntryAnswer = await inquirer_1.default.prompt([
+        {
+            type: "input",
+            name: "testEntryId",
+            message: "Benchling Test Entry ID (optional):",
+            default: config.benchling?.testEntryId || "",
+        },
+    ]);
+    // Handle empty password input - keep existing secret if user pressed Enter
+    if (credentialAnswers.clientSecret.trim().length === 0 && config.benchling?.clientSecret) {
+        credentialAnswers.clientSecret = config.benchling.clientSecret;
     }
     config.benchling = {
-        tenant: benchlingTenant,
-        clientId: benchlingClientId,
-        clientSecret: benchlingClientSecret,
-        appDefinitionId: benchlingAppDefinitionId,
+        tenant: tenantAnswer.tenant,
+        clientId: credentialAnswers.clientId,
+        clientSecret: credentialAnswers.clientSecret,
+        appDefinitionId: appDefinitionId,
     };
-    if (benchlingTestEntryId && benchlingTestEntryId.length > 0) {
-        config.benchling.testEntryId = benchlingTestEntryId;
+    if (testEntryAnswer.testEntryId && testEntryAnswer.testEntryId.trim() !== "") {
+        config.benchling.testEntryId = testEntryAnswer.testEntryId;
     }
     // Prompt for package configuration
-    console.log("\nPackage Storage Configuration\n");
+    console.log("\nStep 3: Package Configuration\n");
     const packageAnswers = await inquirer_1.default.prompt([
         {
             type: "input",
             name: "bucket",
             message: "Package S3 Bucket:",
-            default: config.packages?.bucket || config.quilt?.bucket,
+            default: config.packages?.bucket,
             validate: (input) => input.trim().length > 0 || "Bucket name is required",
         },
         {
@@ -611,17 +476,8 @@ async function runConfigWizard(options = {}) {
         metadataKey: packageAnswers.metadataKey,
     };
     // Prompt for deployment configuration
-    console.log("\nDeployment Defaults\n");
-    const defaultAccount = config.deployment?.account || getAccountFromStackArn(config.quilt?.stackArn);
+    console.log("\nStep 4: Deployment Configuration\n");
     const deploymentAnswers = await inquirer_1.default.prompt([
-        {
-            type: "input",
-            name: "account",
-            message: "AWS Account ID:",
-            default: defaultAccount || "",
-            filter: (value) => value.trim(),
-            validate: (input) => input.trim().length === 0 || /^[0-9]{12}$/.test(input.trim()) || "Account ID must be a 12 digit number",
-        },
         {
             type: "input",
             name: "region",
@@ -630,18 +486,26 @@ async function runConfigWizard(options = {}) {
         },
         {
             type: "input",
-            name: "imageTag",
-            message: "Docker image tag:",
-            default: config.deployment?.imageTag || "latest",
+            name: "account",
+            message: "AWS Account ID:",
+            default: config.deployment?.account || awsAccountId || config.quilt?.stackArn?.match(/:(\d{12}):/)?.[1],
+            validate: (input) => {
+                if (!input || input.trim().length === 0) {
+                    return "AWS Account ID is required";
+                }
+                if (!/^\d{12}$/.test(input.trim())) {
+                    return "AWS Account ID must be a 12-digit number";
+                }
+                return true;
+            },
         },
     ]);
     config.deployment = {
-        ...(deploymentAnswers.account ? { account: deploymentAnswers.account } : {}),
         region: deploymentAnswers.region,
-        imageTag: deploymentAnswers.imageTag,
+        account: deploymentAnswers.account,
     };
     // Optional: Logging configuration
-    console.log("\nSecurity and Logging Options\n");
+    console.log("\nStep 5: Optional Configuration\n");
     const optionalAnswers = await inquirer_1.default.prompt([
         {
             type: "list",
@@ -650,12 +514,6 @@ async function runConfigWizard(options = {}) {
             choices: ["DEBUG", "INFO", "WARNING", "ERROR"],
             default: config.logging?.level || "INFO",
         },
-        {
-            type: "confirm",
-            name: "enableVerification",
-            message: "Enable webhook signature verification:",
-            default: config.security?.enableVerification !== false,
-        },
         {
             type: "input",
             name: "webhookAllowList",
@@ -667,13 +525,13 @@ async function runConfigWizard(options = {}) {
         level: optionalAnswers.logLevel,
     };
     config.security = {
-        enableVerification: optionalAnswers.enableVerification,
+        enableVerification: true,
         webhookAllowList: optionalAnswers.webhookAllowList,
     };
     // Add metadata
     const now = new Date().toISOString();
     config._metadata = {
-        version: pkg.version,
+        version: "0.7.0",
         createdAt: config._metadata?.createdAt || now,
         updatedAt: now,
         source: "wizard",
@@ -695,37 +553,41 @@ async function runConfigWizard(options = {}) {
  * 5. Save to XDG config directory
  */
 async function runInstallWizard(options = {}) {
-    const { profile = "default", inheritFrom, nonInteractive = false, skipValidation = false, skipSecretsSync = false, skipDeployment = false, deployStage = "prod", awsProfile, awsRegion = "us-east-1", } = options;
+    const { profile = "default", inheritFrom, nonInteractive = false, skipValidation = false, awsProfile, awsRegion = "us-east-1", } = options;
     const xdg = new xdg_config_1.XDGConfig();
     console.log("\n╔═══════════════════════════════════════════════════════════╗");
-    const headerLine = `║   Benchling Webhook Setup (v${pkg.version})`;
-    console.log(`${headerLine.padEnd(59, " ")}║`);
+    console.log("║   Benchling Webhook Setup (v0.7.0)                        ║");
     console.log("╚═══════════════════════════════════════════════════════════╝\n");
     // Step 1: Load existing configuration (if profile exists)
     let existingConfig;
+    // Determine if we should inherit from 'default' when profile is not 'default'
+    const shouldInheritFromDefault = profile !== "default" && !inheritFrom;
+    const effectiveInheritFrom = inheritFrom || (shouldInheritFromDefault ? "default" : undefined);
     if (xdg.profileExists(profile)) {
         console.log(`Loading existing configuration for profile: ${profile}\n`);
         try {
-            existingConfig = inheritFrom
-                ? xdg.readProfileWithInheritance(profile, inheritFrom)
+            existingConfig = effectiveInheritFrom
+                ? xdg.readProfileWithInheritance(profile, effectiveInheritFrom)
                 : xdg.readProfile(profile);
         }
         catch (error) {
             console.warn(`Warning: Could not load existing config: ${error.message}`);
         }
     }
-    else if (inheritFrom) {
-        console.log(`Creating new profile '${profile}' inheriting from '${inheritFrom}'\n`);
+    else if (effectiveInheritFrom) {
+        // If profile doesn't exist but we should inherit, load base profile
+        console.log(`Creating new profile '${profile}' inheriting from '${effectiveInheritFrom}'\n`);
         try {
-            existingConfig = xdg.readProfile(inheritFrom);
+            existingConfig = xdg.readProfile(effectiveInheritFrom);
         }
         catch (error) {
-            throw new Error(`Base profile '${inheritFrom}' not found: ${error.message}`);
+            throw new Error(`Base profile '${effectiveInheritFrom}' not found: ${error.message}`);
         }
     }
     // Step 2: Infer Quilt configuration (unless inheriting from another profile)
     let quiltConfig = existingConfig?.quilt || {};
-    if (!inheritFrom || !existingConfig?.quilt) {
+    let inferredAccountId;
+    if (!effectiveInheritFrom || !existingConfig?.quilt) {
         console.log("Step 1: Inferring Quilt configuration from AWS...\n");
         try {
             const inferenceResult = await (0, infer_quilt_config_1.inferQuiltConfig)({
@@ -733,29 +595,8 @@ async function runInstallWizard(options = {}) {
                 profile: awsProfile,
                 interactive: !nonInteractive,
             });
-            // Map InferenceResult to QuiltConfig fields
-            if (inferenceResult.quiltStackArn) {
-                quiltConfig.stackArn = inferenceResult.quiltStackArn;
-            }
-            if (inferenceResult.catalogUrl) {
-                // Strip protocol and trailing slash to store only domain
-                quiltConfig.catalog = inferenceResult.catalogUrl.replace(/^https?:\/\//, "").replace(/\/$/, "");
-            }
-            if (inferenceResult.quiltUserBucket) {
-                quiltConfig.bucket = inferenceResult.quiltUserBucket;
-            }
-            if (inferenceResult.quiltDatabase) {
-                quiltConfig.database = inferenceResult.quiltDatabase;
-            }
-            if (inferenceResult.queueArn) {
-                const queueArn = inferenceResult.queueArn;
-                if (queueArn.startsWith("arn:aws:sqs:") || !quiltConfig.queueArn) {
-                    quiltConfig.queueArn = queueArn;
-                }
-            }
-            if (inferenceResult.quiltRegion) {
-                quiltConfig.region = inferenceResult.quiltRegion;
-            }
+            quiltConfig = inferenceResult;
+            inferredAccountId = inferenceResult.account;
             console.log("✓ Quilt configuration inferred\n");
         }
         catch (error) {
@@ -783,12 +624,17 @@ async function runInstallWizard(options = {}) {
             ...existingConfig?.quilt,
             ...quiltConfig,
         },
+        // Pass through inferred account ID for deployment config
+        deployment: {
+            ...existingConfig?.deployment,
+            account: existingConfig?.deployment?.account || inferredAccountId,
+        },
     };
     // Step 3: Run interactive wizard for remaining configuration
-    let config = await runConfigWizard({
+    const config = await runConfigWizard({
         existingConfig: partialConfig,
         nonInteractive,
-        inheritFrom,
+        inheritFrom: effectiveInheritFrom,
     });
     // Step 4: Validate configuration
     if (!skipValidation) {
@@ -824,66 +670,28 @@ async function runInstallWizard(options = {}) {
             console.log("");
         }
     }
-    // Step 5: Persist configuration locally
+    // Step 5: Save configuration
     console.log(`Saving configuration to profile: ${profile}...\n`);
     try {
         xdg.writeProfile(profile, config);
-        console.log(chalk_1.default.green(`✓ Configuration saved: ~/.config/benchling-webhook/${profile}/config.json\n`));
+        console.log(`✓ Configuration saved to: ~/.config/benchling-webhook/${profile}/config.json\n`);
     }
     catch (error) {
         throw new Error(`Failed to save configuration: ${error.message}`);
     }
-    // Step 6: Sync secrets and deploy (unless skipped)
-    console.log(chalk_1.default.bold("Step 3: Deploy Stack and Return Webhook URL\n"));
-    if (skipSecretsSync) {
-        console.log(chalk_1.default.yellow("Skipping secrets sync (--skip-secrets-sync)."));
-        console.log(chalk_1.default.yellow(`Run \`npm run setup:sync-secrets -- --profile ${profile}\` when ready.\n`));
+    // Step 6: Display next steps
+    console.log("╔═══════════════════════════════════════════════════════════╗");
+    console.log("║   Setup Complete!                                         ║");
+    console.log("╚═══════════════════════════════════════════════════════════╝\n");
+    console.log("Next steps:");
+    if (profile === "default") {
+        console.log("  1. Deploy to AWS: npm run deploy");
+        console.log("  2. Test integration: npm run test\n");
     }
     else {
-        console.log("Syncing secrets to AWS Secrets Manager...\n");
-        try {
-            await (0, sync_secrets_1.syncSecretsToAWS)({
-                profile,
-                awsProfile,
-                region: config.deployment.region,
-                force: true,
-            });
-            console.log(chalk_1.default.green("\n✓ Secrets synced to AWS Secrets Manager\n"));
-            // Reload config to capture secret ARN written by sync
-            config = xdg.readProfile(profile);
-        }
-        catch (error) {
-            throw new Error(`Secrets sync failed: ${error.message}`);
-        }
-    }
-    if (skipDeployment) {
-        console.log(chalk_1.default.yellow("Skipping deployment (--skip-deployment)."));
-        console.log(chalk_1.default.yellow(`Run \`npm run deploy -- --profile ${profile} --stage ${deployStage}\` to deploy later.\n`));
-        return config;
-    }
-    if (!nonInteractive) {
-        console.log(`Deploy target: profile=${chalk_1.default.cyan(profile)}, stage=${chalk_1.default.cyan(deployStage)}, region=${chalk_1.default.cyan(config.deployment.region)}\n`);
-        const { confirmDeploy } = await inquirer_1.default.prompt([
-            {
-                type: "confirm",
-                name: "confirmDeploy",
-                message: "Deploy AWS infrastructure now? (takes ~5-10 minutes)",
-                default: true,
-            },
-        ]);
-        if (!confirmDeploy) {
-            console.log(chalk_1.default.yellow("\nDeployment skipped by user."));
-            console.log(chalk_1.default.yellow(`Re-run with \`npm run deploy -- --profile ${profile} --stage ${deployStage}\` when ready.\n`));
-            return config;
-        }
+        console.log(`  1. Deploy to AWS: npx benchling-webhook deploy --profile ${profile} --stage ${profile}`);
+        console.log(`  2. Test integration: npm run test:${profile}\n`);
     }
-    console.log("Deploying AWS infrastructure. This can take several minutes...\n");
-    await (0, deploy_1.deployCommand)({
-        profile,
-        stage: deployStage,
-        requireApproval: "never",
-        yes: true,
-    });
     return config;
 }
 // =============================================================================
@@ -896,6 +704,20 @@ async function runInstallWizard(options = {}) {
  * @returns Promise that resolves when wizard completes
  */
 async function setupWizardCommand(options = {}) {
-    await runInstallWizard(options);
+    try {
+        await runInstallWizard(options);
+    }
+    catch (error) {
+        // Handle user cancellation (Ctrl+C) gracefully
+        const err = error;
+        if (err &&
+            (err.message?.includes("User force closed") ||
+                err.message?.includes("ERR_USE_AFTER_CLOSE") ||
+                err.code === "ERR_USE_AFTER_CLOSE")) {
+            console.log(chalk_1.default.yellow("\n✖ Setup cancelled by user"));
+            process.exit(0);
+        }
+        throw error;
+    }
 }
 //# sourceMappingURL=setup-wizard.js.map