@ducci/jarvis 1.0.69 → 1.0.71

package/docs/system-prompt.md

@@ -64,6 +64,7 @@ Never include markdown code fences, preamble, or any text outside this JSON obje
 You have access to a set of tools. Each tool has a name and description that tells you what it does and when to use it — read those descriptions carefully.
 
 - Always use a tool to perform an action. Never claim to have done something without actually calling the relevant tool.
+- If answering a question requires checking a file, reading data, or calling any tool, do it first — never send a response that announces what you are about to do. Perform the action, then report the result.
 - Call tools one at a time. You will receive the result before deciding on the next step. Exception: when using `spawn_subagent` for bulk tasks (e.g. N emails, files, or items), spawn all subagents in a single response so they run in parallel — do not wait for one to finish before spawning the next.
 - After a tool call, verify the result before proceeding. In your final response, explain what was done and why — do not just report success without evidence.
 - Stop as soon as the task is complete and verified. Do not do extra work that was not asked for.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducci/jarvis",
-  "version": "1.0.69",
+  "version": "1.0.71",
   "description": "A fully automated agent system that lives on a server.",
   "main": "./src/index.js",
   "type": "module",

package/src/channels/telegram/index.js

@@ -20,10 +20,28 @@ async function appendTelegramChatLog(chatId, sessionId, direction, text, ts = nu
   await fs.promises.appendFile(logFile, line, 'utf8').catch(() => {});
 }
 
+function escapeHtml(str) {
+  return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+function markdownToHtml(text) {
+  // 1. Block fences: ```[lang]\ncontent\n``` → <pre>content</pre>
+  text = text.replace(/```[\w]*\n([\s\S]*?)\n?```/g, (_, content) => {
+    return `<pre>${escapeHtml(content)}</pre>`;
+  });
+  // 2. Inline code: `content` → <code>content</code> (no newlines inside)
+  text = text.replace(/`([^`\n]+)`/g, (_, content) => {
+    return `<code>${escapeHtml(content)}</code>`;
+  });
+  return text;
+}
+
 async function sendMessage(api, chatId, text, sessionId) {
   const MAX_TG = 4096;
   // Telegram HTML mode does not support <br> — replace with newlines before sending
   text = text.replace(/<br\s*\/?>/gi, '\n');
+  // Convert leftover Markdown code fences to HTML (model sometimes mixes both formats)
+  text = markdownToHtml(text);
   const chunks = [];
   for (let i = 0; i < text.length; i += MAX_TG) {
     chunks.push(text.slice(i, i + MAX_TG));
@@ -154,9 +172,15 @@ export async function startTelegramChannel(config) {
         }
       }
 
+      let lastCheckpointSent = null;
       let result;
       try {
-        result = await handleChat(config, sessionId, userText, allAttachments);
+        result = await handleChat(config, sessionId, userText, allAttachments, async (checkpointResponse) => {
+          const text = typeof checkpointResponse === 'string' ? checkpointResponse : JSON.stringify(checkpointResponse);
+          lastCheckpointSent = text;
+          await appendTelegramChatLog(chatId, sessions[chatId] || null, 'JARVIS', text);
+          await sendMessage(api, chatId, text, sessions[chatId] || null);
+        });
       } catch (e) {
         console.error(`[telegram] agent error chat_id=${chatId}: ${e.message}`);
         const errText = e.message
@@ -185,9 +209,16 @@ export async function startTelegramChannel(config) {
           : result.response != null ? JSON.stringify(result.response, null, 2) : '';
         const text = rawResponse.trim()
           || 'The agent encountered an error and could not produce a response. Please try again.';
-        await appendTelegramChatLog(chatId, result.sessionId, 'JARVIS', text);
-        await sendMessage(api, chatId, text, result.sessionId);
-        console.log(`[telegram] response sent chat_id=${chatId} length=${text.length}`);
+        // Skip sending if this response was already sent as a checkpoint update —
+        // intervention_required and zero-progress reuse the last checkpoint response
+        // as their finalResponse, which would otherwise cause a duplicate message.
+        if (text !== lastCheckpointSent) {
+          await appendTelegramChatLog(chatId, result.sessionId, 'JARVIS', text);
+          await sendMessage(api, chatId, text, result.sessionId);
+          console.log(`[telegram] response sent chat_id=${chatId} length=${text.length}`);
+        } else {
+          console.log(`[telegram] skipped duplicate final response chat_id=${chatId}`);
+        }
       } catch (e) {
         console.error(`[telegram] delivery error chat_id=${chatId}: ${e.message}`);
         await api.sendMessage(chatId, 'Sorry, something went wrong sending the response. Please try again.').catch(() => {});

package/src/server/agent.js

@@ -618,7 +618,7 @@ export async function withSessionLock(sessionId, fn) {
  * Main entry point: handles a single POST /api/chat request.
  * Manages the handoff loop across multiple agent runs.
  */
-export async function handleChat(config, requestSessionId, userMessage, attachments = []) {
+export async function handleChat(config, requestSessionId, userMessage, attachments = [], onCheckpoint = null) {
   const sessionId = requestSessionId || crypto.randomUUID();
 
   // Serialize concurrent requests for the same session. Each request registers
@@ -632,7 +632,7 @@ export async function handleChat(config, requestSessionId, userMessage, attachme
   await previous;
 
   try {
-    return await _runHandleChat(config, sessionId, userMessage, attachments);
+    return await _runHandleChat(config, sessionId, userMessage, attachments, onCheckpoint);
   } finally {
     releaseLock();
     // Clean up only if no one else has queued behind us
@@ -646,7 +646,7 @@ export async function handleChat(config, requestSessionId, userMessage, attachme
  * The actual chat logic, extracted so handleChat can wrap it cleanly with the
  * session lock.
  */
-async function _runHandleChat(config, sessionId, userMessage, attachments = []) {
+async function _runHandleChat(config, sessionId, userMessage, attachments = [], onCheckpoint = null) {
   const client = createClient(config);
 
   const systemPromptTemplate = loadSystemPrompt();
@@ -802,7 +802,9 @@ async function _runHandleChat(config, sessionId, userMessage, attachments = [])
         break;
       }
 
-      // Checkpoint reached — log this run
+      // Checkpoint reached — log this run and notify the caller (e.g. Telegram adapter)
+      // so intermediate progress is visible to the user instead of being swallowed
+      // by the handoff loop until the final response.
       await appendLog(sessionId, {
         iteration: run.iteration,
         model: config.selectedModel,
@@ -812,6 +814,7 @@ async function _runHandleChat(config, sessionId, userMessage, attachments = [])
         logSummary: run.logSummary,
         status: 'checkpoint_reached',
       });
+      if (onCheckpoint) await onCheckpoint(run.response);
 
       // Accumulate failedApproaches from this run into session metadata so the
       // full history of failed strategies is available across all handoff runs.