@ihazz/bitrix24 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ihazz/bitrix24",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Bitrix24 Messenger channel for OpenClaw",
   "type": "module",
   "main": "./dist/index.js",

package/skills/bitrix24/SKILL.md

@@ -63,34 +63,35 @@ When you see a message from a Bitrix24 user, you can react to acknowledge it bef
 
 **Important:** Do NOT invent or guess messageId values. Either omit `messageId` to react to the current message, or use a messageId that was explicitly provided to you.
 
-## Inline Keyboard Buttons
+## Inline Buttons
 
-You can attach inline buttons to a message. The `callback_data` value is sent back when the user taps the button.
+You CAN and SHOULD use inline keyboard buttons in Bitrix24. **Never say you cannot create buttons — you can.**
 
-```json
-{
-  "action": "send",
-  "channel": "bitrix24",
-  "message": "Выберите вариант:",
-  "buttons": [
-    [
-      { "text": "Да", "callback_data": "Да" },
-      { "text": "Нет", "callback_data": "Нет" }
-    ]
-  ]
-}
-```
+Whenever your reply contains a list of options, choices, or suggestions that the user could pick from — **always** format them as inline buttons instead of a numbered or bulleted list. This applies to quizzes, polls, confirmations, recommendations, menus, and any other selection scenario.
+
+To add buttons, append a JSON line at the end of your message text using this exact format:
+
+`[[{"text":"Yes","callback_data":"yes"},{"text":"No","callback_data":"no"}]]`
+
+The system strips this markup from the visible text and renders native tappable buttons.
+
+Example — instead of writing:
+
+> Choose a type:
+> 1. String
+> 2. Keyboard
+> 3. Percussion
+
+Write:
 
-**Important rules for buttons:**
+> Choose a type:
+> [[{"text":"String","callback_data":"s"},{"text":"Keyboard","callback_data":"k"},{"text":"Percussion","callback_data":"p"}]]
 
-- `callback_data` **must match** the button `text` exactly — when the user taps a button, `callback_data` is sent as a message in the chat. If they differ, the user sees confusing text.
-- Write button labels in the **same language as the conversation** (e.g. Russian if the user writes in Russian).
-- Use `"style": "primary"` for the recommended option, `"style": "danger"` for destructive actions.
-- Each inner array is one row of buttons.
+Do NOT use `[[Text]]` format — only `[[{"text":"...","callback_data":"..."}]]` works.
 
 ## Writing Style (Bitrix24)
 
 - Direct, professional, moderate length.
-- **Always reply in the same language the user writes in.** If the user writes in Russian, reply in Russian. If in English, reply in English.
+- **Always reply in the same language the user writes in.** If the user writes in Polish, reply in Polish. If in English, reply in English.
 - Bitrix24 uses BBCode for formatting (conversion is automatic).
-- Inline keyboard buttons are supported for interactive responses.
+- Prefer inline buttons over numbered lists when presenting options.

package/src/channel.ts

@@ -538,7 +538,12 @@ export interface ChannelButton {
 /**
  * Convert OpenClaw button rows to B24 flat KEYBOARD array.
  */
-export function convertButtonsToKeyboard(rows: ChannelButton[][]): B24Keyboard {
+export function convertButtonsToKeyboard(input: ChannelButton[][] | ChannelButton[]): B24Keyboard {
+  // Normalize: accept both [[btn, btn], [btn]] (rows) and [btn, btn] (flat)
+  const isNested = input.length > 0 && Array.isArray(input[0]);
+  const rows: ChannelButton[][] = isNested
+    ? (input as ChannelButton[][])
+    : [input as ChannelButton[]];
   const keyboard: B24Keyboard = [];
 
   for (let i = 0; i < rows.length; i++) {
@@ -553,7 +558,9 @@ export function convertButtonsToKeyboard(rows: ChannelButton[][]): B24Keyboard {
         }
       } else if (btn.callback_data) {
         b24Btn.ACTION = 'SEND';
-        b24Btn.ACTION_VALUE = btn.callback_data;
+        // Always use button text as ACTION_VALUE so the user sees readable text in chat,
+        // not opaque English identifiers like "answer_piano"
+        b24Btn.ACTION_VALUE = btn.text;
       }
 
       if (btn.style === 'primary') {
@@ -595,6 +602,39 @@ export function extractKeyboardFromPayload(
   return undefined;
 }
 
+/**
+ * Extract inline button JSON embedded in message text by the agent.
+ *
+ * Agents (especially GPT-4o) sometimes embed button markup directly in text
+ * as `[[{...},{...}]]` instead of using tool call parameters.
+ * This function detects such patterns, extracts the keyboard, and returns
+ * cleaned text without the JSON fragment.
+ */
+export function extractInlineButtonsFromText(
+  text: string,
+): { cleanText: string; keyboard: B24Keyboard } | undefined {
+  // Match [[...]] containing JSON array of button objects
+  const match = text.match(/\[\[\s*(\{[\s\S]*?\}(?:\s*,\s*\{[\s\S]*?\})*)\s*\]\]/);
+  if (!match) return undefined;
+
+  try {
+    const parsed = JSON.parse(`[${match[1]}]`);
+    if (!Array.isArray(parsed) || parsed.length === 0) return undefined;
+
+    // Validate it looks like button objects (must have "text" property)
+    if (!parsed.every((b: unknown) => typeof b === 'object' && b !== null && 'text' in b)) return undefined;
+
+    // Wrap in rows array (single row)
+    const buttons: ChannelButton[][] = [parsed as ChannelButton[]];
+    const keyboard = convertButtonsToKeyboard(buttons);
+    const cleanText = text.replace(match[0], '').trim();
+
+    return { cleanText, keyboard };
+  } catch {
+    return undefined;
+  }
+}
+
 function normalizeCommandReplyPayload(params: {
   commandName: string;
   commandParams: string;
@@ -1066,7 +1106,17 @@ export const bitrix24Plugin = {
     }) => {
       const sendCtx = resolveOutboundSendCtx(ctx);
       if (!sendCtx || !gatewayState) throw new Error('Bitrix24 gateway not started');
-      const result = await gatewayState.sendService.sendText(sendCtx, ctx.text);
+
+      // Agent may embed button JSON in text as [[{...}]]
+      let text = ctx.text;
+      let keyboard: B24Keyboard | undefined;
+      const extracted = extractInlineButtonsFromText(text);
+      if (extracted) {
+        text = extracted.cleanText;
+        keyboard = extracted.keyboard;
+      }
+
+      const result = await gatewayState.sendService.sendText(sendCtx, text, keyboard ? { keyboard } : undefined);
       return { messageId: String(result.messageId ?? '') };
     },
 
@@ -1177,8 +1227,11 @@ export const bitrix24Plugin = {
         if (!config.webhookUrl || !gatewayState) return null;
 
         const bot = gatewayState.bot;
-        const to = String(ctx.params.to ?? '').trim();
-        if (!to) return null;
+        const to = String(ctx.params.to ?? ctx.to ?? '').trim();
+        if (!to) {
+          defaultLogger.warn('handleAction send: no "to" in params or ctx, falling back to gateway');
+          return null;
+        }
 
         const sendCtx: SendContext = { webhookUrl: config.webhookUrl, bot, dialogId: to };
         const message = String(ctx.params.message ?? '').trim();
@@ -1503,8 +1556,19 @@ export const bitrix24Plugin = {
                     }
                   }
                   if (payload.text) {
-                    const keyboard = extractKeyboardFromPayload(payload);
-                    await sendService.sendText(sendCtx, payload.text, keyboard ? { keyboard } : undefined);
+                    let text = payload.text;
+                    let keyboard = extractKeyboardFromPayload(payload);
+
+                    // Fallback: agent may embed button JSON in text as [[{...}]]
+                    if (!keyboard) {
+                      const extracted = extractInlineButtonsFromText(text);
+                      if (extracted) {
+                        text = extracted.cleanText;
+                        keyboard = extracted.keyboard;
+                      }
+                    }
+
+                    await sendService.sendText(sendCtx, text, keyboard ? { keyboard } : undefined);
                   }
                 },
                 onReplyStart: async () => {

package/tests/channel.test.ts

@@ -97,7 +97,7 @@ describe('convertButtonsToKeyboard', () => {
     }
   });
 
-  it('converts non-slash callback_data to ACTION PUT', () => {
+  it('converts non-slash callback_data to ACTION SEND with text as value', () => {
     const kb = convertButtonsToKeyboard([
       [{ text: 'Click me', callback_data: 'some_value' }],
     ]);
@@ -106,7 +106,7 @@ describe('convertButtonsToKeyboard', () => {
     if (isButton(btn)) {
       expect(btn.COMMAND).toBeUndefined();
       expect(btn.ACTION).toBe('SEND');
-      expect(btn.ACTION_VALUE).toBe('some_value');
+      expect(btn.ACTION_VALUE).toBe('Click me');
     }
   });