@clawos-dev/clawd 0.2.119-beta.236.8805685 → 0.2.120-beta.237.5d8e8a2

package/dist/cli.cjs

@@ -41651,7 +41651,7 @@ function buildExtensionHandlers(deps) {
 
 // src/app-builder/kill-port.ts
 var import_node_child_process7 = require("child_process");
-async function killPortOccupants(port, logger) {
+async function killPortOccupants(port, ownedPids, logger) {
   let pids;
   try {
     pids = await listPidsOnPort(port);
@@ -41667,6 +41667,14 @@ async function killPortOccupants(port, logger) {
     return;
   }
   for (const pid of pids) {
+    if (!ownedPids.has(pid)) {
+      logger?.warn("app-builder.kill-port.skip-external", {
+        port,
+        pid,
+        hint: "pid not in supervisor owned set; might be another daemon or external process. handle manually via lsof + kill."
+      });
+      continue;
+    }
     try {
       process.kill(pid, "SIGKILL");
       logger?.info("app-builder.kill-port-occupant", { port, pid });
@@ -41714,7 +41722,7 @@ function buildAppBuilderHandlers(deps) {
   function getStageOf(name) {
     const recorded = stages.get(name);
     if (recorded) return recorded;
-    return devServerLifecycle.isRunning(name) ? { stage: "running" } : { stage: "install-pending" };
+    return devServerLifecycle.isRunning(name) ? { stage: "running" } : { stage: "stopped" };
   }
   async function setStageAndBroadcast(name, stage, reason) {
     if (reason !== void 0) {
@@ -41972,7 +41980,7 @@ function buildAppBuilderHandlers(deps) {
       const projects = await store.list();
       const meta = projects.find((p2) => p2.name === projectName);
       if (meta) {
-        await killPortOccupants(meta.port, deps.logger);
+        await killPortOccupants(meta.port, devServerLifecycle.getOwnedPids(), deps.logger);
       }
     } catch (err) {
       deps.logger?.warn("app-builder.stop-dev-server.kill-port-skipped", {
@@ -42496,6 +42504,20 @@ var DevServerSupervisor = class extends import_node_events2.EventEmitter {
   isRunning(projectName) {
     return [...this.running.values()].some((e) => e.projectName === projectName);
   }
+  /**
+   * 多 daemon fix (#803 follow-up): 返回 supervisor 当前 spawn 着的所有子进程 pid 集合。
+   * stopDevServer handler 调 killPortOccupants 时传入做白名单，避免无差别 kill 端口上的
+   * 进程把另一个 daemon (.clawd / .clawd-second) 的 dev server 也连带杀。
+   * undefined pid（spawn 还没拿到 pid 的极短窗口）会被过滤掉。
+   */
+  getOwnedPids() {
+    const pids = /* @__PURE__ */ new Set();
+    for (const entry of this.running.values()) {
+      const pid = entry.process.pid;
+      if (typeof pid === "number" && pid > 0) pids.add(pid);
+    }
+    return pids;
+  }
   boundSessionId(projectName) {
     const entry = [...this.running.values()].find((e) => e.projectName === projectName);
     return entry?.sessionId ?? null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.119-beta.236.8805685",
+  "version": "0.2.120-beta.237.5d8e8a2",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",