@deadragdoll/tellymcp 0.0.9 → 0.0.11

package/dist/services/features/telegram-mcp/gateway-delivery.service.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TELEGRAM_MCP_GATEWAY_DELIVERY_SERVICE_NAME = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const runtime_service_1 = require("./runtime.service");
-const ids_1 = require("./src/shared/lib/ids/ids");
-const client_1 = require("./src/shared/integrations/tmux/client");
+const xchangeRecordHints_1 = require("./src/shared/lib/xchangeRecordHints");
+const client_1 = require("./src/shared/integrations/terminal/client");
+const sqliteRecordStore_1 = require("./src/shared/integrations/xchange/sqliteRecordStore");
 exports.TELEGRAM_MCP_GATEWAY_DELIVERY_SERVICE_NAME = "telegramMcp.gatewayDelivery";
 function renderYamlArray(values) {
     if (values.length === 0) {
@@ -15,7 +16,55 @@ function renderYamlArray(values) {
     }
     return `\n${values.map((value) => `  - ${JSON.stringify(value)}`).join("\n")}`;
 }
+function looksLikeFileDeliveryRequest(input) {
+    if (input.kind !== "request" && input.kind !== "question") {
+        return false;
+    }
+    const haystack = [
+        input.summary,
+        input.message,
+        input.expectedReply ?? "",
+    ]
+        .join("\n")
+        .toLowerCase();
+    return (/\b(send_partner_file|file delivery path|artifact|artifacts)\b/u.test(haystack) ||
+        /\b(файл|артефакт|артефакты)\b/u.test(haystack) ||
+        /\b[\w.-]+\.(html|txt|md|json|ts|tsx|js|jsx|css|scss|png|jpg|jpeg|webp|pdf|zip)\b/u.test(haystack));
+}
+function looksLikeBrowserScreenshotRequest(input) {
+    if (input.kind !== "request" && input.kind !== "question") {
+        return false;
+    }
+    const haystack = [
+        input.summary,
+        input.message,
+        input.expectedReply ?? "",
+    ]
+        .join("\n")
+        .toLowerCase();
+    return (/\b(browser_open|browser_screenshot|playwright)\b/u.test(haystack) ||
+        /\b(скриншот|screenshot|скрин)\b/u.test(haystack) ||
+        /\bhttps?:\/\/[^\s]+/u.test(haystack));
+}
 function buildNoteContent(input) {
+    const isDirectRoute = input.delivery.route_mode === "direct";
+    const isTelegramHumanSource = input.delivery.source_client_uuid === "gateway-telegram";
+    const prefersFileDelivery = looksLikeFileDeliveryRequest({
+        kind: input.delivery.kind,
+        summary: input.delivery.summary,
+        message: input.delivery.message,
+        ...(input.delivery.expected_reply
+            ? { expectedReply: input.delivery.expected_reply }
+            : {}),
+    });
+    const prefersBrowserScreenshot = looksLikeBrowserScreenshotRequest({
+        kind: input.delivery.kind,
+        summary: input.delivery.summary,
+        message: input.delivery.message,
+        ...(input.delivery.expected_reply
+            ? { expectedReply: input.delivery.expected_reply }
+            : {}),
+    });
     const lines = ["---"];
     lines.push(`message_uuid: ${JSON.stringify(input.delivery.message_uuid)}`);
     lines.push(`kind: ${JSON.stringify(input.delivery.kind)}`);
@@ -40,70 +89,112 @@ function buildNoteContent(input) {
     if (input.delivery.expected_reply?.trim()) {
         lines.push("", "# Expected Reply", input.delivery.expected_reply.trim());
     }
-    if (input.delivery.requires_reply) {
-        lines.push("", "# Reply Params", `message_uuid: ${input.delivery.message_uuid}`, `target_session_id: ${input.delivery.source_session_uuid}`, ...(input.delivery.project_uuid
+    if (isTelegramHumanSource) {
+        lines.push("", "# Human Reply Route", "Reply to the human with notify_telegram after you finish the requested work.", "Do not use send_partner_note for a human Telegram reply.");
+    }
+    else if (input.delivery.requires_reply) {
+        lines.push("", "# Reply Params", `message_uuid: ${input.delivery.message_uuid}`, ...(isDirectRoute
+            ? [
+                ...(input.delivery.source_client_uuid
+                    ? [`target_client_uuid: ${input.delivery.source_client_uuid}`]
+                    : []),
+                `target_local_session_id: ${input.delivery.source_local_session_id}`,
+            ]
+            : [`target_session_id: ${input.delivery.source_session_uuid}`]), ...(!isDirectRoute && input.delivery.project_uuid
             ? [`project_uuid: ${input.delivery.project_uuid}`]
-            : []), "", "# Action Required", "You must send a reply via send_partner_note.", "Your task is not complete until send_partner_note succeeds.", "Do not stop after local analysis or a chat explanation.", "Do not rely on linked partner.", "Pass target_session_id explicitly.", "If possible, also pass in_reply_to=message_uuid.", "Only after the tool succeeds may you say that the reply was sent.", "", "# Reply Tool Call Example", "send_partner_note(", `  session_id=${JSON.stringify(input.delivery.target_local_session_id)},`, `  target_session_id=${JSON.stringify(input.delivery.source_session_uuid)},`, `  kind=${JSON.stringify("reply")},`, ...(input.delivery.project_uuid
+            : []), "", "# Action Required", ...(prefersFileDelivery
+            ? [
+                "You must send the requested file via send_partner_file.",
+                ...(prefersBrowserScreenshot
+                    ? [
+                        "For a webpage screenshot request, first use browser_open and browser_screenshot in this console.",
+                        "Do not replace the browser workflow with a shell Playwright command unless the browser tools actually fail.",
+                    ]
+                    : []),
+                "Do not paste file contents into send_partner_note.",
+                "Do not stop after reading, listing files, or explaining what you found.",
+                "Your task is not complete until send_partner_file succeeds.",
+                "Do not mark_xchange_record_read before send_partner_file succeeds.",
+            ]
+            : [
+                "You must send a reply via send_partner_note.",
+                "Do not stop after reading, listing files, or explaining what you found.",
+                "Your task is not complete until send_partner_note succeeds.",
+                "Do not mark_xchange_record_read before send_partner_note succeeds.",
+            ]), "Do not stop after local analysis, inspection, or a chat explanation.", "If the request asks you to produce an artifact, actually produce and send the artifact.", ...(isDirectRoute
+            ? [
+                "Do not rely on implicit partner selection or project-scoped target_session_id.",
+                "Pass target_client_uuid and target_local_session_id explicitly.",
+            ]
+            : [
+                "Do not rely on implicit partner selection.",
+                "Pass target_session_id explicitly.",
+            ]), "If possible, also pass in_reply_to=message_uuid.", "Only after the tool succeeds may you say that the reply was sent.", "", ...(prefersFileDelivery
+            ? [
+                ...(prefersBrowserScreenshot
+                    ? [
+                        "# Preferred Browser Workflow Example",
+                        "browser_open(",
+                        "  url=\"https://github.com\",",
+                        "  wait_until=\"networkidle\"",
+                        ")",
+                        "browser_screenshot(",
+                        "  file_name=\"github.com.png\"",
+                        ")",
+                        "",
+                    ]
+                    : []),
+                "# Preferred Reply Tool Call Example",
+                "send_partner_file(",
+                `  session_id=${JSON.stringify(input.delivery.target_local_session_id)},`,
+                ...(isDirectRoute
+                    ? [
+                        ...(input.delivery.source_client_uuid
+                            ? [
+                                `  target_client_uuid=${JSON.stringify(input.delivery.source_client_uuid)},`,
+                            ]
+                            : []),
+                        `  target_local_session_id=${JSON.stringify(input.delivery.source_local_session_id)},`,
+                    ]
+                    : [
+                        `  target_session_id=${JSON.stringify(input.delivery.source_session_uuid)},`,
+                    ]),
+                ...(!isDirectRoute && input.delivery.project_uuid
+                    ? [`  project_uuid=${JSON.stringify(input.delivery.project_uuid)},`]
+                    : []),
+                `  file_path=${JSON.stringify(prefersBrowserScreenshot ? "github.com.png" : "index.html")},`,
+                `  in_reply_to=${JSON.stringify(input.delivery.message_uuid)},`,
+                "  summary=\"Передаю запрошенный файл\",",
+                "  message=\"Передаю реальный файл как артефакт\"",
+                ")",
+                "",
+                "# Alternate Reply Tool Call Example",
+            ]
+            : ["# Reply Tool Call Example"]), "send_partner_note(", `  session_id=${JSON.stringify(input.delivery.target_local_session_id)},`, ...(isDirectRoute
+            ? [
+                ...(input.delivery.source_client_uuid
+                    ? [
+                        `  target_client_uuid=${JSON.stringify(input.delivery.source_client_uuid)},`,
+                    ]
+                    : []),
+                `  target_local_session_id=${JSON.stringify(input.delivery.source_local_session_id)},`,
+            ]
+            : [
+                `  target_session_id=${JSON.stringify(input.delivery.source_session_uuid)},`,
+            ]), `  kind=${JSON.stringify("reply")},`, ...(!isDirectRoute && input.delivery.project_uuid
             ? [`  project_uuid=${JSON.stringify(input.delivery.project_uuid)},`]
             : []), `  in_reply_to=${JSON.stringify(input.delivery.message_uuid)},`, "  summary=\"Короткий итог\",", "  message=\"Подробный ответ\"", ")");
     }
+    if (!input.delivery.requires_reply && input.delivery.kind === "reply") {
+        lines.push("", "# Follow-up", "If this reply completes a task that originally came from a human Telegram request in the receiving session, the receiving session must now deliver the final result to the human.", "Use notify_telegram for text-only results.", "If this reply returned a real artifact or file, use send_file_to_telegram from the receiving session instead of leaving the artifact only in local xchange storage.");
+    }
     if (input.copiedArtifacts.length > 0) {
         lines.push("", "# Artifacts", ...input.copiedArtifacts.map((artifact) => `- ${artifact}`));
     }
     return `${lines.join("\n")}\n`;
 }
-function buildShareIndexLine(input) {
-    return [
-        "-",
-        `[${input.delivery.created_at}]`,
-        `${input.delivery.source_session_label} → ${input.delivery.target_session_label}`,
-        `| ${input.delivery.kind} |`,
-        `${input.delivery.summary}`,
-        `| \`${input.relativeNotePath}\``,
-    ].join(" ");
-}
-function buildPartnerInboxText(input) {
-    const sourceActorLabel = input.delivery.source_actor_label || input.delivery.source_session_label;
-    const kindTitle = input.delivery.kind === "question"
-        ? `Получен вопрос от ${sourceActorLabel}.`
-        : input.delivery.kind === "reply"
-            ? `Получен ответ от ${sourceActorLabel}.`
-            : input.delivery.kind === "request"
-                ? `Получен запрос от ${sourceActorLabel}.`
-                : input.delivery.kind === "handoff"
-                    ? `Получен handoff от ${sourceActorLabel}.`
-                    : `Получено обновление от ${sourceActorLabel}.`;
-    return [
-        kindTitle,
-        ...(input.delivery.project_name
-            ? [`Проект: ${input.delivery.project_name}`]
-            : []),
-        `Сессия: ${input.delivery.source_session_label} -> ${input.delivery.target_session_label}`,
-        `Кратко: ${input.delivery.summary}`,
-        "",
-        `Действие: открой ${input.delivery.share_index_file_name}, затем note ниже.`,
-        `Note: ${input.notePath}`,
-        ...(input.copiedArtifacts.length > 0
-            ? ["", "Файлы:", ...input.copiedArtifacts.map((item) => `- ${item}`)]
-            : []),
-        ...(input.delivery.requires_reply
-            ? [
-                "",
-                `Reply message_uuid: ${input.delivery.message_uuid}`,
-                `Reply target_session_id: ${input.delivery.source_session_uuid}`,
-                ...(input.delivery.project_uuid
-                    ? [`Reply project_uuid: ${input.delivery.project_uuid}`]
-                    : []),
-                "Обязательно отправь reply через send_partner_note.",
-                "Задача не завершена, пока send_partner_note не отработал успешно.",
-                "Не останавливайся на локальном объяснении.",
-                "Не используй linked partner для ответа. Передай эти параметры явно в send_partner_note.",
-                "Только после успешного tool call можно считать ответ отправленным.",
-            ]
-            : []),
-    ].join("\n");
-}
 function buildTelegramDeliveryNotification(input) {
+    const isDirectRoute = input.delivery.route_mode === "direct";
     const sourceActorLabel = input.delivery.source_actor_label || input.delivery.source_session_label;
     const kindTitle = input.delivery.kind === "question"
         ? `Получен вопрос от ${sourceActorLabel}.`
@@ -135,8 +226,17 @@ function buildTelegramDeliveryNotification(input) {
             ? [
                 "",
                 `Reply message_uuid: ${input.delivery.message_uuid}`,
-                `Reply target_session_id: ${input.delivery.source_session_uuid}`,
-                ...(input.delivery.project_uuid
+                ...(isDirectRoute
+                    ? [
+                        ...(input.delivery.source_client_uuid
+                            ? [
+                                `Reply target_client_uuid: ${input.delivery.source_client_uuid}`,
+                            ]
+                            : []),
+                        `Reply target_local_session_id: ${input.delivery.source_local_session_id}`,
+                    ]
+                    : [`Reply target_session_id: ${input.delivery.source_session_uuid}`]),
+                ...(!isDirectRoute && input.delivery.project_uuid
                     ? [`Reply project_uuid: ${input.delivery.project_uuid}`]
                     : []),
             ]
@@ -207,19 +307,19 @@ const TelegramMcpGatewayDeliveryService = {
             }
             const targetBinding = await runtime.bindingStore.getBinding(targetSession.sessionId);
             if (!targetBinding) {
-                runtime.logger.warn("Skipping gateway delivery because target session is not paired with Telegram", {
+                runtime.logger.info("Gateway delivery will be materialized without Telegram route", {
                     deliveryUuid: delivery.delivery_uuid,
                     sessionId: targetSession.sessionId,
                 });
-                return;
             }
+            const workspaceDir = runtime.objectStore.resolveWorkspaceDir(targetSession);
             const copiedArtifacts = [];
             for (const artifact of delivery.artifacts) {
                 const relativePath = artifact.relative_path ||
                     `shares/files/${delivery.share_id}/${artifact.original_name}`;
                 let localArtifactPath;
                 if (artifact.content_base64) {
-                    localArtifactPath = await (0, client_1.writeXchangeRelativeFile)(runtime.config.tmux, runtime.objectStore.resolveWorkspaceDir(targetSession), runtime.config.exchange.dir, relativePath, Buffer.from(artifact.content_base64, "base64"));
+                    localArtifactPath = await (0, client_1.writeXchangeRelativeFile)(runtime.config.terminal, workspaceDir, runtime.config.exchange.dir, relativePath, Buffer.from(artifact.content_base64, "base64"));
                 }
                 else {
                     localArtifactPath = await runtime.objectStore.ensureLocalFile({
@@ -246,7 +346,7 @@ const TelegramMcpGatewayDeliveryService = {
                 });
             }
             const noteContent = buildNoteContent({ delivery, copiedArtifacts });
-            const notePath = await (0, client_1.writeXchangeRelativeFile)(runtime.config.tmux, runtime.objectStore.resolveWorkspaceDir(targetSession), runtime.config.exchange.dir, delivery.note_relative_path, Buffer.from(noteContent, "utf8"));
+            const notePath = await (0, client_1.writeXchangeRelativeFile)(runtime.config.terminal, workspaceDir, runtime.config.exchange.dir, delivery.note_relative_path, Buffer.from(noteContent, "utf8"));
             await runtime.xchangeFileMetaStore.setXchangeFileMeta({
                 sessionId: targetSession.sessionId,
                 filePath: notePath,
@@ -256,52 +356,134 @@ const TelegramMcpGatewayDeliveryService = {
                 mimeType: "text/markdown",
                 sizeBytes: Buffer.byteLength(noteContent, "utf8"),
             });
-            await (0, client_1.writeXchangeRelativeFile)(runtime.config.tmux, runtime.objectStore.resolveWorkspaceDir(targetSession), runtime.config.exchange.dir, delivery.share_index_file_name, Buffer.from(`${buildShareIndexLine({
-                delivery,
-                relativeNotePath: delivery.note_relative_path,
-            })}\n`, "utf8"), { append: true });
-            const inboxMessage = {
-                id: (0, ids_1.createInboxMessageId)(new Date(delivery.created_at)),
-                sessionId: targetSession.sessionId,
-                telegramChatId: targetBinding.telegramChatId,
-                telegramUserId: targetBinding.telegramUserId,
-                sourceTelegramMessageId: Date.now(),
-                text: buildPartnerInboxText({
-                    delivery,
-                    notePath,
-                    copiedArtifacts,
-                }),
-                attachments: [notePath, ...copiedArtifacts],
-                receivedAt: delivery.created_at,
-            };
-            await runtime.inboxStore.createInboxMessage(inboxMessage);
-            try {
-                await runtime.telegramTransport.sendNotification({
-                    sessionId: targetSession.sessionId,
-                    sessionLabel: delivery.source_session_label,
-                    recipient: {
-                        telegramChatId: targetBinding.telegramChatId,
-                        telegramUserId: targetBinding.telegramUserId,
+            const isTelegramHumanSource = delivery.source_client_uuid === "gateway-telegram";
+            const prefersFileDelivery = looksLikeFileDeliveryRequest({
+                kind: delivery.kind,
+                summary: delivery.summary,
+                message: delivery.message,
+                ...(delivery.expected_reply
+                    ? { expectedReply: delivery.expected_reply }
+                    : {}),
+            });
+            const prefersBrowserScreenshot = looksLikeBrowserScreenshotRequest({
+                kind: delivery.kind,
+                summary: delivery.summary,
+                message: delivery.message,
+                ...(delivery.expected_reply
+                    ? { expectedReply: delivery.expected_reply }
+                    : {}),
+            });
+            const actionDesc = isTelegramHumanSource
+                ? (0, xchangeRecordHints_1.buildIncomingTelegramMessageActionDesc)(delivery.kind, (0, xchangeRecordHints_1.detectIncomingTelegramBrowserScreenshotRequest)({
+                    kind: delivery.kind,
+                    text: delivery.message,
+                    ...(delivery.summary.trim()
+                        ? { summary: delivery.summary.trim() }
+                        : {}),
+                }))
+                : (0, xchangeRecordHints_1.buildIncomingPartnerActionDesc)(delivery.kind, delivery.requires_reply, prefersFileDelivery, prefersBrowserScreenshot);
+            await (0, sqliteRecordStore_1.upsertXchangeRecord)(runtime.config.terminal, workspaceDir, runtime.config.exchange.dir, {
+                record_id: delivery.share_id,
+                session_id: targetSession.sessionId,
+                category: isTelegramHumanSource ? "telegram_message" : "partner_note",
+                direction: "incoming",
+                status: "new",
+                kind: delivery.kind,
+                summary: delivery.summary,
+                body_text: noteContent,
+                action_desc: actionDesc,
+                tools: isTelegramHumanSource
+                    ? (0, xchangeRecordHints_1.buildIncomingTelegramMessageTools)(delivery.kind, (0, xchangeRecordHints_1.detectIncomingTelegramBrowserScreenshotRequest)({
+                        kind: delivery.kind,
+                        text: delivery.message,
+                        ...(delivery.summary.trim()
+                            ? { summary: delivery.summary.trim() }
+                            : {}),
+                    }))
+                    : (0, xchangeRecordHints_1.buildIncomingPartnerTools)(delivery.kind, delivery.requires_reply, prefersFileDelivery, prefersBrowserScreenshot),
+                note_path: notePath,
+                note_relative_path: delivery.note_relative_path,
+                source_session_id: delivery.source_session_uuid,
+                source_label: delivery.source_session_label,
+                ...(delivery.source_client_uuid
+                    ? { source_client_uuid: delivery.source_client_uuid }
+                    : {}),
+                source_local_session_id: delivery.source_local_session_id,
+                target_session_id: delivery.target_session_uuid,
+                target_label: delivery.target_session_label,
+                ...(delivery.target_client_uuid
+                    ? { target_client_uuid: delivery.target_client_uuid }
+                    : {}),
+                target_local_session_id: delivery.target_local_session_id,
+                ...(delivery.project_uuid ? { project_uuid: delivery.project_uuid } : {}),
+                ...(delivery.project_name ? { project_name: delivery.project_name } : {}),
+                requires_reply: delivery.requires_reply,
+                ...(delivery.expected_reply
+                    ? { expected_reply: delivery.expected_reply }
+                    : {}),
+                ...(delivery.in_reply_to ? { in_reply_to: delivery.in_reply_to } : {}),
+                attachments: [
+                    {
+                        file_path: notePath,
+                        relative_path: delivery.note_relative_path,
+                        original_name: node_path_1.default.basename(delivery.note_relative_path),
+                        mime_type: "text/markdown",
+                        size_bytes: Buffer.byteLength(noteContent, "utf8"),
                     },
-                    message: buildTelegramDeliveryNotification({
-                        delivery,
-                        notePath,
-                        copiedArtifacts,
-                    }),
-                });
-            }
-            catch (error) {
-                runtime.logger.warn("Failed to send Telegram notification for gateway delivery", {
-                    deliveryUuid: delivery.delivery_uuid,
-                    sessionId: targetSession.sessionId,
-                    error: error instanceof Error ? (error.stack ?? error.message) : String(error),
-                });
+                    ...delivery.artifacts.map((artifact, index) => ({
+                        file_path: copiedArtifacts[index] ?? artifact.original_name,
+                        ...(artifact.relative_path
+                            ? { relative_path: artifact.relative_path }
+                            : {}),
+                        original_name: artifact.original_name,
+                        ...(artifact.mime_type ? { mime_type: artifact.mime_type } : {}),
+                        ...(typeof artifact.size_bytes === "number"
+                            ? { size_bytes: artifact.size_bytes }
+                            : {}),
+                        ...(artifact.storage_ref ? { storage_ref: artifact.storage_ref } : {}),
+                    })),
+                ],
+                tags: [
+                    "partner",
+                    delivery.kind,
+                    ...(delivery.project_uuid ? ["project"] : ["direct"]),
+                    ...(delivery.requires_reply ? ["requires-reply"] : []),
+                ],
+                created_at: delivery.created_at,
+                updated_at: delivery.created_at,
+            });
+            if (targetBinding && !isTelegramHumanSource) {
+                try {
+                    await runtime.telegramTransport.sendNotification({
+                        sessionId: targetSession.sessionId,
+                        sessionLabel: delivery.source_session_label,
+                        recipient: {
+                            telegramChatId: targetBinding.telegramChatId,
+                            telegramUserId: targetBinding.telegramUserId,
+                        },
+                        message: buildTelegramDeliveryNotification({
+                            delivery,
+                            notePath,
+                            copiedArtifacts,
+                        }),
+                    });
+                }
+                catch (error) {
+                    runtime.logger.warn("Failed to send Telegram notification for gateway delivery", {
+                        deliveryUuid: delivery.delivery_uuid,
+                        sessionId: targetSession.sessionId,
+                        error: error instanceof Error ? (error.stack ?? error.message) : String(error),
+                    });
+                }
             }
             try {
-                await runtime.telegramTransport.nudgeSessionPartnerNote(targetSession.sessionId);
+                await runtime.telegramTransport.nudgeSessionPartnerNote(targetSession.sessionId, {
+                    kind: delivery.kind,
+                    requiresReply: delivery.requires_reply,
+                });
             }
             catch (error) {
-                runtime.logger.warn("Failed to nudge tmux after gateway delivery", {
+                runtime.logger.warn("Failed to nudge terminal after gateway delivery", {
                     deliveryUuid: delivery.delivery_uuid,
                     sessionId: targetSession.sessionId,
                     error: error instanceof Error ? (error.stack ?? error.message) : String(error),

package/dist/services/features/telegram-mcp/gateway-rmq.service.js

@@ -276,10 +276,11 @@ const TelegramMcpGatewayRmqService = {
             throw new Error(`Local Moleculer service '${runtime_service_1.TELEGRAM_MCP_RUNTIME_SERVICE_NAME}' is unavailable`);
         }
         this.runtimeService = runtimeService;
+        const runtime = await runtimeService.waitUntilReady();
         if (!this.isEnabled?.()) {
             this.logger.info("Gateway RMQ is disabled", {
-                distributedMode: runtimeService.getRuntime().config.distributed.mode,
-                rmqConfigured: Boolean(runtimeService.getRuntime().config.distributed.rmq?.host),
+                distributedMode: runtime.config.distributed.mode,
+                rmqConfigured: Boolean(runtime.config.distributed.rmq?.host),
             });
             return;
         }