kimaki 0.4.55 → 0.4.57

package/dist/cli.js

@@ -6,16 +6,19 @@ import { cac } from '@xmorse/cac';
 import { intro, outro, text, password, note, cancel, isCancel, confirm, log, multiselect, } from '@clack/prompts';
 import { deduplicateByKey, generateBotInstallUrl, abbreviatePath } from './utils.js';
 import { getChannelsWithDescriptions, createDiscordClient, initDatabase, getChannelDirectory, startDiscordBot, initializeOpencodeForDirectory, ensureKimakiCategory, createProjectChannels, } from './discord-bot.js';
-import { getBotToken, setBotToken, setGeminiApiKey, setChannelDirectory, findChannelsByDirectory, findChannelByAppId, getThreadSession, getThreadIdBySessionId, setPendingAutoStart, } from './database.js';
+import { getBotToken, setBotToken, setChannelDirectory, findChannelsByDirectory, findChannelByAppId, getThreadSession, getThreadIdBySessionId, getPrisma, } from './database.js';
+import { formatWorktreeName } from './commands/worktree.js';
+import { WORKTREE_PREFIX } from './commands/merge-worktree.js';
+import yaml from 'js-yaml';
 import { Events, ChannelType, REST, Routes, SlashCommandBuilder, AttachmentBuilder, } from 'discord.js';
 import path from 'node:path';
 import fs from 'node:fs';
 import * as errore from 'errore';
 import { createLogger, LogPrefix } from './logger.js';
-import { uploadFilesToDiscord } from './discord-utils.js';
+import { uploadFilesToDiscord, stripMentions } from './discord-utils.js';
 import { spawn, spawnSync, execSync } from 'node:child_process';
 import http from 'node:http';
-import { setDataDir, getDataDir, getLockPort, setDefaultVerbosity } from './config.js';
+import { setDataDir, getDataDir, getLockPort, setDefaultVerbosity, setDefaultMentionMode, getProjectsDir } from './config.js';
 import { sanitizeAgentName } from './commands/agent.js';
 const cliLogger = createLogger(LogPrefix.CLI);
 // Strip bracketed paste escape sequences from terminal input.
@@ -165,6 +168,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .setAutocomplete(true);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('new-session')
@@ -188,6 +192,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .setAutocomplete(true);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('new-worktree')
@@ -199,14 +204,22 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .setRequired(false);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('merge-worktree')
             .setDescription('Merge the worktree branch into the default branch')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('toggle-worktrees')
             .setDescription('Toggle automatic git worktree creation for new sessions in this channel')
+            .setDMPermission(false)
+            .toJSON(),
+        new SlashCommandBuilder()
+            .setName('toggle-mention-mode')
+            .setDescription('Toggle mention-only mode (bot only responds when @mentioned)')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('add-project')
@@ -219,6 +232,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .setAutocomplete(true);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('remove-project')
@@ -231,6 +245,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .setAutocomplete(true);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('create-new-project')
@@ -239,38 +254,57 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             option.setName('name').setDescription('Name for the new project folder').setRequired(true);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('abort')
             .setDescription('Abort the current OpenCode request in this thread')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('compact')
             .setDescription('Compact the session context by summarizing conversation history')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('stop')
             .setDescription('Abort the current OpenCode request in this thread')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('share')
             .setDescription('Share the current session as a public URL')
+            .setDMPermission(false)
+            .toJSON(),
+        new SlashCommandBuilder()
+            .setName('diff')
+            .setDescription('Show git diff as a shareable URL')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('fork')
             .setDescription('Fork the session from a past user message')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('model')
             .setDescription('Set the preferred model for this channel or session')
+            .setDMPermission(false)
+            .toJSON(),
+        new SlashCommandBuilder()
+            .setName('unset-model-override')
+            .setDescription('Remove model override and use default instead')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('login')
             .setDescription('Authenticate with an AI provider (OAuth or API key). Use this instead of /connect')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('agent')
             .setDescription('Set the preferred agent for this channel or session')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('queue')
@@ -279,18 +313,22 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             option.setName('message').setDescription('The message to queue').setRequired(true);
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('clear-queue')
             .setDescription('Clear all queued messages in this thread')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('undo')
             .setDescription('Undo the last assistant message (revert file changes)')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('redo')
             .setDescription('Redo previously undone changes')
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('verbosity')
@@ -303,10 +341,12 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .addChoices({ name: 'tools-and-text (default)', value: 'tools-and-text' }, { name: 'text-and-essential-tools', value: 'text-and-essential-tools' }, { name: 'text-only', value: 'text-only' });
             return option;
         })
+            .setDMPermission(false)
             .toJSON(),
         new SlashCommandBuilder()
             .setName('restart-opencode-server')
             .setDescription('Restart the opencode server for this channel only (fixes state/auth/plugins)')
+            .setDMPermission(false)
             .toJSON(),
     ];
     // Add user-defined commands with -cmd suffix
@@ -315,7 +355,8 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             continue;
         }
         // Sanitize command name: oh-my-opencode uses MCP commands with colons, which Discord doesn't allow
-        const sanitizedName = cmd.name.replace(/:/g, '-');
+        // Also convert to lowercase since Discord only allows lowercase in command names
+        const sanitizedName = cmd.name.toLowerCase().replace(/:/g, '-');
         const commandName = `${sanitizedName}-cmd`;
         const description = cmd.description || `Run /${cmd.name} command`;
         commands.push(new SlashCommandBuilder()
@@ -328,6 +369,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
                 .setRequired(false);
             return option;
         })
+            .setDMPermission(false)
             .toJSON());
     }
     // Add agent-specific quick commands like /plan-agent, /build-agent
@@ -340,6 +382,7 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
         commands.push(new SlashCommandBuilder()
             .setName(commandName.slice(0, 32)) // Discord limits to 32 chars
             .setDescription(description.slice(0, 100))
+            .setDMPermission(false)
             .toJSON());
     }
     const rest = new REST().setToken(token);
@@ -501,6 +544,32 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels })
                 process.exit(EXIT_NO_RESTART);
             }
         }
+        else {
+            // OpenCode found, check version is recent enough for plugin support
+            const opencodeCommand = process.env.OPENCODE_PATH || 'opencode';
+            const versionCheck = spawnSync(opencodeCommand, ['--version'], {
+                shell: true,
+                encoding: 'utf-8',
+            });
+            const version = versionCheck.stdout?.trim();
+            if (version) {
+                const [major, minor, patch] = version.split('.').map(Number);
+                // Minimum version 1.1.51 required for plugin API (@opencode-ai/plugin/tool subpath)
+                const MIN_MAJOR = 1;
+                const MIN_MINOR = 1;
+                const MIN_PATCH = 51;
+                const tooOld = (major || 0) < MIN_MAJOR ||
+                    ((major || 0) === MIN_MAJOR && (minor || 0) < MIN_MINOR) ||
+                    ((major || 0) === MIN_MAJOR && (minor || 0) === MIN_MINOR && (patch || 0) < MIN_PATCH);
+                if (tooOld) {
+                    note(`Installed OpenCode version ${version} is too old.\n` +
+                        `Kimaki requires OpenCode >= ${MIN_MAJOR}.${MIN_MINOR}.${MIN_PATCH}.\n` +
+                        `Please update: curl -fsSL https://opencode.ai/install | bash`, 'OpenCode Update Required');
+                    process.exit(EXIT_NO_RESTART);
+                }
+                cliLogger.log(`OpenCode version: ${version}`);
+            }
+        }
     }
     // Initialize database
     await initDatabase();
@@ -574,29 +643,7 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels })
             process.exit(0);
         }
         token = stripBracketedPaste(tokenInput);
-        note(`You can get a Gemini api Key at https://aistudio.google.com/apikey`, `Gemini API Key`);
-        const geminiApiKeyInput = await password({
-            message: 'Enter your Gemini API Key for voice channels and audio transcription (optional, press Enter to skip):',
-            validate(value) {
-                const cleaned = stripBracketedPaste(value);
-                if (cleaned && cleaned.length < 10) {
-                    return 'Invalid API key format';
-                }
-                return undefined;
-            },
-        });
-        if (isCancel(geminiApiKeyInput)) {
-            cancel('Setup cancelled');
-            process.exit(0);
-        }
-        const geminiApiKey = stripBracketedPaste(geminiApiKeyInput) || null;
-        // Store bot token early so setGeminiApiKey can satisfy FK constraint
         await setBotToken(appId, token);
-        // Store API key in database
-        if (geminiApiKey) {
-            await setGeminiApiKey(appId, geminiApiKey);
-            note('API key saved successfully', 'API Key Stored');
-        }
         note(`Bot install URL:\n${generateBotInstallUrl({ clientId: appId })}\n\nYou MUST install the bot in your Discord server before continuing.`, 'Step 4: Install Bot to Server');
         const installed = await text({
             message: 'Press Enter AFTER you have installed the bot in your server:',
@@ -845,6 +892,7 @@ cli
     .option('--use-worktrees', 'Create git worktrees for all new sessions started from channel messages')
     .option('--enable-voice-channels', 'Create voice channels for projects (disabled by default)')
     .option('--verbosity <level>', 'Default verbosity for all channels (tools-and-text, text-and-essential-tools, or text-only)')
+    .option('--mention-mode', 'Bot only responds when @mentioned (default for all channels)')
     .action(async (options) => {
     try {
         // Set data directory early, before any database access
@@ -861,6 +909,10 @@ cli
             setDefaultVerbosity(options.verbosity);
             cliLogger.log(`Default verbosity: ${options.verbosity}`);
         }
+        if (options.mentionMode) {
+            setDefaultMentionMode(true);
+            cliLogger.log('Default mention mode: enabled (bot only responds when @mentioned)');
+        }
         if (options.installUrl) {
             await initDatabase();
             const existingBot = await getBotToken();
@@ -942,6 +994,10 @@ cli
     .option('-n, --name [name]', 'Thread name (optional, defaults to prompt preview)')
     .option('-a, --app-id [appId]', 'Bot application ID (required if no local database)')
     .option('--notify-only', 'Create notification thread without starting AI session')
+    .option('--worktree [name]', 'Create git worktree for session (name optional, derives from thread name)')
+    .option('-u, --user <username>', 'Discord username to add to thread')
+    .option('--agent <agent>', 'Agent to use for the session')
+    .option('--model <model>', 'Model to use (format: provider/model)')
     .action(async (options) => {
     try {
         let { channel: channelId, prompt, name, appId: optionAppId, notifyOnly } = options;
@@ -954,14 +1010,16 @@ cli
                 channelId = process.argv[channelArgIndex + 1];
             }
         }
-        if (!channelId && !projectPath) {
-            cliLogger.error('Either --channel or --project is required');
-            process.exit(EXIT_NO_RESTART);
-        }
+        // Default to current directory if neither --channel nor --project provided
+        const resolvedProjectPath = projectPath || (!channelId ? '.' : undefined);
         if (!prompt) {
             cliLogger.error('Prompt is required. Use --prompt <prompt>');
             process.exit(EXIT_NO_RESTART);
         }
+        if (options.worktree && notifyOnly) {
+            cliLogger.error('Cannot use --worktree with --notify-only');
+            process.exit(EXIT_NO_RESTART);
+        }
         // Get bot token from env var or database
         const envToken = process.env.KIMAKI_BOT_TOKEN;
         let botToken;
@@ -999,9 +1057,9 @@ cli
             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 --project provided, resolve to channel ID
-        if (projectPath) {
-            const absolutePath = path.resolve(projectPath);
+        // If --project provided (or defaulting to cwd), resolve to channel ID
+        if (resolvedProjectPath) {
+            const absolutePath = path.resolve(resolvedProjectPath);
             if (!fs.existsSync(absolutePath)) {
                 cliLogger.error(`Directory does not exist: ${absolutePath}`);
                 process.exit(EXIT_NO_RESTART);
@@ -1069,7 +1127,15 @@ cli
                             }
                         }
                         // Fall back to first guild the bot is in
-                        const firstGuild = client.guilds.cache.first();
+                        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) {
                             throw new Error('No guild found. Add the bot to a server first.');
                         }
@@ -1092,18 +1158,12 @@ cli
             }
         }
         cliLogger.log('Fetching channel info...');
-        // Get channel info to extract directory from topic
-        const channelResponse = await fetch(`https://discord.com/api/v10/channels/${channelId}`, {
-            headers: {
-                Authorization: `Bot ${botToken}`,
-            },
-        });
-        if (!channelResponse.ok) {
-            const error = await channelResponse.text();
-            cliLogger.log('Failed to fetch channel');
-            throw new Error(`Discord API error: ${channelResponse.status} - ${error}`);
+        if (!channelId) {
+            throw new Error('Channel ID not resolved');
         }
-        const channelData = (await channelResponse.json());
+        const rest = new REST().setToken(botToken);
+        // Get channel info to extract directory from topic
+        const channelData = (await rest.get(Routes.channel(channelId)));
         const channelConfig = await getChannelDirectory(channelData.id);
         if (!channelConfig) {
             cliLogger.log('Channel not configured');
@@ -1116,17 +1176,57 @@ cli
             cliLogger.log('Channel belongs to different bot');
             throw new Error(`Channel belongs to a different bot (expected: ${appId}, got: ${channelAppId})`);
         }
+        // Resolve username to user ID if provided
+        const resolvedUser = await (async () => {
+            if (!options.user) {
+                return undefined;
+            }
+            cliLogger.log(`Searching for user "${options.user}" in guild...`);
+            const searchResults = (await rest.get(Routes.guildMembersSearch(channelData.guild_id), {
+                query: new URLSearchParams({ query: options.user, limit: '10' }),
+            }));
+            // Find exact match by display name, nickname, or username
+            const exactMatch = searchResults.find((member) => {
+                const displayName = member.nick || member.user.global_name || member.user.username;
+                return (displayName.toLowerCase() === options.user.toLowerCase() ||
+                    member.user.username.toLowerCase() === options.user.toLowerCase());
+            });
+            const member = exactMatch || searchResults[0];
+            if (!member) {
+                throw new Error(`User "${options.user}" not found in guild`);
+            }
+            const username = member.nick || member.user.global_name || member.user.username;
+            cliLogger.log(`Found user: ${username} (${member.user.id})`);
+            return { id: member.user.id, username };
+        })();
         cliLogger.log('Creating starter message...');
         // Discord has a 2000 character limit for messages.
         // If prompt exceeds this, send it as a file attachment instead.
         const DISCORD_MAX_LENGTH = 2000;
         let starterMessage;
+        // Compute thread name and worktree name early (needed for embed)
+        const cleanPrompt = stripMentions(prompt);
+        const baseThreadName = name || (cleanPrompt.length > 80 ? cleanPrompt.slice(0, 77) + '...' : cleanPrompt);
+        const worktreeName = options.worktree
+            ? formatWorktreeName(typeof options.worktree === 'string' ? options.worktree : baseThreadName)
+            : undefined;
+        const threadName = worktreeName
+            ? `${WORKTREE_PREFIX}${baseThreadName}`
+            : baseThreadName;
         // Embed marker for auto-start sessions (unless --notify-only)
-        // Bot checks for this embed footer to know it should start a session
-        const AUTO_START_MARKER = 'kimaki:start';
-        const autoStartEmbed = notifyOnly
+        // Bot parses this YAML to know it should start a session, optionally create a worktree, and set initial user
+        const embedMarker = notifyOnly
             ? undefined
-            : [{ color: 0x2b2d31, footer: { text: AUTO_START_MARKER } }];
+            : {
+                start: true,
+                ...(worktreeName && { worktree: worktreeName }),
+                ...(resolvedUser && { username: resolvedUser.username, userId: resolvedUser.id }),
+                ...(options.agent && { agent: options.agent }),
+                ...(options.model && { model: options.model }),
+            };
+        const autoStartEmbed = embedMarker
+            ? [{ color: 0x2b2d31, footer: { text: yaml.dump(embedMarker) } }]
+            : undefined;
         if (prompt.length > DISCORD_MAX_LENGTH) {
             // Send as file attachment with a short summary
             const preview = prompt.slice(0, 100).replace(/\n/g, ' ');
@@ -1139,7 +1239,8 @@ cli
             const tmpFile = path.join(tmpDir, `prompt-${Date.now()}.md`);
             fs.writeFileSync(tmpFile, prompt);
             try {
-                // Create message with file attachment
+                // Using raw fetch for file uploads because discord.js REST client
+                // doesn't handle FormData/multipart file attachments correctly
                 const formData = new FormData();
                 formData.append('payload_json', JSON.stringify({
                     content: summaryContent,
@@ -1169,49 +1270,28 @@ cli
         }
         else {
             // Normal case: send prompt inline
-            const starterMessageResponse = await fetch(`https://discord.com/api/v10/channels/${channelId}/messages`, {
-                method: 'POST',
-                headers: {
-                    Authorization: `Bot ${botToken}`,
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                    content: prompt,
-                    embeds: autoStartEmbed,
-                }),
-            });
-            if (!starterMessageResponse.ok) {
-                const error = await starterMessageResponse.text();
-                cliLogger.log('Failed to create message');
-                throw new Error(`Discord API error: ${starterMessageResponse.status} - ${error}`);
-            }
-            starterMessage = (await starterMessageResponse.json());
+            starterMessage = (await rest.post(Routes.channelMessages(channelId), {
+                body: { content: prompt, embeds: autoStartEmbed },
+            }));
         }
         cliLogger.log('Creating thread...');
-        // Create thread from the message
-        const threadName = name || (prompt.length > 80 ? prompt.slice(0, 77) + '...' : prompt);
-        const threadResponse = await fetch(`https://discord.com/api/v10/channels/${channelId}/messages/${starterMessage.id}/threads`, {
-            method: 'POST',
-            headers: {
-                Authorization: `Bot ${botToken}`,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
+        const threadData = (await rest.post(Routes.threads(channelId, starterMessage.id), {
+            body: {
                 name: threadName.slice(0, 100),
                 auto_archive_duration: 1440, // 1 day
-            }),
-        });
-        if (!threadResponse.ok) {
-            const error = await threadResponse.text();
-            cliLogger.log('Failed to create thread');
-            throw new Error(`Discord API error: ${threadResponse.status} - ${error}`);
-        }
-        const threadData = (await threadResponse.json());
+            },
+        }));
         cliLogger.log('Thread created!');
+        // Add user to thread if specified
+        if (resolvedUser) {
+            cliLogger.log(`Adding user ${resolvedUser.username} to thread...`);
+            await rest.put(Routes.threadMembers(threadData.id, resolvedUser.id));
+        }
         const threadUrl = `https://discord.com/channels/${channelData.guild_id}/${threadData.id}`;
+        const worktreeNote = worktreeName ? `\nWorktree: ${worktreeName} (will be created by bot)` : '';
         const successMessage = notifyOnly
             ? `Thread: ${threadData.name}\nDirectory: ${projectDirectory}\n\nNotification created. Reply to start a session.\n\nURL: ${threadUrl}`
-            : `Thread: ${threadData.name}\nDirectory: ${projectDirectory}\n\nThe running bot will pick this up and start the session.\n\nURL: ${threadUrl}`;
+            : `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);
         process.exit(0);
@@ -1222,7 +1302,8 @@ cli
     }
 });
 cli
-    .command('add-project [directory]', 'Create Discord channels for a project directory (e.g. ./folder)')
+    .command('project add [directory]', 'Create Discord channels for a project directory (e.g. ./folder)')
+    .alias('add-project')
     .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) => {
@@ -1311,7 +1392,15 @@ cli
                 }
                 catch (error) {
                     cliLogger.debug('Failed to fetch existing channel while selecting guild:', error instanceof Error ? error.message : String(error));
-                    const firstGuild = client.guilds.cache.first();
+                    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.');
@@ -1322,7 +1411,15 @@ cli
                 }
             }
             else {
-                const firstGuild = client.guilds.cache.first();
+                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.');
@@ -1344,10 +1441,9 @@ cli
                 try {
                     const ch = await client.channels.fetch(existingChannel.channel_id);
                     if (ch && 'guild' in ch && ch.guild?.id === guild.id) {
-                        cliLogger.log('Channel already exists');
-                        note(`Channel already exists for this directory in ${guild.name}.\n\nChannel: <#${existingChannel.channel_id}>\nDirectory: ${absolutePath}`, '⚠️  Already Exists');
                         client.destroy();
-                        process.exit(0);
+                        cliLogger.error(`Channel already exists for this directory in ${guild.name}. Channel ID: ${existingChannel.channel_id}`);
+                        process.exit(EXIT_NO_RESTART);
                     }
                 }
                 catch (error) {
@@ -1413,5 +1509,125 @@ cli
     const dbPath = path.join(dataDir, 'discord-sessions.db');
     cliLogger.log(dbPath);
 });
+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}`);
+            }
+        }
+        process.exit(0);
+    }
+    catch (error) {
+        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
+        process.exit(EXIT_NO_RESTART);
+    }
+});
+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.');
+            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);
+            }
+            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);
+    }
+});
 cli.help();
 cli.parse();