@lih-x-x/kmr 1.0.44 → 1.0.46

package/dist/cli.js

@@ -6,9 +6,9 @@ async function checkUpdate() {
   try {
     const res = await fetch(`https://registry.npmjs.org/${"@lih-x-x/kmr"}/latest`, { signal: AbortSignal.timeout(3e3) });
     const data = await res.json();
-    if (data.version && data.version !== "1.0.44") {
+    if (data.version && data.version !== "1.0.46") {
       console.log(`
-\u2B06\uFE0F  \u65B0\u7248\u672C\u53EF\u7528: ${"1.0.44"} \u2192 ${data.version}`);
+\u2B06\uFE0F  \u65B0\u7248\u672C\u53EF\u7528: ${"1.0.46"} \u2192 ${data.version}`);
       console.log(`   \u8FD0\u884C npm install -g ${"@lih-x-x/kmr"} \u66F4\u65B0
 `);
     }
@@ -56,7 +56,7 @@ KMR\uFF08Key Meetings Record\uFF09\u2014 \u4F1A\u8BAE\u6316\u6398\u673A
   kmr --help   \u663E\u793A\u5E2E\u52A9
 `);
 } else if (command === "--version" || command === "-v") {
-  console.log("1.0.44");
+  console.log("1.0.46");
 } else if (command === "list") {
   const { loadConfig } = await import("./config-L2SVVMAR.js");
   const { JsonStore } = await import("./jsonStore-AL73KEUG.js");

package/dist/index.js

@@ -620,6 +620,7 @@ var SessionManager = class {
   }
   timeout;
   activeSessions = /* @__PURE__ */ new Map();
+  ownedPids = /* @__PURE__ */ new Set();
   sessionDir;
   async handleMessage(userId, text) {
     const sessionName = await this.ensureSession(userId);
@@ -632,6 +633,28 @@ var SessionManager = class {
     const provider = getAgentProvider();
     return provider === "codex" ? "codex" : provider;
   }
+  /**
+   * 获取当前所有 claude-agent-acp 进程的 PID
+   */
+  async getAgentPids() {
+    try {
+      const { stdout } = await execFileAsync("pgrep", ["-f", "claude-agent-acp"], { timeout: 5e3 });
+      return new Set(stdout.trim().split("\n").filter(Boolean).map(Number));
+    } catch {
+      return /* @__PURE__ */ new Set();
+    }
+  }
+  /**
+   * 记录操作前后新增的 PID
+   */
+  async trackNewPids(before) {
+    const after = await this.getAgentPids();
+    for (const pid of after) {
+      if (!before.has(pid)) {
+        this.ownedPids.add(pid);
+      }
+    }
+  }
   async ensureSession(userId) {
     const existing = this.activeSessions.get(userId);
     if (existing) {
@@ -641,42 +664,51 @@ var SessionManager = class {
     const userDir = path2.join(this.sessionDir, userId);
     fs2.mkdirSync(userDir, { recursive: true });
     const agentCmd = this.getAgentCmd();
-    let sessionExists = false;
     try {
       const { stdout } = await execFileAsync("acpx", [agentCmd, "sessions", "list"], {
         timeout: 1e4,
         maxBuffer: 1024 * 1024,
         env: getExecEnv()
       });
-      sessionExists = stdout.split("\n").some(
+      const hasExisting = stdout.split("\n").some(
         (line) => !line.includes("[closed]") && line.split("	")[1]?.trim() === sessionName
       );
+      if (hasExisting) {
+        console.log(`[session] \u53D1\u73B0\u6B8B\u7559 session: ${sessionName}\uFF0C\u5148\u5173\u95ED`);
+        try {
+          await execFileAsync("acpx", [agentCmd, "sessions", "close", sessionName], {
+            timeout: 1e4,
+            env: getExecEnv()
+          });
+        } catch {
+        }
+      }
     } catch {
     }
-    if (sessionExists) {
-      console.log(`[session] \u590D\u7528\u5DF2\u6709 acpx session: ${sessionName}`);
-    } else {
-      console.log(`[session] \u521B\u5EFA\u65B0 session: ${sessionName}`);
-      try {
-        await execFileAsync("acpx", [agentCmd, "sessions", "ensure", "--name", sessionName], {
-          timeout: this.timeout,
-          maxBuffer: 1024 * 1024,
-          env: getExecEnv()
-        });
-      } catch (err) {
-        console.error(`[session] \u521B\u5EFA session \u5931\u8D25:`, err.message);
-        throw new Error(`\u521B\u5EFA\u4F1A\u8BDD\u5931\u8D25: ${err.message}`);
-      }
-      try {
-        await execFileAsync(
-          "acpx",
-          ["--approve-all", agentCmd, "-s", sessionName, SESSION_SKILL],
-          { timeout: this.timeout, maxBuffer: 1024 * 1024, env: getExecEnv() }
-        );
-      } catch (err) {
-        console.error(`[session] \u89D2\u8272\u8BBE\u5B9A\u5931\u8D25:`, err.message);
-      }
+    console.log(`[session] \u521B\u5EFA\u65B0 session: ${sessionName}`);
+    const pidsBefore = await this.getAgentPids();
+    try {
+      await execFileAsync("acpx", [agentCmd, "sessions", "new", "--name", sessionName], {
+        timeout: this.timeout,
+        maxBuffer: 1024 * 1024,
+        env: getExecEnv()
+      });
+    } catch (err) {
+      console.error(`[session] \u521B\u5EFA session \u5931\u8D25:`, err.message);
+      throw new Error(`\u521B\u5EFA\u4F1A\u8BDD\u5931\u8D25: ${err.message}`);
+    }
+    await this.trackNewPids(pidsBefore);
+    const pidsBefore2 = await this.getAgentPids();
+    try {
+      await execFileAsync(
+        "acpx",
+        ["--approve-all", agentCmd, "-s", sessionName, SESSION_SKILL],
+        { timeout: this.timeout, maxBuffer: 1024 * 1024, env: getExecEnv() }
+      );
+    } catch (err) {
+      console.error(`[session] \u89D2\u8272\u8BBE\u5B9A\u5931\u8D25:`, err.message);
     }
+    await this.trackNewPids(pidsBefore2);
     this.activeSessions.set(userId, {
       name: sessionName,
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
@@ -685,14 +717,17 @@ var SessionManager = class {
   }
   async sendToSession(sessionName, text) {
     const agentCmd = this.getAgentCmd();
+    const pidsBefore = await this.getAgentPids();
     try {
       const { stdout } = await execFileAsync(
         "acpx",
         ["--approve-all", agentCmd, "-s", sessionName, text],
         { timeout: this.timeout, maxBuffer: 1024 * 1024, env: getExecEnv() }
       );
+      await this.trackNewPids(pidsBefore);
       return this.extractReply(stdout);
     } catch (err) {
+      await this.trackNewPids(pidsBefore);
       if (err.killed) {
         throw new Error(`AI \u56DE\u590D\u8D85\u65F6 (${this.timeout}ms)`);
       }
@@ -754,14 +789,24 @@ var SessionManager = class {
     this.activeSessions.delete(userId);
   }
   /**
-   * 关闭所有活跃 session，服务退出时调用
+   * 关闭所有活跃 session 并杀掉自己启动的进程，服务退出时调用
    */
   async closeAll() {
     const userIds = [...this.activeSessions.keys()];
-    if (userIds.length === 0) return;
-    console.log(`[session] \u6B63\u5728\u5173\u95ED ${userIds.length} \u4E2A\u6D3B\u8DC3 session...`);
-    await Promise.all(userIds.map((uid) => this.closeSession(uid)));
-    console.log(`[session] \u6240\u6709 session \u5DF2\u5173\u95ED`);
+    if (userIds.length > 0) {
+      console.log(`[session] \u6B63\u5728\u5173\u95ED ${userIds.length} \u4E2A\u6D3B\u8DC3 session...`);
+      await Promise.all(userIds.map((uid) => this.closeSession(uid)));
+    }
+    if (this.ownedPids.size > 0) {
+      console.log(`[session] \u6B63\u5728\u6E05\u7406 ${this.ownedPids.size} \u4E2A agent \u8FDB\u7A0B...`);
+      for (const pid of this.ownedPids) {
+        try {
+          process.kill(pid, "SIGTERM");
+        } catch {
+        }
+      }
+      this.ownedPids.clear();
+    }
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lih-x-x/kmr",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "type": "module",
   "main": "dist/index.js",
   "bin": {