kimaki 0.4.52 → 0.4.54

package/dist/cli.js

@@ -2,7 +2,7 @@
 // Main CLI entrypoint for the Kimaki Discord bot.
 // Handles interactive setup, Discord OAuth, slash command registration,
 // project channel creation, and launching the bot with opencode integration.
-import { cac } from 'cac';
+import { cac } from '@xmorse/cac';
 import { intro, outro, text, password, note, cancel, isCancel, confirm, log, multiselect, spinner, } from '@clack/prompts';
 import { deduplicateByKey, generateBotInstallUrl, abbreviatePath } from './utils.js';
 import { getChannelsWithDescriptions, createDiscordClient, getDatabase, getChannelDirectory, startDiscordBot, initializeOpencodeForDirectory, ensureKimakiCategory, createProjectChannels, } from './discord-bot.js';
@@ -204,12 +204,8 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .setDescription('Merge the worktree branch into the default branch')
             .toJSON(),
         new SlashCommandBuilder()
-            .setName('enable-worktrees')
-            .setDescription('Enable automatic git worktree creation for new sessions in this channel')
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('disable-worktrees')
-            .setDescription('Disable automatic git worktree creation for new sessions in this channel')
+            .setName('toggle-worktrees')
+            .setDescription('Toggle automatic git worktree creation for new sessions in this channel')
             .toJSON(),
         new SlashCommandBuilder()
             .setName('add-project')
@@ -267,6 +263,10 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             .setName('model')
             .setDescription('Set the preferred model for this channel or session')
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('login')
+            .setDescription('Authenticate with an AI provider (OAuth or API key). Use this instead of /connect')
+            .toJSON(),
         new SlashCommandBuilder()
             .setName('agent')
             .setDescription('Set the preferred agent for this channel or session')
@@ -303,6 +303,14 @@ async function registerCommands({ token, appId, userCommands = [], agents = [],
             return option;
         })
             .toJSON(),
+        new SlashCommandBuilder()
+            .setName('restart-opencode-server')
+            .setDescription('Restart the opencode server for this channel only (fixes state/auth/plugins)')
+            .toJSON(),
+        new SlashCommandBuilder()
+            .setName('sqlitedb')
+            .setDescription('Show the location of the SQLite database file')
+            .toJSON(),
     ];
     // Add user-defined commands with -cmd suffix
     for (const cmd of userCommands) {
@@ -433,54 +441,57 @@ async function run({ restart, addChannels, useWorktrees, enableVoiceChannels })
     const forceSetup = Boolean(restart);
     intro('🤖 Discord Bot Setup');
     // Step 0: Check if OpenCode CLI is available
-    const opencodeCheck = spawnSync('which', ['opencode'], { shell: true });
-    if (opencodeCheck.status !== 0) {
-        note('OpenCode CLI is required but not found in your PATH.', '⚠️  OpenCode Not Found');
-        const shouldInstall = await confirm({
-            message: 'Would you like to install OpenCode right now?',
-        });
-        if (isCancel(shouldInstall) || !shouldInstall) {
-            cancel('OpenCode CLI is required to run this bot');
-            process.exit(0);
-        }
-        const s = spinner();
-        s.start('Installing OpenCode CLI...');
-        try {
-            execSync('curl -fsSL https://opencode.ai/install | bash', {
-                stdio: 'inherit',
-                shell: '/bin/bash',
-            });
-            s.stop('OpenCode CLI installed successfully!');
-            // The install script adds opencode to PATH via shell configuration
-            // For the current process, we need to check common installation paths
-            const possiblePaths = [
-                `${process.env.HOME}/.local/bin/opencode`,
-                `${process.env.HOME}/.opencode/bin/opencode`,
-                '/usr/local/bin/opencode',
-                '/opt/opencode/bin/opencode',
-            ];
-            const installedPath = possiblePaths.find((p) => {
-                try {
-                    fs.accessSync(p, fs.constants.F_OK);
-                    return true;
-                }
-                catch (error) {
-                    cliLogger.debug(`OpenCode path not found at ${p}:`, error instanceof Error ? error.message : String(error));
-                    return false;
-                }
+    // Skip check if user set OPENCODE_PATH (for custom forks like shuvcode)
+    if (!process.env.OPENCODE_PATH) {
+        const opencodeCheck = spawnSync(process.platform === 'win32' ? 'where' : 'which', ['opencode'], { shell: true });
+        if (opencodeCheck.status !== 0) {
+            note('OpenCode CLI is required but not found in your PATH.', '⚠️  OpenCode Not Found');
+            const shouldInstall = await confirm({
+                message: 'Would you like to install OpenCode right now?',
             });
-            if (!installedPath) {
-                note('OpenCode was installed but may not be available in this session.\n' +
-                    'Please restart your terminal and run this command again.', '⚠️  Restart Required');
+            if (isCancel(shouldInstall) || !shouldInstall) {
+                cancel('OpenCode CLI is required to run this bot');
                 process.exit(0);
             }
-            // For subsequent spawn calls in this session, we can use the full path
-            process.env.OPENCODE_PATH = installedPath;
-        }
-        catch (error) {
-            s.stop('Failed to install OpenCode CLI');
-            cliLogger.error('Installation error:', error instanceof Error ? error.message : String(error));
-            process.exit(EXIT_NO_RESTART);
+            const s = spinner();
+            s.start('Installing OpenCode CLI...');
+            try {
+                execSync('curl -fsSL https://opencode.ai/install | bash', {
+                    stdio: 'inherit',
+                    shell: '/bin/bash',
+                });
+                s.stop('OpenCode CLI installed successfully!');
+                // The install script adds opencode to PATH via shell configuration
+                // For the current process, we need to check common installation paths
+                const possiblePaths = [
+                    `${process.env.HOME}/.local/bin/opencode`,
+                    `${process.env.HOME}/.opencode/bin/opencode`,
+                    '/usr/local/bin/opencode',
+                    '/opt/opencode/bin/opencode',
+                ];
+                const installedPath = possiblePaths.find((p) => {
+                    try {
+                        fs.accessSync(p, fs.constants.F_OK);
+                        return true;
+                    }
+                    catch (error) {
+                        cliLogger.debug(`OpenCode path not found at ${p}:`, error instanceof Error ? error.message : String(error));
+                        return false;
+                    }
+                });
+                if (!installedPath) {
+                    note('OpenCode was installed but may not be available in this session.\n' +
+                        'Please restart your terminal and run this command again.', '⚠️  Restart Required');
+                    process.exit(0);
+                }
+                // For subsequent spawn calls in this session, we can use the full path
+                process.env.OPENCODE_PATH = installedPath;
+            }
+            catch (error) {
+                s.stop('Failed to install OpenCode CLI');
+                cliLogger.error('Installation error:', error instanceof Error ? error.message : String(error));
+                process.exit(EXIT_NO_RESTART);
+            }
         }
     }
     const db = getDatabase();
@@ -1382,5 +1393,35 @@ cli
         process.exit(EXIT_NO_RESTART);
     }
 });
+cli
+    .command('tunnel', 'Expose a local port via tunnel')
+    .option('-p, --port <port>', 'Local port to expose (required)')
+    .option('-t, --tunnel-id [id]', 'Tunnel ID (random if omitted)')
+    .option('-h, --host [host]', 'Local host (default: localhost)')
+    .option('-d, --domain [domain]', 'Base domain (default: kimaki.xyz)')
+    .option('-s, --server [url]', 'Tunnel server URL (overrides domain)')
+    .action(async (options) => {
+    const { runTunnel, parseCommandFromArgv, CLI_NAME } = await import('traforo/run-tunnel');
+    if (!options.port) {
+        cliLogger.error('Error: --port is required');
+        cliLogger.error(`\nUsage: kimaki tunnel -p <port> [-- command]`);
+        process.exit(EXIT_NO_RESTART);
+    }
+    const port = parseInt(options.port, 10);
+    if (isNaN(port) || port < 1 || port > 65535) {
+        cliLogger.error(`Error: Invalid port number: ${options.port}`);
+        process.exit(EXIT_NO_RESTART);
+    }
+    // Parse command after -- from argv
+    const { command } = parseCommandFromArgv(process.argv);
+    await runTunnel({
+        port,
+        tunnelId: options.tunnelId,
+        localHost: options.host,
+        baseDomain: options.domain || 'kimaki.xyz',
+        serverUrl: options.server,
+        command: command.length > 0 ? command : undefined,
+    });
+});
 cli.help();
 cli.parse();

package/dist/commands/agent.js

@@ -79,15 +79,15 @@ export async function resolveAgentCommandContext({ interaction, appId, }) {
 }
 /**
  * Set the agent preference for a context (session or channel).
- * When switching agents for a session, also clears the session model preference
- * so the new agent's model takes effect.
+ * When switching agents for a session, clears session model preference
+ * so the new agent's model takes effect (agent model > channel model).
  */
 export function setAgentForContext({ context, agentName, }) {
     if (context.isThread && context.sessionId) {
         setSessionAgent(context.sessionId, agentName);
         // Clear session model so the new agent's model takes effect
         clearSessionModel(context.sessionId);
-        agentLogger.log(`Set agent ${agentName} for session ${context.sessionId} (cleared model preference)`);
+        agentLogger.log(`Set agent ${agentName} for session ${context.sessionId} (cleared session model)`);
     }
     else {
         setChannelAgent(context.channelId, agentName);