@dcrays/scheduled-task 0.1.6-beta.2 → 0.1.6-beta.4

package/cordis.patch.yml

@@ -1,13 +1,13 @@
-- insert:
-    - id: cron-automation
-      name: '@dcrays/scheduled-task'
-      inject:
-        - agentDefaultModel
-        - agents
-        - sessionPersistence
-        - webServer
-        - tools
-      config:
-        legacyDatabaseEnvironment: production
-        maxPromptChars: 16384
-        listPushIntervalSeconds: 30
+- insert:
+    - id: cron-automation
+      name: '@dcrays/scheduled-task'
+      inject:
+        - agentDefaultModel
+        - agents
+        - sessionPersistence
+        - webServer
+        - tools
+      config:
+        legacyDatabaseEnvironment: production
+        maxPromptChars: 16384
+        listPushIntervalSeconds: 30

package/package.json

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

package/plugin/index.js

@@ -1269,13 +1269,17 @@ var CronAutomationManager = class {
   async dispatchDue() {
     if (this.stopping || this.schedulingPaused)
       return;
+    const claimedJobs = [];
     for (; ; ) {
       const claimed = await this.enqueue(() => this.claimNextDueJob());
       if (!claimed)
         break;
+      claimedJobs.push(claimed);
+    }
+    await Promise.all(claimedJobs.map(async (claimed) => {
       const delivered = await this.deliverTracked(claimed.job, claimed.occurrenceAtMs);
       await this.enqueue(() => this.finalizeScheduledRun(claimed.job.id, claimed.occurrenceAtMs, delivered));
-    }
+    }));
     await this.enqueue(async () => {
       this.arm();
     });

package/src/manager.js

@@ -573,13 +573,17 @@ export class CronAutomationManager {
     async dispatchDue() {
         if (this.stopping || this.schedulingPaused)
             return;
+        const claimedJobs = [];
         for (;;) {
             const claimed = await this.enqueue(() => this.claimNextDueJob());
             if (!claimed)
                 break;
+            claimedJobs.push(claimed);
+        }
+        await Promise.all(claimedJobs.map(async (claimed) => {
             const delivered = await this.deliverTracked(claimed.job, claimed.occurrenceAtMs);
             await this.enqueue(() => this.finalizeScheduledRun(claimed.job.id, claimed.occurrenceAtMs, delivered));
-        }
+        }));
         await this.enqueue(async () => {
             this.arm();
         });

package/src/repository.js

@@ -130,153 +130,153 @@ export class CronAutomationRepository {
         this.database.exec('PRAGMA journal_mode = WAL');
         this.database.exec('PRAGMA synchronous = FULL');
         this.database.exec('PRAGMA busy_timeout = 5000');
-        this.database.exec(`
-      CREATE TABLE IF NOT EXISTS cron_jobs (
-        store_key TEXT NOT NULL,
-        job_id TEXT NOT NULL,
-        name TEXT NOT NULL,
-        description TEXT,
-        enabled INTEGER NOT NULL,
-        delete_after_run INTEGER,
-        created_at_ms INTEGER NOT NULL,
-        agent_id TEXT,
-        session_key TEXT,
-        schedule_kind TEXT NOT NULL,
-        schedule_expr TEXT,
-        schedule_tz TEXT,
-        every_ms INTEGER,
-        anchor_ms INTEGER,
-        at TEXT,
-        stagger_ms INTEGER,
-        session_target TEXT NOT NULL,
-        wake_mode TEXT NOT NULL,
-        payload_kind TEXT NOT NULL,
-        payload_message TEXT,
-        payload_model TEXT,
-        payload_fallbacks_json TEXT,
-        payload_thinking TEXT,
-        payload_timeout_seconds INTEGER,
-        payload_allow_unsafe_external_content INTEGER,
-        payload_external_content_source_json TEXT,
-        payload_light_context INTEGER,
-        payload_tools_allow_json TEXT,
-        delivery_mode TEXT,
-        delivery_channel TEXT,
-        delivery_to TEXT,
-        delivery_thread_id TEXT,
-        delivery_account_id TEXT,
-        delivery_best_effort INTEGER,
-        delivery_completion_mode TEXT,
-        delivery_completion_to TEXT,
-        failure_delivery_mode TEXT,
-        failure_delivery_channel TEXT,
-        failure_delivery_to TEXT,
-        failure_delivery_account_id TEXT,
-        failure_alert_disabled INTEGER,
-        failure_alert_after INTEGER,
-        failure_alert_channel TEXT,
-        failure_alert_to TEXT,
-        failure_alert_cooldown_ms INTEGER,
-        failure_alert_include_skipped INTEGER,
-        failure_alert_mode TEXT,
-        failure_alert_account_id TEXT,
-        next_run_at_ms INTEGER,
-        running_at_ms INTEGER,
-        last_run_at_ms INTEGER,
-        last_run_status TEXT,
-        last_error TEXT,
-        last_duration_ms INTEGER,
-        consecutive_errors INTEGER,
-        consecutive_skipped INTEGER,
-        schedule_error_count INTEGER,
-        last_delivery_status TEXT,
-        last_delivery_error TEXT,
-        last_delivered INTEGER,
-        last_failure_alert_at_ms INTEGER,
-        job_json TEXT NOT NULL,
-        state_json TEXT NOT NULL DEFAULT '{}',
-        runtime_updated_at_ms INTEGER,
-        schedule_identity TEXT,
-        sort_order INTEGER NOT NULL DEFAULT 0,
-        updated_at INTEGER NOT NULL,
-        PRIMARY KEY (store_key, job_id)
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_cron_jobs_store_updated
-        ON cron_jobs(store_key, sort_order ASC, updated_at DESC, job_id);
-      CREATE INDEX IF NOT EXISTS idx_cron_jobs_store_order
-        ON cron_jobs(store_key, sort_order ASC, updated_at ASC, job_id);
-      CREATE INDEX IF NOT EXISTS idx_cron_jobs_enabled_next_run
-        ON cron_jobs(store_key, enabled, next_run_at_ms, job_id)
-        WHERE next_run_at_ms IS NOT NULL;
-      CREATE INDEX IF NOT EXISTS idx_cron_jobs_agent_session
-        ON cron_jobs(agent_id, session_key, updated_at DESC, job_id)
-        WHERE agent_id IS NOT NULL OR session_key IS NOT NULL;
-
-      CREATE TABLE IF NOT EXISTS cron_imported_jobs (
-        source TEXT NOT NULL,
-        job_id TEXT NOT NULL,
-        imported_at INTEGER NOT NULL,
-        PRIMARY KEY (source, job_id)
-      );
-
-      CREATE TABLE IF NOT EXISTS cron_migrations (
-        migration_id TEXT PRIMARY KEY,
-        completed_at INTEGER NOT NULL
-      );
+        this.database.exec(`
+      CREATE TABLE IF NOT EXISTS cron_jobs (
+        store_key TEXT NOT NULL,
+        job_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        description TEXT,
+        enabled INTEGER NOT NULL,
+        delete_after_run INTEGER,
+        created_at_ms INTEGER NOT NULL,
+        agent_id TEXT,
+        session_key TEXT,
+        schedule_kind TEXT NOT NULL,
+        schedule_expr TEXT,
+        schedule_tz TEXT,
+        every_ms INTEGER,
+        anchor_ms INTEGER,
+        at TEXT,
+        stagger_ms INTEGER,
+        session_target TEXT NOT NULL,
+        wake_mode TEXT NOT NULL,
+        payload_kind TEXT NOT NULL,
+        payload_message TEXT,
+        payload_model TEXT,
+        payload_fallbacks_json TEXT,
+        payload_thinking TEXT,
+        payload_timeout_seconds INTEGER,
+        payload_allow_unsafe_external_content INTEGER,
+        payload_external_content_source_json TEXT,
+        payload_light_context INTEGER,
+        payload_tools_allow_json TEXT,
+        delivery_mode TEXT,
+        delivery_channel TEXT,
+        delivery_to TEXT,
+        delivery_thread_id TEXT,
+        delivery_account_id TEXT,
+        delivery_best_effort INTEGER,
+        delivery_completion_mode TEXT,
+        delivery_completion_to TEXT,
+        failure_delivery_mode TEXT,
+        failure_delivery_channel TEXT,
+        failure_delivery_to TEXT,
+        failure_delivery_account_id TEXT,
+        failure_alert_disabled INTEGER,
+        failure_alert_after INTEGER,
+        failure_alert_channel TEXT,
+        failure_alert_to TEXT,
+        failure_alert_cooldown_ms INTEGER,
+        failure_alert_include_skipped INTEGER,
+        failure_alert_mode TEXT,
+        failure_alert_account_id TEXT,
+        next_run_at_ms INTEGER,
+        running_at_ms INTEGER,
+        last_run_at_ms INTEGER,
+        last_run_status TEXT,
+        last_error TEXT,
+        last_duration_ms INTEGER,
+        consecutive_errors INTEGER,
+        consecutive_skipped INTEGER,
+        schedule_error_count INTEGER,
+        last_delivery_status TEXT,
+        last_delivery_error TEXT,
+        last_delivered INTEGER,
+        last_failure_alert_at_ms INTEGER,
+        job_json TEXT NOT NULL,
+        state_json TEXT NOT NULL DEFAULT '{}',
+        runtime_updated_at_ms INTEGER,
+        schedule_identity TEXT,
+        sort_order INTEGER NOT NULL DEFAULT 0,
+        updated_at INTEGER NOT NULL,
+        PRIMARY KEY (store_key, job_id)
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_cron_jobs_store_updated
+        ON cron_jobs(store_key, sort_order ASC, updated_at DESC, job_id);
+      CREATE INDEX IF NOT EXISTS idx_cron_jobs_store_order
+        ON cron_jobs(store_key, sort_order ASC, updated_at ASC, job_id);
+      CREATE INDEX IF NOT EXISTS idx_cron_jobs_enabled_next_run
+        ON cron_jobs(store_key, enabled, next_run_at_ms, job_id)
+        WHERE next_run_at_ms IS NOT NULL;
+      CREATE INDEX IF NOT EXISTS idx_cron_jobs_agent_session
+        ON cron_jobs(agent_id, session_key, updated_at DESC, job_id)
+        WHERE agent_id IS NOT NULL OR session_key IS NOT NULL;
+
+      CREATE TABLE IF NOT EXISTS cron_imported_jobs (
+        source TEXT NOT NULL,
+        job_id TEXT NOT NULL,
+        imported_at INTEGER NOT NULL,
+        PRIMARY KEY (source, job_id)
+      );
+
+      CREATE TABLE IF NOT EXISTS cron_migrations (
+        migration_id TEXT PRIMARY KEY,
+        completed_at INTEGER NOT NULL
+      );
     `);
-        this.insertJobStatement = this.database.prepare(`
-      INSERT INTO cron_jobs (
-        store_key, job_id, name, description, enabled, delete_after_run,
-        created_at_ms, agent_id, session_key,
-        schedule_kind, schedule_expr, schedule_tz, every_ms, anchor_ms, at,
-        session_target, wake_mode,
-        payload_kind, payload_message, payload_timeout_seconds,
-        delivery_mode, delivery_channel, delivery_to, delivery_account_id, delivery_best_effort,
-        next_run_at_ms, running_at_ms, last_run_at_ms, last_run_status,
-        job_json, state_json, runtime_updated_at_ms, sort_order, updated_at
-      ) VALUES (
-        ?, ?, ?, ?, ?, ?,
-        ?, ?, ?,
-        ?, ?, ?, ?, ?, ?,
-        ?, ?,
-        ?, ?, ?,
-        ?, ?, ?, ?, ?,
-        ?, ?, ?, ?,
-        ?, ?, ?, ?, ?
-      )
-      ON CONFLICT(store_key, job_id) DO UPDATE SET
-        name = excluded.name,
-        description = excluded.description,
-        enabled = excluded.enabled,
-        delete_after_run = excluded.delete_after_run,
-        created_at_ms = excluded.created_at_ms,
-        agent_id = excluded.agent_id,
-        session_key = excluded.session_key,
-        schedule_kind = excluded.schedule_kind,
-        schedule_expr = excluded.schedule_expr,
-        schedule_tz = excluded.schedule_tz,
-        every_ms = excluded.every_ms,
-        anchor_ms = excluded.anchor_ms,
-        at = excluded.at,
-        session_target = excluded.session_target,
-        wake_mode = excluded.wake_mode,
-        payload_kind = excluded.payload_kind,
-        payload_message = excluded.payload_message,
-        payload_timeout_seconds = excluded.payload_timeout_seconds,
-        delivery_mode = excluded.delivery_mode,
-        delivery_channel = excluded.delivery_channel,
-        delivery_to = excluded.delivery_to,
-        delivery_account_id = excluded.delivery_account_id,
-        delivery_best_effort = excluded.delivery_best_effort,
-        next_run_at_ms = excluded.next_run_at_ms,
-        running_at_ms = excluded.running_at_ms,
-        last_run_at_ms = excluded.last_run_at_ms,
-        last_run_status = excluded.last_run_status,
-        job_json = excluded.job_json,
-        state_json = excluded.state_json,
-        runtime_updated_at_ms = excluded.runtime_updated_at_ms,
-        updated_at = excluded.updated_at
+        this.insertJobStatement = this.database.prepare(`
+      INSERT INTO cron_jobs (
+        store_key, job_id, name, description, enabled, delete_after_run,
+        created_at_ms, agent_id, session_key,
+        schedule_kind, schedule_expr, schedule_tz, every_ms, anchor_ms, at,
+        session_target, wake_mode,
+        payload_kind, payload_message, payload_timeout_seconds,
+        delivery_mode, delivery_channel, delivery_to, delivery_account_id, delivery_best_effort,
+        next_run_at_ms, running_at_ms, last_run_at_ms, last_run_status,
+        job_json, state_json, runtime_updated_at_ms, sort_order, updated_at
+      ) VALUES (
+        ?, ?, ?, ?, ?, ?,
+        ?, ?, ?,
+        ?, ?, ?, ?, ?, ?,
+        ?, ?,
+        ?, ?, ?,
+        ?, ?, ?, ?, ?,
+        ?, ?, ?, ?,
+        ?, ?, ?, ?, ?
+      )
+      ON CONFLICT(store_key, job_id) DO UPDATE SET
+        name = excluded.name,
+        description = excluded.description,
+        enabled = excluded.enabled,
+        delete_after_run = excluded.delete_after_run,
+        created_at_ms = excluded.created_at_ms,
+        agent_id = excluded.agent_id,
+        session_key = excluded.session_key,
+        schedule_kind = excluded.schedule_kind,
+        schedule_expr = excluded.schedule_expr,
+        schedule_tz = excluded.schedule_tz,
+        every_ms = excluded.every_ms,
+        anchor_ms = excluded.anchor_ms,
+        at = excluded.at,
+        session_target = excluded.session_target,
+        wake_mode = excluded.wake_mode,
+        payload_kind = excluded.payload_kind,
+        payload_message = excluded.payload_message,
+        payload_timeout_seconds = excluded.payload_timeout_seconds,
+        delivery_mode = excluded.delivery_mode,
+        delivery_channel = excluded.delivery_channel,
+        delivery_to = excluded.delivery_to,
+        delivery_account_id = excluded.delivery_account_id,
+        delivery_best_effort = excluded.delivery_best_effort,
+        next_run_at_ms = excluded.next_run_at_ms,
+        running_at_ms = excluded.running_at_ms,
+        last_run_at_ms = excluded.last_run_at_ms,
+        last_run_status = excluded.last_run_status,
+        job_json = excluded.job_json,
+        state_json = excluded.state_json,
+        runtime_updated_at_ms = excluded.runtime_updated_at_ms,
+        updated_at = excluded.updated_at
     `);
         try {
             fs.chmodSync(file, 0o600);
@@ -295,11 +295,11 @@ export class CronAutomationRepository {
     async load() {
         this.assertOpen();
         const rows = this.database
-            .prepare(`
-      SELECT job_json
-      FROM cron_jobs
-      WHERE store_key = ?
-      ORDER BY sort_order ASC, updated_at ASC, job_id ASC
+            .prepare(`
+      SELECT job_json
+      FROM cron_jobs
+      WHERE store_key = ?
+      ORDER BY sort_order ASC, updated_at ASC, job_id ASC
     `)
             .all(STORE_KEY);
         return rows.map((row) => decodeJob(JSON.parse(row.job_json)));
@@ -332,9 +332,9 @@ export class CronAutomationRepository {
             const result = this.planImport(source, decoded);
             const nextOrder = this.nextSortOrder();
             result.added.forEach((job, index) => this.insertJob(job, nextOrder + index));
-            const mark = this.database.prepare(`
-        INSERT OR IGNORE INTO cron_imported_jobs (source, job_id, imported_at)
-        VALUES (?, ?, ?)
+            const mark = this.database.prepare(`
+        INSERT OR IGNORE INTO cron_imported_jobs (source, job_id, imported_at)
+        VALUES (?, ?, ?)
       `);
             const importedAt = Date.now();
             for (const job of decoded)
@@ -358,10 +358,10 @@ export class CronAutomationRepository {
             throw new Error('cron import source must be non-empty');
         return this.writeTransaction(() => {
             const rows = this.database
-                .prepare(`
-        SELECT jobs.job_id FROM cron_jobs AS jobs
-        INNER JOIN cron_imported_jobs AS imported ON imported.job_id = jobs.job_id
-        WHERE jobs.store_key = ? AND imported.source = ?
+                .prepare(`
+        SELECT jobs.job_id FROM cron_jobs AS jobs
+        INNER JOIN cron_imported_jobs AS imported ON imported.job_id = jobs.job_id
+        WHERE jobs.store_key = ? AND imported.source = ?
       `)
                 .all(STORE_KEY, source);
             const removed = rows.map((row) => row.job_id).filter((id) => !presentIds.has(id));
@@ -382,9 +382,9 @@ export class CronAutomationRepository {
             const result = this.planImport(migrationId, decoded);
             const nextOrder = this.nextSortOrder();
             result.added.forEach((job, index) => this.insertJob(job, nextOrder + index));
-            const markImported = this.database.prepare(`
-        INSERT OR IGNORE INTO cron_imported_jobs (source, job_id, imported_at)
-        VALUES (?, ?, ?)
+            const markImported = this.database.prepare(`
+        INSERT OR IGNORE INTO cron_imported_jobs (source, job_id, imported_at)
+        VALUES (?, ?, ?)
       `);
             const importedAt = Date.now();
             for (const job of importedJobs)
@@ -418,10 +418,10 @@ export class CronAutomationRepository {
     }
     nextSortOrder() {
         const row = this.database
-            .prepare(`
-      SELECT COALESCE(MAX(sort_order), -1) + 1 AS next_order
-      FROM cron_jobs
-      WHERE store_key = ?
+            .prepare(`
+      SELECT COALESCE(MAX(sort_order), -1) + 1 AS next_order
+      FROM cron_jobs
+      WHERE store_key = ?
     `)
             .get(STORE_KEY);
         return row.next_order;