omnikey-cli 1.0.37 → 1.0.38

package/backend-dist/scheduledJobExecutor.js

@@ -23,9 +23,9 @@ const SHELL_SCRIPT_RE = /<shell_script>([\s\S]*?)<\/shell_script>/;
 const FINAL_ANSWER_RE = /<final_answer>/;
 // Maximum time a single job may run before it is forcibly cancelled.
 const JOB_TIMEOUT_MS = 10 * 60 * 1000;
-// Cron jobs get more turns than interactive sessions so multi-step tasks
-// (web research → shell commands → final answer) can complete unattended.
-const MAX_CRON_TURNS = 30;
+const MAX_AGENT_ERROR_RECOVERY_ATTEMPTS = 4;
+// Single-process guard to avoid running the same job concurrently.
+const RUNNING_JOB_IDS = new Set();
 function computeNextRunAt(cronExpression, runAt) {
     if (cronExpression) {
         try {
@@ -104,6 +104,7 @@ async function runScript(script) {
 }
 function runCronJob(job, subscription, sessionId) {
     return new Promise((resolve, reject) => {
+        let agentErrorRecoveryAttempts = 0;
         let settled = false;
         const settle = (err) => {
             if (settled)
@@ -119,11 +120,27 @@ function runCronJob(job, subscription, sessionId) {
             void (async () => {
                 const content = msg.content ?? '';
                 if (msg.is_error) {
-                    logger_1.logger.error('Cron job: agent returned error.', {
+                    agentErrorRecoveryAttempts += 1;
+                    logger_1.logger.warn('Cron job: agent returned error; attempting recovery.', {
                         jobId: job.id,
+                        attempt: agentErrorRecoveryAttempts,
                         content: content.slice(0, 300),
                     });
-                    settle(new Error(`Agent error: ${content.slice(0, 200)}`));
+                    const shouldFailNow = FINAL_ANSWER_RE.test(content) ||
+                        agentErrorRecoveryAttempts > MAX_AGENT_ERROR_RECOVERY_ATTEMPTS;
+                    if (shouldFailNow) {
+                        settle(new Error(`Agent error: ${content.slice(0, 200)}`));
+                        return;
+                    }
+                    (0, agentServer_1.runAgentTurn)(sessionId, subscription, {
+                        session_id: sessionId,
+                        sender: 'user',
+                        content: `Agent turn failed while processing this cron job. ` +
+                            `Recover from the latest state and return the next ` +
+                            `<shell_script> or a <final_answer>.\n\n` +
+                            `Error details:\n${content}`,
+                        is_error: true,
+                    }, send, logger_1.logger, { isCronJob: true }).catch((err) => settle(err instanceof Error ? err : new Error(String(err))));
                     return;
                 }
                 const scriptMatch = SHELL_SCRIPT_RE.exec(content);
@@ -147,10 +164,28 @@ function runCronJob(job, subscription, sessionId) {
                     }, send, logger_1.logger, { isCronJob: true }).catch((err) => settle(err instanceof Error ? err : new Error(String(err))));
                     return;
                 }
+                if (msg.is_web_call || msg.is_image_rendering) {
+                    logger_1.logger.debug('Cron job: received progress notification; waiting for next message.', {
+                        jobId: job.id,
+                        isWebCall: !!msg.is_web_call,
+                        isImageRendering: !!msg.is_image_rendering,
+                    });
+                    return;
+                }
                 if (FINAL_ANSWER_RE.test(content)) {
                     logger_1.logger.info('Cron job: received final answer.', { jobId: job.id });
                     settle();
+                    return;
                 }
+                if (content.trim()) {
+                    logger_1.logger.warn('Cron job: received untagged agent content; treating as final answer.', {
+                        jobId: job.id,
+                        content: content.slice(0, 300),
+                    });
+                    settle();
+                    return;
+                }
+                settle(new Error('Agent returned empty response with no shell script or final answer.'));
             })();
         };
         (0, agentServer_1.runAgentTurn)(sessionId, subscription, {
@@ -162,38 +197,51 @@ function runCronJob(job, subscription, sessionId) {
     });
 }
 async function executeJob(job) {
-    logger_1.logger.info('Executing scheduled job.', { jobId: job.id, label: job.label });
-    const subscription = await subscription_1.Subscription.findByPk(job.subscriptionId);
-    if (!subscription) {
-        logger_1.logger.error('Subscription not found for scheduled job; skipping.', {
+    if (RUNNING_JOB_IDS.has(job.id)) {
+        logger_1.logger.warn('Scheduled job is already running; skipping duplicate execution.', {
             jobId: job.id,
-            subscriptionId: job.subscriptionId,
+            label: job.label,
         });
         return;
     }
-    const sessionId = (0, cuid_1.default)();
+    RUNNING_JOB_IDS.add(job.id);
+    logger_1.logger.info('Executing scheduled job.', { jobId: job.id, label: job.label });
     try {
-        await runCronJob(job, subscription, sessionId);
-        logger_1.logger.info('Scheduled job completed.', { jobId: job.id, label: job.label });
-    }
-    catch (err) {
-        logger_1.logger.error('Scheduled job failed.', { jobId: job.id, label: job.label, error: err });
-        // Fall through — always update lastRunAt so the next poll does not re-run immediately.
-    }
-    const now = new Date();
-    if (job.cronExpression) {
-        await job.update({
-            lastRunAt: now,
-            nextRunAt: computeNextRunAt(job.cronExpression, null),
-            lastRunSessionId: sessionId,
-        });
+        const subscription = await subscription_1.Subscription.findByPk(job.subscriptionId);
+        if (!subscription) {
+            logger_1.logger.error('Subscription not found for scheduled job; skipping.', {
+                jobId: job.id,
+                subscriptionId: job.subscriptionId,
+            });
+            return;
+        }
+        const sessionId = (0, cuid_1.default)();
+        try {
+            await runCronJob(job, subscription, sessionId);
+            logger_1.logger.info('Scheduled job completed.', { jobId: job.id, label: job.label });
+        }
+        catch (err) {
+            logger_1.logger.error('Scheduled job failed.', { jobId: job.id, label: job.label, error: err });
+            // Fall through — always update lastRunAt so the next poll does not re-run immediately.
+        }
+        const now = new Date();
+        if (job.cronExpression) {
+            await job.update({
+                lastRunAt: now,
+                nextRunAt: computeNextRunAt(job.cronExpression, null),
+                lastRunSessionId: sessionId,
+            });
+        }
+        else {
+            await job.update({
+                lastRunAt: now,
+                isActive: false,
+                nextRunAt: null,
+                lastRunSessionId: sessionId,
+            });
+        }
     }
-    else {
-        await job.update({
-            lastRunAt: now,
-            isActive: false,
-            nextRunAt: null,
-            lastRunSessionId: sessionId,
-        });
+    finally {
+        RUNNING_JOB_IDS.delete(job.id);
     }
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",