dsh-auto-compaction 0.2.1 → 0.2.2

package/lib/client.js

@@ -43,6 +43,10 @@ window.__ModuleLoader__.load({
       { id: "topbar", label: "顶部条" },
       { id: "corner", label: "右上角" },
     ];
+    function presetLabel(id) {
+      for (var i = 0; i < PRESETS.length; i += 1) if (PRESETS[i].id === id) return PRESETS[i].label;
+      return String(id || "未命名预设");
+    }
     var EXAMPLE_WINDOW = 250000, EXAMPLE_RESERVED = 20000, EXAMPLE_HEADROOM = 10000;
 
     var DISPLAY_STYLES = ["orbit", "strip", "ring", "topbar", "corner"];
@@ -480,7 +484,7 @@ window.__ModuleLoader__.load({
               indicator,
               h("div", { style: { fontSize: 12.5, fontWeight: 600, color: STATUS_TEXT } }, title),
               h("div", { style: { fontSize: 11, color: STATUS_MUTED } }, cardSub),
-              h("div", { style: { fontSize: 10.5, color: STATUS_MUTED, opacity: 0.85 } }, "完成后整段历史收成一条交接文档")
+              h("div", { style: { fontSize: 10.5, color: STATUS_MUTED, opacity: 0.85 } }, "完成后把最旧的这段历史收成一条交接文档")
             )
           ),
           document.body
@@ -687,8 +691,29 @@ window.__ModuleLoader__.load({
       var draft = draftState[0], setDraft = draftState[1];
       var statusState = React.useState({ loading: true, error: "", saving: false, saved: false });
       var status = statusState[0], setStatus = statusState[1];
+      var scopeState = React.useState({ loading: true, error: "", value: null });
+      var scope = scopeState[0], setScope = scopeState[1];
+      var tokenState = React.useState(0);
+      var token = tokenState[0], setToken = tokenState[1];
       ensureStatusStyles();
 
+      // The compaction slot lives in the preset YAML, not in our settings file,
+      // so the truth is read from disk each time the section opens.
+      React.useEffect(function () {
+        if (!connection) {
+          setScope({ loading: false, error: "连接服务不可用", value: null });
+          return undefined;
+        }
+        var alive = true;
+        setScope(function (previous) { return { loading: true, error: "", value: previous.value }; });
+        call(connection, "scope").then(function (value) {
+          if (alive) setScope({ loading: false, error: "", value: value });
+        }).catch(function (error) {
+          if (alive) setScope({ loading: false, error: String(error && error.message || error), value: null });
+        });
+        return function () { alive = false; };
+      }, [connection, token]);
+
       React.useEffect(function () {
         var alive = true;
         if (!connection) { setStatus({ loading: false, error: "连接服务不可用", saving: false, saved: false }); return; }
@@ -715,6 +740,80 @@ window.__ModuleLoader__.load({
       var defaultTemplate = base.defaultTemplate || DEFAULT_TEMPLATE;
       var themeStyle = normalizeDisplayStyle(base.displayStyle);
 
+      // Detection only: who compacts is decided by the preset slot (read from
+      // disk) times the 启用插件 switch. This row never changes either of them.
+      var SCOPE_TONE = {
+        native: { dot: "#6b7178", text: C.muted },
+        plugin: { dot: C.accent, text: "#cfe0ff" },
+        part: { dot: "#d29922", text: "#e6c98a" },
+        err: { dot: "#e5534b", text: "#f0b8b4" },
+      };
+      var scopeView = (function () {
+        var st = scope.value;
+        if (!st) {
+          return {
+            tone: "err",
+            text: scope.loading ? "读取中…" : "读不到生效情况",
+            sub: scope.loading
+              ? "正在读取各 Agent 预设里的 compaction 槽位。"
+              : "读不到预设里的 compaction 槽位：" + (scope.error || "未知原因") + "。",
+            rows: [], retry: true,
+          };
+        }
+        var list = Array.isArray(st.presets) ? st.presets : [];
+        var rows = list.map(function (p) {
+          return {
+            key: String(p.id), label: presetLabel(p.id), taken: p.owner === "plugin",
+            owner: p.owner === "plugin" ? "插件" : p.owner === "native" ? "原生" : "未知",
+          };
+        });
+        var names = rows.map(function (r) { return r.label; });
+        var takenNames = rows.filter(function (r) { return r.taken; }).map(function (r) { return r.label; });
+        var restNames = rows.filter(function (r) { return !r.taken; }).map(function (r) { return r.label; });
+        var taken = Number(st.taken) || 0;
+        var total = Number(st.total) || list.length;
+        var globalSaved = st.scope !== "preset";
+        var scopeLead = globalSaved
+          ? "全局生效："
+          : "按预设生效：";
+        if (total === 0) {
+          return {
+            tone: "err", text: "读不到预设", rows: [], retry: true,
+            sub: "没找到带 handoff 槽位的可编辑预设文件，所以无法判断压缩由谁负责。确认 DSH 已生成预设后重新读取。",
+          };
+        }
+        if (taken === 0) {
+          return {
+            tone: "native", text: "DSH 原生压缩", rows: rows, retry: false,
+            sub: "各预设的 compaction 槽位都还在原生实现手里，所以压缩目前由 DSH 自己完成。保存本页设置会自动接管 " + names.join("、") + "（写入预设文件并留备份，重启 DSH 后生效）。",
+          };
+        }
+        if (!enabled) {
+          return {
+            tone: "native", text: "DSH 原生压缩（插件已停用）", rows: rows, retry: false,
+            sub: taken < total
+              ? "「启用插件」已关闭，压缩由 DSH 原生实现负责；" + takenNames.join("、") + " 的槽位仍指向插件，" + restNames.join("、") + " 本来就走原生。"
+              : "「启用插件」已关闭：槽位虽然指向插件，但插件把压缩交回 DSH 原生实现。打开开关即恢复，不需要重启。",
+          };
+        }
+        if (taken < total) {
+          return {
+            tone: "part", text: taken + "/" + total + " 预设已接管", rows: rows, retry: false,
+            sub: scopeLead + "已交给插件：" + takenNames.join("、") + "；" + restNames.join("、") + " 仍走各自的原生压缩。",
+          };
+        }
+        return {
+          tone: "plugin",
+          text: globalSaved ? "已由插件接管（全局）" : "已由插件接管",
+          rows: rows, retry: false,
+          sub: scopeLead + (globalSaved
+            ? "这 " + total + " 个带 handoff 槽位的可编辑预设（" + names.join("、") + "）"
+            : "勾选的 " + taken + " 个预设（" + takenNames.join("、") + "）")
+            + "的 compaction 槽位指向插件，且「启用插件」是开的，压缩由本插件的交接文档负责。",
+        };
+      })();
+      var scopeTone = SCOPE_TONE[scopeView.tone] || SCOPE_TONE.native;
+
       var budget = EXAMPLE_WINDOW - EXAMPLE_RESERVED;
       var ceiling = budget - EXAMPLE_HEADROOM;
       var eff = Math.min(Math.round(budget * ratio / 100), ceiling);
@@ -726,6 +825,20 @@ window.__ModuleLoader__.load({
         (settings.templateFile || "") !== template ||
         normalizeDisplayStyle(settings.displayStyle) !== themeStyle;
 
+      // The detection row reports what is on disk, so every unsaved choice that
+      // would change that report has to be named — otherwise it looks ignored.
+      var enabledIsPending = settings !== null && (settings.enabled !== false) !== enabled;
+      var scopeIsPending = settings !== null && (settings.scope === "preset") !== scopePreset;
+      var presetsIsPending = settings !== null && scopePreset &&
+        JSON.stringify(presets.slice().sort()) !== JSON.stringify((settings.presets || []).slice().sort());
+      var pendingParts = [];
+      if (enabledIsPending) pendingParts.push("「启用插件」改成" + (enabled ? "开" : "关"));
+      if (scopeIsPending) pendingParts.push("生效范围改成「" + (scopePreset ? "按预设生效" : "全局生效") + "」");
+      if (presetsIsPending) pendingParts.push("勾选的预设改成" + (presets.length ? presets.map(presetLabel).join("、") : "（都不勾）"));
+      var pendingNote = pendingParts.length
+        ? "还没保存：" + pendingParts.join("；") + "。保存后开关立刻生效，槽位改动要重启 DSH 才加载。"
+        : "";
+
       function patch(next) { setDraft(Object.assign({}, base, next)); setStatus({ loading: false, error: "", saving: false, saved: false }); }
       function setPreset(id) {
         var next = presets.indexOf(id) >= 0 ? presets.filter(function (v) { return v !== id; }) : presets.concat([id]);
@@ -744,10 +857,12 @@ window.__ModuleLoader__.load({
           setSettings(value); setDraft(value);
           publishDisplayStyle(value && value.displayStyle);
           setStatus({ loading: false, error: "", saving: false, saved: true });
+          setToken(token + 1);
         }).catch(function (error) {
           setStatus({ loading: false, error: String(error && error.message || error), saving: false, saved: false });
         });
       }
+
       function discard() { setDraft(settings); setStatus({ loading: false, error: "", saving: false, saved: false }); }
       function open(kind) {
         call(connection, "open", { kind: kind, path: template }).then(function () {
@@ -808,6 +923,38 @@ window.__ModuleLoader__.load({
           })
         ) : null,
 
+        h("div", { style: rowStyle },
+          h("div", { style: { minWidth: 0 } },
+            h("div", { style: labelStyle }, "当前生效情况"),
+            h("div", { style: subStyle }, scopeView.sub),
+            scopeView.rows.length
+              ? h("div", { style: { display: "flex", gap: "6px 16px", flexWrap: "wrap", marginTop: 7 } },
+                scopeView.rows.map(function (r) {
+                  return h("span", { key: r.key, style: { display: "inline-flex", alignItems: "center", gap: 6, fontSize: 12, color: C.muted } },
+                    h("i", { "aria-hidden": true, style: { width: 6, height: 6, borderRadius: "50%", background: r.taken ? C.accent : "#6b7178" } }),
+                    r.label,
+                    h("em", { style: { fontStyle: "normal", color: C.faint } }, r.owner));
+                })
+              )
+              : null,
+            pendingNote ? h("div", { style: { fontSize: 11.5, color: "#d29922", marginTop: 6 } }, pendingNote) : null,
+            scope.error && scope.value ? h("div", { style: { fontSize: 11.5, color: "#e5534b", marginTop: 6 } }, "读取失败：" + scope.error) : null
+          ),
+          h("div", { style: { display: "inline-flex", alignItems: "center", gap: 12, flex: "0 0 auto" } },
+            h("span", { "aria-live": "polite", style: { display: "inline-flex", alignItems: "center", gap: 7, fontSize: 12.5, color: scopeTone.text } },
+              h("i", { "aria-hidden": true, style: { width: 7, height: 7, borderRadius: "50%", background: scopeTone.dot } }),
+              scopeView.text
+            ),
+            scopeView.retry && !scope.loading
+              ? h("button", {
+                type: "button",
+                onClick: function () { setToken(token + 1); },
+                style: Object.assign({}, btnBase, { fontSize: 11.5, padding: "4px 9px" }),
+              }, "重新读取")
+              : null
+          )
+        ),
+
         h("div", { style: { padding: "12px 0", borderBottom: "1px solid " + C.line } },
           h("div", null,
             h("div", { style: labelStyle }, "压缩显示方式", h("span", { style: newBadgeStyle }, "新")),
@@ -881,8 +1028,8 @@ window.__ModuleLoader__.load({
           h("ol", { style: { margin: 0, paddingLeft: 18, color: C.muted, fontSize: 12.5, lineHeight: 1.85 } },
             h("li", null, "到点后不立即动手，等 agent 结束当前回合。"),
             h("li", null, "用会话自己的前缀（命中缓存）让模型按模板写交接文档，不额外全量 prefill。"),
-            h("li", null, "把整段历史替换成这一条消息；旧消息仍在会话日志里，rewind 可回滚。"),
-            h("li", null, "下一轮只剩 系统提示词 + 工具定义 + 交接文档。")
+            h("li", null, "只替换最旧的这一段历史，换成一条交接文档；最近约 16% 窗口的原文逐字留着，切点也不会把工具调用和它的结果拆开。"),
+            h("li", null, "下一轮 = 系统提示词 + 工具定义 + 这条交接文档 + 那段逐字保留的最近消息；旧消息仍在会话日志里，rewind 可回滚。")
           ),
           h("div", { style: { marginTop: 8, fontSize: 11.5, color: C.faint } }, "手动压缩：会话里发送 /compact 可随时折叠一次，不受这个比例限制。")
         ),

package/lib/index.js

@@ -143,9 +143,9 @@ function scopeScriptPath() {
   }
 }
 
-function execSwitchOnce(command, env, script) {
+function execSwitchOnce(command, env, script, action) {
   return new Promise((resolve, reject) => {
-    execFile(command, [script, "enable"], { timeout: 6000, windowsHide: true, env }, (error, stdout, stderr) => {
+    execFile(command, [script, action], { timeout: 6000, windowsHide: true, env }, (error, stdout, stderr) => {
       if (error) {
         error.stdout = stdout;
         error.stderr = stderr;
@@ -158,15 +158,14 @@ function execSwitchOnce(command, env, script) {
 }
 
 /**
- * Apply the current settings sidecar to the preset/profile YAML. `node` is the
- * normal path; the Electron binary with ELECTRON_RUN_AS_NODE is the fallback
- * when the host has no node on PATH.
+ * Run one preset-scope action. `node` is the normal path; the Electron binary
+ * with ELECTRON_RUN_AS_NODE is the fallback when the host has no node on PATH.
  */
-async function applyScopeSwitch() {
+async function runScope(action) {
   const script = scopeScriptPath();
   if (!existsSync(script)) {
     const message = "preset-scope.mjs not found: " + script;
-    trace("scope switch failed: " + message);
+    trace("scope " + action + " failed: " + message);
     return { ok: false, message };
   }
   const explicit = process.env.DSH_NODE;
@@ -179,10 +178,11 @@ async function applyScopeSwitch() {
   let lastError;
   for (const attempt of attempts) {
     try {
-      const result = await execSwitchOnce(attempt.command, attempt.env, script);
-      const output = `${result.stdout ?? ""}${result.stderr ?? ""}`.trim();
-      trace("scope switch ok" + (output ? " | " + output : ""));
-      return { ok: true, output };
+      const result = await execSwitchOnce(attempt.command, attempt.env, script, action);
+      const output = `${result.stdout ?? ""}`.trim();
+      const noise = `${result.stderr ?? ""}`.trim();
+      trace("scope " + action + " ok" + (output ? " | " + output : "") + (noise ? " | " + noise : ""));
+      return { ok: true, output, noise };
     } catch (error) {
       lastError = error;
       if (error?.code !== "ENOENT") break;
@@ -190,10 +190,34 @@ async function applyScopeSwitch() {
   }
   const output = `${lastError?.stdout ?? ""}${lastError?.stderr ?? ""}`.trim();
   const message = (lastError?.message ?? String(lastError)) + (output ? "\n" + output : "");
-  trace("scope switch failed: " + message);
+  trace("scope " + action + " failed: " + message);
   return { ok: false, message };
 }
 
+/** Who actually compacts right now, straight from the preset YAML on disk. */
+async function readScopeState() {
+  const result = await runScope("state");
+  if (!result.ok) return { ok: false, message: result.message };
+  const line = String(result.output ?? "").split(/\r?\n/).filter(Boolean).pop() ?? "";
+  try {
+    return { ok: true, value: JSON.parse(line) };
+  } catch (error) {
+    const message = "unreadable scope state: " + (error instanceof Error ? error.message : String(error));
+    trace("scope state failed: " + message + " | " + line.slice(0, 200));
+    return { ok: false, message };
+  }
+}
+
+/**
+ * Apply the current settings sidecar to the preset/profile YAML.
+ */
+async function applyScopeSwitch() {
+  const result = await runScope("enable");
+  return result.ok
+    ? { ok: true, output: result.output }
+    : { ok: false, message: result.message };
+}
+
 const CHANNEL = "/dsh-auto-compaction";
 
 function readSettings() {
@@ -265,6 +289,12 @@ export function apply(ctx, config = {}) {
             }
             return { ok: true, value: { ...next, switchApplied: true, defaultTemplate: TEMPLATE_FILE } };
           }
+          if (endpoint === "scope") {
+            const state = await readScopeState();
+            return state.ok
+              ? { ok: true, value: state.value }
+              : { ok: false, error: { code: "auto-compaction/scope-unknown", message: state.message } };
+          }
           if (endpoint === "open") {
             trace("open " + JSON.stringify(payload));
             return await handleOpen(ctx, String(payload?.kind ?? "file") + ":" + Date.now(), String(payload?.path ?? "") || TEMPLATE_FILE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-auto-compaction",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -51,6 +51,6 @@
     "access": "public"
   },
   "dependencies": {
-    "dsh-auto-compaction-engine": "^0.2.1"
+    "dsh-auto-compaction-engine": "^0.2.2"
   }
 }