ework-daemon 0.4.31 → 0.4.33

package/package.json

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

package/src/op.ts

@@ -260,9 +260,12 @@ export class Store {
     return rows.map(rowToSession);
   }
 
-  async listSessionsWithPid(): Promise<Array<{ id: string; opencodePid: number }>> {
+  async listSessionsWithPid(daemonId: number): Promise<Array<{ id: string; opencodePid: number }>> {
     const rows = await getDB().all<{ uid: string; opencode_pid: number }>(
-      "SELECT uid, opencode_pid FROM {{op_sessions}} WHERE opencode_pid IS NOT NULL"
+      `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 }));
   }

package/src/opencode.ts

@@ -1716,14 +1716,22 @@ export class Engine {
   private async cleanupGlobalOrphans(): Promise<void> {
     let sessions: Array<{ id: string; opencodePid: number }>;
     try {
-      sessions = await this.store.listSessionsWithPid();
+      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");
+        const exe = cmdline.split("\0")[0] ?? "";
+        const base = exe.split("/").pop() ?? "";
+        if (base !== binaryName && base !== "opencode" && base !== "pi") continue;
+      } catch { continue; }
+
       let ppid = -1;
       try {
         const stat = readFileSync(`/proc/${s.opencodePid}/stat`, "utf8");
@@ -1732,7 +1740,7 @@ export class Engine {
       } catch { continue; }
 
       if (ppid === 1) {
-        log.info(`engine: killing global orphan pid=${s.opencodePid} (PPID=1, session ${s.id})`);
+        log.info(`engine: killing orphaned pid=${s.opencodePid} (PPID=1, session ${s.id})`);
         try { this.killProcessTree(s.opencodePid); } catch { /* dead */ }
         killed++;
       }