opencode-supertask 0.1.16 → 0.1.17

package/dist/worker/index.js

@@ -5280,9 +5280,10 @@ var TaskService = class {
     const hasExcludedBatches = scope.excludedBatchIds && scope.excludedBatchIds.length > 0;
     let batchFilter;
     if (hasExcludedBatches) {
-      const conditions2 = [];
-      conditions2.push(sql`${tasks2.batchId} NOT IN ${scope.excludedBatchIds}`);
-      batchFilter = and(...conditions2);
+      batchFilter = or(
+        isNull(tasks2.batchId),
+        sql`${tasks2.batchId} NOT IN ${scope.excludedBatchIds}`
+      );
     }
     const statusConditions = or(
       and(
@@ -5447,7 +5448,7 @@ var TaskService = class {
     if (conditions.length > 0) {
       query = query.where(and(...conditions));
     }
-    query = query.orderBy(desc(tasks2.createdAt));
+    query = query.orderBy(desc(tasks2.createdAt), desc(tasks2.id));
     if (options.limit) {
       query = query.limit(options.limit);
     }
@@ -5549,10 +5550,10 @@ var TaskRunService = class {
     return result[0] || null;
   }
   static async listByTaskId(taskId) {
-    return await db.select().from(taskRuns2).where(eq(taskRuns2.taskId, taskId)).orderBy(desc(taskRuns2.startedAt));
+    return await db.select().from(taskRuns2).where(eq(taskRuns2.taskId, taskId)).orderBy(desc(taskRuns2.startedAt), desc(taskRuns2.id));
   }
   static async getLatestByTaskId(taskId) {
-    const result = await db.select().from(taskRuns2).where(eq(taskRuns2.taskId, taskId)).orderBy(desc(taskRuns2.startedAt)).limit(1);
+    const result = await db.select().from(taskRuns2).where(eq(taskRuns2.taskId, taskId)).orderBy(desc(taskRuns2.startedAt), desc(taskRuns2.id)).limit(1);
     return result[0] || null;
   }
   static async getLatestByTaskIds(taskIds) {
@@ -5600,7 +5601,7 @@ var TaskRunService = class {
     }));
   }
   static async getRunningRunByTaskId(taskId) {
-    const result = await db.select().from(taskRuns2).where(and(eq(taskRuns2.taskId, taskId), eq(taskRuns2.status, "running"))).orderBy(desc(taskRuns2.startedAt)).limit(1);
+    const result = await db.select().from(taskRuns2).where(and(eq(taskRuns2.taskId, taskId), eq(taskRuns2.status, "running"))).orderBy(desc(taskRuns2.startedAt), desc(taskRuns2.id)).limit(1);
     return result[0] || null;
   }
   static async deleteByTaskIds(taskIds) {