lazy-gravity 0.1.0 → 0.2.0

package/dist/bot/index.js

@@ -40,6 +40,7 @@ exports.startBot = exports.getResponseDeliveryModeForTest = void 0;
 exports.createSerialTaskQueueForTest = createSerialTaskQueueForTest;
 const i18n_1 = require("../utils/i18n");
 const logger_1 = require("../utils/logger");
+const logBuffer_1 = require("../utils/logBuffer");
 const discord_js_1 = require("discord.js");
 const better_sqlite3_1 = __importDefault(require("better-sqlite3"));
 const config_1 = require("../utils/config");
@@ -56,9 +57,11 @@ const chatCommandHandler_1 = require("../commands/chatCommandHandler");
 const cleanupCommandHandler_1 = require("../commands/cleanupCommandHandler");
 const channelManager_1 = require("../services/channelManager");
 const titleGeneratorService_1 = require("../services/titleGeneratorService");
+const joinCommandHandler_1 = require("../commands/joinCommandHandler");
 const chatSessionService_1 = require("../services/chatSessionService");
 const responseMonitor_1 = require("../services/responseMonitor");
 const antigravityLauncher_1 = require("../services/antigravityLauncher");
+const pathUtils_1 = require("../utils/pathUtils");
 const promptDispatcher_1 = require("../services/promptDispatcher");
 const cdpBridgeManager_1 = require("../services/cdpBridgeManager");
 const streamMessageFormatter_1 = require("../utils/streamMessageFormatter");
@@ -69,7 +72,10 @@ const modeUi_1 = require("../ui/modeUi");
 const modelsUi_1 = require("../ui/modelsUi");
 const templateUi_1 = require("../ui/templateUi");
 const autoAcceptUi_1 = require("../ui/autoAcceptUi");
+const outputUi_1 = require("../ui/outputUi");
 const screenshotUi_1 = require("../ui/screenshotUi");
+const userPreferenceRepository_1 = require("../database/userPreferenceRepository");
+const plainTextFormatter_1 = require("../utils/plainTextFormatter");
 const interactionCreateHandler_1 = require("../events/interactionCreateHandler");
 const messageCreateHandler_1 = require("../events/messageCreateHandler");
 // =============================================================================
@@ -127,6 +133,17 @@ function createSerialTaskQueueForTest(queueName, traceId) {
  *   - Visualize the flow of planning/analysis/execution confirmation/implementation as logs
  */
 async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService, modelService, inboundImages = [], options) {
+    // Completion signal — called exactly once when the entire prompt lifecycle ends
+    let completionSignaled = false;
+    const signalCompletion = (exitPath) => {
+        if (completionSignaled)
+            return;
+        completionSignaled = true;
+        logger_1.logger.debug(`[sendPrompt:${message.channelId}] signalCompletion via ${exitPath}`);
+        options?.onFullCompletion?.();
+    };
+    // Resolve output format once at the start (no mid-response switches)
+    const outputFormat = options?.userPrefRepo?.getOutputFormat(message.author.id) ?? 'embed';
     // Add reaction to acknowledge command receipt
     await message.react('👀').catch(() => { });
     const channel = (message.channel && 'send' in message.channel) ? message.channel : null;
@@ -137,6 +154,13 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
     const sendEmbed = (title, description, color, fields, footerText) => enqueueGeneral(async () => {
         if (!channel)
             return;
+        if (outputFormat === 'plain') {
+            const chunks = (0, plainTextFormatter_1.formatAsPlainText)({ title, description, fields, footerText });
+            for (const chunk of chunks) {
+                await channel.send({ content: chunk }).catch(() => { });
+            }
+            return;
+        }
         const embed = new discord_js_1.EmbedBuilder()
             .setTitle(title)
             .setDescription(description)
@@ -256,9 +280,10 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
         }
     };
     if (!cdp.isConnected()) {
-        await sendEmbed(`${PHASE_ICONS.error} Connection Error`, 'Not connected to Antigravity.\nStart with `open -a Antigravity --args --remote-debugging-port=9223`, then send a message to auto-connect.', PHASE_COLORS.error);
+        await sendEmbed(`${PHASE_ICONS.error} Connection Error`, `Not connected to Antigravity.\nStart with \`${(0, pathUtils_1.getAntigravityCdpHint)(9223)}\`, then send a message to auto-connect.`, PHASE_COLORS.error);
         await clearWatchingReaction();
         await message.react('❌').catch(() => { });
+        signalCompletion('cdp-disconnected');
         return;
     }
     const localMode = modeService.getCurrentMode();
@@ -311,6 +336,30 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
             return;
         if (!channel)
             return;
+        if (outputFormat === 'plain') {
+            const formatted = (0, discordFormatter_1.formatForDiscord)((rawText || '').trim());
+            const plainChunks = (0, plainTextFormatter_1.splitPlainText)(`**${title}**\n${formatted}\n_${footerText}_`);
+            const renderKey = `${title}|plain|${footerText}|${plainChunks.join('\n<<<PAGE_BREAK>>>\n')}`;
+            if (renderKey === lastLiveResponseKey && liveResponseMessages.length > 0)
+                return;
+            lastLiveResponseKey = renderKey;
+            for (let i = 0; i < plainChunks.length; i++) {
+                if (!liveResponseMessages[i]) {
+                    liveResponseMessages[i] = await channel.send({ content: plainChunks[i] }).catch(() => null);
+                    continue;
+                }
+                await liveResponseMessages[i].edit({ content: plainChunks[i] }).catch(async () => {
+                    liveResponseMessages[i] = await channel.send({ content: plainChunks[i] }).catch(() => null);
+                });
+            }
+            while (liveResponseMessages.length > plainChunks.length) {
+                const extra = liveResponseMessages.pop();
+                if (!extra)
+                    continue;
+                await extra.delete().catch(() => { });
+            }
+            return;
+        }
         const descriptions = buildLiveResponseDescriptions(rawText);
         const renderKey = `${title}|${color}|${footerText}|${descriptions.join('\n<<<PAGE_BREAK>>>\n')}`;
         if (renderKey === lastLiveResponseKey && liveResponseMessages.length > 0) {
@@ -347,6 +396,31 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
             return;
         if (!channel)
             return;
+        if (outputFormat === 'plain') {
+            const formatted = (0, discordFormatter_1.formatForDiscord)((rawText || '').trim());
+            const plainContent = `**${title}**\n${formatted}\n_${footerText}_`;
+            const plainChunks = (0, plainTextFormatter_1.splitPlainText)(plainContent);
+            const renderKey = `${title}|plain|${footerText}|${plainChunks.join('\n<<<PAGE_BREAK>>>\n')}`;
+            if (renderKey === lastLiveActivityKey && liveActivityMessages.length > 0)
+                return;
+            lastLiveActivityKey = renderKey;
+            for (let i = 0; i < plainChunks.length; i++) {
+                if (!liveActivityMessages[i]) {
+                    liveActivityMessages[i] = await channel.send({ content: plainChunks[i] }).catch(() => null);
+                    continue;
+                }
+                await liveActivityMessages[i].edit({ content: plainChunks[i] }).catch(async () => {
+                    liveActivityMessages[i] = await channel.send({ content: plainChunks[i] }).catch(() => null);
+                });
+            }
+            while (liveActivityMessages.length > plainChunks.length) {
+                const extra = liveActivityMessages.pop();
+                if (!extra)
+                    continue;
+                await extra.delete().catch(() => { });
+            }
+            return;
+        }
         const descriptions = buildLiveActivityDescriptions(rawText);
         const renderKey = `${title}|${color}|${footerText}|${descriptions.join('\n<<<PAGE_BREAK>>>\n')}`;
         if (renderKey === lastLiveActivityKey && liveActivityMessages.length > 0) {
@@ -392,6 +466,7 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
             await sendEmbed(`${PHASE_ICONS.error} Message Injection Failed`, `Failed to send message: ${injectResult.error}`, PHASE_COLORS.error);
             await clearWatchingReaction();
             await message.react('❌').catch(() => { });
+            signalCompletion('inject-failed');
             return;
         }
         const startTime = Date.now();
@@ -430,122 +505,127 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
             },
             onComplete: async (finalText) => {
                 isFinalized = true;
-                // If the user explicitly pressed /stop, skip output display entirely
-                const wasStoppedByUser = userStopRequestedChannels.delete(message.channelId);
-                if (wasStoppedByUser) {
-                    logger_1.logger.info(`[sendPromptToAntigravity:${monitorTraceId}] Stopped by user — skipping output`);
-                    await clearWatchingReaction();
-                    await message.react('⏹️').catch(() => { });
-                    return;
-                }
                 try {
-                    const elapsed = Math.round((Date.now() - startTime) / 1000);
-                    const isQuotaError = monitor.getPhase() === 'quotaReached' || monitor.getQuotaDetected();
-                    // Quota early exit — skip text extraction, output logging, and embed entirely
-                    if (isQuotaError) {
+                    // If the user explicitly pressed /stop, skip output display entirely
+                    const wasStoppedByUser = userStopRequestedChannels.delete(message.channelId);
+                    if (wasStoppedByUser) {
+                        logger_1.logger.info(`[sendPromptToAntigravity:${monitorTraceId}] Stopped by user — skipping output`);
+                        await clearWatchingReaction();
+                        await message.react('⏹️').catch(() => { });
+                        return;
+                    }
+                    try {
+                        const elapsed = Math.round((Date.now() - startTime) / 1000);
+                        const isQuotaError = monitor.getPhase() === 'quotaReached' || monitor.getQuotaDetected();
+                        // Quota early exit — skip text extraction, output logging, and embed entirely
+                        if (isQuotaError) {
+                            const finalLogText = lastActivityLogText || processLogBuffer.snapshot();
+                            if (finalLogText && finalLogText.trim().length > 0) {
+                                logger_1.logger.divider('Process Log');
+                                console.info(finalLogText);
+                            }
+                            logger_1.logger.divider();
+                            liveActivityUpdateVersion += 1;
+                            await upsertLiveActivityEmbeds(`${PHASE_ICONS.thinking} Process Log`, finalLogText || ACTIVITY_PLACEHOLDER, PHASE_COLORS.thinking, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Process log`), {
+                                source: 'complete',
+                                expectedVersion: liveActivityUpdateVersion,
+                            });
+                            liveResponseUpdateVersion += 1;
+                            await upsertLiveResponseEmbeds('⚠️ Model Quota Reached', 'Model quota limit reached. Please wait or switch to a different model.', 0xFF6B6B, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Quota Reached`), {
+                                source: 'complete',
+                                expectedVersion: liveResponseUpdateVersion,
+                            });
+                            try {
+                                const modelsPayload = await (0, modelsUi_1.buildModelsUI)(cdp, () => bridge.quota.fetchQuota());
+                                if (modelsPayload && channel) {
+                                    await channel.send({ ...modelsPayload });
+                                }
+                            }
+                            catch (e) {
+                                logger_1.logger.error('[Quota] Failed to send model selection UI:', e);
+                            }
+                            await clearWatchingReaction();
+                            await message.react('⚠️').catch(() => { });
+                            return;
+                        }
+                        // Normal path — extract final text
+                        const responseText = (finalText && finalText.trim().length > 0)
+                            ? finalText
+                            : lastProgressText;
+                        const emergencyText = (!responseText || responseText.trim().length === 0)
+                            ? await tryEmergencyExtractText()
+                            : '';
+                        const finalResponseText = responseText && responseText.trim().length > 0
+                            ? responseText
+                            : emergencyText;
+                        const separated = (0, discordFormatter_1.splitOutputAndLogs)(finalResponseText);
+                        const finalOutputText = separated.output || finalResponseText;
+                        // Process logs are now collected by onProcessLog callback directly;
+                        // sanitizeActivityLines is NOT applied because it would strip the very
+                        // content we want to display (activity messages, tool names, etc.)
                         const finalLogText = lastActivityLogText || processLogBuffer.snapshot();
                         if (finalLogText && finalLogText.trim().length > 0) {
                             logger_1.logger.divider('Process Log');
                             console.info(finalLogText);
                         }
+                        if (finalOutputText && finalOutputText.trim().length > 0) {
+                            logger_1.logger.divider(`Output (${finalOutputText.length} chars)`);
+                            console.info(finalOutputText);
+                        }
                         logger_1.logger.divider();
                         liveActivityUpdateVersion += 1;
+                        const activityVersion = liveActivityUpdateVersion;
                         await upsertLiveActivityEmbeds(`${PHASE_ICONS.thinking} Process Log`, finalLogText || ACTIVITY_PLACEHOLDER, PHASE_COLORS.thinking, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Process log`), {
                             source: 'complete',
-                            expectedVersion: liveActivityUpdateVersion,
+                            expectedVersion: activityVersion,
                         });
                         liveResponseUpdateVersion += 1;
-                        await upsertLiveResponseEmbeds('⚠️ Model Quota Reached', 'Model quota limit reached. Please wait or switch to a different model.', 0xFF6B6B, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Quota Reached`), {
-                            source: 'complete',
-                            expectedVersion: liveResponseUpdateVersion,
-                        });
-                        try {
-                            const modelsPayload = await (0, modelsUi_1.buildModelsUI)(cdp, () => bridge.quota.fetchQuota());
-                            if (modelsPayload && channel) {
-                                await channel.send({ ...modelsPayload });
-                            }
+                        const responseVersion = liveResponseUpdateVersion;
+                        if (finalOutputText && finalOutputText.trim().length > 0) {
+                            await upsertLiveResponseEmbeds(`${PHASE_ICONS.complete} Final Output`, finalOutputText, PHASE_COLORS.complete, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Complete`), {
+                                source: 'complete',
+                                expectedVersion: responseVersion,
+                            });
                         }
-                        catch (e) {
-                            logger_1.logger.error('[Quota] Failed to send model selection UI:', e);
+                        else {
+                            await upsertLiveResponseEmbeds(`${PHASE_ICONS.complete} Complete`, (0, i18n_1.t)('Failed to extract response. Use `/screenshot` to verify.'), PHASE_COLORS.complete, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Complete`), {
+                                source: 'complete',
+                                expectedVersion: responseVersion,
+                            });
                         }
-                        await clearWatchingReaction();
-                        await message.react('⚠️').catch(() => { });
-                        return;
-                    }
-                    // Normal path — extract final text
-                    const responseText = (finalText && finalText.trim().length > 0)
-                        ? finalText
-                        : lastProgressText;
-                    const emergencyText = (!responseText || responseText.trim().length === 0)
-                        ? await tryEmergencyExtractText()
-                        : '';
-                    const finalResponseText = responseText && responseText.trim().length > 0
-                        ? responseText
-                        : emergencyText;
-                    const separated = (0, discordFormatter_1.splitOutputAndLogs)(finalResponseText);
-                    const finalOutputText = separated.output || finalResponseText;
-                    // Process logs are now collected by onProcessLog callback directly;
-                    // sanitizeActivityLines is NOT applied because it would strip the very
-                    // content we want to display (activity messages, tool names, etc.)
-                    const finalLogText = lastActivityLogText || processLogBuffer.snapshot();
-                    if (finalLogText && finalLogText.trim().length > 0) {
-                        logger_1.logger.divider('Process Log');
-                        console.info(finalLogText);
-                    }
-                    if (finalOutputText && finalOutputText.trim().length > 0) {
-                        logger_1.logger.divider(`Output (${finalOutputText.length} chars)`);
-                        console.info(finalOutputText);
-                    }
-                    logger_1.logger.divider();
-                    liveActivityUpdateVersion += 1;
-                    const activityVersion = liveActivityUpdateVersion;
-                    await upsertLiveActivityEmbeds(`${PHASE_ICONS.thinking} Process Log`, finalLogText || ACTIVITY_PLACEHOLDER, PHASE_COLORS.thinking, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Process log`), {
-                        source: 'complete',
-                        expectedVersion: activityVersion,
-                    });
-                    liveResponseUpdateVersion += 1;
-                    const responseVersion = liveResponseUpdateVersion;
-                    if (finalOutputText && finalOutputText.trim().length > 0) {
-                        await upsertLiveResponseEmbeds(`${PHASE_ICONS.complete} Final Output`, finalOutputText, PHASE_COLORS.complete, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Complete`), {
-                            source: 'complete',
-                            expectedVersion: responseVersion,
-                        });
-                    }
-                    else {
-                        await upsertLiveResponseEmbeds(`${PHASE_ICONS.complete} Complete`, (0, i18n_1.t)('Failed to extract response. Use `/screenshot` to verify.'), PHASE_COLORS.complete, (0, i18n_1.t)(`⏱️ Time: ${elapsed}s | Complete`), {
-                            source: 'complete',
-                            expectedVersion: responseVersion,
-                        });
-                    }
-                    if (options && message.guild) {
-                        try {
-                            const sessionInfo = await options.chatSessionService.getCurrentSessionInfo(cdp);
-                            if (sessionInfo && sessionInfo.hasActiveChat && sessionInfo.title && sessionInfo.title !== (0, i18n_1.t)('(Untitled)')) {
-                                const session = options.chatSessionRepo.findByChannelId(message.channelId);
-                                const workspaceDirName = session
-                                    ? bridge.pool.extractDirName(session.workspacePath)
-                                    : cdp.getCurrentWorkspaceName();
-                                if (workspaceDirName) {
-                                    (0, cdpBridgeManager_1.registerApprovalSessionChannel)(bridge, workspaceDirName, sessionInfo.title, message.channel);
-                                }
-                                const newName = options.titleGenerator.sanitizeForChannelName(sessionInfo.title);
-                                if (session && session.displayName !== sessionInfo.title) {
-                                    const formattedName = `${session.sessionNumber}-${newName}`;
-                                    await options.channelManager.renameChannel(message.guild, message.channelId, formattedName);
-                                    options.chatSessionRepo.updateDisplayName(message.channelId, sessionInfo.title);
+                        if (options && message.guild) {
+                            try {
+                                const sessionInfo = await options.chatSessionService.getCurrentSessionInfo(cdp);
+                                if (sessionInfo && sessionInfo.hasActiveChat && sessionInfo.title && sessionInfo.title !== (0, i18n_1.t)('(Untitled)')) {
+                                    const session = options.chatSessionRepo.findByChannelId(message.channelId);
+                                    const projectName = session
+                                        ? bridge.pool.extractProjectName(session.workspacePath)
+                                        : cdp.getCurrentWorkspaceName();
+                                    if (projectName) {
+                                        (0, cdpBridgeManager_1.registerApprovalSessionChannel)(bridge, projectName, sessionInfo.title, message.channel);
+                                    }
+                                    const newName = options.titleGenerator.sanitizeForChannelName(sessionInfo.title);
+                                    if (session && session.displayName !== sessionInfo.title) {
+                                        const formattedName = `${session.sessionNumber}-${newName}`;
+                                        await options.channelManager.renameChannel(message.guild, message.channelId, formattedName);
+                                        options.chatSessionRepo.updateDisplayName(message.channelId, sessionInfo.title);
+                                    }
                                 }
                             }
+                            catch (e) {
+                                logger_1.logger.error('[Rename] Failed to get title from Antigravity and rename:', e);
+                            }
                         }
-                        catch (e) {
-                            logger_1.logger.error('[Rename] Failed to get title from Antigravity and rename:', e);
-                        }
+                        await sendGeneratedImages(finalOutputText || '');
+                        await clearWatchingReaction();
+                        await message.react(finalOutputText && finalOutputText.trim().length > 0 ? '✅' : '⚠️').catch(() => { });
+                    }
+                    catch (error) {
+                        logger_1.logger.error(`[sendPromptToAntigravity:${monitorTraceId}] onComplete failed:`, error);
                     }
-                    await sendGeneratedImages(finalOutputText || '');
-                    await clearWatchingReaction();
-                    await message.react(finalOutputText && finalOutputText.trim().length > 0 ? '✅' : '⚠️').catch(() => { });
                 }
-                catch (error) {
-                    logger_1.logger.error(`[sendPromptToAntigravity:${monitorTraceId}] onComplete failed:`, error);
+                finally {
+                    signalCompletion('onComplete');
                 }
             },
             onTimeout: async (lastText) => {
@@ -578,6 +658,9 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
                 catch (error) {
                     logger_1.logger.error(`[sendPromptToAntigravity:${monitorTraceId}] onTimeout failed:`, error);
                 }
+                finally {
+                    signalCompletion('onTimeout');
+                }
             },
         });
         await monitor.start();
@@ -602,18 +685,21 @@ async function sendPromptToAntigravity(bridge, message, prompt, cdp, modeService
         await sendEmbed(`${PHASE_ICONS.error} Error`, (0, i18n_1.t)(`Error occurred during processing: ${e.message}`), PHASE_COLORS.error);
         await clearWatchingReaction();
         await message.react('❌').catch(() => { });
+        signalCompletion('top-level-catch');
     }
 }
 // =============================================================================
 // Bot main entry point
 // =============================================================================
-const startBot = async () => {
+const startBot = async (cliLogLevel) => {
     const config = (0, config_1.loadConfig)();
+    logger_1.logger.setLogLevel(cliLogLevel ?? config.logLevel);
     const dbPath = process.env.NODE_ENV === 'test' ? ':memory:' : 'antigravity.db';
     const db = new better_sqlite3_1.default(dbPath);
     const modeService = new modeService_1.ModeService();
     const modelService = new modelService_1.ModelService();
     const templateRepo = new templateRepository_1.TemplateRepository(db);
+    const userPrefRepo = new userPreferenceRepository_1.UserPreferenceRepository(db);
     const workspaceBindingRepo = new workspaceBindingRepository_1.WorkspaceBindingRepository(db);
     const chatSessionRepo = new chatSessionRepository_1.ChatSessionRepository(db);
     const workspaceService = new workspaceService_1.WorkspaceService(config.workspaceBaseDir);
@@ -631,7 +717,7 @@ const startBot = async () => {
         modelService,
         sendPromptImpl: sendPromptToAntigravity,
     });
-    // Initialize command handlers
+    // Initialize command handlers (joinHandler is created after client, see below)
     const wsHandler = new workspaceCommandHandler_1.WorkspaceCommandHandler(workspaceBindingRepo, chatSessionRepo, workspaceService, channelManager);
     const chatHandler = new chatCommandHandler_1.ChatCommandHandler(chatSessionService, chatSessionRepo, workspaceBindingRepo, channelManager, workspaceService, bridge.pool);
     const cleanupHandler = new cleanupCommandHandler_1.CleanupCommandHandler(chatSessionRepo, workspaceBindingRepo);
@@ -643,6 +729,7 @@ const startBot = async () => {
             discord_js_1.GatewayIntentBits.MessageContent,
         ]
     });
+    const joinHandler = new joinCommandHandler_1.JoinCommandHandler(chatSessionService, chatSessionRepo, workspaceBindingRepo, channelManager, bridge.pool, workspaceService, client);
     client.once(discord_js_1.Events.ClientReady, async (readyClient) => {
         logger_1.logger.info(`Ready! Logged in as ${readyClient.user.tag} | extractionMode=${config.extractionMode}`);
         try {
@@ -700,7 +787,9 @@ const startBot = async () => {
         parseApprovalCustomId: cdpBridgeManager_1.parseApprovalCustomId,
         parseErrorPopupCustomId: cdpBridgeManager_1.parseErrorPopupCustomId,
         parsePlanningCustomId: cdpBridgeManager_1.parsePlanningCustomId,
-        handleSlashInteraction: async (interaction, handler, bridgeArg, wsHandlerArg, chatHandlerArg, cleanupHandlerArg, modeServiceArg, modelServiceArg, autoAcceptServiceArg, clientArg) => handleSlashInteraction(interaction, handler, bridgeArg, wsHandlerArg, chatHandlerArg, cleanupHandlerArg, modeServiceArg, modelServiceArg, autoAcceptServiceArg, clientArg, promptDispatcher, templateRepo),
+        joinHandler,
+        userPrefRepo,
+        handleSlashInteraction: async (interaction, handler, bridgeArg, wsHandlerArg, chatHandlerArg, cleanupHandlerArg, modeServiceArg, modelServiceArg, autoAcceptServiceArg, clientArg) => handleSlashInteraction(interaction, handler, bridgeArg, wsHandlerArg, chatHandlerArg, cleanupHandlerArg, modeServiceArg, modelServiceArg, autoAcceptServiceArg, clientArg, promptDispatcher, templateRepo, joinHandler, userPrefRepo),
         handleTemplateUse: async (interaction, templateId) => {
             const template = templateRepo.findById(templateId);
             if (!template) {
@@ -717,17 +806,17 @@ const startBot = async () => {
             if (workspacePath) {
                 try {
                     cdp = await bridge.pool.getOrConnect(workspacePath);
-                    const dirName = bridge.pool.extractDirName(workspacePath);
-                    bridge.lastActiveWorkspace = dirName;
+                    const projectName = bridge.pool.extractProjectName(workspacePath);
+                    bridge.lastActiveWorkspace = projectName;
                     bridge.lastActiveChannel = interaction.channel;
-                    (0, cdpBridgeManager_1.registerApprovalWorkspaceChannel)(bridge, dirName, interaction.channel);
+                    (0, cdpBridgeManager_1.registerApprovalWorkspaceChannel)(bridge, projectName, interaction.channel);
                     const session = chatSessionRepo.findByChannelId(channelId);
                     if (session?.displayName) {
-                        (0, cdpBridgeManager_1.registerApprovalSessionChannel)(bridge, dirName, session.displayName, interaction.channel);
+                        (0, cdpBridgeManager_1.registerApprovalSessionChannel)(bridge, projectName, session.displayName, interaction.channel);
                     }
-                    (0, cdpBridgeManager_1.ensureApprovalDetector)(bridge, cdp, dirName, client);
-                    (0, cdpBridgeManager_1.ensureErrorPopupDetector)(bridge, cdp, dirName, client);
-                    (0, cdpBridgeManager_1.ensurePlanningDetector)(bridge, cdp, dirName, client);
+                    (0, cdpBridgeManager_1.ensureApprovalDetector)(bridge, cdp, projectName, client);
+                    (0, cdpBridgeManager_1.ensureErrorPopupDetector)(bridge, cdp, projectName, client);
+                    (0, cdpBridgeManager_1.ensurePlanningDetector)(bridge, cdp, projectName, client);
                 }
                 catch (e) {
                     await interaction.followUp({
@@ -761,6 +850,7 @@ const startBot = async () => {
                         chatSessionRepo,
                         channelManager,
                         titleGenerator,
+                        userPrefRepo,
                     },
                 });
             }
@@ -788,6 +878,7 @@ const startBot = async () => {
         }),
         autoRenameChannel,
         handleScreenshot: screenshotUi_1.handleScreenshot,
+        userPrefRepo,
     }));
     await client.login(config.discordToken);
 };
@@ -815,55 +906,82 @@ async function autoRenameChannel(message, chatSessionRepo, titleGenerator, chann
 /**
  * Handle Discord Interactions API slash commands
  */
-async function handleSlashInteraction(interaction, handler, bridge, wsHandler, chatHandler, cleanupHandler, modeService, modelService, autoAcceptService, _client, promptDispatcher, templateRepo) {
+async function handleSlashInteraction(interaction, handler, bridge, wsHandler, chatHandler, cleanupHandler, modeService, modelService, autoAcceptService, _client, promptDispatcher, templateRepo, joinHandler, userPrefRepo) {
     const commandName = interaction.commandName;
     switch (commandName) {
         case 'help': {
+            const helpFields = [
+                {
+                    name: '💬 Chat', value: [
+                        '`/new` — Start a new chat session',
+                        '`/chat` — Show current session info + list',
+                    ].join('\n')
+                },
+                {
+                    name: '🔗 Session', value: [
+                        '`/join` — Join an existing Antigravity session',
+                        '`/mirror` — Toggle PC→Discord mirroring ON/OFF',
+                    ].join('\n')
+                },
+                {
+                    name: '⏹️ Control', value: [
+                        '`/stop` — Interrupt active LLM generation',
+                        '`/screenshot` — Capture Antigravity screen',
+                    ].join('\n')
+                },
+                {
+                    name: '⚙️ Settings', value: [
+                        '`/mode` — Display and change execution mode',
+                        '`/model [name]` — Display and change LLM model',
+                        '`/output [format]` — Toggle Embed / Plain Text output',
+                    ].join('\n')
+                },
+                {
+                    name: '📁 Projects', value: [
+                        '`/project` — Display project list',
+                        '`/project create <name>` — Create a new project',
+                    ].join('\n')
+                },
+                {
+                    name: '📝 Templates', value: [
+                        '`/template list` — Show templates with execute buttons (click to run)',
+                        '`/template add <name> <prompt>` — Register a template',
+                        '`/template delete <name>` — Delete a template',
+                    ].join('\n')
+                },
+                {
+                    name: '🔧 System', value: [
+                        '`/status` — Display overall bot status',
+                        '`/autoaccept` — Toggle auto-approve mode for approval dialogs via buttons',
+                        '`/logs [lines] [level]` — View recent bot logs',
+                        '`/cleanup [days]` — Clean up unused channels/categories',
+                        '`/help` — Show this help',
+                    ].join('\n')
+                },
+            ];
+            const helpOutputFormat = userPrefRepo?.getOutputFormat(interaction.user.id) ?? 'embed';
+            if (helpOutputFormat === 'plain') {
+                const chunks = (0, plainTextFormatter_1.formatAsPlainText)({
+                    title: '📖 LazyGravity Commands',
+                    description: 'Commands for controlling Antigravity from Discord.',
+                    fields: helpFields,
+                    footerText: 'Text messages are sent directly to Antigravity',
+                });
+                await interaction.editReply({ content: chunks[0] });
+                break;
+            }
             const embed = new discord_js_1.EmbedBuilder()
                 .setTitle('📖 LazyGravity Commands')
                 .setColor(0x5865F2)
                 .setDescription('Commands for controlling Antigravity from Discord.')
-                .addFields({
-                name: '💬 Chat', value: [
-                    '`/new` — Start a new chat session',
-                    '`/chat` — Show current session info + list',
-                ].join('\n')
-            }, {
-                name: '⏹️ Control', value: [
-                    '`/stop` — Interrupt active LLM generation',
-                    '`/screenshot` — Capture Antigravity screen',
-                ].join('\n')
-            }, {
-                name: '⚙️ Settings', value: [
-                    '`/mode` — Display and change execution mode',
-                    '`/model [name]` — Display and change LLM model',
-                ].join('\n')
-            }, {
-                name: '📁 Projects', value: [
-                    '`/project` — Display project list',
-                    '`/project create <name>` — Create a new project',
-                ].join('\n')
-            }, {
-                name: '📝 Templates', value: [
-                    '`/template list` — Show templates with execute buttons (click to run)',
-                    '`/template add <name> <prompt>` — Register a template',
-                    '`/template delete <name>` — Delete a template',
-                ].join('\n')
-            }, {
-                name: '🔧 System', value: [
-                    '`/status` — Display overall bot status',
-                    '`/autoaccept` — Toggle auto-approve mode for approval dialogs via buttons',
-                    '`/cleanup [days]` — Clean up unused channels/categories',
-                    '`/help` — Show this help',
-                ].join('\n')
-            })
+                .addFields(...helpFields)
                 .setFooter({ text: 'Text messages are sent directly to Antigravity' })
                 .setTimestamp();
             await interaction.editReply({ embeds: [embed] });
             break;
         }
         case 'mode': {
-            await (0, modeUi_1.sendModeUI)(interaction, modeService);
+            await (0, modeUi_1.sendModeUI)(interaction, modeService, { getCurrentCdp: () => (0, cdpBridgeManager_1.getCurrentCdp)(bridge) });
             break;
         }
         case 'model': {
@@ -924,23 +1042,46 @@ async function handleSlashInteraction(interaction, handler, bridge, wsHandler, c
                 return cdp ? 'CDP Connected' : 'Disconnected';
             })();
             const currentMode = modeService.getCurrentMode();
-            const embed = new discord_js_1.EmbedBuilder()
-                .setTitle('🔧 Bot Status')
-                .setColor(activeNames.length > 0 ? 0x00CC88 : 0x888888)
-                .addFields({ name: 'CDP Connection', value: activeNames.length > 0 ? `🟢 ${activeNames.length} project(s) connected` : '⚪ Disconnected', inline: true }, { name: 'Mode', value: modeService_1.MODE_DISPLAY_NAMES[currentMode] || currentMode, inline: true }, { name: 'Auto Approve', value: autoAcceptService.isEnabled() ? '🟢 ON' : '⚪ OFF', inline: true })
-                .setTimestamp();
+            const mirroringWorkspaces = activeNames.filter((name) => bridge.pool.getUserMessageDetector(name)?.isActive());
+            const mirrorStatus = mirroringWorkspaces.length > 0
+                ? `📡 ON (${mirroringWorkspaces.join(', ')})`
+                : '⚪ OFF';
+            const statusFields = [
+                { name: 'CDP Connection', value: activeNames.length > 0 ? `🟢 ${activeNames.length} project(s) connected` : '⚪ Disconnected', inline: true },
+                { name: 'Mode', value: modeService_1.MODE_DISPLAY_NAMES[currentMode] || currentMode, inline: true },
+                { name: 'Auto Approve', value: autoAcceptService.isEnabled() ? '🟢 ON' : '⚪ OFF', inline: true },
+                { name: 'Mirroring', value: mirrorStatus, inline: true },
+            ];
+            let statusDescription = '';
             if (activeNames.length > 0) {
                 const lines = activeNames.map((name) => {
                     const cdp = bridge.pool.getConnected(name);
                     const contexts = cdp ? cdp.getContexts().length : 0;
                     const detectorActive = bridge.pool.getApprovalDetector(name)?.isActive() ? ' [Detecting]' : '';
-                    return `• **${name}** — Contexts: ${contexts}${detectorActive}`;
+                    const mirrorActive = bridge.pool.getUserMessageDetector(name)?.isActive() ? ' [Mirror]' : '';
+                    return `• **${name}** — Contexts: ${contexts}${detectorActive}${mirrorActive}`;
                 });
-                embed.setDescription(`**Connected Projects:**\n${lines.join('\n')}`);
+                statusDescription = `**Connected Projects:**\n${lines.join('\n')}`;
             }
             else {
-                embed.setDescription('Send a message to auto-connect to a project.');
+                statusDescription = 'Send a message to auto-connect to a project.';
+            }
+            const statusOutputFormat = userPrefRepo?.getOutputFormat(interaction.user.id) ?? 'embed';
+            if (statusOutputFormat === 'plain') {
+                const chunks = (0, plainTextFormatter_1.formatAsPlainText)({
+                    title: '🔧 Bot Status',
+                    description: statusDescription,
+                    fields: statusFields,
+                });
+                await interaction.editReply({ content: chunks[0] });
+                break;
             }
+            const embed = new discord_js_1.EmbedBuilder()
+                .setTitle('🔧 Bot Status')
+                .setColor(activeNames.length > 0 ? 0x00CC88 : 0x888888)
+                .addFields(...statusFields)
+                .setDescription(statusDescription)
+                .setTimestamp();
             await interaction.editReply({ embeds: [embed] });
             break;
         }
@@ -954,6 +1095,23 @@ async function handleSlashInteraction(interaction, handler, bridge, wsHandler, c
             await interaction.editReply({ content: result.message });
             break;
         }
+        case 'output': {
+            if (!userPrefRepo) {
+                await interaction.editReply({ content: 'Output preference service not available.' });
+                break;
+            }
+            const requestedFormat = interaction.options.getString('format');
+            if (!requestedFormat) {
+                const currentFormat = userPrefRepo.getOutputFormat(interaction.user.id);
+                await (0, outputUi_1.sendOutputUI)(interaction, currentFormat);
+                break;
+            }
+            const format = requestedFormat === 'plain' ? 'plain' : 'embed';
+            userPrefRepo.setOutputFormat(interaction.user.id, format);
+            const label = format === 'plain' ? 'Plain Text' : 'Embed';
+            await interaction.editReply({ content: `Output format changed to **${label}**.` });
+            break;
+        }
         case 'screenshot': {
             await (0, screenshotUi_1.handleScreenshot)(interaction, (0, cdpBridgeManager_1.getCurrentCdp)(bridge));
             break;
@@ -1022,6 +1180,24 @@ async function handleSlashInteraction(interaction, handler, bridge, wsHandler, c
             await chatHandler.handleChat(interaction);
             break;
         }
+        case 'join': {
+            if (joinHandler) {
+                await joinHandler.handleJoin(interaction, bridge);
+            }
+            else {
+                await interaction.editReply({ content: (0, i18n_1.t)('⚠️ Join handler not available.') });
+            }
+            break;
+        }
+        case 'mirror': {
+            if (joinHandler) {
+                await joinHandler.handleMirror(interaction, bridge);
+            }
+            else {
+                await interaction.editReply({ content: (0, i18n_1.t)('⚠️ Mirror handler not available.') });
+            }
+            break;
+        }
         case 'cleanup': {
             await cleanupHandler.handleCleanup(interaction);
             break;
@@ -1031,6 +1207,24 @@ async function handleSlashInteraction(interaction, handler, bridge, wsHandler, c
             await interaction.editReply({ content: `🏓 Pong! API Latency is **${apiLatency}ms**.` });
             break;
         }
+        case 'logs': {
+            const lines = interaction.options.getInteger('lines') ?? 50;
+            const level = interaction.options.getString('level');
+            const entries = logBuffer_1.logBuffer.getRecent(lines, level ?? undefined);
+            if (entries.length === 0) {
+                await interaction.editReply({ content: 'No log entries found.' });
+                break;
+            }
+            const formatted = entries
+                .map((e) => `${e.timestamp.slice(11, 19)} ${e.message}`)
+                .join('\n');
+            const MAX_CONTENT = 1900;
+            const codeBlock = formatted.length <= MAX_CONTENT
+                ? `\`\`\`\n${formatted}\n\`\`\``
+                : `\`\`\`\n${formatted.slice(0, MAX_CONTENT)}\n\`\`\`\n(truncated — showing ${MAX_CONTENT} chars of ${formatted.length})`;
+            await interaction.editReply({ content: codeBlock });
+            break;
+        }
         default:
             await interaction.editReply({
                 content: `Unknown command: /${commandName}`,