kimaki 0.4.29 → 0.4.30

package/dist/cli.js

@@ -13,6 +13,7 @@ import { createLogger } from './logger.js';
 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';
 const cliLogger = createLogger('CLI');
 const cli = cac('kimaki');
 process.title = 'kimaki';
@@ -683,5 +684,149 @@ 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)')
+    .option('-c, --channel <channelId>', 'Discord channel ID')
+    .option('-p, --prompt <prompt>', 'Initial prompt for the session')
+    .option('-n, --name [name]', 'Thread name (optional, defaults to prompt preview)')
+    .option('-a, --app-id [appId]', 'Bot application ID (required if no local database)')
+    .action(async (options) => {
+    try {
+        const { channel: channelId, prompt, name, appId: optionAppId } = options;
+        if (!channelId) {
+            cliLogger.error('Channel ID is required. Use --channel <channelId>');
+            process.exit(EXIT_NO_RESTART);
+        }
+        if (!prompt) {
+            cliLogger.error('Prompt is required. Use --prompt <prompt>');
+            process.exit(EXIT_NO_RESTART);
+        }
+        // Get bot token from env var or database
+        const envToken = process.env.KIMAKI_BOT_TOKEN;
+        let botToken;
+        let appId = optionAppId;
+        if (envToken) {
+            botToken = envToken;
+            if (!appId) {
+                // Try to get app_id from database if available (optional in CI)
+                try {
+                    const db = getDatabase();
+                    const botRow = db
+                        .prepare('SELECT app_id FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
+                        .get();
+                    appId = botRow?.app_id;
+                }
+                catch {
+                    // Database might not exist in CI, that's ok
+                }
+            }
+        }
+        else {
+            // Fall back to database
+            try {
+                const db = getDatabase();
+                const botRow = db
+                    .prepare('SELECT app_id, token FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
+                    .get();
+                if (botRow) {
+                    botToken = botRow.token;
+                    appId = appId || botRow.app_id;
+                }
+            }
+            catch (e) {
+                // Database error - will fall through to the check below
+                cliLogger.error('Database error:', e instanceof Error ? e.message : String(e));
+            }
+        }
+        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);
+        }
+        const s = spinner();
+        s.start('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();
+            s.stop('Failed to fetch channel');
+            throw new Error(`Discord API error: ${channelResponse.status} - ${error}`);
+        }
+        const channelData = await channelResponse.json();
+        if (!channelData.topic) {
+            s.stop('Channel has no topic');
+            throw new Error(`Channel #${channelData.name} has no topic. It must have a <kimaki.directory> tag.`);
+        }
+        const extracted = extractTagsArrays({
+            xml: channelData.topic,
+            tags: ['kimaki.directory', 'kimaki.app'],
+        });
+        const projectDirectory = extracted['kimaki.directory']?.[0]?.trim();
+        const channelAppId = extracted['kimaki.app']?.[0]?.trim();
+        if (!projectDirectory) {
+            s.stop('No kimaki.directory tag found');
+            throw new Error(`Channel #${channelData.name} has no <kimaki.directory> tag in topic.`);
+        }
+        // Verify app ID matches if both are present
+        if (channelAppId && appId && channelAppId !== appId) {
+            s.stop('Channel belongs to different bot');
+            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
+        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: `${BOT_SESSION_PREFIX}\n${prompt}`,
+            }),
+        });
+        if (!starterMessageResponse.ok) {
+            const error = await starterMessageResponse.text();
+            s.stop('Failed to create message');
+            throw new Error(`Discord API error: ${starterMessageResponse.status} - ${error}`);
+        }
+        const starterMessage = await starterMessageResponse.json();
+        s.message('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({
+                name: threadName.slice(0, 100),
+                auto_archive_duration: 1440, // 1 day
+            }),
+        });
+        if (!threadResponse.ok) {
+            const error = await threadResponse.text();
+            s.stop('Failed to create thread');
+            throw new Error(`Discord API error: ${threadResponse.status} - ${error}`);
+        }
+        const threadData = await threadResponse.json();
+        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');
+        console.log(threadUrl);
+        process.exit(0);
+    }
+    catch (error) {
+        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
+        process.exit(EXIT_NO_RESTART);
+    }
+});
 cli.help();
 cli.parse();

package/dist/discord-bot.js

@@ -296,6 +296,85 @@ 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`
+    discordClient.on(Events.ThreadCreate, async (thread, newlyCreated) => {
+        try {
+            if (!newlyCreated) {
+                return;
+            }
+            // 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
+            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();
+            if (!prompt) {
+                discordLogger.log(`[BOT_SESSION] No prompt found in starter message`);
+                return;
+            }
+            // Extract directory from parent channel topic
+            if (!parent.topic) {
+                discordLogger.log(`[BOT_SESSION] Parent channel has no topic`);
+                return;
+            }
+            const extracted = extractTagsArrays({
+                xml: parent.topic,
+                tags: ['kimaki.directory', 'kimaki.app'],
+            });
+            const projectDirectory = extracted['kimaki.directory']?.[0]?.trim();
+            const channelAppId = extracted['kimaki.app']?.[0]?.trim();
+            if (!projectDirectory) {
+                discordLogger.log(`[BOT_SESSION] No kimaki.directory in parent channel topic`);
+                return;
+            }
+            if (channelAppId && channelAppId !== currentAppId) {
+                discordLogger.log(`[BOT_SESSION] Channel belongs to different bot app`);
+                return;
+            }
+            if (!fs.existsSync(projectDirectory)) {
+                discordLogger.error(`[BOT_SESSION] Directory does not exist: ${projectDirectory}`);
+                await thread.send({
+                    content: `✗ Directory does not exist: ${JSON.stringify(projectDirectory)}`,
+                    flags: SILENT_MESSAGE_FLAGS,
+                });
+                return;
+            }
+            discordLogger.log(`[BOT_SESSION] Starting session for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}..."`);
+            await handleOpencodeSession({
+                prompt,
+                thread,
+                projectDirectory,
+                channelId: parent.id,
+            });
+        }
+        catch (error) {
+            voiceLogger.error('[BOT_SESSION] Error handling bot-initiated thread:', error);
+            try {
+                const errMsg = error instanceof Error ? error.message : String(error);
+                await thread.send({ content: `Error: ${errMsg}`, flags: SILENT_MESSAGE_FLAGS });
+            }
+            catch {
+                // Ignore send errors
+            }
+        }
+    });
     await discordClient.login(token);
     const handleShutdown = async (signal, { skipExit = false } = {}) => {
         discordLogger.log(`Received ${signal}, cleaning up...`);

package/dist/session-handler.js

@@ -525,7 +525,7 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                 path: { id: session.id },
                 body: {
                     parts,
-                    system: getOpencodeSystemMessage({ sessionId: session.id }),
+                    system: getOpencodeSystemMessage({ sessionId: session.id, channelId }),
                     model: modelParam,
                     agent: agentPreference,
                 },

package/dist/system-message.js

@@ -1,13 +1,13 @@
 // OpenCode system prompt generator.
 // Creates the system message injected into every OpenCode session,
 // including Discord-specific formatting rules, diff commands, and permissions info.
-export function getOpencodeSystemMessage({ sessionId }) {
+export function getOpencodeSystemMessage({ sessionId, channelId }) {
     return `
 The user is reading your messages from inside Discord, via kimaki.xyz
 
 The user cannot see bash tool outputs. If there is important information in bash output, include it in your text response.
 
-Your current OpenCode session ID is: ${sessionId}
+Your current OpenCode session ID is: ${sessionId}${channelId ? `\nYour current Discord channel ID is: ${channelId}` : ''}
 
 ## permissions
 
@@ -22,7 +22,15 @@ Only users with these Discord permissions can send messages to the bot:
 To upload files to the Discord thread (images, screenshots, long files that would clutter the chat), run:
 
 npx -y kimaki upload-to-discord --session ${sessionId} <file1> [file2] ...
+${channelId ? `
+## starting new sessions from CLI
 
+To start a new thread/session in this channel programmatically, run:
+
+npx -y kimaki start-session --channel ${channelId} --prompt "your prompt here"
+
+This is useful for automation (cron jobs, GitHub webhooks, n8n, etc.)
+` : ''}
 ## showing diffs
 
 IMPORTANT: After editing any files, you MUST execute the critique command using the Bash tool to get a diff URL, then share that URL with the user.

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.29",
+  "version": "0.4.30",
   "scripts": {
     "dev": "tsx --env-file .env src/cli.ts",
     "prepublishOnly": "pnpm tsc",

package/src/cli.ts

@@ -46,6 +46,7 @@ import { createLogger } from './logger.js'
 import { spawn, spawnSync, execSync, type ExecSyncOptions } from 'node:child_process'
 import http from 'node:http'
 import { setDataDir, getDataDir, getLockPort } from './config.js'
+import { extractTagsArrays } from './xml.js'
 
 const cliLogger = createLogger('CLI')
 const cli = cac('kimaki')
@@ -958,6 +959,196 @@ cli
   })
 
 
+// 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)')
+  .option('-c, --channel <channelId>', 'Discord channel ID')
+  .option('-p, --prompt <prompt>', 'Initial prompt for the session')
+  .option('-n, --name [name]', 'Thread name (optional, defaults to prompt preview)')
+  .option('-a, --app-id [appId]', 'Bot application ID (required if no local database)')
+  .action(async (options: { channel?: string; prompt?: string; name?: string; appId?: string }) => {
+    try {
+      const { channel: channelId, prompt, name, appId: optionAppId } = options
+
+      if (!channelId) {
+        cliLogger.error('Channel ID is required. Use --channel <channelId>')
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      if (!prompt) {
+        cliLogger.error('Prompt is required. Use --prompt <prompt>')
+        process.exit(EXIT_NO_RESTART)
+      }
+
+      // Get bot token from env var or database
+      const envToken = process.env.KIMAKI_BOT_TOKEN
+      let botToken: string | undefined
+      let appId: string | undefined = optionAppId
+
+      if (envToken) {
+        botToken = envToken
+        if (!appId) {
+          // Try to get app_id from database if available (optional in CI)
+          try {
+            const db = getDatabase()
+            const botRow = db
+              .prepare('SELECT app_id FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
+              .get() as { app_id: string } | undefined
+            appId = botRow?.app_id
+          } catch {
+            // Database might not exist in CI, that's ok
+          }
+        }
+      } else {
+        // Fall back to database
+        try {
+          const db = getDatabase()
+          const botRow = db
+            .prepare('SELECT app_id, token FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
+            .get() as { app_id: string; token: string } | undefined
+
+          if (botRow) {
+            botToken = botRow.token
+            appId = appId || botRow.app_id
+          }
+        } catch (e) {
+          // Database error - will fall through to the check below
+          cliLogger.error('Database error:', e instanceof Error ? e.message : String(e))
+        }
+      }
+
+      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)
+      }
+
+      const s = spinner()
+      s.start('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()
+        s.stop('Failed to fetch channel')
+        throw new Error(`Discord API error: ${channelResponse.status} - ${error}`)
+      }
+
+      const channelData = await channelResponse.json() as {
+        id: string
+        name: string
+        topic?: string
+        guild_id: string
+      }
+
+      if (!channelData.topic) {
+        s.stop('Channel has no topic')
+        throw new Error(`Channel #${channelData.name} has no topic. It must have a <kimaki.directory> tag.`)
+      }
+
+      const extracted = extractTagsArrays({
+        xml: channelData.topic,
+        tags: ['kimaki.directory', 'kimaki.app'],
+      })
+
+      const projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
+      const channelAppId = extracted['kimaki.app']?.[0]?.trim()
+
+      if (!projectDirectory) {
+        s.stop('No kimaki.directory tag found')
+        throw new Error(`Channel #${channelData.name} has no <kimaki.directory> tag in topic.`)
+      }
+
+      // Verify app ID matches if both are present
+      if (channelAppId && appId && channelAppId !== appId) {
+        s.stop('Channel belongs to different bot')
+        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
+      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: `${BOT_SESSION_PREFIX}\n${prompt}`,
+          }),
+        }
+      )
+
+      if (!starterMessageResponse.ok) {
+        const error = await starterMessageResponse.text()
+        s.stop('Failed to create message')
+        throw new Error(`Discord API error: ${starterMessageResponse.status} - ${error}`)
+      }
+
+      const starterMessage = await starterMessageResponse.json() as { id: string }
+
+      s.message('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({
+            name: threadName.slice(0, 100),
+            auto_archive_duration: 1440, // 1 day
+          }),
+        }
+      )
+
+      if (!threadResponse.ok) {
+        const error = await threadResponse.text()
+        s.stop('Failed to create thread')
+        throw new Error(`Discord API error: ${threadResponse.status} - ${error}`)
+      }
+
+      const threadData = await threadResponse.json() as { id: string; name: string }
+
+      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',
+      )
+
+      console.log(threadUrl)
+
+      process.exit(0)
+    } catch (error) {
+      cliLogger.error(
+        'Error:',
+        error instanceof Error ? error.message : String(error),
+      )
+      process.exit(EXIT_NO_RESTART)
+    }
+  })
+
 
 cli.help()
 cli.parse()

package/src/discord-bot.ts

@@ -412,6 +412,99 @@ export async function startDiscordBot({
     }
   })
 
+  // 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`
+  discordClient.on(Events.ThreadCreate, async (thread, newlyCreated) => {
+    try {
+      if (!newlyCreated) {
+        return
+      }
+
+      // Only handle threads in text channels
+      const parent = thread.parent as TextChannel | null
+      if (!parent || parent.type !== ChannelType.GuildText) {
+        return
+      }
+
+      // Get the starter message to check for magic prefix
+      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()
+      if (!prompt) {
+        discordLogger.log(`[BOT_SESSION] No prompt found in starter message`)
+        return
+      }
+
+      // Extract directory from parent channel topic
+      if (!parent.topic) {
+        discordLogger.log(`[BOT_SESSION] Parent channel has no topic`)
+        return
+      }
+
+      const extracted = extractTagsArrays({
+        xml: parent.topic,
+        tags: ['kimaki.directory', 'kimaki.app'],
+      })
+
+      const projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
+      const channelAppId = extracted['kimaki.app']?.[0]?.trim()
+
+      if (!projectDirectory) {
+        discordLogger.log(`[BOT_SESSION] No kimaki.directory in parent channel topic`)
+        return
+      }
+
+      if (channelAppId && channelAppId !== currentAppId) {
+        discordLogger.log(`[BOT_SESSION] Channel belongs to different bot app`)
+        return
+      }
+
+      if (!fs.existsSync(projectDirectory)) {
+        discordLogger.error(`[BOT_SESSION] Directory does not exist: ${projectDirectory}`)
+        await thread.send({
+          content: `✗ Directory does not exist: ${JSON.stringify(projectDirectory)}`,
+          flags: SILENT_MESSAGE_FLAGS,
+        })
+        return
+      }
+
+      discordLogger.log(`[BOT_SESSION] Starting session for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}..."`)
+
+      await handleOpencodeSession({
+        prompt,
+        thread,
+        projectDirectory,
+        channelId: parent.id,
+      })
+    } catch (error) {
+      voiceLogger.error('[BOT_SESSION] Error handling bot-initiated thread:', error)
+      try {
+        const errMsg = error instanceof Error ? error.message : String(error)
+        await thread.send({ content: `Error: ${errMsg}`, flags: SILENT_MESSAGE_FLAGS })
+      } catch {
+        // Ignore send errors
+      }
+    }
+  })
+
   await discordClient.login(token)
 
   const handleShutdown = async (signal: string, { skipExit = false } = {}) => {

package/src/session-handler.ts

@@ -690,7 +690,7 @@ export async function handleOpencodeSession({
           path: { id: session.id },
           body: {
             parts,
-            system: getOpencodeSystemMessage({ sessionId: session.id }),
+            system: getOpencodeSystemMessage({ sessionId: session.id, channelId }),
             model: modelParam,
             agent: agentPreference,
           },

package/src/system-message.ts

@@ -2,13 +2,13 @@
 // Creates the system message injected into every OpenCode session,
 // including Discord-specific formatting rules, diff commands, and permissions info.
 
-export function getOpencodeSystemMessage({ sessionId }: { sessionId: string }) {
+export function getOpencodeSystemMessage({ sessionId, channelId }: { sessionId: string; channelId?: string }) {
   return `
 The user is reading your messages from inside Discord, via kimaki.xyz
 
 The user cannot see bash tool outputs. If there is important information in bash output, include it in your text response.
 
-Your current OpenCode session ID is: ${sessionId}
+Your current OpenCode session ID is: ${sessionId}${channelId ? `\nYour current Discord channel ID is: ${channelId}` : ''}
 
 ## permissions
 
@@ -23,7 +23,15 @@ Only users with these Discord permissions can send messages to the bot:
 To upload files to the Discord thread (images, screenshots, long files that would clutter the chat), run:
 
 npx -y kimaki upload-to-discord --session ${sessionId} <file1> [file2] ...
+${channelId ? `
+## starting new sessions from CLI
 
+To start a new thread/session in this channel programmatically, run:
+
+npx -y kimaki start-session --channel ${channelId} --prompt "your prompt here"
+
+This is useful for automation (cron jobs, GitHub webhooks, n8n, etc.)
+` : ''}
 ## showing diffs
 
 IMPORTANT: After editing any files, you MUST execute the critique command using the Bash tool to get a diff URL, then share that URL with the user.