oh-my-im 0.1.8 → 0.1.10

package/dist/dws-history.js

@@ -87,9 +87,17 @@ export function startDwsHistoryPolling(options) {
         }
     };
     void poll().catch((err) => log.warn(`history poll failed: ${String(err)}`));
-    const timer = setInterval(() => {
+    // Use a short scheduler tick instead of fixing the interval at startup, so
+    // changing 拉取间隔（秒） in the Web UI affects the current polling process.
+    let lastPollStartedAt = Date.now();
+    const scheduler = setInterval(() => {
+        const seconds = Number(options.getConfig().historyPollIntervalSeconds);
+        const intervalMs = Math.max(1, Number.isFinite(seconds) ? seconds : DEFAULT_POLL_INTERVAL_SECONDS) * 1_000;
+        if (Date.now() - lastPollStartedAt < intervalMs)
+            return;
+        lastPollStartedAt = Date.now();
         void poll().catch((err) => log.warn(`history poll failed: ${String(err)}`));
-    }, Math.max(1, Number(options.getConfig().historyPollIntervalSeconds || DEFAULT_POLL_INTERVAL_SECONDS)) * 1_000);
-    timer.unref();
-    return () => { stopped = true; clearInterval(timer); };
+    }, 1_000);
+    scheduler.unref();
+    return () => { stopped = true; clearInterval(scheduler); };
 }

package/dist/dws-listener.js

@@ -666,9 +666,10 @@ function isIgnoredRobotEvent(event, config) {
             return normalized.includes("robotcode") || normalized === "botid" || normalized === "openbotid";
         });
     };
+    const senderDisplay = senderDisplayName(event).trim().toLowerCase();
     const isRobot = robotMarker(sender) ||
-        (configuredRobotId && senderValues.includes(configuredRobotId)) ||
-        (robotName && senderValues.some((value) => value.includes(robotName)));
+        (configuredRobotId && senderId === configuredRobotId) ||
+        (robotName && (senderDisplay === robotName || senderValues.some((value) => value.includes(robotName))));
     if (isRobot)
         return true;
     // DWS history records are not consistent about exposing the sender name.
@@ -719,6 +720,7 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
     const sessionId = sessions.get(sessionKey);
     log.info(`processing batch size=${events.length} groupSession=${sessionId ? "resume" : "new"}`);
     let card;
+    let stopCardUpdates = () => undefined;
     let latestVisibleContent = `${label} 正在处理...`;
     let elapsedTimer;
     const title = `【${label}】`;
@@ -783,13 +785,23 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
         let pendingCardUpdate;
         let pendingCardTimer;
         let cardUpdateInFlight;
+        let cardUpdatesStopped = false;
+        stopCardUpdates = () => {
+            cardUpdatesStopped = true;
+            if (pendingCardTimer)
+                clearTimeout(pendingCardTimer);
+            pendingCardTimer = undefined;
+            pendingCardUpdate = undefined;
+        };
         // Pi emits very small deltas quickly. Coalesce them into one complete card
         // snapshot per second so DingTalk receives fresh content without a backlog.
-        const intervalMs = Math.max(500, getDashboardConfig().cardUpdateIntervalMs || 3_000);
+        const getCardIntervalMs = () => Math.max(500, getDashboardConfig().cardUpdateIntervalMs || 3_000);
         const pumpCardUpdate = () => {
-            if (cardUpdateInFlight || !pendingCardUpdate)
+            if (cardUpdatesStopped || cardUpdateInFlight || !pendingCardUpdate)
                 return;
-            const remaining = intervalMs - (Date.now() - lastCardUpdateAt);
+            // Read the setting for every update. A Web change therefore affects an
+            // already running task, not only the next task.
+            const remaining = getCardIntervalMs() - (Date.now() - lastCardUpdateAt);
             if (remaining > 0) {
                 if (!pendingCardTimer) {
                     pendingCardTimer = setTimeout(() => {
@@ -819,7 +831,7 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
             }
             if (cardUpdateInFlight)
                 await cardUpdateInFlight;
-            if (pendingCardUpdate) {
+            if (pendingCardUpdate && !cardUpdatesStopped) {
                 const latest = pendingCardUpdate;
                 pendingCardUpdate = undefined;
                 await cardClient.update(activeCard, latest.title, formatReply(latest.content, getDashboardConfig().replyFormat))
@@ -827,6 +839,8 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
             }
         };
         const updateCard = (title, content) => {
+            if (cardUpdatesStopped)
+                return;
             pendingCardUpdate = { title, content };
             pumpCardUpdate();
         };
@@ -905,6 +919,10 @@ async function handleBatch(events, groupId, cardState, sessions, cardClient, get
         if (card) {
             const stopped = queue?.paused === true;
             const stoppedContent = latestVisibleContent;
+            // Cancel the interval timer and all delayed updates before the final
+            // paused/failed card update. This prevents a queued update from arriving
+            // after stop and changing the title back to "处理中".
+            stopCardUpdates();
             await cardClient.update(card, stopped ? finishedTitle("🔴", "处理暂停") : finishedTitle("❌", "处理失败"), stopped ? stoppedContent : `${label} 处理失败：${message.slice(0, 2_000)}`)
                 .catch((updateErr) => log.warn(`card failure update skipped: ${String(updateErr)}`));
             cardState.cards[groupId] = { cardBizId: card.cardBizId, status: stopped ? "failed" : "failed" };
@@ -1023,6 +1041,14 @@ function startGroupListener(seen, queues, cardState, sessions, cardClient, getDa
             log.debug(`ignored robot message event=${event.event_id || "unknown"}`);
             return;
         }
+        // A bot acknowledgement may be returned by history before the sender
+        // metadata is complete. Never feed our own steer acknowledgement back into
+        // the active Pi task, even if robot detection missed that event.
+        const eventContent = (event.content || event.text || "").trim();
+        if (queues.get(groupId)?.running && /^已将这条消息作为引导发送给当前 Pi 任务[。.!！]?$/u.test(eventContent)) {
+            log.debug(`ignored self steer acknowledgement group=${groupId}`);
+            return;
+        }
         const key = eventKey(event, groupId);
         if (key && seen.has(key))
             return;

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.10",
   "author": {
     "name": "杜振训",
     "email": "duzhenxun@126.com"