@goodandready/dsh-cron 0.3.12 → 0.3.13

package/lib/scheduler-execution.js

@@ -1,3 +1,5 @@
+import { resolveBranchTargets } from './branching.js';
+import { shouldAutoHeal, applyDoctorFix } from './doctor.js';
 import { recordPromptRunOutcome } from './prompt-evolver.js';
 import { evaluateAdaptiveRun, calculateNextAdaptiveState } from './adaptive.js';
 import { approvalManager } from './approval.js';
@@ -441,14 +443,42 @@ export async function applySilentRuleToRun(task, runInfo, { askModel, readSettin
 /**
  * Run the model-assisted steps for a finished run.
  */
-export async function applyModelAssists(task, runInfo, options) {
+export async function applyModelAssists(task, runInfo, options = {}) {
   const inspection = await inspectFailureRun(task, runInfo, options);
   if (inspection.inspected) {
     runInfo.diagnosis = inspection.diagnosis;
     runInfo.suggestion = inspection.suggestion;
     runInfo.confidence = inspection.confidence;
+    runInfo.doctorReport = inspection.doctorReport || {
+      category: inspection.category || 'runtime_error',
+      cause: inspection.diagnosis,
+      suggestedFix: inspection.suggestion,
+      confidence: inspection.confidence,
+      diff: inspection.diff || '',
+      timestamp: Date.now(),
+      applied: false,
+      autoHealed: false,
+    };
     logger.info(`[dsh-cron] task "${task.title}" failure diagnosed (${inspection.confidence}): ${inspection.diagnosis}`);
-  } else if (inspection.error && task.inspectOnFailure) {
+
+    // Safe Auto-Heal Check (#353)
+    if (shouldAutoHeal(task, runInfo.doctorReport)) {
+      try {
+        const healResult = await applyDoctorFix(task, runInfo.doctorReport, {
+          store: options.store,
+          user: 'scheduler:auto-heal',
+          isAutoHeal: true,
+        });
+        if (healResult.ok) {
+          logger.info(`[dsh-cron] task "${task.title}" auto-healed successfully with doctor fix!`);
+          runInfo.autoHealed = true;
+          if (runInfo.doctorReport) runInfo.doctorReport.autoHealed = true;
+        }
+      } catch (autoHealErr) {
+        logger.warn(`[dsh-cron] failed to auto-heal task "${task.title}":`, autoHealErr.message);
+      }
+    }
+  } else if (inspection.error && (task.inspectOnFailure || task.autoDiagnose || task.autoHeal)) {
     logger.warn(`[dsh-cron] failure inspection for "${task.title}" not applied: ${inspection.error}`);
   }
 
@@ -769,8 +799,14 @@ export async function handleCompleteRun(scheduler, task, taskId, currentRun, out
     runInfo.artifacts = scheduler.store.getArtifactsForRun(runInfo.runId);
   }
 
-  // Chain Checkpoints (#319, #328)
-  const chainedTargets = parseChainTargets(outcome.status === 'success' ? task.onSuccess : task.onFailure);
+  // Chain Checkpoints & Decision Nodes (#319, #328, #352)
+  const branchResult = resolveBranchTargets(task, outcome, runInfo);
+  if (branchResult && branchResult.decision) {
+    runInfo.branchDecision = branchResult.decision;
+  }
+  const chainedTargets = branchResult
+    ? branchResult.targets
+    : parseChainTargets(outcome.status === 'success' ? task.onSuccess : task.onFailure);
   let hasDependents = false;
   if (scheduler.store?.tasks) {
     for (const t of Object.values(scheduler.store.tasks)) {
@@ -888,10 +924,27 @@ export async function handleCompleteRun(scheduler, task, taskId, currentRun, out
     }
   }
 
-  // 2. Task Chaining (#137, #328 Fan-Out / Fan-In)
-  const targets = parseChainTargets(isSuccess ? task.onSuccess : (isFailure ? task.onFailure : null));
+  // 2. Task Chaining & Decision Nodes (#137, #328, #352 Fan-Out / Fan-In)
+  const targets = branchResult
+    ? branchResult.targets
+    : parseChainTargets(isSuccess ? task.onSuccess : (isFailure ? task.onFailure : null));
   const currentDepth = options.chainDepth || 0;
 
+  if (branchResult && branchResult.decision) {
+    logger.info(`[dsh-cron] decision node in "${task.title}": routed to ${targets.join(', ') || 'none'} (${branchResult.decision.isElse ? 'fallback else' : (branchResult.decision.matched ? `rule #${branchResult.decision.matchedIndex + 1}` : 'unmatched')})`);
+    if (chainRunId && scheduler.store.chainCheckpointManager && Array.isArray(task.branchRules)) {
+      for (const rule of task.branchRules) {
+        if (rule && rule.targetTask && !targets.includes(rule.targetTask)) {
+          scheduler.store.chainCheckpointManager.recordStepSnapshot(chainRunId, rule.targetTask, {
+            status: 'skipped',
+            skippedReason: 'condition not met',
+            durationMs: 0,
+          });
+        }
+      }
+    }
+  }
+
   if (currentDepth < 4) {
     // 2.1 Trigger explicit targets (Fan-Out)
     for (const targetId of targets) {

package/lib/task-create.js

@@ -1,3 +1,4 @@
+import { sanitizeBranchRules } from './branching.js';
 import { sanitizePromptHistory } from './prompt-evolver.js';
 import { sanitizeAdaptiveConfig } from './adaptive.js';
 import { sanitizeValidators } from './validators.js';
@@ -55,6 +56,14 @@ export function executeCreateTask(store, scheduler, args) {
     webhookDebounceMs: args.webhookDebounceMs !== undefined ? Number(args.webhookDebounceMs) : (args.webhookTrigger?.debounceMs !== undefined ? Number(args.webhookTrigger.debounceMs) : undefined),
     onSuccess: args.onSuccess ? String(args.onSuccess).trim() : '',
     onFailure: args.onFailure ? String(args.onFailure).trim() : '',
+    branchRules: args.branchRules !== undefined ? sanitizeBranchRules(args.branchRules) : undefined,
+    elseTask: args.elseTask ? String(args.elseTask).trim() : undefined,
+    autoHeal: args.autoHeal !== undefined ? Boolean(args.autoHeal) : undefined,
+    selfHealing: args.selfHealing && typeof args.selfHealing === 'object' ? {
+      autoApply: Boolean(args.selfHealing.autoApply),
+      lastPatchedAt: Number(args.selfHealing.lastPatchedAt) || 0,
+      autoPatchesCount: Number(args.selfHealing.autoPatchesCount) || 0,
+    } : undefined,
     dependsOn: args.dependsOn !== undefined ? sanitizeDependsOn(args.dependsOn) : undefined,
     joinPolicy: args.joinPolicy !== undefined ? sanitizeJoinPolicy(args.joinPolicy) : undefined,
     adaptive: args.adaptive !== undefined ? sanitizeAdaptiveConfig(args.adaptive) : undefined,

package/lib/task-patch.js

@@ -1,3 +1,4 @@
+import { sanitizeBranchRules } from './branching.js';
 import { trackPromptEdit, sanitizePromptHistory } from './prompt-evolver.js';
 import { sanitizeAdaptiveConfig } from './adaptive.js';
 import { sanitizeValidators } from './validators.js';
@@ -121,6 +122,22 @@ export function buildTaskPatch(current, body) {
   if (patch.validators !== undefined) {
     patch.validators = Array.isArray(patch.validators) ? sanitizeValidators(patch.validators) : [];
   }
+  if (patch.branchRules !== undefined) {
+    patch.branchRules = sanitizeBranchRules(patch.branchRules);
+  }
+  if (patch.elseTask !== undefined) {
+    patch.elseTask = patch.elseTask ? String(patch.elseTask).trim() : null;
+  }
+  if (patch.autoHeal !== undefined) {
+    patch.autoHeal = Boolean(patch.autoHeal);
+  }
+  if (patch.selfHealing !== undefined && patch.selfHealing && typeof patch.selfHealing === 'object') {
+    patch.selfHealing = {
+      autoApply: Boolean(patch.selfHealing.autoApply),
+      lastPatchedAt: Number(patch.selfHealing.lastPatchedAt) || 0,
+      autoPatchesCount: Number(patch.selfHealing.autoPatchesCount) || 0,
+    };
+  }
   if (patch.prompt !== undefined && current && typeof current.prompt === 'string') {
     const edit = trackPromptEdit(current, patch.prompt, body && body.promptNote ? body.promptNote : 'Manual edit');
     patch.prompt = edit.prompt;
@@ -181,7 +198,7 @@ export function applyTaskPatch({ store, scheduler, id, body, allowCodeSwitch = f
   }
   const built = buildTaskPatch(current, body);
   if (!built.ok) return built;
-  if (built.patch.dependsOn !== undefined || built.patch.onSuccess !== undefined) {
+  if (built.patch.dependsOn !== undefined || built.patch.onSuccess !== undefined || built.patch.branchRules !== undefined || built.patch.elseTask !== undefined) {
     const dagCheck = validateDAG(store?.tasks || {}, { ...current, ...built.patch, id });
     if (!dagCheck.ok) {
       return { ok: false, error: dagCheck.error };

package/lib/task-transfer.js

@@ -89,6 +89,13 @@ export const PATCHABLE_TASK_FIELDS = [
   'adaptiveState',
   'promptVersion',
   'promptHistory',
+  'branchRules',
+  'elseTask',
+  'autoHeal',
+  'selfHealing',
+  'revisions',
+  'previousPrompt',
+  'previousScript',
 ];
 
 /** Fields a duplicate inherits; anything else is runtime state, not config. */

package/package.json

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