opencode-telegram-bot 1.1.0 → 1.1.1

package/README.md

@@ -280,7 +280,7 @@ You:  [tap "Auth refactoring"]
 Bot:  Switched to session: Auth refactoring
 ```
 
-The `/sessions` list only shows sessions created by the Telegram bot, not sessions from other OpenCode clients (like the TUI). You cannot delete the currently active session -- use `/new` first.
+The `/sessions` list shows sessions created by the Telegram bot. At the bottom of the list, a **"Show all sessions"** button lets you discover sessions created by other OpenCode clients (like the TUI via `opencode attach`). Tapping an external session adopts it and switches to it. You cannot delete the currently active session -- use `/new` first.
 
 ## Session Persistence
 

package/dist/index.js

@@ -20923,7 +20923,13 @@ async function startTelegram(options) {
         try {
             const sessions = await getKnownSessions();
             if (sessions.length === 0) {
-                await ctx.reply("No sessions found.");
+                await ctx.reply("No sessions found.\n\nYou can discover sessions created outside this bot:", {
+                    reply_markup: {
+                        inline_keyboard: [
+                            [{ text: "Show all sessions", callback_data: "sessions:all" }],
+                        ],
+                    },
+                });
                 return;
             }
             const activeSession = sessions.find((session) => session.id === activeSessionId);
@@ -20932,25 +20938,33 @@ async function startTelegram(options) {
                 msgLines.push(`Current session: ${activeSession.title}`);
             }
             const otherSessions = sessions.filter((session) => session.id !== activeSessionId);
-            if (otherSessions.length === 0) {
+            const keyboard = [];
+            if (otherSessions.length > 0) {
+                msgLines.push("Tap a session to switch or delete.");
+                otherSessions.forEach((session) => {
+                    keyboard.push([
+                        {
+                            text: session.title,
+                            callback_data: `switch:${session.id}`,
+                        },
+                        {
+                            text: "Delete",
+                            callback_data: `delete:${session.id}`,
+                        },
+                    ]);
+                });
+            }
+            else {
                 msgLines.push("This is your only session.");
-                await ctx.reply(msgLines.join("\n"));
-                return;
             }
-            msgLines.push("Tap a session to switch or delete.");
-            const keyboard = [];
-            otherSessions.forEach((session) => {
-                keyboard.push([
-                    {
-                        text: session.title,
-                        callback_data: `switch:${session.id}`,
-                    },
-                    {
-                        text: "Delete",
-                        callback_data: `delete:${session.id}`,
-                    },
-                ]);
-            });
+            // Always show "Show all sessions" button to discover sessions
+            // created outside the Telegram bot (e.g. via opencode TUI)
+            keyboard.push([
+                {
+                    text: "Show all sessions",
+                    callback_data: "sessions:all",
+                },
+            ]);
             await ctx.reply(msgLines.join("\n"), {
                 reply_markup: {
                     inline_keyboard: keyboard,
@@ -21110,6 +21124,83 @@ async function startTelegram(options) {
             await answerAndEdit(ctx, "Failed to delete session.");
         }
     });
+    // Handle "Show all sessions" button - list sessions not tracked by the bot
+    bot.action("sessions:all", async (ctx) => {
+        const chatId = getChatIdFromContext(ctx);
+        if (!chatId)
+            return;
+        try {
+            // Delete the button message
+            try {
+                await ctx.deleteMessage();
+            }
+            catch {
+                // Ignore if already deleted
+            }
+            await ctx.answerCbQuery();
+            const list = await client.session.list({});
+            const allSessions = (list.data || [])
+                .filter((s) => !knownSessionIds.has(s.id) && !s.parentID)
+                .sort((a, b) => b.time.updated - a.time.updated);
+            if (allSessions.length === 0) {
+                await ctx.reply("No other sessions found.");
+                return;
+            }
+            const keyboard = [];
+            allSessions.forEach((session) => {
+                keyboard.push([
+                    {
+                        text: session.title,
+                        callback_data: `adopt:${session.id}`,
+                    },
+                ]);
+            });
+            await ctx.reply("Sessions created outside this bot.\nTap to adopt and switch:", {
+                reply_markup: {
+                    inline_keyboard: keyboard,
+                },
+            });
+        }
+        catch (err) {
+            console.error("[Telegram] Error listing all sessions:", err);
+            await ctx.reply("Failed to list sessions.");
+        }
+    });
+    // Handle adopt button - adopt an external session and switch to it
+    bot.action(/^adopt:(.+)$/, async (ctx) => {
+        const chatId = getChatIdFromContext(ctx);
+        const sessionId = ctx.match?.[1];
+        if (!chatId || !sessionId)
+            return;
+        try {
+            // Verify the session still exists on the server
+            const list = await client.session.list({});
+            const allSessions = (list.data || []);
+            const match = allSessions.find((s) => s.id === sessionId);
+            if (!match) {
+                await answerAndEdit(ctx, "Session not found. It may have been deleted.");
+                return;
+            }
+            // Delete the button message
+            try {
+                await ctx.deleteMessage();
+            }
+            catch {
+                // Ignore if already deleted
+            }
+            await ctx.answerCbQuery();
+            // Adopt: add to known sessions and switch to it
+            knownSessionIds.add(match.id);
+            chatSessions.set(chatId, match.id);
+            saveSessions();
+            console.log(`[Telegram] Adopted and switched chat ${chatId} to session ${match.id}`);
+            await ctx.reply(`Adopted and switched to session: ${match.title}`);
+        }
+        catch (err) {
+            console.error("[Telegram] Error adopting session:", err);
+            await answerAndEdit(ctx, "Failed to adopt session.");
+        }
+    });
     // Handle /verbose command - toggle verbose mode for this chat
     // Usage: /verbose, /verbose on, /verbose off
     bot.command("verbose", (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-telegram-bot",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "description": "Telegram bot that forwards messages to an OpenCode agent",
   "main": "./dist/index.js",