opencode-supertask 0.1.40 → 0.1.41

package/dist/plugin/supertask.js

@@ -27155,13 +27155,23 @@ var TaskService = class {
       });
       const maxRetries = normalizedData.maxRetries ?? task.maxRetries ?? 3;
       const exhausted = task.status === "failed" && (task.retryCount ?? 0) > maxRetries;
-      return tx.update(tasks2).set({
+      const updated = tx.update(tasks2).set({
         ...normalizedData,
         ...exhausted ? {
           status: "dead_letter",
           retryAfter: null
         } : {}
       }).where(eq(tasks2.id, id)).returning().get() ?? null;
+      if (exhausted && updated) {
+        const finishedAt = /* @__PURE__ */ new Date();
+        tx.update(tasks2).set({
+          status: "dead_letter",
+          finishedAt,
+          retryAfter: null,
+          resultLog: `\u4F9D\u8D56\u4EFB\u52A1 #${id} \u5DF2\u8FDB\u5165\u4E0D\u53EF\u6062\u590D\u7EC8\u6001`
+        }).where(blockedDependentsOf(id)).run();
+      }
+      return updated;
     }, { behavior: "immediate" });
   }
   static validateNewTask(data) {
@@ -27182,7 +27192,7 @@ var TaskService = class {
       throw new Error(`${name} \u5FC5\u987B\u662F ${min} \u5230 ${max} \u4E4B\u95F4\u7684\u6574\u6570`);
     }
   }
-  static async next(scope = {}) {
+  static buildRunnableTaskWhere(scope) {
     const baseConditions = [...this.buildScopeWhere(scope)];
     const nowMs = Date.now();
     const retryAfterFilter = or(
@@ -27217,40 +27227,43 @@ var TaskService = class {
     if (batchFilter) {
       conditions.push(batchFilter);
     }
-    const result = await db.select().from(tasks2).where(and(
+    return and(
       ...conditions,
       or(
         isNull(tasks2.dependsOn),
         sql`EXISTS (
-                        SELECT 1 FROM tasks AS dependency_task
-                        WHERE dependency_task.id = ${tasks2.dependsOn}
-                          AND dependency_task.status = 'done'
-                          AND dependency_task.cwd IS ${tasks2.cwd}
-                    )`
+                    SELECT 1 FROM tasks AS dependency_task
+                    WHERE dependency_task.id = ${tasks2.dependsOn}
+                      AND dependency_task.status = 'done'
+                      AND dependency_task.cwd IS ${tasks2.cwd}
+                )`
       ),
       or(
         isNull(tasks2.batchId),
         sql`trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS}) = ''`,
         sql`NOT EXISTS (
-                        SELECT 1 FROM tasks AS running_batch_task
-                        WHERE trim(running_batch_task.batch_id, ${TASK_BATCH_TRIM_CHARACTERS})
-                            = trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS})
-                          AND (
-                              running_batch_task.status = 'running'
-                              OR EXISTS (
-                                  SELECT 1 FROM task_runs AS running_batch_run
-                                  WHERE running_batch_run.task_id = running_batch_task.id
-                                    AND running_batch_run.status = 'running'
-                              )
+                    SELECT 1 FROM tasks AS running_batch_task
+                    WHERE trim(running_batch_task.batch_id, ${TASK_BATCH_TRIM_CHARACTERS})
+                        = trim(${tasks2.batchId}, ${TASK_BATCH_TRIM_CHARACTERS})
+                      AND (
+                          running_batch_task.status = 'running'
+                          OR EXISTS (
+                              SELECT 1 FROM task_runs AS running_batch_run
+                              WHERE running_batch_run.task_id = running_batch_task.id
+                                AND running_batch_run.status = 'running'
                           )
-                        )`
+                      )
+                    )`
       ),
       sql`NOT EXISTS (
-                    SELECT 1 FROM task_runs AS candidate_active_run
-                    WHERE candidate_active_run.task_id = ${tasks2.id}
-                      AND candidate_active_run.status = 'running'
-                )`
-    )).orderBy(
+                SELECT 1 FROM task_runs AS candidate_active_run
+                WHERE candidate_active_run.task_id = ${tasks2.id}
+                  AND candidate_active_run.status = 'running'
+            )`
+    );
+  }
+  static async next(scope = {}) {
+    const result = await db.select().from(tasks2).where(this.buildRunnableTaskWhere(scope)).orderBy(
       desc(tasks2.urgency),
       desc(tasks2.importance),
       asc(tasks2.createdAt),
@@ -27258,6 +27271,22 @@ var TaskService = class {
     ).limit(1);
     return result[0] ?? null;
   }
+  static async claimNext(scope = {}) {
+    return db.transaction((tx) => {
+      const candidate = tx.select().from(tasks2).where(this.buildRunnableTaskWhere(scope)).orderBy(
+        desc(tasks2.urgency),
+        desc(tasks2.importance),
+        asc(tasks2.createdAt),
+        asc(tasks2.id)
+      ).limit(1).get();
+      if (!candidate) return null;
+      return tx.update(tasks2).set({
+        status: "running",
+        startedAt: /* @__PURE__ */ new Date(),
+        finishedAt: null
+      }).where(eq(tasks2.id, candidate.id)).returning().get() ?? null;
+    }, { behavior: "immediate" });
+  }
   static async countRunning(scope = {}) {
     const scopeConditions = scope.legacyCwd ? [sql`${tasks2.cwd} IS NULL OR trim(${tasks2.cwd}) = ''`] : this.buildScopeWhere(scope);
     if (scope.batchId !== void 0) {