@ducci/jarvis 1.0.80 → 1.0.82

package/package.json

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

package/src/channels/telegram/index.js

@@ -11,6 +11,7 @@ import { run } from '@grammyjs/runner';
 import { handleChat, requestAbort } from '../../server/agent.js';
 import { loadSession } from '../../server/sessions.js';
 import { PATHS } from '../../server/config.js';
+import { isRunningCron, getRunningCrons } from '../../server/cron-scheduler.js';
 import { load, save } from './sessions.js';
 import { describeImage } from '../../server/vision.js';
 
@@ -123,6 +124,54 @@ function lookupContextWindow(model) {
   return null;
 }
 
+function nextCronDate(expression) {
+  try {
+    const parts = expression.trim().split(/\s+/);
+    if (parts.length !== 5) return null;
+    const [minE, hourE, domE, monE, dowE] = parts;
+
+    function matchField(expr, val) {
+      if (expr === '*') return true;
+      if (expr.includes(',')) return expr.split(',').some(p => matchField(p, val));
+      if (expr.includes('/')) {
+        const [range, step] = expr.split('/');
+        const s = parseInt(step, 10);
+        if (range === '*') return val % s === 0;
+        const [lo, hi] = range.split('-').map(Number);
+        return val >= lo && val <= hi && (val - lo) % s === 0;
+      }
+      if (expr.includes('-')) {
+        const [lo, hi] = expr.split('-').map(Number);
+        return val >= lo && val <= hi;
+      }
+      return parseInt(expr, 10) === val;
+    }
+
+    const candidate = new Date();
+    candidate.setSeconds(0, 0);
+    candidate.setMinutes(candidate.getMinutes() + 1);
+
+    for (let i = 0; i < 10080; i++) {
+      if (matchField(minE, candidate.getMinutes()) &&
+          matchField(hourE, candidate.getHours()) &&
+          matchField(domE, candidate.getDate()) &&
+          matchField(monE, candidate.getMonth() + 1) &&
+          matchField(dowE, candidate.getDay())) {
+        return candidate;
+      }
+      candidate.setMinutes(candidate.getMinutes() + 1);
+    }
+    return null;
+  } catch { return null; }
+}
+
+function formatMinutes(mins) {
+  if (mins < 60) return `${mins}m`;
+  const h = Math.floor(mins / 60);
+  const m = mins % 60;
+  return m > 0 ? `${h}h ${m}m` : `${h}h`;
+}
+
 export async function startTelegramChannel(config) {
   const { token, allowedUserIds } = config.telegram;
 
@@ -198,6 +247,7 @@ export async function startTelegramChannel(config) {
     { command: 'context', description: 'Estimated context size vs model limit' },
     { command: 'stop',    description: 'Stop the running agent on the active slot' },
     { command: 'slots',   description: 'Show all slots and their status' },
+    { command: 'crons',   description: 'Show all crons, running status and next run' },
     { command: 'version', description: 'Show Jarvis version' },
     { command: 'update',  description: 'Update Jarvis to the latest version' },
     { command: 'restart', description: 'Restart Jarvis' },
@@ -278,15 +328,19 @@ export async function startTelegramChannel(config) {
       return;
     }
 
-    const msgCount = Math.max(0, session.messages.length - 1); // exclude system prompt
-    const estimatedTokens = Math.round(JSON.stringify(session.messages).length / 4);
+    const totalMessages = Math.max(0, session.messages.length - 1); // exclude system prompt
+    const windowed = session.messages.length <= config.contextWindow + 1
+      ? session.messages
+      : [session.messages[0], ...session.messages.slice(-config.contextWindow)];
+    const inContext = Math.max(0, windowed.length - 1);
+    const estimatedTokens = Math.round(JSON.stringify(windowed).length / 4);
     const model = config.selectedModel || 'unknown';
     const contextWindow = config.modelContextWindow || lookupContextWindow(model);
 
     let lines = [
       `<b>Context — Slot ${slot}</b>`,
       `Model: <code>${escapeHtml(model)}</code>`,
-      `Messages in history: ${msgCount}`,
+      `Messages on disk: ${totalMessages} | in context: ${inContext}`,
       `Estimated tokens: ~${estimatedTokens.toLocaleString()}`,
     ];
 
@@ -468,6 +522,57 @@ export async function startTelegramChannel(config) {
     await ctx.answerCallbackQuery();
   });
 
+  bot.command('crons', async (ctx) => {
+    const userId = ctx.from?.id;
+    if (!allowedUserIds.includes(userId)) return;
+
+    let entries = [];
+    try {
+      entries = JSON.parse(fs.readFileSync(PATHS.cronsFile, 'utf8'));
+    } catch { /* no crons file */ }
+
+    if (entries.length === 0) {
+      await ctx.reply('Keine Crons konfiguriert.');
+      return;
+    }
+
+    const runningMap = getRunningCrons(); // id -> startDate
+    const now = Date.now();
+    const lines = ['<b>Crons:</b>'];
+
+    for (const entry of entries) {
+      const running = isRunningCron(entry.id);
+      let statusLine;
+
+      if (running) {
+        const startDate = runningMap.get(entry.id);
+        let elapsed = '';
+        if (startDate) {
+          const secs = Math.floor((now - startDate.getTime()) / 1000);
+          const m = Math.floor(secs / 60);
+          const s = secs % 60;
+          elapsed = m > 0 ? ` (seit ${m}m ${s}s)` : ` (seit ${s}s)`;
+        }
+        statusLine = `🟢 läuft${elapsed}`;
+      } else {
+        const nextDate = nextCronDate(entry.schedule);
+        if (nextDate) {
+          const diffMins = Math.round((nextDate.getTime() - now) / 60000);
+          statusLine = `⏰ in ${formatMinutes(diffMins)}`;
+        } else {
+          statusLine = `⏰ unbekannt`;
+        }
+      }
+
+      const onceMark = entry.once ? ' <i>(einmalig)</i>' : '';
+      lines.push(`\n<b>${escapeHtml(entry.name)}</b>${onceMark}`);
+      lines.push(`${statusLine}`);
+      lines.push(`<code>${escapeHtml(entry.schedule)}</code>`);
+    }
+
+    await ctx.reply(lines.join('\n'), { parse_mode: 'HTML' });
+  });
+
   // Runs one or more batches until the pending queue is drained.
   // Each iteration takes all currently pending messages, merges them into a
   // single user turn, calls handleChat once, and sends one response.

package/src/server/cron-scheduler.js

@@ -3,9 +3,32 @@ import cron from 'node-cron';
 // Maps cron id -> active node-cron task
 const tasks = new Map();
 
+// Tracks which cron ids are currently executing
+const runningCrons = new Set();
+// Maps cron id -> Date when it started running
+const cronStartTimes = new Map();
+
 let _runCron = null;
 let _config = null;
 
+export function setRunning(id) {
+  runningCrons.add(id);
+  cronStartTimes.set(id, new Date());
+}
+
+export function clearRunning(id) {
+  runningCrons.delete(id);
+  cronStartTimes.delete(id);
+}
+
+export function isRunningCron(id) {
+  return runningCrons.has(id);
+}
+
+export function getRunningCrons() {
+  return new Map(cronStartTimes);
+}
+
 export function init(runCronFn, config) {
   _runCron = runCronFn;
   _config = config;

package/src/server/crons.js

@@ -22,6 +22,7 @@ async function appendCronLog(cronId, entry) {
 
 export async function runCron(entry, config) {
   console.log(`[cron] running "${entry.name}"`);
+  cronScheduler.setRunning(entry.id);
 
   const systemPromptTemplate = loadSystemPrompt();
   const session = createSession(systemPromptTemplate);
@@ -128,6 +129,8 @@ export async function runCron(entry, config) {
     run = { status: 'error', response: e.message, logSummary: e.message, runToolCalls: [] };
   }
 
+  cronScheduler.clearRunning(entry.id);
+
   // once: true — delete after firing
   if (entry.once) {
     try {