morpheus-cli 0.9.6 → 0.9.7

package/dist/channels/discord.js

@@ -112,8 +112,8 @@ export class DiscordAdapter {
     display = DisplayManager.getInstance();
     config = ConfigManager.getInstance();
     history = new SQLiteChatMessageHistory({ sessionId: '' });
-    /** Per-channel session tracking — which session this Discord adapter is currently using */
-    currentSessionId = null;
+    /** Per-user session tracking — maps userId to sessionId */
+    userSessions = new Map();
     telephonist = null;
     telephonistProvider = null;
     telephonistModel = null;
@@ -189,8 +189,7 @@ export class DiscordAdapter {
                 return;
             this.display.log(`${message.author.tag}: ${text}`, { source: 'Discord' });
             try {
-                const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
-                this.currentSessionId = sessionId;
+                const sessionId = await this.getSessionForUser(userId);
                 const response = await this.oracle.chat(text, undefined, false, {
                     origin_channel: 'discord',
                     session_id: sessionId,
@@ -303,8 +302,7 @@ export class DiscordAdapter {
             // Show transcription
             await channel.send(`🎤 "${text}"`);
             // Process with Oracle
-            const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
-            this.currentSessionId = sessionId;
+            const sessionId = await this.getSessionForUser(userId);
             const response = await this.oracle.chat(text, usage, true, {
                 origin_channel: 'discord',
                 session_id: sessionId,
@@ -495,8 +493,10 @@ export class DiscordAdapter {
             const history = new SQLiteChatMessageHistory({ sessionId: '' });
             const newSessionId = await history.createNewSession();
             history.close();
-            // Track the new session as the current one for this Discord channel
-            this.currentSessionId = newSessionId;
+            // Track the new session as the current one for this user
+            const userId = interaction.user.id;
+            await this.history.setUserChannelSession(this.channel, userId, newSessionId);
+            this.userSessions.set(userId, newSessionId);
             await interaction.reply({ content: '✅ New session started.' });
         }
         catch (err) {
@@ -506,6 +506,13 @@ export class DiscordAdapter {
     async cmdSessions(interaction) {
         try {
             const history = new SQLiteChatMessageHistory({ sessionId: '' });
+            const userId = interaction.user.id;
+            // Get user's current session (string | undefined)
+            let userCurrentSession = this.userSessions.get(userId) || undefined;
+            if (userCurrentSession === undefined) {
+                const fromDb = await this.history.getUserChannelSession(this.channel, userId);
+                userCurrentSession = fromDb ?? undefined;
+            }
             const sessions = (await history.listSessions()).filter((s) => !s.id.startsWith('chronos-job-') && !s.id.startsWith('sati-evaluation'));
             history.close();
             if (sessions.length === 0) {
@@ -516,7 +523,7 @@ export class DiscordAdapter {
             const rows = [];
             for (const session of sessions) {
                 const title = session.title || 'Untitled Session';
-                const isCurrent = session.id === this.currentSessionId;
+                const isCurrent = session.id === userCurrentSession;
                 const icon = isCurrent ? '🟢' : '⚪';
                 const started = new Date(session.started_at).toLocaleString();
                 lines.push(`${icon} **${title}**`);
@@ -554,12 +561,14 @@ export class DiscordAdapter {
             });
             collector.on('collect', async (btn) => {
                 try {
+                    const uid = btn.user.id;
                     if (btn.customId.startsWith('session_switch_')) {
                         const sid = btn.customId.replace('session_switch_', '');
                         const h = new SQLiteChatMessageHistory({ sessionId: '' });
                         await h.switchSession(sid);
                         h.close();
-                        this.currentSessionId = sid;
+                        await this.history.setUserChannelSession(this.channel, uid, sid);
+                        this.userSessions.set(uid, sid);
                         await btn.reply({ content: `✅ Switched to session \`${sid}\`.`, ephemeral: true });
                     }
                     else if (btn.customId.startsWith('session_archive_')) {
@@ -567,8 +576,12 @@ export class DiscordAdapter {
                         const h = new SQLiteChatMessageHistory({ sessionId: '' });
                         await h.archiveSession(sid);
                         h.close();
-                        if (this.currentSessionId === sid)
-                            this.currentSessionId = null;
+                        // Remove user-channel mapping if this was their current session
+                        const current = this.userSessions.get(uid);
+                        if (current === sid) {
+                            await this.history.deleteUserChannelSession(this.channel, uid);
+                            this.userSessions.delete(uid);
+                        }
                         await btn.reply({ content: `📂 Session \`${sid}\` archived.`, ephemeral: true });
                     }
                     else if (btn.customId.startsWith('session_delete_')) {
@@ -576,8 +589,12 @@ export class DiscordAdapter {
                         const h = new SQLiteChatMessageHistory({ sessionId: '' });
                         await h.deleteSession(sid);
                         h.close();
-                        if (this.currentSessionId === sid)
-                            this.currentSessionId = null;
+                        // Remove user-channel mapping if this was their current session
+                        const current = this.userSessions.get(uid);
+                        if (current === sid) {
+                            await this.history.deleteUserChannelSession(this.channel, uid);
+                            this.userSessions.delete(uid);
+                        }
                         await btn.reply({ content: `🗑️ Session \`${sid}\` deleted.`, ephemeral: true });
                     }
                 }
@@ -602,7 +619,9 @@ export class DiscordAdapter {
             const history = new SQLiteChatMessageHistory({ sessionId: '' });
             await history.switchSession(sessionId);
             history.close();
-            this.currentSessionId = sessionId;
+            const userId = interaction.user.id;
+            await this.history.setUserChannelSession(this.channel, userId, sessionId);
+            this.userSessions.set(userId, sessionId);
             await interaction.reply({ content: `✅ Switched to session \`${sessionId}\`.` });
         }
         catch (err) {
@@ -895,6 +914,40 @@ export class DiscordAdapter {
     isAuthorized(userId) {
         return this.allowedUsers.includes(userId);
     }
+    /**
+     * Gets or creates a session for a specific user.
+     * Uses triple fallback: memory → DB → global session.
+     */
+    async getSessionForUser(userId) {
+        // 1. Try memory
+        const fromMemory = this.userSessions.get(userId);
+        if (fromMemory)
+            return fromMemory;
+        // 2. Try DB
+        const fromDb = await this.history.getUserChannelSession(this.channel, userId);
+        if (fromDb !== null) {
+            this.userSessions.set(userId, fromDb);
+            return fromDb;
+        }
+        // 3. Create/use global session
+        const newSessionId = await this.history.getCurrentSessionOrCreate();
+        await this.history.setUserChannelSession(this.channel, userId, newSessionId);
+        this.userSessions.set(userId, newSessionId);
+        return newSessionId;
+    }
+    /**
+     * Restores user sessions from DB on startup.
+     * Reads user_channel_sessions table and populates userSessions Map.
+     */
+    async restoreUserSessions() {
+        const rows = await this.history.listUserChannelSessions(this.channel);
+        for (const row of rows) {
+            this.userSessions.set(row.userId, row.sessionId);
+        }
+        if (rows.length > 0) {
+            this.display.log(`✓ Restored ${rows.length} user session(s) from database`, { source: 'Discord', level: 'info' });
+        }
+    }
     isRateLimited(userId) {
         const now = Date.now();
         const last = this.rateLimitMap.get(userId);

package/dist/channels/telegram.js

@@ -144,8 +144,8 @@ export class TelegramAdapter {
     telephonistProvider = null;
     telephonistModel = null;
     history = new SQLiteChatMessageHistory({ sessionId: '' });
-    /** Per-channel session tracking — which session this Telegram adapter is currently using */
-    currentSessionId = null;
+    /** Per-user session tracking — maps userId to sessionId */
+    userSessions = new Map();
     RATE_LIMIT_MS = 3000; // minimum ms between requests per user
     rateLimiter = new Map(); // userId -> last request timestamp
     // Pending Chronos create confirmations (userId -> job data + expiry)
@@ -232,8 +232,7 @@ export class TelegramAdapter {
                 try {
                     // Send "typing" status
                     await ctx.sendChatAction('typing');
-                    const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
-                    this.currentSessionId = sessionId;
+                    const sessionId = await this.getSessionForUser(userId);
                     // Process with Agent
                     const response = await this.oracle.chat(text, undefined, false, {
                         origin_channel: 'telegram',
@@ -319,7 +318,7 @@ export class TelegramAdapter {
                     this.display.log(`Transcription success for @${user}: "${text}"`, { source: 'Telephonist', level: 'success' });
                     // Audit: record telephonist execution
                     try {
-                        const auditSessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
+                        const auditSessionId = await this.getSessionForUser(userId);
                         AuditRepository.getInstance().insert({
                             session_id: auditSessionId,
                             event_type: 'telephonist',
@@ -347,8 +346,7 @@ export class TelegramAdapter {
                     // So I should treat 'text' as if it was a text message.
                     await ctx.reply(`🎤 Transcription: "${text}"`);
                     await ctx.sendChatAction('typing');
-                    const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
-                    this.currentSessionId = sessionId;
+                    const sessionId = await this.getSessionForUser(userId);
                     // Process with Agent
                     const response = await this.oracle.chat(text, usage, true, {
                         origin_channel: 'telegram',
@@ -382,7 +380,7 @@ export class TelegramAdapter {
                     const detail = error?.cause?.message || error?.response?.data?.error?.message || error.message;
                     this.display.log(`Audio processing error for @${user}: ${detail}`, { source: 'Telephonist', level: 'error' });
                     try {
-                        const auditSessionId = this.currentSessionId ?? 'default';
+                        const auditSessionId = await this.getSessionForUser(userId);
                         AuditRepository.getInstance().insert({
                             session_id: auditSessionId,
                             event_type: 'telephonist',
@@ -425,6 +423,7 @@ export class TelegramAdapter {
                 const callbackQuery = ctx.callbackQuery;
                 const data = callbackQuery && 'data' in callbackQuery ? callbackQuery.data : undefined;
                 const sessionId = typeof data === 'string' ? data.replace('switch_session_', '') : '';
+                const userId = ctx.from.id.toString();
                 if (!sessionId || sessionId === '') {
                     await ctx.answerCbQuery('Invalid session ID');
                     return;
@@ -434,8 +433,9 @@ export class TelegramAdapter {
                     const history = new SQLiteChatMessageHistory({ sessionId: "" });
                     await history.switchSession(sessionId);
                     history.close();
-                    // Track this session as the current one for this Telegram channel
-                    this.currentSessionId = sessionId;
+                    // Update user-channel session mapping
+                    await this.history.setUserChannelSession(this.channel, userId, sessionId);
+                    this.userSessions.set(userId, sessionId);
                     await ctx.answerCbQuery();
                     // Remove the previous message and send confirmation
                     if (ctx.updateType === 'callback_query') {
@@ -468,9 +468,16 @@ export class TelegramAdapter {
             this.bot.action(/^confirm_archive_session_/, async (ctx) => {
                 const data = ctx.callbackQuery.data;
                 const sessionId = data.replace('confirm_archive_session_', '');
+                const userId = ctx.from.id.toString();
                 try {
                     const history = new SQLiteChatMessageHistory({ sessionId: "" });
                     await history.archiveSession(sessionId);
+                    // Remove user-channel session mapping if this was their current session
+                    const currentSession = this.userSessions.get(userId);
+                    if (currentSession === sessionId) {
+                        await this.history.deleteUserChannelSession(this.channel, userId);
+                        this.userSessions.delete(userId);
+                    }
                     await ctx.answerCbQuery('Session archived successfully');
                     if (ctx.updateType === 'callback_query') {
                         ctx.deleteMessage().catch(() => { });
@@ -501,9 +508,16 @@ export class TelegramAdapter {
             this.bot.action(/^confirm_delete_session_/, async (ctx) => {
                 const data = ctx.callbackQuery.data;
                 const sessionId = data.replace('confirm_delete_session_', '');
+                const userId = ctx.from.id.toString();
                 try {
                     const history = new SQLiteChatMessageHistory({ sessionId: "" });
                     await history.deleteSession(sessionId);
+                    // Remove user-channel session mapping if this was their current session
+                    const currentSession = this.userSessions.get(userId);
+                    if (currentSession === sessionId) {
+                        await this.history.deleteUserChannelSession(this.channel, userId);
+                        this.userSessions.delete(userId);
+                    }
                     await ctx.answerCbQuery('Session deleted successfully');
                     if (ctx.updateType === 'callback_query') {
                         ctx.deleteMessage().catch(() => { });
@@ -690,6 +704,40 @@ export class TelegramAdapter {
     isAuthorized(userId, allowedUsers) {
         return allowedUsers.includes(userId);
     }
+    /**
+     * Gets or creates a session for a specific user.
+     * Uses triple fallback: memory → DB → global session.
+     */
+    async getSessionForUser(userId) {
+        // 1. Try memory
+        const fromMemory = this.userSessions.get(userId);
+        if (fromMemory)
+            return fromMemory;
+        // 2. Try DB
+        const fromDb = await this.history.getUserChannelSession(this.channel, userId);
+        if (fromDb !== null) {
+            this.userSessions.set(userId, fromDb);
+            return fromDb;
+        }
+        // 3. Create/use global session
+        const newSessionId = await this.history.getCurrentSessionOrCreate();
+        await this.history.setUserChannelSession(this.channel, userId, newSessionId);
+        this.userSessions.set(userId, newSessionId);
+        return newSessionId;
+    }
+    /**
+     * Restores user sessions from DB on startup.
+     * Reads user_channel_sessions table and populates userSessions Map.
+     */
+    async restoreUserSessions() {
+        const rows = await this.history.listUserChannelSessions(this.channel);
+        for (const row of rows) {
+            this.userSessions.set(row.userId, row.sessionId);
+        }
+        if (rows.length > 0) {
+            this.display.log(`✓ Restored ${rows.length} user session(s) from database`, { source: 'Telegram', level: 'info' });
+        }
+    }
     async downloadToTemp(url, extension = '.ogg') {
         const response = await fetch(url);
         if (!response.ok)
@@ -1157,8 +1205,10 @@ export class TelegramAdapter {
             const history = new SQLiteChatMessageHistory({ sessionId: "" });
             const newSessionId = await history.createNewSession();
             history.close();
-            // Track the new session as the current one for this Telegram channel
-            this.currentSessionId = newSessionId;
+            // Track the new session as the current one for this user
+            const userId = ctx.from.id.toString();
+            await this.history.setUserChannelSession(this.channel, userId, newSessionId);
+            this.userSessions.set(userId, newSessionId);
         }
         catch (e) {
             await ctx.reply(`Error creating new session: ${e.message}`);
@@ -1167,6 +1217,13 @@ export class TelegramAdapter {
     async handleSessionStatusCommand(ctx, user) {
         try {
             const history = new SQLiteChatMessageHistory({ sessionId: "" });
+            const userId = ctx.from.id.toString();
+            // Get user's current session (string | undefined)
+            let userCurrentSession = this.userSessions.get(userId) || undefined;
+            if (userCurrentSession === undefined) {
+                const fromDb = await this.history.getUserChannelSession(this.channel, userId);
+                userCurrentSession = fromDb ?? undefined;
+            }
             // Exclude automated Chronos sessions — their IDs exceed Telegram's 64-byte
             // callback_data limit and they are not user-managed sessions.
             const sessions = (await history.listSessions()).filter((s) => !s.id.startsWith('chronos-job-') && !s.id.startsWith('sati-evaluation'));
@@ -1178,7 +1235,7 @@ export class TelegramAdapter {
             const keyboard = [];
             for (const session of sessions) {
                 const title = session.title || 'Untitled Session';
-                const isCurrent = session.id === this.currentSessionId;
+                const isCurrent = session.id === userCurrentSession;
                 const statusEmoji = isCurrent ? '🟢' : '⚪';
                 response += `${statusEmoji} *${escMdRaw(title)}*\n`;
                 response += `\\- ID: \`${escMdRaw(session.id)}\`\n`;

package/dist/cli/commands/start.js

@@ -240,6 +240,7 @@ export const startCommand = new Command('start')
                 const telegram = new TelegramAdapter(oracle);
                 try {
                     await telegram.connect(config.channels.telegram.token, config.channels.telegram.allowedUsers || []);
+                    await telegram.restoreUserSessions();
                     ChannelRegistry.register(telegram);
                     adapters.push(telegram);
                 }
@@ -257,6 +258,7 @@ export const startCommand = new Command('start')
                 const discord = new DiscordAdapter(oracle);
                 try {
                     await discord.connect(config.channels.discord.token, config.channels.discord.allowedUsers || []);
+                    await discord.restoreUserSessions();
                     ChannelRegistry.register(discord);
                     adapters.push(discord);
                 }

package/dist/runtime/memory/sqlite.js

@@ -130,6 +130,14 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
           embedding_status TEXT CHECK (embedding_status IN ('none', 'pending', 'embedded', 'failed')) NOT NULL DEFAULT 'none'
         );
 
+        CREATE TABLE IF NOT EXISTS user_channel_sessions (
+          channel TEXT NOT NULL,
+          user_id TEXT NOT NULL,
+          session_id TEXT NOT NULL,
+          updated_at INTEGER NOT NULL,
+          PRIMARY KEY (channel, user_id)
+        );
+
         CREATE TABLE IF NOT EXISTS model_pricing (
           provider TEXT NOT NULL,
           model TEXT NOT NULL,
@@ -957,6 +965,50 @@ export class SQLiteChatMessageHistory extends BaseListChatMessageHistory {
     `).all();
         return sessions;
     }
+    /**
+     * Gets the session ID for a specific channel+user combination.
+     * Returns null if not found.
+     */
+    async getUserChannelSession(channel, userId) {
+        const result = this.db.prepare(`
+      SELECT session_id FROM user_channel_sessions
+      WHERE channel = ? AND user_id = ?
+    `).get(channel, userId);
+        return result ? result.session_id : null;
+    }
+    /**
+     * Sets or updates the session ID for a specific channel+user.
+     * Uses INSERT ... ON CONFLICT for upsert behavior.
+     */
+    async setUserChannelSession(channel, userId, sessionId) {
+        this.db.prepare(`
+      INSERT INTO user_channel_sessions (channel, user_id, session_id, updated_at)
+      VALUES (?, ?, ?, ?)
+      ON CONFLICT(channel, user_id) DO UPDATE SET
+        session_id = excluded.session_id,
+        updated_at = excluded.updated_at
+    `).run(channel, userId, sessionId, Date.now());
+    }
+    /**
+     * Lists all user sessions for a channel.
+     * Returns an array of {userId, sessionId} objects.
+     */
+    async listUserChannelSessions(channel) {
+        const rows = this.db.prepare(`
+      SELECT user_id, session_id FROM user_channel_sessions
+      WHERE channel = ?
+    `).all(channel);
+        return rows.map(row => ({ userId: row.user_id, sessionId: row.session_id }));
+    }
+    /**
+     * Removes the session mapping for a channel+user.
+     */
+    async deleteUserChannelSession(channel, userId) {
+        this.db.prepare(`
+      DELETE FROM user_channel_sessions
+      WHERE channel = ? AND user_id = ?
+    `).run(channel, userId);
+    }
     /**
      * Closes the database connection.
      * Should be called when the history object is no longer needed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "morpheus-cli",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "Morpheus is a local AI agent for developers, running as a CLI daemon that connects to LLMs, local tools, and MCPs, enabling interaction via Terminal, Telegram, and Discord. Inspired by the character Morpheus from *The Matrix*, the project acts as an intelligent orchestrator, bridging the gap between the developer and complex systems.",
   "bin": {
     "morpheus": "./bin/morpheus.js"