@goodandready/dsh-cron 0.2.41 → 0.2.42

package/README.md

@@ -550,7 +550,7 @@ dsh-cron:
 Notes:
 
 * Run history is capped at **50 entries per task** (fixed); each entry keeps up to 4000 characters of output.
-* Tasks run in the **server's local timezone**; cron expressions are evaluated by `croner` on the host clock.
+* Tasks run in their configured **timezone** (`task.timezone`, falling back to `settings.defaultTimezone` or server local timezone); cron expressions are evaluated by `croner` against the resolved timezone.
 * Tasks persist in the DSH data directory (`cron/tasks.json`) and survive restarts; missed one-shots are detected on startup.
 
 ---

package/lib/api-webhook.js

@@ -21,22 +21,26 @@ export async function handleTelegramWebhook({ store, scheduler, req, res }) {
   const botToken = settings.botToken || defaults.botToken;
   const allowedChatId = String(settings.chatId || defaults.chatId || '').trim();
 
-  // Secret token verification (Issue #208)
+  // Secret token verification (Issue #208) - fail-closed: secret MUST be configured
   const webhookSecret = settings.telegramWebhookSecret || settings.webhookSecret || settings.secretToken || process.env.TELEGRAM_WEBHOOK_SECRET;
-  if (webhookSecret) {
-    const receivedSecret = req.headers['x-telegram-bot-api-secret-token'];
-    if (!receivedSecret || typeof receivedSecret !== 'string') {
-      logger.warn('[dsh-cron] unauthorized telegram webhook: missing secret token header');
-      sendJson(res, 401, { ok: false, error: 'Unauthorized: missing secret token' });
-      return;
-    }
-    const secretBuf = Buffer.from(String(webhookSecret));
-    const receivedBuf = Buffer.from(String(receivedSecret));
-    if (secretBuf.length !== receivedBuf.length || !crypto.timingSafeEqual(secretBuf, receivedBuf)) {
-      logger.warn('[dsh-cron] unauthorized telegram webhook: invalid secret token');
-      sendJson(res, 401, { ok: false, error: 'Unauthorized: invalid secret token' });
-      return;
-    }
+  if (!webhookSecret) {
+    logger.warn('[dsh-cron] unauthorized telegram webhook: webhook secret is not configured (fail-closed)');
+    sendJson(res, 401, { ok: false, error: 'Unauthorized: webhook secret is not configured' });
+    return;
+  }
+  const headers = req.headers || {};
+  const receivedSecret = headers['x-telegram-bot-api-secret-token'] || headers['X-Telegram-Bot-Api-Secret-Token'];
+  if (!receivedSecret || typeof receivedSecret !== 'string') {
+    logger.warn('[dsh-cron] unauthorized telegram webhook: missing secret token header');
+    sendJson(res, 401, { ok: false, error: 'Unauthorized: missing secret token' });
+    return;
+  }
+  const secretBuf = Buffer.from(String(webhookSecret));
+  const receivedBuf = Buffer.from(String(receivedSecret));
+  if (secretBuf.length !== receivedBuf.length || !crypto.timingSafeEqual(secretBuf, receivedBuf)) {
+    logger.warn('[dsh-cron] unauthorized telegram webhook: invalid secret token');
+    sendJson(res, 401, { ok: false, error: 'Unauthorized: invalid secret token' });
+    return;
   }
 
   // Deduplicate updates by update_id (Issue #208)

package/lib/client.js

@@ -1499,11 +1499,32 @@ window.__ModuleLoader__.load({
 
       const actionInProgressRef = React.useRef(new Set());
 
+      const fetchWithTimeout = async (url, options = {}, timeoutMs = 15000) => {
+        const controller = typeof AbortController !== 'undefined' ? new AbortController() : null;
+        const timer = controller ? setTimeout(() => controller.abort(), timeoutMs) : null;
+        try {
+          const res = await fetch(url, {
+            ...options,
+            signal: controller ? controller.signal : options.signal,
+          });
+          return res;
+        } catch (err) {
+          if (err && err.name === 'AbortError') {
+            const timeoutErr = new Error(`Request timed out after ${Math.round(timeoutMs / 1000)}s`);
+            timeoutErr.isTimeout = true;
+            throw timeoutErr;
+          }
+          throw err;
+        } finally {
+          if (timer) clearTimeout(timer);
+        }
+      };
+
       const handleToggleTask = async (id) => {
         if (actionInProgressRef.current.has(id)) return;
         actionInProgressRef.current.add(id);
         try {
-          const res = await fetch('/dsh-cron/tasks/' + encodeURIComponent(id) + '/toggle', { method: 'POST' });
+          const res = await fetchWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(id) + '/toggle', { method: 'POST' }, 15000);
           const data = await res.json().catch(() => ({}));
           if (!res.ok || (data && data.ok === false)) {
             const msg = (data && data.error) || `Toggle failed (HTTP ${res.status})`;
@@ -1526,7 +1547,7 @@ window.__ModuleLoader__.load({
         const prevStatus = prevTask ? prevTask.lastStatus : null;
         setTasks(prev => prev.map(t2 => t2.id === id ? { ...t2, lastStatus: 'running' } : t2));
         try {
-          const res = await fetch('/dsh-cron/tasks/' + encodeURIComponent(id) + '/run', { method: 'POST' });
+          const res = await fetchWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(id) + '/run', { method: 'POST' }, 15000);
           const data = await res.json().catch(() => ({}));
           if (!res.ok || (data && data.ok === false)) {
             setTasks(prev => prev.map(t2 => t2.id === id ? { ...t2, lastStatus: prevStatus } : t2));

package/lib/index.js

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import { bestEffort } from './best-effort.js';
 import { setLogger, logger } from './logger.js';
 import { registerPluginUpdater } from './updater.js';
 import { credentialRefStatus } from './secrets.js';
@@ -182,6 +183,8 @@ export function apply(ctx, rawConfig) {
 
   scheduler.start();
 
+  // Heartbeat / dead man's snitch (#16): an optional periodic GET ping so an
+  // external monitor can alert when this scheduler stops responding.
   // 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;
@@ -203,6 +206,46 @@ export function apply(ctx, rawConfig) {
   }
   updateHeartbeat(config && config.heartbeatUrl, config && config.heartbeatIntervalSec);
 
+  // Synchronize volatile Config settings to runtime scheduler and store (#235)
+  let activeVolatileConfig = {};
+  function syncVolatileConfig(updatedConfig) {
+    try {
+      const cfg = updatedConfig || ctx.config || config || {};
+      const unwrapped = unwrapConfig(cfg);
+      activeVolatileConfig = { ...activeVolatileConfig, ...unwrapped };
+      if (typeof unwrapped.maxConcurrent === 'number') {
+        scheduler.maxConcurrent = unwrapped.maxConcurrent;
+      }
+      if (typeof unwrapped.defaultTimezone === 'string') {
+        scheduler.defaultTimezone = unwrapped.defaultTimezone;
+      }
+      if (typeof unwrapped.llmActionsEnabled === 'boolean') {
+        scheduler.llmActionsEnabled = unwrapped.llmActionsEnabled;
+      }
+      if (unwrapped.heartbeatUrl !== undefined || unwrapped.heartbeatIntervalSec !== undefined) {
+        updateHeartbeat(unwrapped.heartbeatUrl, unwrapped.heartbeatIntervalSec);
+      }
+      const current = store.getSettings();
+      const patch = {};
+      for (const k of ['maxConcurrent', 'defaultTimezone', 'heartbeatUrl', 'heartbeatIntervalSec', 'llmActionsEnabled']) {
+        if (unwrapped[k] !== undefined && unwrapped[k] !== current[k]) {
+          patch[k] = unwrapped[k];
+        }
+      }
+      if (Object.keys(patch).length > 0) {
+        store.saveSettings(patch);
+      }
+    } catch (err) {
+      logger.warn('[dsh-cron] error syncing volatile config:', err.message);
+    }
+  }
+
+  if (typeof ctx.on === 'function') {
+    ctx.on('loader/volatile-update', (updatedConfig) => {
+      syncVolatileConfig(updatedConfig);
+    });
+  }
+
   ctx.effect(() => {
     return () => {
       if (heartbeatTimer) clearInterval(heartbeatTimer);
@@ -237,7 +280,17 @@ export function apply(ctx, rawConfig) {
     handler: async (req, res) => {
       try {
         if (req.method === 'GET') {
-          sendJson(res, 200, { ok: true, settings: { ...store.getClientSettings(), version: pkgVersion } });
+          const unwrapped = {
+            ...unwrapConfig(ctx.config || config || {}),
+            ...activeVolatileConfig,
+          };
+          const clientSettings = store.getClientSettings();
+          for (const k of ['maxConcurrent', 'defaultTimezone', 'heartbeatUrl', 'heartbeatIntervalSec', 'llmActionsEnabled']) {
+            if (unwrapped[k] !== undefined) {
+              clientSettings[k] = unwrapped[k];
+            }
+          }
+          sendJson(res, 200, { ok: true, settings: { ...clientSettings, version: pkgVersion } });
           return;
         }
         if (req.method === 'POST') {

package/lib/runner-external.js

@@ -112,11 +112,29 @@ export async function runViaRemoteWorkspace(task, signal, ctx) {
 
   let profile = null;
   profile = bestEffort('get-remoteSsh-profile', () => {
+    const remoteProfilesSvc = ctx.get('remoteProfiles');
+    if (remoteProfilesSvc && typeof remoteProfilesSvc.list === 'function') {
+      const list = remoteProfilesSvc.list();
+      if (Array.isArray(list)) {
+        const found = list.find((p) => p && p.id === task.sshProfileId);
+        if (found) return found;
+      }
+    }
     const settings = ctx.get('settings');
-    if (settings && typeof settings.get === 'function') {
-      const snap = settings.get('dsh-remote-workspace');
-      const profiles = snap && Array.isArray(snap.profiles) ? snap.profiles : [];
-      return profiles.find((p) => p && p.id === task.sshProfileId) || null;
+    if (settings) {
+      if (typeof settings.describe === 'function') {
+        const desc = settings.describe();
+        const entry = Array.isArray(desc) ? desc.find((r) => r && r.ns === 'dsh-remote-workspace') : null;
+        const snap = entry ? entry.value : null;
+        const profiles = snap && Array.isArray(snap.profiles) ? snap.profiles : [];
+        const found = profiles.find((p) => p && p.id === task.sshProfileId);
+        if (found) return found;
+      }
+      if (typeof settings.get === 'function') {
+        const snap = settings.get('dsh-remote-workspace');
+        const profiles = snap && Array.isArray(snap.profiles) ? snap.profiles : [];
+        return profiles.find((p) => p && p.id === task.sshProfileId) || null;
+      }
     }
     return null;
   });

package/lib/runner.js

@@ -423,22 +423,41 @@ export class SessionRunner {
         turnEvents = handle.agent.log.slice(startSeq);
       }
 
-      // 3. Terminal turn failure check (#227)
+      // Extract usage FIRST so failed turns and budget checks have accurate token and cost accounting (#228)
+      const usage = this._extractUsage(handle, turnEvents);
+      const costUsd = estimateTokenCost(prep.model, usage);
+
+      // 3. Terminal turn failure and settlement check (#227)
+      let hasTerminalEvent = false;
       for (const ev of turnEvents) {
         if (!ev) continue;
         if (ev.type === 'turn/end' || ev.type === 'turn/error' || ev.type === 'turn/failure') {
+          hasTerminalEvent = true;
           const reason = ev.data?.reason || ev.reason;
           const reasonKind = (reason && typeof reason === 'object') ? reason.kind : reason;
-          if (['error', 'interrupted', 'failed', 'aborted'].includes(reasonKind) || ev.data?.error || ev.error) {
-            const errMsg = ev.data?.error?.message || ev.error?.message || reason?.message || (typeof reason === 'string' ? reason : 'Agent turn ended with error');
+          if (['error', 'interrupted', 'failed', 'aborted', 'blocked'].includes(reasonKind) || ev.data?.error || ev.error) {
+            const errMsg = ev.data?.error?.message || ev.error?.message || reason?.message || (typeof reason === 'string' ? reason : `Agent turn ended with status: ${reasonKind || 'error'}`);
             const err = new Error(errMsg);
             err.reason = reason;
+            err.reasonKind = reasonKind;
             err.turnFailed = true;
+            err.usage = usage;
+            err.costUsd = costUsd;
+            err.sessionId = handle.agent.session?.id || null;
             throw err;
           }
         }
       }
 
+      if (turnEvents.length > 0 && !hasTerminalEvent) {
+        const err = new Error('Agent turn ended without terminal completion event');
+        err.turnFailed = true;
+        err.usage = usage;
+        err.costUsd = costUsd;
+        err.sessionId = handle.agent.session?.id || null;
+        throw err;
+      }
+
       // 4. Extract assistant message text from turn events (#227)
       const messageTexts = [];
       const chunkTexts = [];
@@ -476,11 +495,10 @@ export class SessionRunner {
         outputText = `[dsh-cron] Agent finished turn for task "${task.title}" (${sessionNote})`;
       }
 
-      const usage = this._extractUsage(handle, turnEvents);
       return {
         output: outputText,
         usage,
-        costUsd: estimateTokenCost(prep.model, usage),
+        costUsd,
         sessionId: handle.agent.session?.id || null,
       };
     } finally {
@@ -541,27 +559,35 @@ export class SessionRunner {
           }
         }
 
-        // assistant/attempt usage (e.g. paid failed attempts or retry attempts)
-        if (ev.type === 'assistant/attempt' && ev.data?.usage) {
-          const u = ev.data.usage;
-          if (ev.data.failed || ev.data.error || ev.data.status === 'failed') {
-            failedAttempts.push({
+        // assistant/attempt usage (e.g. paid failed attempts, retries, streaming attempts) (#228)
+        if (ev.type === 'assistant/attempt') {
+          let attemptUsage = null;
+          if (ev.data?.usage) {
+            const u = ev.data.usage;
+            attemptUsage = {
               inputTokens: Number(u.inputTokens || u.promptTokens || u.uncachedInputTokens) || 0,
               outputTokens: Number(u.outputTokens || u.completionTokens) || 0,
               cacheReadTokens: Number(u.cacheReadTokens || u.cachedTokens) || 0,
-            });
-            hasEventUsage = true;
-          } else {
-            const key = `${ev.data.turn || 0}:${ev.data.step || 0}`;
-            if (!stepUsage.has(key)) {
-              stepUsage.set(key, {
-                inputTokens: Number(u.inputTokens || u.promptTokens || u.uncachedInputTokens) || 0,
-                outputTokens: Number(u.outputTokens || u.completionTokens) || 0,
-                cacheReadTokens: Number(u.cacheReadTokens || u.cachedTokens) || 0,
-              });
-              hasEventUsage = true;
+            };
+          }
+          // DSH 0.2.0-rc.2 AssistantStreamRecord: stream contains usage chunks
+          if (Array.isArray(ev.data?.stream)) {
+            for (const item of ev.data.stream) {
+              const u = item?.chunk?.usage || item?.usage;
+              if (u) {
+                if (!attemptUsage) {
+                  attemptUsage = { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0 };
+                }
+                attemptUsage.inputTokens += Number(u.inputTokens || u.promptTokens || u.uncachedInputTokens) || 0;
+                attemptUsage.outputTokens += Number(u.outputTokens || u.completionTokens) || 0;
+                attemptUsage.cacheReadTokens += Number(u.cacheReadTokens || u.cachedTokens) || 0;
+              }
             }
           }
+          if (attemptUsage) {
+            failedAttempts.push(attemptUsage);
+            hasEventUsage = true;
+          }
         }
       }
 

package/lib/scheduler-execution.js

@@ -146,6 +146,9 @@ export async function executeOnce(scheduler, task, signal, options = {}) {
     result.error = err.message || String(err);
     const timedOut = result.error.toLowerCase().includes('timed out') || result.error.toLowerCase().includes('timeout');
     result.status = timedOut ? 'timeout' : 'error';
+    if (err.usage) result.usage = err.usage;
+    if (typeof err.costUsd === 'number') result.costUsd = err.costUsd;
+    if (err.sessionId) result.sessionId = err.sessionId;
   }
   return result;
 }

package/lib/store.js

@@ -39,6 +39,7 @@ export class TaskStore {
     this._saveTimer = null;
     this._savePromise = Promise.resolve();
     this._saveVersion = 0;
+    this._diskVersion = 0;
     this._lastWrittenVersion = 0;
     this.init();
   }
@@ -178,7 +179,7 @@ export class TaskStore {
     };
 
     const writeOp = async () => {
-      if (this._lastWrittenVersion >= version) {
+      if ((this._diskVersion || 0) >= version) {
         return;
       }
       const dir = path.dirname(this.filePath);
@@ -191,13 +192,31 @@ export class TaskStore {
       await fs.promises.writeFile(tmp, payload, { encoding: 'utf-8', mode: 0o600 });
       bestEffort('chmod-tmp', () => fs.chmodSync(tmp, 0o600));
 
-      if (this._lastWrittenVersion >= version) {
+      if ((this._diskVersion || 0) >= version || this._saveVersion > version) {
         await fs.promises.unlink(tmp).catch(() => {});
         return;
       }
 
       await fs.promises.rename(tmp, this.filePath);
       bestEffort('chmod-store', () => fs.chmodSync(this.filePath, 0o600));
+
+      // Monotonic versioning & sync save interleaving repair (#244)
+      if ((this._diskVersion || 0) > version) {
+        const syncData = {
+          version: 1,
+          updatedAt: new Date().toISOString(),
+          tasks: Array.from(this.tasks.values()),
+          history: Object.fromEntries(this.history.entries()),
+          settings: this.settings || {},
+        };
+        const randRep = Math.random().toString(36).slice(2, 8);
+        const tmpRep = `${this.filePath}.tmp.${process.pid}_${Date.now()}_${randRep}`;
+        fs.writeFileSync(tmpRep, JSON.stringify(syncData, null, 2), { encoding: 'utf-8', mode: 0o600 });
+        fs.renameSync(tmpRep, this.filePath);
+        return;
+      }
+
+      this._diskVersion = version;
       this._lastWrittenVersion = version;
 
       const now = Date.now();
@@ -243,7 +262,8 @@ export class TaskStore {
       bestEffort('chmod-tmp', () => fs.chmodSync(tmp, 0o600));
       fs.renameSync(tmp, this.filePath);
       bestEffort('chmod-store', () => fs.chmodSync(this.filePath, 0o600));
-      this._lastWrittenVersion = version;
+      this._diskVersion = Math.max(this._diskVersion || 0, version);
+      this._lastWrittenVersion = this._diskVersion;
 
       // Throttled backup (.bak): avoid expensive copyFileSync on every micro-save
       const now = Date.now();

package/package.json

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