@agentuity/cli 2.0.12 → 2.0.14

package/dist/cmd/project/random-name.js

@@ -0,0 +1,144 @@
+/**
+ * Generates project-derived suggestions for resource names (DB / S3 bucket).
+ *
+ * The CLI shows these as a dim "press Enter to use ..." default in the create flow.
+ * If the user presses Enter, the suggestion is sent to the server. Otherwise the
+ * server is responsible for assigning a name when none is provided.
+ *
+ * Both suggestions are validated against the same rules the server enforces
+ * (`validateBucketName` / `validateDatabaseName` from `@agentuity/server`) so the
+ * happy path can never produce an invalid suggestion.
+ */
+import { validateBucketName, validateDatabaseName } from '@agentuity/server';
+const BUCKET_MAX = 63;
+const BUCKET_MIN = 3;
+const DB_MAX = 63;
+/** 3 lowercase alphanumeric chars, e.g. "k7p". */
+function shortSuffix() {
+    // toString(36) yields [0-9a-z]; slice 3 chars after the "0." prefix.
+    const s = Math.random().toString(36).slice(2, 5);
+    // Pad in the (extremely unlikely) case the slice is shorter than 3 chars.
+    return s.length === 3 ? s : (s + '000').slice(0, 3);
+}
+/**
+ * Sanitize a project name into the bucket-name alphabet:
+ * - lowercase
+ * - spaces / underscores / dots → hyphens
+ * - drop anything else
+ * - collapse and trim hyphens
+ * - strip reserved prefixes (`agentuity*`, `ag-*`, `ago-*`, `xn--`)
+ */
+function sanitizeForBucket(name) {
+    let out = name
+        .toLowerCase()
+        .trim()
+        .replace(/[\s_.]+/g, '-')
+        .replace(/[^a-z0-9-]/g, '')
+        .replace(/-+/g, '-')
+        .replace(/^-+|-+$/g, '');
+    // Strip reserved prefixes (rules from validateBucketName).
+    while (out.startsWith('agentuity') ||
+        out.startsWith('ag-') ||
+        out.startsWith('ago-') ||
+        out.startsWith('xn--')) {
+        if (out.startsWith('agentuity'))
+            out = out.slice('agentuity'.length);
+        else if (out.startsWith('ago-'))
+            out = out.slice('ago-'.length);
+        else if (out.startsWith('ag-'))
+            out = out.slice('ag-'.length);
+        else if (out.startsWith('xn--'))
+            out = out.slice('xn--'.length);
+        out = out.replace(/^-+/, '');
+    }
+    return out;
+}
+/**
+ * Sanitize a project name into the database-name alphabet:
+ * - lowercase
+ * - non `[a-z0-9_]` → `_`
+ * - collapse and trim underscores
+ * - ensure it starts with a letter or underscore (prepend `p_` otherwise)
+ * - strip reserved `pg_` prefix
+ */
+function sanitizeForDatabase(name) {
+    let out = name
+        .toLowerCase()
+        .trim()
+        .replace(/[^a-z0-9_]+/g, '_')
+        .replace(/_+/g, '_')
+        .replace(/^_+|_+$/g, '');
+    if (!/^[a-z_]/.test(out)) {
+        out = out.length > 0 ? `p_${out}` : '';
+    }
+    while (out.startsWith('pg_')) {
+        out = out.slice(3).replace(/^_+/, '');
+        if (!/^[a-z_]/.test(out) && out.length > 0)
+            out = `p_${out}`;
+    }
+    return out;
+}
+/**
+ * Truncate so the final string (`<base>-<suffixWithDash>`) fits within `max` chars
+ * while keeping the suffix intact and not ending on a hyphen.
+ */
+function truncateBaseHyphen(base, suffixWithDash, max) {
+    const room = max - suffixWithDash.length;
+    if (room <= 0)
+        return '';
+    let out = base.slice(0, room);
+    out = out.replace(/-+$/, '');
+    return out;
+}
+/** Same as `truncateBaseHyphen` but for underscore-joined names (database). */
+function truncateBaseUnderscore(base, suffixWithUnderscore, max) {
+    const room = max - suffixWithUnderscore.length;
+    if (room <= 0)
+        return '';
+    let out = base.slice(0, room);
+    out = out.replace(/_+$/, '');
+    return out;
+}
+/**
+ * Generate a suggested S3 bucket name derived from the project name.
+ * Format: `<sanitized-project>-storage-<3char>` (≤ 63 chars).
+ *
+ * Falls back to `bucket-<3char><3char>` if the project name produces nothing usable.
+ * Always returns a value that passes `validateBucketName`.
+ */
+export function suggestBucketName(projectName) {
+    const sanitized = sanitizeForBucket(projectName);
+    // Try a few times in case sanitization + suffix happens to land on something invalid.
+    for (let attempt = 0; attempt < 5; attempt++) {
+        const suffix = `-storage-${shortSuffix()}`;
+        const base = truncateBaseHyphen(sanitized, suffix, BUCKET_MAX);
+        const candidate = base.length > 0 ? `${base}${suffix}` : `bucket${suffix}`;
+        if (candidate.length >= BUCKET_MIN && validateBucketName(candidate).valid) {
+            return candidate;
+        }
+    }
+    // Pure fallback: short, always-valid generic name.
+    const fallback = `bucket-${shortSuffix()}${shortSuffix()}`;
+    return validateBucketName(fallback).valid ? fallback : `bucket-${shortSuffix()}aaa`;
+}
+/**
+ * Generate a suggested PostgreSQL database name derived from the project name.
+ * Format: `<sanitized-project>_db_<3char>` (≤ 63 chars).
+ *
+ * Falls back to `db_<3char><3char>` if the project name produces nothing usable.
+ * Always returns a value that passes `validateDatabaseName`.
+ */
+export function suggestDatabaseName(projectName) {
+    const sanitized = sanitizeForDatabase(projectName);
+    for (let attempt = 0; attempt < 5; attempt++) {
+        const suffix = `_db_${shortSuffix()}`;
+        const base = truncateBaseUnderscore(sanitized, suffix, DB_MAX);
+        const candidate = base.length > 0 ? `${base}${suffix}` : `db${suffix}`;
+        if (validateDatabaseName(candidate).valid) {
+            return candidate;
+        }
+    }
+    const fallback = `db_${shortSuffix()}${shortSuffix()}`;
+    return validateDatabaseName(fallback).valid ? fallback : `db_${shortSuffix()}aaa`;
+}
+//# sourceMappingURL=random-name.js.map

package/dist/cmd/project/random-name.js.map

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

package/dist/cmd/project/template-flow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-flow.d.ts","sourceRoot":"","sources":["../../../src/cmd/project/template-flow.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAY9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAe3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAKpD,UAAU,iBAAiB;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8mBzF"}
+{"version":3,"file":"template-flow.d.ts","sourceRoot":"","sources":["../../../src/cmd/project/template-flow.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAY9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAe3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAUpD,UAAU,iBAAiB;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,wBAAsB,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAynBzF"}

package/dist/cmd/project/template-flow.js

@@ -12,7 +12,10 @@ import * as tui from '../../tui';
 import { createPrompt, note } from '../../tui';
 import { getGithubBotIdentity } from '../git/api';
 import { downloadTemplate, initGitRepo, setupProject } from './download';
+import { suggestBucketName, suggestDatabaseName } from './random-name';
 import { fetchTemplates } from './templates';
+// Domain validator shared between the multi-select branch and the standalone prompt.
+const DOMAIN_REGEX = /^(?=.{1,253}$)(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[A-Za-z]{2,63}$/;
 export async function runCreateFlow(options) {
     const { projectName: initialProjectName, dir: targetDir, template: initialTemplate, templateDir, templateBranch, skipPrompts, logger, auth, config, orgId: selectedOrgId, region, apiClient, domains, database: databaseOption, storage: storageOption, } = options;
     const isHeadless = !process.stdin.isTTY || !process.stdout.isTTY;
@@ -187,7 +190,7 @@ export async function runCreateFlow(options) {
             error: 'Project setup completed with errors',
         };
     }
-    // Add separator bar if we're going to show resource prompts
+    // Resource provisioning gates
     const canProvision = auth && apiClient && catalystClient && orgId && region;
     // Only count as resource flags if actually requesting provisioning (not explicit skip)
     const hasResourceFlags = (databaseOption !== undefined && databaseOption.toLowerCase() !== 'skip') ||
@@ -204,11 +207,56 @@ export async function runCreateFlow(options) {
             'Remove --no-register or omit --database/--storage flags.', ErrorCode.VALIDATION_FAILED);
     }
     if (canProvision) {
-        // Fetch resources for selected org and region using Catalyst API (needed for both interactive and CLI flags)
+        // CLI flags pre-resolve their respective per-resource decision; the multi-select
+        // is only used for resources where the user didn't pass a flag.
+        const dbFlagAction = resolveFlagAction(databaseOption, 'database');
+        const storageFlagAction = resolveFlagAction(storageOption, 'storage');
+        const domainFlagProvided = (domains?.length ?? 0) > 0;
+        // Determine which resources should run through the configuration phase.
+        // In interactive mode, ask the user via a single multi-select.
+        // In headless / non-interactive mode, only flagged resources are considered.
+        let wantDb = dbFlagAction !== undefined && dbFlagAction !== 'Skip';
+        let wantStorage = storageFlagAction !== undefined && storageFlagAction !== 'Skip';
+        let wantDomain = domainFlagProvided;
+        if (isInteractive) {
+            // Build multi-select options dynamically: only show resources the user hasn't
+            // already decided about via CLI flags. If all three came from flags, skip the prompt.
+            const msOptions = [];
+            if (dbFlagAction === undefined) {
+                msOptions.push({ value: 'database', label: 'SQL Database', hint: 'PostgreSQL' });
+            }
+            if (storageFlagAction === undefined) {
+                msOptions.push({ value: 'storage', label: 'Storage Bucket', hint: 'S3-compatible' });
+            }
+            if (!domainFlagProvided) {
+                msOptions.push({ value: 'domain', label: 'Custom Domain', hint: 'BYO domain' });
+            }
+            if (msOptions.length > 0) {
+                const picked = await prompt.multiselect({
+                    message: 'What would you like to set up? (all optional)',
+                    options: msOptions,
+                    initial: [],
+                });
+                if (dbFlagAction === undefined)
+                    wantDb = picked.includes('database');
+                if (storageFlagAction === undefined)
+                    wantStorage = picked.includes('storage');
+                if (!domainFlagProvided)
+                    wantDomain = picked.includes('domain');
+            }
+        }
+        // Fetch existing resources only if we'll actually need them.
+        // Need them when:
+        //   - user wants db/storage in interactive mode (to offer "use existing")
+        //   - a CLI flag pointed at an existing resource by name
         let resources;
-        const needResources = isInteractive ||
-            (databaseOption && databaseOption !== 'skip' && databaseOption !== 'new') ||
-            (storageOption && storageOption !== 'skip' && storageOption !== 'new');
+        const needResources = (isInteractive && (wantDb || wantStorage)) ||
+            (databaseOption !== undefined &&
+                dbFlagAction !== 'Create New' &&
+                dbFlagAction !== 'Skip') ||
+            (storageOption !== undefined &&
+                storageFlagAction !== 'Create New' &&
+                storageFlagAction !== 'Skip');
         if (needResources) {
             resources = await tui.spinner({
                 message: 'Fetching resources',
@@ -221,204 +269,163 @@ export async function runCreateFlow(options) {
             logger.debug(`Resources for org ${orgId} in region ${region}: ${resources.db.length} databases, ${resources.s3.length} storage buckets`);
             logger.debug(`Database names: ${resources.db.map((d) => d.name).join(', ') || '(none)'}`);
             logger.debug(`Storage buckets: ${resources.s3.map((b) => b.bucket_name).join(', ') || '(none)'}`);
-        }
-        // Determine database action: CLI flag > interactive prompt > skip (headless)
-        let db_action;
-        if (databaseOption !== undefined) {
-            // CLI flag provided - normalize to expected values
-            if (databaseOption.toLowerCase() === 'new') {
-                db_action = 'Create New';
+            // Validate flag-supplied resource names against the fetched list.
+            if (databaseOption !== undefined &&
+                dbFlagAction !== 'Create New' &&
+                dbFlagAction !== 'Skip' &&
+                !resources.db.find((d) => d.name === dbFlagAction)) {
+                logger.fatal(`Database '${databaseOption}' not found. Use 'new' to create a new database or 'skip' to skip.`, ErrorCode.RESOURCE_NOT_FOUND);
             }
-            else if (databaseOption.toLowerCase() === 'skip') {
-                db_action = 'Skip';
+            if (storageOption !== undefined &&
+                storageFlagAction !== 'Create New' &&
+                storageFlagAction !== 'Skip' &&
+                !resources.s3.find((b) => b.bucket_name === storageFlagAction)) {
+                logger.fatal(`Storage bucket '${storageOption}' not found. Use 'new' to create a new bucket or 'skip' to skip.`, ErrorCode.RESOURCE_NOT_FOUND);
             }
-            else {
-                // Existing database name - validate it exists
-                const existingDb = resources?.db.find((d) => d.name === databaseOption);
-                if (!existingDb) {
-                    logger.fatal(`Database '${databaseOption}' not found. Use 'new' to create a new database or 'skip' to skip.`, ErrorCode.RESOURCE_NOT_FOUND);
-                }
-                db_action = databaseOption;
-            }
-        }
-        else if (isInteractive) {
-            db_action = await prompt.select({
-                message: 'Create SQL Database?',
-                options: [
-                    { value: 'Skip', label: 'Skip or Setup later' },
-                    { value: 'Create New', label: 'Create a new database' },
-                    ...resources.db.map((db) => ({
-                        value: db.name,
-                        label: `Use database: ${tui.tuiColors.primary(db.name)}`,
-                    })),
-                ],
-            });
-        }
-        else {
-            // Headless without flag - skip
-            db_action = 'Skip';
         }
-        // Determine storage action: CLI flag > interactive prompt > skip (headless)
-        let s3_action;
-        if (storageOption !== undefined) {
-            // CLI flag provided - normalize to expected values
-            if (storageOption.toLowerCase() === 'new') {
-                s3_action = 'Create New';
-            }
-            else if (storageOption.toLowerCase() === 'skip') {
-                s3_action = 'Skip';
-            }
-            else {
-                // Existing bucket name - validate it exists
-                const existingBucket = resources?.s3.find((b) => b.bucket_name === storageOption);
-                if (!existingBucket) {
-                    logger.fatal(`Storage bucket '${storageOption}' not found. Use 'new' to create a new bucket or 'skip' to skip.`, ErrorCode.RESOURCE_NOT_FOUND);
+        // === Configure each selected resource: Database → Storage → Domain ===
+        // Database
+        if (wantDb) {
+            let dbAction = dbFlagAction;
+            if (dbAction === undefined && isInteractive) {
+                const existing = resources?.db ?? [];
+                if (existing.length > 0) {
+                    dbAction = await prompt.select({
+                        message: 'SQL Database',
+                        options: [
+                            { value: 'Create New', label: 'Create a new database' },
+                            ...existing.map((db) => ({
+                                value: db.name,
+                                label: `Use database: ${tui.tuiColors.primary(db.name)}`,
+                            })),
+                        ],
+                    });
+                }
+                else {
+                    // No existing databases — user already opted in via the multi-select, so create new.
+                    dbAction = 'Create New';
                 }
-                s3_action = storageOption;
-            }
-        }
-        else if (isInteractive) {
-            s3_action = await prompt.select({
-                message: 'Create Storage Bucket?',
-                options: [
-                    { value: 'Skip', label: 'Skip or Setup later' },
-                    { value: 'Create New', label: 'Create a new bucket' },
-                    ...resources.s3.map((bucket) => ({
-                        value: bucket.bucket_name,
-                        label: `Use bucket: ${tui.tuiColors.primary(bucket.bucket_name)}`,
-                    })),
-                ],
-            });
-        }
-        else {
-            // Headless without flag - skip
-            s3_action = 'Skip';
-        }
-        // Custom DNS: only prompt in interactive mode if not already provided
-        if (!domains?.length && isInteractive) {
-            const customDns = await prompt.text({
-                message: 'Setup custom DNS?',
-                hint: 'Enter a domain name or press Enter to skip',
-                validate: (val) => val === ''
-                    ? true
-                    : /^(?=.{1,253}$)(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[A-Za-z]{2,63}$/.test(val),
-            });
-            if (customDns) {
-                _domains = [customDns];
             }
-        }
-        // Process storage action
-        switch (s3_action) {
-            case 'Create New': {
-                let bucketName;
-                let bucketDescription;
-                // Only prompt for name/description in interactive mode
+            if (dbAction === 'Create New') {
+                let dbName;
+                let dbDescription;
                 if (isInteractive) {
-                    const bucketNameInput = await prompt.text({
-                        message: 'Bucket name',
-                        hint: 'Optional - lowercase letters, digits, hyphens only',
+                    const suggestion = suggestDatabaseName(projectName);
+                    const dbNameInput = await prompt.text({
+                        message: 'Database name',
+                        hint: 'Optional · lowercase letters, digits, underscores',
+                        placeholder: suggestion,
                         validate: (value) => {
                             const trimmed = value.trim();
                             if (trimmed === '')
                                 return true;
-                            const result = validateBucketName(trimmed);
+                            const result = validateDatabaseName(trimmed);
                             return result.valid ? true : result.error;
                         },
                     });
-                    bucketName = bucketNameInput.trim() || undefined;
-                    bucketDescription =
+                    dbName = dbNameInput.trim() || undefined;
+                    dbDescription =
                         (await prompt.text({
-                            message: 'Bucket description',
-                            hint: 'Optional - press Enter to skip',
+                            message: 'Database description',
+                            hint: 'Optional · press Enter to skip',
                         })) || undefined;
                 }
                 const created = await tui.spinner({
-                    message: 'Provisioning New Bucket',
+                    message: 'Provisioning New SQL Database',
                     clearOnSuccess: true,
                     callback: async () => {
                         return createResources(catalystClient, orgId, region, [
-                            {
-                                type: 's3',
-                                name: bucketName,
-                                description: bucketDescription,
-                            },
+                            { type: 'db', name: dbName, description: dbDescription },
                         ]);
                     },
                 });
-                // Collect env vars from newly created resource
-                if (created[0]?.env) {
+                if (created[0]?.env)
                     Object.assign(resourceEnvVars, created[0].env);
-                }
-                break;
             }
-            case 'Skip': {
-                break;
+            else if (dbAction && dbAction !== 'Skip') {
+                // Existing database selected — reuse its env vars.
+                const selectedDb = resources?.db.find((d) => d.name === dbAction);
+                if (selectedDb?.env)
+                    Object.assign(resourceEnvVars, selectedDb.env);
             }
-            default: {
-                // User selected an existing bucket - get env vars from the resources list
-                const selectedBucket = resources?.s3.find((b) => b.bucket_name === s3_action);
-                if (selectedBucket?.env) {
-                    Object.assign(resourceEnvVars, selectedBucket.env);
+        }
+        // Storage
+        if (wantStorage) {
+            let s3Action = storageFlagAction;
+            if (s3Action === undefined && isInteractive) {
+                const existing = resources?.s3 ?? [];
+                if (existing.length > 0) {
+                    s3Action = await prompt.select({
+                        message: 'Storage Bucket',
+                        options: [
+                            { value: 'Create New', label: 'Create a new bucket' },
+                            ...existing.map((bucket) => ({
+                                value: bucket.bucket_name,
+                                label: `Use bucket: ${tui.tuiColors.primary(bucket.bucket_name)}`,
+                            })),
+                        ],
+                    });
+                }
+                else {
+                    s3Action = 'Create New';
                 }
-                break;
             }
-        }
-        // Process database action
-        switch (db_action) {
-            case 'Create New': {
-                let dbName;
-                let dbDescription;
-                // Only prompt for name/description in interactive mode
+            if (s3Action === 'Create New') {
+                let bucketName;
+                let bucketDescription;
                 if (isInteractive) {
-                    const dbNameInput = await prompt.text({
-                        message: 'Database name',
-                        hint: 'Optional - lowercase letters, digits, underscores only',
+                    const suggestion = suggestBucketName(projectName);
+                    const bucketNameInput = await prompt.text({
+                        message: 'Bucket name',
+                        hint: 'Optional · lowercase letters, digits, hyphens',
+                        placeholder: suggestion,
                         validate: (value) => {
                             const trimmed = value.trim();
                             if (trimmed === '')
                                 return true;
-                            const result = validateDatabaseName(trimmed);
+                            const result = validateBucketName(trimmed);
                             return result.valid ? true : result.error;
                         },
                     });
-                    dbName = dbNameInput.trim() || undefined;
-                    dbDescription =
+                    bucketName = bucketNameInput.trim() || undefined;
+                    bucketDescription =
                         (await prompt.text({
-                            message: 'Database description',
-                            hint: 'Optional - press Enter to skip',
+                            message: 'Bucket description',
+                            hint: 'Optional · press Enter to skip',
                         })) || undefined;
                 }
                 const created = await tui.spinner({
-                    message: 'Provisioning New SQL Database',
+                    message: 'Provisioning New Bucket',
                     clearOnSuccess: true,
                     callback: async () => {
                         return createResources(catalystClient, orgId, region, [
-                            {
-                                type: 'db',
-                                name: dbName,
-                                description: dbDescription,
-                            },
+                            { type: 's3', name: bucketName, description: bucketDescription },
                         ]);
                     },
                 });
-                // Collect env vars from newly created resource
-                if (created[0]?.env) {
+                if (created[0]?.env)
                     Object.assign(resourceEnvVars, created[0].env);
-                }
-                break;
             }
-            case 'Skip': {
-                break;
-            }
-            default: {
-                // User selected an existing database - get env vars from the resources list
-                const selectedDb = resources?.db.find((d) => d.name === db_action);
-                if (selectedDb?.env) {
-                    Object.assign(resourceEnvVars, selectedDb.env);
-                }
-                break;
+            else if (s3Action && s3Action !== 'Skip') {
+                const selectedBucket = resources?.s3.find((b) => b.bucket_name === s3Action);
+                if (selectedBucket?.env)
+                    Object.assign(resourceEnvVars, selectedBucket.env);
             }
         }
+        // Custom Domain
+        if (wantDomain && !domainFlagProvided && isInteractive) {
+            const customDns = await prompt.text({
+                message: 'Custom domain',
+                hint: 'e.g. agents.example.com',
+                validate: (val) => val === ''
+                    ? 'Domain is required (or go back and uncheck Custom Domain)'
+                    : DOMAIN_REGEX.test(val)
+                        ? true
+                        : 'Invalid domain',
+            });
+            if (customDns)
+                _domains = [customDns];
+        }
     }
     let projectId;
     if (auth && apiClient && orgId) {
@@ -553,6 +560,27 @@ export async function runCreateFlow(options) {
         error: setupResult.success ? undefined : 'Project setup completed with errors',
     };
 }
+/**
+ * Normalize a CLI flag value (`--database` / `--storage`) into the same
+ * action vocabulary the interactive flow uses:
+ *   - 'new'  -> 'Create New'
+ *   - 'skip' -> 'Skip'
+ *   - any other string -> treated as an existing-resource name (returned as-is)
+ *   - undefined -> undefined (no flag passed; multi-select decides)
+ *
+ * The existence check for named resources happens later, after the resource
+ * list is fetched.
+ */
+function resolveFlagAction(flag, _kind) {
+    if (flag === undefined)
+        return undefined;
+    const lower = flag.toLowerCase();
+    if (lower === 'new')
+        return 'Create New';
+    if (lower === 'skip')
+        return 'Skip';
+    return flag;
+}
 /**
  * Sanitize a project name to create a safe directory/package name
  * - Converts to lowercase