kimaki 0.4.18 → 0.4.20

package/README.md

@@ -30,27 +30,6 @@ This will guide you through:
 kimaki
 ```
 
-### Send a session to Discord
-
-Send an OpenCode session to Discord from the CLI:
-
-```bash
-kimaki send-to-discord <session-id>
-```
-
-Options:
-- `-d, --directory <dir>` - Project directory (defaults to current working directory)
-
-### OpenCode Integration
-
-To use the `/send-to-kimaki-discord` command in OpenCode:
-
-```bash
-npx kimaki install-plugin
-```
-
-Then use `/send-to-kimaki-discord` in OpenCode to send the current session to Discord.
-
 ## Discord Slash Commands
 
 Once the bot is running, you can use these commands in Discord:

package/dist/cli.js

@@ -6,26 +6,40 @@ import { getChannelsWithDescriptions, createDiscordClient, getDatabase, startDis
 import { Events, ChannelType, REST, Routes, SlashCommandBuilder, AttachmentBuilder, } from 'discord.js';
 import path from 'node:path';
 import fs from 'node:fs';
-import { createRequire } from 'node:module';
-import os from 'node:os';
 import { createLogger } from './logger.js';
 import { spawn, spawnSync, execSync } from 'node:child_process';
+import http from 'node:http';
 const cliLogger = createLogger('CLI');
 const cli = cac('kimaki');
 process.title = 'kimaki';
-process.on('SIGUSR2', () => {
-    cliLogger.info('Received SIGUSR2, restarting process in 1000ms...');
-    setTimeout(() => {
-        cliLogger.info('Restarting...');
-        spawn(process.argv[0], [...process.execArgv, ...process.argv.slice(1)], {
-            stdio: 'inherit',
-            detached: true,
-            cwd: process.cwd(),
-            env: process.env,
-        }).unref();
-        process.exit(0);
-    }, 1000);
-});
+const LOCK_PORT = 29988;
+async function checkSingleInstance() {
+    try {
+        const response = await fetch(`http://127.0.0.1:${LOCK_PORT}`, {
+            signal: AbortSignal.timeout(1000),
+        });
+        if (response.ok) {
+            cliLogger.error('Another kimaki instance is already running');
+            process.exit(1);
+        }
+    }
+    catch {
+        // Connection refused means no instance running, continue
+    }
+}
+function startLockServer() {
+    const server = http.createServer((req, res) => {
+        res.writeHead(200);
+        res.end('kimaki');
+    });
+    server.listen(LOCK_PORT, '127.0.0.1');
+    server.on('error', (err) => {
+        if (err.code === 'EADDRINUSE') {
+            cliLogger.error('Another kimaki instance is already running');
+            process.exit(1);
+        }
+    });
+}
 const EXIT_NO_RESTART = 64;
 async function registerCommands(token, appId) {
     const commands = [
@@ -72,6 +86,17 @@ async function registerCommands(token, appId) {
             return option;
         })
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('add-new-project')
+            .setDescription('Create a new project folder, initialize git, and start a session')
+            .addStringOption((option) => {
+            option
+                .setName('name')
+                .setDescription('Name for the new project folder')
+                .setRequired(true);
+            return option;
+        })
+            .toJSON(),
         new SlashCommandBuilder()
             .setName('accept')
             .setDescription('Accept a pending permission request (this request only)')
@@ -88,6 +113,10 @@ async function registerCommands(token, appId) {
             .setName('abort')
             .setDescription('Abort the current OpenCode request in this thread')
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('share')
+            .setDescription('Share the current session as a public URL')
+            .toJSON(),
     ];
     const rest = new REST().setToken(token);
     try {
@@ -431,6 +460,8 @@ cli
     .option('--add-channels', 'Select OpenCode projects to create Discord channels before starting')
     .action(async (options) => {
     try {
+        await checkSingleInstance();
+        startLockServer();
         await run({
             restart: options.restart,
             addChannels: options.addChannels,
@@ -441,126 +472,6 @@ cli
         process.exit(EXIT_NO_RESTART);
     }
 });
-cli
-    .command('send-to-discord <sessionId>', 'Send an OpenCode session to Discord and create a thread for it')
-    .option('-d, --directory <dir>', 'Project directory (defaults to current working directory)')
-    .action(async (sessionId, options) => {
-    try {
-        const directory = options.directory || process.cwd();
-        const db = getDatabase();
-        const botRow = db
-            .prepare('SELECT app_id, token FROM bot_tokens ORDER BY created_at DESC LIMIT 1')
-            .get();
-        if (!botRow) {
-            cliLogger.error('No bot credentials found. Run `kimaki` first to set up the bot.');
-            process.exit(EXIT_NO_RESTART);
-        }
-        const channelRow = db
-            .prepare('SELECT channel_id FROM channel_directories WHERE directory = ? AND channel_type = ?')
-            .get(directory, 'text');
-        if (!channelRow) {
-            cliLogger.error(`No Discord channel found for directory: ${directory}\n` +
-                'Run `kimaki --add-channels` to create a channel for this project.');
-            process.exit(EXIT_NO_RESTART);
-        }
-        const s = spinner();
-        s.start('Connecting to Discord...');
-        const discordClient = await createDiscordClient();
-        await new Promise((resolve, reject) => {
-            discordClient.once(Events.ClientReady, () => {
-                resolve();
-            });
-            discordClient.once(Events.Error, reject);
-            discordClient.login(botRow.token).catch(reject);
-        });
-        s.stop('Connected to Discord!');
-        const channel = await discordClient.channels.fetch(channelRow.channel_id);
-        if (!channel || channel.type !== ChannelType.GuildText) {
-            cliLogger.error('Could not find the text channel or it is not a text channel');
-            discordClient.destroy();
-            process.exit(EXIT_NO_RESTART);
-        }
-        const textChannel = channel;
-        s.start('Fetching session from OpenCode...');
-        const getClient = await initializeOpencodeForDirectory(directory);
-        const sessionResponse = await getClient().session.get({
-            path: { id: sessionId },
-        });
-        if (!sessionResponse.data) {
-            s.stop('Session not found');
-            discordClient.destroy();
-            process.exit(EXIT_NO_RESTART);
-        }
-        const session = sessionResponse.data;
-        s.stop(`Found session: ${session.title}`);
-        s.start('Creating Discord thread...');
-        const thread = await textChannel.threads.create({
-            name: `Resume: ${session.title}`.slice(0, 100),
-            autoArchiveDuration: 1440,
-            reason: `Resuming session ${sessionId} from CLI`,
-        });
-        db.prepare('INSERT OR REPLACE INTO thread_sessions (thread_id, session_id) VALUES (?, ?)').run(thread.id, sessionId);
-        s.stop('Created Discord thread!');
-        s.start('Loading session messages...');
-        const messagesResponse = await getClient().session.messages({
-            path: { id: sessionId },
-        });
-        if (!messagesResponse.data) {
-            s.stop('Failed to fetch session messages');
-            discordClient.destroy();
-            process.exit(EXIT_NO_RESTART);
-        }
-        const messages = messagesResponse.data;
-        await thread.send(`📂 **Resumed session:** ${session.title}\n📅 **Created:** ${new Date(session.time.created).toLocaleString()}\n\n*Loading ${messages.length} messages...*`);
-        let messageCount = 0;
-        for (const message of messages) {
-            if (message.info.role === 'user') {
-                const userParts = message.parts.filter((p) => p.type === 'text' && !p.synthetic);
-                const userTexts = userParts
-                    .map((p) => {
-                    if (p.type === 'text') {
-                        return p.text;
-                    }
-                    return '';
-                })
-                    .filter((t) => t.trim());
-                const userText = userTexts.join('\n\n');
-                if (userText) {
-                    const truncated = userText.length > 1900 ? userText.slice(0, 1900) + '…' : userText;
-                    await thread.send(`**User:**\n${truncated}`);
-                }
-            }
-            else if (message.info.role === 'assistant') {
-                const textParts = message.parts.filter((p) => p.type === 'text');
-                const texts = textParts
-                    .map((p) => {
-                    if (p.type === 'text') {
-                        return p.text;
-                    }
-                    return '';
-                })
-                    .filter((t) => t?.trim());
-                if (texts.length > 0) {
-                    const combinedText = texts.join('\n\n');
-                    const truncated = combinedText.length > 1900 ? combinedText.slice(0, 1900) + '…' : combinedText;
-                    await thread.send(truncated);
-                }
-            }
-            messageCount++;
-        }
-        await thread.send(`✅ **Session resumed!** Loaded ${messageCount} messages.\n\nYou can now continue the conversation by sending messages in this thread.`);
-        s.stop(`Loaded ${messageCount} messages`);
-        const guildId = textChannel.guildId;
-        const threadUrl = `https://discord.com/channels/${guildId}/${thread.id}`;
-        note(`Session "${session.title}" has been sent to Discord!\n\nThread: ${threadUrl}`, '✅ Success');
-        discordClient.destroy();
-        process.exit(0);
-    }
-    catch (error) {
-        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
-        process.exit(EXIT_NO_RESTART);
-    }
-});
 cli
     .command('upload-to-discord [...files]', 'Upload files to a Discord thread for a session')
     .option('-s, --session <sessionId>', 'OpenCode session ID')
@@ -627,24 +538,5 @@ cli
         process.exit(EXIT_NO_RESTART);
     }
 });
-cli
-    .command('install-plugin', 'Install the OpenCode command for kimaki Discord integration')
-    .action(async () => {
-    try {
-        const require = createRequire(import.meta.url);
-        const sendCommandSrc = require.resolve('./opencode-command-send-to-discord.md');
-        const opencodeConfig = path.join(os.homedir(), '.config', 'opencode');
-        const commandDir = path.join(opencodeConfig, 'command');
-        fs.mkdirSync(commandDir, { recursive: true });
-        const sendCommandDest = path.join(commandDir, 'send-to-kimaki-discord.md');
-        fs.copyFileSync(sendCommandSrc, sendCommandDest);
-        note(`Command installed:\n- ${sendCommandDest}\n\nUse /send-to-kimaki-discord to send session to Discord.`, '✅ Installed');
-        process.exit(0);
-    }
-    catch (error) {
-        cliLogger.error('Error:', error instanceof Error ? error.message : String(error));
-        process.exit(EXIT_NO_RESTART);
-    }
-});
 cli.help();
 cli.parse();