@goodandready/dsh-cron 0.2.23 → 0.2.24

package/lib/client.js

@@ -3380,7 +3380,7 @@ window.__ModuleLoader__.load({
       const [updateState, setUpdateState] = React.useState({
         checking: false,
         updating: false,
-        currentVersion: '0.2.23',
+        currentVersion: '0.2.24',
         latestVersion: undefined,
         updateAvailable: false,
         notice: null,

package/lib/index.js

@@ -74,6 +74,8 @@ import {
   SETTINGS_SYNC_KEYS,
   applySettingsToScope,
   sanitizeSettingsPayload,
+  unwrapConfig,
+  unwrapConfigValue,
 } from './settings.js';
 import { registerRoutes } from './routes.js';
 
@@ -82,10 +84,12 @@ export {
   SETTINGS_SYNC_KEYS,
   applySettingsToScope,
   sanitizeSettingsPayload,
+  unwrapConfig,
+  unwrapConfigValue,
 };
 
 export const name = '@goodandready/dsh-cron';
-export const inject = ['tools', 'webServer', 'settings', 'llm', 'agents', 'agentDefaultModel', 'credentials'];
+export const inject = ['tools', 'webServer', 'llm', 'agents', 'agentDefaultModel', 'credentials'];
 
 import { executeCreateTask } from './task-create.js';
 export { executeCreateTask };
@@ -147,8 +151,23 @@ const createTaskOutput = {
   render: (_args, val) => [{ type: 'text', text: val.message || JSON.stringify(val) }]
 };
 
-export function apply(ctx, config) {
+export function apply(ctx, rawConfig) {
+  const config = unwrapConfig(rawConfig);
   const store = new TaskStore();
+
+  // Sync settings declared in the profile config into the store (#184)
+  if (config && typeof config === 'object') {
+    const fromConfig = {};
+    for (const key of SETTINGS_SYNC_KEYS) {
+      const val = config[key];
+      if (val !== undefined && val !== null && val !== '') {
+        fromConfig[key] = val;
+      }
+    }
+    if (Object.keys(fromConfig).length > 0) {
+      store.saveSettings(fromConfig);
+    }
+  }
   const runner = new SessionRunner(ctx, store);
   const scheduler = new TaskScheduler(store, (task, opts) => runner.execute(task, opts), {
     maxConcurrent: config && config.maxConcurrent,
@@ -166,29 +185,22 @@ export function apply(ctx, config) {
     }),
   });
 
-  // Register settings in the Harness settings service (#71, #102): the scope
-  // is the source of truth for the core, scope.watch mirrors values into the
-  // plugin store, and REST writes go through scope.set so nothing bypasses
-  // the settings service.
-  let cronSettingsScope = null;
+  // Settings integration for DSH 0.1.7+ (#184):
+  // DSH 0.1.7 removed legacy settings.register and uses volatile Config fields.
+  // We attach to settings optionally, configure presentation, and synchronize writes.
+  let settingsService = null;
   ctx.inject(['settings'], (sctx) => {
+    settingsService = sctx.settings;
     try {
-      cronSettingsScope = sctx.settings.register('dsh-cron', Config, {
-        base: store.getSettings()
-      });
-      if (cronSettingsScope && typeof cronSettingsScope.watch === 'function') {
-        cronSettingsScope.watch((updated) => {
-          if (updated && typeof updated === 'object') {
-            store.saveSettings(updated);
-          }
-        });
+      if (settingsService && typeof settingsService.configure === 'function') {
+        sctx.effect(() => settingsService.configure({ auto: false }, ctx.fiber));
       }
-      sctx.effect(() => () => {
-        cronSettingsScope = null;
-      });
-    } catch (e) {
-      console.warn('[dsh-cron] settings registration warning:', e.message);
+    } catch {
+      // ignore presentation policy errors
     }
+    sctx.effect(() => () => {
+      settingsService = null;
+    });
   });
 
   // #50: jobs declared in the profile config belong to the config. The sync
@@ -239,7 +251,7 @@ export function apply(ctx, config) {
   registerRoutes(ctx, {
     store,
     scheduler,
-    getCronSettingsScope: () => cronSettingsScope,
+    getCronSettingsScope: () => settingsService,
     recommendations,
   });
 
@@ -258,11 +270,13 @@ export function apply(ctx, config) {
           const { body, error } = await readBody(req, res);
           if (error) return;
           const payload = sanitizeSettingsPayload(body);
-          const scopeErrors = await applySettingsToScope(cronSettingsScope, payload);
-          if (scopeErrors === null) {
-            store.saveSettings(payload);
-          }
-          sendJson(res, 200, { ok: true, settings: store.getClientSettings(), scopeErrors: scopeErrors || undefined });
+          store.saveSettings(payload);
+          const scopeErrors = await applySettingsToScope(settingsService, payload);
+          sendJson(res, 200, {
+            ok: true,
+            settings: store.getClientSettings(),
+            scopeErrors: (scopeErrors && scopeErrors.length > 0) ? scopeErrors : undefined
+          });
           return;
         }
         sendJson(res, 405, { ok: false, error: 'Method not allowed' });

package/lib/settings.js

@@ -3,43 +3,76 @@ import { credentialRefStatus } from './secrets.js';
 import { TaskStore } from './store.js';
 import { MIN_DELIVERY_TIMEOUT_MS, resolveDeliveryTimeoutMs } from './channels.js';
 
+// Polyfill Schema.prototype.volatile for schemastery < 3.18.3 environments
+if (typeof z.prototype?.volatile !== 'function') {
+  z.prototype.volatile = function volatile() {
+    if (this.meta && this.meta.volatile) throw new TypeError('volatile schema is already wrapped');
+    return typeof this.extra === 'function' ? this.extra('volatile', true) : this;
+  };
+}
+
 export const Config = z.object({
-  botToken: z.string().role('secret').default('').description('Legacy Telegram Bot API token (prefer botTokenRef with the DSH credentials service)'),
-  botTokenRef: z.string().default('').description('Name of the DSH credential that holds the Telegram bot token'),
-  chatId: z.string().default('').description('Telegram chat ID that receives task reports'),
-  notifyTelegram: z.boolean().default(false).description('Deliver task reports to Telegram for every task'),
-  onlyOnFailure: z.boolean().default(false).description('Deliver reports only for failed runs'),
-  kanbanBaseUrl: z.string().default('http://127.0.0.1:3000').description('Base URL of the dsh-kanban HTTP API'),
-  defaultTimezone: z.string().default('').description('Default IANA time zone for schedules (empty = server local)'),
-  maxConcurrent: z.number().default(0).description('Max parallel task runs (0 = unlimited)'),
-  heartbeatUrl: z.string().default('').description('Dead man\'s snitch URL pinged on the heartbeat interval'),
-  heartbeatIntervalSec: z.number().default(0).description('Heartbeat ping interval in seconds (0 = off)'),
+  botToken: z.string().role('secret').default('').description('Legacy Telegram Bot API token (prefer botTokenRef with the DSH credentials service)').volatile(),
+  botTokenRef: z.string().default('').description('Name of the DSH credential that holds the Telegram bot token').volatile(),
+  chatId: z.string().default('').description('Telegram chat ID that receives task reports').volatile(),
+  notifyTelegram: z.boolean().default(false).description('Deliver task reports to Telegram for every task').volatile(),
+  onlyOnFailure: z.boolean().default(false).description('Deliver reports only for failed runs').volatile(),
+  kanbanBaseUrl: z.string().default('http://127.0.0.1:3000').description('Base URL of the dsh-kanban HTTP API').volatile(),
+  defaultTimezone: z.string().default('').description('Default IANA time zone for schedules (empty = server local)').volatile(),
+  maxConcurrent: z.number().default(0).description('Max parallel task runs (0 = unlimited)').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(),
   // --- 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}'),
-  channelTemplates: z.object({}).default({}).description('Per-channel template overrides keyed by channel id'),
-  silentRuleModel: z.string().default('').description('Model used to evaluate a task silent rule (empty = the task model)'),
-  inspectorModel: z.string().default('').description('Model used to diagnose failed runs (empty = the task model)'),
-  deliveryTimeoutMs: z.number().min(MIN_DELIVERY_TIMEOUT_MS).default(15000).description('Per-channel delivery timeout in ms (minimum 1000); a slower endpoint is recorded as a failure and does not block other channels or the next tick'),
-  discordWebhookUrl: z.string().default('').description('Discord webhook URL'),
-  slackWebhookUrl: z.string().default('').description('Slack incoming webhook URL'),
-  ntfyUrl: z.string().default('https://ntfy.sh').description('ntfy server base URL'),
-  ntfyTopic: z.string().default('').description('ntfy topic for push notifications'),
-  ntfyTokenRef: z.string().default('').description('Credential name for the ntfy access token'),
-  barkServerUrl: z.string().default('https://api.day.app').description('Bark server base URL'),
-  barkKey: z.string().default('').description('Bark device key'),
-  pushplusTokenRef: z.string().default('').description('Credential name for the PushPlus token'),
-  pushplusUrl: z.string().default('https://www.pushplus.plus/send').description('PushPlus send endpoint (override for a self-hosted proxy)'),
-  ttsBaseUrl: z.string().default('http://127.0.0.1:3080').description('Base URL of the harness used to reach the dsh-tts speak route'),
-  giteaBaseUrl: z.string().default('').description('Gitea base URL for alert issues'),
-  giteaRepo: z.string().default('').description('Gitea repository (owner/name) for alert issues'),
-  giteaTokenRef: z.string().default('').description('Credential name for the Gitea API token'),
-  prReviewerEnabled: z.boolean().default(false).description('Enable automated PR Reviewer scheduled agent (#33)'),
+  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(),
+  silentRuleModel: z.string().default('').description('Model used to evaluate a task silent rule (empty = the task model)').volatile(),
+  inspectorModel: z.string().default('').description('Model used to diagnose failed runs (empty = the task model)').volatile(),
+  deliveryTimeoutMs: z.number().min(MIN_DELIVERY_TIMEOUT_MS).default(15000).description('Per-channel delivery timeout in ms (minimum 1000); a slower endpoint is recorded as a failure and does not block other channels or the next tick').volatile(),
+  discordWebhookUrl: z.string().default('').description('Discord webhook URL').volatile(),
+  slackWebhookUrl: z.string().default('').description('Slack incoming webhook URL').volatile(),
+  ntfyUrl: z.string().default('https://ntfy.sh').description('ntfy server base URL').volatile(),
+  ntfyTopic: z.string().default('').description('ntfy topic for push notifications').volatile(),
+  ntfyTokenRef: z.string().default('').description('Credential name for the ntfy access token').volatile(),
+  barkServerUrl: z.string().default('https://api.day.app').description('Bark server base URL').volatile(),
+  barkKey: z.string().default('').description('Bark device key').volatile(),
+  pushplusTokenRef: z.string().default('').description('Credential name for the PushPlus token').volatile(),
+  pushplusUrl: z.string().default('https://www.pushplus.plus/send').description('PushPlus send endpoint (override for a self-hosted proxy)').volatile(),
+  ttsBaseUrl: z.string().default('http://127.0.0.1:3080').description('Base URL of the harness used to reach the dsh-tts speak route').volatile(),
+  giteaBaseUrl: z.string().default('').description('Gitea base URL for alert issues').volatile(),
+  giteaRepo: z.string().default('').description('Gitea repository (owner/name) for alert issues').volatile(),
+  giteaTokenRef: z.string().default('').description('Credential name for the Gitea API token').volatile(),
+  prReviewerEnabled: z.boolean().default(false).description('Enable automated PR Reviewer scheduled agent (#33)').volatile(),
   // --- Declarative jobs (#50, ADR-0001) ---
   jobs: z.array(z.any()).default([]).description('Static jobs owned by the config; each entry needs id, title, schedule and (for agent types) prompt'),
   // --- External REST API (#54, ADR-0001) ---
-  apiToken: z.string().role('secret').default('').description('Bearer token for the external /dsh-cron/api/* surface (empty = the surface answers 503)'),
+  apiToken: z.string().role('secret').default('').description('Bearer token for the external /dsh-cron/api/* surface (empty = the surface answers 503)').volatile(),
 });
 
+
+/**
+ * Unwrap a volatile config reference or wrap a config object in a transparent Proxy.
+ */
+export function unwrapConfigValue(val) {
+  if (val && typeof val === 'object' && typeof val.get === 'function') {
+    return val.get();
+  }
+  return val;
+}
+
+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 SETTINGS_SYNC_KEYS = [
   'botToken', 'botTokenRef', 'chatId', 'notifyTelegram', 'onlyOnFailure', 'kanbanBaseUrl',
   'template', 'channelTemplates', 'deliveryTimeoutMs', 'silentRuleModel', 'inspectorModel',
@@ -58,18 +91,37 @@ export const SETTINGS_SYNC_KEYS = [
  * snapshot stays authoritative (#102). Returns null when the settings
  * service is unavailable (headless profiles fall back to store-only writes).
  */
-export async function applySettingsToScope(settingsScope, body) {
-  if (!settingsScope || typeof settingsScope.set !== 'function') return null;
-  const errors = [];
-  for (const key of SETTINGS_SYNC_KEYS) {
-    if (!Object.prototype.hasOwnProperty.call(body, key)) continue;
+export async function applySettingsToScope(settingsTarget, body) {
+  if (!settingsTarget) return null;
+  // DSH 0.1.7: SettingsForms service has update(ns, patch)
+  if (typeof settingsTarget.update === 'function') {
     try {
-      await settingsScope.set(key, body[key]);
+      const patch = {};
+      for (const key of SETTINGS_SYNC_KEYS) {
+        if (Object.prototype.hasOwnProperty.call(body, key)) {
+          patch[key] = body[key];
+        }
+      }
+      await settingsTarget.update('dsh-cron', patch);
+      return [];
     } catch (e) {
-      errors.push(key + ': ' + ((e && e.message) || e));
+      return ['dsh-cron: ' + ((e && e.message) || e)];
+    }
+  }
+  // Legacy / mock scope with set(key, value)
+  if (typeof settingsTarget.set === 'function') {
+    const errors = [];
+    for (const key of SETTINGS_SYNC_KEYS) {
+      if (!Object.prototype.hasOwnProperty.call(body, key)) continue;
+      try {
+        await settingsTarget.set(key, body[key]);
+      } catch (e) {
+        errors.push(key + ': ' + ((e && e.message) || e));
+      }
     }
+    return errors;
   }
-  return errors;
+  return null;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Scheduled cron tasks, background automation and agent execution for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",