opencode-supertask 0.1.21 → 0.1.22

package/dist/cli/index.js

@@ -9734,6 +9734,23 @@ var init_task_service = __esm({
         ).returning();
         return result.length;
       }
+      static async resetOrphanRunningToPending() {
+        const result = await db.update(tasks2).set({
+          status: "pending",
+          startedAt: null,
+          finishedAt: null
+        }).where(
+          and(
+            eq(tasks2.status, "running"),
+            sql`NOT EXISTS (
+                        SELECT 1 FROM ${taskRuns2}
+                        WHERE ${taskRuns2.taskId} = ${tasks2.id}
+                          AND ${taskRuns2.status} = 'running'
+                    )`
+          )
+        ).returning();
+        return result.length;
+      }
       static async cancel(id, scope = {}) {
         const conditions = [
           eq(tasks2.id, id),
@@ -19290,6 +19307,7 @@ __export(pm2_exports, {
   ensureGateway: () => ensureGateway,
   getPackageVersion: () => getPackageVersion,
   install: () => install,
+  installMacLaunchAgent: () => installMacLaunchAgent,
   isGatewayReady: () => isGatewayReady,
   isGatewayRunning: () => isGatewayRunning,
   isPm2Installed: () => isPm2Installed,
@@ -19298,9 +19316,9 @@ __export(pm2_exports, {
   upgrade: () => upgrade
 });
 import { execSync, spawnSync } from "child_process";
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { chmodSync, existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { homedir as homedir3 } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { dirname as dirname2, isAbsolute, join as join3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { Database as Database3 } from "bun:sqlite";
 function getPackageVersion() {
@@ -19348,6 +19366,83 @@ function writeRunningVersion(version2) {
 function pm2Bin() {
   return process.env.SUPERTASK_PM2_BIN ?? (process.platform === "win32" ? "pm2.cmd" : "pm2");
 }
+function xmlEscape(value) {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
+}
+function resolvePm2Bin() {
+  const configured = pm2Bin();
+  if (isAbsolute(configured)) return configured;
+  const result = spawnSync("which", [configured], { encoding: "utf8" });
+  const resolved = result.status === 0 ? result.stdout.trim().split("\n")[0] : "";
+  if (!resolved) throw new Error(`[supertask] \u65E0\u6CD5\u89E3\u6790 pm2 \u53EF\u6267\u884C\u6587\u4EF6: ${configured}`);
+  return resolved;
+}
+function launchAgentPath() {
+  return process.env.SUPERTASK_LAUNCH_AGENT_PATH ?? join3(homedir3(), "Library/LaunchAgents", `${MAC_LAUNCH_AGENT_LABEL}.plist`);
+}
+function launchctlBin() {
+  return process.env.SUPERTASK_LAUNCHCTL_BIN ?? "launchctl";
+}
+function installMacLaunchAgent() {
+  if (typeof process.getuid !== "function") {
+    throw new Error("[supertask] \u5F53\u524D\u8FD0\u884C\u65F6\u65E0\u6CD5\u83B7\u53D6 macOS \u7528\u6237 ID");
+  }
+  const path = launchAgentPath();
+  const home = homedir3();
+  const pm2Home = process.env.PM2_HOME ?? join3(home, ".pm2");
+  const environmentPath = process.env.PATH ?? "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin";
+  const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>${MAC_LAUNCH_AGENT_LABEL}</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>${xmlEscape(resolvePm2Bin())}</string>
+      <string>resurrect</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <dict>
+      <key>SuccessfulExit</key>
+      <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>10</integer>
+    <key>EnvironmentVariables</key>
+    <dict>
+      <key>HOME</key>
+      <string>${xmlEscape(home)}</string>
+      <key>PATH</key>
+      <string>${xmlEscape(environmentPath)}</string>
+      <key>PM2_HOME</key>
+      <string>${xmlEscape(pm2Home)}</string>
+    </dict>
+    <key>StandardErrorPath</key>
+    <string>${xmlEscape(join3(pm2Home, "supertask-launchd-error.log"))}</string>
+    <key>StandardOutPath</key>
+    <string>${xmlEscape(join3(pm2Home, "supertask-launchd-output.log"))}</string>
+  </dict>
+</plist>
+`;
+  mkdirSync2(dirname2(path), { recursive: true });
+  writeFileSync(path, plist, { mode: 384 });
+  chmodSync(path, 384);
+  const domain = `gui/${process.getuid()}`;
+  spawnSync(launchctlBin(), ["bootout", `${domain}/${MAC_LAUNCH_AGENT_LABEL}`], {
+    stdio: "ignore"
+  });
+  const loaded = spawnSync(launchctlBin(), ["bootstrap", domain, path], {
+    encoding: "utf8"
+  });
+  if (loaded.status !== 0) {
+    const output = `${loaded.stdout ?? ""}${loaded.stderr ?? ""}`.trim();
+    throw new Error(`[supertask] macOS LaunchAgent \u52A0\u8F7D\u5931\u8D25: ${output || `\u9000\u51FA\u7801 ${loaded.status}`}`);
+  }
+  return path;
+}
 function isPm2Installed() {
   const result = spawnSync(pm2Bin(), ["--version"], {
     stdio: "ignore",
@@ -19486,10 +19581,19 @@ function install() {
   pm2StartGateway();
   writeRunningVersion(version2);
   savePm2State();
-  const startup = pm2Exec(["startup"]);
-  if (startup.output) console.log(startup.output);
-  if (!startup.ok) {
-    console.warn("[supertask] pm2 startup \u672A\u5B8C\u6210\uFF1B\u8BF7\u6309 pm2 \u8F93\u51FA\u6267\u884C\u9700\u8981\u7BA1\u7406\u5458\u6743\u9650\u7684\u547D\u4EE4\uFF0C\u7136\u540E\u8FD0\u884C `pm2 save`\u3002");
+  if (process.platform === "darwin") {
+    try {
+      const path = installMacLaunchAgent();
+      console.log(`[supertask] macOS LaunchAgent installed: ${path}`);
+    } catch (error) {
+      console.warn(error instanceof Error ? error.message : String(error));
+    }
+  } else {
+    const startup = pm2Exec(["startup"]);
+    if (startup.output) console.log(startup.output);
+    if (!startup.ok) {
+      console.warn("[supertask] pm2 startup \u672A\u5B8C\u6210\uFF1B\u8BF7\u6309 pm2 \u8F93\u51FA\u6267\u884C\u9700\u8981\u7BA1\u7406\u5458\u6743\u9650\u7684\u547D\u4EE4\uFF0C\u7136\u540E\u8FD0\u884C `pm2 save`\u3002");
+    }
   }
   console.log("[supertask] Gateway installed and running.");
   console.log("[supertask] Manage with: pm2 status / pm2 logs supertask-gateway");
@@ -19547,13 +19651,14 @@ function ensureGateway() {
   savePm2State();
   return { ok: true, action: existing ? "restarted" : "started" };
 }
-var __dirname, PROCESS_NAME, GATEWAY_LOCK_STALE_MS;
+var __dirname, PROCESS_NAME, MAC_LAUNCH_AGENT_LABEL, GATEWAY_LOCK_STALE_MS;
 var init_pm2 = __esm({
   "src/daemon/pm2.ts"() {
     "use strict";
     init_config();
     __dirname = dirname2(fileURLToPath2(import.meta.url));
     PROCESS_NAME = "supertask-gateway";
+    MAC_LAUNCH_AGENT_LABEL = "com.supertask.pm2-resurrect";
     GATEWAY_LOCK_STALE_MS = 3e4;
   }
 });
@@ -19768,6 +19873,15 @@ import { basename } from "path";
 function isSafePid(pid) {
   return Number.isInteger(pid) && pid > 1 && pid !== process.pid;
 }
+function isProcessAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return error instanceof Error && "code" in error && error.code === "EPERM";
+  }
+}
 function inspectUnixProcess(pid) {
   const result = spawnSync2("ps", ["-o", "pgid=", "-o", "command=", "-p", String(pid)], {
     encoding: "utf8",
@@ -23463,7 +23577,9 @@ var init_web = __esm({
 // src/gateway/index.ts
 var gateway_exports = {};
 __export(gateway_exports, {
-  main: () => main
+  acquireLock: () => acquireLock,
+  main: () => main,
+  releaseLock: () => releaseLock
 });
 function acquireLock() {
   const now = Date.now();
@@ -23472,7 +23588,8 @@ function acquireLock() {
     sqlite.exec("BEGIN IMMEDIATE");
     const existing = sqlite.prepare("SELECT id, pid, heartbeat_at FROM gateway_lock WHERE id = 1").get();
     if (existing) {
-      if (now - existing.heartbeat_at < STALE_THRESHOLD_MS) {
+      const lockHolderAlive = existing.pid !== pid && isProcessAlive(existing.pid);
+      if (now - existing.heartbeat_at < STALE_THRESHOLD_MS && lockHolderAlive) {
         sqlite.exec("ROLLBACK");
         console.error(JSON.stringify({
           ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -23542,6 +23659,15 @@ async function main() {
   const worker = new WorkerEngine(cfg);
   const watchdog = new Watchdog(cfg);
   const scheduler = new Scheduler(cfg);
+  const recoveredOrphans = await TaskService.resetOrphanRunningToPending();
+  if (recoveredOrphans > 0) {
+    console.log(JSON.stringify({
+      ts: (/* @__PURE__ */ new Date()).toISOString(),
+      level: "warn",
+      msg: "reset orphan running tasks to pending",
+      count: recoveredOrphans
+    }));
+  }
   initializeGatewayHealth({
     workerPollIntervalMs: cfg.worker.pollIntervalMs,
     schedulerEnabled: cfg.scheduler.enabled,
@@ -23621,6 +23747,7 @@ var init_gateway = __esm({
     init_task_service();
     init_task_run_service();
     init_health();
+    init_process_control();
     STALE_THRESHOLD_MS = 3e4;
     if (import.meta.main) {
       main();