@kanadego/dsh-heartbeat 1.7.2 → 1.7.3

package/README.md

@@ -183,7 +183,8 @@ dsh plugin --profile web remove @kanadego/dsh-heartbeat
 
 | 插件版本 | 适配的 DSH | 说明 |
 |---|---|---|
-| **v1.7.2**（当前） | ≥ `0.1.2-rc.1`（新增 `0.2.0-rc.1`） | 声明适配 `0.2.0-rc.1`，无行为改动 |
+| **v1.7.3**（当前） | ≥ `0.1.2-rc.1` | 修复心跳进行中拖住宿主关闭/更新的问题 |
+| v1.7.2 | ≥ `0.1.2-rc.1`（新增 `0.2.0-rc.1`） | 声明适配 `0.2.0-rc.1`，无行为改动 |
 | v1.7.1 | ≥ `0.1.2-rc.1` | 修复 `0.1.7` 下「心跳模式」预设丢失：预设改为声明式注册，不再依赖文件系统用户根 |
 | v1.7.0 | ≥ `0.1.2-rc.1`（在 `0.1.7-rc.2` 上验收） | 适配 0.1.7 的接口换代（设置接口 / 客户端服务 / 节律配置自持 / 会话消息源）；新增 psy 分区开关与节省 token 模式 |
 | v1.6.0 – v1.6.4 | ≥ `0.1.2-rc.1` | 素材闭环 + 视觉识别；修好 `0.1.5` 下节律配置保存不生效。**建议直接用 v1.6.4**：v1.6.3 的设置卡有渲染 bug，别停在那一版 |
@@ -199,6 +200,10 @@ dsh plugin --profile web remove @kanadego/dsh-heartbeat
 <details open>
 <summary><b>v1.7.x</b></summary>
 
+### v1.7.3 · 2026-09-29（修复：心跳拖住 DSH 关闭）
+
+修复心跳正在跑时 DSH 关不掉的问题——此前桌面端更新若恰逢一跳在跑，宿主等心跳结束等不到，更新会报「未能安全停止任务」。现在收到关闭信号，心跳会立刻停下手里这一跳，不再拖住宿主。
+
 ### v1.7.2 · 2026-09-29（适配 DSH `0.2.0-rc.1`）
 
 声明适配 `0.2.0-rc.1`，无行为改动。

package/dist/index.js

@@ -64,7 +64,7 @@ import {
   removeBinding
 } from "./chunk-J6ZTRFFW.js";
 
-// node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.3/node_modules/@deepseek-ai/cosmokit/lib/index.js
+// node_modules/@deepseek-ai/cosmokit/lib/index.js
 function isNullable(value) {
   return value === null || value === void 0;
 }
@@ -83,6 +83,32 @@ function pick(source, keys, forced) {
   for (const key of keys) if (forced || source[key] !== void 0) result[key] = source[key];
   return result;
 }
+var write = /* @__PURE__ */ Symbol.for("cosmokit.volatile.write");
+function snapshot(value, ancestors = /* @__PURE__ */ new Set()) {
+  if (typeof value === "function") throw new TypeError("volatile config cannot contain functions");
+  if (value === null || typeof value !== "object") return value;
+  if (ancestors.has(value)) throw new TypeError("volatile config cannot contain cycles");
+  ancestors.add(value);
+  try {
+    if (Array.isArray(value)) return Object.freeze(value.map((item) => snapshot(item, ancestors)));
+    if (Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) throw new TypeError("volatile config objects must be plain objects or arrays");
+    return Object.freeze(Object.fromEntries(Object.entries(value).map(([key, item]) => [key, snapshot(item, ancestors)])));
+  } finally {
+    ancestors.delete(value);
+  }
+}
+function createVolatile(value) {
+  let current = snapshot(value);
+  return Object.freeze({
+    get: () => current,
+    [write]: (value2) => {
+      current = value2;
+    }
+  });
+}
+function isVolatile(value) {
+  return typeof value === "object" && value !== null && write in value;
+}
 function is(type, value) {
   if (arguments.length === 1) return (value2) => is(type, value2);
   return type in globalThis && value instanceof globalThis[type] || Object.prototype.toString.call(value).slice(8, -1) === type;
@@ -161,24 +187,37 @@ function clone(source, refs = /* @__PURE__ */ new Map()) {
   return result;
 }
 function deepEqual(a, b, strict) {
-  if (a === b) return true;
-  if (!strict && isNullable(a) && isNullable(b)) return true;
-  if (typeof a !== typeof b) return false;
-  if (typeof a !== "object") return false;
-  if (!a || !b) return false;
-  function check(test, then) {
-    return test(a) ? test(b) ? then(a, b) : false : test(b) ? false : void 0;
-  }
-  return check(Array.isArray, (a2, b2) => a2.length === b2.length && a2.every((item, index) => deepEqual(item, b2[index]))) ?? check(is("Date"), (a2, b2) => a2.valueOf() === b2.valueOf()) ?? check(is("RegExp"), (a2, b2) => a2.source === b2.source && a2.flags === b2.flags) ?? check(isArrayBufferLike, (a2, b2) => {
-    if (a2.byteLength !== b2.byteLength) return false;
-    const viewA = new Uint8Array(a2);
-    const viewB = new Uint8Array(b2);
-    for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
-    return true;
-  }) ?? Object.keys({
-    ...a,
-    ...b
-  }).every((key) => deepEqual(a[key], b[key], strict));
+  const ancestors = /* @__PURE__ */ new Set();
+  function compare(a2, b2) {
+    if (a2 === b2) return true;
+    if (isVolatile(a2) || isVolatile(b2)) return isVolatile(a2) && isVolatile(b2);
+    if (!strict && isNullable(a2) && isNullable(b2)) return true;
+    if (typeof a2 !== typeof b2 || typeof a2 !== "object" || !a2 || !b2) return false;
+    if (ancestors.has(a2)) return false;
+    function check(test, then) {
+      return test(a2) ? test(b2) ? then(a2, b2) : false : test(b2) ? false : void 0;
+    }
+    ancestors.add(a2);
+    try {
+      return check(Array.isArray, (a3, b3) => {
+        if (a3.length !== b3.length) return false;
+        for (let index = 0; index < a3.length; index++) if (!compare(a3[index], b3[index])) return false;
+        return true;
+      }) ?? check(is("Date"), (a3, b3) => a3.valueOf() === b3.valueOf()) ?? check(is("URL"), (a3, b3) => a3.href === b3.href) ?? check(is("RegExp"), (a3, b3) => a3.source === b3.source && a3.flags === b3.flags) ?? check(isArrayBufferLike, (a3, b3) => {
+        if (a3.byteLength !== b3.byteLength) return false;
+        const viewA = new Uint8Array(a3);
+        const viewB = new Uint8Array(b3);
+        for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
+        return true;
+      }) ?? ((!strict || [a2, b2].every((value) => Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)) && Object.keys({
+        ...a2,
+        ...b2
+      }).every((key) => compare(a2[key], b2[key])));
+    } finally {
+      ancestors.delete(a2);
+    }
+  }
+  return compare(a, b);
 }
 var Time;
 (function(Time2) {
@@ -250,7 +289,7 @@ var Time;
   Time2.template = template;
 })(Time || (Time = {}));
 
-// node_modules/.pnpm/@deepseek-ai+schemastery@3.18.2/node_modules/@deepseek-ai/schemastery/lib/index.mjs
+// node_modules/@deepseek-ai/schemastery/lib/index.mjs
 var kSchema = /* @__PURE__ */ Symbol.for("schemastery");
 var kValidationError = /* @__PURE__ */ Symbol.for("ValidationError");
 globalThis.__schemastery_index__ ??= 0;
@@ -427,6 +466,7 @@ Schema.prototype.pattern = function pattern(regexp) {
   return schema;
 };
 Schema.prototype.simplify = function simplify(value) {
+  if (isVolatile(value)) value = value.get();
   if (deepEqual(value, this.meta.default, this.type === "dict")) return null;
   if (isNullable(value)) return value;
   if (this.type === "object" || this.type === "dict") {
@@ -484,12 +524,49 @@ for (const key of [
   };
   return schema;
 } });
+Schema.prototype.volatile = function volatile() {
+  if (this.meta.volatile) throw new TypeError("volatile schema is already wrapped");
+  return this.extra("volatile", true);
+};
 var resolvers = {};
+var checkedVolatile = /* @__PURE__ */ Symbol("checked-volatile-schema");
+function validateVolatileSchema(schema, path13 = [], blocked = false, seen = /* @__PURE__ */ new Map()) {
+  const states = seen.get(schema) ?? /* @__PURE__ */ new Set();
+  if (states.has(blocked)) return;
+  states.add(blocked);
+  seen.set(schema, states);
+  if (schema.meta?.volatile && blocked) throw new ValidationError("volatile fields require a fixed object path without an enclosing volatile field", { path: path13 });
+  const nested = blocked || !!schema.meta?.volatile;
+  if (schema.dict) for (const [key, child] of Object.entries(schema.dict)) validateVolatileSchema(child, [...path13, key], nested, seen);
+  if (schema.sKey) validateVolatileSchema(schema.sKey, [...path13, "<key>"], true, seen);
+  if (schema.inner && (schema.type !== "lazy" || schema.inner[kSchema])) validateVolatileSchema(schema.inner, [...path13, "*"], true, seen);
+  if (schema.list) for (let index = 0; index < schema.list.length; index++) validateVolatileSchema(schema.list[index], [...path13, String(index)], true, seen);
+}
 Schema.extend = function extend(type, resolve2) {
   resolvers[type] = resolve2;
 };
 Schema.resolve = function resolve(data, schema, options = {}, strict = false) {
   if (!schema) return [data];
+  if (!options[checkedVolatile]) {
+    validateVolatileSchema(schema, options.path);
+    options = {
+      ...options,
+      [checkedVolatile]: true
+    };
+  }
+  if (schema.meta?.volatile) {
+    const inner = Schema(schema);
+    inner.meta = {
+      ...schema.meta,
+      volatile: false
+    };
+    const [value, adapted] = Schema.resolve(data, inner, options, strict);
+    try {
+      return [createVolatile(value), adapted];
+    } catch (error) {
+      throw new ValidationError(error instanceof Error ? error.message : String(error), options);
+    }
+  }
   if (options.ignore?.(data, schema)) return [data];
   if (isNullable(data) && schema.type !== "lazy") {
     if (schema.meta.required) throw new ValidationError(`missing required value`, options);
@@ -597,6 +674,7 @@ Schema.extend("lazy", (data, schema, options, strict) => {
       ...schema.meta,
       ...schema.inner.meta
     };
+    validateVolatileSchema(schema.inner, options.path, true);
   }
   return Schema.resolve(data, schema.inner, options, strict);
 });
@@ -696,7 +774,7 @@ function property(data, key, schema, options) {
   } catch (e) {
     if (!options?.autofix) throw e;
     delete data[key];
-    return schema.meta.default;
+    return schema.meta.volatile ? createVolatile(schema.meta.default) : schema.meta.default;
   }
 }
 Schema.extend("array", (data, { inner, meta }, options) => {
@@ -1026,7 +1104,7 @@ function collectPulse(guard, paths, rules, fgProcess = null, now = /* @__PURE__
   const idle = probeIdle(guard, paths);
   const windowClass = classifyProcess(fgProcess, rules);
   const t = timeContext(now);
-  const snapshot = {
+  const snapshot2 = {
     takenAt: now.toISOString(),
     idleSeconds: idle,
     presence: presenceOf(idle, windowClass),
@@ -1037,24 +1115,24 @@ function collectPulse(guard, paths, rules, fgProcess = null, now = /* @__PURE__
     festival: t.festival
   };
   try {
-    fs3.writeFileSync(path3.join(paths.dataDir, "envpulse.json"), JSON.stringify(snapshot, null, 1), "utf8");
+    fs3.writeFileSync(path3.join(paths.dataDir, "envpulse.json"), JSON.stringify(snapshot2, null, 1), "utf8");
   } catch {
   }
-  writePulseStream(paths, snapshot);
-  return snapshot;
+  writePulseStream(paths, snapshot2);
+  return snapshot2;
 }
-function writePulseStream(paths, snapshot) {
+function writePulseStream(paths, snapshot2) {
   try {
     appendAuditLine(path3.join(paths.logsDir, "envpulse.jsonl"), {
       event: "pulse",
-      takenAt: snapshot.takenAt,
-      idleSeconds: snapshot.idleSeconds,
-      presence: snapshot.presence,
-      windowClass: snapshot.windowClass,
-      daypart: snapshot.daypart,
-      weekday: snapshot.weekday,
-      isWeekend: snapshot.isWeekend,
-      festival: snapshot.festival
+      takenAt: snapshot2.takenAt,
+      idleSeconds: snapshot2.idleSeconds,
+      presence: snapshot2.presence,
+      windowClass: snapshot2.windowClass,
+      daypart: snapshot2.daypart,
+      weekday: snapshot2.weekday,
+      isWeekend: snapshot2.isWeekend,
+      festival: snapshot2.festival
     });
   } catch {
   }
@@ -1799,8 +1877,8 @@ function sessionEvents(session) {
   if (!session) return [];
   if (typeof session.snapshotEvents === "function") {
     try {
-      const snapshot = session.snapshotEvents();
-      if (Array.isArray(snapshot)) return snapshot;
+      const snapshot2 = session.snapshotEvents();
+      if (Array.isArray(snapshot2)) return snapshot2;
     } catch {
     }
   }
@@ -1815,6 +1893,7 @@ var IDLE_WAIT_TIMEOUT_MS = 24e4;
 var EXPRESSION_IDLE_WAIT_MS = 6e5;
 var agentPromise = null;
 var beating = false;
+var beatCancel;
 var lastBeat = null;
 function getLastBeat() {
   return lastBeat;
@@ -2468,6 +2547,14 @@ async function beat(deps) {
     appendAuditLine(paths.logsDir + "/heartbeat.jsonl", { event: "beat_start" });
     const beatStart = new Date(now).toISOString();
     const agent = await ensureAgent(deps);
+    if (agent) {
+      beatCancel = () => {
+        try {
+          agent.cancel?.();
+        } catch {
+        }
+      };
+    }
     let wandered = false;
     if (agent) {
       deferredRetries = 0;
@@ -2506,6 +2593,7 @@ async function beat(deps) {
     }
   } finally {
     beating = false;
+    beatCancel = void 0;
   }
 }
 function startOrchestrator(deps) {
@@ -2541,7 +2629,12 @@ function startOrchestrator(deps) {
     return () => {
       if (timer) clearInterval(timer);
       if (first) clearTimeout(first);
-      appendAuditLine(deps.paths.logsDir + "/heartbeat.jsonl", { event: "orchestrator_disposed" });
+      const cancelledInFlight = beating && beatCancel !== void 0;
+      try {
+        beatCancel?.();
+      } catch {
+      }
+      appendAuditLine(deps.paths.logsDir + "/heartbeat.jsonl", { event: "orchestrator_disposed", beatCancelled: cancelledInFlight });
       deps.ctx.logger.info("heartbeat: orchestrator timer disposed");
     };
   }, "heartbeat: timer");