@dcrays/scheduled-task 0.3.5 → 0.3.6-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/scheduled-task",
-  "version": "0.3.5",
+  "version": "0.3.6-beta.2",
   "description": "Persistent client-facing cron automation service for DeepSeek Harness",
   "type": "module",
   "main": "plugin/index.js",

package/plugin/index.js

@@ -1100,6 +1100,9 @@ var CronAutomationManager = class {
       if (patch.at !== void 0 && Date.parse(patch.at) <= now) {
         throw new CronAutomationInputError("invalid_envelope", "at must be in the future");
       }
+      if (patch.enabled === true && next.schedule.kind === "at" && atTimestamp(next.schedule) <= now) {
+        throw new CronAutomationInputError("invalid_envelope", "at must be in the future");
+      }
       if (patch.enabled !== void 0) {
         next.enabled = patch.enabled;
         delete next.state.runningAtMs;
@@ -1328,7 +1331,11 @@ var CronAutomationManager = class {
     }
     this.blockedAgents.delete(dshAgentIdFor(job));
     this.blockedUntil.delete(dshAgentIdFor(job));
-    if (job.deleteAfterRun === true || job.schedule.kind === "at") {
+    if (job.schedule.kind === "at") {
+      job.enabled = false;
+      setNextOccurrence(job, void 0);
+      await this.repository.upsert([job]);
+    } else if (job.deleteAfterRun === true) {
       this.jobs.delete(jobId);
       await this.repository.delete(jobId);
     } else {
@@ -1398,6 +1405,20 @@ import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+var LegacySessionBindingError = class extends Error {
+};
+function decodeImportedJob(value) {
+  if (isRecord3(value) && typeof value.sessionTarget === "string" && value.sessionTarget.startsWith("session:")) {
+    const sessionKey = value.sessionTarget.slice("session:".length);
+    if (!sessionKey.trim())
+      throw new LegacySessionBindingError("OpenClaw cron session target is empty");
+    if (value.sessionKey !== void 0 && value.sessionKey !== null && value.sessionKey !== "" && value.sessionKey !== sessionKey) {
+      throw new LegacySessionBindingError("OpenClaw cron session target conflicts with sessionKey");
+    }
+    return decodeJob({ ...value, sessionTarget: "isolated", sessionKey });
+  }
+  return decodeJob(value);
+}
 function parseJson(raw, label) {
   try {
     return JSON.parse(raw);
@@ -1476,15 +1497,17 @@ function jobFromOpenClawRow(row) {
     const parsed = parseJson(row.job_json, "job_json");
     if (!isRecord3(parsed))
       throw new Error("job_json must be an object");
-    return decodeJob({
+    return decodeImportedJob({
       ...parsed,
       id: typeof parsed.id === "string" && parsed.id ? parsed.id : row.job_id,
       updatedAtMs: typeof parsed.updatedAtMs === "number" ? parsed.updatedAtMs : row.updated_at,
       createdAtMs: typeof parsed.createdAtMs === "number" ? parsed.createdAtMs : row.created_at_ms,
       state: overlayState(row, parsed.state, tableState)
     });
-  } catch {
-    return decodeJob(jobFromColumns(row, overlayState(row, {}, tableState)));
+  } catch (error) {
+    if (error instanceof LegacySessionBindingError)
+      throw error;
+    return decodeImportedJob(jobFromColumns(row, overlayState(row, {}, tableState)));
   }
 }
 function loadOpenClawSqliteJobsWithDiagnostics(sqlitePath) {

package/src/manager.js

@@ -382,6 +382,9 @@ export class CronAutomationManager {
             if (patch.at !== undefined && Date.parse(patch.at) <= now) {
                 throw new CronAutomationInputError('invalid_envelope', 'at must be in the future');
             }
+            if (patch.enabled === true && next.schedule.kind === 'at' && atTimestamp(next.schedule) <= now) {
+                throw new CronAutomationInputError('invalid_envelope', 'at must be in the future');
+            }
             if (patch.enabled !== undefined) {
                 next.enabled = patch.enabled;
                 delete next.state.runningAtMs;
@@ -630,7 +633,12 @@ export class CronAutomationManager {
         }
         this.blockedAgents.delete(dshAgentIdFor(job));
         this.blockedUntil.delete(dshAgentIdFor(job));
-        if (job.deleteAfterRun === true || job.schedule.kind === 'at') {
+        if (job.schedule.kind === 'at') {
+            job.enabled = false;
+            setNextOccurrence(job, undefined);
+            await this.repository.upsert([job]);
+        }
+        else if (job.deleteAfterRun === true) {
             this.jobs.delete(jobId);
             await this.repository.delete(jobId);
         }

package/src/openclaw-sqlite.js

@@ -9,6 +9,24 @@ import { decodeJob } from './repository.js';
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+class LegacySessionBindingError extends Error {
+}
+/** Translate legacy execution targets without changing the task's business conversation. */
+function decodeImportedJob(value) {
+    if (isRecord(value) && typeof value.sessionTarget === 'string' && value.sessionTarget.startsWith('session:')) {
+        const sessionKey = value.sessionTarget.slice('session:'.length);
+        if (!sessionKey.trim())
+            throw new LegacySessionBindingError('OpenClaw cron session target is empty');
+        if (value.sessionKey !== undefined &&
+            value.sessionKey !== null &&
+            value.sessionKey !== '' &&
+            value.sessionKey !== sessionKey) {
+            throw new LegacySessionBindingError('OpenClaw cron session target conflicts with sessionKey');
+        }
+        return decodeJob({ ...value, sessionTarget: 'isolated', sessionKey });
+    }
+    return decodeJob(value);
+}
 function parseJson(raw, label) {
     try {
         return JSON.parse(raw);
@@ -93,7 +111,7 @@ export function jobFromOpenClawRow(row) {
         const parsed = parseJson(row.job_json, 'job_json');
         if (!isRecord(parsed))
             throw new Error('job_json must be an object');
-        return decodeJob({
+        return decodeImportedJob({
             ...parsed,
             id: typeof parsed.id === 'string' && parsed.id ? parsed.id : row.job_id,
             updatedAtMs: typeof parsed.updatedAtMs === 'number' ? parsed.updatedAtMs : row.updated_at,
@@ -101,8 +119,11 @@ export function jobFromOpenClawRow(row) {
             state: overlayState(row, parsed.state, tableState)
         });
     }
-    catch {
-        return decodeJob(jobFromColumns(row, overlayState(row, {}, tableState)));
+    catch (error) {
+        // Conflicting routing must not silently fall back to a different conversation.
+        if (error instanceof LegacySessionBindingError)
+            throw error;
+        return decodeImportedJob(jobFromColumns(row, overlayState(row, {}, tableState)));
     }
 }
 export function loadOpenClawSqliteJobs(sqlitePath) {