opencode-supertask 0.1.16 → 0.1.18

package/dist/cli/index.js

@@ -9554,9 +9554,10 @@ var init_task_service = __esm({
         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(
@@ -9721,7 +9722,7 @@ var init_task_service = __esm({
         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);
         }
@@ -19169,10 +19170,10 @@ var init_task_run_service = __esm({
         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) {
@@ -19220,7 +19221,7 @@ var init_task_run_service = __esm({
         }));
       }
       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) {
@@ -22780,7 +22781,8 @@ __export(pm2_exports, {
   ensureGateway: () => ensureGateway,
   install: () => install,
   isGatewayRunning: () => isGatewayRunning,
-  uninstall: () => uninstall
+  uninstall: () => uninstall,
+  upgrade: () => upgrade
 });
 import { execSync, spawnSync } from "child_process";
 import { join as join3, dirname as dirname3 } from "path";
@@ -22943,6 +22945,26 @@ function uninstall() {
   console.log("[supertask] Note: pm2 startup config was not removed (you may have other pm2 processes).");
   console.log("[supertask] To fully remove pm2 startup: pm2 unstartup");
 }
+function upgrade() {
+  const before = getRunningVersion();
+  const currentVersion = getPackageVersion();
+  const list = pm2JsonList();
+  const proc = list.find((p) => p.name === PROCESS_NAME);
+  if (proc) {
+    console.log(`[supertask] Stopping Gateway (version ${before ?? "unknown"})...`);
+    pm2Exec(["delete", PROCESS_NAME]);
+  }
+  console.log(`[supertask] Starting Gateway (version ${currentVersion})...`);
+  const { ok } = pm2StartGateway(currentVersion);
+  if (ok) {
+    writeRunningVersion(currentVersion);
+    pm2Exec(["save"]);
+    console.log(`[supertask] Gateway upgraded: ${before ?? "unknown"} \u2192 ${currentVersion}`);
+  } else {
+    throw new Error(`[supertask] Failed to start Gateway after upgrade`);
+  }
+  return { before, after: currentVersion, restarted: true };
+}
 function ensureGateway() {
   const currentVersion = getPackageVersion();
   try {
@@ -23320,5 +23342,33 @@ program2.command("uninstall").description("Stop and remove Gateway pm2 service")
     process.exit(1);
   }
 });
+program2.command("upgrade").description("Update npm package and restart Gateway").action(async () => {
+  const { execSync: execSync2 } = await import("child_process");
+  const { homedir: homedir4 } = await import("os");
+  const { join: join4 } = await import("path");
+  const configDir = join4(homedir4(), ".config/opencode");
+  console.log("Updating opencode-supertask...");
+  try {
+    execSync2("npm install opencode-supertask@latest", {
+      cwd: configDir,
+      stdio: "inherit",
+      timeout: 6e4
+    });
+  } catch (err) {
+    console.error("npm install failed:", err instanceof Error ? err.message : String(err));
+    console.error("Try manually: cd ~/.config/opencode && npm install opencode-supertask@latest");
+    process.exit(1);
+  }
+  try {
+    const { upgrade: pm2Upgrade } = await Promise.resolve().then(() => (init_pm2(), pm2_exports));
+    const result = pm2Upgrade();
+    console.log(`
+SuperTask upgraded: ${result.before ?? "unknown"} \u2192 ${result.after}`);
+    console.log("Gateway restarted. Please restart opencode to load the new plugin.");
+  } catch (err) {
+    console.error("Gateway restart failed:", err instanceof Error ? err.message : String(err));
+    process.exit(1);
+  }
+});
 program2.parse();
 //# sourceMappingURL=index.js.map