morpheus-cli 0.8.9 → 0.9.1

package/dist/channels/discord.js

@@ -1,4 +1,4 @@
-import { Client, GatewayIntentBits, Partials, Events, ChannelType, REST, Routes, SlashCommandBuilder, } from 'discord.js';
+import { Client, GatewayIntentBits, Partials, Events, ChannelType, REST, Routes, SlashCommandBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ComponentType, } from 'discord.js';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
@@ -26,6 +26,15 @@ const SLASH_COMMANDS = [
         .setName('newsession')
         .setDescription('Archive current session and start a new one')
         .setDMPermission(true),
+    new SlashCommandBuilder()
+        .setName('sessions')
+        .setDescription('List all sessions and switch between them')
+        .setDMPermission(true),
+    new SlashCommandBuilder()
+        .setName('session_switch')
+        .setDescription('Switch to a specific session')
+        .addStringOption(opt => opt.setName('id').setDescription('Session ID to switch to').setRequired(true))
+        .setDMPermission(true),
     new SlashCommandBuilder()
         .setName('chronos')
         .setDescription('Schedule a prompt for the Oracle')
@@ -103,6 +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;
     telephonist = null;
     telephonistProvider = null;
     telephonistModel = null;
@@ -178,8 +189,8 @@ export class DiscordAdapter {
                 return;
             this.display.log(`${message.author.tag}: ${text}`, { source: 'Discord' });
             try {
-                const sessionId = await this.history.getCurrentSessionOrCreate();
-                await this.oracle.setSessionId(sessionId);
+                const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
+                this.currentSessionId = sessionId;
                 const response = await this.oracle.chat(text, undefined, false, {
                     origin_channel: 'discord',
                     session_id: sessionId,
@@ -292,8 +303,8 @@ export class DiscordAdapter {
             // Show transcription
             await channel.send(`🎤 "${text}"`);
             // Process with Oracle
-            const sessionId = await this.history.getCurrentSessionOrCreate();
-            await this.oracle.setSessionId(sessionId);
+            const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
+            this.currentSessionId = sessionId;
             const response = await this.oracle.chat(text, usage, true, {
                 origin_channel: 'discord',
                 session_id: sessionId,
@@ -355,6 +366,12 @@ export class DiscordAdapter {
             case 'newsession':
                 await this.cmdNewSession(interaction);
                 break;
+            case 'sessions':
+                await this.cmdSessions(interaction);
+                break;
+            case 'session_switch':
+                await this.cmdSessionSwitch(interaction);
+                break;
             case 'chronos':
                 await this.cmdChronos(interaction);
                 break;
@@ -407,6 +424,8 @@ export class DiscordAdapter {
             '`/status` — Check Morpheus status',
             '`/stats` — Token usage statistics',
             '`/newsession` — Start a new session',
+            '`/sessions` — List all sessions (switch, archive, delete)',
+            '`/session_switch id:` — Switch to a specific session',
             '',
             '**Chronos (Scheduler)**',
             '`/chronos prompt: time:` — Schedule a job for the Oracle',
@@ -474,14 +493,122 @@ export class DiscordAdapter {
     async cmdNewSession(interaction) {
         try {
             const history = new SQLiteChatMessageHistory({ sessionId: '' });
-            await history.createNewSession();
+            const newSessionId = await history.createNewSession();
             history.close();
+            // Track the new session as the current one for this Discord channel
+            this.currentSessionId = newSessionId;
             await interaction.reply({ content: '✅ New session started.' });
         }
         catch (err) {
             await interaction.reply({ content: `Error: ${err.message}` });
         }
     }
+    async cmdSessions(interaction) {
+        try {
+            const history = new SQLiteChatMessageHistory({ sessionId: '' });
+            const sessions = (await history.listSessions()).filter((s) => !s.id.startsWith('chronos-job-') && !s.id.startsWith('sati-evaluation'));
+            history.close();
+            if (sessions.length === 0) {
+                await interaction.reply({ content: 'No sessions found.' });
+                return;
+            }
+            const lines = ['**Sessions:**\n'];
+            const rows = [];
+            for (const session of sessions) {
+                const title = session.title || 'Untitled Session';
+                const isCurrent = session.id === this.currentSessionId;
+                const icon = isCurrent ? '🟢' : '⚪';
+                const started = new Date(session.started_at).toLocaleString();
+                lines.push(`${icon} **${title}**`);
+                lines.push(`  ID: \`${session.id}\``);
+                lines.push(`  Started: ${started}\n`);
+                // Discord allows max 5 buttons per row, max 5 rows per message
+                if (rows.length < 5) {
+                    const btns = [];
+                    if (!isCurrent) {
+                        btns.push(new ButtonBuilder()
+                            .setCustomId(`session_switch_${session.id}`)
+                            .setLabel('Switch')
+                            .setStyle(ButtonStyle.Primary)
+                            .setEmoji('➡️'));
+                    }
+                    btns.push(new ButtonBuilder()
+                        .setCustomId(`session_archive_${session.id}`)
+                        .setLabel('Archive')
+                        .setStyle(ButtonStyle.Secondary)
+                        .setEmoji('📂'));
+                    btns.push(new ButtonBuilder()
+                        .setCustomId(`session_delete_${session.id}`)
+                        .setLabel('Delete')
+                        .setStyle(ButtonStyle.Danger)
+                        .setEmoji('🗑️'));
+                    rows.push(new ActionRowBuilder().addComponents(...btns));
+                }
+            }
+            const content = lines.join('\n').slice(0, 2000);
+            const reply = await interaction.reply({ content, components: rows, fetchReply: true });
+            // Collect button interactions for 60 seconds
+            const collector = reply.createMessageComponentCollector({
+                componentType: ComponentType.Button,
+                time: 60_000,
+            });
+            collector.on('collect', async (btn) => {
+                try {
+                    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 btn.reply({ content: `✅ Switched to session \`${sid}\`.`, ephemeral: true });
+                    }
+                    else if (btn.customId.startsWith('session_archive_')) {
+                        const sid = btn.customId.replace('session_archive_', '');
+                        const h = new SQLiteChatMessageHistory({ sessionId: '' });
+                        await h.archiveSession(sid);
+                        h.close();
+                        if (this.currentSessionId === sid)
+                            this.currentSessionId = null;
+                        await btn.reply({ content: `📂 Session \`${sid}\` archived.`, ephemeral: true });
+                    }
+                    else if (btn.customId.startsWith('session_delete_')) {
+                        const sid = btn.customId.replace('session_delete_', '');
+                        const h = new SQLiteChatMessageHistory({ sessionId: '' });
+                        await h.deleteSession(sid);
+                        h.close();
+                        if (this.currentSessionId === sid)
+                            this.currentSessionId = null;
+                        await btn.reply({ content: `🗑️ Session \`${sid}\` deleted.`, ephemeral: true });
+                    }
+                }
+                catch (err) {
+                    await btn.reply({ content: `Error: ${err.message}`, ephemeral: true }).catch(() => { });
+                }
+            });
+            collector.on('end', async () => {
+                try {
+                    await interaction.editReply({ components: [] });
+                }
+                catch { /* message may have been deleted */ }
+            });
+        }
+        catch (err) {
+            await interaction.reply({ content: `Error: ${err.message}` });
+        }
+    }
+    async cmdSessionSwitch(interaction) {
+        const sessionId = interaction.options.getString('id', true);
+        try {
+            const history = new SQLiteChatMessageHistory({ sessionId: '' });
+            await history.switchSession(sessionId);
+            history.close();
+            this.currentSessionId = sessionId;
+            await interaction.reply({ content: `✅ Switched to session \`${sessionId}\`.` });
+        }
+        catch (err) {
+            await interaction.reply({ content: `Error: ${err.message}` });
+        }
+    }
     async cmdChronos(interaction) {
         const prompt = interaction.options.getString('prompt', true);
         const timeExpr = interaction.options.getString('time', true);

package/dist/channels/telegram.js

@@ -144,6 +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;
     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)
@@ -230,8 +232,8 @@ export class TelegramAdapter {
                 try {
                     // Send "typing" status
                     await ctx.sendChatAction('typing');
-                    const sessionId = await this.history.getCurrentSessionOrCreate();
-                    await this.oracle.setSessionId(sessionId);
+                    const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
+                    this.currentSessionId = sessionId;
                     // Process with Agent
                     const response = await this.oracle.chat(text, undefined, false, {
                         origin_channel: 'telegram',
@@ -317,9 +319,9 @@ export class TelegramAdapter {
                     this.display.log(`Transcription success for @${user}: "${text}"`, { source: 'Telephonist', level: 'success' });
                     // Audit: record telephonist execution
                     try {
-                        const sessionId = await this.history.getCurrentSessionOrCreate();
+                        const auditSessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
                         AuditRepository.getInstance().insert({
-                            session_id: sessionId,
+                            session_id: auditSessionId,
                             event_type: 'telephonist',
                             agent: 'telephonist',
                             provider: config.audio.provider,
@@ -345,8 +347,8 @@ 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 = await this.history.getCurrentSessionOrCreate();
-                    await this.oracle.setSessionId(sessionId);
+                    const sessionId = this.currentSessionId ?? await this.history.getCurrentSessionOrCreate();
+                    this.currentSessionId = sessionId;
                     // Process with Agent
                     const response = await this.oracle.chat(text, usage, true, {
                         origin_channel: 'telegram',
@@ -380,9 +382,9 @@ 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 sessionId = await this.history.getCurrentSessionOrCreate();
+                        const auditSessionId = this.currentSessionId ?? 'default';
                         AuditRepository.getInstance().insert({
-                            session_id: sessionId,
+                            session_id: auditSessionId,
                             event_type: 'telephonist',
                             agent: 'telephonist',
                             provider: this.config.get().audio.provider,
@@ -428,12 +430,14 @@ export class TelegramAdapter {
                     return;
                 }
                 try {
-                    // Obter a sessão atual antes de alternar
+                    // Validate session exists and is usable
                     const history = new SQLiteChatMessageHistory({ sessionId: "" });
-                    // Alternar para a nova sessão
                     await history.switchSession(sessionId);
+                    history.close();
+                    // Track this session as the current one for this Telegram channel
+                    this.currentSessionId = sessionId;
                     await ctx.answerCbQuery();
-                    // Remover a mensagem anterior e enviar confirmação
+                    // Remove the previous message and send confirmation
                     if (ctx.updateType === 'callback_query') {
                         ctx.deleteMessage().catch(() => { });
                     }
@@ -1154,7 +1158,10 @@ export class TelegramAdapter {
     async handleApproveNewSessionCommand(ctx, user) {
         try {
             const history = new SQLiteChatMessageHistory({ sessionId: "" });
-            await history.createNewSession();
+            const newSessionId = await history.createNewSession();
+            history.close();
+            // Track the new session as the current one for this Telegram channel
+            this.currentSessionId = newSessionId;
         }
         catch (e) {
             await ctx.reply(`Error creating new session: ${e.message}`);
@@ -1167,21 +1174,20 @@ export class TelegramAdapter {
             // 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'));
             if (sessions.length === 0) {
-                await ctx.reply('No active or paused sessions found\\.', { parse_mode: 'MarkdownV2' });
+                await ctx.reply('No sessions found\\.', { parse_mode: 'MarkdownV2' });
                 return;
             }
             let response = '*Sessions:*\n\n';
             const keyboard = [];
             for (const session of sessions) {
                 const title = session.title || 'Untitled Session';
-                const statusEmoji = session.status === 'active' ? '🟢' : '🟡';
+                const isCurrent = session.id === this.currentSessionId;
+                const statusEmoji = isCurrent ? '🟢' : '⚪';
                 response += `${statusEmoji} *${escMdRaw(title)}*\n`;
                 response += `\\- ID: \`${escMdRaw(session.id)}\`\n`;
-                response += `\\- Status: ${escMdRaw(session.status)}\n`;
                 response += `\\- Started: ${escMdRaw(new Date(session.started_at).toLocaleString())}\n\n`;
-                // Adicionar botão inline para alternar para esta sessão
                 const sessionButtons = [];
-                if (session.status !== 'active') {
+                if (!isCurrent) {
                     sessionButtons.push({
                         text: `➡️ Switch`,
                         callback_data: `switch_session_${session.id}`

package/dist/http/api.js

@@ -61,8 +61,7 @@ export function createApiRouter(oracle, chronosWorker) {
     });
     router.post('/sessions', async (req, res) => {
         try {
-            await history.createNewSession();
-            const newSessionId = await history.getCurrentSessionOrCreate(); // Should be the new one
+            const newSessionId = await history.createNewSession();
             res.json({ success: true, id: newSessionId, message: 'New session started' });
         }
         catch (err) {
@@ -248,7 +247,7 @@ export function createApiRouter(oracle, chronosWorker) {
         }
         try {
             const { message, sessionId } = parsed.data;
-            await oracle.setSessionId(sessionId);
+            // Session is passed via taskContext — no need to mutate global Oracle state.
             const response = await oracle.chat(message, undefined, false, {
                 origin_channel: 'ui',
                 session_id: sessionId,

package/dist/runtime/__tests__/keymaker.test.js

@@ -32,12 +32,15 @@ vi.mock('../display.js', () => ({
         })),
     },
 }));
-vi.mock('../../devkit/index.js', () => ({
+vi.mock('morpheus-devkit', () => ({
     buildDevKit: vi.fn(() => [
         { name: 'fs_read', description: 'Read file' },
         { name: 'shell_exec', description: 'Execute shell command' },
     ]),
 }));
+vi.mock('../devkit-instrument.js', () => ({
+    instrumentDevKitTools: vi.fn((tools) => tools),
+}));
 vi.mock('../tools/factory.js', () => ({
     Construtor: {
         create: vi.fn(() => Promise.resolve([
@@ -97,7 +100,7 @@ describe('Keymaker', () => {
     describe('initialize()', () => {
         it('should initialize agent with all tools', async () => {
             const { ProviderFactory } = await import('../providers/factory.js');
-            const { buildDevKit } = await import('../../devkit/index.js');
+            const { buildDevKit } = await import('morpheus-devkit');
             const { Construtor } = await import('../tools/factory.js');
             const keymaker = new Keymaker('test-skill', '# Instructions');
             await keymaker.initialize();

package/dist/runtime/apoc.js

@@ -3,7 +3,8 @@ import { ConfigManager } from "../config/manager.js";
 import { ProviderFactory } from "./providers/factory.js";
 import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
-import { buildDevKit } from "../devkit/index.js";
+import { buildDevKit } from "morpheus-devkit";
+import { instrumentDevKitTools } from "./devkit-instrument.js";
 import { extractRawUsage, persistAgentMessage, buildAgentResult, emitToolAuditEvents } from "./subagent-utils.js";
 import { buildDelegationTool } from "./tools/delegation-utils.js";
 /**
@@ -47,9 +48,9 @@ export class Apoc {
         const devkit = ConfigManager.getInstance().getDevKitConfig();
         const timeout_ms = devkit.timeout_ms || this.config.apoc?.timeout_ms || 30_000;
         const personality = this.config.apoc?.personality || 'pragmatic_dev';
-        // Import all devkit tool factories (side-effect registration)
-        await import("../devkit/index.js");
-        const tools = buildDevKit({
+        // Import morpheus-devkit to trigger side-effect tool registration
+        await import("morpheus-devkit");
+        const rawTools = buildDevKit({
             working_dir: devkit.sandbox_dir || process.cwd(),
             allowed_commands: devkit.allowed_shell_commands || [],
             timeout_ms,
@@ -59,9 +60,8 @@ export class Apoc {
             enable_shell: devkit.enable_shell,
             enable_git: devkit.enable_git,
             enable_network: devkit.enable_network,
-            getSessionId: () => Apoc.currentSessionId,
-            getAgent: () => 'apoc',
         });
+        const tools = instrumentDevKitTools(rawTools, () => Apoc.currentSessionId, () => 'apoc');
         this.display.log(`Apoc initialized with ${tools.length} DevKit tools (sandbox_dir: ${devkit.sandbox_dir}, personality: ${personality})`, { source: "Apoc" });
         try {
             this.agent = await ProviderFactory.createBare(apocConfig, tools);
@@ -259,7 +259,7 @@ ${context ? `CONTEXT FROM ORACLE:\n${context}` : ""}
         try {
             const inputCount = messages.length;
             const startMs = Date.now();
-            const response = await this.agent.invoke({ messages }, { recursionLimit: 100 });
+            const response = await this.agent.invoke({ messages }, { recursionLimit: 50 });
             const durationMs = Date.now() - startMs;
             const apocConfig = this.config.apoc || this.config.llm;
             const lastMessage = response.messages[response.messages.length - 1];

package/dist/{devkit/registry.js → runtime/devkit-instrument.js}

@@ -1,15 +1,4 @@
-import { AuditRepository } from '../runtime/audit/repository.js';
-const factories = [];
-export function registerToolFactory(factory, category = 'system') {
-    factories.push({ category, factory });
-}
-/** Categories that can be toggled off via DevKit config */
-const TOGGLEABLE_CATEGORIES = {
-    filesystem: 'enable_filesystem',
-    shell: 'enable_shell',
-    git: 'enable_git',
-    network: 'enable_network',
-};
+import { AuditRepository } from './audit/repository.js';
 /**
  * Wraps a StructuredTool to record audit events on each invocation.
  * The `getSessionId` getter is called at invocation time so it reflects
@@ -51,22 +40,9 @@ function instrumentTool(tool, getSessionId, getAgent) {
     return tool;
 }
 /**
- * Builds the full DevKit tool set for a given context.
- * Each factory receives the context (working_dir, allowed_commands, etc.)
- * and returns tools with the context captured in closure.
- * Disabled categories are filtered out based on context flags.
- * All tools are wrapped with audit instrumentation.
+ * Wraps all DevKit tools with audit instrumentation.
+ * Call this after buildDevKit() to add Morpheus audit tracking.
  */
-export function buildDevKit(ctx) {
-    const getSessionId = ctx.getSessionId ?? (() => undefined);
-    const getAgent = ctx.getAgent ?? (() => 'apoc');
-    return factories
-        .filter(({ category }) => {
-        const ctxKey = TOGGLEABLE_CATEGORIES[category];
-        if (!ctxKey)
-            return true; // non-toggleable categories always load
-        return ctx[ctxKey] !== false;
-    })
-        .flatMap(({ factory }) => factory(ctx))
-        .map(tool => instrumentTool(tool, getSessionId, getAgent));
+export function instrumentDevKitTools(tools, getSessionId, getAgent) {
+    return tools.map(tool => instrumentTool(tool, getSessionId, getAgent));
 }

package/dist/runtime/keymaker.js

@@ -3,7 +3,8 @@ import { ConfigManager } from "../config/manager.js";
 import { ProviderFactory } from "./providers/factory.js";
 import { ProviderError } from "./errors.js";
 import { DisplayManager } from "./display.js";
-import { buildDevKit } from "../devkit/index.js";
+import { buildDevKit } from "morpheus-devkit";
+import { instrumentDevKitTools } from "./devkit-instrument.js";
 import { Construtor } from "./tools/factory.js";
 import { morpheusTools } from "./tools/index.js";
 import { SkillRegistry } from "./skills/registry.js";
@@ -36,8 +37,8 @@ export class Keymaker {
         // Build DevKit tools (filesystem, shell, git, browser, network, etc.)
         const devkit = ConfigManager.getInstance().getDevKitConfig();
         const timeout_ms = devkit.timeout_ms || 30_000;
-        await import("../devkit/index.js");
-        const devKitTools = buildDevKit({
+        await import("morpheus-devkit");
+        const devKitTools = instrumentDevKitTools(buildDevKit({
             working_dir: devkit.sandbox_dir || process.cwd(),
             allowed_commands: devkit.allowed_shell_commands || [],
             timeout_ms,
@@ -47,7 +48,7 @@ export class Keymaker {
             enable_shell: devkit.enable_shell,
             enable_git: devkit.enable_git,
             enable_network: devkit.enable_network,
-        });
+        }), () => undefined, () => 'keymaker');
         // Load MCP tools from configured servers
         const mcpTools = await Construtor.create();
         // Combine all tools
@@ -116,7 +117,7 @@ CRITICAL — NEVER FABRICATE DATA:
                 origin_user_id: taskContext?.origin_user_id,
             };
             const startMs = Date.now();
-            const response = await TaskRequestContext.run(invokeContext, () => this.agent.invoke({ messages }, { recursionLimit: 100 }));
+            const response = await TaskRequestContext.run(invokeContext, () => this.agent.invoke({ messages }, { recursionLimit: 50 }));
             const durationMs = Date.now() - startMs;
             const lastMessage = response.messages[response.messages.length - 1];
             const content = typeof lastMessage.content === "string"

package/dist/runtime/memory/sati/service.js

@@ -97,7 +97,7 @@ export class SatiService {
                 console.warn('[SatiService] Failed to persist input log:', e);
             }
             const satiStartMs = Date.now();
-            const response = await agent.invoke({ messages }, { recursionLimit: 100 });
+            const response = await agent.invoke({ messages }, { recursionLimit: 50 });
             const satiDurationMs = Date.now() - satiStartMs;
             const lastMessage = response.messages[response.messages.length - 1];
             let content = lastMessage.content.toString();