dsh-any-agent 0.3.8 → 0.4.0

package/src/line-decoder.mjs

@@ -0,0 +1,41 @@
+/**
+ * 行式 UTF-8 解码器。
+ *
+ * Node 的 stream 回调给的是 Buffer；直接对每个 chunk 调 `toString('utf8')`
+ * 会在 chunk 边界把一个多字节字符（中文/emoji）截成 U+FFFD，JSON 仍然合法，
+ * 但内容被静默改写。StringDecoder 会跨 chunk 保留未完成的多字节序列。
+ *
+ * 同时负责按 `\n` 切行；行内保留 `\r`，由调用方按需 trim。
+ */
+import { StringDecoder } from 'node:string_decoder';
+
+export class LineDecoder {
+  #decoder = new StringDecoder('utf8');
+  #buf = '';
+
+  /** 喂一个 Buffer；返回本轮切出的完整行（不含换行符）。 */
+  push(chunk) {
+    this.#buf += this.#decoder.write(chunk);
+    return this.#drain(false);
+  }
+
+  /** EOF：把 decoder 里残留的半个字符和最后一行一起吐出来。 */
+  end() {
+    this.#buf += this.#decoder.end();
+    return this.#drain(true);
+  }
+
+  #drain(flush) {
+    const lines = [];
+    let i;
+    while ((i = this.#buf.indexOf('\n')) !== -1) {
+      lines.push(this.#buf.slice(0, i));
+      this.#buf = this.#buf.slice(i + 1);
+    }
+    if (flush && this.#buf) {
+      lines.push(this.#buf);
+      this.#buf = '';
+    }
+    return lines;
+  }
+}

package/src/locks.mjs

@@ -106,7 +106,12 @@ export function writeMarker(conversationId, { childPid, cwd }) {
     mcp_token: MCP_TOKEN,
     child_pid: childPid ?? null,
     cwd: cwd ?? null,
-    spawned_at: prev?.spawned_at ?? now,
+    // 只有同一个子进程才沿用旧启动时间；子进程换了（PID 变化）必须重置，
+    // 否则 PID 复用保护会把新进程误判成“复用旧 PID”而拒绝 takeover。
+    spawned_at:
+      prev && prev.child_pid === childPid && Number.isFinite(prev.spawned_at)
+        ? prev.spawned_at
+        : now,
     heartbeat_at: now,
   });
   return true;

package/src/mcp.mjs

@@ -10,6 +10,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createHandlers, TOOL_DEFS } from './tools.mjs';
 import { DEFAULT_PERMISSION } from './config.mjs';
+import { LineDecoder } from './line-decoder.mjs';
 
 const SERVER_NAME = 'dsh-any-agent';
 /**
@@ -117,7 +118,7 @@ function fileURLToPathSafe(uri) {
 
 export function createMcpServer({ hub, toolDefs = TOOL_DEFS, handlers = createHandlers(hub), log }) {
   const write = (obj) => process.stdout.write(JSON.stringify(obj) + '\n');
-  let buffer = '';
+  const lineDecoder = new LineDecoder();
   let initialized = false;
   let clientCapabilities = {};
   let rootsSeq = 0;
@@ -251,11 +252,7 @@ export function createMcpServer({ hub, toolDefs = TOOL_DEFS, handlers = createHa
   }
 
   function onData(chunk) {
-    buffer += chunk.toString('utf8');
-    let idx;
-    while ((idx = buffer.indexOf('\n')) !== -1) {
-      const line = buffer.slice(0, idx);
-      buffer = buffer.slice(idx + 1);
+    for (const line of lineDecoder.push(chunk)) {
       if (!line.trim()) continue;
       let msg;
       try {

package/src/procstat.mjs

@@ -0,0 +1,72 @@
+/**
+ * 子进程 RSS 读取（只用于观测与内存预算，不参与任何协议）。
+ *
+ * 平台差异：
+ *   - Windows：`tasklist /FO CSV /NH` 第五列是 "12,345 K"
+ *   - Unix：`ps -axo pid=,rss=` 第二列是 KB
+ *
+ * 读取失败一律返回空 Map / null —— 量不到内存不是故障，绝不能因此回收会话。
+ * 结果缓存 5 秒，避免 reaper（默认 30 秒一轮）和 dsh_list 反复拉起进程。
+ */
+
+import { spawnSync } from 'node:child_process';
+
+const CACHE_MS = 5000;
+let cache = { at: 0, map: new Map() };
+
+function parseTasklist(out) {
+  const map = new Map();
+  for (const line of out.split('\n')) {
+    const cols = line.match(/"[^"]*"/g);
+    if (!cols || cols.length < 5) continue;
+    const pid = Number(cols[1].slice(1, -1));
+    const kb = /([\d,]+)\s*K/i.exec(cols[4]);
+    if (Number.isFinite(pid) && kb) map.set(pid, Number(kb[1].replace(/,/g, '')) / 1024);
+  }
+  return map;
+}
+
+function parsePs(out) {
+  const map = new Map();
+  for (const line of out.split('\n')) {
+    const m = /^\s*(\d+)\s+(\d+)\s*$/.exec(line);
+    if (m) map.set(Number(m[1]), Number(m[2]) / 1024);
+  }
+  return map;
+}
+
+/** @returns {Map<number, number>} pid → MB */
+export function readRssMap({ force = false } = {}) {
+  const now = Date.now();
+  if (!force && now - cache.at < CACHE_MS) return cache.map;
+  let map = new Map();
+  try {
+    const r =
+      process.platform === 'win32'
+        ? spawnSync('tasklist', ['/FO', 'CSV', '/NH'], {
+            encoding: 'utf8',
+            timeout: 3000,
+            windowsHide: true,
+            maxBuffer: 8 << 20,
+          })
+        : spawnSync('ps', ['-axo', 'pid=,rss='], {
+            encoding: 'utf8',
+            timeout: 3000,
+            maxBuffer: 8 << 20,
+          });
+    if (r.status === 0 && r.stdout) {
+      map = process.platform === 'win32' ? parseTasklist(r.stdout) : parsePs(r.stdout);
+    }
+  } catch {
+    // 读不到就当作未知
+  }
+  cache = { at: now, map };
+  return map;
+}
+
+/** @returns {number|null} pid 的 RSS（MB，四舍五入）；未知返回 null */
+export function rssMb(pid) {
+  if (!pid) return null;
+  const v = readRssMap().get(pid);
+  return v === undefined ? null : Math.round(v);
+}