@dcrays/scheduled-task 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcrays/scheduled-task",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Persistent client-facing cron automation service for DeepSeek Harness (production)",
   "type": "module",
   "main": "plugin/index.js",
@@ -32,16 +32,14 @@
   "engines": {
     "node": ">=24.0.0"
   },
-  "dependencies": {
-    "@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
-    "@deepseek-ai/schemastery": "^3.18.1"
-  },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-tools": "^0.1.1-rc.2"
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-agent": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-home-paths": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-tools": "^0.1.2-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.1"
   },
   "publishConfig": {
     "access": "public"

package/plugin/index.js

@@ -1,6 +1,7 @@
 import { createRequire as __mobookCreateRequire } from 'node:module'; const require = __mobookCreateRequire(import.meta.url);
 
-// plugins/scheduled-task/dist-npm/plugin/index.js
+// dist-npm/plugin/index.js
+import { existsSync as existsSync2 } from "node:fs";
 import path3 from "node:path";
 import { Service } from "@deepseek-ai/cordis";
 import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
@@ -8,7 +9,7 @@ import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import z from "@deepseek-ai/schemastery";
 
-// plugins/scheduled-task/dist-npm/src/cron.js
+// dist-npm/src/cron.js
 var FIELD_COUNT = 5;
 var MAX_SEARCH_DAYS = 366 * 8;
 var GREGORIAN_CYCLE_DAYS = 146097;
@@ -208,10 +209,10 @@ function nextCronOccurrence(afterEpochMs, cron, timeZone) {
   throw new CronExpressionError("cron expression has no occurrence within the next eight years");
 }
 
-// plugins/scheduled-task/dist-npm/src/manager.js
+// dist-npm/src/manager.js
 import { createHash } from "node:crypto";
 
-// plugins/scheduled-task/dist-npm/src/protocol.js
+// dist-npm/src/protocol.js
 var CRON_CREATE_TYPE = "dsh/cron.create";
 var CRON_LIST_TYPE = "dsh/cron.list";
 var CronAutomationInputError = class extends Error {
@@ -302,7 +303,7 @@ function parseCronEditorRequest(message) {
   return { id, text };
 }
 
-// plugins/scheduled-task/dist-npm/src/repository.js
+// dist-npm/src/repository.js
 import fs from "node:fs";
 import path from "node:path";
 import { DatabaseSync } from "node:sqlite";
@@ -681,7 +682,7 @@ var CronAutomationRepository = class {
   }
 };
 
-// plugins/scheduled-task/dist-npm/src/manager.js
+// dist-npm/src/manager.js
 var MAX_TIMER_DELAY_MS = 2147483647;
 function automationId(agentId, requestId) {
   return `cron-${createHash("sha256").update(`${agentId}\0${requestId}`).digest("hex").slice(0, 24)}`;
@@ -692,6 +693,9 @@ function cloneJob(job) {
 function dshAgentIdFor(job) {
   return job.dshSessionId ?? job.agentId;
 }
+function hasDshSession(job) {
+  return typeof job.dshSessionId === "string" && job.dshSessionId.length > 0;
+}
 function timezoneFor(schedule) {
   return schedule.tz ?? Intl.DateTimeFormat().resolvedOptions().timeZone ?? "UTC";
 }
@@ -982,6 +986,8 @@ var CronAutomationManager = class {
         return "not_found";
       if (job.state.runningAtMs !== void 0)
         return "already_running";
+      if (!hasDshSession(job))
+        return "delivery_unavailable";
       const occurrenceAtMs = this.now();
       job.state.runningAtMs = occurrenceAtMs;
       job.updatedAtMs = occurrenceAtMs;
@@ -1061,7 +1067,7 @@ var CronAutomationManager = class {
       clearTimeout(this.timer);
     this.timer = void 0;
     const now = this.now();
-    const target = [...this.jobs.values()].filter((job) => job.enabled && job.state.runningAtMs === void 0 && !this.blockedAgents.has(dshAgentIdFor(job))).map((job) => job.state.nextRunAtMs).filter((value) => value !== void 0).reduce((earliest, candidate) => earliest === void 0 || candidate < earliest ? candidate : earliest, void 0);
+    const target = [...this.jobs.values()].filter((job) => job.enabled && hasDshSession(job) && job.state.runningAtMs === void 0 && !this.blockedAgents.has(dshAgentIdFor(job))).map((job) => job.state.nextRunAtMs).filter((value) => value !== void 0).reduce((earliest, candidate) => earliest === void 0 || candidate < earliest ? candidate : earliest, void 0);
     if (target === void 0)
       return;
     const delay = Math.max(0, Math.min(target - now, MAX_TIMER_DELAY_MS));
@@ -1075,7 +1081,7 @@ var CronAutomationManager = class {
     if (this.stopping)
       return;
     const now = this.now();
-    const due = [...this.jobs.values()].filter((job) => job.enabled && job.state.nextRunAtMs !== void 0 && job.state.nextRunAtMs <= now).sort((left, right) => (left.state.nextRunAtMs ?? 0) - (right.state.nextRunAtMs ?? 0) || left.createdAtMs - right.createdAtMs);
+    const due = [...this.jobs.values()].filter((job) => job.enabled && hasDshSession(job) && job.state.nextRunAtMs !== void 0 && job.state.nextRunAtMs <= now).sort((left, right) => (left.state.nextRunAtMs ?? 0) - (right.state.nextRunAtMs ?? 0) || left.createdAtMs - right.createdAtMs);
     for (const job of due) {
       const occurrenceAtMs = job.state.nextRunAtMs ?? now;
       job.state.runningAtMs = now;
@@ -1105,12 +1111,15 @@ var CronAutomationManager = class {
   }
 };
 
-// plugins/scheduled-task/dist-npm/src/openclaw-sqlite.js
+// dist-npm/src/openclaw-sqlite.js
 import { existsSync, realpathSync } from "node:fs";
+import { mkdir, rename, unlink, writeFile } from "node:fs/promises";
+import { randomUUID } from "node:crypto";
 import os from "node:os";
 import path2 from "node:path";
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
 var DEFAULT_OPENCLAW_SQLITE = path2.join(os.homedir(), ".mobook", "state", "openclaw.sqlite");
+var DEFAULT_OPENCLAW_SQLITE_ALT = path2.join(os.homedir(), ".openclaw", "state", "openclaw.sqlite");
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1223,11 +1232,23 @@ function loadOpenClawSqliteJobs(sqlitePath) {
     database.close();
   }
 }
-function resolveOpenClawSqlitePath(configured) {
-  const explicit = configured?.trim() || process.env.OPENCLAW_SQLITE?.trim();
-  if (explicit)
-    return path2.resolve(explicit);
-  return DEFAULT_OPENCLAW_SQLITE;
+async function snapshotOpenClawSqlite(sqlitePath, destination) {
+  const database = new DatabaseSync2(sqlitePath, { readOnly: true, timeout: 5e3 });
+  try {
+    const serialized = database.serialize();
+    const directory = path2.dirname(destination);
+    const temporary = path2.join(directory, `.${path2.basename(destination)}.${randomUUID()}.tmp`);
+    await mkdir(directory, { recursive: true });
+    try {
+      await writeFile(temporary, serialized, { mode: 384 });
+      await rename(temporary, destination);
+    } catch (error) {
+      await unlink(temporary).catch(() => void 0);
+      throw error;
+    }
+  } finally {
+    database.close();
+  }
 }
 function openClawImportSource(sqlitePath) {
   const resolved = path2.resolve(sqlitePath);
@@ -1235,7 +1256,7 @@ function openClawImportSource(sqlitePath) {
   return `openclaw-sqlite:${canonical}`;
 }
 
-// plugins/scheduled-task/dist-npm/plugin/index.js
+// dist-npm/plugin/index.js
 var name = "@dcrays/scheduled-task";
 var inject = ["agentDefaultModel", "agents", "sessionPersistence", "webServer", "tools"];
 var API_PREFIX = "/api/cron-automations";
@@ -1452,9 +1473,13 @@ var CronAutomationService = class extends Service {
     this.manager = new CronAutomationManager(new CronAutomationRepository(databaseFile), {
       maxPromptChars: config.maxPromptChars,
       deliver: async (cron, occurrenceAt) => {
+        if (!cron.dshSessionId) {
+          logger.warn("cron %s is waiting for an MBHChat DSH session binding", cron.id);
+          return false;
+        }
         let agent;
         try {
-          agent = await resumeAgent(owner, cron.dshSessionId ?? cron.agentId);
+          agent = await resumeAgent(owner, cron.dshSessionId);
         } catch (error) {
           logger.warn("could not resume agent %s for cron %s: %s", cron.agentId, cron.id, error instanceof Error ? error.message : String(error));
           return false;
@@ -1494,7 +1519,23 @@ var CronAutomationService = class extends Service {
     this.interval.unref();
   }
   async importOpenClawJobs() {
-    const sqlitePath = resolveOpenClawSqlitePath(this.config.openclawSqlite);
+    const explicit = this.config.openclawSqlite?.trim() || process.env["OPENCLAW_SQLITE"]?.trim();
+    let sqlitePath;
+    if (explicit) {
+      sqlitePath = path3.resolve(explicit);
+    } else {
+      const stagingPath = dshHomePath("migration", "openclaw.sqlite");
+      const sourceCandidate = [DEFAULT_OPENCLAW_SQLITE, DEFAULT_OPENCLAW_SQLITE_ALT].find(existsSync2);
+      if (!existsSync2(stagingPath) && sourceCandidate) {
+        try {
+          await snapshotOpenClawSqlite(sourceCandidate, stagingPath);
+          this.owner.logger("dsh-cron-automation").info("staged openclaw sqlite from %s to %s", sourceCandidate, stagingPath);
+        } catch (error) {
+          this.owner.logger("dsh-cron-automation").warn("failed to stage openclaw sqlite: %s", error instanceof Error ? error.message : String(error));
+        }
+      }
+      sqlitePath = stagingPath;
+    }
     let incoming;
     try {
       incoming = loadOpenClawSqliteJobs(sqlitePath);

package/src/manager.js

@@ -12,6 +12,9 @@ function cloneJob(job) {
 function dshAgentIdFor(job) {
     return job.dshSessionId ?? job.agentId;
 }
+function hasDshSession(job) {
+    return typeof job.dshSessionId === 'string' && job.dshSessionId.length > 0;
+}
 function timezoneFor(schedule) {
     return schedule.tz ?? Intl.DateTimeFormat().resolvedOptions().timeZone ?? 'UTC';
 }
@@ -317,6 +320,10 @@ export class CronAutomationManager {
                 return 'not_found';
             if (job.state.runningAtMs !== undefined)
                 return 'already_running';
+            // Imported OpenClaw jobs refer to an OpenClaw agent id, not a DSH session.
+            // They must wait until mbh-chat supplies a verified DSH session binding.
+            if (!hasDshSession(job))
+                return 'delivery_unavailable';
             const occurrenceAtMs = this.now();
             job.state.runningAtMs = occurrenceAtMs;
             job.updatedAtMs = occurrenceAtMs;
@@ -401,7 +408,10 @@ export class CronAutomationManager {
         this.timer = undefined;
         const now = this.now();
         const target = [...this.jobs.values()]
-            .filter((job) => job.enabled && job.state.runningAtMs === undefined && !this.blockedAgents.has(dshAgentIdFor(job)))
+            .filter((job) => job.enabled &&
+            hasDshSession(job) &&
+            job.state.runningAtMs === undefined &&
+            !this.blockedAgents.has(dshAgentIdFor(job)))
             .map((job) => job.state.nextRunAtMs)
             .filter((value) => value !== undefined)
             .reduce((earliest, candidate) => (earliest === undefined || candidate < earliest ? candidate : earliest), undefined);
@@ -419,7 +429,7 @@ export class CronAutomationManager {
             return;
         const now = this.now();
         const due = [...this.jobs.values()]
-            .filter((job) => job.enabled && job.state.nextRunAtMs !== undefined && job.state.nextRunAtMs <= now)
+            .filter((job) => job.enabled && hasDshSession(job) && job.state.nextRunAtMs !== undefined && job.state.nextRunAtMs <= now)
             .sort((left, right) => (left.state.nextRunAtMs ?? 0) - (right.state.nextRunAtMs ?? 0) || left.createdAtMs - right.createdAtMs);
         for (const job of due) {
             const occurrenceAtMs = job.state.nextRunAtMs ?? now;

package/src/openclaw-sqlite.d.ts

@@ -1,5 +1,6 @@
-import { type StoredCronAutomation } from "./repository.js";
+import { type StoredCronAutomation } from './repository.js';
 export declare const DEFAULT_OPENCLAW_SQLITE: string;
+export declare const DEFAULT_OPENCLAW_SQLITE_ALT: string;
 interface CronJobRow {
     job_id: string;
     name: string;
@@ -35,6 +36,11 @@ interface CronJobRow {
 }
 export declare function jobFromOpenClawRow(row: CronJobRow): StoredCronAutomation;
 export declare function loadOpenClawSqliteJobs(sqlitePath: string): StoredCronAutomation[];
+/**
+ * Materialize a consistent OpenClaw database snapshot. Copying only the main
+ * SQLite file loses transactions which are still in the source database WAL.
+ */
+export declare function snapshotOpenClawSqlite(sqlitePath: string, destination: string): Promise<void>;
 export declare function resolveOpenClawSqlitePath(configured?: string): string;
 export declare function openClawImportSource(sqlitePath: string): string;
 export {};

package/src/openclaw-sqlite.js

@@ -1,11 +1,14 @@
-import { existsSync, realpathSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { DatabaseSync } from "node:sqlite";
-import { decodeJob } from "./repository.js";
-export const DEFAULT_OPENCLAW_SQLITE = path.join(os.homedir(), ".mobook", "state", "openclaw.sqlite");
+import { existsSync, realpathSync } from 'node:fs';
+import { mkdir, rename, unlink, writeFile } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import os from 'node:os';
+import path from 'node:path';
+import { DatabaseSync } from 'node:sqlite';
+import { decodeJob } from './repository.js';
+export const DEFAULT_OPENCLAW_SQLITE = path.join(os.homedir(), '.mobook', 'state', 'openclaw.sqlite');
+export const DEFAULT_OPENCLAW_SQLITE_ALT = path.join(os.homedir(), '.openclaw', 'state', 'openclaw.sqlite');
 function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 function parseJson(raw, label) {
     try {
@@ -16,18 +19,18 @@ function parseJson(raw, label) {
     }
 }
 function scheduleFromRow(row) {
-    if (row.schedule_kind === "every") {
+    if (row.schedule_kind === 'every') {
         return {
-            kind: "every",
+            kind: 'every',
             everyMs: row.every_ms,
             ...(row.anchor_ms === null ? {} : { anchorMs: row.anchor_ms })
         };
     }
-    if (row.schedule_kind === "at") {
-        return { kind: "at", ...(row.at === null ? {} : { at: row.at }) };
+    if (row.schedule_kind === 'at') {
+        return { kind: 'at', ...(row.at === null ? {} : { at: row.at }) };
     }
     return {
-        kind: "cron",
+        kind: 'cron',
         expr: row.schedule_expr,
         ...(row.schedule_tz === null ? {} : { tz: row.schedule_tz })
     };
@@ -42,17 +45,17 @@ function jobFromColumns(row, state) {
         updatedAtMs: row.updated_at,
         schedule: scheduleFromRow(row),
         payload: {
-            kind: row.payload_kind || "agentTurn",
-            message: row.payload_message ?? "",
+            kind: row.payload_kind || 'agentTurn',
+            message: row.payload_message ?? '',
             ...(row.payload_timeout_seconds === null ? {} : { timeoutSeconds: row.payload_timeout_seconds })
         },
-        agentId: row.agent_id ?? "main",
+        agentId: row.agent_id ?? 'main',
         ...(row.session_key ? { sessionKey: row.session_key } : {}),
-        sessionTarget: row.session_target || "isolated",
-        wakeMode: row.wake_mode || "now",
+        sessionTarget: row.session_target || 'isolated',
+        wakeMode: row.wake_mode || 'now',
         ...(row.delete_after_run === 1 ? { deleteAfterRun: true } : {}),
         delivery: {
-            mode: row.delivery_mode ?? "announce",
+            mode: row.delivery_mode ?? 'announce',
             ...(row.delivery_channel ? { channel: row.delivery_channel } : {}),
             ...(row.delivery_to ? { to: row.delivery_to } : {}),
             ...(row.delivery_account_id ? { accountId: row.delivery_account_id } : {}),
@@ -77,16 +80,16 @@ function overlayState(row, jobState, tableState) {
     return state;
 }
 export function jobFromOpenClawRow(row) {
-    const tableState = parseJson(row.state_json || "{}", "state_json");
+    const tableState = parseJson(row.state_json || '{}', 'state_json');
     try {
-        const parsed = parseJson(row.job_json, "job_json");
+        const parsed = parseJson(row.job_json, 'job_json');
         if (!isRecord(parsed))
-            throw new Error("job_json must be an object");
+            throw new Error('job_json must be an object');
         return decodeJob({
             ...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,
+            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)
         });
     }
@@ -104,7 +107,9 @@ export function loadOpenClawSqliteJobs(sqlitePath) {
             return [];
         // SELECT * deliberately tolerates OpenClaw schema additions and older schemas
         // that omit newer nullable projection columns. job_json remains authoritative.
-        const rows = database.prepare("SELECT * FROM cron_jobs ORDER BY updated_at ASC, job_id ASC").all();
+        const rows = database
+            .prepare('SELECT * FROM cron_jobs ORDER BY updated_at ASC, job_id ASC')
+            .all();
         const jobs = new Map();
         for (const row of rows) {
             try {
@@ -123,6 +128,32 @@ export function loadOpenClawSqliteJobs(sqlitePath) {
         database.close();
     }
 }
+/**
+ * Materialize a consistent OpenClaw database snapshot. Copying only the main
+ * SQLite file loses transactions which are still in the source database WAL.
+ */
+export async function snapshotOpenClawSqlite(sqlitePath, destination) {
+    const database = new DatabaseSync(sqlitePath, { readOnly: true, timeout: 5_000 });
+    try {
+        // @types/node 24.0 predates DatabaseSync.serialize(), which is available in
+        // the Electron/Node runtime we require. Keep the compatibility shim local.
+        const serialized = database.serialize();
+        const directory = path.dirname(destination);
+        const temporary = path.join(directory, `.${path.basename(destination)}.${randomUUID()}.tmp`);
+        await mkdir(directory, { recursive: true });
+        try {
+            await writeFile(temporary, serialized, { mode: 0o600 });
+            await rename(temporary, destination);
+        }
+        catch (error) {
+            await unlink(temporary).catch(() => undefined);
+            throw error;
+        }
+    }
+    finally {
+        database.close();
+    }
+}
 export function resolveOpenClawSqlitePath(configured) {
     const explicit = configured?.trim() || process.env.OPENCLAW_SQLITE?.trim();
     if (explicit)