refactor(services): remove SessionManager and update TelegramService to handle session management directly

Author: MarvelNwachukwu

src/services/SessionManager.ts

@@ -4,9 +4,12 @@
  */
 
 import {
+	type BaseSessionService,
 	createSamplingHandler,
+	type EnhancedRunner,
 	extractTextFromContent,
 	type LlmRequest,
+	type MemoryService,
 } from "@iqai/adk";
 import { createClawdAgent } from "../agents/agent.js";
 import { getTelegramAgent } from "../agents/telegram-agent/agent.js";
@@ -19,7 +22,6 @@ import {
 	initScheduler,
 	stopScheduler,
 } from "./SchedulerService.js";
-import { sessionManager } from "./SessionManager.js";
 
 const log = createLogger("Telegram");
 
@@ -227,51 +229,122 @@ adk-claw pairing approve telegram ${code}
 Code expires in 1 hour.`;
 }
 
-const commands: Record<string, CommandHandler> = {
-	"/start": async (chatId, userId) => {
-		const config = getRawConfig();
+/**
+ * Format duration between a unix timestamp (seconds) and now
+ */
+function formatDuration(startTimestamp: number): string {
+	const diffMs = Date.now() - startTimestamp * 1000;
+	const minutes = Math.floor(diffMs / 60000);
+	const hours = Math.floor(minutes / 60);
+
+	if (hours > 0) {
+		return `${hours}h ${minutes % 60}m`;
+	}
+	return `${minutes}m`;
+}
+
+/**
+ * Create command handlers bound to ADK session lifecycle.
+ * Uses sessionService.createSession / deleteSession and runner.setSession
+ * to properly create/destroy ADK sessions instead of local state.
+ */
+function createCommands(deps: {
+	runner: EnhancedRunner;
+	sessionService: BaseSessionService;
+	memoryService?: MemoryService;
+}): Record<string, CommandHandler> {
+	const { runner, sessionService, memoryService } = deps;
+
+	return {
+		"/start": async (_chatId, userId) => {
+			const config = getRawConfig();
 
-		// Check if user is already allowed
-		if (isAllowed("telegram", userId)) {
-			return `👋 Welcome back!
+			// Check if user is already allowed
+			if (isAllowed("telegram", userId)) {
+				return `👋 Welcome back!
 
 I'm ${config.agent.name}, your personal AI assistant.
 
 Commands:
 /new - Save session & start fresh
 /reset - Clear session without saving
 /help - Show available commands`;
-		}
+			}
 
-		// User needs pairing
-		return getPairingResponse(userId, undefined, chatId);
-	},
+			// User needs pairing
+			return getPairingResponse(userId, undefined, _chatId);
+		},
 
-	"/new": async (chatId, _userId) => {
-		const summary = await sessionManager.saveAndReset(chatId);
-		return `✅ Session saved to memory.
+		"/new": async (_chatId, _userId) => {
+			const currentSession = runner.getSession();
+
+			// Save current session to memory if it has events
+			if (memoryService && currentSession.events.length > 0) {
+				const freshSession = await sessionService.getSession(
+					currentSession.appName,
+					currentSession.userId,
+					currentSession.id,
+				);
+				if (freshSession) {
+					await memoryService.addSessionToMemory(freshSession);
+				}
+			}
+
+			// Derive summary from ADK session events
+			const eventCount = currentSession.events.length;
+			let summary = "No conversation to save.";
+			if (eventCount > 0) {
+				const firstTimestamp = currentSession.events[0].timestamp;
+				const duration = formatDuration(firstTimestamp);
+				summary = `${eventCount} events over ${duration}`;
+			}
+
+			// Create a new ADK session and swap it into the runner
+			const newSession = await sessionService.createSession(
+				currentSession.appName,
+				currentSession.userId,
+			);
+			runner.setSession(newSession);
+
+			return `✅ Session saved to memory.
 
 📝 Summary: ${summary}
 
 🆕 New session started!`;
-	},
+		},
 
-	"/reset": async (chatId, _userId) => {
-		sessionManager.reset(chatId);
-		return "🔄 Session cleared (not saved). Fresh start!";
-	},
+		"/reset": async (_chatId, _userId) => {
+			const currentSession = runner.getSession();
 
-	"/help": async (_chatId, _userId) => {
-		return `📚 Available commands:
+			// Delete the old session without saving to memory
+			await sessionService.deleteSession(
+				currentSession.appName,
+				currentSession.userId,
+				currentSession.id,
+			);
+
+			// Create a fresh ADK session
+			const newSession = await sessionService.createSession(
+				currentSession.appName,
+				currentSession.userId,
+			);
+			runner.setSession(newSession);
+
+			return "🔄 Session cleared (not saved). Fresh start!";
+		},
+
+		"/help": async (_chatId, _userId) => {
+			return `📚 Available commands:
 
 /start - Start the bot and pair
 /new - Save session & start fresh
 /reset - Clear session without saving
 /help - Show this help message
 
 Just send a message to chat with me!`;
-	},
-};
+		},
+	};
+}
 
 /**
  * Start the Telegram bot with MCP sampling
@@ -291,10 +364,8 @@ export async function startTelegramBot(): Promise<void> {
 			channel: "telegram",
 		});
 
-	// Wire memory service into session manager for /new command
-	if (memoryService) {
-		sessionManager.setDeps(memoryService, sessionService, session);
-	}
+	// Create command handlers bound to ADK session lifecycle
+	const commands = createCommands({ runner, sessionService, memoryService });
 
 	// Create sampling handler with command detection
 	const samplingHandler = createSamplingHandler(
@@ -327,17 +398,9 @@ export async function startTelegramBot(): Promise<void> {
 				registerUserCommands(config.telegramBotToken, chatId);
 			}
 
-			// Track in session
-			sessionManager.getOrCreate(chatId, userId);
-			sessionManager.addMessage(chatId, "user", messageText);
-
-			// Get response from agent
+			// Get response from agent (ADK tracks events in session automatically)
 			try {
 				const response = await runner.ask(messageText);
-
-				// Track response
-				sessionManager.addMessage(chatId, "assistant", response);
-
 				return response;
 			} catch (error) {
 				log.error(

src/services/TelegramService.ts

@@ -3,5 +3,4 @@
  */
 
 export { initScheduler, stopScheduler } from "./SchedulerService.js";
-export { sessionManager } from "./SessionManager.js";
 export { startTelegramBot } from "./TelegramService.js";