@ihazz/bitrix24 1.1.7 → 1.1.9

package/README.md

@@ -1,6 +1,7 @@
 # @ihazz/bitrix24
 
 OpenClaw channel plugin for Bitrix24 Messenger based on Bot Platform 2.0 (`imbot.v2.*` / `im.v2.*`).
+This is the official, Bitrix24-certified OpenClaw plugin for Bitrix24 Messenger.
 
 ## Current Status
 
@@ -65,7 +66,7 @@ Minimal configuration:
       "groupPolicy": "webhookUser",
       "requireMention": true,
       "historyLimit": 100,
-      "showTyping": true, 
+      "showTyping": true,
       "capabilities": [
         "inlineButtons",
         "reactions"
@@ -173,10 +174,10 @@ The direct-message scenario is configured independently through `dmPolicy`. Grou
 | `4. Add the bot to a group chat where it responds to all of my messages in that chat.` | The bot stores all delivered group messages in RAM history, but answers only the webhook owner and does not require mention. | `groupPolicy: "webhookUser"`, `requireMention: false` |
 | `5. Add the bot to a group chat where it responds only to my mentions in that chat.` | The bot stores all delivered group messages in RAM history, but answers only the webhook owner and only on mention. | `groupPolicy: "webhookUser"`, `requireMention: true` |
 | `6. Add the bot to a group chat where scenarios 2 through 5 apply only to users from my allowlist.` | The bot stores all delivered group messages in RAM history, but group replies are limited to the merged allowlist. | `groupPolicy: "allowlist"`, `allowFrom: ["77", "42"]`, plus `requireMention: false` or `true` |
-| `7. The bot can summarize or search messages from any direct or group chat it participates in.` | This is baseline behavior. All delivered messages are recorded in RAM history and can later be used for in-chat context or explicit cross-chat lookup. | No extra flag. Usually `historyLimit: 100`. Use explicit Bitrix24 chat mention like `[CHAT=520]Green Chat 15[/CHAT]` for cross-chat lookup. |
+| `7. The bot can summarize recent messages from the current chat and from previously seen group chats it participates in.` | This is baseline behavior. All delivered messages are recorded in RAM history for in-chat context. Previously seen group chats can also be injected from RAM by explicit Bitrix24 chat mention. | No extra flag. Usually `historyLimit: 100`. Use explicit Bitrix24 chat mention like `[CHAT=520]Green Chat 15[/CHAT]` for group cross-chat lookup. |
 | `8. In a group chat, the bot can watch a specific user and answer only on selected topics.` | The bot records all delivered messages and may answer watched users without mention when a watch rule matches. | `groups.<chat>.watch: [{ "userId": "77", "topics": ["secret", "contract"] }]` |
-| `9. In a group chat, the bot can watch a specific user or all users and notify the bot owner in DM with a forwarded copy of the matched message.` | The bot records all delivered messages. When a watch rule matches, it does not answer in the group and instead sends the webhook owner a DM notice with a context URL, plus a native forwarded message copy. | `groups.<chat>.watch: [{ "userId": "*", "topics": ["incident"], "mode": "notifyOwnerDm" }]` |
-| `10. The bot can watch all accessible group chats for a phrase and notify the bot owner in DM with a forwarded copy of the matched message.` | The bot records all delivered group messages. A wildcard group watch applies across every allowed group chat, even when a specific chat also has its own overrides. | `groups["*"].watch: [{ "userId": "*", "topics": ["incident"], "mode": "notifyOwnerDm" }]` |
+| `9. In a group chat, the bot can watch a specific user or all users and notify the bot owner in DM with a copy of the matched message.` | The bot records all delivered messages. When a watch rule matches, it does not answer in the group and instead sends the webhook owner a DM notice with a context URL, then tries a native forwarded copy and falls back to a quoted copy if forwarding is unavailable. | `groups.<chat>.watch: [{ "userId": "*", "topics": ["incident"], "mode": "notifyOwnerDm" }]` |
+| `10. The bot can watch all accessible group chats for a phrase and notify the bot owner in DM with a copy of the matched message.` | The bot records all delivered group messages. A wildcard group watch applies across every allowed group chat, even when a specific chat also has its own overrides. Delivery uses the same native-forward-first flow with quoted fallback when forwarding is unavailable. | `groups["*"].watch: [{ "userId": "*", "topics": ["incident"], "mode": "notifyOwnerDm" }]` |
 
 Default profile:
 
@@ -323,7 +324,7 @@ For a matching `watch` rule:
 - the sender is matched by Bitrix24 user ID; use `"*"` to match any sender
 - `topics` are matched by normalized text inclusion / token prefix matching
 - `mode: "reply"` answers in the group even if the normal group policy would otherwise require a mention
-- `mode: "notifyOwnerDm"` sends the webhook owner a DM notice with a user mention and a deep link back to the original chat context, plus a native forwarded copy of the matched message instead of replying in the group
+- `mode: "notifyOwnerDm"` sends the webhook owner a DM notice with a deep link back to the original chat context, then tries a native forwarded copy of the matched message and falls back to a quoted copy if forwarding is unavailable
 - `groups["*"].watch` applies the same rule set to every allowed group chat
 - if a specific group also defines `watch`, those chat-specific rules are checked first and the wildcard rules remain available as a fallback
 
@@ -364,7 +365,7 @@ If `mode` is omitted, `reply` is used.
 - Forwarded-message hydration from Bitrix24 message context, including merge with buffered neighboring context when related events arrive close together
 - Cross-chat lookup from RAM memory by explicit Bitrix24 chat mention like `[CHAT=520]Green Chat 15[/CHAT]`
 - Topic watches for specific group users
-- Owner-DM watch notifications with native forwarded messages
+- Owner-DM watch notifications with native forward and quoted fallback
 - Agent-mode ingestion of user-visible messages through combined polling
 - Agent-mode owner-DM watch notifications through `agentWatch`
 
@@ -377,13 +378,13 @@ Arbitrary local server paths are rejected on purpose for safety.
 ## Not Supported
 
 - Persistent SQLite or search-based history layer
-- Persistent reply or forward search across chats beyond what Bitrix24 `Chat.Message.get` / `getContext` can return
-- “Reply to me in DM because this started in a group” behavior
+- Persistent cross-chat reply or forward retrieval beyond current RAM history and what Bitrix24 `Chat.Message.get` / `getContext` can return
+- Generic “reply to me in DM because this started in a group” behavior
 - Sending replies as the user through `im.v2.Chat.Message.*`
-- Agent-triggered user auto-replies or one-shot autoresponder flows
+- Agent-mode user-event auto-replies or one-shot autoresponder flows
 - Production-ready multi-account operation in one process
 
-There is already account-config scaffolding in the plugin, but the current production recommendation is still one active Bitrix24 portal per instance.
+There is already account-config scaffolding in the plugin, but the runtime still enforces a singleton Bitrix24 gateway per process, so the current production recommendation remains one active Bitrix24 portal per instance.
 
 ## Verification
 

package/dist/src/channel.d.ts

@@ -34,7 +34,12 @@ export declare function resolveConversationRef(params: {
     dialogId: string;
     isDirect: boolean;
 }): Bitrix24ConversationRef;
-export declare function buildConversationSessionKey(routeSessionKey: string, conversation: Pick<Bitrix24ConversationRef, 'address'>): string;
+export declare function buildConversationSessionKey(routeSessionKey: string, conversation: Pick<Bitrix24ConversationRef, 'address'>, sessionNamespace?: string): string;
+type ActiveSessionNamespaceEntry = {
+    namespace: string;
+    updatedAt: number;
+};
+export declare function normalizeActiveSessionNamespaceState(state: unknown, accountId: string, now?: number): Record<string, ActiveSessionNamespaceEntry>;
 /** State held per running gateway instance */
 interface GatewayState {
     accountId: string;
@@ -46,9 +51,11 @@ interface GatewayState {
     eventMode: 'fetch' | 'webhook';
 }
 export declare function __setGatewayStateForTests(state: GatewayState | null): void;
+export declare function buildWelcomeKeyboard(language?: string): B24Keyboard;
 /** Default keyboard shown with command responses and welcome messages. */
 export declare function buildDefaultCommandKeyboard(language?: string): B24Keyboard;
 export declare const DEFAULT_COMMAND_KEYBOARD: B24Keyboard;
+export declare const DEFAULT_WELCOME_KEYBOARD: B24Keyboard;
 /** Generic button format used by OpenClaw channelData. */
 export interface ChannelButton {
     text: string;

package/dist/src/channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../src/channel.ts"],"names":[],"mappings":"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"}

package/dist/src/channel.js

@@ -1,18 +1,20 @@
-import { createHash } from 'node:crypto';
-import { basename } from 'node:path';
+import { createHash, randomUUID } from 'node:crypto';
+import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { basename, dirname, join } from 'node:path';
 import { listAccountIds, resolveAccount, getConfig } from './config.js';
 import { Bitrix24Api } from './api.js';
 import { SendService } from './send-service.js';
 import { MediaService } from './media-service.js';
 import { InboundHandler } from './inbound-handler.js';
 import { PollingService } from './polling-service.js';
+import { resolvePollingStateDir } from './state-paths.js';
 import { normalizeAllowEntry, normalizeAllowList, checkAccessWithPairing, getWebhookUserId, } from './access-control.js';
 import { checkGroupAccessPassive, checkGroupAccessWithPairing, resolveAgentWatchRules, resolveGroupAccess, } from './group-access.js';
 import { DEFAULT_AVATAR_BASE64 } from './bot-avatar.js';
 import { Bitrix24ApiError, createVerboseLogger, defaultLogger, CHANNEL_PREFIX_RE } from './utils.js';
 import { getBitrix24Runtime } from './runtime.js';
-import { OPENCLAW_COMMANDS, buildCommandsHelpText, formatModelsCommandReply } from './commands.js';
-import { accessApproved, accessDenied, commandKeyboardLabels, groupPairingPending, mediaDownloadFailed, groupChatUnsupported, onboardingMessage, ownerAndAllowedUsersOnly, personalBotOwnerOnly, replyGenerationFailed, watchOwnerDmNotice, } from './i18n.js';
+import { OPENCLAW_COMMANDS, buildCommandsHelpText, formatModelsCommandReply, getCommandRegistrationPayload, } from './commands.js';
+import { accessApproved, accessDenied, commandKeyboardLabels, groupPairingPending, mediaDownloadFailed, groupChatUnsupported, newSessionReplyTexts, onboardingMessage, normalizeNewSessionReply, ownerAndAllowedUsersOnly, personalBotOwnerOnly, replyGenerationFailed, welcomeKeyboardLabels, watchOwnerDmNotice, } from './i18n.js';
 import { HistoryCache } from './history-cache.js';
 const PHASE_STATUS_DURATION_SECONDS = 8;
 const PHASE_STATUS_REFRESH_GRACE_MS = 1000;
@@ -31,6 +33,9 @@ const CROSS_CHAT_HISTORY_LIMIT = 20;
 const ACCESS_DENIED_REACTION = 'crossMark';
 const BOT_MESSAGE_WATCH_REACTION = 'eyes';
 const FORWARDED_CONTEXT_RANGE = 5;
+const ACTIVE_SESSION_NAMESPACE_TTL_MS = 180 * 24 * 60 * 60 * 1000;
+const ACTIVE_SESSION_NAMESPACE_MAX_KEYS = 1000;
+const ACTIVE_SESSION_NAMESPACE_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const REGISTERED_COMMANDS = new Set(OPENCLAW_COMMANDS.map((command) => command.command));
 // ─── Emoji → B24 reaction code mapping ──────────────────────────────────
 // B24 uses named reaction codes, not Unicode emoji.
@@ -125,7 +130,7 @@ function buildTopicsBbCode(topics) {
         .join(', ');
 }
 function formatQuoteTimestamp(timestamp, language) {
-    const locale = (language ?? 'ru').toLowerCase().slice(0, 2);
+    const locale = (language ?? 'en').toLowerCase().slice(0, 2);
     const value = timestamp ?? Date.now();
     try {
         return new Intl.DateTimeFormat(locale, {
@@ -137,7 +142,7 @@ function formatQuoteTimestamp(timestamp, language) {
         }).format(new Date(value)).replace(',', '');
     }
     catch {
-        return new Intl.DateTimeFormat('ru', {
+        return new Intl.DateTimeFormat('en', {
             year: 'numeric',
             month: '2-digit',
             day: '2-digit',
@@ -146,6 +151,12 @@ function formatQuoteTimestamp(timestamp, language) {
         }).format(new Date(value)).replace(',', '');
     }
 }
+function buildWatchQuoteAnchor(msgCtx, ownerId) {
+    if (msgCtx.isGroup) {
+        return `#${msgCtx.chatId}/${msgCtx.messageId}`;
+    }
+    return `#${msgCtx.chatId}:${ownerId}/${msgCtx.messageId}`;
+}
 function buildWatchQuoteText(params) {
     const separator = '------------------------------------------------------';
     const senderLine = `${escapeBbCodeText(params.senderName)} [${formatQuoteTimestamp(params.timestamp, params.language)}] ${params.anchor}`;
@@ -349,8 +360,81 @@ export function resolveConversationRef(params) {
         },
     };
 }
-export function buildConversationSessionKey(routeSessionKey, conversation) {
-    return `${routeSessionKey}:${conversation.address}`;
+export function buildConversationSessionKey(routeSessionKey, conversation, sessionNamespace) {
+    const baseKey = `${routeSessionKey}:${conversation.address}`;
+    return sessionNamespace
+        ? `${baseKey}:${sessionNamespace}`
+        : baseKey;
+}
+function normalizeSessionNamespaceTimestamp(value, now, fallback) {
+    let parsed;
+    if (typeof value === 'number') {
+        parsed = value;
+    }
+    else if (typeof value === 'string') {
+        const asNumber = Number(value);
+        parsed = Number.isFinite(asNumber) ? asNumber : Date.parse(value);
+    }
+    if (!Number.isFinite(parsed) || parsed == null || parsed <= 0) {
+        return fallback;
+    }
+    return Math.min(parsed, now);
+}
+function isValidActiveSessionNamespace(value) {
+    return typeof value === 'string' && ACTIVE_SESSION_NAMESPACE_RE.test(value);
+}
+export function normalizeActiveSessionNamespaceState(state, accountId, now = Date.now()) {
+    if (!state || typeof state !== 'object') {
+        return {};
+    }
+    const rawState = state;
+    const fallbackUpdatedAt = normalizeSessionNamespaceTimestamp(rawState.updatedAt, now, now);
+    const accountKeyPrefix = `${accountId}:`;
+    const entries = [];
+    for (const [key, value] of Object.entries(rawState.sessions ?? {})) {
+        if (!key.startsWith(accountKeyPrefix)) {
+            continue;
+        }
+        let namespace;
+        let updatedAt = fallbackUpdatedAt;
+        if (typeof value === 'string') {
+            namespace = value;
+        }
+        else if (value && typeof value === 'object') {
+            const rawEntry = value;
+            namespace = rawEntry.namespace;
+            updatedAt = normalizeSessionNamespaceTimestamp(rawEntry.updatedAt, now, fallbackUpdatedAt);
+        }
+        if (!isValidActiveSessionNamespace(namespace)) {
+            continue;
+        }
+        if (now - updatedAt > ACTIVE_SESSION_NAMESPACE_TTL_MS) {
+            continue;
+        }
+        entries.push([key, { namespace, updatedAt }]);
+    }
+    entries.sort((left, right) => left[1].updatedAt - right[1].updatedAt);
+    return Object.fromEntries(entries.slice(-ACTIVE_SESSION_NAMESPACE_MAX_KEYS));
+}
+function pruneActiveSessionNamespaceEntries(entries, now = Date.now()) {
+    for (const [key, value] of entries) {
+        if (!isValidActiveSessionNamespace(value?.namespace)
+            || !Number.isFinite(value?.updatedAt)
+            || value.updatedAt <= 0
+            || now - value.updatedAt > ACTIVE_SESSION_NAMESPACE_TTL_MS) {
+            entries.delete(key);
+        }
+    }
+    if (entries.size <= ACTIVE_SESSION_NAMESPACE_MAX_KEYS) {
+        return;
+    }
+    const overflow = entries.size - ACTIVE_SESSION_NAMESPACE_MAX_KEYS;
+    const staleFirst = [...entries.entries()]
+        .sort((left, right) => left[1].updatedAt - right[1].updatedAt)
+        .slice(0, overflow);
+    for (const [key] of staleFirst) {
+        entries.delete(key);
+    }
 }
 function buildHistoryBody(msgCtx) {
     const text = msgCtx.text.trim();
@@ -518,7 +602,7 @@ function normalizeTopicText(text) {
 }
 function tokenizeTopicText(text) {
     return normalizeTopicText(text)
-        .split(/[^a-zа-яё0-9]+/i)
+        .split(/[^\p{L}\p{N}]+/u)
         .filter(Boolean);
 }
 function matchesWatchTopic(messageText, topic) {
@@ -654,7 +738,18 @@ let gatewayState = null;
 export function __setGatewayStateForTests(state) {
     gatewayState = state;
 }
-// ─── Default command keyboard ────────────────────────────────────────────────
+// ─── Keyboard layouts ────────────────────────────────────────────────────────
+export function buildWelcomeKeyboard(language) {
+    const labels = welcomeKeyboardLabels(language);
+    return [
+        { TEXT: labels.todayTasks, ACTION: 'SEND', ACTION_VALUE: labels.todayTasks, DISPLAY: 'LINE' },
+        { TEXT: labels.stalledDeals, ACTION: 'SEND', ACTION_VALUE: labels.stalledDeals, DISPLAY: 'LINE' },
+        { TYPE: 'NEWLINE' },
+        { TEXT: labels.newSession, COMMAND: 'new', DISPLAY: 'LINE' },
+        { TEXT: labels.commands, COMMAND: 'commands', DISPLAY: 'LINE' },
+        { TEXT: labels.help, COMMAND: 'help', BG_COLOR_TOKEN: 'primary', DISPLAY: 'LINE' },
+    ];
+}
 /** Default keyboard shown with command responses and welcome messages. */
 export function buildDefaultCommandKeyboard(language) {
     const labels = commandKeyboardLabels(language);
@@ -668,6 +763,7 @@ export function buildDefaultCommandKeyboard(language) {
     ];
 }
 export const DEFAULT_COMMAND_KEYBOARD = buildDefaultCommandKeyboard();
+export const DEFAULT_WELCOME_KEYBOARD = buildWelcomeKeyboard();
 function parseRegisteredCommandTrigger(callbackData) {
     const trimmed = callbackData.trim();
     const isSlashCommand = trimmed.startsWith('/');
@@ -739,7 +835,8 @@ export function extractKeyboardFromPayload(payload) {
     }
     const tgData = cd.telegram;
     if (tgData?.buttons?.length) {
-        return convertButtonsToKeyboard(tgData.buttons);
+        const keyboard = convertButtonsToKeyboard(tgData.buttons);
+        return keyboard.length > 0 ? keyboard : undefined;
     }
     return undefined;
 }
@@ -781,6 +878,12 @@ function normalizeCommandReplyPayload(params) {
             return { text: formattedText, convertMarkdown: false };
         }
     }
+    if (commandName === 'new' && commandParams.trim() === '') {
+        const normalizedText = normalizeNewSessionReply(language, text);
+        if (normalizedText) {
+            return { text: normalizedText, convertMarkdown: false };
+        }
+    }
     return { text };
 }
 /**
@@ -835,7 +938,7 @@ async function sendInitialWelcomeToWebhookOwner(params) {
     const text = onboardingMessage(language, config.botName ?? 'OpenClaw', config.dmPolicy);
     const options = isPairing
         ? undefined
-        : { keyboard: buildDefaultCommandKeyboard(language) };
+        : { keyboard: buildWelcomeKeyboard(language) };
     try {
         await sendService.sendText(sendCtx, text, options);
         welcomedDialogs.add(ownerId);
@@ -942,8 +1045,7 @@ async function ensureCommandsRegistered(api, config, bot, logger) {
         try {
             await api.registerCommand(webhookUrl, bot, {
                 command: cmd.command,
-                title: { en: cmd.en, ru: cmd.ru },
-                ...(cmd.params ? { params: { en: cmd.params, ru: cmd.params } } : {}),
+                ...getCommandRegistrationPayload(cmd),
             });
             registered++;
         }
@@ -1339,6 +1441,72 @@ export const bitrix24Plugin = {
             const welcomedDialogs = new Set();
             const dialogNoticeTimestamps = new Map();
             const historyCache = new HistoryCache({ maxKeys: HISTORY_CACHE_MAX_KEYS });
+            const activeSessionNamespaces = new Map();
+            const sessionNamespaceStatePath = join(resolvePollingStateDir(), `session-namespaces-${ctx.accountId}.json`);
+            let persistActiveSessionNamespacesTail = Promise.resolve();
+            const buildActiveSessionNamespaceKey = (conversation) => {
+                return `${ctx.accountId}:${conversation.address}`;
+            };
+            const loadActiveSessionNamespaces = async () => {
+                try {
+                    const raw = await readFile(sessionNamespaceStatePath, 'utf-8');
+                    const state = JSON.parse(raw);
+                    const entries = normalizeActiveSessionNamespaceState(state, ctx.accountId);
+                    const persistedSessions = state.sessions ?? {};
+                    const needsCompaction = Object.keys(entries).length !== Object.keys(persistedSessions).length
+                        || Object.values(persistedSessions).some((value) => typeof value === 'string');
+                    activeSessionNamespaces.clear();
+                    for (const [key, value] of Object.entries(entries)) {
+                        activeSessionNamespaces.set(key, value);
+                    }
+                    if (needsCompaction) {
+                        void persistActiveSessionNamespaces();
+                    }
+                }
+                catch (err) {
+                    logger.debug('Failed to load active session namespaces, starting fresh', err);
+                }
+            };
+            const persistActiveSessionNamespaces = () => {
+                persistActiveSessionNamespacesTail = persistActiveSessionNamespacesTail
+                    .catch(() => undefined)
+                    .then(async () => {
+                    try {
+                        pruneActiveSessionNamespaceEntries(activeSessionNamespaces);
+                        await mkdir(dirname(sessionNamespaceStatePath), { recursive: true });
+                        const data = JSON.stringify({
+                            updatedAt: new Date().toISOString(),
+                            sessions: Object.fromEntries(activeSessionNamespaces),
+                        }, null, 2);
+                        const tmpPath = `${sessionNamespaceStatePath}.${randomUUID()}.tmp`;
+                        await writeFile(tmpPath, data, 'utf-8');
+                        await rename(tmpPath, sessionNamespaceStatePath);
+                    }
+                    catch (err) {
+                        logger.warn('Failed to persist active session namespaces', err);
+                    }
+                });
+                return persistActiveSessionNamespacesTail;
+            };
+            const resolveActiveConversationSessionKey = (routeSessionKey, conversation) => {
+                return buildConversationSessionKey(routeSessionKey, conversation, activeSessionNamespaces.get(buildActiveSessionNamespaceKey(conversation))?.namespace);
+            };
+            const startNewConversationSession = async (conversation) => {
+                const sessionNamespace = randomUUID();
+                pruneActiveSessionNamespaceEntries(activeSessionNamespaces);
+                historyCache.clear(conversation.historyKey);
+                activeSessionNamespaces.set(buildActiveSessionNamespaceKey(conversation), {
+                    namespace: sessionNamespace,
+                    updatedAt: Date.now(),
+                });
+                await persistActiveSessionNamespaces();
+                logger.info('Started new local conversation session', {
+                    dialogId: conversation.dialogId,
+                    sessionNamespace,
+                });
+                return sessionNamespace;
+            };
+            await loadActiveSessionNamespaces();
             // Cleanup stale denied dialog entries once per day
             const DENIED_CLEANUP_INTERVAL_MS = 24 * 60 * 60 * 1000;
             const deniedCleanupTimer = setInterval(() => {
@@ -1575,7 +1743,7 @@ export const bitrix24Plugin = {
                         RawBody: body,
                         From: conversation.address,
                         To: conversation.address,
-                        SessionKey: buildConversationSessionKey(route.sessionKey, conversation),
+                        SessionKey: resolveActiveConversationSessionKey(route.sessionKey, conversation),
                         AccountId: route.accountId,
                         ChatType: msgCtx.isDm ? 'direct' : 'group',
                         ConversationLabel: msgCtx.senderName,
@@ -1737,6 +1905,18 @@ export const bitrix24Plugin = {
                     bot,
                     dialogId: ownerId,
                 };
+                const sendQuotedWatchMessage = async () => {
+                    const quoteText = buildWatchQuoteText({
+                        senderName: msgCtx.senderName || msgCtx.chatName || msgCtx.chatId,
+                        language: msgCtx.language,
+                        timestamp: msgCtx.timestamp,
+                        anchor: buildWatchQuoteAnchor(msgCtx, ownerId),
+                        body: msgCtx.text.trim(),
+                    });
+                    await sendService.sendText(ownerSendCtx, quoteText, {
+                        convertMarkdown: false,
+                    });
+                };
                 const noticeText = watchOwnerDmNotice(msgCtx.language, {
                     chatRef: buildChatContextUrl(msgCtx.chatId, msgCtx.messageId, msgCtx.isDm
                         ? (msgCtx.senderName || msgCtx.chatName || msgCtx.chatId)
@@ -1748,24 +1928,17 @@ export const bitrix24Plugin = {
                     await sendService.sendText(ownerSendCtx, noticeText, {
                         convertMarkdown: false,
                     });
-                    if (msgCtx.eventScope === 'user' && msgCtx.isDm) {
-                        const quoteText = buildWatchQuoteText({
-                            senderName: msgCtx.senderName || msgCtx.chatName || msgCtx.chatId,
-                            language: msgCtx.language,
-                            timestamp: msgCtx.timestamp,
-                            anchor: `#${msgCtx.chatId}:${ownerId}/${msgCtx.messageId}`,
-                            body: msgCtx.text.trim(),
-                        });
-                        await sendService.sendText(ownerSendCtx, quoteText, {
-                            convertMarkdown: false,
-                        });
-                        return true;
+                    try {
+                        await api.sendMessage(webhookUrl, bot, ownerId, null, { forwardMessages: [forwardedMessageId] });
+                    }
+                    catch (err) {
+                        logger.warn('Failed to send owner watch notification with native forward, falling back to quote', err);
+                        await sendQuotedWatchMessage();
                     }
-                    await api.sendMessage(webhookUrl, bot, ownerId, null, { forwardMessages: [forwardedMessageId] });
                     return true;
                 }
                 catch (err) {
-                    logger.warn('Failed to send owner watch notification with native forward', err);
+                    logger.warn('Failed to send owner watch notification', err);
                     return false;
                 }
             };
@@ -1988,9 +2161,10 @@ export const bitrix24Plugin = {
                 onCommand: async (cmdCtx) => {
                     const { commandId, commandName, commandParams, commandText, senderId, dialogId, chatId, chatType, messageId, } = cmdCtx;
                     const isDm = chatType === 'P';
+                    const replyDialogId = isDm ? senderId : dialogId;
                     const conversation = resolveConversationRef({
                         accountId: ctx.accountId,
-                        dialogId,
+                        dialogId: replyDialogId,
                         isDirect: isDm,
                     });
                     logger.info('Inbound command', {
@@ -2006,7 +2180,7 @@ export const bitrix24Plugin = {
                     const sendCtx = {
                         webhookUrl,
                         bot,
-                        dialogId: conversation.dialogId,
+                        dialogId: replyDialogId,
                     };
                     let runtime;
                     let cfg;
@@ -2078,7 +2252,6 @@ export const bitrix24Plugin = {
                         await sendService.answerCommandText(commandSendCtx, groupChatUnsupported(cmdCtx.language), { convertMarkdown: false });
                         return;
                     }
-                    await sendService.sendStatus(sendCtx, 'IMBOT_AGENT_ACTION_THINKING', 8);
                     if (accessResult === 'deny') {
                         await sendService.markRead(sendCtx, commandMessageId);
                         await sendService.answerCommandText(commandSendCtx, buildAccessDeniedNotice(cmdCtx.language, isDm ? config.dmPolicy : groupAccess?.groupPolicy, {
@@ -2099,6 +2272,9 @@ export const bitrix24Plugin = {
                     }
                     await directTextCoalescer.flush(ctx.accountId, conversation.dialogId);
                     const defaultCommandKeyboard = buildDefaultCommandKeyboard(cmdCtx.language);
+                    const defaultSessionKeyboard = commandName === 'new' && commandParams.trim() === ''
+                        ? buildWelcomeKeyboard(cmdCtx.language)
+                        : defaultCommandKeyboard;
                     if (commandName === 'help' || commandName === 'commands') {
                         const helpText = buildCommandsHelpText(cmdCtx.language, { concise: commandName === 'help' });
                         if (isDm) {
@@ -2109,6 +2285,18 @@ export const bitrix24Plugin = {
                         }
                         return;
                     }
+                    if (commandName === 'new' && commandParams.trim() === '') {
+                        await startNewConversationSession(conversation);
+                        const startedText = newSessionReplyTexts(cmdCtx.language).started;
+                        if (isDm) {
+                            await sendService.sendText(sendCtx, startedText, { keyboard: defaultSessionKeyboard, convertMarkdown: false });
+                        }
+                        else {
+                            await sendService.answerCommandText(commandSendCtx, startedText, { keyboard: defaultSessionKeyboard, convertMarkdown: false });
+                        }
+                        return;
+                    }
+                    await sendService.sendStatus(sendCtx, 'IMBOT_AGENT_ACTION_THINKING', 8);
                     const route = runtime.channel.routing.resolveAgentRoute({
                         cfg,
                         channel: 'bitrix24',
@@ -2123,7 +2311,7 @@ export const bitrix24Plugin = {
                         CommandBody: commandText,
                         CommandAuthorized: true,
                         CommandSource: 'native',
-                        CommandTargetSessionKey: buildConversationSessionKey(route.sessionKey, conversation),
+                        CommandTargetSessionKey: resolveActiveConversationSessionKey(route.sessionKey, conversation),
                         From: conversation.address,
                         To: `slash:${senderId}`,
                         SessionKey: slashSessionKey,
@@ -2157,7 +2345,7 @@ export const bitrix24Plugin = {
                                     await replyStatusHeartbeat.stopAndWait();
                                     if (payload.text) {
                                         const keyboard = extractKeyboardFromPayload(payload)
-                                            ?? defaultCommandKeyboard;
+                                            ?? defaultSessionKeyboard;
                                         const formattedPayload = normalizeCommandReplyPayload({
                                             commandName,
                                             commandParams,
@@ -2200,13 +2388,13 @@ export const bitrix24Plugin = {
                             const fallbackText = replyGenerationFailed(cmdCtx.language);
                             if (isDm) {
                                 await sendService.sendText(sendCtx, fallbackText, {
-                                    keyboard: defaultCommandKeyboard,
+                                    keyboard: defaultSessionKeyboard,
                                     convertMarkdown: false,
                                 });
                             }
                             else {
                                 await sendService.answerCommandText(commandSendCtx, fallbackText, {
-                                    keyboard: defaultCommandKeyboard,
+                                    keyboard: defaultSessionKeyboard,
                                     convertMarkdown: false,
                                 });
                             }
@@ -2223,13 +2411,13 @@ export const bitrix24Plugin = {
                         const fallbackText = replyGenerationFailed(cmdCtx.language);
                         if (isDm) {
                             await sendService.sendText(sendCtx, fallbackText, {
-                                keyboard: defaultCommandKeyboard,
+                                keyboard: defaultSessionKeyboard,
                                 convertMarkdown: false,
                             });
                         }
                         else {
                             await sendService.answerCommandText(commandSendCtx, fallbackText, {
-                                keyboard: defaultCommandKeyboard,
+                                keyboard: defaultSessionKeyboard,
                                 convertMarkdown: false,
                             });
                         }
@@ -2312,7 +2500,7 @@ export const bitrix24Plugin = {
                     const isPairing = config.dmPolicy === 'pairing';
                     const text = onboardingMessage(language, config.botName ?? 'OpenClaw', config.dmPolicy);
                     try {
-                        await sendService.sendText(sendCtx, text, isPairing ? undefined : { keyboard: buildDefaultCommandKeyboard(language) });
+                        await sendService.sendText(sendCtx, text, isPairing ? undefined : { keyboard: buildWelcomeKeyboard(language) });
                         welcomedDialogs.add(dialogId);
                         logger.info('Welcome message sent', { dialogId });
                     }