kimaki 0.4.34 → 0.4.35

package/dist/cli.js

@@ -135,6 +135,13 @@ async function registerCommands(token, appId, userCommands = []) {
                 .setAutocomplete(true)
                 .setMaxLength(6000);
             return option;
+        })
+            .addStringOption((option) => {
+            option
+                .setName('agent')
+                .setDescription('Agent to use for this session')
+                .setAutocomplete(true);
+            return option;
         })
             .toJSON(),
         new SlashCommandBuilder()

package/dist/commands/session.js

@@ -13,6 +13,7 @@ export async function handleSessionCommand({ command, appId, }) {
     await command.deferReply({ ephemeral: false });
     const prompt = command.options.getString('prompt', true);
     const filesString = command.options.getString('files') || '';
+    const agent = command.options.getString('agent') || undefined;
     const channel = command.channel;
     if (!channel || channel.type !== ChannelType.GuildText) {
         await command.editReply('This command can only be used in text channels');
@@ -66,6 +67,7 @@ export async function handleSessionCommand({ command, appId, }) {
             thread,
             projectDirectory,
             channelId: textChannel.id,
+            agent,
         });
     }
     catch (error) {
@@ -73,8 +75,61 @@ export async function handleSessionCommand({ command, appId, }) {
         await command.editReply(`Failed to create session: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
 }
+async function handleAgentAutocomplete({ interaction, appId, }) {
+    const focusedValue = interaction.options.getFocused();
+    let projectDirectory;
+    if (interaction.channel) {
+        const channel = interaction.channel;
+        if (channel.type === ChannelType.GuildText) {
+            const textChannel = channel;
+            if (textChannel.topic) {
+                const extracted = extractTagsArrays({
+                    xml: textChannel.topic,
+                    tags: ['kimaki.directory', 'kimaki.app'],
+                });
+                const channelAppId = extracted['kimaki.app']?.[0]?.trim();
+                if (channelAppId && channelAppId !== appId) {
+                    await interaction.respond([]);
+                    return;
+                }
+                projectDirectory = extracted['kimaki.directory']?.[0]?.trim();
+            }
+        }
+    }
+    if (!projectDirectory) {
+        await interaction.respond([]);
+        return;
+    }
+    try {
+        const getClient = await initializeOpencodeForDirectory(projectDirectory);
+        const agentsResponse = await getClient().app.agents({
+            query: { directory: projectDirectory },
+        });
+        if (!agentsResponse.data || agentsResponse.data.length === 0) {
+            await interaction.respond([]);
+            return;
+        }
+        const agents = agentsResponse.data
+            .filter((a) => a.mode === 'primary' || a.mode === 'all')
+            .filter((a) => a.name.toLowerCase().includes(focusedValue.toLowerCase()))
+            .slice(0, 25);
+        const choices = agents.map((agent) => ({
+            name: agent.name.slice(0, 100),
+            value: agent.name,
+        }));
+        await interaction.respond(choices);
+    }
+    catch (error) {
+        logger.error('[AUTOCOMPLETE] Error fetching agents:', error);
+        await interaction.respond([]);
+    }
+}
 export async function handleSessionAutocomplete({ interaction, appId, }) {
     const focusedOption = interaction.options.getFocused(true);
+    if (focusedOption.name === 'agent') {
+        await handleAgentAutocomplete({ interaction, appId });
+        return;
+    }
     if (focusedOption.name !== 'files') {
         return;
     }

package/dist/opencode.js

@@ -87,8 +87,7 @@ export async function initializeOpencodeForDirectory(directory) {
         throw new Error(`Directory does not exist or is not accessible: ${directory}`);
     }
     const port = await getOpenPort();
-    const opencodeBinDir = `${process.env.HOME}/.opencode/bin`;
-    const opencodeCommand = process.env.OPENCODE_PATH || `${opencodeBinDir}/opencode`;
+    const opencodeCommand = process.env.OPENCODE_PATH || 'opencode';
     const serverProcess = spawn(opencodeCommand, ['serve', '--port', port.toString()], {
         stdio: 'pipe',
         detached: false,

package/dist/session-handler.js

@@ -2,7 +2,7 @@
 // Creates, maintains, and sends prompts to OpenCode sessions from Discord threads.
 // Handles streaming events, permissions, abort signals, and message queuing.
 import prettyMilliseconds from 'pretty-ms';
-import { getDatabase, getSessionModel, getChannelModel, getSessionAgent, getChannelAgent } from './database.js';
+import { getDatabase, getSessionModel, getChannelModel, getSessionAgent, getChannelAgent, setSessionAgent } from './database.js';
 import { initializeOpencodeForDirectory, getOpencodeServers, getOpencodeClientV2 } from './opencode.js';
 import { sendThreadMessage, NOTIFY_MESSAGE_FLAGS, SILENT_MESSAGE_FLAGS } from './discord-utils.js';
 import { formatPart } from './message-formatting.js';
@@ -85,7 +85,7 @@ export async function abortAndRetrySession({ sessionId, thread, projectDirectory
     });
     return true;
 }
-export async function handleOpencodeSession({ prompt, thread, projectDirectory, originalMessage, images = [], channelId, command, }) {
+export async function handleOpencodeSession({ prompt, thread, projectDirectory, originalMessage, images = [], channelId, command, agent, }) {
     voiceLogger.log(`[OPENCODE SESSION] Starting for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}${prompt.length > 50 ? '...' : ''}"`);
     const sessionStartTime = Date.now();
     const directory = projectDirectory || process.cwd();
@@ -127,6 +127,11 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
         .prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)')
         .run(thread.id, session.id);
     sessionLogger.log(`Stored session ${session.id} for thread ${thread.id}`);
+    // Store agent preference if provided
+    if (agent) {
+        setSessionAgent(session.id, agent);
+        sessionLogger.log(`Set agent preference for session ${session.id}: ${agent}`);
+    }
     const existingController = abortControllers.get(session.id);
     if (existingController) {
         voiceLogger.log(`[ABORT] Cancelling existing request for session: ${session.id}`);
@@ -648,15 +653,17 @@ export async function handleOpencodeSession({ prompt, thread, projectDirectory,
                     discordLogger.log(`Could not update reaction:`, e);
                 }
             }
-            const errorName = error &&
-                typeof error === 'object' &&
-                'constructor' in error &&
-                error.constructor &&
-                typeof error.constructor.name === 'string'
-                ? error.constructor.name
-                : typeof error;
-            const errorMsg = error instanceof Error ? error.stack || error.message : String(error);
-            await sendThreadMessage(thread, `✗ Unexpected bot Error: [${errorName}]\n${errorMsg}`);
+            const errorDisplay = (() => {
+                if (error instanceof Error) {
+                    const name = error.constructor.name || 'Error';
+                    return `[${name}]\n${error.stack || error.message}`;
+                }
+                if (typeof error === 'string') {
+                    return error;
+                }
+                return String(error);
+            })();
+            await sendThreadMessage(thread, `✗ Unexpected bot Error: ${errorDisplay}`);
         }
     }
 }

package/dist/unnest-code-blocks.js

@@ -107,9 +107,11 @@ function renderSegments(segments) {
             }
             else {
                 // Raw content (no prefix means it's original raw)
-                result.push(segment.content);
+                // Ensure raw ends with newline for proper separation from next segment
+                const raw = segment.content.trimEnd();
+                result.push(raw + '\n');
             }
         }
     }
-    return result.join('');
+    return result.join('').trimEnd();
 }

package/dist/unnest-code-blocks.test.js

@@ -11,8 +11,7 @@ test('basic - single item with code block', () => {
 
     \`\`\`js
     const x = 1
-    \`\`\`
-    "
+    \`\`\`"
   `);
 });
 test('multiple items - code in middle item only', () => {
@@ -50,8 +49,7 @@ test('multiple code blocks in one item', () => {
     \`\`\`
     \`\`\`python
     b = 2
-    \`\`\`
-    "
+    \`\`\`"
   `);
 });
 test('nested list with code', () => {
@@ -125,8 +123,7 @@ test('mixed - some items have code, some dont', () => {
 
     \`\`\`python
     y = 2
-    \`\`\`
-    "
+    \`\`\`"
   `);
 });
 test('text before and after code in same item', () => {
@@ -142,8 +139,7 @@ test('text before and after code in same item', () => {
     \`\`\`js
     const x = 1
     \`\`\`
-    - End text
-    "
+    - End text"
   `);
 });
 test('preserves content outside lists', () => {
@@ -169,7 +165,6 @@ More text after.`;
     const x = 1
     \`\`\`
 
-
     More text after."
   `);
 });
@@ -195,8 +190,7 @@ test('handles code block without language', () => {
 
     \`\`\`
     plain code
-    \`\`\`
-    "
+    \`\`\`"
   `);
 });
 test('handles empty list item with code', () => {
@@ -207,8 +201,7 @@ test('handles empty list item with code', () => {
     expect(result).toMatchInlineSnapshot(`
     "\`\`\`js
     const x = 1
-    \`\`\`
-    "
+    \`\`\`"
   `);
 });
 test('numbered list with text after code block', () => {
@@ -321,7 +314,8 @@ test('deeply nested list with code', () => {
     deep code
     \`\`\`
     - Text after deep code
-    - Another level 3- Back to level 2"
+    - Another level 3
+    - Back to level 2"
   `);
 });
 test('nested numbered list inside unordered with code', () => {
@@ -342,7 +336,8 @@ test('nested numbered list inside unordered with code', () => {
     code
     \`\`\`
     - Text after
-    2. Second nested- Another unordered"
+    2. Second nested
+    - Another unordered"
   `);
 });
 test('code block at end of numbered item no text after', () => {
@@ -405,3 +400,33 @@ test('code block immediately after list marker', () => {
     2. Normal item"
   `);
 });
+test('code block with filename metadata', () => {
+    const input = `- Item with code
+  \`\`\`tsx filename=example.tsx
+  const x = 1
+  \`\`\``;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "- Item with code
+
+    \`\`\`tsx filename=example.tsx
+    const x = 1
+    \`\`\`"
+  `);
+});
+test('numbered list with filename metadata code block', () => {
+    const input = `1. First item
+   \`\`\`tsx filename=app.tsx
+   export default function App() {}
+   \`\`\`
+2. Second item`;
+    const result = unnestCodeBlocksFromLists(input);
+    expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`tsx filename=app.tsx
+    export default function App() {}
+    \`\`\`
+    2. Second item"
+  `);
+});

package/package.json

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

package/src/cli.ts

@@ -197,6 +197,14 @@ async function registerCommands(token: string, appId: string, userCommands: Open
 
         return option
       })
+      .addStringOption((option) => {
+        option
+          .setName('agent')
+          .setDescription('Agent to use for this session')
+          .setAutocomplete(true)
+
+        return option
+      })
       .toJSON(),
     new SlashCommandBuilder()
       .setName('add-project')

package/src/commands/session.ts

@@ -21,6 +21,7 @@ export async function handleSessionCommand({
 
   const prompt = command.options.getString('prompt', true)
   const filesString = command.options.getString('files') || ''
+  const agent = command.options.getString('agent') || undefined
   const channel = command.channel
 
   if (!channel || channel.type !== ChannelType.GuildText) {
@@ -91,6 +92,7 @@ export async function handleSessionCommand({
       thread,
       projectDirectory,
       channelId: textChannel.id,
+      agent,
     })
   } catch (error) {
     logger.error('[SESSION] Error:', error)
@@ -100,12 +102,78 @@ export async function handleSessionCommand({
   }
 }
 
+async function handleAgentAutocomplete({
+  interaction,
+  appId,
+}: AutocompleteContext): Promise<void> {
+  const focusedValue = interaction.options.getFocused()
+
+  let projectDirectory: string | undefined
+
+  if (interaction.channel) {
+    const channel = interaction.channel
+    if (channel.type === ChannelType.GuildText) {
+      const textChannel = channel as TextChannel
+      if (textChannel.topic) {
+        const extracted = extractTagsArrays({
+          xml: textChannel.topic,
+          tags: ['kimaki.directory', 'kimaki.app'],
+        })
+        const channelAppId = extracted['kimaki.app']?.[0]?.trim()
+        if (channelAppId && channelAppId !== appId) {
+          await interaction.respond([])
+          return
+        }
+        projectDirectory = extracted['kimaki.directory']?.[0]?.trim()
+      }
+    }
+  }
+
+  if (!projectDirectory) {
+    await interaction.respond([])
+    return
+  }
+
+  try {
+    const getClient = await initializeOpencodeForDirectory(projectDirectory)
+
+    const agentsResponse = await getClient().app.agents({
+      query: { directory: projectDirectory },
+    })
+
+    if (!agentsResponse.data || agentsResponse.data.length === 0) {
+      await interaction.respond([])
+      return
+    }
+
+    const agents = agentsResponse.data
+      .filter((a) => a.mode === 'primary' || a.mode === 'all')
+      .filter((a) => a.name.toLowerCase().includes(focusedValue.toLowerCase()))
+      .slice(0, 25)
+
+    const choices = agents.map((agent) => ({
+      name: agent.name.slice(0, 100),
+      value: agent.name,
+    }))
+
+    await interaction.respond(choices)
+  } catch (error) {
+    logger.error('[AUTOCOMPLETE] Error fetching agents:', error)
+    await interaction.respond([])
+  }
+}
+
 export async function handleSessionAutocomplete({
   interaction,
   appId,
 }: AutocompleteContext): Promise<void> {
   const focusedOption = interaction.options.getFocused(true)
 
+  if (focusedOption.name === 'agent') {
+    await handleAgentAutocomplete({ interaction, appId })
+    return
+  }
+
   if (focusedOption.name !== 'files') {
     return
   }

package/src/opencode.ts

@@ -115,8 +115,7 @@ export async function initializeOpencodeForDirectory(directory: string) {
 
   const port = await getOpenPort()
 
-  const opencodeBinDir = `${process.env.HOME}/.opencode/bin`
-  const opencodeCommand = process.env.OPENCODE_PATH || `${opencodeBinDir}/opencode`
+  const opencodeCommand = process.env.OPENCODE_PATH || 'opencode'
 
   const serverProcess = spawn(
     opencodeCommand,

package/src/session-handler.ts

@@ -6,7 +6,7 @@ import type { Part, PermissionRequest } from '@opencode-ai/sdk/v2'
 import type { FilePartInput } from '@opencode-ai/sdk'
 import type { Message, ThreadChannel } from 'discord.js'
 import prettyMilliseconds from 'pretty-ms'
-import { getDatabase, getSessionModel, getChannelModel, getSessionAgent, getChannelAgent } from './database.js'
+import { getDatabase, getSessionModel, getChannelModel, getSessionAgent, getChannelAgent, setSessionAgent } from './database.js'
 import { initializeOpencodeForDirectory, getOpencodeServers, getOpencodeClientV2 } from './opencode.js'
 import { sendThreadMessage, NOTIFY_MESSAGE_FLAGS, SILENT_MESSAGE_FLAGS } from './discord-utils.js'
 import { formatPart } from './message-formatting.js'
@@ -141,6 +141,7 @@ export async function handleOpencodeSession({
   images = [],
   channelId,
   command,
+  agent,
 }: {
   prompt: string
   thread: ThreadChannel
@@ -150,6 +151,8 @@ export async function handleOpencodeSession({
   channelId?: string
   /** If set, uses session.command API instead of session.prompt */
   command?: { name: string; arguments: string }
+  /** Agent to use for this session */
+  agent?: string
 }): Promise<{ sessionID: string; result: any; port?: number } | undefined> {
   voiceLogger.log(
     `[OPENCODE SESSION] Starting for thread ${thread.id} with prompt: "${prompt.slice(0, 50)}${prompt.length > 50 ? '...' : ''}"`,
@@ -209,6 +212,12 @@ export async function handleOpencodeSession({
     .run(thread.id, session.id)
   sessionLogger.log(`Stored session ${session.id} for thread ${thread.id}`)
 
+  // Store agent preference if provided
+  if (agent) {
+    setSessionAgent(session.id, agent)
+    sessionLogger.log(`Set agent preference for session ${session.id}: ${agent}`)
+  }
+
   const existingController = abortControllers.get(session.id)
   if (existingController) {
     voiceLogger.log(
@@ -825,20 +834,17 @@ export async function handleOpencodeSession({
           discordLogger.log(`Could not update reaction:`, e)
         }
       }
-      const errorName =
-        error &&
-        typeof error === 'object' &&
-        'constructor' in error &&
-        error.constructor &&
-        typeof error.constructor.name === 'string'
-          ? error.constructor.name
-          : typeof error
-      const errorMsg =
-        error instanceof Error ? error.stack || error.message : String(error)
-      await sendThreadMessage(
-        thread,
-        `✗ Unexpected bot Error: [${errorName}]\n${errorMsg}`,
-      )
+      const errorDisplay = (() => {
+        if (error instanceof Error) {
+          const name = error.constructor.name || 'Error'
+          return `[${name}]\n${error.stack || error.message}`
+        }
+        if (typeof error === 'string') {
+          return error
+        }
+        return String(error)
+      })()
+      await sendThreadMessage(thread, `✗ Unexpected bot Error: ${errorDisplay}`)
     }
   }
 }

package/src/unnest-code-blocks.test.ts

@@ -12,8 +12,7 @@ test('basic - single item with code block', () => {
 
     \`\`\`js
     const x = 1
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -53,8 +52,7 @@ test('multiple code blocks in one item', () => {
     \`\`\`
     \`\`\`python
     b = 2
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -132,8 +130,7 @@ test('mixed - some items have code, some dont', () => {
 
     \`\`\`python
     y = 2
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -150,8 +147,7 @@ test('text before and after code in same item', () => {
     \`\`\`js
     const x = 1
     \`\`\`
-    - End text
-    "
+    - End text"
   `)
 })
 
@@ -178,7 +174,6 @@ More text after.`
     const x = 1
     \`\`\`
 
-
     More text after."
   `)
 })
@@ -206,8 +201,7 @@ test('handles code block without language', () => {
 
     \`\`\`
     plain code
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -219,8 +213,7 @@ test('handles empty list item with code', () => {
   expect(result).toMatchInlineSnapshot(`
     "\`\`\`js
     const x = 1
-    \`\`\`
-    "
+    \`\`\`"
   `)
 })
 
@@ -338,7 +331,8 @@ test('deeply nested list with code', () => {
     deep code
     \`\`\`
     - Text after deep code
-    - Another level 3- Back to level 2"
+    - Another level 3
+    - Back to level 2"
   `)
 })
 
@@ -360,7 +354,8 @@ test('nested numbered list inside unordered with code', () => {
     code
     \`\`\`
     - Text after
-    2. Second nested- Another unordered"
+    2. Second nested
+    - Another unordered"
   `)
 })
 
@@ -426,3 +421,35 @@ test('code block immediately after list marker', () => {
     2. Normal item"
   `)
 })
+
+test('code block with filename metadata', () => {
+  const input = `- Item with code
+  \`\`\`tsx filename=example.tsx
+  const x = 1
+  \`\`\``
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "- Item with code
+
+    \`\`\`tsx filename=example.tsx
+    const x = 1
+    \`\`\`"
+  `)
+})
+
+test('numbered list with filename metadata code block', () => {
+  const input = `1. First item
+   \`\`\`tsx filename=app.tsx
+   export default function App() {}
+   \`\`\`
+2. Second item`
+  const result = unnestCodeBlocksFromLists(input)
+  expect(result).toMatchInlineSnapshot(`
+    "1. First item
+
+    \`\`\`tsx filename=app.tsx
+    export default function App() {}
+    \`\`\`
+    2. Second item"
+  `)
+})

package/src/unnest-code-blocks.ts

@@ -123,10 +123,12 @@ function renderSegments(segments: Segment[]): string {
         result.push(segment.prefix + segment.content + '\n')
       } else {
         // Raw content (no prefix means it's original raw)
-        result.push(segment.content)
+        // Ensure raw ends with newline for proper separation from next segment
+        const raw = segment.content.trimEnd()
+        result.push(raw + '\n')
       }
     }
   }
 
-  return result.join('')
+  return result.join('').trimEnd()
 }