@openacp/cli 0.3.0 → 0.3.2

package/dist/{chunk-C6IFPAWN.js → chunk-66PHSLNS.js}

@@ -614,9 +614,11 @@ var Session = class {
     }
   }
   async cancel() {
-    this.status = "cancelled";
+    this.promptQueue = [];
     this.log.info("Session cancelled");
     await this.agentInstance.cancel();
+    this.promptRunning = false;
+    this.status = "active";
   }
   async destroy() {
     this.log.info("Session destroyed");
@@ -1945,16 +1947,30 @@ async function handleNewChat(ctx, core, chatId) {
     );
     return;
   }
-  try {
-    const session = await core.handleNewChat("telegram", String(threadId));
-    if (!session) {
+  const currentSession = core.sessionManager.getSessionByThread(
+    "telegram",
+    String(threadId)
+  );
+  let agentName;
+  let workspace;
+  if (currentSession) {
+    agentName = currentSession.agentName;
+    workspace = currentSession.workingDirectory;
+  } else {
+    const record = core.sessionManager.getRecordByThread("telegram", String(threadId));
+    if (!record || record.status === "cancelled" || record.status === "error") {
       await ctx.reply("No active session in this topic.", {
         parse_mode: "HTML"
       });
       return;
     }
-    const topicName = `\u{1F504} ${session.agentName} \u2014 New Chat`;
-    const newThreadId = await createSessionTopic(
+    agentName = record.agentName;
+    workspace = record.workingDir;
+  }
+  let newThreadId;
+  try {
+    const topicName = `\u{1F504} ${agentName} \u2014 New Chat`;
+    newThreadId = await createSessionTopic(
       botFromCtx(ctx),
       chatId,
       topicName
@@ -1963,6 +1979,11 @@ async function handleNewChat(ctx, core, chatId) {
       message_thread_id: newThreadId,
       parse_mode: "HTML"
     });
+    const session = await core.handleNewSession(
+      "telegram",
+      agentName,
+      workspace
+    );
     session.threadId = String(newThreadId);
     await core.sessionManager.updateSessionPlatform(session.id, {
       topicId: newThreadId
@@ -1980,6 +2001,12 @@ async function handleNewChat(ctx, core, chatId) {
     );
     session.warmup().catch((err) => log6.error({ err }, "Warm-up error"));
   } catch (err) {
+    if (newThreadId) {
+      try {
+        await ctx.api.deleteForumTopic(chatId, newThreadId);
+      } catch {
+      }
+    }
     const message = err instanceof Error ? err.message : String(err);
     await ctx.reply(`\u274C ${escapeHtml(message)}`, { parse_mode: "HTML" });
   }
@@ -2204,10 +2231,11 @@ function setupSkillCallbacks(bot, core) {
 }
 async function executeNewSession(bot, core, chatId, agentName, workspace) {
   const threadId = await createSessionTopic(bot, chatId, "\u{1F504} New Session");
-  await bot.api.sendMessage(chatId, "\u23F3 Setting up session, please wait...", {
+  const setupMsg = await bot.api.sendMessage(chatId, "\u23F3 Setting up session, please wait...", {
     message_thread_id: threadId,
     parse_mode: "HTML"
   });
+  const firstMsgId = setupMsg.message_id;
   try {
     const session = await core.handleNewSession(
       "telegram",
@@ -2221,7 +2249,7 @@ async function executeNewSession(bot, core, chatId, agentName, workspace) {
     const finalName = `\u{1F504} ${session.agentName} \u2014 New Session`;
     await renameSessionTopic(bot, chatId, threadId, finalName);
     session.warmup().catch((err) => log6.error({ err }, "Warm-up error"));
-    return { session, threadId };
+    return { session, threadId, firstMsgId };
   } catch (err) {
     try {
       await bot.api.deleteForumTopic(chatId, threadId);
@@ -2495,6 +2523,9 @@ var UsageMessage = class {
       log9.warn({ err }, "UsageMessage.send() failed");
     }
   }
+  getMsgId() {
+    return this.msgId;
+  }
   async delete() {
     if (!this.msgId) return;
     const id = this.msgId;
@@ -2632,6 +2663,9 @@ var ActivityTracker = class {
   async sendUsage(data) {
     await this.usage.send(data);
   }
+  getUsageMsgId() {
+    return this.usage.getMsgId();
+  }
   async onComplete() {
     if (this.hasPlanCard) {
       await this.planCard.finalize();
@@ -2650,6 +2684,7 @@ var ActivityTracker = class {
     }
   }
   destroy() {
+    this.thinking.dismiss();
     this.planCard.destroy();
   }
   async _firstEventGuard() {
@@ -2807,14 +2842,14 @@ function setupActionCallbacks(bot, core, chatId, getAssistantSessionId) {
     try {
       if (action.action === "new_session") {
         await ctx.answerCallbackQuery({ text: "\u23F3 Creating session..." });
-        const { threadId } = await executeNewSession(
+        const { threadId, firstMsgId } = await executeNewSession(
           bot,
           core,
           chatId,
           action.agent,
           action.workspace
         );
-        const topicLink = `https://t.me/c/${String(chatId).replace("-100", "")}/${threadId}`;
+        const topicLink = `https://t.me/c/${String(chatId).replace("-100", "")}/${firstMsgId ?? threadId}`;
         const originalText = ctx.callbackQuery.message?.text ?? "";
         try {
           await ctx.editMessageText(
@@ -3242,7 +3277,8 @@ Workspace: <code>${workspace}</code>
           const sessionName = sess?.name || "Session";
           const chatIdStr = String(this.telegramConfig.chatId);
           const numericId = chatIdStr.startsWith("-100") ? chatIdStr.slice(4) : chatIdStr.replace("-", "");
-          const deepLink = `https://t.me/c/${numericId}/${threadId}`;
+          const usageMsgId = tracker.getUsageMsgId();
+          const deepLink = `https://t.me/c/${numericId}/${usageMsgId ?? threadId}`;
           const text = `\u2705 <b>${escapeHtml(sessionName)}</b>
 Task completed.
 
@@ -3537,4 +3573,4 @@ export {
   ApiServer,
   TelegramAdapter
 };
-//# sourceMappingURL=chunk-C6IFPAWN.js.map
+//# sourceMappingURL=chunk-66PHSLNS.js.map