@goodandready/dsh-cron 0.2.42 → 0.2.44

package/lib/client.js

@@ -1499,7 +1499,7 @@ window.__ModuleLoader__.load({
 
       const actionInProgressRef = React.useRef(new Set());
 
-      const fetchWithTimeout = async (url, options = {}, timeoutMs = 15000) => {
+      const fetchJsonWithTimeout = async (url, options = {}, timeoutMs = 15000) => {
         const controller = typeof AbortController !== 'undefined' ? new AbortController() : null;
         const timer = controller ? setTimeout(() => controller.abort(), timeoutMs) : null;
         try {
@@ -1507,9 +1507,18 @@ window.__ModuleLoader__.load({
             ...options,
             signal: controller ? controller.signal : options.signal,
           });
-          return res;
+          let data = {};
+          try {
+            data = await res.json();
+          } catch (jsonErr) {
+            // Re-throw if body reading aborted/timed out (#242)
+            if (jsonErr && (jsonErr.name === 'AbortError' || controller?.signal.aborted)) {
+              throw jsonErr;
+            }
+          }
+          return { res, data };
         } catch (err) {
-          if (err && err.name === 'AbortError') {
+          if (err && (err.name === 'AbortError' || controller?.signal.aborted)) {
             const timeoutErr = new Error(`Request timed out after ${Math.round(timeoutMs / 1000)}s`);
             timeoutErr.isTimeout = true;
             throw timeoutErr;
@@ -1519,13 +1528,13 @@ window.__ModuleLoader__.load({
           if (timer) clearTimeout(timer);
         }
       };
+      const fetchWithTimeout = fetchJsonWithTimeout;
 
       const handleToggleTask = async (id) => {
         if (actionInProgressRef.current.has(id)) return;
         actionInProgressRef.current.add(id);
         try {
-          const res = await fetchWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(id) + '/toggle', { method: 'POST' }, 15000);
-          const data = await res.json().catch(() => ({}));
+          const { res, data } = await fetchJsonWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(id) + '/toggle', { method: 'POST' }, 15000);
           if (!res.ok || (data && data.ok === false)) {
             const msg = (data && data.error) || `Toggle failed (HTTP ${res.status})`;
             alert(msg);
@@ -1547,8 +1556,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 fetchWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(id) + '/run', { method: 'POST' }, 15000);
-          const data = await res.json().catch(() => ({}));
+          const { res, data } = await fetchJsonWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(id) + '/run', { method: 'POST' }, 15000);
           if (!res.ok || (data && data.ok === false)) {
             setTasks(prev => prev.map(t2 => t2.id === id ? { ...t2, lastStatus: prevStatus } : t2));
             const msg = (data && data.error) || `Run failed (HTTP ${res.status})`;

package/lib/index.js

@@ -1,4 +1,5 @@
 import fs from 'node:fs';
+import path from 'node:path';
 import { bestEffort } from './best-effort.js';
 import { setLogger, logger } from './logger.js';
 import { registerPluginUpdater } from './updater.js';
@@ -79,6 +80,7 @@ import {
   sanitizeSettingsPayload,
   unwrapConfig,
   unwrapConfigValue,
+  plainConfig,
 } from './settings.js';
 import { registerRoutes } from './routes.js';
 
@@ -89,6 +91,7 @@ export {
   sanitizeSettingsPayload,
   unwrapConfig,
   unwrapConfigValue,
+  plainConfig,
 };
 
 export const name = '@goodandready/dsh-cron';
@@ -118,8 +121,9 @@ const pkgVersion = JSON.parse(fs.readFileSync(pkgUrl, 'utf8')).version || '0.2.2
 
 export function apply(ctx, rawConfig) {
   if (ctx && ctx.logger) setLogger(ctx.logger);
-  const config = unwrapConfig(rawConfig);
-  const store = new TaskStore();
+  const config = plainConfig(rawConfig);
+  const storePath = (config && (config.cronDir || config.storePath)) ? (config.storePath || path.join(config.cronDir, 'tasks.json')) : undefined;
+  const store = new TaskStore(storePath);
 
   // Sync settings declared in the profile config into the store (#184)
   if (config && typeof config === 'object') {
@@ -210,7 +214,8 @@ export function apply(ctx, rawConfig) {
   let activeVolatileConfig = {};
   function syncVolatileConfig(updatedConfig) {
     try {
-      const cfg = updatedConfig || ctx.config || config || {};
+      const isPlainConfigObject = updatedConfig && typeof updatedConfig === 'object' && !Array.isArray(updatedConfig);
+      const cfg = isPlainConfigObject ? { ...(ctx.config || config || {}), ...updatedConfig } : (ctx.config || config || {});
       const unwrapped = unwrapConfig(cfg);
       activeVolatileConfig = { ...activeVolatileConfig, ...unwrapped };
       if (typeof unwrapped.maxConcurrent === 'number') {

package/lib/runner.js

@@ -449,8 +449,13 @@ export class SessionRunner {
         }
       }
 
-      if (turnEvents.length > 0 && !hasTerminalEvent) {
-        const err = new Error('Agent turn ended without terminal completion event');
+      const hasEventLog = typeof session?.snapshotEvents === 'function' || Array.isArray(session?.log) || Array.isArray(handle.agent?.log);
+      if (hasEventLog && !hasTerminalEvent) {
+        const err = new Error(
+          turnEvents.length === 0
+            ? 'Agent turn produced no events before quiescence'
+            : 'Agent turn ended without terminal completion event'
+        );
         err.turnFailed = true;
         err.usage = usage;
         err.costUsd = costUsd;

package/lib/settings.js

@@ -53,28 +53,21 @@ export const Config = z.object({
 
 
 /**
- * Unwrap a volatile config reference or wrap a config object in a transparent Proxy.
+ * Deeply unwrap Cosmokit/Schemastery Volatile boxes into plain primitives/objects/arrays (#282).
  */
-export function unwrapConfigValue(val) {
-  if (val && typeof val === 'object' && typeof val.get === 'function') {
-    return val.get();
+export function plainConfig(value) {
+  if (value === null || value === undefined) return value;
+  if (typeof value === 'function') return plainConfig(value());
+  if (typeof value.get === 'function') return plainConfig(value.get());
+  if (Array.isArray(value)) return value.map(plainConfig);
+  if (typeof value === 'object') {
+    return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, plainConfig(v)]));
   }
-  return val;
+  return value;
 }
 
-export function unwrapConfig(cfg) {
-  if (!cfg || typeof cfg !== 'object') return cfg;
-  if (typeof cfg.get === 'function') return unwrapConfig(cfg.get());
-  return new Proxy(cfg, {
-    get(target, prop, receiver) {
-      const val = Reflect.get(target, prop, receiver);
-      if (val && typeof val === 'object' && typeof val.get === 'function') {
-        return val.get();
-      }
-      return val;
-    }
-  });
-}
+export const unwrapConfigValue = plainConfig;
+export const unwrapConfig = plainConfig;
 
 export const SETTINGS_SYNC_KEYS = [
   'botToken', 'botTokenRef', 'telegramWebhookSecret', 'chatId', 'notifyTelegram', 'onlyOnFailure', 'kanbanBaseUrl',

package/lib/store.js

@@ -179,7 +179,7 @@ export class TaskStore {
     };
 
     const writeOp = async () => {
-      if ((this._diskVersion || 0) >= version) {
+      if ((this._diskVersion || 0) >= version || (this._lastSyncVersion || 0) >= version) {
         return;
       }
       const dir = path.dirname(this.filePath);
@@ -188,37 +188,34 @@ export class TaskStore {
 
       const rand = Math.random().toString(36).slice(2, 8);
       const tmp = `${this.filePath}.tmp.${process.pid}_${Date.now()}_${rand}`;
-      const payload = JSON.stringify(data, null, 2);
+      this._currentAsyncTmp = tmp;
+
+      // Use compact serialization without whitespace indentation to eliminate event loop lag on large stores (#244)
+      const payload = JSON.stringify(data);
       await fs.promises.writeFile(tmp, payload, { encoding: 'utf-8', mode: 0o600 });
       bestEffort('chmod-tmp', () => fs.chmodSync(tmp, 0o600));
 
-      if ((this._diskVersion || 0) >= version || this._saveVersion > version) {
+      if ((this._diskVersion || 0) >= version || (this._lastSyncVersion || 0) >= version || this._saveVersion > version) {
         await fs.promises.unlink(tmp).catch(() => {});
+        if (this._currentAsyncTmp === tmp) this._currentAsyncTmp = null;
         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;
+      try {
+        await fs.promises.rename(tmp, this.filePath);
+        bestEffort('chmod-store', () => fs.chmodSync(this.filePath, 0o600));
+        this._currentAsyncTmp = null;
+        this._diskVersion = version;
+        this._lastWrittenVersion = version;
+      } catch (err) {
+        this._currentAsyncTmp = null;
+        // If tmp was unlinked by newer sync save, rename will fail with ENOENT - safely ignore only in that case (#244)
+        if (err.code === 'ENOENT' && (this._lastSyncVersion || 0) >= version) {
+          return;
+        }
+        throw err;
       }
 
-      this._diskVersion = version;
-      this._lastWrittenVersion = version;
-
       const now = Date.now();
       if (now - this._lastBackupTime > 60000) {
         this._lastBackupTime = now;
@@ -242,6 +239,14 @@ export class TaskStore {
       this._saveTimer = null;
     }
     const version = ++this._saveVersion;
+    this._lastSyncVersion = version;
+
+    // Immediately cancel and unlink any in-flight async tmp file so async rename cannot touch disk (#244)
+    if (this._currentAsyncTmp) {
+      const inFlightTmp = this._currentAsyncTmp;
+      this._currentAsyncTmp = null;
+      bestEffort('unlink-async-tmp', () => fs.unlinkSync(inFlightTmp));
+    }
     try {
       const dir = path.dirname(this.filePath);
       if (!fs.existsSync(dir)) {

package/package.json

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