opencode-supertask 0.1.5 → 0.1.7

package/dist/plugin/supertask.js

@@ -9102,8 +9102,8 @@ var require_CronFileParser = __commonJS({
        * @throws If file cannot be read
        */
       static parseFileSync(filePath) {
-        const { readFileSync } = __require("fs");
-        const data = readFileSync(filePath, "utf8");
+        const { readFileSync: readFileSync2 } = __require("fs");
+        const data = readFileSync2(filePath, "utf8");
         return _CronFileParser.#parseContent(data);
       }
       /**
@@ -27200,13 +27200,52 @@ var TaskTemplateService = class {
   }
 };
 
+// src/core/duration.ts
+var DURATION_REGEX = /^(\d+(?:\.\d+)?)\s*(ms|s|sec|seconds?|min|minutes?|m|h|hours?|d|days?|w|weeks?)$/i;
+var ISO8601_REGEX = /^P(?:([.\d]+)D)?(?:T(?:([.\d]+)H)?(?:([.\d]+)M)?(?:([.\d]+)S)?)?$/i;
+function parseDuration(input) {
+  const trimmed = input.trim();
+  const simple = DURATION_REGEX.exec(trimmed);
+  if (simple) {
+    const value = parseFloat(simple[1]);
+    const unit = simple[2].toLowerCase();
+    if (unit === "ms") return value;
+    if (unit === "s" || unit === "sec" || unit === "second" || unit === "seconds") return value * 1e3;
+    if (unit === "min" || unit === "minute" || unit === "minutes" || unit === "m") return value * 6e4;
+    if (unit === "h" || unit === "hour" || unit === "hours") return value * 36e5;
+    if (unit === "d" || unit === "day" || unit === "days") return value * 864e5;
+    if (unit === "w" || unit === "week" || unit === "weeks") return value * 6048e5;
+  }
+  const iso = ISO8601_REGEX.exec(trimmed);
+  if (iso) {
+    const days = parseFloat(iso[1] ?? "0");
+    const hours = parseFloat(iso[2] ?? "0");
+    const minutes = parseFloat(iso[3] ?? "0");
+    const seconds = parseFloat(iso[4] ?? "0");
+    return (days * 86400 + hours * 3600 + minutes * 60 + seconds) * 1e3;
+  }
+  const asNumber = Number(trimmed);
+  if (!isNaN(asNumber) && asNumber > 0) return asNumber;
+  return null;
+}
+
 // src/daemon/pm2.ts
 import { execSync, spawnSync } from "child_process";
 import { join as join2, dirname as dirname2 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
+import { readFileSync } from "fs";
 var __dirname = dirname2(fileURLToPath2(import.meta.url));
 var GATEWAY_ENTRY = join2(__dirname, "../gateway/index.js");
 var PROCESS_NAME = "supertask-gateway";
+function getPackageVersion() {
+  try {
+    const pkgPath = join2(__dirname, "../package.json");
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    return pkg.version || "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
 function pm2Bin() {
   return process.platform === "win32" ? "pm2.cmd" : "pm2";
 }
@@ -27251,10 +27290,37 @@ function findBunPath() {
   }
 }
 function ensureGateway() {
+  const currentVersion = getPackageVersion();
   try {
     const list = pm2JsonList();
     const proc = list.find((p) => p.name === PROCESS_NAME);
     if (proc && proc.pm2_env?.status === "online") {
+      const runningVersion = proc.pm2_env.pm_exec_path ? void 0 : void 0;
+      const envVersion = proc.pm2_env.env?.SUPERTASK_VERSION;
+      if (envVersion === currentVersion) {
+        return;
+      }
+      console.log(`[supertask] Version changed: ${envVersion ?? "unknown"} \u2192 ${currentVersion}, reloading Gateway...`);
+      const bunPath = findBunPath();
+      pm2Exec([
+        "delete",
+        PROCESS_NAME
+      ]);
+      pm2Exec([
+        "start",
+        GATEWAY_ENTRY,
+        "--name",
+        PROCESS_NAME,
+        "--interpreter",
+        bunPath,
+        "--restart-delay",
+        "5000",
+        "--max-restarts",
+        "30",
+        "--env",
+        `SUPERTASK_VERSION=${currentVersion}`
+      ]);
+      pm2Exec(["save"]);
       return;
     }
   } catch {
@@ -27278,6 +27344,7 @@ function ensureGateway() {
     pm2Exec(["restart", PROCESS_NAME]);
   } else {
     const bunPath = findBunPath();
+    const version3 = getPackageVersion();
     pm2Exec([
       "start",
       GATEWAY_ENTRY,
@@ -27288,7 +27355,9 @@ function ensureGateway() {
       "--restart-delay",
       "5000",
       "--max-restarts",
-      "30"
+      "30",
+      "--env",
+      `SUPERTASK_VERSION=${version3}`
     ]);
   }
   pm2Exec(["save"]);
@@ -27681,8 +27750,8 @@ var SuperTaskPlugin = async () => {
           schedule: tool.schema.object({
             type: tool.schema.enum(["cron", "delayed", "recurring"]).describe("\u8C03\u5EA6\u7C7B\u578B"),
             cron_expr: tool.schema.string().optional().describe("cron \u8868\u8FBE\u5F0F\uFF08cron \u7C7B\u578B\u5FC5\u586B\uFF0C\u5982 '0 9 * * 1-5'\uFF09"),
-            run_at: tool.schema.number().optional().describe("\u6267\u884C\u65F6\u95F4\u6233 ms\uFF08delayed \u7C7B\u578B\u5FC5\u586B\uFF09"),
-            interval_ms: tool.schema.number().optional().describe("\u95F4\u9694\u6BEB\u79D2\uFF08recurring \u7C7B\u578B\u5FC5\u586B\uFF09")
+            delay: tool.schema.string().optional().describe("\u5EF6\u8FDF\u65F6\u95F4\uFF08delayed \u7C7B\u578B\u5FC5\u586B\uFF09\uFF0C\u53CB\u597D\u683C\u5F0F\u5982 '30s' '5min' '1h' '2d'\uFF0C\u4E5F\u652F\u6301 ISO 8601 duration \u5982 'PT30M'"),
+            interval: tool.schema.string().optional().describe("\u5FAA\u73AF\u95F4\u9694\uFF08recurring \u7C7B\u578B\u5FC5\u586B\uFF09\uFF0C\u53CB\u597D\u683C\u5F0F\u5982 '1h' '30min' '5s'\uFF0C\u4E5F\u652F\u6301 ISO 8601 duration \u5982 'PT1H'")
           }).describe("\u8C03\u5EA6\u914D\u7F6E"),
           max_instances: tool.schema.number().optional().describe("\u6700\u5927\u5E76\u53D1\u5B9E\u4F8B\u6570\uFF0C\u9ED8\u8BA4 1"),
           max_retries: tool.schema.number().optional().describe("\u514B\u9686\u7ED9 task \u7684\u6700\u5927\u91CD\u8BD5\u6B21\u6570\uFF0C\u9ED8\u8BA4 3"),
@@ -27694,6 +27763,22 @@ var SuperTaskPlugin = async () => {
               return JSON.stringify({ error: "schedule is required" });
             }
             const scheduleType = args.schedule.type;
+            let cronExpr = args.schedule.cron_expr;
+            let intervalMs = null;
+            let runAt = null;
+            if (scheduleType === "delayed" && args.schedule.delay) {
+              const delayMs = parseDuration(args.schedule.delay);
+              if (delayMs === null) {
+                return JSON.stringify({ error: `Invalid delay format: "${args.schedule.delay}". Use formats like "30s", "5min", "1h", "2d"` });
+              }
+              runAt = Date.now() + delayMs;
+            }
+            if (scheduleType === "recurring" && args.schedule.interval) {
+              intervalMs = parseDuration(args.schedule.interval);
+              if (intervalMs === null) {
+                return JSON.stringify({ error: `Invalid interval format: "${args.schedule.interval}". Use formats like "30s", "5min", "1h", "2d"` });
+              }
+            }
             const tmpl = await TaskTemplateService.create({
               name: args.name,
               agent: args.agent,
@@ -27703,9 +27788,9 @@ var SuperTaskPlugin = async () => {
               importance: args.importance ?? 3,
               urgency: args.urgency ?? 3,
               scheduleType,
-              cronExpr: args.schedule.cron_expr,
-              intervalMs: args.schedule.interval_ms,
-              runAt: args.schedule.run_at,
+              cronExpr,
+              intervalMs,
+              runAt,
               maxInstances: args.max_instances,
               maxRetries: args.max_retries,
               retryBackoffMs: args.retry_backoff_ms