oh-my-im 0.1.8 → 0.1.9

package/dist/omi.js

@@ -98,6 +98,44 @@ function isRunning(pid) {
         return false;
     }
 }
+function omiProcesses() {
+    try {
+        const result = spawnSync("ps", ["-eo", "pid=,ppid=,args="], { encoding: "utf8" });
+        if (result.status !== 0 || typeof result.stdout !== "string")
+            return [];
+        return result.stdout.split("\\n").flatMap((line) => {
+            const match = line.trim().match(/^(\\d+)\\s+(\\d+)\\s+(.+)$/);
+            if (!match)
+                return [];
+            return [{ pid: Number(match[1]), ppid: Number(match[2]), command: match[3] }];
+        });
+    }
+    catch {
+        return [];
+    }
+}
+function allOmiProcessIds() {
+    const processes = omiProcesses();
+    const ids = new Set();
+    // Match only this application's built workers. Do not use a broad
+    // "oh-my-im" substring that could terminate an unrelated shell/editor.
+    processes.filter((item) => item.command.includes("/dist/omi.js") || item.command.includes("/dist/dashboard-worker.js") || item.command.includes("/dist/dws-listener.js") || item.command.includes("/dist/bot-worker.js"))
+        .forEach((item) => ids.add(item.pid));
+    // Include Agent/DWS descendants spawned by our workers, such as codex/pi and
+    // dws child processes, so stop really leaves no worker behind.
+    let changed = true;
+    while (changed) {
+        changed = false;
+        processes.forEach((item) => {
+            if (ids.has(item.ppid) && !ids.has(item.pid)) {
+                ids.add(item.pid);
+                changed = true;
+            }
+        });
+    }
+    ids.delete(process.pid);
+    return [...ids];
+}
 function pidFromFile(path) {
     try {
         const pid = Number.parseInt(readFileSync(path, "utf8").trim(), 10);
@@ -182,21 +220,41 @@ function start(mode, workspace = launchWorkspace) {
 }
 async function stop() {
     const current = readState();
-    if (!current) {
+    const statePids = current?.processes.map((managed) => managed.pid) ?? [];
+    const pids = [...new Set([...statePids, ...allOmiProcessIds()])].filter((pid) => pid !== process.pid && isRunning(pid));
+    if (pids.length === 0) {
+        if (existsSync(stateFile))
+            unlinkSync(stateFile);
         console.log("omi is not running");
         return false;
     }
-    for (const managed of current.processes)
-        process.kill(managed.pid, "SIGTERM");
+    // Stop every omi worker and its descendants, including stale workers left by
+    // an older state file. Escalate after five seconds so restart cannot overlap
+    // with the previous listener/bot instance.
+    for (const pid of pids) {
+        try {
+            process.kill(pid, "SIGTERM");
+        }
+        catch { /* already exited */ }
+    }
     const deadline = Date.now() + 5_000;
-    while (current.processes.some((process) => isRunning(process.pid)) && Date.now() < deadline) {
+    while (pids.some((pid) => isRunning(pid)) && Date.now() < deadline) {
         await new Promise((resolve) => setTimeout(resolve, 100));
     }
-    const active = current.processes.filter((process) => isRunning(process.pid));
-    if (active.length > 0)
-        throw new Error(`omi did not stop within 5 seconds (pid ${active.map((item) => item.pid).join(", ")})`);
-    unlinkSync(stateFile);
-    console.log("omi stopped");
+    const active = pids.filter((pid) => isRunning(pid));
+    for (const pid of active) {
+        try {
+            process.kill(pid, "SIGKILL");
+        }
+        catch { /* already exited */ }
+    }
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    const remaining = pids.filter((pid) => isRunning(pid));
+    if (remaining.length > 0)
+        throw new Error(`omi did not stop (pid ${remaining.join(", ")})`);
+    if (existsSync(stateFile))
+        unlinkSync(stateFile);
+    console.log(`omi stopped (${pids.length} process(es))`);
     return true;
 }
 function status() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-im",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "author": {
     "name": "杜振训",
     "email": "duzhenxun@126.com"