kimaki 0.1.2 → 0.1.3

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-import { intro, outro, text, password, note, cancel, isCancel, log, multiselect, spinner, } from '@clack/prompts';
-import { generateBotInstallUrl } from './utils.js';
+import { intro, outro, text, password, note, cancel, isCancel, confirm, log, multiselect, spinner, } from '@clack/prompts';
+import { deduplicateByKey, generateBotInstallUrl } from './utils.js';
 import { getChannelsWithDescriptions, createDiscordClient, getDatabase, startDiscordBot, initializeOpencodeForDirectory, } from './discordBot.js';
 import { Events, ChannelType, REST, Routes, SlashCommandBuilder, } from 'discord.js';
 import path from 'node:path';
@@ -74,7 +74,6 @@ async function ensureKimakiCategory(guild) {
 }
 async function run({ restart, addChannels }) {
     const forceSetup = Boolean(restart);
-    const shouldAddChannels = Boolean(addChannels);
     intro('🤖 Discord Bot Setup');
     const db = getDatabase();
     let appId;
@@ -82,6 +81,7 @@ async function run({ restart, addChannels }) {
     const existingBot = db
         .prepare('SELECT app_id, token FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
         .get();
+    const shouldAddChannels = !existingBot?.token || forceSetup || Boolean(addChannels);
     if (existingBot && !forceSetup) {
         appId = existingBot.app_id;
         token = existingBot.token;
@@ -112,8 +112,22 @@ async function run({ restart, addChannels }) {
         }
         appId = appIdInput;
         note('1. Go to the "Bot" section in the left sidebar\n' +
-            '2. Click "Reset Token" to generate a new bot token\n' +
-            "3. Copy the token (you won't be able to see it again!)", 'Step 2: Get Bot Token');
+            '2. Scroll down to "Privileged Gateway Intents"\n' +
+            '3. Enable these intents by toggling them ON:\n' +
+            '   • SERVER MEMBERS INTENT\n' +
+            '   • MESSAGE CONTENT INTENT\n' +
+            '4. Click "Save Changes" at the bottom', 'Step 2: Enable Required Intents');
+        const intentsConfirmed = await text({
+            message: 'Press Enter after enabling both intents:',
+            placeholder: 'Enter',
+        });
+        if (isCancel(intentsConfirmed)) {
+            cancel('Setup cancelled');
+            process.exit(0);
+        }
+        note('1. Still in the "Bot" section\n' +
+            '2. Click "Reset Token" to generate a new bot token (in case of errors try again)\n' +
+            "3. Copy the token (you won't be able to see it again!)", 'Step 3: Get Bot Token');
         const tokenInput = await password({
             message: 'Enter your Discord Bot Token (will be hidden):',
             validate(value) {
@@ -128,15 +142,10 @@ async function run({ restart, addChannels }) {
             process.exit(0);
         }
         token = tokenInput;
-        db.prepare('INSERT OR REPLACE INTO bot_tokens (app_id, token) VALUES (?, ?)').run(appId, token);
-        note('Token saved to database', 'Credentials Stored');
-        note(`Bot install URL:\n${generateBotInstallUrl({ clientId: appId })}\n\nYou MUST install the bot in your Discord server before continuing.`, 'Step 3: Install Bot to Server');
+        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:',
-            placeholder: 'Press Enter to continue',
-            validate() {
-                return undefined;
-            },
+            placeholder: 'Enter',
         });
         if (isCancel(installed)) {
             cancel('Setup cancelled');
@@ -172,6 +181,7 @@ async function run({ restart, addChannels }) {
         cliLogger.error('Error: ' + (error instanceof Error ? error.message : String(error)));
         process.exit(EXIT_NO_RESTART);
     }
+    db.prepare('INSERT OR REPLACE INTO bot_tokens (app_id, token) VALUES (?, ?)').run(appId, token);
     for (const { guild, channels } of kimakiChannels) {
         for (const channel of channels) {
             if (channel.kimakiDirectory) {
@@ -216,12 +226,16 @@ async function run({ restart, addChannels }) {
         discordClient.destroy();
         process.exit(EXIT_NO_RESTART);
     }
-    const existingDirs = kimakiChannels.flatMap(({ channels }) => channels.map((ch) => ch.kimakiDirectory).filter(Boolean));
-    const availableProjects = projects.filter((project) => !existingDirs.includes(project.worktree));
+    const existingDirs = kimakiChannels.flatMap(({ channels }) => channels
+        .filter((ch) => ch.kimakiDirectory && ch.kimakiApp === appId)
+        .map((ch) => ch.kimakiDirectory)
+        .filter(Boolean));
+    const availableProjects = deduplicateByKey(projects.filter((project) => !existingDirs.includes(project.worktree)), (x) => x.worktree);
     if (availableProjects.length === 0) {
         note('All OpenCode projects already have Discord channels', 'No New Projects');
     }
-    if (shouldAddChannels && availableProjects.length > 0) {
+    if ((!existingDirs?.length && availableProjects.length > 0) ||
+        shouldAddChannels) {
         const selectedProjects = await multiselect({
             message: 'Select projects to create Discord channels for:',
             options: availableProjects.map((project) => ({
@@ -262,7 +276,7 @@ async function run({ restart, addChannels }) {
                 if (!project)
                     continue;
                 const baseName = path.basename(project.worktree);
-                const channelName = `kimaki-${baseName}`
+                const channelName = `${baseName}`
                     .toLowerCase()
                     .replace(/[^a-z0-9-]/g, '-')
                     .slice(0, 100);

package/dist/discordBot.js

@@ -227,14 +227,16 @@ async function setupVoiceHandling({ connection, guildId, channelId, }) {
             .on('data', (frame) => {
             // Check if a newer speaking session has started
             if (currentSessionCount !== speakingSessionCount) {
-                voiceLogger.log(`Skipping audio frame from session ${currentSessionCount} because newer session ${speakingSessionCount} has started`);
+                // voiceLogger.log(
+                //   `Skipping audio frame from session ${currentSessionCount} because newer session ${speakingSessionCount} has started`,
+                // )
                 return;
             }
             if (!voiceData.genAiWorker) {
                 voiceLogger.warn(`[VOICE] Received audio frame but no GenAI worker active for guild ${guildId}`);
                 return;
             }
-            voiceLogger.debug('User audio chunk length', frame.length);
+            // voiceLogger.debug('User audio chunk length', frame.length)
             // Write to PCM file if stream exists
             voiceData.userAudioStream?.write(frame);
             // stream incrementally — low latency

package/dist/utils.js

@@ -28,25 +28,14 @@ export function generateBotInstallUrl({ clientId, permissions = [
     }
     return url.toString();
 }
-function getRequiredBotPermissions() {
-    return [
-        PermissionsBitField.Flags.ViewChannel,
-        PermissionsBitField.Flags.ManageChannels,
-        PermissionsBitField.Flags.SendMessages,
-        PermissionsBitField.Flags.SendMessagesInThreads,
-        PermissionsBitField.Flags.CreatePublicThreads,
-        PermissionsBitField.Flags.ManageThreads,
-        PermissionsBitField.Flags.ReadMessageHistory,
-        PermissionsBitField.Flags.AddReactions,
-        PermissionsBitField.Flags.ManageMessages,
-        PermissionsBitField.Flags.UseExternalEmojis,
-        PermissionsBitField.Flags.AttachFiles,
-        PermissionsBitField.Flags.Connect,
-        PermissionsBitField.Flags.Speak,
-    ];
-}
-function getPermissionNames() {
-    const permissions = getRequiredBotPermissions();
-    const permissionsBitField = new PermissionsBitField(permissions);
-    return permissionsBitField.toArray();
+export function deduplicateByKey(arr, keyFn) {
+    const seen = new Set();
+    return arr.filter(item => {
+        const key = keyFn(item);
+        if (seen.has(key)) {
+            return false;
+        }
+        seen.add(key);
+        return true;
+    });
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [

package/src/cli.ts

@@ -8,11 +8,12 @@ import {
   note,
   cancel,
   isCancel,
+  confirm,
   log,
   multiselect,
   spinner,
 } from '@clack/prompts'
-import { generateBotInstallUrl } from './utils.js'
+import { deduplicateByKey, generateBotInstallUrl } from './utils.js'
 import {
   getChannelsWithDescriptions,
   createDiscordClient,
@@ -138,7 +139,6 @@ async function ensureKimakiCategory(guild: Guild): Promise<CategoryChannel> {
 
 async function run({ restart, addChannels }: CliOptions) {
   const forceSetup = Boolean(restart)
-  const shouldAddChannels = Boolean(addChannels)
 
   intro('🤖 Discord Bot Setup')
 
@@ -152,6 +152,9 @@ async function run({ restart, addChannels }: CliOptions) {
     )
     .get() as { app_id: string; token: string } | undefined
 
+  const shouldAddChannels =
+    !existingBot?.token || forceSetup || Boolean(addChannels)
+
   if (existingBot && !forceSetup) {
     appId = existingBot.app_id
     token = existingBot.token
@@ -196,9 +199,29 @@ async function run({ restart, addChannels }: CliOptions) {
 
     note(
       '1. Go to the "Bot" section in the left sidebar\n' +
-        '2. Click "Reset Token" to generate a new bot token\n' +
+        '2. Scroll down to "Privileged Gateway Intents"\n' +
+        '3. Enable these intents by toggling them ON:\n' +
+        '   • SERVER MEMBERS INTENT\n' +
+        '   • MESSAGE CONTENT INTENT\n' +
+        '4. Click "Save Changes" at the bottom',
+      'Step 2: Enable Required Intents',
+    )
+
+    const intentsConfirmed = await text({
+      message: 'Press Enter after enabling both intents:',
+      placeholder: 'Enter',
+    })
+
+    if (isCancel(intentsConfirmed)) {
+      cancel('Setup cancelled')
+      process.exit(0)
+    }
+
+    note(
+      '1. Still in the "Bot" section\n' +
+        '2. Click "Reset Token" to generate a new bot token (in case of errors try again)\n' +
         "3. Copy the token (you won't be able to see it again!)",
-      'Step 2: Get Bot Token',
+      'Step 3: Get Bot Token',
     )
 
     const tokenInput = await password({
@@ -215,23 +238,14 @@ async function run({ restart, addChannels }: CliOptions) {
     }
     token = tokenInput
 
-    db.prepare(
-      'INSERT OR REPLACE INTO bot_tokens (app_id, token) VALUES (?, ?)',
-    ).run(appId, token)
-
-    note('Token saved to database', 'Credentials Stored')
-
     note(
       `Bot install URL:\n${generateBotInstallUrl({ clientId: appId })}\n\nYou MUST install the bot in your Discord server before continuing.`,
-      'Step 3: Install Bot to Server',
+      'Step 4: Install Bot to Server',
     )
 
     const installed = await text({
       message: 'Press Enter AFTER you have installed the bot in your server:',
-      placeholder: 'Press Enter to continue',
-      validate() {
-        return undefined
-      },
+      placeholder: 'Enter',
     })
 
     if (isCancel(installed)) {
@@ -282,6 +296,9 @@ async function run({ restart, addChannels }: CliOptions) {
     )
     process.exit(EXIT_NO_RESTART)
   }
+  db.prepare(
+    'INSERT OR REPLACE INTO bot_tokens (app_id, token) VALUES (?, ?)',
+  ).run(appId, token)
 
   for (const { guild, channels } of kimakiChannels) {
     for (const channel of channels) {
@@ -350,11 +367,15 @@ async function run({ restart, addChannels }: CliOptions) {
   }
 
   const existingDirs = kimakiChannels.flatMap(({ channels }) =>
-    channels.map((ch) => ch.kimakiDirectory).filter(Boolean),
+    channels
+      .filter((ch) => ch.kimakiDirectory && ch.kimakiApp === appId)
+      .map((ch) => ch.kimakiDirectory)
+      .filter(Boolean),
   )
 
-  const availableProjects = projects.filter(
-    (project) => !existingDirs.includes(project.worktree),
+  const availableProjects = deduplicateByKey(
+    projects.filter((project) => !existingDirs.includes(project.worktree)),
+    (x) => x.worktree,
   )
 
   if (availableProjects.length === 0) {
@@ -364,7 +385,10 @@ async function run({ restart, addChannels }: CliOptions) {
     )
   }
 
-  if (shouldAddChannels && availableProjects.length > 0) {
+  if (
+    (!existingDirs?.length && availableProjects.length > 0) ||
+    shouldAddChannels
+  ) {
     const selectedProjects = await multiselect({
       message: 'Select projects to create Discord channels for:',
       options: availableProjects.map((project) => ({
@@ -410,7 +434,7 @@ async function run({ restart, addChannels }: CliOptions) {
         if (!project) continue
 
         const baseName = path.basename(project.worktree)
-        const channelName = `kimaki-${baseName}`
+        const channelName = `${baseName}`
           .toLowerCase()
           .replace(/[^a-z0-9-]/g, '-')
           .slice(0, 100)

package/src/discordBot.ts

@@ -334,9 +334,9 @@ async function setupVoiceHandling({
       .on('data', (frame: Buffer) => {
         // Check if a newer speaking session has started
         if (currentSessionCount !== speakingSessionCount) {
-          voiceLogger.log(
-            `Skipping audio frame from session ${currentSessionCount} because newer session ${speakingSessionCount} has started`,
-          )
+          // voiceLogger.log(
+          //   `Skipping audio frame from session ${currentSessionCount} because newer session ${speakingSessionCount} has started`,
+          // )
           return
         }
 
@@ -346,7 +346,7 @@ async function setupVoiceHandling({
           )
           return
         }
-        voiceLogger.debug('User audio chunk length', frame.length)
+        // voiceLogger.debug('User audio chunk length', frame.length)
 
         // Write to PCM file if stream exists
         voiceData.userAudioStream?.write(frame)
@@ -1950,7 +1950,7 @@ export async function startDiscordBot({
                       return ''
                     })
                     .filter((t) => t.trim())
-                  
+
                   const userText = userTexts.join('\n\n')
                   if (userText) {
                     // Escape backticks in user messages to prevent formatting issues

package/src/utils.ts

@@ -48,26 +48,15 @@ export function generateBotInstallUrl({
   return url.toString()
 }
 
-function getRequiredBotPermissions(): bigint[] {
-  return [
-    PermissionsBitField.Flags.ViewChannel,
-    PermissionsBitField.Flags.ManageChannels,
-    PermissionsBitField.Flags.SendMessages,
-    PermissionsBitField.Flags.SendMessagesInThreads,
-    PermissionsBitField.Flags.CreatePublicThreads,
-    PermissionsBitField.Flags.ManageThreads,
-    PermissionsBitField.Flags.ReadMessageHistory,
-    PermissionsBitField.Flags.AddReactions,
-    PermissionsBitField.Flags.ManageMessages,
-    PermissionsBitField.Flags.UseExternalEmojis,
-    PermissionsBitField.Flags.AttachFiles,
-    PermissionsBitField.Flags.Connect,
-    PermissionsBitField.Flags.Speak,
-  ]
-}
 
-function getPermissionNames(): string[] {
-  const permissions = getRequiredBotPermissions()
-  const permissionsBitField = new PermissionsBitField(permissions)
-  return permissionsBitField.toArray()
+export function deduplicateByKey<T, K>(arr: T[], keyFn: (item: T) => K): T[] {
+  const seen = new Set<K>()
+  return arr.filter(item => {
+    const key = keyFn(item)
+    if (seen.has(key)) {
+      return false
+    }
+    seen.add(key)
+    return true
+  })
 }