@grinev/opencode-telegram-bot 0.5.0 → 0.6.1-rc.1

package/dist/pinned/manager.js

@@ -266,7 +266,7 @@ class PinnedMessageManager {
             logger.debug(`[PinnedManager] loadDiffsFromMessages: ${messagesData.length} messages`);
             const filesMap = new Map();
             let toolCount = 0;
-            let editWriteCount = 0;
+            let fileToolCount = 0;
             for (const { parts } of messagesData) {
                 for (const part of parts) {
                     if (part.type !== "tool")
@@ -275,10 +275,12 @@ class PinnedMessageManager {
                     const toolPart = part;
                     if (toolPart.state.status !== "completed")
                         continue;
-                    if (toolPart.tool === "edit" || toolPart.tool === "write") {
-                        editWriteCount++;
+                    if (toolPart.tool === "edit" ||
+                        toolPart.tool === "write" ||
+                        toolPart.tool === "apply_patch") {
+                        fileToolCount++;
                     }
-                    if (toolPart.tool === "edit" &&
+                    if ((toolPart.tool === "edit" || toolPart.tool === "apply_patch") &&
                         toolPart.state.metadata &&
                         "filediff" in toolPart.state.metadata) {
                         const filediff = toolPart.state.metadata.filediff;
@@ -318,7 +320,7 @@ class PinnedMessageManager {
                     }
                 }
             }
-            logger.debug(`[PinnedManager] loadDiffsFromMessages: found ${toolCount} tool parts, ${editWriteCount} edit/write`);
+            logger.debug(`[PinnedManager] loadDiffsFromMessages: found ${toolCount} tool parts, ${fileToolCount} file tools`);
             if (filesMap.size > 0) {
                 this.state.changedFiles = Array.from(filesMap.values());
                 logger.info(`[PinnedManager] Loaded ${this.state.changedFiles.length} file diffs from messages`);

package/dist/settings/manager.js

@@ -119,5 +119,10 @@ export function __resetSettingsForTests() {
     settingsWriteQueue = Promise.resolve();
 }
 export async function loadSettings() {
-    currentSettings = await readSettingsFile();
+    const loadedSettings = (await readSettingsFile());
+    if ("toolMessagesIntervalSec" in loadedSettings) {
+        delete loadedSettings.toolMessagesIntervalSec;
+        void writeSettingsFile(loadedSettings);
+    }
+    currentSettings = loadedSettings;
 }

package/dist/summary/aggregator.js

@@ -1,6 +1,29 @@
-import { prepareCodeFile } from "./formatter.js";
+import { normalizePathForDisplay, prepareCodeFile } from "./formatter.js";
 import { logger } from "../utils/logger.js";
 import { getCurrentProject } from "../settings/manager.js";
+function extractFirstUpdatedFileFromTitle(title) {
+    for (const rawLine of title.split("\n")) {
+        const line = rawLine.trim();
+        if (line.length >= 3 && line[1] === " " && /[AMDURC]/.test(line[0])) {
+            return line.slice(2).trim();
+        }
+    }
+    return "";
+}
+function countDiffChangesFromText(text) {
+    let additions = 0;
+    let deletions = 0;
+    for (const line of text.split("\n")) {
+        if (line.startsWith("+") && !line.startsWith("+++")) {
+            additions++;
+            continue;
+        }
+        if (line.startsWith("-") && !line.startsWith("---")) {
+            deletions++;
+        }
+    }
+    return { additions, deletions };
+}
 class SummaryAggregator {
     currentSessionId = null;
     currentMessageParts = new Map();
@@ -19,6 +42,7 @@ class SummaryAggregator {
     onPermissionCallback = null;
     onSessionDiffCallback = null;
     onFileChangeCallback = null;
+    onClearedCallback = null;
     processedToolStates = new Set();
     bot = null;
     chatId = null;
@@ -61,6 +85,9 @@ class SummaryAggregator {
     setOnFileChange(callback) {
         this.onFileChangeCallback = callback;
     }
+    setOnCleared(callback) {
+        this.onClearedCallback = callback;
+    }
     startTypingIndicator() {
         if (this.typingTimer) {
             return;
@@ -145,6 +172,14 @@ class SummaryAggregator {
         this.processedToolStates.clear();
         this.messageCount = 0;
         this.lastUpdated = 0;
+        if (this.onClearedCallback) {
+            try {
+                this.onClearedCallback();
+            }
+            catch (err) {
+                logger.error("[Aggregator] Error in clear callback:", err);
+            }
+        }
     }
     handleMessageUpdated(event) {
         const { info } = event.properties;
@@ -160,8 +195,11 @@ class SummaryAggregator {
                 this.startTypingIndicator();
                 // Notify that agent started thinking
                 if (this.onThinkingCallback) {
+                    const callback = this.onThinkingCallback;
                     setImmediate(() => {
-                        this.onThinkingCallback();
+                        if (typeof callback === "function") {
+                            callback(info.sessionID);
+                        }
                     });
                 }
             }
@@ -260,10 +298,12 @@ class SummaryAggregator {
             }
             if ("status" in state && state.status === "completed") {
                 logger.debug(`[Aggregator] Tool completed: callID=${part.callID}, tool=${part.tool}`, JSON.stringify(state, null, 2));
-                const notifiedKey = `notified-${part.callID}`;
-                if (!this.processedToolStates.has(notifiedKey)) {
-                    this.processedToolStates.add(notifiedKey);
+                const completedKey = `completed-${part.callID}`;
+                if (!this.processedToolStates.has(completedKey)) {
+                    this.processedToolStates.add(completedKey);
+                    const preparedFileContext = this.prepareToolFileContext(part.tool, input, title, state.metadata);
                     const toolData = {
+                        sessionId: part.sessionID,
                         messageId: messageID,
                         callId: part.callID,
                         tool: part.tool,
@@ -271,61 +311,105 @@ class SummaryAggregator {
                         input,
                         title,
                         metadata: state.metadata,
+                        hasFileAttachment: !!preparedFileContext.fileData,
                     };
                     logger.debug(`[Aggregator] Sending tool notification to Telegram: tool=${part.tool}, title=${title || "N/A"}`);
                     if (this.onToolCallback) {
                         this.onToolCallback(toolData);
                     }
-                }
-            }
-            if ("status" in state && state.status === "completed") {
-                const fileKey = `file-${part.callID}`;
-                if (!this.processedToolStates.has(fileKey)) {
-                    this.processedToolStates.add(fileKey);
-                    if (part.tool === "write" && input && "content" in input && "filePath" in input) {
-                        const fileData = prepareCodeFile(input.content, input.filePath, "write");
-                        if (fileData && this.onToolFileCallback) {
-                            logger.debug(`[Aggregator] Sending write file: ${fileData.filename} (${fileData.buffer.length} bytes)`);
-                            this.onToolFileCallback(fileData);
-                        }
-                        // Notify about file change for pinned message
-                        if (this.onFileChangeCallback) {
-                            const lines = input.content.split("\n").length;
-                            this.onFileChangeCallback({
-                                file: input.filePath,
-                                additions: lines,
-                                deletions: 0,
-                            });
-                        }
+                    if (preparedFileContext.fileData && this.onToolFileCallback) {
+                        logger.debug(`[Aggregator] Sending ${part.tool} file: ${preparedFileContext.fileData.filename} (${preparedFileContext.fileData.buffer.length} bytes)`);
+                        this.onToolFileCallback({
+                            ...toolData,
+                            hasFileAttachment: true,
+                            fileData: preparedFileContext.fileData,
+                        });
                     }
-                    else if (part.tool === "edit" &&
-                        state.metadata &&
-                        "diff" in state.metadata &&
-                        "filediff" in state.metadata) {
-                        const filediff = state.metadata.filediff;
-                        const filePath = filediff.file;
-                        const diff = state.metadata.diff;
-                        if (filePath && diff) {
-                            const fileData = prepareCodeFile(diff, filePath, "edit");
-                            if (fileData && this.onToolFileCallback) {
-                                logger.debug(`[Aggregator] Sending edit file: ${fileData.filename} (${fileData.buffer.length} bytes)`);
-                                this.onToolFileCallback(fileData);
-                            }
-                            // Notify about file change for pinned message
-                            if (this.onFileChangeCallback) {
-                                this.onFileChangeCallback({
-                                    file: filePath,
-                                    additions: filediff.additions || 0,
-                                    deletions: filediff.deletions || 0,
-                                });
-                            }
-                        }
+                    if (preparedFileContext.fileChange && this.onFileChangeCallback) {
+                        this.onFileChangeCallback(preparedFileContext.fileChange);
                     }
                 }
             }
         }
         this.lastUpdated = Date.now();
     }
+    prepareToolFileContext(tool, input, title, metadata) {
+        if (tool === "write" && input) {
+            const filePath = typeof input.filePath === "string" ? normalizePathForDisplay(input.filePath) : "";
+            const hasContent = typeof input.content === "string";
+            const content = hasContent ? input.content : "";
+            if (!filePath || !hasContent) {
+                return { fileData: null, fileChange: null };
+            }
+            return {
+                fileData: prepareCodeFile(content, filePath, "write"),
+                fileChange: {
+                    file: filePath,
+                    additions: content.split("\n").length,
+                    deletions: 0,
+                },
+            };
+        }
+        if (tool === "edit" && metadata) {
+            const editMetadata = metadata;
+            const filePath = editMetadata.filediff?.file
+                ? normalizePathForDisplay(editMetadata.filediff.file)
+                : "";
+            const diffText = typeof editMetadata.diff === "string" ? editMetadata.diff : "";
+            if (!filePath || !diffText) {
+                return { fileData: null, fileChange: null };
+            }
+            return {
+                fileData: prepareCodeFile(diffText, filePath, "edit"),
+                fileChange: {
+                    file: filePath,
+                    additions: editMetadata.filediff?.additions || 0,
+                    deletions: editMetadata.filediff?.deletions || 0,
+                },
+            };
+        }
+        if (tool === "apply_patch") {
+            const patchMetadata = metadata;
+            const filePathFromInput = input && typeof input.filePath === "string"
+                ? normalizePathForDisplay(input.filePath)
+                : input && typeof input.path === "string"
+                    ? normalizePathForDisplay(input.path)
+                    : "";
+            const filePathFromTitle = title ? extractFirstUpdatedFileFromTitle(title) : "";
+            const filePath = (patchMetadata?.filediff?.file && normalizePathForDisplay(patchMetadata.filediff.file)) ||
+                filePathFromInput ||
+                normalizePathForDisplay(filePathFromTitle);
+            const diffText = typeof patchMetadata?.diff === "string"
+                ? patchMetadata.diff
+                : input && typeof input.patchText === "string"
+                    ? input.patchText
+                    : "";
+            if (!filePath) {
+                return { fileData: null, fileChange: null };
+            }
+            const fileChange = patchMetadata?.filediff
+                ? {
+                    file: filePath,
+                    additions: patchMetadata.filediff.additions || 0,
+                    deletions: patchMetadata.filediff.deletions || 0,
+                }
+                : diffText
+                    ? (() => {
+                        const changes = countDiffChangesFromText(diffText);
+                        return {
+                            file: filePath,
+                            additions: changes.additions,
+                            deletions: changes.deletions,
+                        };
+                    })()
+                    : null;
+            return {
+                fileData: diffText ? prepareCodeFile(diffText, filePath, "edit") : null,
+                fileChange,
+            };
+        }
+        return { fileData: null, fileChange: null };
+    }
     hashString(str) {
         let hash = 0;
         for (let i = 0; i < str.length; i++) {

package/dist/summary/formatter.js

@@ -2,6 +2,7 @@ import * as path from "path";
 import { config } from "../config.js";
 import { logger } from "../utils/logger.js";
 import { t } from "../i18n/index.js";
+import { getCurrentProject } from "../settings/manager.js";
 const TELEGRAM_MESSAGE_LIMIT = 4096;
 function splitText(text, maxLength) {
     const parts = [];
@@ -21,6 +22,27 @@ function splitText(text, maxLength) {
     }
     return parts;
 }
+export function normalizePathForDisplay(filePath) {
+    const normalizedPath = filePath.replace(/\\/g, "/");
+    const project = getCurrentProject();
+    if (!project?.worktree) {
+        return normalizedPath;
+    }
+    const normalizedWorktree = project.worktree.replace(/\\/g, "/").replace(/\/+$/, "");
+    if (!normalizedWorktree) {
+        return normalizedPath;
+    }
+    const pathForCompare = process.platform === "win32" ? normalizedPath.toLowerCase() : normalizedPath;
+    const worktreeForCompare = process.platform === "win32" ? normalizedWorktree.toLowerCase() : normalizedWorktree;
+    if (pathForCompare === worktreeForCompare) {
+        return ".";
+    }
+    const worktreePrefix = `${worktreeForCompare}/`;
+    if (pathForCompare.startsWith(worktreePrefix)) {
+        return normalizedPath.slice(normalizedWorktree.length + 1);
+    }
+    return normalizedPath;
+}
 export function formatSummary(text) {
     if (!text || text.trim().length === 0) {
         return [];
@@ -50,9 +72,10 @@ function getToolDetails(tool, input) {
         case "read":
         case "edit":
         case "write":
-            const path = input.path || input.filePath;
-            if (typeof path === "string")
-                return path;
+        case "apply_patch":
+            const filePath = input.path || input.filePath;
+            if (typeof filePath === "string")
+                return normalizePathForDisplay(filePath);
             break;
         case "bash":
             if (typeof input.command === "string")
@@ -88,6 +111,8 @@ function getToolIcon(tool) {
             return "✍️";
         case "edit":
             return "✏️";
+        case "apply_patch":
+            return "🩹";
         case "bash":
             return "💻";
         case "glob":
@@ -133,6 +158,37 @@ function formatTodos(todos) {
     }
     return result;
 }
+function formatDiffLineInfo(filediff) {
+    const parts = [];
+    if (filediff.additions && filediff.additions > 0)
+        parts.push(`+${filediff.additions}`);
+    if (filediff.deletions && filediff.deletions > 0)
+        parts.push(`-${filediff.deletions}`);
+    return parts.length > 0 ? ` (${parts.join(" ")})` : "";
+}
+function countDiffChangesFromText(text) {
+    let additions = 0;
+    let deletions = 0;
+    for (const line of text.split("\n")) {
+        if (line.startsWith("+") && !line.startsWith("+++")) {
+            additions++;
+            continue;
+        }
+        if (line.startsWith("-") && !line.startsWith("---")) {
+            deletions++;
+        }
+    }
+    return { additions, deletions };
+}
+function extractFirstUpdatedFileFromTitle(title) {
+    for (const rawLine of title.split("\n")) {
+        const line = rawLine.trim();
+        if (line.length >= 3 && line[1] === " " && /[AMDURC]/.test(line[0])) {
+            return line.slice(2).trim();
+        }
+    }
+    return "";
+}
 export function formatToolInfo(toolInfo) {
     const { tool, input, title } = toolInfo;
     logger.debug(`[Formatter] formatToolInfo: tool=${tool}, hasMetadata=${!!toolInfo.metadata}, hasFilediff=${!!toolInfo.metadata?.filediff}`);
@@ -151,22 +207,41 @@ export function formatToolInfo(toolInfo) {
     if (tool === "bash" && input && typeof input.command === "string") {
         details = input.command;
     }
+    if (tool === "apply_patch") {
+        const filediff = toolInfo.metadata && "filediff" in toolInfo.metadata
+            ? toolInfo.metadata.filediff
+            : undefined;
+        if (filediff?.file) {
+            details = normalizePathForDisplay(filediff.file);
+        }
+        else if (title) {
+            const fileFromTitle = extractFirstUpdatedFileFromTitle(title);
+            if (fileFromTitle) {
+                details = normalizePathForDisplay(fileFromTitle);
+            }
+        }
+    }
     const detailsStr = details ? ` ${details}` : "";
     let lineInfo = "";
     if (tool === "write" && input && "content" in input && typeof input.content === "string") {
         const lines = countLines(input.content);
         lineInfo = ` (+${lines})`;
     }
-    if (tool === "edit" && toolInfo.metadata && "filediff" in toolInfo.metadata) {
+    if ((tool === "edit" || tool === "apply_patch") &&
+        toolInfo.metadata &&
+        "filediff" in toolInfo.metadata) {
         const filediff = toolInfo.metadata.filediff;
-        logger.debug("[Formatter] Edit metadata:", JSON.stringify(toolInfo.metadata, null, 2));
-        const parts = [];
-        if (filediff.additions && filediff.additions > 0)
-            parts.push(`+${filediff.additions}`);
-        if (filediff.deletions && filediff.deletions > 0)
-            parts.push(`-${filediff.deletions}`);
-        if (parts.length > 0) {
-            lineInfo = ` (${parts.join(" ")})`;
+        logger.debug("[Formatter] Diff metadata:", JSON.stringify(toolInfo.metadata, null, 2));
+        lineInfo = formatDiffLineInfo(filediff);
+    }
+    if (tool === "apply_patch" && !lineInfo) {
+        const diffText = toolInfo.metadata && typeof toolInfo.metadata.diff === "string"
+            ? toolInfo.metadata.diff
+            : input && typeof input.patchText === "string"
+                ? input.patchText
+                : "";
+        if (diffText) {
+            lineInfo = formatDiffLineInfo(countDiffChangesFromText(diffText));
         }
     }
     return `${toolIcon} ${description}${tool}${detailsStr}${lineInfo}`;
@@ -209,18 +284,19 @@ function formatDiff(diff) {
     return formattedLines.join("\n");
 }
 export function prepareCodeFile(content, filePath, operation) {
+    const displayPath = normalizePathForDisplay(filePath);
     let processedContent = content;
     if (operation === "edit") {
         processedContent = formatDiff(content);
     }
     const sizeKb = Buffer.byteLength(processedContent, "utf8") / 1024;
     if (sizeKb > config.files.maxFileSizeKb) {
-        logger.debug(`[Formatter] File too large: ${filePath} (${sizeKb.toFixed(2)} KB > ${config.files.maxFileSizeKb} KB)`);
+        logger.debug(`[Formatter] File too large: ${displayPath} (${sizeKb.toFixed(2)} KB > ${config.files.maxFileSizeKb} KB)`);
         return null;
     }
     const header = operation === "write"
-        ? t("tool.file_header.write", { path: filePath })
-        : t("tool.file_header.edit", { path: filePath });
+        ? t("tool.file_header.write", { path: displayPath })
+        : t("tool.file_header.edit", { path: displayPath });
     const fullContent = header + processedContent;
     const buffer = Buffer.from(fullContent, "utf8");
     const basename = path.basename(filePath);