@openacp/cli 0.2.28 → 0.2.30

package/dist/{chunk-6HORD4FS.js → chunk-WKHCVK5P.js}

@@ -1,7 +1,7 @@
 import {
   createChildLogger,
   createSessionLogger
-} from "./chunk-MNJDYDGH.js";
+} from "./chunk-JOSJGZGF.js";
 
 // src/core/streams.ts
 function nodeToWebWritable(nodeStream) {
@@ -304,6 +304,8 @@ ${stderr}`
             event = {
               type: "tool_update",
               id: update.toolCallId,
+              name: update.title ?? void 0,
+              kind: update.kind ?? void 0,
               status: update.status ?? "pending",
               content: update.content ?? void 0,
               rawInput: update.rawInput ?? void 0,
@@ -691,6 +693,16 @@ var SessionManager = class {
       await this.store.save({ ...record, status });
     }
   }
+  async updateSessionName(sessionId, name) {
+    if (!this.store) return;
+    const record = this.store.get(sessionId);
+    if (record) {
+      await this.store.save({ ...record, name });
+    }
+  }
+  getSessionRecord(sessionId) {
+    return this.store?.get(sessionId);
+  }
   async cancelSession(sessionId) {
     const session = this.sessions.get(sessionId);
     if (session) {
@@ -871,17 +883,21 @@ function extractFileInfo(name, kind, content, rawInput, meta) {
   let info = null;
   if (meta) {
     const m = meta;
-    const file = m?.claudeCode?.toolResponse?.file;
+    const tr = m?.claudeCode?.toolResponse;
+    const file = tr?.file;
     if (file?.filePath && file?.content) {
       info = { filePath: file.filePath, content: file.content };
     }
+    if (!info && tr?.filePath && tr?.content) {
+      info = { filePath: tr.filePath, content: tr.content };
+    }
   }
   if (!info && rawInput) {
     const ri = rawInput;
     const filePath = ri?.file_path || ri?.filePath || ri?.path;
     if (typeof filePath === "string") {
       const parsed = content ? parseContent(content) : null;
-      info = { filePath, content: parsed?.content || ri?.content };
+      info = { filePath, content: parsed?.content || ri?.content, oldContent: parsed?.oldContent };
     }
   }
   if (!info && content) {
@@ -1144,6 +1160,7 @@ var OpenACPCore = class {
       case "tool_call": {
         const metadata = {
           id: event.id,
+          name: event.name,
           kind: event.kind,
           status: event.status,
           content: event.content,
@@ -1155,6 +1172,8 @@ var OpenACPCore = class {
       case "tool_update": {
         const metadata = {
           id: event.id,
+          name: event.name,
+          kind: event.kind,
           status: event.status,
           content: event.content
         };
@@ -1538,6 +1557,7 @@ function extractContentText(content, depth = 0) {
     if (c.type === "text" && typeof c.text === "string") return c.text;
     if (typeof c.text === "string") return c.text;
     if (typeof c.content === "string") return c.content;
+    if (c.content && typeof c.content === "object") return extractContentText(c.content, depth + 1);
     if (c.input) return extractContentText(c.input, depth + 1);
     if (c.output) return extractContentText(c.output, depth + 1);
     const keys = Object.keys(c).filter((k) => k !== "type");
@@ -1554,12 +1574,14 @@ function formatToolCall(tool) {
   const si = STATUS_ICON[tool.status || ""] || "\u{1F527}";
   const ki = KIND_ICON[tool.kind || ""] || "\u{1F6E0}\uFE0F";
   let text = `${si} ${ki} <b>${escapeHtml(tool.name || "Tool")}</b>`;
-  const details = extractContentText(tool.content);
-  if (details) {
-    text += `
+  text += formatViewerLinks(tool.viewerLinks, tool.viewerFilePath);
+  if (!tool.viewerLinks) {
+    const details = extractContentText(tool.content);
+    if (details) {
+      text += `
 <pre>${escapeHtml(truncateContent(details))}</pre>`;
+    }
   }
-  text += formatViewerLinks(tool.viewerLinks, tool.viewerFilePath);
   return text;
 }
 function formatToolUpdate(update) {
@@ -1567,12 +1589,14 @@ function formatToolUpdate(update) {
   const ki = KIND_ICON[update.kind || ""] || "\u{1F6E0}\uFE0F";
   const name = update.name || "Tool";
   let text = `${si} ${ki} <b>${escapeHtml(name)}</b>`;
-  const details = extractContentText(update.content);
-  if (details) {
-    text += `
+  text += formatViewerLinks(update.viewerLinks, update.viewerFilePath);
+  if (!update.viewerLinks) {
+    const details = extractContentText(update.content);
+    if (details) {
+      text += `
 <pre>${escapeHtml(truncateContent(details))}</pre>`;
+    }
   }
-  text += formatViewerLinks(update.viewerLinks, update.viewerFilePath);
   return text;
 }
 function formatViewerLinks(links, filePath) {
@@ -1623,95 +1647,69 @@ function splitMessage(text, maxLength = 4096) {
 }
 
 // src/adapters/telegram/streaming.ts
-var nextDraftId = 1;
+var FLUSH_INTERVAL = 5e3;
 var MessageDraft = class {
-  // Only set in fallback mode (sendMessageDraft returns true, not Message)
-  constructor(bot, chatId, threadId, throttleMs = 200, sendQueue) {
+  constructor(bot, chatId, threadId, sendQueue, sessionId) {
     this.bot = bot;
     this.chatId = chatId;
     this.threadId = threadId;
     this.sendQueue = sendQueue;
-    this.draftId = nextDraftId++;
-    this.minInterval = throttleMs;
+    this.sessionId = sessionId;
   }
-  draftId;
   buffer = "";
-  lastFlush = 0;
+  messageId;
+  firstFlushPending = false;
   flushTimer;
   flushPromise = Promise.resolve();
-  minInterval;
-  useFallback = false;
-  messageId;
+  lastSentBuffer = "";
   append(text) {
     this.buffer += text;
     this.scheduleFlush();
   }
   scheduleFlush() {
-    const now = Date.now();
-    const elapsed = now - this.lastFlush;
-    if (elapsed >= this.minInterval) {
+    if (this.flushTimer) return;
+    this.flushTimer = setTimeout(() => {
+      this.flushTimer = void 0;
       this.flushPromise = this.flushPromise.then(() => this.flush()).catch(() => {
       });
-    } else if (!this.flushTimer) {
-      this.flushTimer = setTimeout(() => {
-        this.flushTimer = void 0;
-        this.flushPromise = this.flushPromise.then(() => this.flush()).catch(() => {
-        });
-      }, this.minInterval - elapsed);
-    }
+    }, FLUSH_INTERVAL);
   }
   async flush() {
     if (!this.buffer) return;
-    this.lastFlush = Date.now();
+    if (this.firstFlushPending) return;
     const html = markdownToTelegramHtml(this.buffer);
     const truncated = html.length > 4096 ? html.slice(0, 4090) + "\n..." : html;
     if (!truncated) return;
-    if (this.useFallback) {
-      await this.flushFallback(truncated);
-      return;
-    }
-    try {
-      await this.bot.api.sendMessageDraft(this.chatId, this.draftId, truncated, {
-        message_thread_id: this.threadId,
-        parse_mode: "HTML"
-      });
-    } catch {
-      this.useFallback = true;
-      this.minInterval = 1e3;
-      await this.flushFallback(truncated);
-    }
-  }
-  async flushFallback(html) {
-    const exec = this.sendQueue ? (fn) => this.sendQueue.enqueue(fn) : (fn) => fn();
-    try {
-      if (!this.messageId) {
-        const msg = await exec(
-          () => this.bot.api.sendMessage(this.chatId, html, {
+    if (!this.messageId) {
+      this.firstFlushPending = true;
+      try {
+        const result = await this.sendQueue.enqueue(
+          () => this.bot.api.sendMessage(this.chatId, truncated, {
             message_thread_id: this.threadId,
             parse_mode: "HTML",
             disable_notification: true
-          })
-        );
-        this.messageId = msg.message_id;
-      } else {
-        await exec(
-          () => this.bot.api.editMessageText(this.chatId, this.messageId, html, {
-            parse_mode: "HTML"
-          })
+          }),
+          { type: "other" }
         );
+        if (result) {
+          this.messageId = result.message_id;
+          this.lastSentBuffer = this.buffer;
+        }
+      } catch {
+      } finally {
+        this.firstFlushPending = false;
       }
-    } catch {
+    } else {
       try {
-        if (!this.messageId) {
-          const msg = await exec(
-            () => this.bot.api.sendMessage(this.chatId, this.buffer.slice(0, 4096), {
-              message_thread_id: this.threadId,
-              disable_notification: true
-            })
-          );
-          this.messageId = msg.message_id;
-        }
+        await this.sendQueue.enqueue(
+          () => this.bot.api.editMessageText(this.chatId, this.messageId, truncated, {
+            parse_mode: "HTML"
+          }),
+          { type: "text", key: this.sessionId }
+        );
+        this.lastSentBuffer = this.buffer;
       } catch {
+        this.messageId = void 0;
       }
     }
   }
@@ -1722,31 +1720,47 @@ var MessageDraft = class {
     }
     await this.flushPromise;
     if (!this.buffer) return this.messageId;
+    if (this.messageId && this.buffer === this.lastSentBuffer) {
+      return this.messageId;
+    }
     const html = markdownToTelegramHtml(this.buffer);
     const chunks = splitMessage(html);
     try {
       for (let i = 0; i < chunks.length; i++) {
         const chunk = chunks[i];
         if (i === 0 && this.messageId) {
-          await this.bot.api.editMessageText(this.chatId, this.messageId, chunk, {
-            parse_mode: "HTML"
-          });
+          await this.sendQueue.enqueue(
+            () => this.bot.api.editMessageText(this.chatId, this.messageId, chunk, {
+              parse_mode: "HTML"
+            }),
+            { type: "other" }
+          );
         } else {
-          const msg = await this.bot.api.sendMessage(this.chatId, chunk, {
-            message_thread_id: this.threadId,
-            parse_mode: "HTML",
-            disable_notification: true
-          });
-          this.messageId = msg.message_id;
+          const msg = await this.sendQueue.enqueue(
+            () => this.bot.api.sendMessage(this.chatId, chunk, {
+              message_thread_id: this.threadId,
+              parse_mode: "HTML",
+              disable_notification: true
+            }),
+            { type: "other" }
+          );
+          if (msg) {
+            this.messageId = msg.message_id;
+          }
         }
       }
     } catch {
-      try {
-        await this.bot.api.sendMessage(this.chatId, this.buffer.slice(0, 4096), {
-          message_thread_id: this.threadId,
-          disable_notification: true
-        });
-      } catch {
+      if (this.buffer !== this.lastSentBuffer) {
+        try {
+          await this.sendQueue.enqueue(
+            () => this.bot.api.sendMessage(this.chatId, this.buffer.slice(0, 4096), {
+              message_thread_id: this.threadId,
+              disable_notification: true
+            }),
+            { type: "other" }
+          );
+        } catch {
+        }
       }
     }
     return this.messageId;
@@ -2155,7 +2169,7 @@ ${escapeHtml(request.description)}`,
       }
     );
     const deepLink = buildDeepLink(this.chatId, msg.message_id);
-    await this.sendNotification({
+    void this.sendNotification({
       sessionId: session.id,
       sessionName: session.name,
       type: "permission",
@@ -2248,34 +2262,67 @@ function redirectToAssistant(chatId, assistantTopicId) {
 
 // src/adapters/telegram/send-queue.ts
 var TelegramSendQueue = class {
-  queue = Promise.resolve();
+  items = [];
+  processing = false;
   lastExec = 0;
   minInterval;
-  constructor(minInterval = 100) {
+  constructor(minInterval = 3e3) {
     this.minInterval = minInterval;
   }
-  enqueue(fn) {
-    let resolve;
-    let reject;
-    const resultPromise = new Promise((res, rej) => {
-      resolve = res;
-      reject = rej;
-    });
-    this.queue = this.queue.then(async () => {
-      const elapsed = Date.now() - this.lastExec;
-      if (elapsed < this.minInterval) {
-        await new Promise((r) => setTimeout(r, this.minInterval - elapsed));
-      }
-      try {
-        const result = await fn();
-        resolve(result);
-      } catch (err) {
-        reject(err);
-      } finally {
-        this.lastExec = Date.now();
+  enqueue(fn, opts) {
+    const type = opts?.type ?? "other";
+    const key = opts?.key;
+    return new Promise((resolve, reject) => {
+      if (type === "text" && key) {
+        const idx = this.items.findIndex(
+          (item) => item.type === "text" && item.key === key
+        );
+        if (idx !== -1) {
+          this.items[idx].resolve(void 0);
+          this.items[idx] = { fn, type, key, resolve, reject };
+          this.scheduleProcess();
+          return;
+        }
       }
+      this.items.push({ fn, type, key, resolve, reject });
+      this.scheduleProcess();
     });
-    return resultPromise;
+  }
+  onRateLimited() {
+    const remaining = [];
+    for (const item of this.items) {
+      if (item.type === "text") {
+        item.resolve(void 0);
+      } else {
+        remaining.push(item);
+      }
+    }
+    this.items = remaining;
+  }
+  scheduleProcess() {
+    if (this.processing) return;
+    if (this.items.length === 0) return;
+    const elapsed = Date.now() - this.lastExec;
+    const delay = Math.max(0, this.minInterval - elapsed);
+    this.processing = true;
+    setTimeout(() => void this.processNext(), delay);
+  }
+  async processNext() {
+    const item = this.items.shift();
+    if (!item) {
+      this.processing = false;
+      return;
+    }
+    try {
+      const result = await item.fn();
+      item.resolve(result);
+    } catch (err) {
+      item.reject(err);
+    } finally {
+      this.lastExec = Date.now();
+      this.processing = false;
+      this.scheduleProcess();
+    }
   }
 };
 
@@ -2284,8 +2331,8 @@ import { nanoid as nanoid4 } from "nanoid";
 import { InlineKeyboard as InlineKeyboard3 } from "grammy";
 var CMD_NEW_RE = /\/new(?:\s+([^\s\u0080-\uFFFF]+)(?:\s+([^\s\u0080-\uFFFF]+))?)?/;
 var CMD_CANCEL_RE = /\/cancel\b/;
-var KW_NEW_RE = /(?:tao|tạo|create|new)\s+session/i;
-var KW_CANCEL_RE = /(?:huy|huỷ|cancel|dung|dừng)\s+session/i;
+var KW_NEW_RE = /(?:create|new)\s+session/i;
+var KW_CANCEL_RE = /(?:cancel|stop)\s+session/i;
 function detectAction(text) {
   if (!text) return null;
   const cancelCmd = CMD_CANCEL_RE.exec(text);
@@ -2330,11 +2377,11 @@ function removeAction(id) {
 function buildActionKeyboard(actionId, action) {
   const keyboard = new InlineKeyboard3();
   if (action.action === "new_session") {
-    keyboard.text("\u2705 T\u1EA1o session", `a:${actionId}`);
-    keyboard.text("\u274C Hu\u1EF7", `a:dismiss:${actionId}`);
+    keyboard.text("\u2705 Create session", `a:${actionId}`);
+    keyboard.text("\u274C Cancel", `a:dismiss:${actionId}`);
   } else {
-    keyboard.text("\u26D4 Hu\u1EF7 session", `a:${actionId}`);
-    keyboard.text("\u274C Kh\xF4ng", `a:dismiss:${actionId}`);
+    keyboard.text("\u26D4 Cancel session", `a:${actionId}`);
+    keyboard.text("\u274C No", `a:dismiss:${actionId}`);
   }
   return keyboard;
 }
@@ -2348,19 +2395,19 @@ function setupActionCallbacks(bot, core, chatId, getAssistantSessionId) {
       });
     } catch {
     }
-    await ctx.answerCallbackQuery({ text: "\u0110\xE3 hu\u1EF7" });
+    await ctx.answerCallbackQuery({ text: "Dismissed" });
   });
   bot.callbackQuery(/^a:(?!dismiss)/, async (ctx) => {
     const actionId = ctx.callbackQuery.data.replace("a:", "");
     const action = getAction(actionId);
     if (!action) {
-      await ctx.answerCallbackQuery({ text: "Action \u0111\xE3 h\u1EBFt h\u1EA1n" });
+      await ctx.answerCallbackQuery({ text: "Action expired" });
       return;
     }
     removeAction(actionId);
     try {
       if (action.action === "new_session") {
-        await ctx.answerCallbackQuery({ text: "\u23F3 \u0110ang t\u1EA1o session..." });
+        await ctx.answerCallbackQuery({ text: "\u23F3 Creating session..." });
         const { threadId } = await executeNewSession(
           bot,
           core,
@@ -2386,13 +2433,13 @@ function setupActionCallbacks(bot, core, chatId, getAssistantSessionId) {
         const assistantId = getAssistantSessionId();
         const cancelled = await executeCancelSession(core, assistantId);
         if (cancelled) {
-          await ctx.answerCallbackQuery({ text: "\u26D4 Session \u0111\xE3 hu\u1EF7" });
+          await ctx.answerCallbackQuery({ text: "\u26D4 Session cancelled" });
           const originalText = ctx.callbackQuery.message?.text ?? "";
           try {
             await ctx.editMessageText(
               originalText + `
 
-\u26D4 Session "${cancelled.name ?? cancelled.id}" \u0111\xE3 hu\u1EF7`,
+\u26D4 Session "${cancelled.name ?? cancelled.id}" cancelled`,
               { parse_mode: "HTML" }
             );
           } catch {
@@ -2402,7 +2449,7 @@ function setupActionCallbacks(bot, core, chatId, getAssistantSessionId) {
           }
         } else {
           await ctx.answerCallbackQuery({
-            text: "Kh\xF4ng c\xF3 session n\xE0o \u0111ang ch\u1EA1y"
+            text: "No active session"
           });
           try {
             await ctx.editMessageReplyMarkup({
@@ -2413,7 +2460,7 @@ function setupActionCallbacks(bot, core, chatId, getAssistantSessionId) {
         }
       }
     } catch {
-      await ctx.answerCallbackQuery({ text: "\u274C L\u1ED7i, th\u1EED l\u1EA1i sau" });
+      await ctx.answerCallbackQuery({ text: "\u274C Error, try again later" });
       try {
         await ctx.editMessageReplyMarkup({
           reply_markup: { inline_keyboard: [] }
@@ -2452,7 +2499,7 @@ var TelegramAdapter = class extends ChannelAdapter {
   assistantTopicId;
   skillMessages = /* @__PURE__ */ new Map();
   // sessionId → pinned messageId
-  sendQueue = new TelegramSendQueue();
+  sendQueue = new TelegramSendQueue(3e3);
   constructor(core, config) {
     super(core, config);
     this.telegramConfig = config;
@@ -2471,6 +2518,10 @@ var TelegramAdapter = class extends ChannelAdapter {
           return result;
         }
         const retryAfter = (result.parameters?.retry_after ?? 5) + 1;
+        const rateLimitedMethods = ["sendMessage", "editMessageText", "editMessageReplyMarkup"];
+        if (rateLimitedMethods.includes(method)) {
+          this.sendQueue.onRateLimited();
+        }
         log8.warn(
           { method, retryAfter, attempt: attempt + 1 },
           "Rate limited by Telegram, retrying"
@@ -2596,6 +2647,7 @@ Workspace: <code>${workspace}</code>
       }
       if (threadId === this.notificationTopicId) return;
       if (threadId === this.assistantTopicId) {
+        await this.finalizeDraft(this.assistantSession.id);
         ctx.replyWithChatAction("typing").catch(() => {
         });
         handleAssistantMessage(this.assistantSession, ctx.message.text).catch(
@@ -2603,6 +2655,8 @@ Workspace: <code>${workspace}</code>
         );
         return;
       }
+      const sessionId = this.core.sessionManager.getSessionByThread("telegram", String(threadId))?.id;
+      if (sessionId) await this.finalizeDraft(sessionId);
       ctx.replyWithChatAction("typing").catch(() => {
       });
       this.core.handleMessage({
@@ -2631,8 +2685,8 @@ Workspace: <code>${workspace}</code>
             this.bot,
             this.telegramConfig.chatId,
             threadId,
-            this.telegramConfig.streamThrottleMs,
-            this.sendQueue
+            this.sendQueue,
+            sessionId
           );
           this.sessionDrafts.set(sessionId, draft);
         }
@@ -2646,6 +2700,21 @@ Workspace: <code>${workspace}</code>
       case "tool_call": {
         await this.finalizeDraft(sessionId);
         const meta = content.metadata;
+        if (!this.toolCallMessages.has(sessionId)) {
+          this.toolCallMessages.set(sessionId, /* @__PURE__ */ new Map());
+        }
+        let resolveReady;
+        const ready = new Promise((r) => {
+          resolveReady = r;
+        });
+        this.toolCallMessages.get(sessionId).set(meta.id, {
+          msgId: 0,
+          name: meta.name,
+          kind: meta.kind,
+          viewerLinks: meta.viewerLinks,
+          viewerFilePath: content.metadata?.viewerFilePath,
+          ready
+        });
         const msg = await this.sendQueue.enqueue(
           () => this.bot.api.sendMessage(
             this.telegramConfig.chatId,
@@ -2657,43 +2726,52 @@ Workspace: <code>${workspace}</code>
             }
           )
         );
-        if (!this.toolCallMessages.has(sessionId)) {
-          this.toolCallMessages.set(sessionId, /* @__PURE__ */ new Map());
-        }
-        this.toolCallMessages.get(sessionId).set(meta.id, {
-          msgId: msg.message_id,
-          name: meta.name,
-          kind: meta.kind,
-          viewerLinks: meta.viewerLinks,
-          viewerFilePath: content.metadata?.viewerFilePath
-        });
+        const toolEntry = this.toolCallMessages.get(sessionId).get(meta.id);
+        toolEntry.msgId = msg.message_id;
+        resolveReady();
         break;
       }
       case "tool_update": {
         const meta = content.metadata;
         const toolState = this.toolCallMessages.get(sessionId)?.get(meta.id);
         if (toolState) {
-          const viewerLinks = meta.viewerLinks || toolState.viewerLinks;
-          const viewerFilePath = content.metadata?.viewerFilePath || toolState.viewerFilePath;
-          if (meta.viewerLinks) toolState.viewerLinks = meta.viewerLinks;
+          if (meta.viewerLinks) {
+            toolState.viewerLinks = meta.viewerLinks;
+            log8.debug({ toolId: meta.id, viewerLinks: meta.viewerLinks }, "Accumulated viewerLinks");
+          }
+          const viewerFilePath = content.metadata?.viewerFilePath;
           if (viewerFilePath) toolState.viewerFilePath = viewerFilePath;
+          if (meta.name) toolState.name = meta.name;
+          if (meta.kind) toolState.kind = meta.kind;
+          const isTerminal = meta.status === "completed" || meta.status === "failed";
+          if (!isTerminal && !meta.viewerLinks) break;
+          await toolState.ready;
+          log8.debug(
+            { toolId: meta.id, status: meta.status, hasViewerLinks: !!toolState.viewerLinks, viewerLinks: toolState.viewerLinks, name: toolState.name, msgId: toolState.msgId },
+            "Tool completed, preparing edit"
+          );
           const merged = {
             ...meta,
-            name: meta.name || toolState.name,
-            kind: meta.kind || toolState.kind,
-            viewerLinks,
-            viewerFilePath
+            name: toolState.name,
+            kind: toolState.kind,
+            viewerLinks: toolState.viewerLinks,
+            viewerFilePath: toolState.viewerFilePath
           };
+          const formattedText = formatToolUpdate(merged);
           try {
             await this.sendQueue.enqueue(
               () => this.bot.api.editMessageText(
                 this.telegramConfig.chatId,
                 toolState.msgId,
-                formatToolUpdate(merged),
+                formattedText,
                 { parse_mode: "HTML" }
               )
             );
-          } catch {
+          } catch (err) {
+            log8.warn(
+              { err, msgId: toolState.msgId, textLen: formattedText.length, hasViewerLinks: !!merged.viewerLinks },
+              "Tool update edit failed"
+            );
           }
         }
         break;
@@ -2789,7 +2867,7 @@ Workspace: <code>${workspace}</code>
       permission: "\u{1F510}",
       input_required: "\u{1F4AC}"
     };
-    let text = `${emoji[notification.type] || "\u2139\uFE0F"} <b>${escapeHtml(notification.sessionName || notification.sessionId)}</b>
+    let text = `${emoji[notification.type] || "\u2139\uFE0F"} <b>${escapeHtml(notification.sessionName || "New session")}</b>
 `;
     text += escapeHtml(notification.summary);
     if (notification.deepLink) {
@@ -2822,6 +2900,10 @@ Workspace: <code>${workspace}</code>
       Number(session.threadId),
       newName
     );
+    await this.core.sessionManager.updateSessionName(
+      sessionId,
+      newName
+    );
   }
   async sendSkillCommands(sessionId, commands) {
     const session = this.core.sessionManager.getSession(
@@ -2830,6 +2912,13 @@ Workspace: <code>${workspace}</code>
     if (!session) return;
     const threadId = Number(session.threadId);
     if (!threadId) return;
+    if (!this.skillMessages.has(sessionId)) {
+      const record = this.core.sessionManager.getSessionRecord(sessionId);
+      const platform = record?.platform;
+      if (platform?.skillMsgId) {
+        this.skillMessages.set(sessionId, platform.skillMsgId);
+      }
+    }
     if (commands.length === 0) {
       await this.cleanupSkillCommands(sessionId);
       return;
@@ -2864,6 +2953,13 @@ Workspace: <code>${workspace}</code>
         )
       );
       this.skillMessages.set(sessionId, msg.message_id);
+      const record = this.core.sessionManager.getSessionRecord(sessionId);
+      if (record) {
+        await this.core.sessionManager.updateSessionPlatform(
+          sessionId,
+          { ...record.platform, skillMsgId: msg.message_id }
+        );
+      }
       await this.bot.api.pinChatMessage(
         this.telegramConfig.chatId,
         msg.message_id,
@@ -2891,6 +2987,11 @@ Workspace: <code>${workspace}</code>
     }
     this.skillMessages.delete(sessionId);
     clearSkillCallbacks(sessionId);
+    const record = this.core.sessionManager.getSessionRecord(sessionId);
+    if (record) {
+      const { skillMsgId: _removed, ...rest } = record.platform;
+      await this.core.sessionManager.updateSessionPlatform(sessionId, rest);
+    }
   }
   async updateCommandAutocomplete(agentName, skillCommands) {
     const prefix = `[${agentName}] `;
@@ -2957,4 +3058,4 @@ export {
   ApiServer,
   TelegramAdapter
 };
-//# sourceMappingURL=chunk-6HORD4FS.js.map
+//# sourceMappingURL=chunk-WKHCVK5P.js.map