kimaki 0.4.81 → 0.4.83

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Kimaki
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/anthropic-auth-plugin.js

@@ -1,6 +1,13 @@
 /**
  * Anthropic OAuth authentication plugin for OpenCode.
  *
+ * If you're copy-pasting this plugin into your OpenCode config folder,
+ * you need to install the runtime dependencies first:
+ *
+ *   cd ~/.config/opencode
+ *   bun init -y
+ *   bun add @openauthjs/openauth proper-lockfile
+ *
  * Handles two concerns:
  * 1. OAuth login + token refresh (PKCE flow against claude.ai)
  * 2. Request/response rewriting (tool names, system prompt, beta headers)

package/dist/cli.js

@@ -7,7 +7,7 @@ import { z } from 'zod';
 import { intro, outro, text, password, note, cancel, isCancel, confirm, log, multiselect, select, spinner, } from '@clack/prompts';
 import { deduplicateByKey, generateBotInstallUrl, generateDiscordInstallUrlForBot, KIMAKI_GATEWAY_APP_ID, KIMAKI_WEBSITE_URL, abbreviatePath, } from './utils.js';
 import { getChannelsWithDescriptions, createDiscordClient, initDatabase, getChannelDirectory, startDiscordBot, initializeOpencodeForDirectory, ensureKimakiCategory, createProjectChannels, createDefaultKimakiChannel, } from './discord-bot.js';
-import { getBotTokenWithMode, ensureServiceAuthToken, setBotToken, setBotMode, setChannelDirectory, findChannelsByDirectory, getThreadSession, getThreadIdBySessionId, getSessionEventSnapshot, getPrisma, createScheduledTask, listScheduledTasks, cancelScheduledTask, getScheduledTask, updateScheduledTask, getSessionStartSourcesBySessionIds, } from './database.js';
+import { getBotTokenWithMode, ensureServiceAuthToken, setBotToken, setBotMode, setChannelDirectory, findChannelsByDirectory, getThreadSession, getThreadIdBySessionId, getSessionEventSnapshot, getPrisma, createScheduledTask, listScheduledTasks, cancelScheduledTask, getScheduledTask, updateScheduledTask, getSessionStartSourcesBySessionIds, deleteChannelDirectoryById, } from './database.js';
 import { ShareMarkdown } from './markdown.js';
 import { parseSessionSearchPattern, findFirstSessionSearchHit, buildSessionSearchSnippet, getPartSearchTexts, } from './session-search.js';
 import { formatWorktreeName } from './commands/new-worktree.js';
@@ -16,7 +16,7 @@ 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 { Events, ChannelType, ActivityType, Routes, AttachmentBuilder, } from 'discord.js';
 import { createDiscordRest, discordApiUrl, getDiscordRestApiUrl, getGatewayProxyRestBaseUrl, getInternetReachableBaseUrl } from './discord-urls.js';
 import crypto from 'node:crypto';
 import path from 'node:path';
@@ -27,7 +27,6 @@ import { initSentry, notifyError } from './sentry.js';
 import { archiveThread, uploadFilesToDiscord, stripMentions, } from './discord-utils.js';
 import { spawn, execSync } from 'node:child_process';
 import { setDataDir, getDataDir, getProjectsDir, } from './config.js';
-import { sanitizeAgentName, buildQuickAgentCommandDescription, } from './commands/agent.js';
 import { execAsync } from './worktrees.js';
 import { backgroundUpgradeKimaki, upgrade, getCurrentVersion, } from './upgrade.js';
 import { startHranaServer } from './hrana-server.js';
@@ -437,509 +436,8 @@ function startCaffeinate() {
 }
 const cli = goke('kimaki');
 process.title = 'kimaki';
-// Commands to skip when registering user commands (reserved names)
-const SKIP_USER_COMMANDS = ['init'];
-function getDiscordCommandSuffix(command) {
-    if (command.source === 'skill') {
-        return '-skill';
-    }
-    if (command.source === 'mcp') {
-        return '-mcp-prompt';
-    }
-    return '-cmd';
-}
 import { store } from './store.js';
-function isDiscordCommandSummary(value) {
-    if (typeof value !== 'object' || value === null) {
-        return false;
-    }
-    const id = Reflect.get(value, 'id');
-    const name = Reflect.get(value, 'name');
-    return typeof id === 'string' && typeof name === 'string';
-}
-async function deleteLegacyGlobalCommands({ rest, appId, commandNames, }) {
-    try {
-        const response = await rest.get(Routes.applicationCommands(appId));
-        if (!Array.isArray(response)) {
-            cliLogger.warn('COMMANDS: Unexpected global command payload while cleaning legacy global commands');
-            return;
-        }
-        const legacyGlobalCommands = response
-            .filter(isDiscordCommandSummary)
-            .filter((command) => {
-            return commandNames.has(command.name);
-        });
-        if (legacyGlobalCommands.length === 0) {
-            return;
-        }
-        const deletionResults = await Promise.allSettled(legacyGlobalCommands.map(async (command) => {
-            await rest.delete(Routes.applicationCommand(appId, command.id));
-            return command;
-        }));
-        const failedDeletions = deletionResults.filter((result) => {
-            return result.status === 'rejected';
-        });
-        if (failedDeletions.length > 0) {
-            cliLogger.warn(`COMMANDS: Failed to delete ${failedDeletions.length} legacy global command(s)`);
-        }
-        const deletedCount = deletionResults.length - failedDeletions.length;
-        if (deletedCount > 0) {
-            cliLogger.info(`COMMANDS: Deleted ${deletedCount} legacy global command(s) to avoid guild/global duplicates`);
-        }
-    }
-    catch (error) {
-        cliLogger.warn(`COMMANDS: Could not clean legacy global commands: ${error instanceof Error ? error.stack : String(error)}`);
-    }
-}
-// Discord slash command descriptions must be 1-100 chars.
-// Truncate to 100 so @sapphire/shapeshift validation never throws.
-function truncateCommandDescription(description) {
-    return description.slice(0, 100);
-}
-async function registerCommands({ token, appId, guildIds, userCommands = [], agents = [], }) {
-    const commands = [
-        new SlashCommandBuilder()
-            .setName('resume')
-            .setDescription(truncateCommandDescription('Resume an existing OpenCode session'))
-            .addStringOption((option) => {
-            option
-                .setName('session')
-                .setDescription(truncateCommandDescription('The session to resume'))
-                .setRequired(true)
-                .setAutocomplete(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('new-session')
-            .setDescription(truncateCommandDescription('Start a new OpenCode session'))
-            .addStringOption((option) => {
-            option
-                .setName('prompt')
-                .setDescription(truncateCommandDescription('Prompt content for the session'))
-                .setRequired(true);
-            return option;
-        })
-            .addStringOption((option) => {
-            option
-                .setName('files')
-                .setDescription(truncateCommandDescription('Files to mention (comma or space separated; autocomplete)'))
-                .setAutocomplete(true)
-                .setMaxLength(6000);
-            return option;
-        })
-            .addStringOption((option) => {
-            option
-                .setName('agent')
-                .setDescription(truncateCommandDescription('Agent to use for this session'))
-                .setAutocomplete(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('new-worktree')
-            .setDescription(truncateCommandDescription('Create a git worktree branch from origin/HEAD (or main). Optionally pick a base branch.'))
-            .addStringOption((option) => {
-            option
-                .setName('name')
-                .setDescription(truncateCommandDescription('Name for worktree (optional in threads - uses thread name)'))
-                .setRequired(false);
-            return option;
-        })
-            .addStringOption((option) => {
-            option
-                .setName('base-branch')
-                .setDescription(truncateCommandDescription('Branch to create the worktree from (default: origin/HEAD or main)'))
-                .setRequired(false)
-                .setAutocomplete(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('merge-worktree')
-            .setDescription(truncateCommandDescription('Squash-merge worktree into default branch. Aborts if main has uncommitted changes.'))
-            .addStringOption((option) => {
-            option
-                .setName('target-branch')
-                .setDescription(truncateCommandDescription('Branch to merge into (default: origin/HEAD or main)'))
-                .setRequired(false)
-                .setAutocomplete(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('toggle-worktrees')
-            .setDescription(truncateCommandDescription('Toggle automatic git worktree creation for new sessions in this channel'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('worktrees')
-            .setDescription(truncateCommandDescription('List all active worktree sessions'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('tasks')
-            .setDescription(truncateCommandDescription('List scheduled tasks created via send --send-at'))
-            .addBooleanOption((option) => {
-            return option
-                .setName('all')
-                .setDescription(truncateCommandDescription('Include completed, cancelled, and failed tasks'));
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('toggle-mention-mode')
-            .setDescription(truncateCommandDescription('Toggle mention-only mode (bot only responds when @mentioned)'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('add-project')
-            .setDescription(truncateCommandDescription('Create Discord channels for a project. Use `npx kimaki project add` for unlisted projects'))
-            .addStringOption((option) => {
-            option
-                .setName('project')
-                .setDescription(truncateCommandDescription('Recent OpenCode projects. Use `npx kimaki project add` if not listed'))
-                .setRequired(true)
-                .setAutocomplete(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('remove-project')
-            .setDescription(truncateCommandDescription('Remove Discord channels for a project'))
-            .addStringOption((option) => {
-            option
-                .setName('project')
-                .setDescription(truncateCommandDescription('Select a project to remove'))
-                .setRequired(true)
-                .setAutocomplete(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('create-new-project')
-            .setDescription(truncateCommandDescription('Create a new project folder, initialize git, and start a session'))
-            .addStringOption((option) => {
-            option
-                .setName('name')
-                .setDescription(truncateCommandDescription('Name for the new project folder'))
-                .setRequired(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('abort')
-            .setDescription(truncateCommandDescription('Abort the current OpenCode request in this thread'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('compact')
-            .setDescription(truncateCommandDescription('Compact the session context by summarizing conversation history'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('stop')
-            .setDescription(truncateCommandDescription('Abort the current OpenCode request in this thread'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('share')
-            .setDescription(truncateCommandDescription('Share the current session as a public URL'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('diff')
-            .setDescription(truncateCommandDescription('Show git diff as a shareable URL'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('fork')
-            .setDescription(truncateCommandDescription('Fork the session from a past user message'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('model')
-            .setDescription(truncateCommandDescription('Set the preferred model for this channel or session'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('model-variant')
-            .setDescription(truncateCommandDescription('Quickly change the thinking level variant for the current model'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('unset-model-override')
-            .setDescription(truncateCommandDescription('Remove model override and use default instead'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('login')
-            .setDescription(truncateCommandDescription('Authenticate with an AI provider (OAuth or API key). Use this instead of /connect'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('agent')
-            .setDescription(truncateCommandDescription('Set the preferred agent for this channel or session'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('queue')
-            .setDescription(truncateCommandDescription('Queue a message to be sent after the current response finishes'))
-            .addStringOption((option) => {
-            option
-                .setName('message')
-                .setDescription(truncateCommandDescription('The message to queue'))
-                .setRequired(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('clear-queue')
-            .setDescription(truncateCommandDescription('Clear all queued messages in this thread'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('queue-command')
-            .setDescription(truncateCommandDescription('Queue a user command to run after the current response finishes'))
-            .addStringOption((option) => {
-            option
-                .setName('command')
-                .setDescription(truncateCommandDescription('The command to run'))
-                .setRequired(true)
-                .setAutocomplete(true);
-            return option;
-        })
-            .addStringOption((option) => {
-            option
-                .setName('arguments')
-                .setDescription(truncateCommandDescription('Arguments to pass to the command'))
-                .setRequired(false);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('undo')
-            .setDescription(truncateCommandDescription('Undo the last assistant message (revert file changes)'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('redo')
-            .setDescription(truncateCommandDescription('Redo previously undone changes'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('verbosity')
-            .setDescription(truncateCommandDescription('Set output verbosity for this channel'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('restart-opencode-server')
-            .setDescription(truncateCommandDescription('Restart the shared opencode server (fixes state/auth/plugins)'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('run-shell-command')
-            .setDescription(truncateCommandDescription('Run a shell command in the project directory. Tip: prefix messages with ! as shortcut'))
-            .addStringOption((option) => {
-            option
-                .setName('command')
-                .setDescription(truncateCommandDescription('Command to run'))
-                .setRequired(true);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('context-usage')
-            .setDescription(truncateCommandDescription('Show token usage and context window percentage for this session'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('session-id')
-            .setDescription(truncateCommandDescription('Show current session ID and opencode attach command for this thread'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('memory-snapshot')
-            .setDescription(truncateCommandDescription('Write a V8 heap snapshot to disk for memory debugging'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('upgrade-and-restart')
-            .setDescription(truncateCommandDescription('Upgrade kimaki to the latest version and restart the bot'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('transcription-key')
-            .setDescription(truncateCommandDescription('Set API key for voice message transcription (OpenAI or Gemini)'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('mcp')
-            .setDescription(truncateCommandDescription('List and manage MCP servers for this project'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('screenshare')
-            .setDescription(truncateCommandDescription('Start screen sharing via VNC tunnel (auto-stops after 1 hour)'))
-            .setDMPermission(false)
-            .toJSON(),
-        new SlashCommandBuilder()
-            .setName('screenshare-stop')
-            .setDescription(truncateCommandDescription('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
-    const newRegisteredCommands = [];
-    for (const cmd of userCommands) {
-        if (SKIP_USER_COMMANDS.includes(cmd.name)) {
-            continue;
-        }
-        // Sanitize command name: oh-my-opencode uses MCP commands with colons and slashes,
-        // which Discord doesn't allow in command names.
-        // Discord command names: lowercase, alphanumeric and hyphens only, must start with letter/number.
-        const sanitizedName = cmd.name
-            .toLowerCase()
-            .replace(/[:/]/g, '-') // Replace : and / with hyphens first
-            .replace(/[^a-z0-9-]/g, '-') // Replace any other non-alphanumeric chars
-            .replace(/-+/g, '-') // Collapse multiple hyphens
-            .replace(/^-|-$/g, ''); // Remove leading/trailing hyphens
-        // Skip if sanitized name is empty - would create invalid command name like "-cmd"
-        if (!sanitizedName) {
-            continue;
-        }
-        const commandSuffix = getDiscordCommandSuffix(cmd);
-        // Truncate base name before appending suffix so the suffix is never
-        // lost to Discord's 32-char command name limit.
-        const baseName = sanitizedName.slice(0, 32 - commandSuffix.length);
-        const commandName = `${baseName}${commandSuffix}`;
-        const description = cmd.description || `Run /${cmd.name} command`;
-        newRegisteredCommands.push({
-            name: cmd.name,
-            discordCommandName: commandName,
-            description,
-            source: cmd.source,
-        });
-        commands.push(new SlashCommandBuilder()
-            .setName(commandName)
-            .setDescription(truncateCommandDescription(description))
-            .addStringOption((option) => {
-            option
-                .setName('arguments')
-                .setDescription(truncateCommandDescription('Arguments to pass to the command'))
-                .setRequired(false);
-            return option;
-        })
-            .setDMPermission(false)
-            .toJSON());
-    }
-    store.setState({ registeredUserCommands: newRegisteredCommands });
-    // Add agent-specific quick commands like /plan-agent, /build-agent
-    // Filter to primary/all mode agents (same as /agent command shows), excluding hidden agents
-    const primaryAgents = agents.filter((a) => (a.mode === 'primary' || a.mode === 'all') && !a.hidden);
-    for (const agent of primaryAgents) {
-        const sanitizedName = sanitizeAgentName(agent.name);
-        // Skip if sanitized name is empty or would create invalid command name
-        // Discord command names must start with a lowercase letter or number
-        if (!sanitizedName || !/^[a-z0-9]/.test(sanitizedName)) {
-            continue;
-        }
-        // Truncate base name before appending suffix so the -agent suffix is never
-        // lost to Discord's 32-char command name limit.
-        const agentSuffix = '-agent';
-        const agentBaseName = sanitizedName.slice(0, 32 - agentSuffix.length);
-        const commandName = `${agentBaseName}${agentSuffix}`;
-        const description = buildQuickAgentCommandDescription({
-            agentName: agent.name,
-            description: agent.description,
-        });
-        commands.push(new SlashCommandBuilder()
-            .setName(commandName)
-            .setDescription(truncateCommandDescription(description))
-            .setDMPermission(false)
-            .toJSON());
-    }
-    const rest = createDiscordRest(token);
-    const uniqueGuildIds = Array.from(new Set(guildIds.filter((guildId) => guildId)));
-    const guildCommandNames = new Set(commands
-        .map((command) => {
-        return command.name;
-    })
-        .filter((name) => {
-        return typeof name === 'string';
-    }));
-    if (uniqueGuildIds.length === 0) {
-        cliLogger.warn('COMMANDS: No guilds available, skipping slash command registration');
-        return;
-    }
-    try {
-        // PUT is a bulk overwrite: Discord matches by name, updates changed fields
-        // (description, options, etc.) in place, creates new commands, and deletes
-        // any not present in the body. No local diffing needed.
-        const results = await Promise.allSettled(uniqueGuildIds.map(async (guildId) => {
-            const response = await rest.put(Routes.applicationGuildCommands(appId, guildId), {
-                body: commands,
-            });
-            const registeredCount = Array.isArray(response)
-                ? response.length
-                : commands.length;
-            return { guildId, registeredCount };
-        }));
-        const failedGuilds = results
-            .map((result, index) => {
-            if (result.status === 'fulfilled') {
-                return null;
-            }
-            return {
-                guildId: uniqueGuildIds[index],
-                error: result.reason instanceof Error
-                    ? result.reason.message
-                    : String(result.reason),
-            };
-        })
-            .filter((value) => {
-            return value !== null;
-        });
-        if (failedGuilds.length > 0) {
-            failedGuilds.forEach((failure) => {
-                cliLogger.warn(`COMMANDS: Failed to register slash commands for guild ${failure.guildId}: ${failure.error}`);
-            });
-            throw new Error(`Failed to register slash commands for ${failedGuilds.length} guild(s)`);
-        }
-        const successfulGuilds = results.length;
-        const firstRegisteredCount = results[0];
-        const registeredCommandCount = firstRegisteredCount && firstRegisteredCount.status === 'fulfilled'
-            ? firstRegisteredCount.value.registeredCount
-            : commands.length;
-        // In gateway mode, global application routes (/applications/{app_id}/commands)
-        // are denied by the proxy (DeniedWithoutGuild). Legacy global commands only
-        // exist for self-hosted bots that previously registered commands globally.
-        const isGateway = store.getState().discordBaseUrl !== 'https://discord.com';
-        if (!isGateway) {
-            await deleteLegacyGlobalCommands({
-                rest,
-                appId,
-                commandNames: guildCommandNames,
-            });
-        }
-        cliLogger.info(`COMMANDS: Successfully registered ${registeredCommandCount} slash commands for ${successfulGuilds} guild(s)`);
-    }
-    catch (error) {
-        cliLogger.error('COMMANDS: Failed to register slash commands: ' + String(error));
-        throw error;
-    }
-}
+import { registerCommands, SKIP_USER_COMMANDS } from './discord-command-registration.js';
 async function reconcileKimakiRole({ guild }) {
     try {
         const roles = await guild.roles.fetch();
@@ -2855,6 +2353,7 @@ cli
 cli
     .command('project list', 'List all registered projects with their Discord channels')
     .option('--json', 'Output as JSON')
+    .option('--prune', 'Remove stale entries whose Discord channel no longer exists')
     .action(async (options) => {
     await initDatabase();
     const prisma = await getPrisma();
@@ -2871,31 +2370,67 @@ cli
     const rest = botRow ? createDiscordRest(botRow.token) : null;
     const enriched = await Promise.all(channels.map(async (ch) => {
         let channelName = '';
+        let deleted = false;
         if (rest) {
             try {
                 const data = (await rest.get(Routes.channel(ch.channel_id)));
                 channelName = data.name || '';
             }
-            catch {
-                // Channel may have been deleted from Discord
+            catch (error) {
+                // Only mark as deleted for Unknown Channel (10003) or 404,
+                // not transient errors like rate limits or 5xx
+                const isUnknownChannel = error instanceof Error &&
+                    'code' in error &&
+                    'status' in error &&
+                    (error.code === 10003 ||
+                        error.status === 404);
+                deleted = isUnknownChannel;
             }
         }
-        return { ...ch, channelName };
+        return { ...ch, channelName, deleted };
     }));
+    // Prune stale entries if requested
+    if (options.prune) {
+        const stale = enriched.filter((ch) => {
+            return ch.deleted;
+        });
+        if (stale.length === 0) {
+            cliLogger.log('No stale channels to prune');
+        }
+        else {
+            for (const ch of stale) {
+                await deleteChannelDirectoryById(ch.channel_id);
+                cliLogger.log(`Pruned stale channel ${ch.channel_id} (${path.basename(ch.directory)})`);
+            }
+            cliLogger.log(`Pruned ${stale.length} stale channel(s)`);
+        }
+        // Re-filter to only show live entries after pruning
+        const live = enriched.filter((ch) => {
+            return !ch.deleted;
+        });
+        if (live.length === 0) {
+            cliLogger.log('No projects registered');
+            process.exit(0);
+        }
+        enriched.length = 0;
+        enriched.push(...live);
+    }
     if (options.json) {
         const output = enriched.map((ch) => ({
             channel_id: ch.channel_id,
             channel_name: ch.channelName,
             directory: ch.directory,
             folder_name: path.basename(ch.directory),
+            deleted: ch.deleted,
         }));
         console.log(JSON.stringify(output, null, 2));
         process.exit(0);
     }
     for (const ch of enriched) {
         const folderName = path.basename(ch.directory);
+        const deletedTag = ch.deleted ? ' (deleted from Discord)' : '';
         const channelLabel = ch.channelName ? `#${ch.channelName}` : ch.channel_id;
-        console.log(`\n${channelLabel}`);
+        console.log(`\n${channelLabel}${deletedTag}`);
         console.log(`   Folder: ${folderName}`);
         console.log(`   Directory: ${ch.directory}`);
         console.log(`   Channel ID: ${ch.channel_id}`);