@logictan/dsh-easyrewrite 2.7.0 → 2.7.2

package/lib/client.js

@@ -10,6 +10,7 @@ window.__ModuleLoader__.load({
   factory: function (require) {
     var React = require("react");
     var Primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+    var UI = require("@logictan/dsh-plugins-shared-client");
 
     /**
      * 取第一个可用的图标导出。
@@ -1592,7 +1593,7 @@ window.__ModuleLoader__.load({
         errNoBoundary: "该消息之前没有可截断的闭合回合边界（截断/首条消息无法撤回或编辑）",
         errTurnOpen: "该消息所在回合尚未结束，请等待回复完成后再操作",
         errGeneric: "操作失败，请重试",
-        resetNotice: "对话处于半截状态，已重置——正在回到上一次模型回复处（或空白新对话）",
+        resetNotice: "该消息之前没有可保留的历史，已重置——修改后的内容将作为新对话的第一条发出",
         turnOpenNotice: "回复仍在生成中，请等待回复完成后再撤回。",
         sectionUpdate: "更新",
         currentVersion: "当前版本",
@@ -1685,7 +1686,7 @@ window.__ModuleLoader__.load({
         errNoBoundary: "No truncation boundary before this message (first/truncated message cannot be recalled or edited)",
         errTurnOpen: "This message's turn is still running; wait for the reply to finish",
         errGeneric: "Operation failed, please retry",
-        resetNotice: "The conversation was in a truncated state and has been reset — returning to the last model reply (or a blank conversation)",
+        resetNotice: "There is no earlier history to keep, so the conversation was reset — your edit will be sent as the first message of a new conversation",
         turnOpenNotice: "A reply is still being generated. Please wait for it to finish before recalling.",
         sectionUpdate: "Update",
         currentVersion: "Current version",
@@ -1778,7 +1779,7 @@ window.__ModuleLoader__.load({
         errNoBoundary: "このメッセージの前に切り詰め境界がありません（切り詰め後・最初のメッセージは撤回/編集できません）",
         errTurnOpen: "このメッセージのターンはまだ終了していません。返信完了後にお試しください",
         errGeneric: "操作に失敗しました。もう一度お試しください",
-        resetNotice: "会話が途中で切れた状態のためリセットしました——最後のモデル返信（または空白の会話）に戻ります",
+        resetNotice: "このメッセージより前の履歴がないためリセットしました——編集内容は新しい会話の最初のメッセージとして送信されます",
         turnOpenNotice: "返信がまだ生成中です。返信が完了してから取り消してください",
         sectionUpdate: "更新",
         currentVersion: "現在のバージョン",
@@ -1851,19 +1852,7 @@ window.__ModuleLoader__.load({
     /** 设置卡片：注册进 plugins.row.config（设置 → 插件 → 插件配置）。
      *  插件页对每个配置项渲染两次：view==='summary' 取行标题下的一行摘要，view==='page' 取完整表单。 */
     function EasyRewriteSettingsCard(props) {
-      /**
-       * 是否由外部容器提供卡片外壳。
-       *
-       * 0.1.7 的插件页（plugins.item）自己画行外壳、标题取自插槽 label，卡片再画一层头部
-       * 就成了嵌套折叠；旧插槽 settings.plugin.item 没有外壳，卡片必须自画。由挂载方经
-       * inject 面传入，默认 false，保持旧行为。
-       */
-      var embedded = !!(props && props.embedded);
       var L = useUILocaleDict();
-      // embedded 时头部不渲染，但「展开时检查更新」这类 side effect 仍要照跑，故初始即展开。
-      var openState = React.useState(embedded);
-      var open = openState[0];
-      var setOpen = openState[1];
       // 控件状态（初始化自 localStorage）
       var sRewrite = React.useState(rewriteOnClick());
       var rewrite = sRewrite[0];
@@ -1948,10 +1937,10 @@ window.__ModuleLoader__.load({
           }
         }).catch(function () { setUpdateUpdating(false); setUpdateMsg(L.updateFailed); });
       }
-      // 展开折叠时无感触发一次检查（5 分钟节流，防频繁展开刷请求）；
-      // 每日检查开关开启时，即使不展开也会按天自动检测
+      // 卡片加载时无感触发一次检查（5 分钟节流，防频繁刷新刷请求）；
+      // 每日检查开关开启时，即使不打开也会按天自动检测
       React.useEffect(function () {
-        if (!open) return;
+        if (props && props.view === "summary") return;
         var now = Date.now();
         var lastCheck = 0;
         try { lastCheck = parseInt(localStorage.getItem("dsh-easyrewrite:lastUpdateCheckTs") || "0", 10) || 0; } catch (e) { /* ignore */ }
@@ -1959,7 +1948,7 @@ window.__ModuleLoader__.load({
         try { localStorage.setItem("dsh-easyrewrite:lastUpdateCheckTs", String(now)); } catch (e) { /* ignore */ }
         if (!updateVer) setUpdateVer("…");
         doCheckUpdate();
-      }, [open]);
+      }, [props && props.view]);
       // 每日检测：开关开启时每天首次触发一次（不依赖展开）
       React.useEffect(function () {
         var autoOn = getBool("dsh-easyrewrite:autoCheckUpdate", false);
@@ -2025,417 +2014,331 @@ window.__ModuleLoader__.load({
       var origImg = sOrigImg[0];
       var setOrigImg = sOrigImg[1];
 
-      // 官方 PluginCard 同款：卡片/展开态/头部/标题/描述/箭头/内容区
-      var cardStyle = {
-        border: "1px solid var(--dsw-alias-border-l2)",
-        background: "var(--dsw-alias-bg-layer-3)",
-        borderRadius: "12px",
-        listStyle: "none",
-        transition: "border-color .16s, background .16s"
-      };
-      var cardOpenStyle = { background: "var(--dsw-alias-bg-layer-2)", borderColor: "var(--dsw-alias-label-dimmed)" };
-      var headStyle = {
-        appearance: "none",
-        width: "100%",
-        font: "inherit",
-        color: "inherit",
-        textAlign: "left",
-        cursor: "pointer",
-        background: "transparent",
-        border: "none",
-        borderRadius: "12px",
-        display: "flex",
-        alignItems: "center",
-        gap: "12px",
-        padding: "14px 16px"
-      };
-      var headTextStyle = { display: "flex", flexDirection: "column", flex: "1", minWidth: "0", gap: "4px" };
-      var titleStyle = { color: "var(--dsw-alias-label-primary)", fontSize: "15px", fontWeight: 600, lineHeight: "1.4" };
-      var subStyle = { color: "var(--dsw-alias-label-tertiary)", fontSize: "13px", lineHeight: "1.5" };
-      var chevronStyle = { color: "var(--dsw-alias-label-tertiary)", flex: "none", transition: "transform .16s", transform: "rotate(90deg)" };
-      var chevronOpenStyle = { transform: "rotate(270deg)" };
-      var bodyStyle = {
-        borderTop: "1px solid var(--dsw-alias-border-l2)",
-        margin: "0 16px",
-        paddingTop: "14px",
-        paddingBottom: "8px",
-        display: "flex",
-        flexDirection: "column",
-        gap: "16px"
-      };
-      // 大项分组：组内 10px，组间 16px（bodyStyle gap）；每级缩进 4 空格（16px）
-      var sectionStyle = { display: "flex", flexDirection: "column", gap: "10px", paddingLeft: "16px" };
-      var groupTitleStyle = {
-        fontSize: "14px",
-        fontWeight: 600,
-        color: "var(--dsw-alias-label-primary)",
-        letterSpacing: "0.02em",
-        lineHeight: "1.6"
-      };
-      var rowStyle = { display: "flex", alignItems: "center", justifyContent: "space-between", gap: "12px", paddingLeft: "16px" };
-      var labelStyle = { fontSize: "13px", color: "var(--dsw-alias-label-primary)" };
-      var hintStyle = { fontSize: "11px", color: "var(--dsw-alias-label-tertiary)" };
-      var groupStyle = { display: "flex", flexDirection: "column", gap: "6px", paddingLeft: "16px" };
-      var inputStyle = {
-        width: "90px",
-        border: "1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.3))",
-        borderRadius: "8px",
-        padding: "4px 8px",
-        fontSize: "13px",
-        background: "var(--dsw-alias-bg-base)",
-        color: "var(--dsw-alias-label-primary)"
-      };
-      var disabledInputStyle = Object.assign({}, inputStyle, { opacity: 0.45, cursor: "not-allowed" });
-      function switchRow(label, value, onChange, extraHint, disabled) {
-        // 圆形勾选框：选中 = 白底黑勾（与确认胶囊同设计语言）；未选中 = 灰色圆环
-        var checkSize = 20;
-        var checkStyle = {
-          width: checkSize,
-          height: checkSize,
-          borderRadius: "50%",
-          border: "2px solid " + (value ? "#ffffff" : "var(--dsw-alias-border-l2, rgba(128,128,128,0.45))"),
-          background: value ? "#ffffff" : "transparent",
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          color: value ? "#000000" : "transparent",
-          fontSize: "13px",
-          lineHeight: "13px",
-          cursor: "pointer",
-          flex: "none",
-          margin: "0 2px",
-          transition: "border-color .15s, background .15s, color .15s",
-          userSelect: "none",
-          boxSizing: "border-box"
-        };
-        return React.createElement("div", {
-          style: Object.assign({}, rowStyle, disabled ? { opacity: 0.45, cursor: "not-allowed" } : null),
-          "data-dsh-easyrewrite": "switch-row",
-          title: disabled ? (extraHint || "") : undefined
-        },
-          React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: "2px", flex: "1", minWidth: "0" } },
-            React.createElement("span", { style: labelStyle }, label),
-            extraHint ? React.createElement("span", { style: hintStyle }, extraHint) : null
-          ),
-          React.createElement("div", {
-            role: "checkbox",
-            "aria-checked": !!value,
-            "aria-disabled": disabled || undefined,
-            style: Object.assign({}, checkStyle, disabled ? { cursor: "not-allowed" } : null),
-            onClick: function (e) { e.stopPropagation(); if (disabled) return; onChange(!value); }
-          }, value ? React.createElement(IconCheckOutline, null) : null)
+      if (props && props.view === "summary") return L.subtitle;
+
+      function sectionHead(title) {
+        return React.createElement(
+          "div",
+          { key: "head-" + title, className: "dsp-card-title", style: { fontSize: "14px", fontWeight: 600, marginTop: "8px" } },
+          title,
         );
       }
-      // Apple 风格分段控件：灰色药丸长条 + 白色小药丸高亮当前项（滑动过渡，主题自适应）
-      function segmentedGroup(options, value, onChange) {
-        var n = options.length;
-        var idx = 0;
-        for (var i = 0; i < n; i++) { if (options[i][0] === value) { idx = i; break; } }
-        var segStyle = {
-          position: "relative",
-          display: "flex",
-          background: "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.1))",
-          borderRadius: "999px",
-          padding: "2px"
-        };
-        var thumbStyle = {
-          position: "absolute",
-          top: "2px",
-          left: "calc(" + idx + " * (100% - 4px) / " + n + ")",
-          width: "calc((100% - 4px) / " + n + ")",
-          height: "calc(100% - 4px)",
-          background: "var(--dsw-alias-bg-layer-3, #ffffff)",
-          borderRadius: "999px",
-          boxShadow: "0 1px 2px rgba(0, 0, 0, 0.12)",
-          transition: "left .18s ease",
-          zIndex: 1
-        };
-        return React.createElement("div", { style: segStyle, role: "radiogroup" },
-          React.createElement("div", { style: thumbStyle, "data-dsh-easyrewrite": "seg-thumb" }),
-          options.map(function (opt) {
-            var sel = value === opt[0];
-            return React.createElement("div", {
-              key: opt[0],
-              role: "radio",
-              "aria-checked": sel,
-              style: {
-                position: "relative",
-                zIndex: 2,
-                flex: "1",
-                padding: "3px 10px",
-                textAlign: "center",
-                fontSize: "13px",
-                lineHeight: "20px",
-                cursor: "pointer",
-                borderRadius: "999px",
-                color: sel ? "var(--dsw-alias-label-primary)" : "var(--dsw-alias-label-secondary)",
-                transition: "color .15s",
-                whiteSpace: "nowrap",
-                userSelect: "none"
-              },
-              onClick: function () { onChange(opt[0]); }
-            }, opt[1]);
-          })
+
+      function sectionDivider(key) {
+        return React.createElement("hr", {
+          key: key,
+          style: { border: "none", borderTop: "1px solid var(--dsw-alias-border-l2)", margin: "8px 0" },
+        });
+      }
+
+      function renderSwitch(label, value, onChange, extraHint, disabled) {
+        return React.createElement(
+          UI.Field,
+          {
+            key: label,
+            inline: true,
+            label: label,
+            hint: extraHint || undefined,
+          },
+          React.createElement(UI.Switch, {
+            checked: !!value,
+            disabled: !!disabled,
+            label: label,
+            onCheckedChange: onChange,
+          }),
         );
       }
 
-      // 配置主体：两种挂法共用。
-      //
-      // 0.1.7 起卡片挂进 plugins.item，页面已经给了行外壳（标题来自插槽 label、描述、
-      // 展开由页面管），卡片只该交出主体。自带 <li> + 可点头部会变成页面里多出来的一层
-      // 折叠 —— 列表上一个下拉，点进去还有一个。旧插槽 settings.plugin.item 没有外壳，
-      // 那种挂法仍旧要卡片自画，所以分流在函数末尾按 embedded 做。
-      var cardBody = React.createElement("div", { style: bodyStyle },
-          // —— 编辑 ——
-          React.createElement("div", { style: sectionStyle },
-            React.createElement("span", { style: groupTitleStyle }, L.sectionEdit),
-            switchRow(L.rewrite, rewrite, function (v) { setRewrite(v); setBool("dsh-easyrewrite:rewriteOnClick", v); }),
-            switchRow(L.editOffShowRecall, showRecall, function (v) {
-              setShowRecall(v); setBool("dsh-easyrewrite:editOffShowRecall", v);
-            }, rewrite ? L.lockedHint : null, rewrite),
-            // 编辑宽度：三固定 + 自定义（固定时输入框禁用置灰）
-            React.createElement("div", { style: groupStyle },
-              React.createElement("span", { style: labelStyle }, L.editWidth),
-              segmentedGroup([["compact", L.wCompact], ["standard", L.wStandard], ["extended", L.wExtended], ["custom", L.wCustom]], widthMode, function (v) { setWidthMode(v); setSetting("dsh-easyrewrite:editWidth", v); }),
-              React.createElement("div", { style: rowStyle },
-                React.createElement("span", { style: labelStyle }, L.customWidth),
-                React.createElement("input", {
-                  type: "number",
-                  min: 100,
-                  max: 1200,
-                  style: widthMode === "custom" ? inputStyle : disabledInputStyle,
-                  disabled: widthMode !== "custom",
-                  placeholder: L.placeholderCustom,
-                  value: customW,
-                  onChange: function (e) {
-                    setCustomW(e.target.value);
-                    setSetting("dsh-easyrewrite:editWidthCustom", e.target.value);
-                  }
-                })
-              )
-            )
+      var children = [
+        // —— 编辑 ——
+        sectionHead(L.sectionEdit),
+        renderSwitch(L.rewrite, rewrite, function (v) { setRewrite(v); setBool("dsh-easyrewrite:rewriteOnClick", v); }),
+        renderSwitch(L.editOffShowRecall, showRecall, function (v) {
+          setShowRecall(v); setBool("dsh-easyrewrite:editOffShowRecall", v);
+        }, rewrite ? L.lockedHint : null, rewrite),
+        React.createElement(
+          UI.Field,
+          {
+            key: "edit-width",
+            label: L.editWidth,
+          },
+          React.createElement(UI.Segmented, {
+            label: L.editWidth,
+            value: widthMode,
+            options: [
+              { value: "compact", label: L.wCompact },
+              { value: "standard", label: L.wStandard },
+              { value: "extended", label: L.wExtended },
+              { value: "custom", label: L.wCustom },
+            ],
+            onChange: function (v) { setWidthMode(v); setSetting("dsh-easyrewrite:editWidth", v); },
+          }),
+        ),
+        React.createElement(
+          UI.Field,
+          {
+            key: "custom-width",
+            inline: true,
+            label: L.customWidth,
+          },
+          React.createElement(UI.NumberField, {
+            min: 100,
+            max: 1200,
+            disabled: widthMode !== "custom",
+            placeholder: L.placeholderCustom,
+            value: customW,
+            onValueChange: function (v) {
+              setCustomW(v);
+              setSetting("dsh-easyrewrite:editWidthCustom", v);
+            },
+          }),
+        ),
+
+        sectionDivider("div-recall"),
+
+        // —— 撤回 ——
+        sectionHead(L.sectionRecall),
+        renderSwitch(L.recallConfirm, confirmCapsule, function (v) { setConfirmCapsule(v); setBool("dsh-easyrewrite:recallConfirm", v); }),
+        renderSwitch(L.showOriginalImages, origImg, function (v) { setOrigImg(v); setBool("dsh-easyrewrite:showOriginalImages", v); }),
+        React.createElement(
+          UI.Field,
+          {
+            key: "visual-mode",
+            label: L.visualMode,
+          },
+          React.createElement(UI.Segmented, {
+            label: L.visualMode,
+            value: visual,
+            options: [
+              { value: "simple", label: L.visualSimple },
+              { value: "minimal", label: L.visualMinimal },
+              { value: "info", label: L.visualInfo },
+            ],
+            onChange: function (v) { setVisual(v); setSetting("dsh-easyrewrite:visualMode", v); },
+          }),
+        ),
+        renderSwitch(L.statOnlyUser, statOnly, function (v) { setStatOnly(v); setBool("dsh-easyrewrite:statOnlyUser", v); }),
+        renderSwitch(L.hotkeyEnable, hotkeyOn, function (v) {
+          setHotkeyOn(v);
+          setHotkeyEnabledSetting(v);
+          if (!v) setRecording(false);
+        }, L.hotkeyHint),
+        React.createElement(
+          UI.Field,
+          {
+            key: "hotkey-field",
+            inline: true,
+            label: L.hotkey + "：" + (hotkey ? formatHotkey(hotkey) : L.hotkeyNone),
+            hint: recording ? L.hotkeyRecording : (hotkey ? undefined : L.hotkeyHint),
+            error: hotkeyInvalid ? L.hotkeyInvalid : undefined,
+          },
+          React.createElement(
+            UI.Button,
+            {
+              variant: "secondary",
+              size: "sm",
+              disabled: !hotkeyOn,
+              onClick: function () { setHotkeyInvalid(false); setRecording(!recording); },
+            },
+            recording ? L.hotkeyRecording : L.hotkeyRecord,
           ),
-          // —— 撤回 ——
-          React.createElement("div", { style: sectionStyle },
-            React.createElement("span", { style: groupTitleStyle }, L.sectionRecall),
-            switchRow(L.recallConfirm, confirmCapsule, function (v) { setConfirmCapsule(v); setBool("dsh-easyrewrite:recallConfirm", v); }),
-            switchRow(L.showOriginalImages, origImg, function (v) { setOrigImg(v); setBool("dsh-easyrewrite:showOriginalImages", v); }),
-            // 视觉模式
-            React.createElement("div", { style: groupStyle },
-              React.createElement("span", { style: labelStyle }, L.visualMode),
-              segmentedGroup([["simple", L.visualSimple], ["minimal", L.visualMinimal], ["info", L.visualInfo]], visual, function (v) { setVisual(v); setSetting("dsh-easyrewrite:visualMode", v); })
-            ),
-            switchRow(L.statOnlyUser, statOnly, function (v) { setStatOnly(v); setBool("dsh-easyrewrite:statOnlyUser", v); }),
-            // 撤回快捷键：总开关（Beta，默认关——避免与其他插件快捷键打架）
-            switchRow(L.hotkeyEnable, hotkeyOn, function (v) {
-              setHotkeyOn(v);
-              setHotkeyEnabledSetting(v);
-              if (!v) setRecording(false);
-            }, L.hotkeyHint),
-            // 键位行：始终显示；总开关关闭时录制按钮禁用置灰
-            React.createElement("div", { style: rowStyle },
-              React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: "2px" } },
-                React.createElement("span", { style: labelStyle }, L.hotkey + "：" + (hotkey ? formatHotkey(hotkey) : L.hotkeyNone)),
-                React.createElement("span", { style: hintStyle }, recording ? L.hotkeyRecording : (hotkey ? null : L.hotkeyHint)),
-                hotkeyInvalid ? React.createElement("span", { style: { fontSize: "11px", color: "var(--dsw-alias-label-error, #d9534f)" } }, L.hotkeyInvalid) : null
+        ),
+
+        sectionDivider("div-composer"),
+
+        // —— 回填 ——
+        sectionHead(L.sectionComposer),
+        React.createElement(
+          UI.Field,
+          {
+            key: "conflict-mode",
+            label: L.conflictMode,
+            hint: conflict === "merge" ? L.conflictMerge : L.conflictOverwrite,
+          },
+          React.createElement(UI.Segmented, {
+            label: L.conflictMode,
+            value: conflict,
+            options: [
+              { value: "overwrite", label: L.conflictOverwriteShort },
+              { value: "merge", label: L.conflictMergeShort },
+            ],
+            onChange: function (v) { setConflict(v); setSetting("dsh-easyrewrite:conflictMode", v); },
+          }),
+        ),
+
+        sectionDivider("div-versions"),
+
+        // —— 版本 ——
+        sectionHead(L.sectionVersions),
+        React.createElement(
+          "div",
+          { key: "versions-group", style: { display: "flex", flexDirection: "column", gap: "6px" } },
+          (function () {
+            var families = listVersionFamilies(props.ctxSessions);
+            if (families.length === 0) return React.createElement("span", { className: "dsp-field-hint" }, L.versionFamilyNone);
+            var snap = null;
+            try { snap = props.ctxSessions.list.getSnapshot(); } catch (e) { /* ignore */ }
+            var metaOf = function (vid) { return (snap && snap.byId && snap.byId[vid]) || {}; };
+            var famName = function (fam) {
+              var best = null, bt = -1;
+              fam.versions.forEach(function (vid) {
+                var m = metaOf(vid); var tt = m.updatedAt || 0;
+                if (tt >= bt) { bt = tt; best = m.title || null; }
+              });
+              return best || (fam.versions.length + " " + L.versionCount);
+            };
+            var fmtStamp = function (tsv) {
+              if (!tsv) return "—";
+              var dd = new Date(tsv);
+              var p2 = function (x) { return (x < 10 ? "0" : "") + x; };
+              return dd.getFullYear() + "-" + p2(dd.getMonth() + 1) + "-" + p2(dd.getDate()) + " " + p2(dd.getHours()) + ":" + p2(dd.getMinutes());
+            };
+            var chev = function (openState) {
+              return React.createElement("svg", {
+                width: "16", height: "16", viewBox: "0 0 24 24",
+                style: { flex: "none", display: "block", color: "var(--dsw-alias-label-tertiary)", transform: openState ? "rotate(90deg)" : "rotate(0deg)", transition: "transform .12s" }
+              }, React.createElement("path", { d: "M9 6l6 6-6 6", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }));
+            };
+            var rowHead = { display: "flex", alignItems: "center", gap: "8px", padding: "4px 8px", borderRadius: "6px" };
+            var hdrRow = { display: "flex", alignItems: "center", gap: "6px", cursor: "pointer", padding: "4px 0" };
+            return React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: "4px" } },
+              React.createElement("div", { style: hdrRow, onClick: function () { setHistOpen(!histOpen); } },
+                chev(histOpen),
+                React.createElement("span", { style: { fontSize: "13px", color: "var(--dsw-alias-label-secondary)" } }, L.versionHistory),
+                React.createElement("span", { style: { marginLeft: "auto" } }, React.createElement(UI.Tag, { mono: true }, families.length + ""))
               ),
-              React.createElement("button", {
-                type: "button",
-                disabled: !hotkeyOn,
-                style: {
-                  appearance: "none",
-                  border: "1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.3))",
-                  background: "transparent",
-                  color: "var(--dsw-alias-label-secondary)",
-                  borderRadius: "6px",
-                  padding: "3px 10px",
-                  fontSize: "12px",
-                  cursor: hotkeyOn ? "pointer" : "not-allowed",
-                  fontFamily: "inherit",
-                  flex: "none",
-                  opacity: hotkeyOn ? 1 : 0.45
-                },
-                onClick: function () { setHotkeyInvalid(false); setRecording(!recording); }
-              }, recording ? L.hotkeyRecording : L.hotkeyRecord)
-            )
-          ),
-          // —— 回填 ——
-          React.createElement("div", { style: sectionStyle },
-            React.createElement("span", { style: groupTitleStyle }, L.sectionComposer),
-            // 回填冲突模式
-            React.createElement("div", { style: groupStyle },
-              React.createElement("span", { style: labelStyle }, L.conflictMode),
-              segmentedGroup([["overwrite", L.conflictOverwriteShort], ["merge", L.conflictMergeShort]], conflict, function (v) { setConflict(v); setSetting("dsh-easyrewrite:conflictMode", v); }),
-              React.createElement("span", { style: hintStyle }, conflict === "merge" ? L.conflictMerge : L.conflictOverwrite)
-            )
-          ),
-          // —— 版本 ——
-          React.createElement("div", { style: sectionStyle },
-            React.createElement("span", { style: groupTitleStyle }, L.sectionVersions),
-            // 版本历史（三层折叠）：总开关默认收起 → 按对话名的家族折叠项 → 条目显最后对话时间
-            // （官方无归档恢复入口，此处保留恢复并打开；review #6 后家族来自官方 lineage）
-            React.createElement("div", { style: groupStyle },
-              (function () {
-                var families = listVersionFamilies(props.ctxSessions);
-                if (families.length === 0) return React.createElement("span", { style: hintStyle }, L.versionFamilyNone);
-                var snap = null;
-                try { snap = props.ctxSessions.list.getSnapshot(); } catch (e) { /* ignore */ }
-                var metaOf = function (vid) { return (snap && snap.byId && snap.byId[vid]) || {}; };
-                var famName = function (fam) {
-                  var best = null, bt = -1;
-                  fam.versions.forEach(function (vid) {
-                    var m = metaOf(vid); var tt = m.updatedAt || 0;
-                    if (tt >= bt) { bt = tt; best = m.title || null; }
-                  });
-                  return best || (fam.versions.length + " " + L.versionCount);
-                };
-                var fmtStamp = function (tsv) {
-                  if (!tsv) return "—";
-                  var dd = new Date(tsv);
-                  var p2 = function (x) { return (x < 10 ? "0" : "") + x; };
-                  return dd.getFullYear() + "-" + p2(dd.getMonth() + 1) + "-" + p2(dd.getDate()) + " " + p2(dd.getHours()) + ":" + p2(dd.getMinutes());
-                };
-                // 折叠箭头：SVG 描边（官方图标同风格），像素级对齐、无字距
-                var chev = function (openState) {
-                  return React.createElement("svg", {
-                    width: "18", height: "18", viewBox: "0 0 24 24",
-                    style: { flex: "none", display: "block", color: "var(--dsw-alias-label-tertiary)", transform: openState ? "rotate(90deg)" : "rotate(0deg)", transition: "transform .12s" }
-                  }, React.createElement("path", { d: "M9 6l6 6-6 6", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }));
-                };
-                var rowHead = { display: "flex", alignItems: "center", gap: "6px", padding: "5px 4px", cursor: "pointer", borderRadius: "6px" };
-                var hdrRow = { display: "flex", alignItems: "center", cursor: "pointer" }; // 无 gap：SVG 箭头紧贴文字
-                // 层1：版本历史总折叠（默认收起）
-                return React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: "2px" } },
-                  React.createElement("div", { style: hdrRow, onClick: function () { setHistOpen(!histOpen); } },
-                    chev(histOpen),
-                    React.createElement("span", { style: { fontSize: "12px", color: "var(--dsw-alias-label-secondary)" } }, L.versionHistory),
-                    React.createElement("span", { style: { fontSize: "11px", color: "var(--dsw-alias-label-tertiary)", marginLeft: "auto" } }, families.length + "")
+              histOpen ? families.map(function (fam) {
+                var famOpen = !!famOpenMap[fam.rootId];
+                return React.createElement("div", { key: fam.rootId, style: { display: "flex", flexDirection: "column", gap: "2px", padding: "2px 0 2px 14px", borderTop: "1px solid var(--dsw-alias-border-l2)" } },
+                  React.createElement("div", { style: hdrRow, onClick: function () { var nm = {}; for (var ok2 in famOpenMap) nm[ok2] = famOpenMap[ok2]; nm[fam.rootId] = !famOpen; setFamOpenMap(nm); } },
+                    chev(famOpen),
+                    React.createElement("span", { style: { fontSize: "13px", color: "var(--dsw-alias-label-primary)", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: "1" } }, famName(fam)),
+                    React.createElement("span", { style: { marginLeft: "auto" } }, React.createElement(UI.Tag, null, fam.versions.length + " " + L.versionCount))
                   ),
-                  histOpen ? families.map(function (fam) {
-                    var open = !!famOpenMap[fam.rootId];
-                    return React.createElement("div", { key: fam.rootId, style: { display: "flex", flexDirection: "column", gap: "2px", padding: "2px 0 2px 12px", borderTop: "1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.14))" } },
-                      React.createElement("div", { style: hdrRow, onClick: function () { var nm = {}; for (var ok2 in famOpenMap) nm[ok2] = famOpenMap[ok2]; nm[fam.rootId] = !open; setFamOpenMap(nm); } },
-                        chev(open),
-                        React.createElement("span", { style: { fontSize: "12px", color: "var(--dsw-alias-label-primary)", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: "1" } }, famName(fam)),
-                        React.createElement("span", { style: { fontSize: "11px", color: "var(--dsw-alias-label-tertiary)", flex: "none", marginLeft: "auto" } }, fam.versions.length + " " + L.versionCount)
-                      ),
-                      open ? fam.versions.map(function (vid, vi) {
-                        return React.createElement("div", { key: vid, style: rowHead },
-                          React.createElement("span", { style: { fontSize: "11px", color: "var(--dsw-alias-label-tertiary)", fontVariantNumeric: "tabular-nums", flex: "none", width: "26px" } }, "v" + (vi + 1)),
-                          React.createElement("span", { style: { fontSize: "11px", color: "var(--dsw-alias-label-tertiary)", fontVariantNumeric: "tabular-nums", flex: "1" } }, fmtStamp(metaOf(vid).updatedAt)),
-                          React.createElement("button", {
-                            type: "button",
-                            style: { appearance: "none", border: "1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.3))", background: "transparent", color: "var(--dsw-alias-label-secondary)", borderRadius: "6px", padding: "2px 8px", fontSize: "12px", cursor: "pointer", fontFamily: "inherit", flex: "none" },
-                            onClick: function (ev) {
-                              ev.stopPropagation();
-                              fetch("/bubble/unarchive", {
-                                method: "POST",
-                                headers: { "content-type": "application/json" },
-                                body: JSON.stringify({ sessionId: vid }),
-                                keepalive: true
-                              }).then(function () {
-                                if (typeof props.openSession === "function") props.openSession(vid);
-                              }).catch(function () { /* ignore */ });
-                            }
-                          }, L.versionRestoreOpen)
-                        );
-                      }) : null
+                  famOpen ? fam.versions.map(function (vid, vi) {
+                    return React.createElement("div", { key: vid, style: rowHead },
+                      React.createElement("span", { style: { fontSize: "12px", color: "var(--dsw-alias-label-tertiary)", fontVariantNumeric: "tabular-nums", flex: "none", width: "28px" } }, "v" + (vi + 1)),
+                      React.createElement("span", { style: { fontSize: "12px", color: "var(--dsw-alias-label-tertiary)", fontVariantNumeric: "tabular-nums", flex: "1" } }, fmtStamp(metaOf(vid).updatedAt)),
+                      React.createElement(UI.Button, {
+                        variant: "secondary",
+                        size: "sm",
+                        onClick: function (ev) {
+                          ev.stopPropagation();
+                          fetch("/bubble/unarchive", {
+                            method: "POST",
+                            headers: { "content-type": "application/json" },
+                            body: JSON.stringify({ sessionId: vid }),
+                            keepalive: true
+                          }).then(function () {
+                            if (typeof props.openSession === "function") props.openSession(vid);
+                          }).catch(function () { /* ignore */ });
+                        }
+                      }, L.versionRestoreOpen)
                     );
                   }) : null
                 );
-              })()
-            )
+              }) : null
+            );
+          })()
+        ),
+
+        sectionDivider("div-update"),
+
+        // —— 更新 ——
+        sectionHead(L.sectionUpdate),
+        React.createElement(
+          "div",
+          { key: "updates-group", style: { display: "flex", flexDirection: "column", gap: "10px" } },
+          React.createElement(
+            UI.Field,
+            {
+              key: "check-update-field",
+              inline: true,
+              label: L.currentVersion + "：" + (updateVer || "…"),
+              hint: updateMsg || undefined,
+            },
+            React.createElement(UI.Button, {
+              variant: "secondary",
+              size: "sm",
+              loading: updateChecking,
+              onClick: function () { doCheckUpdate(); },
+            }, updateChecking ? L.checking : L.checkUpdate),
           ),
-          // —— 更新 ——
-          React.createElement("div", { style: sectionStyle },
-            React.createElement("span", { style: groupTitleStyle }, L.sectionUpdate),
-            // 更新检查与执行（精简版：手动检查 + 每日检测可选 + 有新版提示）
-            React.createElement("div", { style: groupStyle },
-              React.createElement("span", { style: labelStyle }, L.currentVersion + "：" + (updateVer || "…")),
-              (function () {
-                if (!dshVer) return null;
-                if (cmpDsh(dshVer, MIN_DSH_VERSION) < 0) return React.createElement("div", { key: "dsh-low", style: { display: "flex", flexDirection: "column", gap: "4px", padding: "6px 8px", background: "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.1))", borderRadius: "8px" } },
-                  React.createElement("span", { style: { fontSize: "12px", lineHeight: "18px", color: "var(--dsw-alias-label-primary)" } }, L.dshLowWarning.replace("{cur}", dshVer).replace("{min}", MIN_DSH_VERSION)),
-                  React.createElement("div", { style: { display: "flex", alignItems: "center", gap: "6px" } },
-                    React.createElement("code", { style: { fontSize: "11px", color: "var(--dsw-alias-label-secondary)", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap", flex: "1" } }, "npm install -g @deepseek-ai/dsh@" + MIN_DSH_VERSION),
-                    React.createElement("button", { type: "button", style: { appearance: "none", border: "1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.3))", background: "transparent", color: "var(--dsw-alias-label-secondary)", borderRadius: "6px", padding: "2px 8px", fontSize: "11px", cursor: "pointer", fontFamily: "inherit", flex: "none" }, onClick: function () { try { legacyCopy("npm install -g @deepseek-ai/dsh@" + MIN_DSH_VERSION); } catch (eC1) { /* ignore */ } } }, L.copyUpgradeCmd)
-                  )
-                );
-                if (cmpDsh(MAX_TESTED_DSH_VERSION, dshVer) < 0) return React.createElement("div", { key: "dsh-new", style: { padding: "6px 8px", fontSize: "12px", lineHeight: "18px", color: "var(--dsw-alias-label-secondary)", background: "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.08))", borderRadius: "8px" } }, L.dshNewNotice.replace("{cur}", dshVer));
-                return null;
-              })(),
-              !remindClosed && !getBool("dsh-easyrewrite:autoCheckUpdate", false) ? React.createElement("div", { key: "remind", style: { display: "flex", alignItems: "center", gap: "8px", padding: "6px 8px", background: "rgba(77,107,254,0.08)", borderRadius: "8px" } },
-                React.createElement("span", { style: { fontSize: "12px", lineHeight: "18px", color: "var(--dsw-alias-label-primary)", flex: "1", minWidth: "0" } }, L.suggestAutoCheck),
-                React.createElement("button", { type: "button", style: { appearance: "none", border: "none", background: "var(--dsw-static-deepseek-500, #4d6bfe)", color: "#ffffff", borderRadius: "6px", padding: "3px 10px", fontSize: "12px", cursor: "pointer", fontFamily: "inherit", flex: "none" }, onClick: function () { setBool("dsh-easyrewrite:autoCheckUpdate", true); setBool("dsh-easyrewrite:autoCheckReminded", true); setAutoCheckOn(true); setRemindClosed(true); } }, L.enableNow),
-                React.createElement("button", { type: "button", title: L.remindIgnore, style: { appearance: "none", border: "none", background: "var(--dsw-alias-interactive-bg-hover, rgba(128,128,128,0.16))", color: "var(--dsw-alias-label-secondary)", borderRadius: "6px", padding: "3px 10px", fontSize: "12px", cursor: "pointer", fontFamily: "inherit", flex: "none" }, onClick: function () { setBool("dsh-easyrewrite:autoCheckReminded", true); setRemindClosed(true); } }, L.remindIgnore)
-              ) : null,
-              React.createElement("div", { style: rowStyle },
-                React.createElement("span", { style: hintStyle, flex: "1" }, updateMsg || ""),
-                React.createElement("button", {
-                  type: "button",
-                  style: {
-                    appearance: "none",
-                    border: "1px solid var(--dsw-alias-border-l2, rgba(128,128,128,0.3))",
-                    background: "transparent",
-                    color: "var(--dsw-alias-label-secondary)",
-                    borderRadius: "6px",
-                    padding: "3px 10px",
-                    fontSize: "12px",
-                    cursor: "pointer",
-                    fontFamily: "inherit",
-                    flex: "none"
-                  },
-                  onClick: function () { doCheckUpdate(); }
-                }, updateChecking ? L.checking : L.checkUpdate)
-              ),
-              updateAvailableVer ? React.createElement("div", { style: rowStyle },
-                React.createElement("span", { style: { fontSize: "12px", color: "var(--dsw-alias-brand-primary, #4d6bfe)", flex: "1" } }, L.newVersion.replace("{ver}", updateAvailableVer)),
-                React.createElement("button", {
-                  type: "button",
-                  style: {
-                    appearance: "none",
-                    border: "none",
-                    background: "var(--dsw-static-deepseek-500, #4d6bfe)",
-                    color: "#ffffff",
-                    borderRadius: "6px",
-                    padding: "3px 12px",
-                    fontSize: "12px",
-                    cursor: "pointer",
-                    fontFamily: "inherit",
-                    flex: "none"
-                  },
-                  onClick: function () { doUpdatePlugin(); }
-                }, updateUpdating ? L.updating : L.updateNow)
-              ) : null,
-              switchRow(L.autoCheckUpdate, autoCheckOn, function (v) {
-                setAutoCheckOn(v);
-                setBool("dsh-easyrewrite:autoCheckUpdate", v);
-              })
+          (function () {
+            if (!dshVer) return null;
+            if (cmpDsh(dshVer, MIN_DSH_VERSION) < 0) return React.createElement(
+              UI.Banner,
+              { key: "dsh-low", kind: "warn" },
+              React.createElement("div", { style: { display: "flex", flexDirection: "column", gap: "4px", width: "100%" } },
+                React.createElement("span", null, L.dshLowWarning.replace("{cur}", dshVer).replace("{min}", MIN_DSH_VERSION)),
+                React.createElement("div", { style: { display: "flex", alignItems: "center", gap: "6px" } },
+                  React.createElement("code", { style: { fontSize: "11px", flex: "1", minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } }, "npm install -g @deepseek-ai/dsh@" + MIN_DSH_VERSION),
+                  React.createElement(UI.Button, {
+                    variant: "secondary",
+                    size: "sm",
+                    onClick: function () { try { legacyCopy("npm install -g @deepseek-ai/dsh@" + MIN_DSH_VERSION); } catch (e) {} },
+                  }, L.copyUpgradeCmd)
+                )
+              )
+            );
+            if (cmpDsh(MAX_TESTED_DSH_VERSION, dshVer) < 0) return React.createElement(UI.Banner, { key: "dsh-new", kind: "info" }, L.dshNewNotice.replace("{cur}", dshVer));
+            return null;
+          })(),
+          !remindClosed && !getBool("dsh-easyrewrite:autoCheckUpdate", false) ? React.createElement(
+            UI.Banner,
+            { key: "remind", kind: "info" },
+            React.createElement("div", { style: { display: "flex", alignItems: "center", gap: "8px", width: "100%" } },
+              React.createElement("span", { style: { flex: "1", minWidth: 0 } }, L.suggestAutoCheck),
+              React.createElement(UI.Button, {
+                variant: "primary",
+                size: "sm",
+                onClick: function () {
+                  setBool("dsh-easyrewrite:autoCheckUpdate", true);
+                  setBool("dsh-easyrewrite:autoCheckReminded", true);
+                  setAutoCheckOn(true);
+                  setRemindClosed(true);
+                },
+              }, L.enableNow),
+              React.createElement(UI.Button, {
+                variant: "ghost",
+                size: "sm",
+                title: L.remindIgnore,
+                onClick: function () {
+                  setBool("dsh-easyrewrite:autoCheckReminded", true);
+                  setRemindClosed(true);
+                },
+              }, L.remindIgnore)
             )
-          ),
-          React.createElement("span", { style: hintStyle }, L.instant)
-      );
-      // plugins.item（0.1.7 起）：页面把同一个组件按 view 渲染两次 —— summary 当列表行与
-      // 详情页的一行描述，page 当配置主体。图标、标题（取自插槽 label）、启用开关与详情页
-      // 外壳都由页面提供，所以这里两者都不画头部。
-      if (embedded) return props.view === "summary" ? L.subtitle : cardBody;
-      // settings.plugin.item（0.1.5 及以下）：插槽不提供外壳，卡片自画可点头部。
-      return React.createElement("li", { style: Object.assign({}, cardStyle, open ? cardOpenStyle : null), "data-dsh-easyrewrite": "settings-card" },
-        React.createElement("button", {
-          type: "button",
-          style: headStyle,
-          "aria-expanded": open,
-          "aria-label": (open ? L.collapse : L.expand) + ": " + L.title,
-          onClick: function () { setOpen(!open); }
-        },
-          React.createElement("span", { style: headTextStyle },
-            React.createElement("span", { style: titleStyle }, L.title),
-            React.createElement("span", { style: subStyle }, L.subtitle)
-          ),
-          React.createElement("svg", { width: "18", height: "18", viewBox: "0 0 24 24", style: Object.assign({}, chevronStyle, open ? chevronOpenStyle : null) },
-            React.createElement("path", { d: "M9 6l6 6-6 6", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }))
+          ) : null,
+          updateAvailableVer ? React.createElement(
+            UI.Banner,
+            { key: "update-avail", kind: "ok" },
+            React.createElement("div", { style: { display: "flex", alignItems: "center", gap: "8px", width: "100%" } },
+              React.createElement("span", { style: { flex: "1" } }, L.newVersion.replace("{ver}", updateAvailableVer)),
+              React.createElement(UI.Button, {
+                variant: "primary",
+                size: "sm",
+                loading: updateUpdating,
+                onClick: function () { doUpdatePlugin(); },
+              }, updateUpdating ? L.updating : L.updateNow)
+            )
+          ) : null,
+          renderSwitch(L.autoCheckUpdate, autoCheckOn, function (v) {
+            setAutoCheckOn(v);
+            setBool("dsh-easyrewrite:autoCheckUpdate", v);
+          }),
         ),
-        open ? cardBody : null
+
+        React.createElement("span", { key: "instant-hint", className: "dsp-field-hint" }, L.instant),
+      ];
+
+      return React.createElement(
+        UI.SettingsCard,
+        {
+          title: L.title,
+          description: L.subtitle,
+        },
+        children,
       );
     }
 
@@ -2498,20 +2401,19 @@ window.__ModuleLoader__.load({
     }
 
     /** 极限场景重置（首条消息/截断会话首条，无前置闭合边界，无法 fork）：
-     * - 家族会话（截断/分叉产物，版本 ≥2）：归档当前 → 恢复并打开**父版本**（上一次模型回复处）重新开始；
-     *   编辑模式经 resume 机制把修改文本带到父版本自动重发。
-     * - 全新会话首条（无家族）：归档当前 → 回到空白新对话（官方 project() 检测归档即回 hero）。
+     * 归档当前会话 → 在所属工作区打开空白新会话；编辑模式经 resume 机制把修改后的文本
+     * 作为新会话的**第一条**自动发出（DESIGN §2.3：目标消息之前没有历史，新对话即修改稿本身）。
      * @param mode - "recall" | "edit"
      * @param text - edit 模式的修改后文本
      * @param props - 组件 inject 面
      */
     function resetConversation(sessionId, mode, text, props, imageIds, selOverride, stagedDraft) {
       log("info", "reset", "首条消息重置对话", { sessionId: sessionId, mode: mode });
-      // v2.1.1：目标会话（父版本或空白新会话）发送前需要恢复当前模型/挡位
+      // v2.1.1：新会话发送前需要恢复当前模型/挡位
       // v2.2：气泡编辑 chip 的本地选择优先（selOverride），撤回键路径不传 → 原语义
       var msel = selOverride || (props.modelSel ? props.modelSel.capture(sessionId) : null);
       writePending(sessionId, null);
-      // 1) 归档当前会话（两种场景都需要；project() 检测 current 归档 → 自动回 hero/父版本打开后列表更新）
+      // 1) 归档当前会话（project() 检测 current 归档 → 自动回 hero；新会话随后被打开）
       try {
         var archiver = typeof props.archiveSession === "function"
           ? props.archiveSession
@@ -2524,26 +2426,10 @@ window.__ModuleLoader__.load({
           log("warn", "reset", "归档能力不可用", { sessionId: sessionId });
         }
       } catch (e) { /* ignore */ }
-      // 2) 场景 2：家族父版本（截断/分叉会话 → 回到上一次模型回复）
-      try {
-        var fam = familyOfSession(sessionId, props.ctxSessions);
-        log("info", "reset", "场景2家族判定", { sessionId: sessionId, found: !!fam, verLen: fam ? fam.versions.length : -1, index: fam ? fam.index : -1 });
-        var parentId = fam && fam.versions.length >= 2 && fam.index > 0 ? fam.versions[fam.index - 1] : null;
-        if (parentId) {
-          if (mode === "edit" && typeof text === "string") {
-            try { localStorage.setItem("dsh-easyrewrite:resume-send:" + parentId, JSON.stringify({ draftText: text, t: Date.now(), imageIds: imageIds || [], sel: msel, stagedDraft: stagedDraft || null })); } catch (e) { /* ignore */ }
-          }
-          var doOpenParent = function () {
-            safeOpenSession(parentId, props);
-          };
-          if (typeof props.restoreSession === "function") {
-            try { props.restoreSession(parentId).then(doOpenParent, doOpenParent); return; } catch (e) { /* fallthrough */ }
-          }
-          doOpenParent();
-          return;
-        }
-      } catch (e) { /* ignore */ }
-      // 3) 场景 1：全新会话首条 → 无缝打开空白新会话（编辑模式经 resume 自动发送编辑文本）
+      // 2) 打开空白新会话（编辑模式经 resume 自动发送编辑文本）
+      //    目标消息之前没有任何历史 → 新对话 = 修改后的消息本身（DESIGN §2.3）。
+      //    此前这里先走「家族父版本」分支，把修改后的文本**追加到父版本历史末尾**：
+      //    首条消息的编辑于是变成「整段旧历史 + 修改稿」，与 §2.3 的截断语义相反。
       try {
         var wsId = null;
         if (props.ctxWorkspaces && typeof props.ctxWorkspaces.list === "object" && typeof props.ctxWorkspaces.list.getSnapshot === "function") {
@@ -2557,7 +2443,7 @@ window.__ModuleLoader__.load({
             }
           }
         }
-          log("info", "reset", "场景1工作区定位", { sessionId: sessionId, wsId: wsId, hasConnect: !!(props.ctxWorkspaces && typeof props.ctxWorkspaces.connectWorkspace === "function") });
+          log("info", "reset", "空白新会话：工作区定位", { sessionId: sessionId, wsId: wsId, hasConnect: !!(ctxUiWorkspaceRef && typeof ctxUiWorkspaceRef.connectWorkspace === "function") });
         var wsConnector = (ctxUiWorkspaceRef && typeof ctxUiWorkspaceRef.connectWorkspace === "function") ? ctxUiWorkspaceRef : ((props.ctxWorkspaces && typeof props.ctxWorkspaces.connectWorkspace === "function") ? props.ctxWorkspaces : null);
         if (wsId && wsConnector) {
           wsConnector.connectWorkspace(wsId).then(function (newId) {
@@ -2572,7 +2458,7 @@ window.__ModuleLoader__.load({
         }
       } catch (e) { /* ignore */ }
       // 兜底：归档已生效，官方自动回 hero
-      log("info", "reset", "重置完成（兜底路径）", { sessionId: sessionId, mode: mode });
+      log("warn", "reset", "无可用的空白新会话通道（已归档，回 hero）", { sessionId: sessionId, mode: mode, wsId: wsId });
     }
 
     /** 版本翻页器 < X >：撤回/编辑重发产生的版本家族切换（官方 assistant-actions 操作区）。
@@ -4087,7 +3973,10 @@ window.__ModuleLoader__.load({
         } catch (eDbg) { /* ignore */ }
         try { ctxConversationRef = ctx.conversation; } catch (e) { ctxConversationRef = null; }
         try { ctxUiConversationRef = (typeof ctx.get === "function") ? (ctx.get("uiConversation") || null) : null; } catch (eUic) { ctxUiConversationRef = null; }
-        try { ctxUiWorkspaceRef = ctx.uiWorkspace || ((typeof ctx.get === "function") ? (ctx.get("uiWorkspace") || null) : null); } catch (eUiw) { ctxUiWorkspaceRef = null; }
+        // 注意：uiWorkspace 不在本插件的 inject 清单内，`ctx.uiWorkspace` 抛错（见下方
+        // invokeOpenSession 的 try/catch）；此前把它放在 || 左侧，抛错被 catch 吞掉，导致
+        // ctx.get("uiWorkspace") 永远不可达、ctxUiWorkspaceRef 恒为 null（空白新会话通道自 2.6.0 起失效）。
+        try { ctxUiWorkspaceRef = (typeof ctx.get === "function") ? (ctx.get("uiWorkspace") || null) : null; } catch (eUiw) { ctxUiWorkspaceRef = null; }
         function invokeOpenSession(id) {
           try {
             if (ctx.uiWorkspace && typeof ctx.uiWorkspace.openSession === "function") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logictan/dsh-easyrewrite",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "DSH Web内目前最无感的消息撤回、重编辑插件，原版体验，兼容性强，功能简单可开关，设置丰富，现代化轻量ui框架。The most seamless message recall & re-edit plugin for DSH Web — native experience, strong compatibility, simple toggles, rich settings, modern lightweight UI. DSH Web で最もシームレスなメッセージ撤回・再編集プラグイン——ネイティブ体験、高い互換性、シンプルなトグル、充実した設定、モダンで軽量な UI。",
   "type": "module",
   "main": "lib/index.js",
@@ -14,6 +14,9 @@
       "patch": "./cordis.patch.yml"
     },
     "client": {
+      "external": [
+        "@logictan/dsh-plugins-shared-client"
+      ],
       "inject": [
         "slots",
         "sessions",
@@ -63,9 +66,17 @@
     "prepare": "node build.mjs",
     "prepack": "node build.mjs"
   },
+  "peerDependencies": {
+    "@logictan/dsh-plugins-shared-client": "^0.1.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dale0525/dsh-plugins.git",
     "directory": "packages/dsh-easyrewrite"
+  },
+  "peerDependenciesMeta": {
+    "@logictan/dsh-plugins-shared-client": {
+      "optional": true
+    }
   }
 }