kimaki 0.4.74 → 0.4.76

package/dist/agent-model.e2e.test.js

@@ -23,8 +23,8 @@ import { startDiscordBot } from './discord-bot.js';
 import { setBotToken, initDatabase, closeDatabase, setChannelDirectory, setChannelVerbosity, setChannelAgent, setChannelModel, } from './database.js';
 import { getPrisma } from './db.js';
 import { startHranaServer, stopHranaServer } from './hrana-server.js';
-import { initializeOpencodeForDirectory } from './opencode.js';
-import { cleanupOpencodeServers, cleanupTestSessions, waitForBotMessageContaining, waitForFooterMessage, } from './test-utils.js';
+import { initializeOpencodeForDirectory, stopOpencodeServer } from './opencode.js';
+import { cleanupTestSessions, waitForBotMessageContaining, waitForFooterMessage, } from './test-utils.js';
 import { buildQuickAgentCommandDescription } from './commands/agent.js';
 const TEST_USER_ID = '200000000000000920';
 const TEXT_CHANNEL_ID = '200000000000000921';
@@ -266,7 +266,7 @@ describe('agent model resolution', () => {
         if (botClient) {
             botClient.destroy();
         }
-        await cleanupOpencodeServers();
+        await stopOpencodeServer();
         await Promise.all([
             closeDatabase().catch(() => {
                 return;
@@ -674,7 +674,7 @@ describe('agent model resolution', () => {
         --- from: assistant (TestBot)
         ⬥ ok
         *project ⋅ main ⋅ Ns ⋅ N% ⋅ agent-model-v2 ⋅ **test-agent***
-        Switched to **plan** agent for this session (was **test-agent**)
+        Switched to **plan** agent for this session next messages (was **test-agent**)
         --- from: user (agent-model-tester)
         Reply with exactly: after-switch-msg
         --- from: assistant (TestBot)

package/dist/channel-management.js

@@ -2,8 +2,13 @@
 // Creates and manages Kimaki project channels (text + voice pairs),
 // extracts channel metadata from topic tags, and ensures category structure.
 import { ChannelType, } from 'discord.js';
+import fs from 'node:fs';
 import path from 'node:path';
-import { getChannelDirectory, setChannelDirectory } from './database.js';
+import { getChannelDirectory, setChannelDirectory, findChannelsByDirectory, } from './database.js';
+import { getProjectsDir } from './config.js';
+import { execAsync } from './worktrees.js';
+import { createLogger, LogPrefix } from './logger.js';
+const logger = createLogger(LogPrefix.CHANNEL);
 export async function ensureKimakiCategory(guild, botName) {
     // Skip appending bot name if it's already "kimaki" to avoid "Kimaki kimaki"
     const isKimakiBot = botName?.toLowerCase() === 'kimaki';
@@ -96,3 +101,127 @@ export async function getChannelsWithDescriptions(guild) {
     }
     return channels;
 }
+const DEFAULT_GITIGNORE = `node_modules/
+dist/
+.env
+.env.*
+!.env.example
+.DS_Store
+tmp/
+*.log
+__pycache__/
+*.pyc
+.venv/
+*.egg-info/
+`;
+const DEFAULT_CHANNEL_TOPIC = 'General channel for misc tasks with Kimaki. Not connected to a specific OpenCode project or repository.';
+/**
+ * Create (or find) the default "kimaki" channel for general-purpose tasks.
+ * Channel name is "kimaki-{botName}" for self-hosted bots, "kimaki" for gateway.
+ * Directory is ~/.kimaki/projects/kimaki, git-initialized with a .gitignore.
+ *
+ * Idempotency: checks the database for an existing channel mapped to the
+ * kimaki projects directory. Also scans guild channels by name+category
+ * as a fallback for channels created before DB mapping existed.
+ */
+export async function createDefaultKimakiChannel({ guild, botName, appId, isGatewayMode, }) {
+    const projectDirectory = path.join(getProjectsDir(), 'kimaki');
+    // Ensure the default kimaki project directory exists before any DB mapping
+    // restoration or git setup. Custom data dirs may not have <dataDir>/projects
+    // created yet, and later writes assume the full path is present.
+    if (!fs.existsSync(projectDirectory)) {
+        fs.mkdirSync(projectDirectory, { recursive: true });
+        logger.log(`Created default kimaki directory: ${projectDirectory}`);
+    }
+    // Hydrate guild channels from API so the cache scan is complete
+    try {
+        await guild.channels.fetch();
+    }
+    catch (error) {
+        logger.warn(`Could not fetch guild channels for ${guild.name}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    // 1. Check database for existing channel mapped to this directory.
+    // Check ALL mappings (not just the first) since the same directory could
+    // have stale rows from deleted channels or other guilds.
+    const existingMappings = await findChannelsByDirectory({
+        directory: projectDirectory,
+        channelType: 'text',
+    });
+    const mappedChannelInGuild = existingMappings
+        .map((row) => guild.channels.cache.get(row.channel_id))
+        .find((ch) => ch?.type === ChannelType.GuildText);
+    if (mappedChannelInGuild) {
+        logger.log(`Default kimaki channel already exists: ${mappedChannelInGuild.id}`);
+        return null;
+    }
+    // 2. Fallback: detect existing channel by name+category
+    const kimakiCategory = await ensureKimakiCategory(guild, botName);
+    const existingByName = guild.channels.cache.find((ch) => {
+        if (ch.type !== ChannelType.GuildText) {
+            return false;
+        }
+        if (ch.parentId !== kimakiCategory.id) {
+            return false;
+        }
+        return ch.name === 'kimaki' || ch.name.startsWith('kimaki-');
+    });
+    if (existingByName) {
+        logger.log(`Found existing default kimaki channel by name: ${existingByName.id}, restoring DB mapping`);
+        await setChannelDirectory({
+            channelId: existingByName.id,
+            directory: projectDirectory,
+            channelType: 'text',
+            skipIfExists: true,
+        });
+        return null;
+    }
+    // Git init — gracefully skip if git is not installed
+    const gitDir = path.join(projectDirectory, '.git');
+    if (!fs.existsSync(gitDir)) {
+        try {
+            await execAsync('git init', { cwd: projectDirectory, timeout: 10_000 });
+            logger.log(`Initialized git in: ${projectDirectory}`);
+        }
+        catch (error) {
+            logger.warn(`Could not initialize git in ${projectDirectory}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    // Write .gitignore if it doesn't exist
+    const gitignorePath = path.join(projectDirectory, '.gitignore');
+    if (!fs.existsSync(gitignorePath)) {
+        fs.writeFileSync(gitignorePath, DEFAULT_GITIGNORE);
+    }
+    // Channel name: "kimaki-{botName}" for self-hosted, "kimaki" for gateway
+    const channelName = (() => {
+        if (isGatewayMode || !botName) {
+            return 'kimaki';
+        }
+        const sanitized = botName
+            .toLowerCase()
+            .replace(/[^a-z0-9-]/g, '-')
+            .replace(/-+/g, '-')
+            .replace(/^-|-$/g, '');
+        if (!sanitized || sanitized === 'kimaki') {
+            return 'kimaki';
+        }
+        return `kimaki-${sanitized}`.slice(0, 100);
+    })();
+    const textChannel = await guild.channels.create({
+        name: channelName,
+        type: ChannelType.GuildText,
+        parent: kimakiCategory,
+        topic: DEFAULT_CHANNEL_TOPIC,
+    });
+    await setChannelDirectory({
+        channelId: textChannel.id,
+        directory: projectDirectory,
+        channelType: 'text',
+    });
+    logger.log(`Created default kimaki channel: #${channelName} (${textChannel.id})`);
+    return {
+        textChannel,
+        textChannelId: textChannel.id,
+        channelName,
+        projectDirectory,
+    };
+}