@n1creator/openacp-cli 2026.712.10 → 2026.712.12

package/dist/index.d.ts

@@ -5195,7 +5195,7 @@ interface TelegramChannelConfig extends ChannelConfig {
  *   API calls while keeping the response live.
  * - **Callback routing**:
  *   - `p:<key>:<optionId>` — permission approval buttons
- *   - `c/<command>` (or `c/#<id>` for long commands) — command button actions
+ *   - `c/<command>` (or `c/#<id>`) — command actions with optional allow-listed return context
  *   - `m:<itemId>` — MenuRegistry item dispatch
  *   - Domain prefixes (`d:`, `v:`, `ns:`, `sw:`, etc.) — specific feature flows
  * - **Two-phase startup**: Phase 1 starts the bot and registers handlers.
@@ -5330,6 +5330,8 @@ declare class TelegramAdapter extends MessagingAdapter {
     private renderCommandResponse;
     private toCallbackData;
     private fromCallbackData;
+    private returnMarkup;
+    private appendReturnButton;
     private setupRoutes;
     /**
      * Per-session serial dispatch queues.

package/dist/index.js

@@ -10024,6 +10024,37 @@ var init_resume = __esm({
   }
 });
 
+// src/plugins/telegram/callback-navigation.ts
+function contextualCommandCallback(command, target) {
+  if (!command.startsWith("/")) throw new Error("Telegram navigation commands must start with /");
+  const data = target === "settings" ? `${SETTINGS_PREFIX}${command}` : void 0;
+  return data && Buffer.byteLength(data, "utf8") <= 64 ? data : void 0;
+}
+function settingsCommandCallback(command) {
+  const data = contextualCommandCallback(command, "settings");
+  if (!data) throw new Error("Telegram navigation callback exceeds 64 bytes");
+  return data;
+}
+function decodeCommandCallback(data) {
+  if (data.startsWith(SETTINGS_PREFIX)) {
+    return { command: data.slice(SETTINGS_PREFIX.length), returnTarget: "settings" };
+  }
+  return { command: data.slice(2) };
+}
+function returnButton(target) {
+  switch (target) {
+    case "settings":
+      return { text: "\u25C0\uFE0F Back to Settings", callback_data: "s:back:refresh" };
+  }
+}
+var SETTINGS_PREFIX;
+var init_callback_navigation = __esm({
+  "src/plugins/telegram/callback-navigation.ts"() {
+    "use strict";
+    SETTINGS_PREFIX = "c/@settings:";
+  }
+});
+
 // src/plugins/telegram/commands/menu.ts
 var menu_exports = {};
 __export(menu_exports, {
@@ -10136,6 +10167,7 @@ async function buildSettingsKeyboard(core) {
       kb.text(`${label}`, `s:input:${field.path}`).row();
     }
   }
+  kb.text("\u{1F310} Proxy Management", settingsCommandCallback("/proxy")).row();
   kb.text("\u25C0\uFE0F Back to Menu", "s:back");
   return kb;
 }
@@ -10328,6 +10360,7 @@ var init_settings = __esm({
     "use strict";
     init_config_registry();
     init_log();
+    init_callback_navigation();
     log29 = createChildLogger({ module: "telegram-settings" });
   }
 });
@@ -12301,6 +12334,7 @@ var init_adapter = __esm({
     init_command_sync();
     init_command_ownership_store();
     init_instance_context();
+    init_callback_navigation();
     log38 = createChildLogger({ module: "telegram" });
     HISTORICAL_OPENACP_COMMAND_NAMES = /* @__PURE__ */ new Set([
       ...STATIC_COMMANDS.map((command) => command.command),
@@ -12629,7 +12663,13 @@ var init_adapter = __esm({
               }
             });
             if (response.type !== "silent" && response.type !== "delegated") {
-              await this.renderCommandResponse(response, ctx.chat.id, topicIdForInput, String(ctx.from?.id));
+              await this.renderCommandResponse(
+                response,
+                ctx.chat.id,
+                topicIdForInput,
+                String(ctx.from?.id),
+                pending.returnTarget
+              );
             }
             return;
           }
@@ -12712,7 +12752,8 @@ var init_adapter = __esm({
             return;
           }
           const data = ctx.callbackQuery.data;
-          const command = this.fromCallbackData(data);
+          const callback = this.fromCallbackData(data);
+          const command = callback.command;
           const registry = this.core.lifecycleManager?.serviceRegistry?.get(
             "command-registry"
           );
@@ -12741,16 +12782,23 @@ var init_adapter = __esm({
             await ctx.answerCallbackQuery();
             if (response.type !== "silent" && response.type !== "delegated") {
               if (response.type === "input") {
-                await this.renderCommandResponse(response, chatId, topicId, String(ctx.from?.id));
+                await this.renderCommandResponse(
+                  response,
+                  chatId,
+                  topicId,
+                  String(ctx.from?.id),
+                  callback.returnTarget
+                );
                 return;
               }
               if (response.type === "menu") {
                 const keyboard = response.options.map((opt) => [
                   {
                     text: `${opt.label}${opt.hint ? ` \u2014 ${opt.hint}` : ""}`,
-                    callback_data: this.toCallbackData(opt.command)
+                    callback_data: this.toCallbackData(opt.command, callback.returnTarget)
                   }
                 ]);
+                this.appendReturnButton(keyboard, callback.returnTarget);
                 try {
                   await ctx.editMessageText(response.title, {
                     reply_markup: { inline_keyboard: keyboard }
@@ -12769,7 +12817,11 @@ var init_adapter = __esm({
                   parseMode = "Markdown";
                 }
                 try {
-                  await ctx.editMessageText(text3, { ...parseMode && { parse_mode: parseMode } });
+                  const returnMarkup = this.returnMarkup(callback.returnTarget);
+                  await ctx.editMessageText(text3, {
+                    ...parseMode && { parse_mode: parseMode },
+                    ...returnMarkup && { reply_markup: returnMarkup }
+                  });
                 } catch {
                 }
               }
@@ -13370,11 +13422,13 @@ System topics have been created. Tap${assistantTopicLink} to get started.`,
         log38.info("Telegram bot stopped");
       }
       // --- CommandRegistry response rendering ---
-      async renderCommandResponse(response, chatId, topicId, userId) {
+      async renderCommandResponse(response, chatId, topicId, userId, returnTarget) {
+        const returnMarkup = this.returnMarkup(returnTarget);
         switch (response.type) {
           case "text":
             await this.bot.api.sendMessage(chatId, response.text, {
-              message_thread_id: topicId
+              message_thread_id: topicId,
+              ...returnMarkup && { reply_markup: returnMarkup }
             });
             break;
           case "adaptive": {
@@ -13382,7 +13436,8 @@ System topics have been created. Tap${assistantTopicLink} to get started.`,
             const text3 = variant?.text ?? response.fallback;
             await this.bot.api.sendMessage(chatId, text3, {
               message_thread_id: topicId,
-              ...variant?.parse_mode && { parse_mode: variant.parse_mode }
+              ...variant?.parse_mode && { parse_mode: variant.parse_mode },
+              ...returnMarkup && { reply_markup: returnMarkup }
             });
             break;
           }
@@ -13390,16 +13445,17 @@ System topics have been created. Tap${assistantTopicLink} to get started.`,
             await this.bot.api.sendMessage(
               chatId,
               `\u26A0\uFE0F ${response.message}`,
-              { message_thread_id: topicId }
+              { message_thread_id: topicId, ...returnMarkup && { reply_markup: returnMarkup } }
             );
             break;
           case "menu": {
             const keyboard = response.options.map((opt) => [
               {
                 text: `${opt.label}${opt.hint ? ` \u2014 ${opt.hint}` : ""}`,
-                callback_data: this.toCallbackData(opt.command)
+                callback_data: this.toCallbackData(opt.command, returnTarget)
               }
             ]);
+            this.appendReturnButton(keyboard, returnTarget);
             await this.bot.api.sendMessage(chatId, response.title, {
               message_thread_id: topicId,
               reply_markup: { inline_keyboard: keyboard }
@@ -13413,7 +13469,8 @@ System topics have been created. Tap${assistantTopicLink} to get started.`,
             const text3 = `${response.title}
 ${lines.join("\n")}`;
             await this.bot.api.sendMessage(chatId, text3, {
-              message_thread_id: topicId
+              message_thread_id: topicId,
+              ...returnMarkup && { reply_markup: returnMarkup }
             });
             break;
           }
@@ -13422,16 +13479,17 @@ ${lines.join("\n")}`;
               [
                 {
                   text: "\u2705 Yes",
-                  callback_data: this.toCallbackData(response.onYes)
+                  callback_data: this.toCallbackData(response.onYes, returnTarget)
                 }
               ]
             ];
             if (response.onNo) {
               buttons[0].push({
                 text: "\u274C No",
-                callback_data: this.toCallbackData(response.onNo)
+                callback_data: this.toCallbackData(response.onNo, returnTarget)
               });
             }
+            this.appendReturnButton(buttons, returnTarget);
             await this.bot.api.sendMessage(chatId, response.question, {
               message_thread_id: topicId,
               reply_markup: { inline_keyboard: buttons }
@@ -13440,7 +13498,10 @@ ${lines.join("\n")}`;
           }
           case "input": {
             if (!userId) {
-              await this.bot.api.sendMessage(chatId, response.fallback, { message_thread_id: topicId });
+              await this.bot.api.sendMessage(chatId, response.fallback, {
+                message_thread_id: topicId,
+                ...returnMarkup && { reply_markup: returnMarkup }
+              });
               break;
             }
             const key = `${chatId}:${userId}:${topicId ?? 0}`;
@@ -13462,7 +13523,8 @@ ${lines.join("\n")}`;
               sensitive: response.sensitive === true,
               fallback: response.fallback,
               expiresAt: Date.now() + (response.expiresInMs ?? 10 * 6e4),
-              promptMessageId: promptMessage.message_id
+              promptMessageId: promptMessage.message_id,
+              returnTarget
             });
             break;
           }
@@ -13470,11 +13532,15 @@ ${lines.join("\n")}`;
             break;
         }
       }
-      toCallbackData(command) {
+      toCallbackData(command, returnTarget) {
         const data = `c/${command}`;
-        if (data.length <= 64) return data;
+        if (!returnTarget && Buffer.byteLength(data, "utf8") <= 64) return data;
+        if (returnTarget) {
+          const contextual = contextualCommandCallback(command, returnTarget);
+          if (contextual) return contextual;
+        }
         const id = String(++this.callbackCounter);
-        this.callbackCache.set(id, command);
+        this.callbackCache.set(id, { command, returnTarget });
         if (this.callbackCache.size > 1e3) {
           const first = this.callbackCache.keys().next().value;
           if (first) this.callbackCache.delete(first);
@@ -13483,9 +13549,15 @@ ${lines.join("\n")}`;
       }
       fromCallbackData(data) {
         if (data.startsWith("c/#")) {
-          return this.callbackCache.get(data.slice(3)) ?? data.slice(2);
+          return this.callbackCache.get(data.slice(3)) ?? { command: data.slice(2) };
         }
-        return data.slice(2);
+        return decodeCommandCallback(data);
+      }
+      returnMarkup(returnTarget) {
+        return returnTarget ? { inline_keyboard: [[returnButton(returnTarget)]] } : void 0;
+      }
+      appendReturnButton(keyboard, returnTarget) {
+        if (returnTarget) keyboard.push([returnButton(returnTarget)]);
       }
       setupRoutes() {
         this.bot.on("message:text", async (ctx) => {
@@ -20776,7 +20848,9 @@ function registerCoreMenuItems(registry) {
     label: "\u{1F310} Proxy Routing",
     priority: 32,
     group: "config",
-    action: { type: "command", command: "/proxy" }
+    action: { type: "command", command: "/proxy" },
+    // Keep already-sent m:core:proxy buttons valid while nesting new entry points under Settings.
+    visible: () => false
   });
   registry.register({
     id: "core:restart",