kimaki 0.4.60 → 0.4.61

package/dist/cli.js

@@ -366,6 +366,7 @@ async function startLockServer() {
 }
 // Commands to skip when registering user commands (reserved names)
 const SKIP_USER_COMMANDS = ['init'];
+import { registeredUserCommands } from './config.js';
 async function registerCommands({ token, appId, userCommands = [], agents = [], }) {
     const commands = [
         new SlashCommandBuilder()
@@ -531,6 +532,26 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .setDescription('Clear all queued messages in this thread')
             .setDMPermission(false)
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('queue-command')
+            .setDescription('Queue a user command to run after the current response finishes')
+            .addStringOption((option) => {
+            option
+                .setName('command')
+                .setDescription('The command to run')
+                .setRequired(true)
+                .setAutocomplete(true);
+            return option;
+        })
+            .addStringOption((option) => {
+            option
+                .setName('arguments')
+                .setDescription('Arguments to pass to the command')
+                .setRequired(false);
+            return option;
+        })
+            .setDMPermission(false)
+            .toJSON(),
         new SlashCommandBuilder()
             .setName('undo')
             .setDescription('Undo the last assistant message (revert file changes)')
@@ -571,6 +592,11 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
         })
             .setDMPermission(false)
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('context-usage')
+            .setDescription('Show token usage and context window percentage for this session')
+            .setDMPermission(false)
+            .toJSON(),
         new SlashCommandBuilder()
             .setName('upgrade-and-restart')
             .setDescription('Upgrade kimaki to the latest version and restart the bot')
@@ -578,6 +604,8 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .toJSON(),
     ];
     // Add user-defined commands with -cmd suffix
+    // Also populate registeredUserCommands for /queue-command autocomplete
+    registeredUserCommands.length = 0;
     for (const cmd of userCommands) {
         if (SKIP_USER_COMMANDS.includes(cmd.name)) {
             continue;
@@ -587,6 +615,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
         const sanitizedName = cmd.name.toLowerCase().replace(/:/g, '-');
         const commandName = `${sanitizedName}-cmd`;
         const description = cmd.description || `Run /${cmd.name} command`;
+        registeredUserCommands.push({ name: cmd.name, description });
         commands.push(new SlashCommandBuilder()
             .setName(commandName.slice(0, 32)) // Discord limits to 32 chars
             .setDescription(description.slice(0, 100)) // Discord limits to 100 chars
@@ -1184,6 +1213,7 @@ cli
     .option('--model <model>', 'Model to use (format: provider/model)')
     .option('--thread <threadId>', 'Post prompt to an existing thread')
     .option('--session <sessionId>', 'Post prompt to thread mapped to an existing session')
+    .option('--wait', 'Wait for session to complete, then print session text to stdout')
     .action(async (options) => {
     try {
         let { channel: channelId, prompt, name, appId: optionAppId, notifyOnly, thread: threadId, session: sessionId, } = options;
@@ -1209,6 +1239,10 @@ cli
             cliLogger.error('Cannot use --worktree with --notify-only');
             process.exit(EXIT_NO_RESTART);
         }
+        if (options.wait && notifyOnly) {
+            cliLogger.error('Cannot use --wait with --notify-only');
+            process.exit(EXIT_NO_RESTART);
+        }
         if (existingThreadMode) {
             const incompatibleFlags = [];
             if (notifyOnly) {
@@ -1403,9 +1437,11 @@ cli
             }
             const threadPromptMarker = { cliThreadPrompt: true };
             const promptEmbed = [{ color: 0x2b2d31, footer: { text: yaml.dump(threadPromptMarker) } }];
+            // Prefix the prompt so it's clear who sent it (matches /queue format)
+            const prefixedPrompt = `» **kimaki-cli:** ${prompt}`;
             await sendDiscordMessageWithOptionalAttachment({
                 channelId: targetThreadId,
-                prompt,
+                prompt: prefixedPrompt,
                 botToken,
                 embeds: promptEmbed,
                 rest,
@@ -1413,6 +1449,13 @@ cli
             const threadUrl = `https://discord.com/channels/${threadData.guild_id}/${threadData.id}`;
             note(`Prompt sent to thread: ${threadData.name}\n\nURL: ${threadUrl}`, '✅ Message Sent');
             cliLogger.log(threadUrl);
+            if (options.wait) {
+                const { waitAndOutputSession } = await import('./wait-session.js');
+                await waitAndOutputSession({
+                    threadId: targetThreadId,
+                    projectDirectory: channelConfig.directory,
+                });
+            }
             process.exit(0);
         }
         cliLogger.log('Fetching channel info...');
@@ -1507,6 +1550,13 @@ cli
             : `Thread: ${threadData.name}\nDirectory: ${projectDirectory}${worktreeNote}\n\nThe running bot will pick this up and start the session.\n\nURL: ${threadUrl}`;
         note(successMessage, '✅ Thread Created');
         cliLogger.log(threadUrl);
+        if (options.wait) {
+            const { waitAndOutputSession } = await import('./wait-session.js');
+            await waitAndOutputSession({
+                threadId: threadData.id,
+                projectDirectory,
+            });
+        }
         process.exit(0);
     }
     catch (error) {
@@ -1520,107 +1570,87 @@ cli
     .option('-g, --guild <guildId>', 'Discord guild/server ID (auto-detects if bot is in only one server)')
     .option('-a, --app-id <appId>', 'Bot application ID (reads from database if available)')
     .action(async (directory, options) => {
-    try {
-        const absolutePath = path.resolve(directory || '.');
-        if (!fs.existsSync(absolutePath)) {
-            cliLogger.error(`Directory does not exist: ${absolutePath}`);
-            process.exit(EXIT_NO_RESTART);
-        }
-        // Initialize database
-        await initDatabase();
-        // Get bot token from env var or database
-        const envToken = process.env.KIMAKI_BOT_TOKEN;
-        let botToken;
-        let appId = options.appId;
-        if (envToken) {
-            botToken = envToken;
-            if (!appId) {
-                try {
-                    const botRow = await getBotToken();
-                    appId = botRow?.app_id;
-                }
-                catch (error) {
-                    cliLogger.debug('Database lookup failed while resolving app ID:', error instanceof Error ? error.message : String(error));
-                }
-            }
-        }
-        else {
+    const absolutePath = path.resolve(directory || '.');
+    if (!fs.existsSync(absolutePath)) {
+        cliLogger.error(`Directory does not exist: ${absolutePath}`);
+        process.exit(EXIT_NO_RESTART);
+    }
+    // Initialize database
+    await initDatabase();
+    // Get bot token from env var or database
+    const envToken = process.env.KIMAKI_BOT_TOKEN;
+    let botToken;
+    let appId = options.appId;
+    if (envToken) {
+        botToken = envToken;
+        if (!appId) {
             try {
                 const botRow = await getBotToken();
-                if (botRow) {
-                    botToken = botRow.token;
-                    appId = appId || botRow.app_id;
-                }
+                appId = botRow?.app_id;
             }
-            catch (e) {
-                cliLogger.error('Database error:', e instanceof Error ? e.message : String(e));
+            catch (error) {
+                cliLogger.debug('Database lookup failed while resolving app ID:', error instanceof Error ? error.message : String(error));
             }
         }
-        if (!botToken) {
-            cliLogger.error('No bot token found. Set KIMAKI_BOT_TOKEN env var or run `kimaki` first to set up.');
-            process.exit(EXIT_NO_RESTART);
+    }
+    else {
+        try {
+            const botRow = await getBotToken();
+            if (botRow) {
+                botToken = botRow.token;
+                appId = appId || botRow.app_id;
+            }
         }
-        if (!appId) {
-            cliLogger.error('App ID is required to create channels. Use --app-id or run `kimaki` first.');
-            process.exit(EXIT_NO_RESTART);
+        catch (e) {
+            cliLogger.error('Database error:', e instanceof Error ? e.message : String(e));
         }
-        cliLogger.log('Connecting to Discord...');
-        const client = await createDiscordClient();
-        await new Promise((resolve, reject) => {
-            client.once(Events.ClientReady, () => {
-                resolve();
-            });
-            client.once(Events.Error, reject);
-            client.login(botToken);
+    }
+    if (!botToken) {
+        cliLogger.error('No bot token found. Set KIMAKI_BOT_TOKEN env var or run `kimaki` first to set up.');
+        process.exit(EXIT_NO_RESTART);
+    }
+    if (!appId) {
+        cliLogger.error('App ID is required to create channels. Use --app-id or run `kimaki` first.');
+        process.exit(EXIT_NO_RESTART);
+    }
+    cliLogger.log('Connecting to Discord...');
+    const client = await createDiscordClient();
+    await new Promise((resolve, reject) => {
+        client.once(Events.ClientReady, () => {
+            resolve();
         });
-        cliLogger.log('Finding guild...');
-        // Find guild
-        let guild;
-        if (options.guild) {
-            const guildId = String(options.guild);
-            const foundGuild = client.guilds.cache.get(guildId);
-            if (!foundGuild) {
-                cliLogger.log('Guild not found');
-                cliLogger.error(`Guild not found: ${guildId}`);
-                client.destroy();
-                process.exit(EXIT_NO_RESTART);
-            }
-            guild = foundGuild;
+        client.once(Events.Error, reject);
+        client.login(botToken);
+    });
+    cliLogger.log('Finding guild...');
+    // Find guild
+    let guild;
+    if (options.guild) {
+        const guildId = String(options.guild);
+        const foundGuild = client.guilds.cache.get(guildId);
+        if (!foundGuild) {
+            cliLogger.log('Guild not found');
+            cliLogger.error(`Guild not found: ${guildId}`);
+            client.destroy();
+            process.exit(EXIT_NO_RESTART);
         }
-        else {
-            // Auto-detect: prefer guild with existing channels for this bot, else first guild
-            const existingChannelId = await findChannelByAppId(appId);
-            if (existingChannelId) {
-                try {
-                    const ch = await client.channels.fetch(existingChannelId);
-                    if (ch && 'guild' in ch && ch.guild) {
-                        guild = ch.guild;
-                    }
-                    else {
-                        throw new Error('Channel has no guild');
-                    }
+        guild = foundGuild;
+    }
+    else {
+        // Auto-detect: prefer guild with existing channels for this bot, else first guild
+        const existingChannelId = await findChannelByAppId(appId);
+        if (existingChannelId) {
+            try {
+                const ch = await client.channels.fetch(existingChannelId);
+                if (ch && 'guild' in ch && ch.guild) {
+                    guild = ch.guild;
                 }
-                catch (error) {
-                    cliLogger.debug('Failed to fetch existing channel while selecting guild:', error instanceof Error ? error.message : String(error));
-                    let firstGuild = client.guilds.cache.first();
-                    if (!firstGuild) {
-                        // Cache might be empty, try fetching guilds from API
-                        const fetched = await client.guilds.fetch();
-                        const firstOAuth2Guild = fetched.first();
-                        if (firstOAuth2Guild) {
-                            firstGuild = await client.guilds.fetch(firstOAuth2Guild.id);
-                        }
-                    }
-                    if (!firstGuild) {
-                        cliLogger.log('No guild found');
-                        cliLogger.error('No guild found. Add the bot to a server first.');
-                        client.destroy();
-                        process.exit(EXIT_NO_RESTART);
-                    }
-                    guild = firstGuild;
+                else {
+                    throw new Error('Channel has no guild');
                 }
             }
-            else {
+            catch (error) {
+                cliLogger.debug('Failed to fetch existing channel while selecting guild:', error instanceof Error ? error.message : String(error));
                 let firstGuild = client.guilds.cache.first();
                 if (!firstGuild) {
                     // Cache might be empty, try fetching guilds from API
@@ -1639,169 +1669,225 @@ cli
                 guild = firstGuild;
             }
         }
-        // Check if channel already exists in this guild
-        cliLogger.log('Checking for existing channel...');
-        try {
-            const existingChannels = await findChannelsByDirectory({
-                directory: absolutePath,
-                channelType: 'text',
-                appId,
-            });
-            for (const existingChannel of existingChannels) {
-                try {
-                    const ch = await client.channels.fetch(existingChannel.channel_id);
-                    if (ch && 'guild' in ch && ch.guild?.id === guild.id) {
-                        client.destroy();
-                        cliLogger.error(`Channel already exists for this directory in ${guild.name}. Channel ID: ${existingChannel.channel_id}`);
-                        process.exit(EXIT_NO_RESTART);
-                    }
-                }
-                catch (error) {
-                    cliLogger.debug(`Failed to fetch channel ${existingChannel.channel_id} while checking existing channels:`, error instanceof Error ? error.message : String(error));
+        else {
+            let firstGuild = client.guilds.cache.first();
+            if (!firstGuild) {
+                // Cache might be empty, try fetching guilds from API
+                const fetched = await client.guilds.fetch();
+                const firstOAuth2Guild = fetched.first();
+                if (firstOAuth2Guild) {
+                    firstGuild = await client.guilds.fetch(firstOAuth2Guild.id);
                 }
             }
+            if (!firstGuild) {
+                cliLogger.log('No guild found');
+                cliLogger.error('No guild found. Add the bot to a server first.');
+                client.destroy();
+                process.exit(EXIT_NO_RESTART);
+            }
+            guild = firstGuild;
         }
-        catch (error) {
-            cliLogger.debug('Database lookup failed while checking existing channels:', error instanceof Error ? error.message : String(error));
-        }
-        cliLogger.log(`Creating channels in ${guild.name}...`);
-        const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({
-            guild,
-            projectDirectory: absolutePath,
+    }
+    // Check if channel already exists in this guild
+    cliLogger.log('Checking for existing channel...');
+    try {
+        const existingChannels = await findChannelsByDirectory({
+            directory: absolutePath,
+            channelType: 'text',
             appId,
-            botName: client.user?.username,
         });
-        client.destroy();
-        cliLogger.log('Channels created!');
-        const channelUrl = `https://discord.com/channels/${guild.id}/${textChannelId}`;
-        note(`Created channels for project:\n\n📝 Text: #${channelName}\n🔊 Voice: #${channelName}\n📁 Directory: ${absolutePath}\n\nURL: ${channelUrl}`, '✅ Success');
-        cliLogger.log(channelUrl);
-        process.exit(0);
+        for (const existingChannel of existingChannels) {
+            try {
+                const ch = await client.channels.fetch(existingChannel.channel_id);
+                if (ch && 'guild' in ch && ch.guild?.id === guild.id) {
+                    client.destroy();
+                    cliLogger.error(`Channel already exists for this directory in ${guild.name}. Channel ID: ${existingChannel.channel_id}`);
+                    process.exit(EXIT_NO_RESTART);
+                }
+            }
+            catch (error) {
+                cliLogger.debug(`Failed to fetch channel ${existingChannel.channel_id} while checking existing channels:`, error instanceof Error ? error.message : String(error));
+            }
+        }
     }
     catch (error) {
-        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
-        process.exit(EXIT_NO_RESTART);
+        cliLogger.debug('Database lookup failed while checking existing channels:', error instanceof Error ? error.message : String(error));
     }
+    cliLogger.log(`Creating channels in ${guild.name}...`);
+    const { textChannelId, voiceChannelId, channelName } = await createProjectChannels({
+        guild,
+        projectDirectory: absolutePath,
+        appId,
+        botName: client.user?.username,
+    });
+    client.destroy();
+    cliLogger.log('Channels created!');
+    const channelUrl = `https://discord.com/channels/${guild.id}/${textChannelId}`;
+    note(`Created channels for project:\n\n📝 Text: #${channelName}\n🔊 Voice: #${channelName}\n📁 Directory: ${absolutePath}\n\nURL: ${channelUrl}`, '✅ Success');
+    cliLogger.log(channelUrl);
+    process.exit(0);
 });
 cli
     .command('project list', 'List all registered projects with their Discord channels')
     .option('--json', 'Output as JSON')
     .action(async (options) => {
-    try {
-        await initDatabase();
-        const prisma = await getPrisma();
-        const channels = await prisma.channel_directories.findMany({
-            where: { channel_type: 'text' },
-            orderBy: { created_at: 'desc' },
-        });
-        if (options.json) {
-            const output = channels.map((ch) => ({
-                channel_id: ch.channel_id,
-                directory: ch.directory,
-                app_id: ch.app_id,
-            }));
-            console.log(JSON.stringify(output, null, 2));
-            process.exit(0);
-        }
-        if (channels.length === 0) {
-            cliLogger.log('No projects registered');
-            process.exit(0);
-        }
-        for (const ch of channels) {
-            const name = path.basename(ch.directory);
-            console.log(`\n📁 ${name}`);
-            console.log(`   Directory: ${ch.directory}`);
-            console.log(`   Channel ID: ${ch.channel_id}`);
-            if (ch.app_id) {
-                console.log(`   Bot App ID: ${ch.app_id}`);
-            }
-        }
+    await initDatabase();
+    const prisma = await getPrisma();
+    const channels = await prisma.channel_directories.findMany({
+        where: { channel_type: 'text' },
+        orderBy: { created_at: 'desc' },
+    });
+    if (options.json) {
+        const output = channels.map((ch) => ({
+            channel_id: ch.channel_id,
+            directory: ch.directory,
+            app_id: ch.app_id,
+        }));
+        console.log(JSON.stringify(output, null, 2));
         process.exit(0);
     }
-    catch (error) {
-        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
+    if (channels.length === 0) {
+        cliLogger.log('No projects registered');
+        process.exit(0);
+    }
+    for (const ch of channels) {
+        const name = path.basename(ch.directory);
+        console.log(`\n📁 ${name}`);
+        console.log(`   Directory: ${ch.directory}`);
+        console.log(`   Channel ID: ${ch.channel_id}`);
+        if (ch.app_id) {
+            console.log(`   Bot App ID: ${ch.app_id}`);
+        }
+    }
+    process.exit(0);
+});
+cli
+    .command('project open-in-discord', 'Open the current project channel in Discord')
+    .action(async () => {
+    await initDatabase();
+    const botRow = await getBotToken();
+    if (!botRow) {
+        cliLogger.error('No bot configured. Run `kimaki` first.');
         process.exit(EXIT_NO_RESTART);
     }
+    const { app_id: appId, token: botToken } = botRow;
+    const absolutePath = path.resolve('.');
+    // Walk up parent directories to find a matching channel
+    const findChannelForPath = async (dirPath) => {
+        const withAppId = appId ? await findChannelsByDirectory({ directory: dirPath, channelType: 'text', appId }) : [];
+        if (withAppId.length > 0) {
+            return withAppId[0];
+        }
+        const withoutAppId = await findChannelsByDirectory({ directory: dirPath, channelType: 'text' });
+        return withoutAppId[0];
+    };
+    let existingChannel;
+    let searchPath = absolutePath;
+    do {
+        existingChannel = await findChannelForPath(searchPath);
+        if (existingChannel) {
+            break;
+        }
+        const parent = path.dirname(searchPath);
+        if (parent === searchPath) {
+            break;
+        }
+        searchPath = parent;
+    } while (true);
+    if (!existingChannel) {
+        cliLogger.error(`No project channel found for ${absolutePath}`);
+        process.exit(EXIT_NO_RESTART);
+    }
+    // Fetch channel from Discord to get guild_id
+    const rest = new REST().setToken(botToken);
+    const channelData = (await rest.get(Routes.channel(existingChannel.channel_id)));
+    const channelUrl = `https://discord.com/channels/${channelData.guild_id}/${channelData.id}`;
+    cliLogger.log(channelUrl);
+    // Open in browser if running in a TTY
+    if (process.stdout.isTTY) {
+        if (process.platform === 'win32') {
+            spawn('cmd', ['/c', 'start', '', channelUrl], { detached: true, stdio: 'ignore' }).unref();
+        }
+        else {
+            const openCmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
+            spawn(openCmd, [channelUrl], { detached: true, stdio: 'ignore' }).unref();
+        }
+    }
+    process.exit(0);
 });
 cli
     .command('project create <name>', 'Create a new project folder with git and Discord channels')
     .option('-g, --guild <guildId>', 'Discord guild ID')
     .action(async (name, options) => {
-    try {
-        const sanitizedName = name
-            .toLowerCase()
-            .replace(/[^a-z0-9-]/g, '-')
-            .replace(/-+/g, '-')
-            .replace(/^-|-$/g, '')
-            .slice(0, 100);
-        if (!sanitizedName) {
-            cliLogger.error('Invalid project name');
-            process.exit(EXIT_NO_RESTART);
-        }
-        await initDatabase();
-        const botRow = await getBotToken();
-        if (!botRow) {
-            cliLogger.error('No bot configured. Run `kimaki` first.');
+    const sanitizedName = name
+        .toLowerCase()
+        .replace(/[^a-z0-9-]/g, '-')
+        .replace(/-+/g, '-')
+        .replace(/^-|-$/g, '')
+        .slice(0, 100);
+    if (!sanitizedName) {
+        cliLogger.error('Invalid project name');
+        process.exit(EXIT_NO_RESTART);
+    }
+    await initDatabase();
+    const botRow = await getBotToken();
+    if (!botRow) {
+        cliLogger.error('No bot configured. Run `kimaki` first.');
+        process.exit(EXIT_NO_RESTART);
+    }
+    const { app_id: appId, token: botToken } = botRow;
+    const projectsDir = getProjectsDir();
+    const projectDirectory = path.join(projectsDir, sanitizedName);
+    if (!fs.existsSync(projectsDir)) {
+        fs.mkdirSync(projectsDir, { recursive: true });
+    }
+    if (fs.existsSync(projectDirectory)) {
+        cliLogger.error(`Directory already exists: ${projectDirectory}`);
+        process.exit(EXIT_NO_RESTART);
+    }
+    fs.mkdirSync(projectDirectory, { recursive: true });
+    cliLogger.log(`Created: ${projectDirectory}`);
+    execSync('git init', { cwd: projectDirectory, stdio: 'pipe' });
+    cliLogger.log('Initialized git');
+    cliLogger.log('Connecting to Discord...');
+    const client = await createDiscordClient();
+    await new Promise((resolve, reject) => {
+        client.once(Events.ClientReady, () => {
+            resolve();
+        });
+        client.once(Events.Error, reject);
+        client.login(botToken).catch(reject);
+    });
+    let guild;
+    if (options.guild) {
+        const found = client.guilds.cache.get(options.guild);
+        if (!found) {
+            cliLogger.error(`Guild not found: ${options.guild}`);
+            client.destroy();
             process.exit(EXIT_NO_RESTART);
         }
-        const { app_id: appId, token: botToken } = botRow;
-        const projectsDir = getProjectsDir();
-        const projectDirectory = path.join(projectsDir, sanitizedName);
-        if (!fs.existsSync(projectsDir)) {
-            fs.mkdirSync(projectsDir, { recursive: true });
-        }
-        if (fs.existsSync(projectDirectory)) {
-            cliLogger.error(`Directory already exists: ${projectDirectory}`);
+        guild = found;
+    }
+    else {
+        const first = client.guilds.cache.first();
+        if (!first) {
+            cliLogger.error('No guild found. Add the bot to a server first.');
+            client.destroy();
             process.exit(EXIT_NO_RESTART);
         }
-        fs.mkdirSync(projectDirectory, { recursive: true });
-        cliLogger.log(`Created: ${projectDirectory}`);
-        execSync('git init', { cwd: projectDirectory, stdio: 'pipe' });
-        cliLogger.log('Initialized git');
-        cliLogger.log('Connecting to Discord...');
-        const client = await createDiscordClient();
-        await new Promise((resolve, reject) => {
-            client.once(Events.ClientReady, () => {
-                resolve();
-            });
-            client.once(Events.Error, reject);
-            client.login(botToken).catch(reject);
-        });
-        let guild;
-        if (options.guild) {
-            const found = client.guilds.cache.get(options.guild);
-            if (!found) {
-                cliLogger.error(`Guild not found: ${options.guild}`);
-                client.destroy();
-                process.exit(EXIT_NO_RESTART);
-            }
-            guild = found;
-        }
-        else {
-            const first = client.guilds.cache.first();
-            if (!first) {
-                cliLogger.error('No guild found. Add the bot to a server first.');
-                client.destroy();
-                process.exit(EXIT_NO_RESTART);
-            }
-            guild = first;
-        }
-        const { textChannelId, channelName } = await createProjectChannels({
-            guild,
-            projectDirectory,
-            appId,
-            botName: client.user?.username,
-        });
-        client.destroy();
-        const channelUrl = `https://discord.com/channels/${guild.id}/${textChannelId}`;
-        note(`Created project: ${sanitizedName}\n\nDirectory: ${projectDirectory}\nChannel: #${channelName}\nURL: ${channelUrl}`, '✅ Success');
-        cliLogger.log(channelUrl);
-        process.exit(0);
-    }
-    catch (error) {
-        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
-        process.exit(EXIT_NO_RESTART);
+        guild = first;
     }
+    const { textChannelId, channelName } = await createProjectChannels({
+        guild,
+        projectDirectory,
+        appId,
+        botName: client.user?.username,
+    });
+    client.destroy();
+    const channelUrl = `https://discord.com/channels/${guild.id}/${textChannelId}`;
+    note(`Created project: ${sanitizedName}\n\nDirectory: ${projectDirectory}\nChannel: #${channelName}\nURL: ${channelUrl}`, '✅ Success');
+    cliLogger.log(channelUrl);
+    process.exit(0);
 });
 cli
     .command('tunnel', 'Expose a local port via tunnel')