kimaki 0.4.36 → 0.4.38

package/dist/channel-management.js

@@ -6,7 +6,9 @@ import path from 'node:path';
 import { getDatabase } from './database.js';
 import { extractTagsArrays } from './xml.js';
 export async function ensureKimakiCategory(guild, botName) {
-    const categoryName = botName ? `Kimaki ${botName}` : 'Kimaki';
+    // Skip appending bot name if it's already "kimaki" to avoid "Kimaki kimaki"
+    const isKimakiBot = botName?.toLowerCase() === 'kimaki';
+    const categoryName = botName && !isKimakiBot ? `Kimaki ${botName}` : 'Kimaki';
     const existingCategory = guild.channels.cache.find((channel) => {
         if (channel.type !== ChannelType.GuildCategory) {
             return false;
@@ -22,7 +24,9 @@ export async function ensureKimakiCategory(guild, botName) {
     });
 }
 export async function ensureKimakiAudioCategory(guild, botName) {
-    const categoryName = botName ? `Kimaki Audio ${botName}` : 'Kimaki Audio';
+    // Skip appending bot name if it's already "kimaki" to avoid "Kimaki Audio kimaki"
+    const isKimakiBot = botName?.toLowerCase() === 'kimaki';
+    const categoryName = botName && !isKimakiBot ? `Kimaki Audio ${botName}` : 'Kimaki Audio';
     const existingCategory = guild.channels.cache.find((channel) => {
         if (channel.type !== ChannelType.GuildCategory) {
             return false;
@@ -57,11 +61,11 @@ export async function createProjectChannels({ guild, projectDirectory, appId, bo
         parent: kimakiAudioCategory,
     });
     getDatabase()
-        .prepare('INSERT OR REPLACE INTO channel_directories (channel_id, directory, channel_type) VALUES (?, ?, ?)')
-        .run(textChannel.id, projectDirectory, 'text');
+        .prepare('INSERT OR REPLACE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)')
+        .run(textChannel.id, projectDirectory, 'text', appId);
     getDatabase()
-        .prepare('INSERT OR REPLACE INTO channel_directories (channel_id, directory, channel_type) VALUES (?, ?, ?)')
-        .run(voiceChannel.id, projectDirectory, 'voice');
+        .prepare('INSERT OR REPLACE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)')
+        .run(voiceChannel.id, projectDirectory, 'voice', appId);
     return {
         textChannelId: textChannel.id,
         voiceChannelId: voiceChannel.id,

package/dist/cli.js

@@ -14,6 +14,7 @@ import { spawn, spawnSync, execSync } from 'node:child_process';
 import http from 'node:http';
 import { setDataDir, getDataDir, getLockPort } from './config.js';
 import { extractTagsArrays } from './xml.js';
+import { sanitizeAgentName } from './commands/agent.js';
 const cliLogger = createLogger('CLI');
 const cli = cac('kimaki');
 process.title = 'kimaki';
@@ -119,7 +120,7 @@ async function startLockServer() {
 const EXIT_NO_RESTART = 64;
 // Commands to skip when registering user commands (reserved names)
 const SKIP_USER_COMMANDS = ['init'];
-async function registerCommands(token, appId, userCommands = []) {
+async function registerCommands({ token, appId, userCommands = [], agents = [], }) {
     const commands = [
         new SlashCommandBuilder()
             .setName('resume')
@@ -254,6 +255,18 @@ async function registerCommands(token, appId, userCommands = []) {
         })
             .toJSON());
     }
+    // Add agent-specific quick commands like /plan-agent, /build-agent
+    // Filter to primary/all mode agents (same as /agent command shows)
+    const primaryAgents = agents.filter((a) => a.mode === 'primary' || a.mode === 'all');
+    for (const agent of primaryAgents) {
+        const sanitizedName = sanitizeAgentName(agent.name);
+        const commandName = `${sanitizedName}-agent`;
+        const description = agent.description || `Switch to ${agent.name} agent`;
+        commands.push(new SlashCommandBuilder()
+            .setName(commandName.slice(0, 32)) // Discord limits to 32 chars
+            .setDescription(description.slice(0, 100))
+            .toJSON());
+    }
     const rest = new REST().setToken(token);
     try {
         const data = (await rest.put(Routes.applicationCommands(appId), {
@@ -484,10 +497,10 @@ async function run({ restart, addChannels }) {
     for (const { guild, channels } of kimakiChannels) {
         for (const channel of channels) {
             if (channel.kimakiDirectory) {
-                db.prepare('INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type) VALUES (?, ?, ?)').run(channel.id, channel.kimakiDirectory, 'text');
+                db.prepare('INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)').run(channel.id, channel.kimakiDirectory, 'text', channel.kimakiApp || null);
                 const voiceChannel = guild.channels.cache.find((ch) => ch.type === ChannelType.GuildVoice && ch.name === channel.name);
                 if (voiceChannel) {
-                    db.prepare('INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type) VALUES (?, ?, ?)').run(voiceChannel.id, channel.kimakiDirectory, 'voice');
+                    db.prepare('INSERT OR IGNORE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)').run(voiceChannel.id, channel.kimakiDirectory, 'voice', channel.kimakiApp || null);
                 }
             }
         }
@@ -506,8 +519,8 @@ async function run({ restart, addChannels }) {
     const getClient = await opencodePromise;
     s.stop('OpenCode server ready!');
     s.start('Fetching OpenCode data...');
-    // Fetch projects and commands in parallel
-    const [projects, allUserCommands] = await Promise.all([
+    // Fetch projects, commands, and agents in parallel
+    const [projects, allUserCommands, allAgents] = await Promise.all([
         getClient()
             .project.list({})
             .then((r) => r.data || [])
@@ -521,6 +534,10 @@ async function run({ restart, addChannels }) {
             .command.list({ query: { directory: currentDir } })
             .then((r) => r.data || [])
             .catch(() => []),
+        getClient()
+            .app.agents({ query: { directory: currentDir } })
+            .then((r) => r.data || [])
+            .catch(() => []),
     ]);
     s.stop(`Found ${projects.length} OpenCode project(s)`);
     const existingDirs = kimakiChannels.flatMap(({ channels }) => channels
@@ -611,7 +628,7 @@ async function run({ restart, addChannels }) {
         note(`Found ${registrableCommands.length} user-defined command(s):\n${commandList}`, 'OpenCode Commands');
     }
     cliLogger.log('Registering slash commands asynchronously...');
-    void registerCommands(token, appId, allUserCommands)
+    void registerCommands({ token, appId, userCommands: allUserCommands, agents: allAgents })
         .then(() => {
         cliLogger.log('Slash commands registered!');
     })
@@ -746,20 +763,27 @@ cli
         process.exit(EXIT_NO_RESTART);
     }
 });
-// Magic prefix used to identify bot-initiated sessions.
-// The running bot will recognize this prefix and start a session.
-const BOT_SESSION_PREFIX = '🤖 **Bot-initiated session**';
 cli
-    .command('start-session', 'Start a new session in a Discord channel (creates thread, bot handles the rest)')
+    .command('send', 'Send a message to Discord channel, creating a thread. Use --notify-only to skip AI session.')
+    .alias('start-session') // backwards compatibility
     .option('-c, --channel <channelId>', 'Discord channel ID')
     .option('-d, --project <path>', 'Project directory (alternative to --channel)')
-    .option('-p, --prompt <prompt>', 'Initial prompt for the session')
+    .option('-p, --prompt <prompt>', 'Message content')
     .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')
     .action(async (options) => {
     try {
-        let { channel: channelId, prompt, name, appId: optionAppId } = options;
+        let { channel: channelId, prompt, name, appId: optionAppId, notifyOnly } = options;
         const { project: projectPath } = options;
+        // Get raw channel ID from argv to prevent JS number precision loss on large Discord IDs
+        // cac parses large numbers and loses precision, so we extract the original string value
+        if (channelId) {
+            const channelArgIndex = process.argv.findIndex((arg) => arg === '--channel' || arg === '-c');
+            if (channelArgIndex !== -1 && process.argv[channelArgIndex + 1]) {
+                channelId = process.argv[channelArgIndex + 1];
+            }
+        }
         if (!channelId && !projectPath) {
             cliLogger.error('Either --channel or --project is required');
             process.exit(EXIT_NO_RESTART);
@@ -818,15 +842,38 @@ cli
                 process.exit(EXIT_NO_RESTART);
             }
             s.start('Looking up channel for project...');
-            // Check if channel already exists for this directory
+            // Check if channel already exists for this directory or a parent directory
+            // This allows running from subfolders of a registered project
             try {
                 const db = getDatabase();
-                const existingChannel = db
-                    .prepare('SELECT channel_id FROM channel_directories WHERE directory = ? AND channel_type = ?')
-                    .get(absolutePath, 'text');
+                // Helper to find channel for a path (prefers current bot's channel)
+                const findChannelForPath = (dirPath) => {
+                    const withAppId = db
+                        .prepare('SELECT channel_id, directory FROM channel_directories WHERE directory = ? AND channel_type = ? AND app_id = ?')
+                        .get(dirPath, 'text', appId);
+                    if (withAppId)
+                        return withAppId;
+                    return db
+                        .prepare('SELECT channel_id, directory FROM channel_directories WHERE directory = ? AND channel_type = ?')
+                        .get(dirPath, 'text');
+                };
+                // Try exact match first, then walk up parent directories
+                let existingChannel;
+                let searchPath = absolutePath;
+                while (searchPath !== path.dirname(searchPath)) {
+                    existingChannel = findChannelForPath(searchPath);
+                    if (existingChannel)
+                        break;
+                    searchPath = path.dirname(searchPath);
+                }
                 if (existingChannel) {
                     channelId = existingChannel.channel_id;
-                    s.message(`Found existing channel: ${channelId}`);
+                    if (existingChannel.directory !== absolutePath) {
+                        s.message(`Found parent project channel: ${existingChannel.directory}`);
+                    }
+                    else {
+                        s.message(`Found existing channel: ${channelId}`);
+                    }
                 }
                 else {
                     // Need to create a new channel
@@ -846,10 +893,10 @@ cli
                     });
                     // Get guild from existing channels or first available
                     const guild = await (async () => {
-                        // Try to find a guild from existing channels
+                        // Try to find a guild from existing channels belonging to this bot
                         const existingChannelRow = db
-                            .prepare('SELECT channel_id FROM channel_directories ORDER BY created_at DESC LIMIT 1')
-                            .get();
+                            .prepare('SELECT channel_id FROM channel_directories WHERE app_id = ? ORDER BY created_at DESC LIMIT 1')
+                            .get(appId);
                         if (existingChannelRow) {
                             try {
                                 const ch = await client.channels.fetch(existingChannelRow.channel_id);
@@ -861,7 +908,7 @@ cli
                                 // Channel might be deleted, continue
                             }
                         }
-                        // Fall back to first guild
+                        // Fall back to first guild the bot is in
                         const firstGuild = client.guilds.cache.first();
                         if (!firstGuild) {
                             throw new Error('No guild found. Add the bot to a server first.');
@@ -917,8 +964,7 @@ cli
             throw new Error(`Channel belongs to a different bot (expected: ${appId}, got: ${channelAppId})`);
         }
         s.message('Creating starter message...');
-        // Create starter message with magic prefix
-        // The full prompt goes in the message so the bot can read it
+        // Create starter message with just the prompt (no prefix)
         const starterMessageResponse = await fetch(`https://discord.com/api/v10/channels/${channelId}/messages`, {
             method: 'POST',
             headers: {
@@ -926,7 +972,7 @@ cli
                 'Content-Type': 'application/json',
             },
             body: JSON.stringify({
-                content: `${BOT_SESSION_PREFIX}\n${prompt}`,
+                content: prompt,
             }),
         });
         if (!starterMessageResponse.ok) {
@@ -955,9 +1001,23 @@ cli
             throw new Error(`Discord API error: ${threadResponse.status} - ${error}`);
         }
         const threadData = (await threadResponse.json());
+        // Mark thread for auto-start if not notify-only
+        // This is optional - only works if local database exists (for local bot auto-start)
+        if (!notifyOnly) {
+            try {
+                const db = getDatabase();
+                db.prepare('INSERT OR REPLACE INTO pending_auto_start (thread_id) VALUES (?)').run(threadData.id);
+            }
+            catch {
+                // Database not available (e.g., CI environment) - skip auto-start marking
+            }
+        }
         s.stop('Thread created!');
         const threadUrl = `https://discord.com/channels/${channelData.guild_id}/${threadData.id}`;
-        note(`Thread: ${threadData.name}\nDirectory: ${projectDirectory}\n\nThe running bot will pick this up and start the session.\n\nURL: ${threadUrl}`, '✅ Thread Created');
+        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}`;
+        note(successMessage, '✅ Thread Created');
         console.log(threadUrl);
         process.exit(0);
     }

package/dist/commands/agent.js

@@ -1,19 +1,29 @@
 // /agent command - Set the preferred agent for this channel or session.
+// Also provides quick agent commands like /plan-agent, /build-agent that switch instantly.
 import { ChatInputCommandInteraction, StringSelectMenuInteraction, StringSelectMenuBuilder, ActionRowBuilder, ChannelType, } from 'discord.js';
 import crypto from 'node:crypto';
-import { getDatabase, setChannelAgent, setSessionAgent, runModelMigrations } from '../database.js';
+import { getDatabase, setChannelAgent, setSessionAgent, clearSessionModel, runModelMigrations } from '../database.js';
 import { initializeOpencodeForDirectory } from '../opencode.js';
 import { resolveTextChannel, getKimakiMetadata } from '../discord-utils.js';
 import { createLogger } from '../logger.js';
 const agentLogger = createLogger('AGENT');
 const pendingAgentContexts = new Map();
-export async function handleAgentCommand({ interaction, appId, }) {
-    await interaction.deferReply({ ephemeral: true });
-    runModelMigrations();
+/**
+ * Sanitize an agent name to be a valid Discord command name component.
+ * Lowercase, alphanumeric and hyphens only.
+ */
+export function sanitizeAgentName(name) {
+    return name.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-').replace(/^-|-$/g, '');
+}
+/**
+ * Resolve the context for an agent command (directory, channel, session).
+ * Returns null if the command cannot be executed in this context.
+ */
+export async function resolveAgentCommandContext({ interaction, appId, }) {
     const channel = interaction.channel;
     if (!channel) {
         await interaction.editReply({ content: 'This command can only be used in a channel' });
-        return;
+        return null;
     }
     const isThread = [
         ChannelType.PublicThread,
@@ -47,22 +57,53 @@ export async function handleAgentCommand({ interaction, appId, }) {
         await interaction.editReply({
             content: 'This command can only be used in text channels or threads',
         });
-        return;
+        return null;
     }
     if (channelAppId && channelAppId !== appId) {
         await interaction.editReply({ content: 'This channel is not configured for this bot' });
-        return;
+        return null;
     }
     if (!projectDirectory) {
         await interaction.editReply({
             content: 'This channel is not configured with a project directory',
         });
+        return null;
+    }
+    return {
+        dir: projectDirectory,
+        channelId: targetChannelId,
+        sessionId,
+        isThread,
+    };
+}
+/**
+ * Set the agent preference for a context (session or channel).
+ * When switching agents for a session, also clears the session model preference
+ * so the new agent's model takes effect.
+ */
+export function setAgentForContext({ context, agentName, }) {
+    if (context.isThread && context.sessionId) {
+        setSessionAgent(context.sessionId, agentName);
+        // Clear session model so the new agent's model takes effect
+        clearSessionModel(context.sessionId);
+        agentLogger.log(`Set agent ${agentName} for session ${context.sessionId} (cleared model preference)`);
+    }
+    else {
+        setChannelAgent(context.channelId, agentName);
+        agentLogger.log(`Set agent ${agentName} for channel ${context.channelId}`);
+    }
+}
+export async function handleAgentCommand({ interaction, appId, }) {
+    await interaction.deferReply({ ephemeral: true });
+    runModelMigrations();
+    const context = await resolveAgentCommandContext({ interaction, appId });
+    if (!context) {
         return;
     }
     try {
-        const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        const getClient = await initializeOpencodeForDirectory(context.dir);
         const agentsResponse = await getClient().app.agents({
-            query: { directory: projectDirectory },
+            query: { directory: context.dir },
         });
         if (!agentsResponse.data || agentsResponse.data.length === 0) {
             await interaction.editReply({ content: 'No agents available' });
@@ -76,12 +117,7 @@ export async function handleAgentCommand({ interaction, appId, }) {
             return;
         }
         const contextHash = crypto.randomBytes(8).toString('hex');
-        pendingAgentContexts.set(contextHash, {
-            dir: projectDirectory,
-            channelId: targetChannelId,
-            sessionId,
-            isThread,
-        });
+        pendingAgentContexts.set(contextHash, context);
         const options = agents.map((agent) => ({
             label: agent.name.slice(0, 100),
             value: agent.name,
@@ -128,17 +164,14 @@ export async function handleAgentSelectMenu(interaction) {
         return;
     }
     try {
+        setAgentForContext({ context, agentName: selectedAgent });
         if (context.isThread && context.sessionId) {
-            setSessionAgent(context.sessionId, selectedAgent);
-            agentLogger.log(`Set agent ${selectedAgent} for session ${context.sessionId}`);
             await interaction.editReply({
                 content: `Agent preference set for this session: **${selectedAgent}**`,
                 components: [],
             });
         }
         else {
-            setChannelAgent(context.channelId, selectedAgent);
-            agentLogger.log(`Set agent ${selectedAgent} for channel ${context.channelId}`);
             await interaction.editReply({
                 content: `Agent preference set for this channel: **${selectedAgent}**\n\nAll new sessions in this channel will use this agent.`,
                 components: [],
@@ -154,3 +187,52 @@ export async function handleAgentSelectMenu(interaction) {
         });
     }
 }
+/**
+ * Handle quick agent commands like /plan-agent, /build-agent.
+ * These instantly switch to the specified agent without showing a dropdown.
+ */
+export async function handleQuickAgentCommand({ command, appId, }) {
+    await command.deferReply({ ephemeral: true });
+    runModelMigrations();
+    // Extract agent name from command: "plan-agent" → "plan"
+    const sanitizedAgentName = command.commandName.replace(/-agent$/, '');
+    const context = await resolveAgentCommandContext({ interaction: command, appId });
+    if (!context) {
+        return;
+    }
+    try {
+        const getClient = await initializeOpencodeForDirectory(context.dir);
+        const agentsResponse = await getClient().app.agents({
+            query: { directory: context.dir },
+        });
+        if (!agentsResponse.data || agentsResponse.data.length === 0) {
+            await command.editReply({ content: 'No agents available in this project' });
+            return;
+        }
+        // Find the agent matching the sanitized command name
+        const matchingAgent = agentsResponse.data.find((a) => sanitizeAgentName(a.name) === sanitizedAgentName);
+        if (!matchingAgent) {
+            await command.editReply({
+                content: `Agent not found. Available agents: ${agentsResponse.data.map((a) => a.name).join(', ')}`,
+            });
+            return;
+        }
+        setAgentForContext({ context, agentName: matchingAgent.name });
+        if (context.isThread && context.sessionId) {
+            await command.editReply({
+                content: `Switched to **${matchingAgent.name}** agent for this session`,
+            });
+        }
+        else {
+            await command.editReply({
+                content: `Switched to **${matchingAgent.name}** agent for this channel\n\nAll new sessions will use this agent.`,
+            });
+        }
+    }
+    catch (error) {
+        agentLogger.error('Error in quick agent command:', error);
+        await command.editReply({
+            content: `Failed to switch agent: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        });
+    }
+}

package/dist/database.js

@@ -49,6 +49,20 @@ export function getDatabase() {
         channel_type TEXT NOT NULL,
         created_at DATETIME DEFAULT CURRENT_TIMESTAMP
       )
+    `);
+        // Migration: add app_id column to channel_directories for multi-bot support
+        try {
+            db.exec(`ALTER TABLE channel_directories ADD COLUMN app_id TEXT`);
+        }
+        catch {
+            // Column already exists, ignore
+        }
+        // Table for threads that should auto-start a session (created by CLI without --notify-only)
+        db.exec(`
+      CREATE TABLE IF NOT EXISTS pending_auto_start (
+        thread_id TEXT PRIMARY KEY,
+        created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+      )
     `);
         db.exec(`
       CREATE TABLE IF NOT EXISTS bot_api_keys (
@@ -140,6 +154,14 @@ export function setSessionModel(sessionId, modelId) {
     const db = getDatabase();
     db.prepare(`INSERT OR REPLACE INTO session_models (session_id, model_id) VALUES (?, ?)`).run(sessionId, modelId);
 }
+/**
+ * Clear the model preference for a session.
+ * Used when switching agents so the agent's model takes effect.
+ */
+export function clearSessionModel(sessionId) {
+    const db = getDatabase();
+    db.prepare('DELETE FROM session_models WHERE session_id = ?').run(sessionId);
+}
 /**
  * Get the agent preference for a channel.
  */

package/dist/discord-bot.js

@@ -119,14 +119,6 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
             if (isThread) {
                 const thread = channel;
                 discordLogger.log(`Message in thread ${thread.name} (${thread.id})`);
-                const row = getDatabase()
-                    .prepare('SELECT session_id FROM thread_sessions WHERE thread_id = ?')
-                    .get(thread.id);
-                if (!row) {
-                    discordLogger.log(`No session found for thread ${thread.id}`);
-                    return;
-                }
-                voiceLogger.log(`[SESSION] Found session ${row.session_id} for thread ${thread.id}`);
                 const parent = thread.parent;
                 let projectDirectory;
                 let channelAppId;
@@ -150,6 +142,31 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
                     });
                     return;
                 }
+                const row = getDatabase()
+                    .prepare('SELECT session_id FROM thread_sessions WHERE thread_id = ?')
+                    .get(thread.id);
+                // No existing session - start a new one (e.g., replying to a notification thread)
+                if (!row) {
+                    discordLogger.log(`No session for thread ${thread.id}, starting new session`);
+                    if (!projectDirectory) {
+                        discordLogger.log(`Cannot start session: no project directory for thread ${thread.id}`);
+                        return;
+                    }
+                    // Include starter message as context for the session
+                    let prompt = message.content;
+                    const starterMessage = await thread.fetchStarterMessage().catch(() => null);
+                    if (starterMessage?.content && starterMessage.content !== message.content) {
+                        prompt = `Context from thread:\n${starterMessage.content}\n\nUser request:\n${message.content}`;
+                    }
+                    await handleOpencodeSession({
+                        prompt,
+                        thread,
+                        projectDirectory,
+                        channelId: parent?.id || '',
+                    });
+                    return;
+                }
+                voiceLogger.log(`[SESSION] Found session ${row.session_id} for thread ${thread.id}`);
                 let messageContent = message.content || '';
                 let currentSessionContext;
                 let lastSessionContext;
@@ -293,35 +310,35 @@ export async function startDiscordBot({ token, appId, discordClient, }) {
             }
         }
     });
-    // Magic prefix used by `kimaki start-session` CLI command to initiate sessions
-    const BOT_SESSION_PREFIX = '🤖 **Bot-initiated session**';
-    // Handle bot-initiated threads created by `kimaki start-session`
+    // Handle bot-initiated threads created by `kimaki send` (without --notify-only)
     discordClient.on(Events.ThreadCreate, async (thread, newlyCreated) => {
         try {
             if (!newlyCreated) {
                 return;
             }
+            // Check if this thread is marked for auto-start in the database
+            const db = getDatabase();
+            const pendingRow = db
+                .prepare('SELECT thread_id FROM pending_auto_start WHERE thread_id = ?')
+                .get(thread.id);
+            if (!pendingRow) {
+                return; // Not a CLI-initiated auto-start thread
+            }
+            // Remove from pending table
+            db.prepare('DELETE FROM pending_auto_start WHERE thread_id = ?').run(thread.id);
+            discordLogger.log(`[BOT_SESSION] Detected bot-initiated thread: ${thread.name}`);
             // Only handle threads in text channels
             const parent = thread.parent;
             if (!parent || parent.type !== ChannelType.GuildText) {
                 return;
             }
-            // Get the starter message to check for magic prefix
+            // Get the starter message for the prompt
             const starterMessage = await thread.fetchStarterMessage().catch(() => null);
             if (!starterMessage) {
                 discordLogger.log(`[THREAD_CREATE] Could not fetch starter message for thread ${thread.id}`);
                 return;
             }
-            // Only handle messages from this bot with the magic prefix
-            if (starterMessage.author.id !== discordClient.user?.id) {
-                return;
-            }
-            if (!starterMessage.content.startsWith(BOT_SESSION_PREFIX)) {
-                return;
-            }
-            discordLogger.log(`[BOT_SESSION] Detected bot-initiated thread: ${thread.name}`);
-            // Extract the prompt (everything after the prefix)
-            const prompt = starterMessage.content.slice(BOT_SESSION_PREFIX.length).trim();
+            const prompt = starterMessage.content.trim();
             if (!prompt) {
                 discordLogger.log(`[BOT_SESSION] No prompt found in starter message`);
                 return;

package/dist/interaction-handler.js

@@ -12,7 +12,7 @@ import { handleAbortCommand } from './commands/abort.js';
 import { handleShareCommand } from './commands/share.js';
 import { handleForkCommand, handleForkSelectMenu } from './commands/fork.js';
 import { handleModelCommand, handleProviderSelectMenu, handleModelSelectMenu, } from './commands/model.js';
-import { handleAgentCommand, handleAgentSelectMenu } from './commands/agent.js';
+import { handleAgentCommand, handleAgentSelectMenu, handleQuickAgentCommand } from './commands/agent.js';
 import { handleAskQuestionSelectMenu } from './commands/ask-question.js';
 import { handleQueueCommand, handleClearQueueCommand } from './commands/queue.js';
 import { handleUndoCommand, handleRedoCommand } from './commands/undo-redo.js';
@@ -94,6 +94,11 @@ export function registerInteractionHandler({ discordClient, appId, }) {
                         await handleRedoCommand({ command: interaction, appId });
                         return;
                 }
+                // Handle quick agent commands (ending with -agent suffix, but not the base /agent command)
+                if (interaction.commandName.endsWith('-agent') && interaction.commandName !== 'agent') {
+                    await handleQuickAgentCommand({ command: interaction, appId });
+                    return;
+                }
                 // Handle user-defined commands (ending with -cmd suffix)
                 if (interaction.commandName.endsWith('-cmd')) {
                     await handleUserCommand({ command: interaction, appId });