opencode-supertask 0.1.15 → 0.1.17

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,12 +22781,14 @@ __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";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync4 } from "fs";
+import { homedir as homedir3 } from "os";
 function getPackageVersion() {
   try {
     const pkgPath = join3(__dirname, "../package.json");
@@ -22795,6 +22798,20 @@ function getPackageVersion() {
     return "0.0.0";
   }
 }
+function getRunningVersion() {
+  try {
+    if (!existsSync4(VERSION_FILE)) return null;
+    return readFileSync3(VERSION_FILE, "utf-8").trim() || null;
+  } catch {
+    return null;
+  }
+}
+function writeRunningVersion(version2) {
+  try {
+    writeFileSync2(VERSION_FILE, version2, "utf-8");
+  } catch {
+  }
+}
 function pm2Bin() {
   return process.platform === "win32" ? "pm2.cmd" : "pm2";
 }
@@ -22898,6 +22915,7 @@ function install() {
     if (!ok) {
       throw new Error(`[supertask] pm2 start failed: ${output}`);
     }
+    writeRunningVersion(version2);
   }
   pm2Exec(["save"]);
   console.log("[supertask] Configuring startup...");
@@ -22927,20 +22945,40 @@ 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 {
     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) {
+      const runningVersion = getRunningVersion();
+      if (runningVersion === currentVersion) {
         return;
       }
-      console.log(`[supertask] Version changed: ${envVersion ?? "unknown"} \u2192 ${currentVersion}, reloading Gateway...`);
+      console.log(`[supertask] Version changed: ${runningVersion ?? "unknown"} \u2192 ${currentVersion}, reloading Gateway...`);
       pm2Exec(["delete", PROCESS_NAME]);
-      pm2StartGateway(currentVersion);
+      const { ok } = pm2StartGateway(currentVersion);
+      if (ok) writeRunningVersion(currentVersion);
       pm2Exec(["save"]);
       return;
     }
@@ -22965,17 +23003,19 @@ function ensureGateway() {
     pm2Exec(["restart", PROCESS_NAME]);
   } else {
     const version2 = getPackageVersion();
-    pm2StartGateway(version2);
+    const { ok } = pm2StartGateway(version2);
+    if (ok) writeRunningVersion(version2);
   }
   pm2Exec(["save"]);
 }
-var __dirname, GATEWAY_ENTRY, PROCESS_NAME;
+var __dirname, GATEWAY_ENTRY, PROCESS_NAME, VERSION_FILE;
 var init_pm2 = __esm({
   "src/daemon/pm2.ts"() {
     "use strict";
     __dirname = dirname3(fileURLToPath2(import.meta.url));
     GATEWAY_ENTRY = join3(__dirname, "../gateway/index.js");
     PROCESS_NAME = "supertask-gateway";
+    VERSION_FILE = join3(homedir3(), ".local/share/opencode/supertask-gateway-version");
   }
 });
 
@@ -23231,14 +23271,14 @@ program2.command("template").description("\u7BA1\u7406\u4EFB\u52A1\u8C03\u5EA6\u
   }))
 );
 program2.command("init").description("Initialize SuperTask (create config + run migrations)").action(async () => withDb(async () => {
-  const { existsSync: existsSync4, mkdirSync: mkdirSync3, writeFileSync: writeFileSync2 } = await import("fs");
-  const { homedir: homedir3 } = await import("os");
+  const { existsSync: existsSync5, mkdirSync: mkdirSync3, writeFileSync: writeFileSync3 } = await import("fs");
+  const { homedir: homedir4 } = await import("os");
   const { join: join4, dirname: dirname4 } = await import("path");
   const { CONFIG_PATH: CONFIG_PATH2 } = await Promise.resolve().then(() => (init_config(), config_exports));
-  if (!existsSync4(CONFIG_PATH2)) {
+  if (!existsSync5(CONFIG_PATH2)) {
     const dir = dirname4(CONFIG_PATH2);
-    if (!existsSync4(dir)) mkdirSync3(dir, { recursive: true });
-    writeFileSync2(CONFIG_PATH2, JSON.stringify({
+    if (!existsSync5(dir)) mkdirSync3(dir, { recursive: true });
+    writeFileSync3(CONFIG_PATH2, JSON.stringify({
       worker: { maxConcurrency: 2, defaultModel: "zhipuai-coding-plan/glm-4.7" },
       scheduler: { enabled: true }
     }, null, 2) + "\n");
@@ -23302,5 +23342,15 @@ program2.command("uninstall").description("Stop and remove Gateway pm2 service")
     process.exit(1);
   }
 });
+program2.command("upgrade").description("Restart Gateway with current plugin version").action(async () => {
+  try {
+    const { upgrade: pm2Upgrade } = await Promise.resolve().then(() => (init_pm2(), pm2_exports));
+    const result = pm2Upgrade();
+    console.log(JSON.stringify({ before: result.before, after: result.after, restarted: result.restarted }));
+  } catch (err) {
+    console.error(err instanceof Error ? err.message : String(err));
+    process.exit(1);
+  }
+});
 program2.parse();
 //# sourceMappingURL=index.js.map