ework-daemon 0.4.30 → 0.4.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-daemon",
-  "version": "0.4.30",
+  "version": "0.4.32",
   "description": "Issue-driven AI development daemon. Spawns opencode subprocesses to resolve Gitea issues.",
   "module": "src/index.ts",
   "type": "module",

package/src/op.ts

@@ -260,6 +260,16 @@ export class Store {
     return rows.map(rowToSession);
   }
 
+  async listSessionsWithPid(daemonId: number): Promise<Array<{ id: string; opencodePid: number }>> {
+    const rows = await getDB().all<{ uid: string; opencode_pid: number }>(
+      `SELECT s.uid, s.opencode_pid FROM {{op_sessions}} s
+       INNER JOIN {{issues}} i ON i.uid = s.issue_id
+       WHERE s.opencode_pid IS NOT NULL AND i.owner_daemon_id = ?`,
+      [daemonId]
+    );
+    return rows.map((r) => ({ id: r.uid, opencodePid: r.opencode_pid }));
+  }
+
   async listNonIdleSessions(): Promise<OpSession[]> {
     const rows = await getDB().all<SessionRow>("SELECT * FROM {{op_sessions}} WHERE state != 'idle'");
     return rows.map(rowToSession);

package/src/opencode.ts

@@ -1,5 +1,5 @@
 import { Database } from "bun:sqlite";
-import { mkdirSync, writeFileSync, readdirSync, existsSync } from "fs";
+import { mkdirSync, writeFileSync, readdirSync, existsSync, readFileSync } from "fs";
 import { join, resolve, isAbsolute } from "path";
 import { homedir } from "os";
 import { log } from "./logger";
@@ -1617,6 +1617,8 @@ export class Engine {
       log.error("engine: releaseDeadOwners at boot failed:", (err as Error).message);
     }
 
+    await this.cleanupGlobalOrphans();
+
     // Multi-machine: recover ONLY this daemon's sessions. Other daemons own
     // the rest; touching their state would race them.
     const ownedSessions = await this.store.listOwnedSessions(this.daemonId);
@@ -1711,6 +1713,39 @@ export class Engine {
     }
   }
 
+  private async cleanupGlobalOrphans(): Promise<void> {
+    let sessions: Array<{ id: string; opencodePid: number }>;
+    try {
+      sessions = await this.store.listSessionsWithPid(this.daemonId);
+    } catch { return; }
+    const binaryName = this.cfg.opencode.binary.split("/").pop() ?? "opencode";
+    let killed = 0;
+    for (const s of sessions) {
+      let alive = false;
+      try { process.kill(s.opencodePid, 0); alive = true; } catch { /* dead */ }
+      if (!alive) continue;
+
+      try {
+        const cmdline = readFileSync(`/proc/${s.opencodePid}/cmdline`, "utf8");
+        if (!cmdline.includes(binaryName) && !cmdline.includes("opencode") && !cmdline.includes("pi")) continue;
+      } catch { continue; }
+
+      let ppid = -1;
+      try {
+        const stat = readFileSync(`/proc/${s.opencodePid}/stat`, "utf8");
+        const m = stat.match(/\)\s+\S+\s+(\d+)/);
+        ppid = m ? Number(m[1]) : -1;
+      } catch { continue; }
+
+      if (ppid === 1) {
+        log.info(`engine: killing orphaned pid=${s.opencodePid} (PPID=1, session ${s.id})`);
+        try { this.killProcessTree(s.opencodePid); } catch { /* dead */ }
+        killed++;
+      }
+    }
+    if (killed > 0) log.info(`engine: cleaned up ${killed} orphaned processes (PPID=1)`);
+  }
+
   // ─── API Methods ───
 
   async retryMessage(messageId: string): Promise<boolean> {