quiltdata
diff --git a/‎CHANGELOG.md‎
Lines changed: 20 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎bin/commands/deploy.ts‎
Lines changed: 53 additions & 3 deletions b/‎bin/commands/deploy.ts‎
Lines changed: 53 additions & 3 deletions
@@ -3,6 +3,26 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.11.1] - 2025-12-27
+
+### Added
+
+- **Custom Athena workgroup for standalone deployments** - Creates webhook-managed workgroup instead of using AWS default, matching the integrated stack behavior and ensuring consistent query results handling
+
+### Fixed
+
+- **Setup wizard UX improvements**
+  - Removed duplicate standalone deployment prompt
+  - Removed duplicate disable confirmation and clarified impact
+  - Clear deployment tracking when configuring integrated mode
+- **Status command** - Now waits for ECS rollout completion before exiting
+- **Athena workgroup configuration** - Enabled AWS-managed query results in fallback workgroup (fixes "No output location provided" errors)
+
+### Changed
+
+- **Integrated flow** - Improved user experience with clearer prompts and better state management
+- **Workgroup resolution** - Automatically uses Quilt-managed workgroup when integrated, creates custom webhook-managed workgroup for standalone deployments (replaces AWS default workgroup)
+
 ## [0.11.0] - 2025-12-26
 
 ### BREAKING CHANGES
 
@@ -9,6 +9,7 @@ import {
     ServiceResolverError,
     parseStackArn,
 } from "../../lib/utils/service-resolver";
+import { extractQuiltResources, getStackResources } from "../../lib/utils/stack-inference";
 import { checkCdkBootstrap, createStack } from "../benchling-webhook";
 import { XDGConfig } from "../../lib/xdg-config";
 import { ProfileConfig, getStackName } from "../../lib/types/config";
@@ -86,6 +87,41 @@ async function checkStackStatus(region: string, stackName: string): Promise<Stac
     }
 }
 
+async function resolveQuiltAthenaWorkgroup(
+    stackArn: string,
+    region: string,
+    quiltStackName: string,
+): Promise<string | undefined> {
+    try {
+        const resources = await getStackResources(region, stackArn);
+        const discovered = extractQuiltResources(resources);
+        const workgroup = discovered.athenaUserWorkgroup;
+
+        if (!workgroup) {
+            return undefined;
+        }
+
+        const expectedPrefix = `${quiltStackName}-`;
+        if (!workgroup.startsWith(expectedPrefix)) {
+            console.log(
+                chalk.yellow(
+                    `⚠️  Ignoring Athena workgroup '${workgroup}' (expected prefix '${expectedPrefix}')`,
+                ),
+            );
+            return undefined;
+        }
+
+        return workgroup;
+    } catch (error) {
+        console.log(
+            chalk.yellow(
+                `⚠️  Failed to discover Athena workgroup from Quilt stack: ${(error as Error).message}`,
+            ),
+        );
+        return undefined;
+    }
+}
+
 // Legacy detection functions removed in v1.0.0
 // v1.0.0 uses REST API v1 (not HTTP API v2) with resource policies instead of WAF
 
@@ -553,16 +589,28 @@ export async function deploy(
         process.exit(1);
     }
 
+    spinner.succeed("Quilt configuration loaded");
+
+    spinner.start("Resolving Quilt Athena workgroup...");
+    const discoveredAthenaWorkgroup = await resolveQuiltAthenaWorkgroup(
+        stackArn,
+        deployRegion,
+        parsed.stackName,
+    );
+    if (discoveredAthenaWorkgroup) {
+        spinner.succeed(`Resolved Athena workgroup: ${discoveredAthenaWorkgroup}`);
+    } else {
+        spinner.succeed("No Quilt-managed Athena workgroup found; will create one in webhook stack");
+    }
+
     // Convert to QuiltServices format for display
     const services: QuiltServices = {
         packagerQueueUrl: config.quilt.queueUrl,
         athenaUserDatabase: config.quilt.database,
         quiltWebHost: config.quilt.catalog,
-        athenaUserWorkgroup: config.quilt.athenaUserWorkgroup,
+        athenaUserWorkgroup: discoveredAthenaWorkgroup,
     };
 
-    spinner.succeed("Quilt configuration loaded");
-
     // Build ECR image URI for display
     // HARDCODED: Always use the quiltdata AWS account for ECR images
     const ecrAccount = "712023778557";
@@ -586,6 +634,8 @@ export async function deploy(
     console.log(`    ${chalk.bold("Athena Database:")}         ${services.athenaUserDatabase}`);
     if (services.athenaUserWorkgroup) {
         console.log(`    ${chalk.bold("Athena Workgroup:")}        ${services.athenaUserWorkgroup}`);
+    } else {
+        console.log(`    ${chalk.bold("Athena Workgroup:")}        ${stackName}-athena-workgroup ${chalk.dim("(webhook-managed)")}`);
     }
     console.log();
     console.log(chalk.bold("  Stack Parameters:"));