@goodandready/dsh-cron 0.2.40 → 0.2.41

package/lib/api.js

@@ -256,8 +256,8 @@ function buildTaskRecord(store, body, taskType, parsed) {
     model: body.model || undefined,
     fallbackProvider: body.fallbackProvider || undefined,
     fallbackModel: body.fallbackModel || undefined,
-    notifyTelegram: body.notifyTelegram !== undefined ? Boolean(body.notifyTelegram) : (current ? current.notifyTelegram : false),
-    onlyOnFailure: body.onlyOnFailure !== undefined ? Boolean(body.onlyOnFailure) : (current ? current.onlyOnFailure : false),
+    notifyTelegram: body.notifyTelegram !== undefined ? Boolean(body.notifyTelegram) : (current ? current.notifyTelegram : undefined),
+    onlyOnFailure: body.onlyOnFailure !== undefined ? Boolean(body.onlyOnFailure) : (current ? current.onlyOnFailure : undefined),
     timeoutSeconds: body.timeoutSeconds !== undefined ? Number(body.timeoutSeconds) : (current ? current.timeoutSeconds : 1800),
     overlapPolicy: body.overlapPolicy || (current ? current.overlapPolicy : 'skip'),
     kanbanMode: body.kanbanMode || (current ? current.kanbanMode : 'none'),

package/lib/channels.js

@@ -18,11 +18,17 @@ export const CHANNEL_IDS = ['telegram', 'kanban', 'discord', 'slack', 'ntfy', 'b
 export const isFailureStatus = (status) => status === 'error' || status === 'timeout' || status === 'missed';
 export const isFailed = (status) => isFailureStatus(status);
 
-/** The message text for a channel: custom template, else built-in defaults. */
-function messageTextFor(channelId, task, runInfo, settings = {}) {
+/** The message text for a channel: task template -> channel template -> global template -> built-in defaults (#233). */
+export function messageTextFor(channelId, task, runInfo, settings = {}) {
   const templates = (settings && settings.channelTemplates) || {};
-  const template = templates[channelId] || settings.template || '';
-  return resolveTemplateText({ template, task, runInfo });
+  const custom = (task && task.template) || templates[channelId] || (settings && settings.template) || '';
+  if (custom) {
+    return resolveTemplateText({ template: custom, task, runInfo });
+  }
+  if (channelId === 'telegram') {
+    return formatTaskTelegramMessage(task, runInfo);
+  }
+  return resolveTemplateText({ template: '', task, runInfo });
 }
 
 /**
@@ -56,17 +62,27 @@ export function unknownChannels(task) {
   return unknownChannelIds(task && task.channels);
 }
 
-/** Failure/only-on-failure filtering, per channel. */
+/** Failure/only-on-failure filtering, per channel (#219). Explicit task channels win over legacy flags. */
 export function shouldSendToChannel(channelId, task, runInfo, settings = {}) {
-  if (channelId === 'kanban') return shouldCreateKanbanCard(task, runInfo);
-  if (channelId === 'telegram') {
-    if (task && task.notifyTelegram === false) return false;
-    const taskForTelegram = Object.assign({}, task, { notifyTelegram: true });
-    return shouldNotifyTask(taskForTelegram, runInfo, settings);
+  const isExplicit = Array.isArray(task && task.channels) && task.channels.includes(channelId);
+  if (!isExplicit) {
+    if (channelId === 'kanban') return shouldCreateKanbanCard(task, runInfo);
+    if (channelId === 'telegram') {
+      if (task && task.notifyTelegram === false) return false;
+      const taskForTelegram = Object.assign({}, task, { notifyTelegram: true });
+      return shouldNotifyTask(taskForTelegram, runInfo, settings);
+    }
+  }
+
+  // Explicit selection (or default event filtering for all channels):
+  if (channelId === 'kanban') {
+    if (task && task.kanbanMode === 'on_failure') return isFailed(runInfo.status);
+    if (task && task.kanbanMode === 'always') return true;
   }
-  const onlyOnFail = task.onlyOnFailure !== undefined
+
+  const onlyOnFail = (task && task.onlyOnFailure !== undefined)
     ? Boolean(task.onlyOnFailure)
-    : Boolean(settings.onlyOnFailure);
+    : Boolean(settings && settings.onlyOnFailure);
   if (onlyOnFail && !isFailed(runInfo.status)) return false;
   return true;
 }
@@ -133,8 +149,34 @@ export function buildPushplusRequest({ settings = {}, text, task, token }) {
   };
 }
 
-export function buildGiteaIssuePayload({ task, runInfo }) {
+export function buildGiteaIssuePayload({ task, runInfo, settings = {} }) {
   const failed = isFailed(runInfo.status);
+  const defaultNames = failed ? ['cron', 'bug', 'alert'] : ['cron', 'auto'];
+
+  // Resolve labels to integer IDs per Gitea Swagger (array<int64>) (#224)
+  const mapping = settings.giteaLabelIds || {};
+  let candidateIds = [];
+
+  if (Array.isArray(task && task.giteaLabelIds)) {
+    candidateIds = task.giteaLabelIds;
+  } else if (Array.isArray(settings.giteaLabels)) {
+    candidateIds = settings.giteaLabels;
+  } else if (Array.isArray(settings.giteaLabelIds)) {
+    candidateIds = settings.giteaLabelIds;
+  } else if (Array.isArray(task && task.labels)) {
+    candidateIds = task.labels.map((item) => {
+      const num = Number(item);
+      if (Number.isInteger(num) && num > 0) return num;
+      return typeof mapping === 'object' && mapping !== null ? mapping[item] : undefined;
+    });
+  } else if (typeof mapping === 'object' && mapping !== null && Object.keys(mapping).length > 0) {
+    candidateIds = defaultNames.map((name) => mapping[name]);
+  }
+
+  const labelIds = candidateIds
+    .map((id) => Number(id))
+    .filter((id) => Number.isInteger(id) && id > 0);
+
   return {
     title: `${failed ? '[Cron failure]' : '[Cron run]'} ${truncateText(task.title || 'Task', 200)}`,
     body: [
@@ -145,7 +187,7 @@ export function buildGiteaIssuePayload({ task, runInfo }) {
       runInfo.error ? `\n**Error:**\n\`\`\`\n${truncateText(runInfo.error, 1000)}\n\`\`\`` : '',
       runInfo.output ? `\n**Output:**\n\`\`\`\n${truncateText(runInfo.output, 1000)}\n\`\`\`` : '',
     ].filter(Boolean).join('\n\n'),
-    labels: failed ? ['cron', 'bug', 'alert'] : ['cron', 'auto'],
+    labels: labelIds,
   };
 }
 
@@ -248,9 +290,7 @@ const CHANNEL_HANDLERS = {
     const botToken = secrets.botToken || '';
     const chatId = String(settings.chatId || '').trim();
     if (!botToken || !chatId) throw new Error('telegram: botToken or chatId is not configured');
-    const text = settings.template
-      ? messageTextFor('telegram', task, runInfo, settings)
-      : formatTaskTelegramMessage(task, runInfo);
+    const text = messageTextFor('telegram', task, runInfo, settings);
     try {
       const replyMarkup = createTelegramTaskKeyboard(task, runInfo);
       await sendTelegramMessage({ botToken, chatId, text, replyMarkup, fetchFn: http, signal });
@@ -321,7 +361,7 @@ const CHANNEL_HANDLERS = {
     if (!base || !repo) throw new Error('gitea: giteaBaseUrl and giteaRepo are required');
     const token = settings.giteaTokenRef ? await resolveSecret(settings.giteaTokenRef) : '';
     if (!token) throw new Error(`gitea: credential "${settings.giteaTokenRef || ''}" did not resolve`);
-    const payload = buildGiteaIssuePayload({ task, runInfo });
+    const payload = buildGiteaIssuePayload({ task, runInfo, settings });
     const issue = await postJson(
       http,
       `${base}/api/v1/repos/${repo}/issues`,

package/lib/index.js

@@ -185,14 +185,23 @@ export function apply(ctx, rawConfig) {
   // Heartbeat / dead man's snitch (#16): an optional periodic GET ping so an
   // external monitor can alert when this scheduler stops responding.
   let heartbeatTimer = null;
-  if (config && config.heartbeatUrl && Number(config.heartbeatIntervalSec) > 0) {
-    const intervalMs = Number(config.heartbeatIntervalSec) * 1000;
-    heartbeatTimer = setInterval(() => {
-      fetch(config.heartbeatUrl, { method: 'GET' }).catch((err) => {
-        logger.warn('[dsh-cron] heartbeat ping failed:', err.message);
-      });
-    }, intervalMs);
+  function updateHeartbeat(url, intervalSec) {
+    if (heartbeatTimer) {
+      clearInterval(heartbeatTimer);
+      heartbeatTimer = null;
+    }
+    const cleanUrl = String(url || '').trim();
+    const cleanSec = Number(intervalSec) || 0;
+    if (cleanUrl && cleanSec > 0) {
+      heartbeatTimer = setInterval(() => {
+        fetch(cleanUrl, { method: 'GET' }).catch((err) => {
+          logger.warn('[dsh-cron] heartbeat ping failed:', err.message);
+        });
+      }, cleanSec * 1000);
+      if (typeof heartbeatTimer.unref === 'function') heartbeatTimer.unref();
+    }
   }
+  updateHeartbeat(config && config.heartbeatUrl, config && config.heartbeatIntervalSec);
 
   ctx.effect(() => {
     return () => {
@@ -236,12 +245,29 @@ export function apply(ctx, rawConfig) {
           const { body, error } = await readBody(req, res);
           if (error) return;
           const payload = sanitizeSettingsPayload(body);
-          store.saveSettings(payload);
           const scopeErrors = await applySettingsToScope(settingsService, payload);
+          if (scopeErrors && scopeErrors.length > 0) {
+            sendJson(res, 500, {
+              ok: false,
+              error: `Settings scope update failed: ${scopeErrors.join('; ')}`,
+              scopeErrors,
+            });
+            return;
+          }
+          store.saveSettings(payload);
+          if (payload.maxConcurrent !== undefined && Number.isFinite(Number(payload.maxConcurrent))) {
+            scheduler.maxConcurrent = Number(payload.maxConcurrent);
+          }
+          if (payload.defaultTimezone !== undefined) {
+            scheduler.defaultTimezone = String(payload.defaultTimezone || '').trim();
+          }
+          if (payload.heartbeatUrl !== undefined || payload.heartbeatIntervalSec !== undefined) {
+            const current = store.getSettings();
+            updateHeartbeat(current.heartbeatUrl, current.heartbeatIntervalSec);
+          }
           sendJson(res, 200, {
             ok: true,
             settings: { ...store.getClientSettings(), version: pkgVersion },
-            scopeErrors: (scopeErrors && scopeErrors.length > 0) ? scopeErrors : undefined
           });
           return;
         }

package/lib/runtimes.js

@@ -46,14 +46,15 @@ function looksLikeScriptFile(token, extensions) {
 
 /** #5: resolve a Node.js invocation (inline code or a .js/.mjs/.cjs file). */
 export function buildNodeInvocation(task, cwd) {
+  const nodeExecutable = task.nodePath || process.execPath;
   const { path: filePath, args } = splitCommandLine(task.prompt);
   if (looksLikeScriptFile(filePath, ['.js', '.mjs', '.cjs'])) {
-    return { file: process.execPath, args: [filePath, ...args] };
+    return { file: nodeExecutable, args: [filePath, ...args] };
   }
   const code = String(task.prompt || '');
   const isEsm = /\bimport\s|\bexport\s/.test(code);
   const nodeArgs = isEsm ? ['--input-type=module', '-e', code] : ['-e', code];
-  return { file: task.nodePath || process.execPath, args: nodeArgs };
+  return { file: nodeExecutable, args: nodeArgs };
 }
 
 /** Find the Python interpreter, preferring a task virtualenv, then the workspace one. */

package/lib/scheduler-execution.js

@@ -261,6 +261,48 @@ export async function executeTask(scheduler, taskId, options = {}) {
   const task = scheduler.store.get(taskId);
   if (!task) return null;
 
+  // Dry-run path: read-only evaluation without mutating store, history, attempts, or triggering alerts (#229)
+  if (options.dryRun) {
+    const runs = (scheduler.store.history && scheduler.store.history.get(taskId)) || [];
+    const guard = checkTaskBudgetLimits(task, runs);
+    if (guard.exceeded) {
+      return {
+        ok: false,
+        dryRun: true,
+        status: 'error',
+        error: guard.reason,
+        preflightBlocked: true,
+      };
+    }
+    const preflight = await executePreflight(task);
+    if (!preflight.ok) {
+      return {
+        ok: false,
+        dryRun: true,
+        status: 'skipped',
+        error: `Preflight check skipped: ${preflight.reason}`,
+        preflightBlocked: true,
+      };
+    }
+    const start = Date.now();
+    const outcome = await scheduler.executeWithFallback(
+      task,
+      AbortSignal.timeout(Math.min((task.timeoutSeconds || 1800) * 1000, 30000)),
+      options
+    );
+    return {
+      ok: outcome.status !== 'error' && outcome.status !== 'timeout',
+      dryRun: true,
+      status: outcome.status,
+      output: outcome.output,
+      error: outcome.error,
+      durationMs: Date.now() - start,
+      usage: outcome.usage,
+      costUsd: outcome.costUsd,
+      model: outcome.model || task.model || '',
+    };
+  }
+
   // Pre-flight Burn Guard check (#181): prevent executing task if budget already breached
   const runs = (scheduler.store.history && scheduler.store.history.get(taskId)) || [];
   const guard = checkTaskBudgetLimits(task, runs);
@@ -277,22 +319,6 @@ export async function executeTask(scheduler, taskId, options = {}) {
     scheduler.store.set(task);
   }
 
-  if (options.dryRun) {
-    const start = Date.now();
-    const outcome = await scheduler.executeWithFallback(task, AbortSignal.timeout(Math.min((task.timeoutSeconds || 1800) * 1000, 30000)), options);
-    return {
-      ok: true,
-      dryRun: true,
-      status: outcome.status,
-      output: outcome.output,
-      error: outcome.error,
-      durationMs: Date.now() - start,
-      usage: outcome.usage,
-      costUsd: outcome.costUsd,
-      model: outcome.model || task.model || '',
-    };
-  }
-
   const currentRun = scheduler.beginRun(task, taskId, options);
   if (currentRun === null) return null;
 
@@ -377,12 +403,23 @@ export async function applyModelAssists(task, runInfo, options) {
 /**
  * Deliver a finished run to every configured channel (#26).
  */
-export async function deliverNotifications(task, runInfo, { store, resolveSecrets, deliver }) {
+export async function deliverNotifications(task, runInfo, { store, resolveSecrets, deliver, secretTimeoutMs = 5000 }) {
   try {
     let settings = typeof store?.getSettings === 'function' ? store.getSettings() : {};
     if (resolveSecrets) {
       try {
-        settings = { ...settings, ...(await resolveSecrets(settings)) };
+        let timer;
+        const deadline = new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error(`credential resolution timed out after ${secretTimeoutMs}ms`)), secretTimeoutMs);
+          if (typeof timer.unref === 'function') timer.unref();
+        });
+        const resolved = await Promise.race([
+          Promise.resolve(resolveSecrets(settings)).finally(() => {
+            if (timer) clearTimeout(timer);
+          }),
+          deadline,
+        ]);
+        settings = { ...settings, ...(resolved || {}) };
       } catch (secErr) {
         logger.warn('[dsh-cron] credential resolution failed:', secErr.message);
       }

package/lib/settings.js

@@ -24,6 +24,7 @@ export const Config = z.object({
   maxConcurrent: z.number().default(2).description('Max parallel task runs (0 = unlimited, default 2)').volatile(),
   heartbeatUrl: z.string().default('').description('Dead man\'s snitch URL pinged on the heartbeat interval').volatile(),
   heartbeatIntervalSec: z.number().default(0).description('Heartbeat ping interval in seconds (0 = off)').volatile(),
+  llmActionsEnabled: z.boolean().default(false).description('Enable LLM actions execution').volatile(),
   // --- Delivery channels (#20-#23, #26, #28, #47) ---
   template: z.string().default('').description('Global notification template; placeholders: {title} {status} {output} {error} {duration} {schedule} {time} {tokens} {cost}').volatile(),
   channelTemplates: z.object({}).default({}).description('Per-channel template overrides keyed by channel id').volatile(),
@@ -77,6 +78,7 @@ export function unwrapConfig(cfg) {
 
 export const SETTINGS_SYNC_KEYS = [
   'botToken', 'botTokenRef', 'telegramWebhookSecret', 'chatId', 'notifyTelegram', 'onlyOnFailure', 'kanbanBaseUrl',
+  'defaultTimezone', 'maxConcurrent', 'heartbeatUrl', 'heartbeatIntervalSec', 'llmActionsEnabled',
   'template', 'channelTemplates', 'deliveryTimeoutMs', 'silentRuleModel', 'inspectorModel',
   'discordWebhookUrl', 'slackWebhookUrl',
   'ntfyUrl', 'ntfyTopic', 'ntfyTokenRef',

package/lib/store.js

@@ -411,8 +411,12 @@ export class TaskStore {
       delivery: task.delivery !== undefined ? task.delivery : (prev.delivery || 'isolated'),
       provider: task.provider !== undefined ? task.provider : prev.provider,
       model: task.model !== undefined ? task.model : prev.model,
-      notifyTelegram: task.notifyTelegram !== undefined ? Boolean(task.notifyTelegram) : (prev.notifyTelegram || false),
-      onlyOnFailure: task.onlyOnFailure !== undefined ? Boolean(task.onlyOnFailure) : (prev.onlyOnFailure || false),
+      notifyTelegram: task.notifyTelegram !== undefined
+        ? (task.notifyTelegram === null || task.notifyTelegram === 'inherit' ? undefined : Boolean(task.notifyTelegram))
+        : prev.notifyTelegram,
+      onlyOnFailure: task.onlyOnFailure !== undefined
+        ? (task.onlyOnFailure === null || task.onlyOnFailure === 'inherit' ? undefined : Boolean(task.onlyOnFailure))
+        : prev.onlyOnFailure,
       timeoutSeconds: task.timeoutSeconds !== undefined ? Number(task.timeoutSeconds) : (prev.timeoutSeconds || 1800),
       overlapPolicy: task.overlapPolicy !== undefined ? String(task.overlapPolicy) : (prev.overlapPolicy || 'skip'),
       kanbanMode: task.kanbanMode !== undefined ? String(task.kanbanMode) : (prev.kanbanMode || 'none'), // 'none' | 'on_failure' | 'always'

package/lib/task-create.js

@@ -35,8 +35,8 @@ export function executeCreateTask(store, scheduler, args) {
     priority: Number(args.priority) || 5,
     selfHealingCommand: args.selfHealingCommand ? String(args.selfHealingCommand).trim() : '',
     autoDiagnose: Boolean(args.autoDiagnose),
-    notifyTelegram: Boolean(args.notifyTelegram),
-    onlyOnFailure: Boolean(args.onlyOnFailure),
+    notifyTelegram: args.notifyTelegram !== undefined ? Boolean(args.notifyTelegram) : undefined,
+    onlyOnFailure: args.onlyOnFailure !== undefined ? Boolean(args.onlyOnFailure) : undefined,
     timeoutSeconds: Number(args.timeoutSeconds) || 1800,
     overlapPolicy: args.overlapPolicy || 'skip',
     timezone: args.timezone ? String(args.timezone).trim() : '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.2.40",
+  "version": "0.2.41",
   "description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
   "type": "module",
   "main": "lib/index.js",