From ba05cae0f14f7cf30bc78c29974c09228f7f198b Mon Sep 17 00:00:00 2001
From: Burhanverse <burhanverse@gmail.com>
Date: Thu, 4 Sep 2025 23:45:12 +0530
Subject: [PATCH 1/2] Checkpoint from VS Code for coding agent session

---
 src/services/publisher.ts       | 10 +++++++---
 src/services/userBotRegistry.ts |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/services/publisher.ts b/src/services/publisher.ts
index c7e2bf3..442cdf4 100644
--- a/src/services/publisher.ts
+++ b/src/services/publisher.ts
@@ -4,7 +4,7 @@ import { logger } from "../utils/logger";
 import { InlineKeyboard, Bot } from "grammy";
 import { ChannelModel, ChannelDoc } from "../models/Channel";
 import { UserBotModel } from "../models/UserBot";
-import { getOrCreateUserBot, forceStopBot } from "./userBotRegistry";
+import { getActiveBotInstance } from "./userBotRegistry";
 import { BotContext } from "../telegram/bot";
 import { decrypt } from "../utils/crypto";
 
@@ -47,8 +47,12 @@ export async function publishPersonal(
       "Publisher: creating API-only bot & checking permissions",
     );
     
-  // Always use the polling bot instance for personal bots
-  const personalBot = await getOrCreateUserBot(userBotRecord.botId);
+    const personalBot = getActiveBotInstance(userBotRecord.botId);
+    if (!personalBot) {
+      throw new Error(
+        "Personal bot inactive. Start or re-add your personal bot first (use /mybot to verify status).",
+      );
+    }
     
     const botMember = await personalBot.api.getChatMember(
       chatId,
diff --git a/src/services/userBotRegistry.ts b/src/services/userBotRegistry.ts
index 12522c9..1874729 100644
--- a/src/services/userBotRegistry.ts
+++ b/src/services/userBotRegistry.ts
@@ -57,6 +57,14 @@ function initial(): SessionData {
   return {};
 }
 
+export function getActiveBotInstance(botId: number): Bot<BotContext> | undefined {
+  const meta = activeBots.get(botId);
+  if (meta && meta.isRunning && meta.bot.isRunning()) {
+    return meta.bot;
+  }
+  return undefined;
+}
+
 export async function getOrCreateUserBot(botId: number) {
   // Global lock to prevent any concurrent bot creation
   while (globalCreationLock) {

From 07cf4035d636ee7b3a2394cbb899a976f79b5ca0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 4 Sep 2025 18:15:21 +0000
Subject: [PATCH 2/2] Initial plan