kimaki 0.4.76 → 0.4.78

package/dist/adapter-rest-boundary.test.js

@@ -0,0 +1,34 @@
+// Guardrail test to keep REST helpers out of adapter-consumer runtime files.
+// CLI/task-runner/discord-utils must use platform adapter interfaces instead of
+// direct createDiscordRest/discordRoutes/discordApiUrl imports.
+import fs from 'node:fs';
+import path from 'node:path';
+import { describe, expect, test } from 'vitest';
+const TARGET_FILES = [
+    'src/cli.ts',
+    'src/task-runner.ts',
+    'src/discord-utils.ts',
+];
+const PROJECT_ROOT = path.resolve(import.meta.dirname, '..');
+describe('adapter rest boundary', () => {
+    test('forbids direct REST helper imports in migrated files', () => {
+        const violations = TARGET_FILES.flatMap((relativePath) => {
+            const filePath = path.join(PROJECT_ROOT, relativePath);
+            const content = fs.readFileSync(filePath, 'utf8');
+            const matches = [
+                /\bcreateDiscordRest\b/.test(content)
+                    ? 'createDiscordRest'
+                    : null,
+                /\bdiscordRoutes\b/.test(content) ? 'discordRoutes' : null,
+                /\bdiscordApiUrl\b/.test(content) ? 'discordApiUrl' : null,
+            ].filter((match) => {
+                return Boolean(match);
+            });
+            if (matches.length === 0) {
+                return [];
+            }
+            return [`${relativePath}: ${matches.join(', ')}`];
+        });
+        expect(violations).toMatchInlineSnapshot(`[]`);
+    });
+});

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

@@ -10,7 +10,6 @@
 // Uses opencode-deterministic-provider (no real LLM calls).
 // Poll timeouts: 4s max, 100ms interval.
 import fs from 'node:fs';
-import net from 'node:net';
 import path from 'node:path';
 import url from 'node:url';
 import { describe, beforeAll, afterAll, test, expect, } from 'vitest';
@@ -24,7 +23,7 @@ import { setBotToken, initDatabase, closeDatabase, setChannelDirectory, setChann
 import { getPrisma } from './db.js';
 import { startHranaServer, stopHranaServer } from './hrana-server.js';
 import { initializeOpencodeForDirectory, stopOpencodeServer } from './opencode.js';
-import { cleanupTestSessions, waitForBotMessageContaining, waitForFooterMessage, } from './test-utils.js';
+import { chooseLockPort, cleanupTestSessions, waitForBotMessageContaining, waitForFooterMessage, } from './test-utils.js';
 import { buildQuickAgentCommandDescription } from './commands/agent.js';
 const TEST_USER_ID = '200000000000000920';
 const TEXT_CHANNEL_ID = '200000000000000921';
@@ -41,23 +40,6 @@ function createRunDirectories() {
     fs.mkdirSync(projectDirectory, { recursive: true });
     return { root, dataDir, projectDirectory };
 }
-function chooseLockPort() {
-    return new Promise((resolve, reject) => {
-        const server = net.createServer();
-        server.listen(0, () => {
-            const address = server.address();
-            if (!address || typeof address === 'string') {
-                server.close();
-                reject(new Error('Failed to resolve lock port'));
-                return;
-            }
-            const port = address.port;
-            server.close(() => {
-                resolve(port);
-            });
-        });
-    });
-}
 function createDiscordJsClient({ restUrl }) {
     return new Client({
         intents: [
@@ -158,7 +140,7 @@ describe('agent model resolution', () => {
     beforeAll(async () => {
         testStartTime = Date.now();
         directories = createRunDirectories();
-        const lockPort = await chooseLockPort();
+        const lockPort = chooseLockPort({ key: TEXT_CHANNEL_ID });
         process.env['KIMAKI_LOCK_PORT'] = String(lockPort);
         setDataDir(directories.dataDir);
         previousDefaultVerbosity = store.getState().defaultVerbosity;

package/dist/cli.js

@@ -13,6 +13,7 @@ import { formatWorktreeName } from './commands/new-worktree.js';
 import { WORKTREE_PREFIX } from './commands/merge-worktree.js';
 import { sendWelcomeMessage } from './onboarding-welcome.js';
 import { buildOpencodeEventLogLine } from './session-handler/opencode-session-event-log.js';
+import { selectResolvedCommand } from './opencode-command.js';
 import yaml from 'js-yaml';
 import { Events, ChannelType, ActivityType, Routes, SlashCommandBuilder, AttachmentBuilder, } from 'discord.js';
 import { createDiscordRest, discordApiUrl, getDiscordRestApiUrl, getGatewayProxyRestBaseUrl } from './discord-urls.js';
@@ -342,7 +343,11 @@ async function ensureCommandAvailable({ name, envPathKey, installUnix, installWi
     const foundInPath = await execAsync(`${whichCmd} ${name}`, {
         env: process.env,
     }).then((result) => {
-        return result.stdout.trim();
+        const resolved = selectResolvedCommand({
+            output: result.stdout,
+            isWindows,
+        });
+        return resolved || '';
     }, () => {
         return '';
     });
@@ -730,6 +735,16 @@ async function registerCommands({ token, appId, guildIds, userCommands = [], age
             .setDescription('List and manage MCP servers for this project')
             .setDMPermission(false)
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('screenshare')
+            .setDescription('Start screen sharing via VNC tunnel (auto-stops after 1 hour)')
+            .setDMPermission(false)
+            .toJSON(),
+        new SlashCommandBuilder()
+            .setName('screenshare-stop')
+            .setDescription('Stop screen sharing')
+            .setDMPermission(false)
+            .toJSON(),
     ];
     // Add user-defined commands with source-based suffixes (-cmd / -skill)
     // Also populate registeredUserCommands in the store for /queue-command autocomplete
@@ -1173,7 +1188,7 @@ async function resolveCredentials({ forceRestartOnboarding, forceGateway, gatewa
             emitJsonEvent({ type: 'install_url', url: oauthUrl });
         }
         // Poll until the user installs the bot in a Discord server.
-        // 600 attempts x 2s = 20 minutes timeout.
+        // 100 attempts x 3s = 5 minutes timeout.
         const s = isInteractive ? spinner() : undefined;
         s?.start('Waiting for a Discord server with the bot installed...');
         const pollUrl = new URL('/api/onboarding/status', KIMAKI_WEBSITE_URL);
@@ -1181,9 +1196,9 @@ async function resolveCredentials({ forceRestartOnboarding, forceGateway, gatewa
         pollUrl.searchParams.set('secret', clientSecret);
         let guildId;
         let installerDiscordUserId;
-        for (let attempt = 0; attempt < 600; attempt++) {
+        for (let attempt = 0; attempt < 100; attempt++) {
             await new Promise((resolve) => {
-                setTimeout(resolve, 2000);
+                setTimeout(resolve, 3000);
             });
             // Progressive hints for interactive users who may be stuck
             if (isInteractive) {
@@ -1217,9 +1232,9 @@ async function resolveCredentials({ forceRestartOnboarding, forceGateway, gatewa
                 s?.stop('Authorization timed out');
             }
             else {
-                emitJsonEvent({ type: 'error', message: 'Authorization timed out after 20 minutes' });
+                emitJsonEvent({ type: 'error', message: 'Authorization timed out after 5 minutes' });
             }
-            cliLogger.error('Bot authorization timed out after 20 minutes. Please try again.');
+            cliLogger.error('Bot authorization timed out after 5 minutes. Please try again.');
             process.exit(EXIT_NO_RESTART);
         }
         if (isInteractive) {
@@ -1507,13 +1522,18 @@ async function run({ restartOnboarding, addChannels, useWorktrees, enableVoiceCh
             }
             // Create default kimaki channel + welcome message in each guild.
             // Runs after channel sync so existing channels are detected correctly.
-            await ensureDefaultChannelsWithWelcome({
-                guilds,
-                discordClient,
-                appId,
-                isGatewayMode,
-                installerDiscordUserId,
-            });
+            try {
+                await ensureDefaultChannelsWithWelcome({
+                    guilds,
+                    discordClient,
+                    appId,
+                    isGatewayMode,
+                    installerDiscordUserId,
+                });
+            }
+            catch (error) {
+                cliLogger.warn('Background default channel creation failed:', error instanceof Error ? error.message : String(error));
+            }
         })();
         // Background: OpenCode init + slash command registration (non-blocking)
         void backgroundInit({
@@ -2927,6 +2947,23 @@ cli
         command: command.length > 0 ? command : undefined,
     });
 });
+cli
+    .command('screenshare', 'Share your screen via VNC tunnel. Auto-stops after 1 hour. Runs until Ctrl+C. Use tmux to run in background.')
+    .action(async () => {
+    const { startScreenshare } = await import('./commands/screenshare.js');
+    try {
+        const session = await startScreenshare({
+            sessionKey: 'cli',
+            startedBy: 'cli',
+        });
+        cliLogger.log(`Screen sharing started: ${session.noVncUrl}`);
+        cliLogger.log('Press Ctrl+C to stop');
+    }
+    catch (err) {
+        cliLogger.error('Failed to start screen share:', err instanceof Error ? err.message : String(err));
+        process.exit(EXIT_NO_RESTART);
+    }
+});
 cli
     .command('sqlitedb', 'Show the location of the SQLite database file')
     .action(() => {

package/dist/commands/channel-ref.js

@@ -0,0 +1,16 @@
+// Helpers for working with normalized platform channel references in commands.
+export function isThreadChannel(channel) {
+    return channel?.kind === 'thread';
+}
+export function isTextChannel(channel) {
+    return channel?.kind === 'text';
+}
+export function getRootChannelId(channel) {
+    if (!channel) {
+        return null;
+    }
+    if (channel.kind === 'thread') {
+        return channel.parentId || channel.id;
+    }
+    return channel.id;
+}

package/dist/commands/diff.js

@@ -3,7 +3,7 @@ import { ChannelType, EmbedBuilder, MessageFlags, } from 'discord.js';
 import path from 'node:path';
 import { resolveWorkingDirectory, SILENT_MESSAGE_FLAGS, } from '../discord-utils.js';
 import { createLogger, LogPrefix } from '../logger.js';
-import { execAsync } from '../worktrees.js';
+import { uploadGitDiffViaCritique } from '../critique-utils.js';
 const logger = createLogger(LogPrefix.DIFF);
 export async function handleDiffCommand({ command, }) {
     const channel = command.channel;
@@ -39,90 +39,25 @@ export async function handleDiffCommand({ command, }) {
     }
     const { workingDirectory } = resolved;
     await command.deferReply({ flags: SILENT_MESSAGE_FLAGS });
-    try {
-        const projectName = path.basename(workingDirectory);
-        const title = `${projectName}: Discord /diff`;
-        const { stdout, stderr } = await execAsync(`bunx critique --web "${title}" --json`, {
-            cwd: workingDirectory,
-            timeout: 30000,
-        });
-        // critique --json outputs JSON on the last line: {"url":"...","id":"..."} or {"error":"..."}
-        const output = stdout || stderr;
-        const lines = output.trim().split('\n');
-        const jsonLine = lines[lines.length - 1];
-        if (!jsonLine) {
-            await command.editReply({
-                content: 'No changes to show',
-            });
-            return;
-        }
-        let result;
-        try {
-            result = JSON.parse(jsonLine);
-        }
-        catch {
-            // Fallback: try to find URL in output
-            const urlMatch = output.match(/https?:\/\/critique\.work\/[^\s]+/);
-            if (urlMatch) {
-                await command.editReply({
-                    content: `[diff](${urlMatch[0]})`,
-                });
-                logger.log(`Diff shared: ${urlMatch[0]}`);
-                return;
-            }
-            await command.editReply({
-                content: 'No changes to show',
-            });
-            return;
-        }
-        if (result.error || !result.url || !result.id) {
-            await command.editReply({
-                content: result.error || 'No changes to show',
-            });
-            return;
-        }
-        const imageUrl = `https://critique.work/og/${result.id}.png`;
-        const embed = new EmbedBuilder()
-            .setTitle(title)
-            .setURL(result.url)
-            .setImage(imageUrl);
-        await command.editReply({
-            embeds: [embed],
-        });
-        logger.log(`Diff shared: ${result.url}`);
+    const projectName = path.basename(workingDirectory);
+    const title = `${projectName}: Discord /diff`;
+    const result = await uploadGitDiffViaCritique({
+        title,
+        cwd: workingDirectory,
+    });
+    if (!result) {
+        await command.editReply({ content: 'No changes to show' });
+        return;
     }
-    catch (error) {
-        logger.error('[DIFF] Error:', error);
-        // exec error includes stdout/stderr - try to parse JSON from it
-        const execError = error;
-        const output = execError.stdout || execError.stderr || '';
-        // Check if critique output JSON even on error
-        const lines = output.trim().split('\n');
-        const jsonLine = lines[lines.length - 1];
-        if (jsonLine) {
-            try {
-                const result = JSON.parse(jsonLine);
-                if (result.error) {
-                    await command.editReply({
-                        content: result.error,
-                    });
-                    return;
-                }
-            }
-            catch {
-                // not JSON, continue to generic error
-            }
-        }
-        // Check for common errors
-        const message = execError.message || 'Unknown error';
-        if (message.includes('command not found') || message.includes('ENOENT')) {
-            await command.editReply({
-                content: 'bunx/critique not available',
-            });
-            return;
-        }
-        await command.editReply({
-            content: `Failed to generate diff: ${message.slice(0, 200)}`,
-        });
+    if (result.error || !result.url) {
+        await command.editReply({ content: result.error || 'No changes to show' });
+        return;
     }
+    const imageUrl = `https://critique.work/og/${result.id}.png`;
+    const embed = new EmbedBuilder()
+        .setTitle(title)
+        .setURL(result.url)
+        .setImage(imageUrl);
+    await command.editReply({ embeds: [embed] });
+    logger.log(`Diff shared: ${result.url}`);
 }

package/dist/commands/merge-worktree.js

@@ -6,7 +6,7 @@ import { getThreadWorktree, getThreadSession, getChannelDirectory, } from '../da
 import { createLogger, LogPrefix } from '../logger.js';
 import { notifyError } from '../sentry.js';
 import { mergeWorktree, listBranchesByLastCommit, validateBranchRef } from '../worktrees.js';
-import { sendThreadMessage, resolveWorkingDirectory, resolveTextChannel, } from '../discord-utils.js';
+import { sendThreadMessage, resolveWorkingDirectory, resolveProjectDirectoryFromAutocomplete, } from '../discord-utils.js';
 import { getOrCreateRuntime, } from '../session-handler/thread-session-runtime.js';
 import { RebaseConflictError, DirtyWorktreeError } from '../errors.js';
 const logger = createLogger(LogPrefix.WORKTREE);
@@ -131,22 +131,10 @@ export async function handleMergeWorktreeCommand({ command, appId, }) {
 export async function handleMergeWorktreeAutocomplete({ interaction, }) {
     try {
         const focusedValue = interaction.options.getFocused();
-        let projectDirectory;
-        // Try to get directory from worktree info (we're in a thread)
-        if (interaction.channel?.isThread()) {
-            const worktreeInfo = await getThreadWorktree(interaction.channel.id);
-            if (worktreeInfo?.project_directory) {
-                projectDirectory = worktreeInfo.project_directory;
-            }
-        }
-        // Fallback: resolve from parent channel
-        if (!projectDirectory && interaction.channel) {
-            const textChannel = await resolveTextChannel(interaction.channel);
-            if (textChannel) {
-                const channelConfig = await getChannelDirectory(textChannel.id);
-                projectDirectory = channelConfig?.directory;
-            }
-        }
+        // interaction.channel can be null when the channel isn't cached
+        // (common with gateway-proxy). Use channelId which is always available
+        // from the raw interaction payload.
+        const projectDirectory = await resolveProjectDirectoryFromAutocomplete(interaction);
         if (!projectDirectory) {
             await interaction.respond([]);
             return;

package/dist/commands/new-worktree.js

@@ -4,7 +4,7 @@
 import { ChannelType, REST, } from 'discord.js';
 import fs from 'node:fs';
 import { createPendingWorktree, setWorktreeReady, setWorktreeError, getChannelDirectory, getThreadWorktree, } from '../database.js';
-import { SILENT_MESSAGE_FLAGS, reactToThread, resolveTextChannel, } from '../discord-utils.js';
+import { SILENT_MESSAGE_FLAGS, reactToThread, resolveProjectDirectoryFromAutocomplete, } from '../discord-utils.js';
 import { createLogger, LogPrefix } from '../logger.js';
 import { notifyError } from '../sentry.js';
 import { createWorktreeWithSubmodules, execAsync, listBranchesByLastCommit, validateBranchRef, } from '../worktrees.js';
@@ -313,14 +313,10 @@ async function handleWorktreeInThread({ command, thread, }) {
 export async function handleNewWorktreeAutocomplete({ interaction, }) {
     try {
         const focusedValue = interaction.options.getFocused();
-        let projectDirectory;
-        if (interaction.channel) {
-            const textChannel = await resolveTextChannel(interaction.channel);
-            if (textChannel) {
-                const channelConfig = await getChannelDirectory(textChannel.id);
-                projectDirectory = channelConfig?.directory;
-            }
-        }
+        // interaction.channel can be null when the channel isn't cached
+        // (common with gateway-proxy). Use channelId which is always available
+        // from the raw interaction payload.
+        const projectDirectory = await resolveProjectDirectoryFromAutocomplete(interaction);
         if (!projectDirectory) {
             await interaction.respond([]);
             return;

package/dist/commands/permissions.js

@@ -118,9 +118,83 @@ export async function showPermissionButtons({ thread, permission, directory, per
         components: [actionRow],
         flags: NOTIFY_MESSAGE_FLAGS | MessageFlags.SuppressEmbeds,
     });
+    context.messageId = permissionMessage.id;
     logger.log(`Showed permission buttons for ${permission.id}`);
     return { messageId: permissionMessage.id, contextHash };
 }
+function updatePermissionMessage({ context, status, }) {
+    if (!context.messageId) {
+        return;
+    }
+    context.thread.messages
+        .fetch(context.messageId)
+        .then((message) => {
+        const patternStr = compactPermissionPatterns(context.permission.patterns).join(', ');
+        const externalDirLine = context.permission.permission === 'external_directory'
+            ? 'Agent is accessing files outside the project. [Learn more](https://opencode.ai/docs/permissions/#external-directories)\n'
+            : '';
+        return message.edit({
+            content: `⚠️ **Permission Required**\n` +
+                `**Type:** \`${context.permission.permission}\`\n` +
+                externalDirLine +
+                (patternStr ? `**Pattern:** \`${patternStr}\`\n` : '') +
+                status,
+            components: [],
+        });
+    })
+        .catch((error) => {
+        logger.error('Failed to update permission message:', error);
+    });
+}
+export async function cancelPendingPermission(threadId) {
+    const contexts = Array.from(pendingPermissionContexts.values()).filter((context) => {
+        return context.thread.id === threadId;
+    });
+    if (contexts.length === 0) {
+        return false;
+    }
+    let cancelledCount = 0;
+    for (const context of contexts) {
+        const pendingContext = takePendingPermissionContext(context.contextHash);
+        if (!pendingContext) {
+            continue;
+        }
+        const client = getOpencodeClient(pendingContext.directory);
+        if (!client) {
+            pendingPermissionContexts.set(pendingContext.contextHash, pendingContext);
+            logger.error('Failed to dismiss pending permission: OpenCode server not found');
+            continue;
+        }
+        const requestIds = pendingContext.requestIds.length > 0
+            ? pendingContext.requestIds
+            : [pendingContext.permission.id];
+        const result = await Promise.all(requestIds.map((requestId) => {
+            return client.permission.reply({
+                requestID: requestId,
+                directory: pendingContext.permissionDirectory,
+                reply: 'reject',
+            });
+        })).then(() => {
+            return 'ok';
+        }).catch((error) => {
+            pendingPermissionContexts.set(pendingContext.contextHash, pendingContext);
+            logger.error('Failed to dismiss pending permission:', error);
+            return 'error';
+        });
+        if (result === 'error') {
+            continue;
+        }
+        updatePermissionMessage({
+            context: pendingContext,
+            status: '_Permission dismissed - user sent a new message._',
+        });
+        cancelledCount++;
+    }
+    if (cancelledCount > 0) {
+        logger.log(`Dismissed ${cancelledCount} pending permission request(s) for thread ${threadId}`);
+    }
+    return cancelledCount > 0;
+}
 /**
  * Handle button click for permission.
  */
@@ -166,17 +240,9 @@ export async function handlePermissionButton(interaction) {
                     return '❌ Permission **rejected**';
             }
         })();
-        const patternStr = compactPermissionPatterns(context.permission.patterns).join(', ');
-        const externalDirLine = context.permission.permission === 'external_directory'
-            ? `Agent is accessing files outside the project. [Learn more](https://opencode.ai/docs/permissions/#external-directories)\n`
-            : '';
-        await interaction.editReply({
-            content: `⚠️ **Permission Required**\n` +
-                `**Type:** \`${context.permission.permission}\`\n` +
-                externalDirLine +
-                (patternStr ? `**Pattern:** \`${patternStr}\`\n` : '') +
-                resultText,
-            components: [], // Remove the buttons
+        updatePermissionMessage({
+            context,
+            status: resultText,
         });
         logger.log(`Permission ${context.permission.id} ${response} (${requestIds.length} request(s))`);
     }

package/dist/commands/resume.js

@@ -3,7 +3,7 @@ import { ChannelType, ThreadAutoArchiveDuration, } from 'discord.js';
 import fs from 'node:fs';
 import { getChannelDirectory, setThreadSession, setPartMessagesBatch, getAllThreadSessionIds, } from '../database.js';
 import { initializeOpencodeForDirectory } from '../opencode.js';
-import { sendThreadMessage, resolveTextChannel } from '../discord-utils.js';
+import { sendThreadMessage, resolveProjectDirectoryFromAutocomplete } from '../discord-utils.js';
 import { collectLastAssistantParts } from '../message-formatting.js';
 import { createLogger, LogPrefix } from '../logger.js';
 import * as errore from 'errore';
@@ -100,14 +100,10 @@ export async function handleResumeCommand({ command, }) {
 }
 export async function handleResumeAutocomplete({ interaction, }) {
     const focusedValue = interaction.options.getFocused();
-    let projectDirectory;
-    if (interaction.channel) {
-        const textChannel = await resolveTextChannel(interaction.channel);
-        if (textChannel) {
-            const channelConfig = await getChannelDirectory(textChannel.id);
-            projectDirectory = channelConfig?.directory;
-        }
-    }
+    // interaction.channel can be null when the channel isn't cached
+    // (common with gateway-proxy). Use channelId which is always available
+    // from the raw interaction payload.
+    const projectDirectory = await resolveProjectDirectoryFromAutocomplete(interaction);
     if (!projectDirectory) {
         await interaction.respond([]);
         return;