@kanadego/dsh-heartbeat 1.9.1 → 1.9.3

package/dist/{chunk-HT57FOEF.js → chunk-TRO4E6WG.js}

@@ -10,6 +10,7 @@ import {
   minutesOfDay,
   pendingOlderThan,
   preferenceFilePath,
+  pruneWeeklyReports,
   readLedger,
   recordDelivery,
   renderTemplateReport,
@@ -20,7 +21,7 @@ import {
   sendNewMessageHint,
   sendWeeklyReadyHint,
   weeklyDue
-} from "./chunk-WRJCINZ7.js";
+} from "./chunk-WLZSABBH.js";
 import {
   getRuntime
 } from "./chunk-3QJJRXIR.js";
@@ -31,17 +32,17 @@ import {
   loadPool,
   seedsFilePath,
   surfaceSeed
-} from "./chunk-KOOQOMQY.js";
+} from "./chunk-JDH2LDFS.js";
 import {
   dedupeItems,
   inboxClear,
   inboxCount,
   inboxDrain,
   inboxFilePath
-} from "./chunk-BQCXYE7N.js";
+} from "./chunk-3MDBU6WY.js";
 import {
   snapshotIfDue
-} from "./chunk-QOQ7EPZZ.js";
+} from "./chunk-KB5SMG3F.js";
 import {
   appendAuditLine,
   applyOpsToDoc,
@@ -53,7 +54,7 @@ import {
   readAuditLines,
   readJournalTexts,
   runDeterministicAging
-} from "./chunk-OYVNWB5G.js";
+} from "./chunk-CUOSICYJ.js";
 import {
   decryptFile,
   encryptFile,
@@ -63,7 +64,7 @@ import {
   saveEncryptedText,
   saveJson,
   writeText
-} from "./chunk-7TW6DD6Q.js";
+} from "./chunk-K5Y6JP2B.js";
 import {
   atomicWriteJsonSync,
   burnFileSync
@@ -560,7 +561,8 @@ function assembleCandidates(seeds, opts = {}) {
   if (topic.length < 4) chat.push(...chatPool.slice(2, 2 + (4 - topic.length)));
   return [...topic, ...chat].slice(0, 6);
 }
-var PACKAGE_DECLARE = "\u8FD9\u662F\u5FC3\u8DF3\u63D2\u4EF6\u7D20\u6750\u6295\u9012,\u8BF7\u4F60\u6839\u636E\u5F53\u524D\u5904\u5883\u5224\u65AD\u8981\u4E0D\u8981\u9009\u4E00\u6761\u8BF4";
+var PACKAGE_DECLARE = "\u8FD9\u662F\u5FC3\u8DF3\u63D2\u4EF6\u7D20\u6750\u6295\u9012,\u8BF7\u4F60\u6839\u636E\u5F53\u524D\u5904\u5883\u5224\u65AD\u8981\u4E0D\u8981\u5F00\u53E3:\u8BE5\u8BF4\u5C31\u9009\u4E00\u6761\u8BF4,\u4E0D\u8BE5\u8BF4\u5C31\u7559\u767D";
+var SILENCE_DECLARE = '(\u51B3\u5B9A\u4E0D\u8BF4\u7684\u65F6\u5019:\u56DE\u590D\u91CC\u4E0D\u8981\u5199\u4EFB\u4F55\u6B63\u6587,\u4E5F\u4E0D\u8981\u5199"\u55EF""\u5728\u7684"\u8FD9\u79CD\u5BA2\u5957,\u53EA\u8C03\u4E00\u6B21 seed_report \u62A5 spoken=silent \u5E76\u5199\u4E0A reason;\u7A7A\u7740\u5C31\u662F\u771F\u7684\u6C89\u9ED8)';
 function materialLines(materials) {
   return materials.map((m) => `- [${m.id}] ${m.text.trim()}`);
 }
@@ -578,13 +580,14 @@ function buildMaterialPrompt(materials, opts = {}) {
   if (wantHonestOption(materials, opts.threshold ?? 2)) {
     lines.push("(\u6216\u8005\u4E5F\u53EF\u4EE5\u8BF4\u4E00\u53E5\u771F\u5FC3\u8BDD,\u4E0D\u5E26\u7D20\u6750)");
   }
+  lines.push(SILENCE_DECLARE);
   if (opts.deliveryId) {
     lines.push(`(\u672C\u6B21\u6295\u9012\u7F16\u53F7:${opts.deliveryId},\u62A5\u8D26\u65F6\u539F\u6837\u586B\u8FDB delivery_id)`);
   }
   lines.push(REPORT_DECLARE);
   return lines.join("\n");
 }
-var REPORT_DECLARE = "\u6700\u540E,\u65E0\u8BBA\u521A\u624D\u8BF4\u4E0D\u8BF4\u8BDD\u3001\u7528\u6CA1\u7528\u7D20\u6750,\u90FD\u8981\u8C03\u7528\u4E00\u6B21 seed_report \u5DE5\u5177\u62A5\u8D26:spoken=material(\u8BF4\u4E86\u7D20\u6750)/heartfelt(\u8BF4\u4E86\u4E0D\u5E26\u7D20\u6750\u7684\u8BDD)/silent(\u6CA1\u8BF4\u8BDD);\u7528\u4E86\u7D20\u6750\u5C31\u628A\u7D20\u6750\u7F16\u53F7\u586B\u8FDB seed_ids(\u53EF\u591A\u6761,\u53EA\u586B\u7F16\u53F7\u672C\u8EAB);\u7528\u4E86\u753B\u50CF\u6761\u76EE\u5F53\u8BDD\u9898\u5C31\u586B profile_ids;\u6CA1\u7528\u7D20\u6750\u65F6\u7528 reason \u7B80\u5355\u8BB0\u4E00\u7B14\u539F\u56E0(\u4E0D\u60F3\u8BF4\u8BDD/\u7D20\u6750\u4E0D\u642D/\u5728\u5FD9\u6216\u521A\u804A\u8FC7,\u65E0\u9700\u7D20\u6750);\u5E76\u628A\u672C\u6B21\u6295\u9012\u7F16\u53F7\u586B\u8FDB delivery_id\u3002";
+var REPORT_DECLARE = "\u6700\u540E,\u65E0\u8BBA\u521A\u624D\u8BF4\u4E0D\u8BF4\u8BDD\u3001\u7528\u6CA1\u7528\u7D20\u6750,\u90FD\u8981\u8C03\u7528\u4E00\u6B21 seed_report \u5DE5\u5177\u62A5\u8D26(\u4E0D\u8BF4\u8BDD\u65F6\u6B63\u6587\u5C31\u7559\u7A7A):spoken=material(\u8BF4\u4E86\u7D20\u6750)/heartfelt(\u8BF4\u4E86\u4E0D\u5E26\u7D20\u6750\u7684\u8BDD)/silent(\u6CA1\u8BF4\u8BDD);\u7528\u4E86\u7D20\u6750\u5C31\u628A\u7D20\u6750\u7F16\u53F7\u586B\u8FDB seed_ids(\u53EF\u591A\u6761,\u53EA\u586B\u7F16\u53F7\u672C\u8EAB);\u7528\u4E86\u753B\u50CF\u6761\u76EE\u5F53\u8BDD\u9898\u5C31\u586B profile_ids;\u6CA1\u7528\u7D20\u6750\u65F6\u7528 reason \u7B80\u5355\u8BB0\u4E00\u7B14\u539F\u56E0(\u4E0D\u60F3\u8BF4\u8BDD/\u7D20\u6750\u4E0D\u642D/\u5728\u5FD9\u6216\u521A\u804A\u8FC7,\u65E0\u9700\u7D20\u6750);\u5E76\u628A\u672C\u6B21\u6295\u9012\u7F16\u53F7\u586B\u8FDB delivery_id\u3002";
 function explicitIds(candidates, ids = []) {
   const known = new Set(candidates.map((c) => c.id));
   return [...new Set(ids)].filter((id) => known.has(id));
@@ -990,7 +993,7 @@ async function runConsolidation(guard, paths, policy, llm, now = Date.now()) {
     const report = applyOpsToDoc(guard, paths.dataDir, doc, profileOpsCast, schema, policy, now);
     const aged = runDeterministicAging(doc, policy, now);
     persistWithJournal(guard, paths.dataDir, doc, { runId, applied: report.applied, rejected: report.rejected });
-    const { addSeed: addSeed2, seedsFilePath: seedsFilePath2 } = await import("./pool-B34NTH6D.js");
+    const { addSeed: addSeed2, seedsFilePath: seedsFilePath2 } = await import("./pool-UTXQJJ5C.js");
     const seedAudit = (entry) => {
       try {
         appendAuditLine(paths.dataDir + "/logs/heartbeat.jsonl", entry);
@@ -1100,7 +1103,11 @@ function summarizeRhythm(paths) {
 }
 
 // src/profile/digest.ts
-var BUDGET_CHARS = 3200;
+var BUDGET_CHARS = 6e3;
+var TACT_MAX_CHARS = 2500;
+var WANDER_MAX_CHARS = 850;
+var TOPIC_MIN_CHARS = 2400;
+var TOPN_DEFAULT = 12;
 function fmtEntry(prefix, content, opts) {
   const flag = opts.low ? "\uFF08\u4E45\u672A\u9A8C\u8BC1\uFF09" : "";
   return `${prefix}${content}${flag} [conf ${opts.confidence.toFixed(2)}]`;
@@ -1109,9 +1116,25 @@ function profileTopicEntries(doc, topN) {
   const score = (e) => e.confidence * 0.7 + 1 / (1 + Math.max(0, Date.now() - Date.parse(e.updatedAt)) / 864e5) * 0.3;
   return [...doc.partitions.interest.entries, ...doc.partitions.projects.entries].filter((e) => e.validTo === null).sort((a, b) => score(b) - score(a)).slice(0, topN);
 }
+function capSection(entries, cap) {
+  const kept = [];
+  let len = 0;
+  let omitted = 0;
+  for (const line of entries) {
+    const add = kept.length === 0 ? line.length : line.length + 1;
+    if (len + add > cap) {
+      omitted += 1;
+      continue;
+    }
+    kept.push(line);
+    len += add;
+  }
+  if (kept.length === 0 && omitted > 0) return { text: `\uFF08\u672C\u8282 ${omitted} \u6761\u8D85\u51FA\u9884\u7B97\uFF0C\u5DF2\u7701\u7565\uFF09`, omitted };
+  return { text: kept.join("\n"), omitted };
+}
 function buildDigest(guard, paths, policy, input = {}) {
   const doc = loadProfile(guard, profileFilePath(paths.dataDir));
-  const topN = input.topN ?? 8;
+  const topN = input.topN ?? TOPN_DEFAULT;
   const summary = summarizeRhythm(paths);
   let rhythmLine = "\u4F5C\u606F\u672A\u77E5\uFF08\u6837\u672C\u4E0D\u8DB3\uFF09";
   if (summary.daysSampled > 0 && summary.peakHours.length > 0) {
@@ -1127,24 +1150,25 @@ function buildDigest(guard, paths, policy, input = {}) {
     return fmtEntry(prefix, `${e.topic}/${e.subTopic}: ${e.content}`, { low: e.lowActivity, confidence: e.confidence });
   });
   const wanderEntries = doc.partitions.interest.entries.filter((e) => e.validTo === null && e.confidence >= 0.6 && e.subTopic === "preference").slice(0, 5).map((e) => `- ${e.content} [conf ${e.confidence.toFixed(2)}]`);
-  const stale = pendingOlderThan(guard, ledgerFilePath(paths.dataDir), 3).slice(0, 3).map((e) => `- ${e.text}\uFF08${e.date}\uFF09`);
-  const tact = tactParts.join("\n");
-  const topic = [
-    ...topicEntries,
-    ...stale.length ? ["[\u8D26\u672C\u5F85\u8DDF\u8FDB] ", ...stale] : []
-  ].join("\n");
-  const wander = wanderEntries.join("\n") || "(\u65E0\u9AD8\u7F6E\u4FE1\u5174\u8DA3)";
-  const totalChars = tact.length + topic.length + wander.length;
-  let outTopic = topic;
-  if (tact.length + outTopic.length + wander.length > BUDGET_CHARS && outTopic.length > 800) {
-    outTopic = outTopic.slice(0, 800) + "\n(\u5DF2\u622A\u65AD\u4EE5\u63A7\u5236\u9884\u7B97)";
-  }
+  const ledgerBlock = pendingOlderThan(guard, ledgerFilePath(paths.dataDir), 3).slice(0, 3).map((e) => `- ${e.text}\uFF08${e.date}\uFF09`);
+  const ledgerText = ledgerBlock.length ? ["[\u8D26\u672C\u5F85\u8DDF\u8FDB] ", ...ledgerBlock].join("\n") : "";
+  const tact = capSection(tactParts, TACT_MAX_CHARS);
+  const wander = capSection(wanderEntries.length ? wanderEntries : ["(\u65E0\u9AD8\u7F6E\u4FE1\u5174\u8DA3)"], WANDER_MAX_CHARS);
+  const topicBudget = Math.max(
+    TOPIC_MIN_CHARS,
+    BUDGET_CHARS - tact.text.length - wander.text.length - ledgerText.length - 40
+  );
+  const topicCapped = capSection(topicEntries, topicBudget);
+  const topic = [topicCapped.text, ledgerText].filter((s) => s.length > 0).join("\n");
+  const totalChars = tact.text.length + topic.length + wander.text.length;
   return {
-    tact,
-    topic: outTopic,
-    wander,
-    totalChars: tact.length + outTopic.length + wander.length,
-    withinBudget: tact.length + outTopic.length + wander.length <= BUDGET_CHARS
+    tact: tact.text,
+    topic,
+    wander: wander.text,
+    totalChars,
+    withinBudget: totalChars <= BUDGET_CHARS,
+    omitted: { tact: tact.omitted, topic: topicCapped.omitted, wander: wander.omitted },
+    budgetChars: BUDGET_CHARS
   };
 }
 
@@ -1277,6 +1301,13 @@ function applyHeartbeatInterval(deps, intervalMin) {
   reschedule?.(v);
   appendAuditLine(deps.paths.logsDir + "/heartbeat.jsonl", { event: "interval_changed", intervalMin: v });
 }
+function looksPermanentResumeFailure(error) {
+  return [
+    /SessionFormatUnsupportedError/i,
+    /refuses the transformed artifact/i,
+    /session migration[^]*refus/i
+  ].some((re) => re.test(error));
+}
 function sessionEvents(session, fromSeq) {
   if (!session) return [];
   if (typeof session.snapshotEvents === "function") {
@@ -1398,6 +1429,11 @@ function makeHomeSetup(deps) {
   return async (agentCtx) => {
     const notes = [];
     const presetId = deps.agentPreset ?? "heartbeat";
+    try {
+      await withTimeout(deps.presetRegistration?.() ?? Promise.resolve(), 3e4, "preset registration timeout (30s)");
+    } catch (e) {
+      notes.push(`preset-register=threw(${String(e).slice(0, 120)})`);
+    }
     try {
       const presets = agentCtx.get("agentPresets");
       if (typeof presets?.mount !== "function") {
@@ -1539,12 +1575,15 @@ async function ensureAgent(deps) {
             agent = unwrap(handle);
             appendAuditLine(paths.logsDir + "/heartbeat.jsonl", { event: "agent_resume_ok", sessionId: savedId, model: agent.options?.model ?? "(none)" });
           } catch (resumeErr) {
+            const resumeMessage = String(resumeErr);
             appendAuditLine(paths.logsDir + "/heartbeat.jsonl", {
               event: "agent_resume_failed",
               sessionId: savedId,
-              error: String(resumeErr).slice(0, 160)
+              error: resumeMessage.slice(0, 160)
             });
-            if (!/not found/i.test(String(resumeErr))) {
+            const gone = /not found/i.test(resumeMessage);
+            const permanent = !gone && looksPermanentResumeFailure(resumeMessage);
+            if (!gone && !permanent) {
               appendAuditLine(paths.logsDir + "/heartbeat.jsonl", {
                 event: "agent_deferred",
                 sessionId: savedId,
@@ -1553,6 +1592,13 @@ async function ensureAgent(deps) {
               agentPromise = null;
               return null;
             }
+            if (permanent) {
+              appendAuditLine(paths.logsDir + "/heartbeat.jsonl", {
+                event: "agent_resume_permanent",
+                sessionId: savedId,
+                error: resumeMessage.slice(0, 160)
+              });
+            }
             try {
               const handle = await withTimeout(Promise.resolve(ctx.agents.create({ sessionId: savedId, meta: { cwd: paths.dataDir }, ...agentOptions ? { agentOptions } : {}, setup })), 3e4, "agents.create (self-heal) timeout");
               agent = unwrap(handle);
@@ -1760,7 +1806,7 @@ async function observeBoundSessions(bc) {
   const { deps, now } = bc;
   const { guard, paths } = deps;
   const { loadBindings, observeTargets } = await import("./bindings-225SI7KC.js");
-  const { inboxAppend, inboxFilePath: inboxFilePath2 } = await import("./inbox-JLT5G7TL.js");
+  const { inboxAppend, inboxFilePath: inboxFilePath2 } = await import("./inbox-P26DDMWC.js");
   const data = loadBindings(guard, paths.settingsDir);
   const targets = observeTargets(data);
   if (targets.length === 0) return;
@@ -1847,6 +1893,10 @@ async function weeklyPhase(bc) {
       text
     });
     audit({ event: "weekly_generated", source, chars: text.length });
+    const pruned = pruneWeeklyReports(guard, paths.dataDir, policy.weekly.keepReports);
+    if (pruned.length > 0) {
+      audit({ event: "weekly_pruned", keep: policy.weekly.keepReports, removed: pruned });
+    }
     if (!inQuietHours(policy, now)) {
       try {
         await sendWeeklyReadyHint(paths);
@@ -2240,13 +2290,13 @@ function writeBeatStatus(deps, info) {
     const pulse = readPulse(guard, paths);
     const last = getLastBeat();
     const spokeThisBeat = last?.verdict === "spoke" && !!last.at && last.at >= info.beatStart;
-    const scene = deriveScene({
+    const scene = info.away ? "away" : deriveScene({
       quietHours: inQuietHours(policy, Date.now()),
       spokeThisBeat,
       wanderedThisBeat: info.wandered,
       presence: pulse?.presence ?? "unknown"
     });
-    const note = last?.verdict === "spoke" ? clampNote(last.text) : void 0;
+    const note = info.away ? "\u4F60\u4E0D\u5728\uFF0C\u5FC3\u8DF3\u6302\u8D77" : last?.verdict === "spoke" ? clampNote(last.text) : void 0;
     writeStatus(guard, paths, {
       at: (/* @__PURE__ */ new Date()).toISOString(),
       scene,
@@ -2269,12 +2319,72 @@ function scheduleDeferredRetry(deps) {
   }, delayMs);
 }
 var TOKEN_SAVER_IDLE_SECONDS = 1800;
+var TOKEN_SAVER_WAKE_MS = 3 * 6e4;
+var TOKEN_SAVER_ACTIVITY_SCAN = 200;
+var wakeTimer;
+var pausedSince = 0;
+var heldChecks = 0;
+function clearTokenSaverWake() {
+  if (wakeTimer) {
+    clearTimeout(wakeTimer);
+    wakeTimer = void 0;
+  }
+}
+function scheduleTokenSaverWake(deps) {
+  if (!pausedSince) pausedSince = Date.now();
+  if (wakeTimer) return;
+  wakeTimer = setTimeout(() => {
+    wakeTimer = void 0;
+    void (async () => {
+      try {
+        if (await tokenSaverActive(deps)) {
+          heldChecks += 1;
+          scheduleTokenSaverWake(deps);
+          return;
+        }
+        const heldMin = Math.round((Date.now() - pausedSince) / 6e4);
+        const checks = heldChecks;
+        clearTokenSaverWake();
+        pausedSince = 0;
+        heldChecks = 0;
+        appendAuditLine(deps.paths.logsDir + "/heartbeat.jsonl", { event: "token_saver_resumed", via: "wake", heldMin, checks });
+        void beat(deps);
+      } catch {
+      }
+    })();
+  }, TOKEN_SAVER_WAKE_MS);
+  wakeTimer.unref?.();
+}
 async function tokenSaverActive(deps) {
   if (!getRuntime().flags.tokenSaver()) return false;
+  if (await userActiveInBoundSessions(deps)) return false;
   if (await probeWorkstationLocked()) return true;
   const idle = await probeIdleSeconds(deps.guard, deps.paths);
   return idle >= TOKEN_SAVER_IDLE_SECONDS;
 }
+async function userActiveInBoundSessions(deps) {
+  try {
+    const { loadBindings, observeTargets } = await import("./bindings-225SI7KC.js");
+    const targets = observeTargets(loadBindings(deps.guard, deps.paths.settingsDir));
+    if (targets.length === 0) return false;
+    const cursors = loadCursors(path9.join(deps.paths.dataDir, "cursors.json")).sessions;
+    for (const b of targets) {
+      const agent = ctx_getAgent(deps, b.sessionId);
+      if (!agent) continue;
+      const count = sessionEventCount(agent.session);
+      const from = Math.max(cursors[b.sessionId] ?? 0, count - TOKEN_SAVER_ACTIVITY_SCAN);
+      for (const e of sessionEvents(agent.session, from)) {
+        if (e.type !== "user/message") continue;
+        const d = e.data;
+        if (d?.source && (d.source.kind === "heartbeat" || d.source.kind === "plugin" || d.source.plugin === "heartbeat")) continue;
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
 async function beat(deps) {
   if (beating) return;
   beating = true;
@@ -2318,13 +2428,26 @@ async function beat(deps) {
       return;
     }
     let wandered = false;
+    let pausedAway = false;
     if (agent) {
       deferredRetries = 0;
       const bc = { deps, agent, now };
       if (await tokenSaverActive(deps)) {
         appendAuditLine(paths.logsDir + "/heartbeat.jsonl", { event: "silent", reason: "token-saver" });
         noteBeat("silent", { reason: "token-saver\uFF08\u4F60\u4E0D\u5728\uFF0C\u5FC3\u8DF3\u6302\u8D77\uFF09" });
+        pausedAway = true;
+        scheduleTokenSaverWake(deps);
       } else {
+        if (pausedSince) {
+          appendAuditLine(paths.logsDir + "/heartbeat.jsonl", {
+            event: "token_saver_resumed",
+            via: "interval",
+            heldMin: Math.round((Date.now() - pausedSince) / 6e4)
+          });
+        }
+        clearTokenSaverWake();
+        pausedSince = 0;
+        heldChecks = 0;
         await withTimeout(maintenancePhase(bc), MAINTENANCE_TIMEOUT_MS, "maintenance");
         appendAuditLine(paths.logsDir + "/heartbeat.jsonl", { event: "phase_done", phase: "maintenance" });
         await weeklyPhase(bc);
@@ -2346,7 +2469,7 @@ async function beat(deps) {
       appendAuditLine(paths.logsDir + "/heartbeat.jsonl", { event: "beat_agentless" });
       scheduleDeferredRetry(deps);
     }
-    writeBeatStatus(deps, { beatStart, wandered });
+    writeBeatStatus(deps, { beatStart, wandered, away: pausedAway });
   } catch (e) {
     deps.ctx.logger.error("heartbeat: beat failed: %s", String(e).slice(0, 200));
     markHomeRotateIfOverflow(e);
@@ -2409,6 +2532,9 @@ function startOrchestrator(deps) {
       lastBeat = null;
       droppedStreak = 0;
       deferredRetries = 0;
+      clearTokenSaverWake();
+      pausedSince = 0;
+      heldChecks = 0;
       if (retryTimer) {
         clearTimeout(retryTimer);
         retryTimer = void 0;
@@ -2428,6 +2554,7 @@ export {
   StatusReader,
   buildDigest,
   applyHeartbeatInterval,
+  looksPermanentResumeFailure,
   sessionEvents,
   sessionEventCount,
   HOME_ROTATE_EVENT_COUNT,
@@ -2448,7 +2575,9 @@ export {
   pickSpokenLine,
   spokeTextSince,
   TOKEN_SAVER_IDLE_SECONDS,
+  TOKEN_SAVER_WAKE_MS,
+  userActiveInBoundSessions,
   beat,
   startOrchestrator
 };
-//# sourceMappingURL=chunk-HT57FOEF.js.map
+//# sourceMappingURL=chunk-TRO4E6WG.js.map