@ihazz/bitrix24 1.1.12 → 1.1.13

package/src/message-utils.ts

@@ -149,6 +149,7 @@ export function markdownToBbCode(md: string): string {
   text = text.replace(/~~(.+?)~~/g, '[S]$1[/S]');
 
   // 3f. HTML inline formatting tags
+  text = text.replace(/<br\s*\/?>/gi, '[BR]');
   text = text.replace(/<u>([\s\S]*?)<\/u>/gi, '[U]$1[/U]');
   text = text.replace(/<b>([\s\S]*?)<\/b>/gi, '[B]$1[/B]');
   text = text.replace(/<strong>([\s\S]*?)<\/strong>/gi, '[B]$1[/B]');
@@ -158,13 +159,18 @@ export function markdownToBbCode(md: string): string {
   text = text.replace(/<del>([\s\S]*?)<\/del>/gi, '[S]$1[/S]');
   text = text.replace(/<strike>([\s\S]*?)<\/strike>/gi, '[S]$1[/S]');
 
-  // 3g. Links: [text](url) → [URL=url]text[/URL]
-  text = text.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '[URL=$2]$1[/URL]');
+  // 3g. Links: [text](url) → Bitrix BB-code links and action links
+  text = text.replace(/\[([^\]]+)\]\(([\s\S]*?)\)/g, (_match, label: string, rawTarget: string) => {
+    return convertMarkdownLink(label, rawTarget);
+  });
 
   // 3h. Autolink URL: <https://...> → [URL]https://...[/URL]
   text = text.replace(/<(https?:\/\/[^>]+)>/g, '[URL]$1[/URL]');
 
-  // 3i. Autolink email: <user@example.com> → [URL]mailto:user@example.com[/URL]
+  // 3i. Autolink tel URI: <tel:+79991234567> → [CALL]+79991234567[/CALL]
+  text = text.replace(/<tel:([^>]+)>/gi, '[CALL]$1[/CALL]');
+
+  // 3j. Autolink email: <user@example.com> → [URL]mailto:user@example.com[/URL]
   text = text.replace(/<([a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,})>/g, '[URL]mailto:$1[/URL]');
 
   // ── Phase 4: Restore placeholders ─────────────────────────────────────────
@@ -645,6 +651,87 @@ function extractMarkdownTarget(rawTarget: string): string {
   return trimmed;
 }
 
+function convertMarkdownLink(label: string, rawTarget: string): string {
+  const target = extractMarkdownTarget(rawTarget);
+  const normalizedTarget = target.trim();
+
+  if (!normalizedTarget) {
+    return label;
+  }
+
+  const sendMatch = normalizedTarget.match(/^send:(.+)$/i);
+  if (sendMatch) {
+    const payload = normalizeActionLinkPayload(sendMatch[1]);
+    return payload ? `[SEND=${payload}]${label}[/SEND]` : `[SEND]${label}[/SEND]`;
+  }
+
+  const putMatch = normalizedTarget.match(/^put:(.+)$/i);
+  if (putMatch) {
+    const payload = normalizeActionLinkPayload(putMatch[1]);
+    return payload ? `[PUT=${payload}]${label}[/PUT]` : `[PUT]${label}[/PUT]`;
+  }
+
+  const callMatch = normalizedTarget.match(/^(?:call|tel):(.+)$/i);
+  if (callMatch) {
+    const phone = callMatch[1].trim();
+    return phone ? `[CALL=${phone}]${label}[/CALL]` : `[CALL]${label}[/CALL]`;
+  }
+
+  const userMatch = normalizedTarget.match(/^user:(.+)$/i);
+  if (userMatch) {
+    return `[USER=${userMatch[1].trim()}]${label}[/USER]`;
+  }
+
+  const chatMatch = normalizedTarget.match(/^chat:(.+)$/i);
+  if (chatMatch) {
+    return `[CHAT=${chatMatch[1].trim()}]${label}[/CHAT]`;
+  }
+
+  const contextMatch = normalizedTarget.match(/^context:(.+)$/i);
+  if (contextMatch) {
+    return `[context=${contextMatch[1].trim()}]${label}[/context]`;
+  }
+
+  const diskMatch = normalizedTarget.match(/^disk:(.+)$/i);
+  if (diskMatch) {
+    return `[disk=${diskMatch[1].trim()}]`;
+  }
+
+  const timestampMatch = normalizedTarget.match(/^timestamp:(.+)$/i);
+  if (timestampMatch) {
+    const timestampMarkup = buildTimestampBbCode(timestampMatch[1].trim());
+    if (timestampMarkup) {
+      return timestampMarkup;
+    }
+  }
+
+  return `[URL=${normalizedTarget}]${label}[/URL]`;
+}
+
+function normalizeActionLinkPayload(value: string): string {
+  return value.trim().replace(/^\/\//, '/');
+}
+
+function buildTimestampBbCode(value: string): string {
+  if (!value) {
+    return '';
+  }
+
+  const [timestamp, rawQuery = ''] = value.split('?', 2);
+  const normalizedTimestamp = timestamp.trim();
+  if (!normalizedTimestamp) {
+    return '';
+  }
+
+  const params = new URLSearchParams(rawQuery);
+  const format = params.get('format')?.trim();
+  if (format) {
+    return `[timestamp=${normalizedTimestamp} format=${format}]`;
+  }
+
+  return `[timestamp=${normalizedTimestamp}]`;
+}
+
 function normalizeBitrixImageUrl(rawUrl: string): string {
   const trimmed = rawUrl.trim();
   if (!trimmed) return trimmed;

package/src/runtime.ts

@@ -2,6 +2,7 @@ interface ReplyPayload {
   text?: string;
   mediaUrl?: string;
   mediaUrls?: string[];
+  replyToId?: string;
   isError?: boolean;
   channelData?: Record<string, unknown>;
 }

package/src/send-service.ts

@@ -41,6 +41,7 @@ export class SendService {
     options?: {
       keyboard?: B24Keyboard;
       convertMarkdown?: boolean;
+      replyToMessageId?: number;
       forwardMessages?: number[];
       system?: boolean;
     },
@@ -49,8 +50,41 @@ export class SendService {
       ? markdownToBbCode(text)
       : text;
 
-    const chunks = splitMessage(convertedText);
-    if (chunks.length === 0) return { ok: true };
+    const chunks = convertedText.length > 0 ? splitMessage(convertedText) : [];
+    if (chunks.length === 0) {
+      if (!options?.forwardMessages?.length) {
+        return { ok: true };
+      }
+
+      const msgOptions: {
+        forwardMessages?: number[];
+        replyToMessageId?: number;
+        system?: boolean;
+      } = {
+        forwardMessages: options.forwardMessages,
+      };
+
+      if (options?.replyToMessageId) {
+        msgOptions.replyToMessageId = options.replyToMessageId;
+      }
+      if (options?.system !== undefined) {
+        msgOptions.system = options.system;
+      }
+
+      try {
+        const messageId = await this.api.sendMessage(
+          ctx.webhookUrl,
+          ctx.bot,
+          ctx.dialogId,
+          null,
+          msgOptions,
+        );
+        return { ok: true, messageId };
+      } catch (error) {
+        this.logger.error('Failed to send forwarded message without text', { error: serializeError(error) });
+        throw error;
+      }
+    }
     let lastMessageId: number | undefined;
 
     for (let i = 0; i < chunks.length; i++) {
@@ -58,6 +92,7 @@ export class SendService {
       const isLast = i === chunks.length - 1;
       const msgOptions: {
         keyboard?: B24Keyboard;
+        replyToMessageId?: number;
         forwardMessages?: number[];
         system?: boolean;
       } = {};
@@ -65,6 +100,9 @@ export class SendService {
       if (isLast && options?.keyboard) {
         msgOptions.keyboard = options.keyboard;
       }
+      if (isFirst && options?.replyToMessageId) {
+        msgOptions.replyToMessageId = options.replyToMessageId;
+      }
       if (isFirst && options?.forwardMessages?.length) {
         msgOptions.forwardMessages = options.forwardMessages;
       }

package/src/state-paths.ts

@@ -23,6 +23,17 @@ export function resolveManagedMediaDir(env: NodeJS.ProcessEnv = process.env): st
   return join(resolveOpenClawStateDir(env), 'media', 'bitrix24');
 }
 
+export function resolveTrustedWorkspaceDirs(env: NodeJS.ProcessEnv = process.env): string[] {
+  const roots = [
+    env.OPENCLAW_WORKSPACE_DIR?.trim(),
+    env.CLAWDBOT_WORKSPACE_DIR?.trim(),
+    join(resolveOpenClawStateDir(env), 'workspace'),
+    join(resolveHomeDir(env), 'workspace'),
+  ].filter((value): value is string => Boolean(value));
+
+  return [...new Set(roots.map((root) => resolvePath(root)))];
+}
+
 export function resolvePollingStateDir(env: NodeJS.ProcessEnv = process.env): string {
   return join(resolveOpenClawStateDir(env), 'state', 'bitrix24');
 }

package/src/types.ts

@@ -346,12 +346,134 @@ export interface KeyboardNewline {
 /** B24 keyboard: flat array with NEWLINE separators between rows */
 export type B24Keyboard = (KeyboardButton | KeyboardNewline)[];
 
+export type B24AttachColorToken = 'primary' | 'secondary' | 'alert' | 'base';
+
+export interface B24AttachMessageBlock {
+  MESSAGE: string;
+}
+
+export interface B24AttachLinkValue {
+  LINK: string;
+  NAME?: string;
+  DESC?: string;
+  HTML?: string;
+  PREVIEW?: string;
+  WIDTH?: number;
+  HEIGHT?: number;
+  USER_ID?: number;
+  CHAT_ID?: number;
+  NETWORK_ID?: string;
+}
+
+export interface B24AttachLinkBlock {
+  LINK: B24AttachLinkValue;
+}
+
+export interface B24AttachImageItem {
+  LINK: string;
+  NAME?: string;
+  PREVIEW?: string;
+  WIDTH?: number;
+  HEIGHT?: number;
+}
+
+export interface B24AttachImageBlock {
+  IMAGE: B24AttachImageItem | B24AttachImageItem[];
+}
+
+export interface B24AttachFileItem {
+  LINK: string;
+  NAME?: string;
+  SIZE?: number;
+}
+
+export interface B24AttachFileBlock {
+  FILE: B24AttachFileItem | B24AttachFileItem[];
+}
+
+export interface B24AttachDelimiterValue {
+  SIZE?: number;
+  COLOR?: string;
+}
+
+export interface B24AttachDelimiterBlock {
+  DELIMITER: B24AttachDelimiterValue;
+}
+
+export type B24AttachGridDisplay = 'BLOCK' | 'LINE' | 'ROW' | 'TABLE';
+
+export interface B24AttachGridItem {
+  DISPLAY: B24AttachGridDisplay;
+  NAME?: string;
+  VALUE?: string;
+  WIDTH?: number;
+  HEIGHT?: number;
+  COLOR_TOKEN?: B24AttachColorToken;
+  COLOR?: string;
+  LINK?: string;
+  USER_ID?: number;
+  CHAT_ID?: number;
+}
+
+export interface B24AttachGridBlock {
+  GRID: B24AttachGridItem[];
+}
+
+export interface B24AttachUserValue {
+  NAME?: string;
+  AVATAR?: string;
+  LINK?: string;
+  USER_ID?: number;
+  NETWORK_ID?: string;
+}
+
+export interface B24AttachUserBlock {
+  USER: B24AttachUserValue;
+}
+
+export type B24AttachBlock =
+  | B24AttachMessageBlock
+  | B24AttachLinkBlock
+  | B24AttachImageBlock
+  | B24AttachFileBlock
+  | B24AttachDelimiterBlock
+  | B24AttachGridBlock
+  | B24AttachUserBlock;
+
+export interface B24AttachEnvelope {
+  ID?: number;
+  COLOR_TOKEN?: B24AttachColorToken;
+  COLOR?: string;
+  BLOCKS: B24AttachBlock[];
+}
+
+export type B24Attach = B24AttachEnvelope | B24AttachBlock[];
+
 export interface SendMessageResult {
   ok: boolean;
   messageId?: number;
   error?: string;
 }
 
+// ─── Message Action Discovery ────────────────────────────────────────────────
+
+export interface ChannelMessageToolSchemaContribution {
+  properties: Record<string, unknown>;
+  visibility?: 'current-channel' | 'all-configured';
+}
+
+export interface ChannelMessageToolDiscovery {
+  actions: string[];
+  capabilities: string[];
+  schema: ChannelMessageToolSchemaContribution | ChannelMessageToolSchemaContribution[] | null;
+}
+
+export interface ExtractedToolSendTarget {
+  to: string;
+  accountId?: string;
+  threadId?: string;
+}
+
 // ─── FETCH Mode Context ─────────────────────────────────────────────────────
 
 /** Context passed from PollingService to InboundHandler for FETCH events */