dsh-plugin-tool-management 0.20.0 → 0.20.1

package/lib/client.js

@@ -72,6 +72,10 @@ window.__ModuleLoader__.load({
          能拖高；权重 4 类 + 1 元素，压过上面那条 200px，不靠 !important。 */
       '.dsm-modal.dsm-modal-compact textarea.dsm-control.dsm-textarea-md{min-height:150px}' +
       '.dsm-detail-title-row{display:flex;align-items:center;justify-content:space-between;gap:8px}' +
+      /* 标题行右侧的动作组：两个及以上按钮必须包一层 —— space-between 直接摊三个子元素时，
+         中间那个会被顶到整行正中（用户 2026-10-15：「重启怎么在中间」）。标题在左、动作组
+         在右，组内间距 8px 与行间隙一致。 */
+      '.dsm-detail-title-acts{display:flex;align-items:center;gap:8px}' +
       `
 .dsm-pick-list{display:flex;max-height:240px;flex-direction:column;overflow:auto;border:1px solid var(--dsw-alias-border-l2);border-radius:var(--dsm-radius-m);padding:4px}.dsm-tab{padding:8px 14px;border:0;background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:13px;cursor:pointer;border-bottom:2px solid transparent;margin-bottom:-1px}.dsm-tab-active{color:var(--dsw-alias-label-primary);border-bottom-color:var(--dsw-alias-state-success-primary)}.dsm-section{box-sizing:border-box;display:flex;width:100%;max-width:820px;min-width:0;margin:0 auto;padding:4px 0 24px;container-type:inline-size;flex-direction:column;gap:12px;color:var(--dsw-alias-label-primary);font-family:inherit}.dsm-head{display:flex;flex-direction:column;align-items:stretch;gap:16px}.dsm-feedback-links{display:flex;flex-direction:column;align-items:flex-end;gap:4px}.dsm-title{margin:0;font-size:18px;line-height:26px;font-weight:600;letter-spacing:-.2px;white-space:nowrap}.dsm-feedback-link{display:inline-flex;min-height:30px;align-items:center;gap:4px;padding:0 8px;border:1px solid var(--dsw-alias-border-l2);border-radius:var(--dsm-radius-m);background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:12px;font-weight:400;line-height:18px;text-decoration:none;white-space:nowrap}.dsm-feedback-link:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}.dsm-feedback-link:focus-visible{outline:2px solid var(--dsw-alias-state-success-primary);outline-offset:2px}.dsm-feedback-link svg{flex:none}.dsm-desc{margin:12px 0 0;display:-webkit-box;overflow:hidden;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:22px;-webkit-box-orient:vertical;-webkit-line-clamp:2}.dsm-actions{display:flex;flex-wrap:wrap;gap:8px;margin-left:0;flex:none}
 /* 页头动作行：内边距收 2px。批量按钮要按「取消全选」定宽（见 .dsm-btn-bulk），
@@ -179,6 +183,10 @@ button.dsm-tag:disabled{cursor:default;opacity:.6}
 .dsm-pill{display:inline-flex;min-height:20px;align-items:center;padding:0 8px;border:1px solid var(--dsw-alias-border-l3);border-radius:99px;font-size:12px;font-weight:400;white-space:nowrap}
 .dsm-pill-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary)}
 .dsm-pill-warn{border-color:var(--dsm-warn);color:var(--dsm-warn)}
+/* 「启动中」的胶囊此前**没有对应配色**（只有 ok / warn / muted 三档），详情页标题那颗
+   「加载中」于是落在 .dsm-pill 的无色默认上 —— 与"没在跑"看着一样。与状态点同一支绿，
+   压一点亮度表示还没到位。 */
+.dsm-pill-busy{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);opacity:.78}
 .dsm-pill-muted{color:var(--dsw-alias-label-tertiary)}
 .dsm-tool-desc-wrap{display:flex;align-items:flex-end;gap:8px}
 .dsm-tool-desc-clamp{display:-webkit-box;overflow:hidden;-webkit-box-orient:vertical;-webkit-line-clamp:2}
@@ -213,6 +221,11 @@ button.dsm-tag:disabled{cursor:default;opacity:.6}
    超限转色，不再画进度条。保留 .dsm-budget-meta，它服务的是各表单的「标签 + 字数计数」行。） */.dsm-budget-meta{display:flex;align-items:baseline;justify-content:space-between;gap:8px}.dsm-budget-meta strong{margin-right:0;font-size:13px;font-weight:600;font-variant-numeric:tabular-nums}.dsm-char-count{color:var(--dsw-alias-label-tertiary);font-size:11px;font-variant-numeric:tabular-nums}.dsm-char-over{color:var(--dsw-alias-state-error-primary)}.dsm-field-row{display:flex;gap:12px;align-items:flex-start}.dsm-field-row>.dsm-field{flex:1;min-width:0}
 .dsm-combo-row{display:flex;gap:8px}.dsm-combo-row .dsm-control{flex:1}
 .dsm-attach-list{display:flex;flex-direction:column;gap:4px}
+/* 技能创建弹窗的附件区（2026-10-16）：清单封顶滚动，行收紧一档 —— 附件多的时候
+   弹窗不该被顶到比正文还高，而 .dsm-file 原档的 8px 内边距是给导入拖拽区用的。 */
+.dsm-attach-actions{display:inline-flex;align-items:center;gap:6px}
+.dsm-attach-cap{max-height:126px;overflow:auto;padding-right:2px}
+.dsm-attach-cap .dsm-file{gap:6px;padding:5px 8px}
 .dsm-toast{position:fixed;right:22px;bottom:22px;z-index:1250;box-sizing:border-box;max-width:min(420px,calc(100vw - 44px));padding:8px 12px;border:1px solid var(--dsw-alias-border-l2);border-radius:var(--dsm-radius-m);background:var(--dsw-alias-bg-layer-3);box-shadow:var(--dsw-shadow-lv2);color:var(--dsw-alias-label-primary);font-size:12px;line-height:18px;animation:dsm-toast-in 160ms ease-out}@keyframes dsm-toast-in{from{opacity:0;transform:translateY(6px)}to{opacity:1;transform:none}}/* 动效降级：系统开了「减少动态效果」就一律关掉。新增 transition / animation 时记得同步加到这里，
    否则那一个动效就是唯一不尊重用户设置的部分。（列表换位的 FLIP 曾在 JS 侧另判，随动画一起删除。） */
 @media(prefers-reduced-motion:reduce){.dsm-toast{animation:none}.dsm-switch:after{transition:none}.dsm-dropzone{transition:none}}
@@ -548,14 +561,14 @@ html,body{scrollbar-gutter:stable}.dsm-settings-scroll-host{overflow-y:scroll!im
 .dsm-toast-warn{border-color:var(--dsm-warn);color:var(--dsm-warn)}
 .dsm-toast-err{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary)}
 
-/* MCP JSON 导入预览（0.15.0 A1）：勾选 | 主体 | 状态三列。非法行只把「问题」那一行标红，
+/* MCP JSON 导入预览（0.15.0 A1）：勾选 | 主体 | 状态三列；表头 label 已删
+   （用户 2026-10-15），勾选框随行内容垂直居中。非法行只把「问题」那一行标红，
    名字净化 / 字段忽略这类是配置事实，走中性灰 —— 黄色在这里留给不了任何东西（琥珀语义）。 */
-.dsm-imp-head,.dsm-imp-row{display:grid;grid-template-columns:15px minmax(0,1fr) auto;align-items:start;gap:8px}
-.dsm-imp-head{padding:0 4px 4px;color:var(--dsw-alias-label-tertiary);font-size:12px}
+.dsm-imp-row{display:grid;grid-template-columns:15px minmax(0,1fr) auto;align-items:center;gap:8px}
 .dsm-imp-list{display:flex;flex-direction:column;gap:4px;max-height:320px;padding:4px 4px 0 0;overflow:auto;scrollbar-width:thin;scrollbar-color:var(--dsw-alias-border-l2) transparent}
 .dsm-imp-row{padding:8px 8px;border:1px solid var(--dsw-alias-border-l2);border-radius:var(--dsm-radius-m);background:var(--dsw-alias-bg-layer-1);font-size:12px}
 .dsm-imp-row.dsm-imp-bad{border-color:var(--dsw-alias-state-error-primary)}
-.dsm-imp-row input[type=checkbox]{width:14px;height:14px;margin:4px 0 0;cursor:pointer;accent-color:var(--dsw-alias-state-success-primary)}
+.dsm-imp-row input[type=checkbox]{width:14px;height:14px;margin:0;cursor:pointer;accent-color:var(--dsw-alias-state-success-primary)}
 .dsm-imp-row input[type=checkbox]:disabled{cursor:not-allowed}
 .dsm-imp-main{display:flex;min-width:0;flex-direction:column;gap:4px}
 .dsm-imp-name{display:flex;align-items:center;flex-wrap:wrap;gap:4px;color:var(--dsw-alias-label-primary);font-size:13px;font-weight:600}
@@ -564,8 +577,10 @@ html,body{scrollbar-gutter:stable}.dsm-settings-scroll-host{overflow-y:scroll!im
 .dsm-imp-err{color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:16px}
 .dsm-imp-meta{display:flex;flex-direction:column;align-items:flex-end;gap:4px}
 .dsm-imp-foot{display:flex;align-items:center;flex-wrap:wrap;gap:12px}
-.dsm-imp-radio{display:flex;align-items:center;gap:4px;color:var(--dsw-alias-label-secondary);font-size:12px;cursor:pointer}
-.dsm-imp-radio input{width:14px;height:14px;margin:0;accent-color:var(--dsw-alias-state-success-primary)}
+/* 导入弹窗重名处理行（用户 2026-10-15 两连）：从预览底部上移到预览之前，导入前
+   就看得见；排他二选一用「提示词类型」同款分段控件（dsm-form-seg，aria-pressed
+   表选中），「重名时」文字 label 删除（同类第三例：设置页表头 label 也删）。 */
+.dsm-imp-conflict{display:flex;align-items:center;flex-wrap:wrap;gap:8px 16px}
 .dsm-imp-count{margin-left:auto;color:var(--dsw-alias-label-tertiary);font-size:12px;font-variant-numeric:tabular-nums;white-space:nowrap}
 
 /* 体检状态点（0.15.0 B1）与行内检查项。点只有 8px，靠 title 说清含义；
@@ -573,8 +588,16 @@ html,body{scrollbar-gutter:stable}.dsm-settings-scroll-host{overflow-y:scroll!im
 .dsm-dot{display:inline-block;flex:none;width:8px;height:8px;border-radius:50%;background:var(--dsw-alias-border-l3)}
 .dsm-dot-ok{background:var(--dsw-alias-state-success-primary)}
 .dsm-dot-warn{background:var(--dsm-warn)}
-/* （.dsm-dot-busy 与 @keyframes dsm-dot-pulse 已随 MCP 体检功能一起删除，2026-10-12：
-   "闪动的点"只有体检的进行中态用过，状态点现在是静态的。） */
+/* 启动进行中的呼吸点（2026-10-15 用户要求加回：服务启动要数秒，原来只有一个静态灰点，
+   "正在启动"只能靠 title 说出来。2026-10-12 曾以"闪动的点只有体检用"为由删过一次，
+   这次是 MCP 启动相位自己要 —— 全页只有 phase 非 active 时用它，不会到处闪）。
+   配色改绿（用户 2026-10-15）：business 橙在 dsh 的语义里是"占用中/要处理"，而启动中既不是
+   警告也不是故障，跑起来之后它就变成同一支绿 —— 呼吸与常亮因此是同一个颜色的两种节律。 */
+.dsm-dot-busy{background:var(--dsw-alias-state-success-primary);animation:dsm-dot-pulse 1.1s ease-in-out infinite}
+/* 呼吸的最低亮度从 .3 提到 .65，且改成**长一圈**而不是缩一点（用户 2026-10-15：灯在闪，
+   可颜色看着不绿，分不清是不是启动中）。6px 的点压到三成透明度就只剩一层灰；"变亮 + 长大"
+   与跑起来那颗常亮的绿一眼可分。 */
+@keyframes dsm-dot-pulse{0%,100%{opacity:1;transform:scale(1)}50%{opacity:.65;transform:scale(1.35)}}
 /* （.dsm-inspect / -line / -warn 三条已随 MCP 体检功能一起删除，2026-10-12。） */
 
 /* 「最近改动」流水（0.15.0 B2）：时间列固定窄栏，改动列吃剩余宽度，来源徽章贴在行尾。 */
@@ -640,8 +663,7 @@ html,body{scrollbar-gutter:stable}.dsm-settings-scroll-host{overflow-y:scroll!im
    detail-head / composer-chips，属于 #7）与半残的 tabs / switch 组。 */
 .dsm-pick input[type=checkbox]{flex:none;width:15px;height:15px;margin:0;cursor:pointer}
 .dsm-tooltable-ghead input[type=checkbox]{flex:none;width:15px;height:15px;margin:0;cursor:pointer}
-.dsm-imp-row input[type=checkbox]{width:14px;height:14px;margin:4px 0 0;cursor:pointer}
-.dsm-imp-radio input{width:14px;height:14px;margin:0}
+.dsm-imp-row input[type=checkbox]{width:14px;height:14px;margin:0;cursor:pointer}
 .dsm-select-menu button:focus-visible{outline:2px solid var(--dsw-alias-state-business-primary); outline-offset: 1px;}
 .dsm-btn-lock:hover:not(:disabled){background: var(--dsw-alias-interactive-bg-hover);}
 .dsm-btn-quiet:hover:not(:disabled){background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-primary);}
@@ -680,7 +702,6 @@ button.dsm-chip:hover{background: var(--dsw-alias-interactive-bg-hover);}
 .dsm-feedback.dsm-error{padding: 8px 12px; border-radius: var(--dsm-radius-m);}
 .dsm-tab:hover{color: var(--dsw-alias-label-primary);}
 .dsm-tab[aria-selected= true ]{color: var(--dsw-alias-label-primary); border-bottom-color: var(--dsw-alias-label-primary); font-weight: 400;}
-.dsm-imp-radio:hover{background: var(--dsw-alias-interactive-bg-hover); color: var(--dsw-alias-label-primary);}
 .dsm-modal-actions .dsm-btn{min-height: 30px; padding: 0 12px; font-size: 13px; line-height: 20px; border-radius: var(--dsm-radius-m);}
 .dsm-seg-filter .dsm-btn{min-height: 30px; padding: 0 12px; font-size: 13px; line-height: 20px;}
 .dsm-actions .dsm-bulk-ghost{min-height: 24px; display: inline-flex; align-items: center;}
@@ -705,6 +726,10 @@ button.dsm-chip:hover{background: var(--dsw-alias-interactive-bg-hover);}
 /* 记忆「形态」二选一：分段按钮（flat / bundle 互斥）。两个值摊开、点击即切，不依赖下拉 ——
    下拉在弹窗底部会被滚动容器裁掉（用户 2026-10-10 截图）。 */
 .dsm-form-seg{display:inline-flex;gap:2px;padding:3px;border:0;border-radius:var(--dsm-radius-m);background:var(--dsw-alias-interactive-bg-hover)}
+/* 字段内的分段控件收回内容宽度（用户 2026-10-15：提示词类型 / 形态两条被
+   .dsm-field 的 align-items:stretch 拉满整行，过长）。flex 子项会被块状化，
+   inline-flex 在列向导里挡不住 stretch —— 显式 align-self + fit-content 才保险。 */
+.dsm-field>.dsm-form-seg{align-self:flex-start;width:fit-content}
 .dsm-form-seg button{min-height:24px;padding:0 12px;border:0;border-radius:var(--dsm-radius-s);background:transparent;color:var(--dsw-alias-label-secondary);font:inherit;font-size:13px;cursor:pointer}
 .dsm-form-seg button:hover{color:var(--dsw-alias-label-primary)}
 .dsm-form-seg button[aria-pressed="true"]{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font-weight:600}
@@ -755,8 +780,30 @@ button.dsm-chip:hover{background: var(--dsw-alias-interactive-bg-hover);}
    §4.2 的 720 帽对这个弹窗太紧，登记为特例；屏幕不够高时仍然自适应缩，不会顶出视口。
    2026-10-12 用户「新建场景加高加宽」：1000×960 → 1200×1080（四组那一档同步加高，
    见 .dsm-editor-grid 的 grid-auto-rows —— 只抬帽不改内容的话弹窗高度由内容决定，等于没加）。
-   ⚠️ 必须三段类名：上面 .dsm-modal.dsm-modal-list 那条也是 720，而且带 !important。 */
-.dsm-modal.dsm-modal-list.dsm-modal-editor{width:min(1200px,100%)!important;max-height:min(1080px,calc(100vh - 48px))!important}
+   ⚠️ 必须三段类名：上面 .dsm-modal.dsm-modal-list 那条也是 720，而且带 !important。
+   宽度 2026-10-15 第二轮改成 min(1200px, 88vw)（用户：小窗下宽度也要减一点）：原先的 100%
+   只扣掉遮罩那 24px，1000px 宽的窗口里弹窗 952 —— 左右各只剩 24px，看着就是"顶满"。
+   代价：顶部五格的 flex-basis 合计 901px，容器窄过它时按既有兜底退回两行（.dsm-editor-basics
+   的 flex-wrap），所以这一档让出的宽度会让五格变两行、而不是把下拉压扁。 */
+.dsm-modal.dsm-modal-list.dsm-modal-editor{width:min(1200px,88vw)!important;max-height:min(1080px,calc(100vh - 48px))!important}
+/* 新增 / 编辑 MCP 的表单弹窗（用户 2026-10-15：两种传输方式弹窗大小不一样）。
+   stdio 是「启动命令 + 参数 + 环境变量」三格，streamable-http 只有「服务 URL + 请求头」两格 ——
+   高度交给内容决定时，切一下传输方式弹窗就跳一次，而 stdio 那一档自然高 782，正好顶破 720 的帽、
+   默认带滚动条。这一档给确定高度（与新建记忆切「形态」同一手感：格子跟着长，弹窗不跳也不滚），
+   多出来的空间由带 textarea 的那几格吸收（.dsm-field-fill，见 41 片）。
+   ⚠️ 这里不写 min-height:0 —— 屏幕不够高时宁可整窗滚动，也不要让格子被压到内容之下、
+   textarea 溢出到下一格上面（实测 760 视口下会切掉两格）。
+   820 → 770（用户 2026-10-16：「MCP 弹窗各减少一点」）：省下的 50 里，24 来自把这一档的字段间距
+   收回 12（stdio 七格六个间距），其余是给两端各留一点余量；stdio 自然高随之降到 ~758，
+   仍然不滚 —— 减高度不能减出滚动条，那是用户同一批里刚抱怨过的。 */
+.dsm-modal.dsm-modal-mcp-form{height:min(770px,calc(100vh - 48px));max-height:none}
+.dsm-modal-mcp-form .dsm-form{flex:1;gap:12px}
+.dsm-modal-mcp-form .dsm-field-fill{flex:1 1 auto}
+.dsm-modal-mcp-form .dsm-field-fill>textarea{flex:1;min-height:88px}
+/* 新增 / 编辑提示词、新建 / 编辑子智能体（用户 2026-10-15：「默认就会有滑动条」）：
+   正文是 dsm-textarea-lg 与两块 dsm-textarea-md，内容排开比 720 的帽更高 —— 帽抬到 920，
+   让这两类表单按自己的内容站满；屏幕不够高时仍按视口缩，不会顶出窗口。 */
+.dsm-modal.dsm-modal-form-tall{max-height:min(920px,calc(100vh - 48px))}
 /* 列表弹窗（导出 / 回收站）：高度自适应——内容矮时缩到 min-height，超高时帽在 720、
    只让 body 内滚（头/底恒定）。旧的 640/760 定高全部由此替代。 */
 .dsm-modal.dsm-modal-list{width:min(720px,100%)!important;height:auto!important;max-height:min(720px,calc(100vh - 96px))!important;min-height:480px}
@@ -880,7 +927,14 @@ button.dsm-chip:hover{background: var(--dsw-alias-interactive-bg-hover);}
    「选择」一出现就把这一格的标签行顶高 4px，下面的下拉被推下去，与其余四格错开。 */
 .dsm-editor-basics .dsm-label,.dsm-editor-basics .dsm-char-count{line-height:18px}
 .dsm-label-row .dsm-btn{min-height:18px;padding:0 6px;font-size:12px;line-height:16px}
-.dsm-editor-grid{display:grid;grid-template-columns:1fr 1fr;gap:12px;grid-auto-rows:300px}
+/* 四组的高度：原先恒定 300px（大窗下没问题），小窗下弹窗整个顶出视口 —— 用户 2026-10-15
+   「新建场景在小窗口模式下占大量面积，能不能等比例缩小，但有最小值」。
+   现在按视口缩：除四组之外的固定开销实测 218px（标题行 + 顶部五格 + 动作行 + 内边距与间距），
+   连同 12px 行间距一起从每半个视口里扣掉，就是每行能给到的高度；上限仍是 300（大屏一字不改）。
+   扣掉的 360 比"刚好填满"（286）再多让出 74px —— 用户 2026-10-15 第二轮：小窗下填满整屏
+   还是太大，弹窗该有自己的边距，不是贴满视口才算用得上空间。下限 150：再矮清单就只剩两三行。
+   组内 .dsm-editor-group-body 本来就是 min-height:0 + 内滚，所以行矮下去不会把内容挤出去。 */
+.dsm-editor-grid{display:grid;grid-template-columns:1fr 1fr;gap:12px;grid-auto-rows:clamp(150px,calc((100vh - 360px) / 2),300px)}
 /* 分组卡片补一圈 1px 描边（用户 2026-10-12：「浅色模式下四个功能集没有分块，全是白的」）。
    原设计是 §13.1 的"深度靠表面层次、不画边框"：卡片 bg-layer-1 比弹窗 bg-layer-2 高一档。
    但这条只在深色主题成立 —— 浅色下 layer-1 与 layer-2 都是白，卡片整块融进弹窗，
@@ -1005,6 +1059,11 @@ button.dsm-chip:hover{background: var(--dsw-alias-interactive-bg-hover);}
 .dsm-setrow{display:flex;align-items:center;justify-content:space-between;gap:12px;min-height:32px;padding:4px 0}
 .dsm-setrow+.dsm-setrow{border-top:1px solid var(--dsw-alias-border-l1)}
 .dsm-setrow-label{display:flex;min-width:0;flex-direction:column;gap:1px}
+/* 名字行：名字与状态标签（tag）同一行，垂直居中（用户裁定 2026-10-15：兼容页斜杠行的
+   「已生效 / 未生效」从开关旁挪到名字右边 —— 状态跟着名字读；标签是 pill，flex 居中
+   才与 13px 的名字真正上下对齐，基线对齐会偏上一截）。 */
+.dsm-setrow-nameline{display:flex;min-width:0;align-items:center;gap:6px}
+.dsm-setrow-nameline>.dsm-setrow-name{min-width:0}
 .dsm-setrow-name{overflow:hidden;color:var(--dsw-alias-label-primary);font-size:13px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}
 .dsm-setrow-desc{overflow:hidden;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:16px;text-overflow:ellipsis;white-space:nowrap}
 .dsm-setrow-control{display:flex;flex:none;align-items:center;gap:8px}
@@ -1174,12 +1233,16 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
      * 行间分隔线分节（`.dsm-setrow + .dsm-setrow`）。label 可带一句 desc（12 弱色，
      * 跟在名字下一行 —— 行随内容长高）；descTitle 给截断的 desc 悬浮全文。
      * 用于兼容页令牌块 / 注入设置 / 子智能体表单开关行这一类「名字 + 一个控件」的行。
-     * props：name / desc / descTitle / control（右侧控件，通常是 Switch）/ title。
+     * props：name / desc / descTitle / control（右侧控件，通常是 Switch）/ title /
+     * tag（名字右边的状态标签，可选 —— 用户裁定 2026-10-15：兼容页斜杠行的「已生效 /
+     * 未生效」从开关旁挪到名字右边，状态跟着名字读，不与开关混排）。
      */
     function SettingsRow(props) {
       return h('div', { className: 'dsm-setrow', title: props.title || undefined },
         h('div', { className: 'dsm-setrow-label' },
-          h('span', { className: 'dsm-setrow-name' }, props.name),
+          h('span', { className: 'dsm-setrow-nameline' },
+            h('span', { className: 'dsm-setrow-name' }, props.name),
+            props.tag || null),
           props.desc ? h('span', { className: 'dsm-setrow-desc', title: props.descTitle || undefined }, props.desc) : null),
         h('div', { className: 'dsm-setrow-control' }, props.control || null))
     }
@@ -2969,10 +3032,12 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
       // 各自就是一个源，所以能各挂各的）+ 一句"重启才生效"。
       const slashParts = []
       if (slash) {
-        // 行末那枚标签是"本次启动真挂上了没"：开关值说的是"要不要"，挂没挂上只有浏览器知道
+        // 名字右边那枚标签是"本次启动真挂上了没"：开关值说的是"要不要"，挂没挂上只有浏览器知道
         // （服务端看不到源注册的结果），两件事不能合成一句 —— 合了必有一句是假的。标签只说
         // 已生效 / 未生效，**为什么**没生效挂在悬停那句里（重名抢占 / 宿主没这个服务 / 还没就绪，
         // 三种的处置完全不同）—— 见 48-slash.js 的 setSlashMount。
+        // 位置（用户裁定 2026-10-15）：跟在名字右边，不摆开关旁 —— 状态说的是"这一段入口
+        // 挂上没"，跟着名字读；与 switch 并排会被读成"开关自己的状态"，而开关只说要不要。
         const liveTag = function (key) {
           const state = slashMountStateOf(key)
           const on = state === 'registered'
@@ -2986,17 +3051,13 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             React.createElement('span', null, t('compat.slash.title')),
             React.createElement('span', { className: 'dsm-seg-group-line' })),
           // 开关行（REDESIGN §5.2 SettingsRow + Switch，切片五换装）：名字+说明在左，
-          // 开关与「本次启动真挂上了没」的标签在右。
+          // 开关在右；「本次启动真挂上了没」的标签在名字右边（tag，见上）。
           React.createElement(SettingsRow, { key: 'slash-tools', name: t('compat.slash.tools'), desc: t('compat.slash.tools.desc'),
-            control: [
-              React.createElement(Switch, { key: 'sw', on: slash.tools !== false, label: t('compat.slash.tools'), onClick: function () { saveSlash({ tools: slash.tools === false }) } }),
-              liveTag('tools'),
-            ] }),
+            tag: liveTag('tools'),
+            control: React.createElement(Switch, { key: 'sw', on: slash.tools !== false, label: t('compat.slash.tools'), onClick: function () { saveSlash({ tools: slash.tools === false }) } }) }),
           React.createElement(SettingsRow, { key: 'slash-quick', name: t('compat.slash.quick'), desc: t('compat.slash.quick.desc'),
-            control: [
-              React.createElement(Switch, { key: 'sw', on: slash.quickPrompts !== false, label: t('compat.slash.quick'), onClick: function () { saveSlash({ quickPrompts: slash.quickPrompts === false }) } }),
-              liveTag('quickPrompts'),
-            ] }))
+            tag: liveTag('quickPrompts'),
+            control: React.createElement(Switch, { key: 'sw', on: slash.quickPrompts !== false, label: t('compat.slash.quick'), onClick: function () { saveSlash({ quickPrompts: slash.quickPrompts === false }) } }) }))
       }
       const injectParts = []
       if (inject) {
@@ -4097,8 +4158,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "empty.search": "没有匹配的技能", "empty.source": "该来源不存在或暂无技能", "loading": "正在加载技能…", "note.missing": "未提供简介", "source.toggle": "启停来源", "skill.toggle": "启停技能",
         "source.external.note": "只读接入，启停不改写源文件", "source.dsh.note": "可创建、导入、移到回收站；默认来源必须读取，不能移除或停用",
         "detail.title": "技能详情", "detail.body": "正文", "detail.frontmatter": "元数据", "detail.noFrontmatter": "该技能未提供元数据。", "detail.diagnostics": "诊断", "detail.path": "源文件", "detail.noIssues": "未发现诊断问题。",
-        "create.title": "创建技能", "create.target": "创建位置", "create.name": "名称", "create.name.placeholder": "例如 code-review-helper", "create.description": "简介", "create.description.placeholder": "一句话说明什么时候使用", "create.body": "正文（Markdown）", "create.body.placeholder": "写下技能要遵循的指令、步骤和边界…", "create.chat.note": "对话里 skill_manager_save 建的是用户级技能",
-        "import.title": "导入技能", "upload.drop.title": "点击或拖入此处", "upload.drop.copy": "支持 .zip、技能文件夹或单个 SKILL.md", "upload.req.mdzip": "支持 .md / .zip，同名自动跳过", "upload.req.skills": "zip 或文件夹，需含 SKILL.md", "upload.req.prompt": "支持 .md，同名自动跳过", "upload.req.session": "一次一个：.jsonl / .json / .md / .txt", "upload.selected.one": "{count} 个文件 · {size}", "upload.selected.other": "{count} 个文件 · {size}", "upload.remove": "移除所选内容", "upload.requirements": "文件要求", "upload.requirement.skill": "压缩包或文件夹需包含 SKILL.md", "upload.requirement.frontmatter": "SKILL.md 需包含 YAML 格式的技能名称和描述", "upload.requirement.copy": "导入时复制完整内容，不修改原始来源", "upload.requirement.persona.1": "支持 .md / .zip（可多选、可拖入）", "upload.requirement.persona.2": "一个 .md = 一个人设，文件名即人设名", "upload.requirement.persona.3": "同名自动跳过，绝不覆盖原有文件", "upload.requirement.memory.1": "支持 .md / .zip（可多选、可拖入）", "upload.requirement.memory.2": "一个 .md = 一条记忆，文件名即记忆名", "upload.requirement.memory.3": "带 SKILL.md 的目录 = bundle 记忆（附件一起进来）", "upload.requirement.memory.4": "zip 里的目录名即场景；没有目录时用下面「导入到场景」的值（留空 = 全局）", "upload.requirement.prompt.1": "支持 .md（可多选、可拖入）", "upload.requirement.prompt.2": "一个 .md = 一份预设，文件名即 id（目录名）", "upload.requirement.prompt.3": "同名已存在则跳过，绝不覆盖", "upload.requirement.session.1": "支持 .jsonl / .json / .md / .txt（一次一个）", "upload.requirement.session.2": "Claude Code / Cursor / Codex 的转录文件，或任意文本", "upload.requirement.session.3": "工作区可留空 = 归入未分组；留空不影响导入", "upload.importing": "正在导入…", "status.selected": "已选择", "select.file.invalid": "请选择 .zip 或单个 SKILL.md", "select.folder.invalid": "该文件夹里没有 SKILL.md", "error.browse.absolute": "目录路径必须是绝对路径：{path}", "error.browse.unreadable": "无法读取目录：{path}", "error.browse.notDirectory": "不是目录：{path}",
+        "create.title": "创建技能", "create.target": "创建位置", "create.name": "名称", "create.name.placeholder": "例如 code-review-helper", "create.description": "简介", "create.description.placeholder": "一句话说明什么时候使用", "create.body": "正文（Markdown）", "create.body.placeholder": "写下技能要遵循的指令、步骤和边界…",
+        "skill.attach.label": "附件（可选）", "skill.attach.new": "新建附件", "skill.attach.pick": "选择附件", "skill.attach.newTitle": "新建附件", "skill.attach.path": "路径（相对技能目录）", "skill.attach.path.placeholder": "例如 references/api.md", "skill.attach.content": "内容", "skill.attach.content.placeholder": "把这个文件的内容写在这里（可留空）", "skill.attach.add": "加入", "skill.attach.edit": "编辑", "skill.attach.remove": "移除附件", "skill.attach.dup": "已有同名附件：{path}", "skill.attach.badpath": "路径不合法：用相对路径，不能以 / 开头或结尾，也不能含 ..", "skill.attach.reserved": "SKILL.md 是技能正文，不能作为附件加进来：{path}", "skill.attach.tooLarge": "{name} 超过 {limit} MB", "detail.attachments": "附件",
+        "import.title": "导入技能", "upload.drop.title": "点击或拖入此处", "upload.drop.copy": "支持 .zip、技能文件夹或单个 SKILL.md", "upload.drop.mzip": "支持 .md 或 .zip", "upload.drop.prompt": "支持 .md", "upload.drop.session": "支持 .jsonl / .json / .md / .txt", "upload.req.mdzip": "支持 .md / .zip，同名自动跳过", "upload.req.skills": "zip 或文件夹，需含 SKILL.md", "upload.req.prompt": "支持 .md，同名自动跳过", "upload.req.session": "一次一个：.jsonl / .json / .md / .txt", "upload.selected.one": "{count} 个文件 · {size}", "upload.selected.other": "{count} 个文件 · {size}", "upload.remove": "移除所选内容", "upload.requirements": "文件要求", "upload.requirement.skill": "压缩包或文件夹需包含 SKILL.md", "upload.requirement.frontmatter": "SKILL.md 需包含 YAML 格式的技能名称和描述", "upload.requirement.copy": "导入时复制完整内容，不修改原始来源", "upload.requirement.persona.1": "支持 .md / .zip（可多选、可拖入）", "upload.requirement.persona.2": "一个 .md = 一个人设，文件名即人设名", "upload.requirement.persona.3": "同名自动跳过，绝不覆盖原有文件", "upload.requirement.memory.1": "支持 .md / .zip（可多选、可拖入）", "upload.requirement.memory.2": "一个 .md = 一条记忆，文件名即记忆名", "upload.requirement.memory.3": "带 SKILL.md 的目录 = bundle 记忆（附件一起进来）", "upload.requirement.memory.4": "zip 里的目录名即场景；没有目录时用下面「导入到场景」的值（留空 = 全局）", "upload.requirement.prompt.1": "支持 .md（可多选、可拖入）", "upload.requirement.prompt.2": "一个 .md = 一份预设，文件名即 id（目录名）", "upload.requirement.prompt.3": "同名已存在则跳过，绝不覆盖", "upload.requirement.session.1": "支持 .jsonl / .json / .md / .txt（一次一个）", "upload.requirement.session.2": "Claude Code / Cursor / Codex 的转录文件，或任意文本", "upload.requirement.session.3": "工作区可留空 = 归入未分组；留空不影响导入", "upload.importing": "正在导入…", "status.selected": "已选择", "select.file.invalid": "请选择 .zip 或单个 SKILL.md", "select.folder.invalid": "该文件夹里没有 SKILL.md", "error.browse.absolute": "目录路径必须是绝对路径：{path}", "error.browse.unreadable": "无法读取目录：{path}", "error.browse.notDirectory": "不是目录：{path}",
         // F-029：服务端错误码补词条（zh 逐字复现服务端文案，命中词条前后中文显示不变；EN 不再回退中文原文）。
         "error.custom.absolute": "目录路径必须是绝对路径: {path}", "error.custom.notDirectory": "不是目录: {path}", "error.custom.unreadable": "无法读取目录: {path}", "error.custom.overlap": "目录与已有技能来源重叠: {path} ↔ {other}", "error.custom.invalidKey": "非法的自定义来源 key: {key}", "error.custom.notFound": "自定义来源不存在: {key}",
         // 与宿主 http-fence.ts 的 TOKEN_MSG **逐字相同**：同一件事在哪个页面出现都必须说同一句话，
@@ -4174,16 +4236,29 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // 已并进这一组；「移入回收站 / 永久删除」与「删除」后果不同，保留各自的键。
         "done.enabled": "已启用：{name}", "done.disabled": "已停用：{name}",
         "done.created": "已创建：{name}", "done.saved": "已保存：{name}",
-        "done.deleted": "已删除：{name}", "done.restored": "已恢复：{name}",
+        "done.deleted": "已删除：{name}", "done.restored": "已恢复：{name}", "done.restoredAs": "已恢复为：{name}",
+        // 同名确认弹窗（用户 2026-10-14）：四个域（记忆 / 场景 / 技能 / 子智能体）× 新建 / 回收站恢复
+        // 共八个入口共用。撞名不再静默退号，先问一句再动手，所以这几个词条必须跨域通用 ——
+        // 名词由调用方从 dup.kind.* 取好传进来。
+        "dup.title": "已存在同名{kind}", "dup.body": "{kind}「{name}」已存在。",
+        "dup.create": "继续将新建为「{name}」。", "dup.restore": "继续将恢复为「{name}」。",
+        "dup.confirm.create": "继续新建", "dup.confirm.restore": "继续恢复",
+        "dup.kind.memory": "记忆", "dup.kind.scene": "场景", "dup.kind.skill": "技能", "dup.kind.subagent": "子智能体", "dup.kind.prompt": "提示词",
         "result.imported": "已导入：{names}", "result.importPartial": "已导入：{imported}；已跳过同名技能：{skipped}", "result.importSkipped": "未导入任何技能；已跳过同名技能：{names}", "result.importEmpty": "未导入任何技能。", "result.importWarnings": "{result}；警告：{warnings}", "result.trashed": "已移到回收站：{name}", "result.deleted": "已永久删除：{name}", "result.updated": "状态已更新。", "result.preferred": "已改为生效：{name}（{source}）", "result.unpreferred": "已取消同名首选：{name}", "result.opened": "已用系统默认程序打开：{path}", "error.action": "操作失败：{error}",
-        "warning.scan.truncated": "技能目录较大或嵌套过深，部分技能未显示：{path}", "warning.state.invalid": "状态文件不可读，已安全停用所有技能：{path}", "warning.backupUncleaned": "旧版本备份未清理：{path}（{error}）", "warning.project.unavailable": "活动会话的项目目录不可访问，项目技能未显示：{path}",
+        "warning.scan.truncated": "技能目录较大或嵌套过深，部分技能未显示：{path}", "warning.state.invalid": "状态文件不可读，已安全停用所有技能：{path}", "warning.backupUncleaned": "旧版本备份未清理：{path}（{error}）", "warning.project.unavailable": "活动会话的项目目录不可访问，项目技能未显示：{path}", "warning.retitleFailed": "声明名未随退号更新，该条目可能仍显示旧名字：{path}（{error}）",
         "error.root.readonly": "该来源不允许{action}", "error.root.disabled": "「{name}」这个来源已整体停用，请先在该来源行启用它", "error.root.unknown": "未知技能来源：{root}", "error.root.unsafe": "项目技能目录不安全，拒绝写入：{path}", "error.skill.notFound": "技能不存在: {name}", "error.skill.noFrontmatter": "缺少 frontmatter，无法{action}：{name}", "error.skill.notLoadable": "技能结构不完整，无法{action}: {name}", "error.skill.notDeletable": "该来源的技能不能删除（技能只能停用）：删除只在项目级来源（<项目>/.dsh/skills）提供",
         "error.source.notFound": "路径不存在: {path}", "error.source.symlink": "不支持符号链接来源：{path}", "error.source.unrecognized": "无法识别的 skill 来源: {path}", "error.source.tooDeep": "skill 来源目录层级超过 {depth} 层: {path}",
-        "error.import.overlap": "该目录与 DSH 技能目录重叠", "error.import.emptySource": "目录下没有 skill 条目：{path}", "error.import.invalidName": "名称不合法：{name}", "error.import.duplicateName": "批量来源中存在多个同名技能: {name}", "error.import.failed": "导入失败", "error.import.rollbackFailed": "覆盖导入回滚失败，备份保留在: {path}（{error}）",
-        "error.upload.path": "上传内容包含非法路径：{path}", "error.upload.encoding": "上传内容编码无效", "error.upload.empty": "上传内容为空", "error.upload.tooMany": "上传文件过多，最多 {limit} 个", "error.upload.tooLarge": "上传内容过大，限制为 {limit} 字节", "error.upload.archiveTooLarge": "ZIP 压缩包过大，限制为 {limit} 字节", "error.upload.duplicate": "上传内容包含重复路径：{path}", "error.upload.zipInvalid": "ZIP 压缩包无法解压",
+        "error.import.overlap": "该目录与 DSH 技能目录重叠", "error.import.emptySource": "目录下没有 skill 条目：{path}", "error.import.invalidName": "名称不合法：{name}", "error.import.duplicateName": "批量来源中存在多个同名技能: {name}", "error.import.failed": "导入失败", "error.import.rollbackFailed": "覆盖导入回滚失败，备份保留在: {path}（{error}）", "error.import.renameExhausted": "同名条目太多，无法生成退号名称: {name}",
+        "error.upload.path": "上传内容包含非法路径：{path}", "error.upload.encoding": "上传内容编码无效", "error.upload.empty": "上传内容为空", "error.upload.tooMany": "上传文件过多，最多 {limit} 个", "error.upload.tooLarge": "上传内容过大，限制为 {limit} 字节", "error.upload.archiveTooLarge": "ZIP 压缩包过大，限制为 {limit} 字节", "error.upload.duplicate": "上传内容包含重复路径：{path}", "error.upload.zipInvalid": "ZIP 压缩包无法解压", "error.upload.noSkillMd": "{name} 中未找到 SKILL.md：需放在根目录，或某个子目录下",
         "error.trash.notFound": "回收站条目不存在: {id}", "error.trash.conflict": "无法恢复，同名技能已存在: {name}", "error.trash.invalid": "回收站条目路径非法: {id}", "error.trash.projectUnavailable": "原项目当前不在活动工作区中，无法恢复：{path}", "error.trash.rollbackFailed": "移入回收站回滚失败，未恢复内容保留在: {path}（{error}）", "error.trash.retention.invalid": "保留期需为非负整数（0=永久保留），收到: {value}", "error.trash.retention.writeFailed": "写入保留期失败: {reason}",
+        // 四个回收站**统一**的「撞名，没能恢复」错误码（用户 2026-10-14）。界面按这个码认出
+        // "这是撞名"，据此弹确认窗 —— 而不是靠比文案。原先四个域各用各的码（技能是
+        // error.trash.conflict、记忆是 error.rules.exists、场景借用 error.rules.invalidGroup、
+        // 人设压根没有码），界面根本分不出"撞名"和"名字非法"。弹窗里那几句更具体的话在 dup.*。
+        "error.dup.conflict": "已存在同名条目，未能恢复：{name}",
         "error.state.invalid": "技能管理器状态文件不可读，已拒绝覆盖：{path}",
         "error.create.descriptionRequired": "技能简介不能为空", "error.create.bodyRequired": "技能正文不能为空", "error.create.tooLarge": "技能内容过长", "error.create.conflict": "同名技能已存在: {name}",
+        "error.create.reservedPath": "附件不能占用 SKILL.md（正文由本次创建写入）: {path}", "error.create.filesWithFlat": "单文件技能不能带附件：附件需要目录形态",
         "error.proto.forbidden": "禁止的修改请求（缺少客户端标记）", "error.proto.forbiddenHost": "禁止的请求来源（非法 Host）", "error.proto.contentType": "请求体必须是 application/json", "error.proto.method": "不支持的请求方法", "error.proto.unknownAction": "未知操作", "error.proto.bodyTooLarge": "请求体过大", "error.proto.invalidJson": "请求体不是合法 JSON", "error.proto.nonJson": "服务端返回非 JSON 响应（HTTP {status}）",
         "diagnostic.frontmatter.missing": "缺少完整 YAML frontmatter", "diagnostic.name.missing": "frontmatter 缺少 name", "diagnostic.name.invalid": "技能名需 kebab-case：{name}", "diagnostic.description.missing": "frontmatter 缺少 description", "diagnostic.invocation.invalid": "调用策略字段值无效", "diagnostic.shadowed": "被更高优先级来源 {root} 覆盖",
         "action.enable": "启用", "action.disable": "停用", "action.create": "创建", "action.delete": "删除", "action.restore": "恢复", "action.toggle": "启用或停用",
@@ -4192,24 +4267,24 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "mcp.stat.total": "服务", "mcp.stat.tools": "工具",
         "mcp.search": "搜索服务", "mcp.search.placeholder": "搜索服务名称、地址或命令",
         "mcp.btn.new": "新增", "mcp.btn.add": "添加", "mcp.btn.save": "保存", "mcp.btn.detail": "详情", "mcp.btn.edit": "编辑", "mcp.btn.remove": "删除",
-        "mcp.btn.enableAll": "全部启用", "mcp.btn.disableAll": "全部停用",
+        "mcp.btn.enableAll": "全部启用", "mcp.btn.restart.title": "重连服务，最长约 11 秒（启用状态不变）", "mcp.btn.restart": "重启", "mcp.btn.disableAll": "全部停用",
         "mcp.loading": "正在加载 MCP 服务…", "mcp.empty": "暂无 MCP，点「新增」添加", "mcp.empty.search": "没有匹配的服务。",
         "mcp.servers.count": "{count} 个服务", "mcp.tools.count": "{count} 个工具", "mcp.tools.countPartial": "{enabled}/{total} 个工具", "mcp.duplicate": "重复 id",
         "mcp.table.name": "服务名称与地址",
         "mcp.live.notLoaded": "未加载", "mcp.live.failed": "启动失败", "mcp.live.stopped": "未启用", "mcp.live.loading": "加载中", "mcp.live.noTools": "无可用工具", "mcp.live.running": "已启用",
-        "mcp.live.failedHint": "启动失败，检查配置后把开关关掉再打开重试", "mcp.live.offlineHint": "未连上：一个工具都没注册，但上次连上时它有 {count} 个工具。检查网络、命令或凭据后把开关关掉再打开重试", "mcp.live.neverHint": "从未连上过：一个工具都没注册过。检查命令、参数或凭据后把开关关掉再打开重试", "mcp.live.allOffHint": "工具全部被停用：当前没有可调用的工具（取消停用即恢复）",
+        "mcp.live.failedHint": "启动失败，检查配置后重新尝试", "mcp.live.offlineHint": "启动失败，检查配置后重新尝试", "mcp.live.neverHint": "启动失败，检查配置后重新尝试", "mcp.live.allOffHint": "工具全部被停用：当前没有可调用的工具（取消停用即恢复）",
         "mcp.note.prefix": "备注：", "mcp.toggleServer": "启停服务", "mcp.toggleTool": "启停工具",
-        "mcp.msg.ok": "操作成功", "mcp.msg.failed": "操作失败", "mcp.msg.loadFailed": "加载失败", "mcp.msg.warn": "操作完成，但加载器有提示：{warning}",
+        "mcp.msg.ok": "操作成功", "mcp.msg.failed": "操作失败", "mcp.msg.loadFailed": "加载失败", "mcp.msg.warn": "操作完成，但加载器有提示：{warning}", "mcp.msg.toolsRefreshed": "已取到 {count} 个工具", "mcp.msg.restartWarn": "已重启，但有告警：{warning}", "mcp.msg.restarted": "已重启：{name}",
         "mcp.form.addTitle": "新增 MCP", "mcp.form.editTitle": "编辑 MCP 服务：",
         "mcp.form.err.serverName": "服务名需为 1-32 位字母、数字、下划线或短横线（不能有空格与中文）", "mcp.form.err.url": "地址需以 http:// 或 https:// 开头", "mcp.form.err.command": "命令不能为空",
         "mcp.form.maskedHint": "密钥框里的打码值（如 ••••••）不是原文：直接保存不会改动它们，插件会保留补丁文件里的原值。要看原文请点「显示密钥」（本插件配了访问令牌的话，先填对令牌）。",
-        "mcp.field.serverName": "服务名称 serverName", "mcp.field.serverName.hint": "1-32 位 [A-Za-z0-9_-]，补丁里按此名注册",
+        "mcp.field.serverName": "服务名称", "mcp.field.serverName.hint": "1-32 位 [A-Za-z0-9_-]，补丁里按此名注册",
         "mcp.field.note": "备注（可选）", "mcp.field.note.placeholder": "给模型看的决策提示，比如「这台要 sudo 免密」；留空不写",
         "mcp.field.transport": "传输方式", "mcp.field.level": "级别",
         "mcp.field.level.project": "应用级（仅当前应用：{path}）", "mcp.field.level.global": "全局（跨应用：{path}）",
         "mcp.field.url": "服务 URL", "mcp.field.url.hint": "需以 http(s):// 开头",
         "mcp.field.command": "启动命令", "mcp.field.args": "参数（空格或换行分隔）",
-        "mcp.field.env": "环境变量（每行 key=value）", "mcp.field.env.hint": "路径按系统路径写法填（Windows 用 \\，macOS/Linux 用 /）。",
+        "mcp.field.env": "环境变量（每行 key=value）",
         "mcp.field.headers": "请求头（每行 key=value）",
         "mcp.detail.title": "服务详情：", "mcp.detail.config": "配置", "mcp.detail.showSecret": "显示密钥", "mcp.detail.hideSecret": "隐藏密钥",
         "mcp.btn.compact": "整理补丁", "mcp.btn.compact.title": "清掉补丁文件里已经不起作用的旧开关记录（每台服务的启用/停用状态不变）",
@@ -4217,23 +4292,22 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "mcp.compact.confirm": "确认整理", "mcp.compact.done": "补丁文件已整理：清掉 {count} 条失效的旧开关记录，服务的启用/停用状态未变", "mcp.compact.clean": "补丁文件已经很干净，没有可清理的旧记录",
         "mcp.detail.entryId": "条目 ID", "mcp.detail.status": "运行状态", "mcp.detail.loader": "Loader 登记", "mcp.detail.loader.yes": "已登记", "mcp.detail.loader.no": "未登记",
         "mcp.tools.stale": "上次运行时", "mcp.tools.expand": "展开", "mcp.tools.collapse": "收起",
-        "mcp.detail.note": "备注（随上下文注入发给模型；压制型预设下不注入时，用 mcp_manager_list 仍能读到）", "mcp.detail.note.placeholder": "例如：A 不可用时改用 B 兜底", "mcp.detail.note.save": "保存备注",
-        "mcp.detail.tools": "工具（{count}）",
+        "mcp.detail.note": "备注（随上下文注入发给模型）", "mcp.detail.note.placeholder": "例如：A 不可用时改用 B 兜底", "mcp.detail.note.save": "保存备注",
+        "mcp.detail.tools": "工具（{count}）", "mcp.detail.toolsRefresh": "刷新工具",
         "mcp.field.headersShort": "请求头", "mcp.field.envShort": "环境变量",
         "mcp.tools.loading": "正在获取工具列表…", "mcp.tools.loadFailed": "加载工具失败：", "mcp.tools.none": "该服务暂无已注册工具。",
         "mcp.tools.note": "停用的工具对模型不可见，改动即时生效",
         "mcp.remove.title": "删除 MCP 服务", "mcp.remove.desc": "确定要删除「{name}」？配置将从补丁文件移除、工具立即下线，不可撤销",
         "mcp.err.warnings": "读取补丁告警：",
-        "mcp.importJson.btn": "导入", "mcp.importJson.title": "从 JSON 导入 MCP 服务器",
-        "mcp.importJson.hint": "认 mcpServers 映射、rows 数组与裸数组三种写法；提交前核对名字与传输方式。",
-        "mcp.importJson.placeholder": "粘贴 {\"mcpServers\": {…}}、{\"rows\": […]} 或数组",
+        "mcp.importJson.btn": "导入", "mcp.importJson.title": "导入 MCP 服务器（补丁片段 / JSON）",
+        "mcp.importJson.hint": "认 dsh 补丁片段（- insert: 块）与 mcpServers / rows / 裸数组 JSON；提交前核对名字与传输方式。",
         "mcp.importJson.orPaste": "或粘贴在上面的输入框里",
-        "mcp.importJson.secretHint": "这批配置带环境变量 / 请求头：值按原样写入补丁文件，明文密钥会被一起带出去。打码串（••••）不会入库，插件用补丁里的旧真值顶替。",
+        "mcp.importJson.secretHint": "含密钥 / 请求头的条目按明文写入补丁文件；打码串（••••）不入库，沿用补丁里的旧值。",
         "mcp.importJson.parseError": "解析失败：{error}",
-        "mcp.importJson.parseError.shape": "没认出可导入的结构：需要 {\"mcpServers\": {…}}、{\"rows\": […]} 或数组",
-        "mcp.importJson.empty": "没有条目：这份 JSON 里一条服务器都没有",
+        "mcp.importJson.parsing": "补丁片段解析中…",
+        "mcp.importJson.parseError.shape": "没认出可导入的结构：需要 dsh 补丁片段（- insert: 块），或 {\"mcpServers\": {…}}、{\"rows\": […]}、数组",
+        "mcp.importJson.empty": "没有条目：这段内容里没有一条 MCP 服务器",
         "mcp.importJson.bigBatch": "这一批 {count} 条，建议分批导入（一次发整批，中途失败不好定位）",
-        "mcp.importJson.preview.name": "服务名与连接参数", "mcp.importJson.preview.state": "状态",
         "mcp.importJson.preview.secret": "{count} 项密钥/请求头",
         "mcp.importJson.disabled": "导入后停用",
         "mcp.importJson.original": "原名：{name}",
@@ -4246,7 +4320,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "mcp.importJson.argsIgnored": "参数形状不认识，已忽略",
         "mcp.importJson.kvIgnored": "{key} 不是对象，已忽略",
         "mcp.importJson.ignoredFields": "已忽略未知字段：{keys}",
-        "mcp.importJson.conflict.skip": "跳过重名", "mcp.importJson.conflict.overwrite": "覆盖重名",
+        "mcp.importJson.conflict.label": "重名时", "mcp.importJson.conflict.skip": "跳过重名", "mcp.importJson.conflict.overwrite": "覆盖重名",
         "mcp.importJson.chosen": "已选 {count} 条",
         "mcp.importJson.submit": "导入 {count} 条", "mcp.importJson.busy": "导入中…",
         "mcp.importJson.none": "没有可导入的条目（非法的那几条不能勾选）",
@@ -4378,7 +4452,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // 点完"应用"才知道自己存的是一段会被原样注入的字。
         "prompts.kind.label": "提示词类型",
         "prompts.kind.global": "全局提示词", "prompts.kind.quick": "快捷提示词",
-        "prompts.kind.global.hint": "应用后写入 AGENTS.md，下一轮对话生效；可被场景绑定。",
+        "prompts.kind.global.hint": "应用于全局 AGENTS.md，启动后下一轮对话注入",
         "prompts.kind.quick.hint": "对话框使用：将提示词输入对话框。",
         "prompts.group.global": "全局提示词", "prompts.group.quick": "快捷提示词", "prompts.bulk.quick": "把这一组里当前可见的快捷提示词全部打开 / 全部关闭", "prompts.bulk.failed": "{done} 条已改，{failed} 条没改成",
         "quickprompt.stat": "快捷提示词",
@@ -4400,7 +4474,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "compat.ov.slashCommands.onTools": "只开「工具」段", "compat.ov.slashCommands.onQuick": "只开「快捷提示词」段",
         "compat.ov.slashCommands.off": "两段都已关闭（本页可重新打开）",
         "compat.slash.title": "斜杠命令入口（重启后生效）",
-        "compat.slash.tools": "「工具」", "compat.slash.tools.desc": "对话框使用\"/\"控制插件功能",
+        "compat.slash.tools": "「智能调度台」", "compat.slash.tools.desc": "对话框使用\"/\"控制插件功能",
         "compat.slash.quick": "「快捷提示词」", "compat.slash.quick.desc": "一键把预设提示词输入对话框",
         "compat.slash.live.on": "已生效", "compat.slash.live.off": "未生效",
         "compat.slash.mount.registered": "本次启动已挂上", "compat.slash.mount.pending": "还没挂上（宿主服务未就绪）", "compat.slash.mount.unregistered": "本次启动已撤下",
@@ -4519,28 +4593,37 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // —— 「或」读起来像"二选一"，而这些工具是真能都做的（`save` 既是新建也是修改，
         // `switch` 既能开也能关）。0.14.x 之前写成「保存一条记忆」这类带量词的说法，读起来
         // 只像"新建"，与 upsert 的实际行为对不上（用户 2026-09-23 指出）。
+        // 2026-10-15（用户：统一模板格式、简洁简约）：行内一律收成 `<动词> + <对象>` 两个词，
+        // 不带任何补充从句 —— 动词按语义固定（列出 / 读 / 进入·退出 / 启用·停用 / 新建·修改 /
+        // 删除·恢复 / 派 / 应用），对象词每域固定（场景 / 记忆 / 服务器 / 技能 / 人设 / 全局提示词）。
+        // 详情（"还列了什么、边界在哪"）一律下放到悬停那一档，行内不再抢。
         // 悬停补"什么时候用、会改到什么、边界在哪"。键按工具名拼（`compat.tools.about.<工具名>`），
         // 工具改名 = 换身份，这两组键要跟着改（取不到时界面留空、不显示键名）。
-        "compat.tools.about.memory_manager_list": "列出记忆与启停",
-        "compat.tools.about.memory_manager_read": "按 id 读记忆正文",
+        "compat.tools.about.scene_manager_list": "列出场景",
+        "compat.tools.about.scene_manager_switch": "进入/退出场景",
+        "compat.tools.about.scene_manager_save": "新建/修改场景",
+        "compat.tools.about.scene_manager_remove": "删除/恢复场景",
+        "compat.tools.about.memory_manager_list": "列出记忆",
+        "compat.tools.about.memory_manager_read": "读记忆正文",
         "compat.tools.about.memory_manager_switch": "启用/停用记忆",
         "compat.tools.about.memory_manager_save": "新建/修改记忆",
-        "compat.tools.about.scene_manager_list": "列出场景、档案与启停",
-        "compat.tools.about.scene_manager_switch": "进入/退出场景",
-        "compat.tools.about.scene_manager_save": "新建/修改场景、写档案、绑提示词",
-        "compat.tools.about.mcp_manager_list": "列出服务器与工具",
-        "compat.tools.about.mcp_manager_switch": "启停/重启服务器",
-        "compat.tools.about.mcp_manager_save": "新增/修改服务器",
-        "compat.tools.about.skill_manager_list": "列出技能、启停与路径",
-        "compat.tools.about.skill_manager_read": "按名字读技能正文",
-        "compat.tools.about.skill_manager_switch": "启用/停用技能或技能目录",
+        "compat.tools.about.memory_manager_remove": "删除/恢复记忆",
+        "compat.tools.about.mcp_manager_list": "列出服务器",
+        "compat.tools.about.mcp_manager_switch": "启用/停用服务器",
+        "compat.tools.about.mcp_manager_save": "新建/修改服务器",
+        "compat.tools.about.skill_manager_list": "列出技能",
+        "compat.tools.about.skill_manager_read": "读技能正文",
+        "compat.tools.about.skill_manager_switch": "启用/停用技能",
         "compat.tools.about.skill_manager_save": "新建/修改技能",
-        "compat.tools.about.subagent_manager_list": "列出人设与描述",
-        "compat.tools.about.subagent_manager_run": "按人设派子智能体",
+        "compat.tools.about.skill_manager_remove": "删除/恢复技能",
+        "compat.tools.about.subagent_manager_list": "列出人设",
+        "compat.tools.about.subagent_manager_run": "派子智能体",
         "compat.tools.about.subagent_manager_switch": "启用/停用人设",
         "compat.tools.about.subagent_manager_save": "新建/修改人设",
-        "compat.tools.about.prompt_manager_list": "列出全局提示词预设",
-        "compat.tools.about.prompt_manager_apply": "应用一份全局提示词预设",
+        "compat.tools.about.subagent_manager_remove": "删除/恢复人设",
+        "compat.tools.about.prompt_manager_list": "列出全局提示词",
+        "compat.tools.about.prompt_manager_apply": "应用全局提示词",
+        "compat.tools.about.prompt_manager_remove": "删除/恢复全局提示词",
         "compat.tools.hover.memory_manager_list": "列出记忆的 id、所属场景、启停与一句话描述，并标明注入按哪个场景走。默认只列这次真的会注入的记忆；all=true 会把停用、场景未启用、被同名覆盖的一起列出来。场景本身（档案、绑定的预设、锁没锁）在 scene_manager_list。只看不改。",
         "compat.tools.hover.memory_manager_read": "按 id（<场景>/<名字>）读一条记忆的完整正文。清单里只有一句话描述，要看正文就用它 —— 尤其是被停用、场景没启用、或被体积预算挤掉的记忆。",
         "compat.tools.hover.memory_manager_switch": "只拨索引里的开关，.md 文件一个字不动，随时能拨回来。停用的记忆不再进上下文，等于把注入预算让给别人 —— 想省 token 优先用它，而不是删。",
@@ -4553,7 +4636,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "compat.tools.hover.mcp_manager_save": "新增一台服务器（streamable-http 或 stdio），或改掉同名的那台 —— 回执会说清走了哪条。改的时候**没传的字段保持原样**，所以改一个 URL 不必重述整条配置（密钥也不会因此丢）；stdio 的 command+args 就是宿主真正会 spawn 的命令，改它会弹确认卡。只在用户明确要求时用。",
         "compat.tools.hover.skill_manager_list": "列出技能的启停、生效还是被同名覆盖、源文件路径。常驻目录只带名字和摘要，所以「我怎么关了它」「同名哪份生效」要看这个；all=true 连停用与影子副本一起列。",
         "compat.tools.hover.skill_manager_read": "按名字读某个技能的 SKILL.md 正文（目录里只有名字和摘要）。同名多份时取真正生效的那一份；要特意看某个被覆盖的副本就传 root。会话里已有官方 skill 工具时这条不下发。",
-        "compat.tools.hover.skill_manager_switch": "按技能名或按来源目录启停。停用的技能不进目录也不能被加载；同名冲突时只有生效的那份有用 —— 启错了副本等于没启。",
+        "compat.tools.hover.skill_manager_switch": "按技能名或按来源目录启停。停用的技能不进目录也不能被加载；同名冲突时只有生效的那份有用 —— 启错了副本等于没启。不给 root 就按名字在所有来源里找生效的那一份（新建技能落在 hub，不传 root 也能直接启停）。给了 prefer 就改「同名首选」：true 让 root 这一份胜出，false 撤掉这次选择（与面板上那颗「启用这个」同一条路，不用再去界面点）。",
         "compat.tools.hover.skill_manager_save": "新建一个技能，或改掉本插件自己写的那份同名技能 —— 回执会说清走了哪条。落点是 hub 的 tool-management/skills/（与界面「创建技能」一致），新建的默认停用、要用得先启用；官方根里的技能不改。技能目录会进每一轮上下文，描述要写清「什么时候用它」。",
         "compat.tools.hover.subagent_manager_list": "列出可用人设（子智能体的角色定义）与各自的描述。常驻目录给的是同一份清单；这个工具拿到的永远是当前完整版，包括目录没注入到的会话。",
         "compat.tools.hover.subagent_manager_run": "把任务交给某个具名人设：它拿到人设当自己的系统提示词、在自己的上下文里做完、只回最终结果。开 inherit 它会看到本次会话已完成的对话。花真 token，默认要用户确认。",
@@ -4561,6 +4644,13 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "compat.tools.hover.subagent_manager_save": "新建人设，或改掉已存在的那份 —— 回执会说清走了哪条。可改名字、描述、正文（正文会作为子代理的系统提示词）与输出要求，没传的字段保持原样；改名会连带改场景与档案里的绑定。provider / 模型 / 工具限制只留给面板（模型看不到自己改对了没有，所以不给）。描述决定模型什么时候会选它。",
         "compat.tools.hover.prompt_manager_list": "列出全局提示词预设（写进 AGENTS.md 的那一类）与摘要，标明当前生效的是哪一份 —— 同时只有一份生效。要换用哪份之前先用它确认名字。快捷提示词不在这个域里：那是用户自己在输入框里点出来的一段话，不进上下文，模型这边没有可做的动作。",
         "compat.tools.hover.prompt_manager_apply": "把某份预设应用到用户级 AGENTS.md，之后的对话立刻按它走。一次只有一份在生效，换一份就是替换上一份。",
+        // 删除族（2026-10-15）统一悬停模板：`把<对象>移进回收站、从回收站恢复，或列出回收站。
+        // 删除可恢复；永久删除在「<页>」页的回收站里做。` —— 五条同形，只换对象词与页名。
+        "compat.tools.hover.scene_manager_remove": "把场景移进回收站、从回收站恢复，或列出回收站。删除可恢复；永久删除在「场景」页的回收站里做。",
+        "compat.tools.hover.memory_manager_remove": "把记忆移进回收站、从回收站恢复，或列出回收站。删除可恢复 —— 只想让它别再注入就用 switch 停用，不必删；永久删除在「记忆」页的回收站里做。",
+        "compat.tools.hover.skill_manager_remove": "把技能移进回收站、从回收站恢复，或列出回收站。删除可恢复 —— 只想让模型别再看到它就用 switch 停用；trash 时传 root 指定技能所在来源（不给就按名字在所有来源里找，与 save 的落点无关）；永久删除在「技能」页的回收站里做。",
+        "compat.tools.hover.subagent_manager_remove": "把人设移进回收站、从回收站恢复，或列出回收站。删除可恢复 —— 只想让它别进目录就用 switch 停用；永久删除在「子智能体」页的回收站里做。",
+        "compat.tools.hover.prompt_manager_remove": "把全局提示词预设移进回收站、从回收站恢复，或列出回收站。删除可恢复；永久删除在「提示词」页的回收站里做。",
         "compat.live.title": "注入实况", "compat.live.hint": "模型实际看到的内容（只读）",
         "compat.live.never": "这段对话还没投过", "compat.live.delivered": "本段对话已投递 {count} 条 · 最近 {time}",
         "compat.live.copy": "复制全文", "compat.live.copied": "已复制", "compat.live.noAgent": "还没有会话：发一条消息后再来看",
@@ -4616,6 +4706,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
        
         "scenes.mem.title": "记忆", "scenes.mem.search": "在本场景内筛选记忆（名称或描述）",
         "scenes.mem.noMatch": "没有匹配项", "scenes.mem.emptyScene": "该场景还没有记忆",
+        "scenes.mem.createNeedScene": "先在左边填好场景名", "scenes.mem.pending": "{count} 条待创建", "scenes.mem.pendingTag": "待创建", "scenes.mem.removePending": "移除",
+        "scenes.mem.pendingTagTitle": "点「创建」时按那时的场景名落盘；勾上的，建好后直接开启",
+        "scenes.mem.created": "已建 {count} 条记忆", "scenes.mem.createFailed": "{count} 条记忆没能创建：{items}", "scenes.mem.incomplete": "{count} 条记忆建好了但没配全：{items}",
         "memory.mode.current": "当前模式", "memory.mode.exit": "退出模式",
         "memory.archive.edit": "档案", "memory.archive.title": "场景档案",
         "memory.archive.tools": "MCP 工具集", "memory.archive.skills": "技能集", "memory.archive.subagents": "子智能体集", "memory.archive.memories": "记忆集", "memory.archive.applyFailed": "运行时未能应用：{reason}",
@@ -4634,7 +4727,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "memory.budget.truncated": "超出预算，段尾已列出未注入的记忆",
         "memory.budget.dropped": "本次未注入：{names}",
         "memory.scene.enable": "启用", "memory.scene.enableAll": "全部启用", "memory.scene.off": "未启用", "memory.scene.shared": "常开", "memory.scene.global.tag": "常驻",
-        "memory.scene.global": "全局", "memory.scene.count": "{count} 条记忆", "memory.scene.new": "新建记忆", "memory.scene.browse": "选择已有",
+        "memory.scene.global": "全局", "memory.scene.count": "{count} 条记忆", "memory.scene.new": "新建记忆",
         "memory.scene.empty": "该场景暂无记忆",
         "memory.scene.orphan": "未归属场景", "memory.scene.orphan.tag": "不会注入", "memory.scene.orphan.hint": "这些记忆直接放在 memories/ 根层，没有归属场景，因此不会被注入上下文。请把它们移入某个场景目录（或放到 memories/global/ 作为「全局」记忆）。",
         "memory.scene.edit": "改描述", "memory.scene.editTitle": "修改场景", "memory.scene.editHelp": "名称就是它的记忆目录名；改名会连目录、档案与绑定一起改，记忆正文不动。",
@@ -4649,13 +4742,12 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "memory.form.flat": "flat", "memory.form.bundle": "bundle", "memory.derived": "派生", "memory.fill.frontmatter": "补齐 frontmatter",
         "memory.shadowed.hint": "同名 bundle 存在，本条不加载",
         "memory.create.title": "新建记忆", "memory.edit.title": "编辑记忆", "memory.edit.group.lock": "编辑时场景不可修改",
-        "memory.field.group": "场景", "memory.field.group.placeholder": "例如 办公", "memory.field.group.hint": "留空 = 全局",
+        "memory.field.group": "场景",
         "memory.field.name": "名称", "memory.field.name.placeholder": "例如 站会流程", "memory.name.invalid": "名称不合法（非空、≤64 字符、不含 / \\ < > : \" | ? *、不以 . 开头）",
         "memory.field.description": "描述", "memory.field.description.placeholder": "一句话说明用途（留空取正文首行）",
         "memory.field.body": "正文（Markdown）", "memory.field.body.placeholder": "写下要记住的约定、流程和边界…",
         "memory.field.form": "形态(flat是单文件；bundle可携带附件)", "memory.field.attach": "附件",
-        "memory.attach.add": "添加附件", "memory.attach.empty": "暂无附件", "memory.attach.pending": "待上传", "memory.attach.remove": "移除附件",
-        "memory.attach.hint": "附件随记忆存放，不会进入提示词",
+        "memory.attach.add": "添加附件", "memory.attach.pending": "待上传", "memory.attach.remove": "移除附件",
         "memory.attach.count.one": "{count} 个附件", "memory.attach.count.other": "{count} 个附件",
         "memory.attach.tip": "点击管理附件：{count} 个 · 共 {size} —— {names}",
         "memory.attach.tip.empty": "还没有附件——点击添加",
@@ -4687,14 +4779,14 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // "不影响委派"，半句不解释"那影响什么"，留着比不留更费解。
         "subagents.field.model": "模型", "subagents.field.provider": "模型来源",
         "subagents.field.offCatalog": "{id} · 目录里没有",
-        "subagents.field.catalogDepth": "目录注入", "subagents.field.catalogDepth.onlyTop": "只在顶层", "subagents.field.catalogDepth.toChild": "顶层和子会话", "subagents.field.catalogDepth.toGrand": "顶层和两层子会话", "subagents.field.catalogDepth.unlimited": "不限制嵌套",
+        "subagents.field.catalogDepth": "目录注入", "subagents.field.catalogDepth.d1": "1层", "subagents.field.catalogDepth.d2": "2层", "subagents.field.catalogDepth.d3": "3层", "subagents.field.catalogDepth.unlimited": "无限",
         // 允许追问（0.19.0）。界面只留复选框副标题那一行 —— 机制（官方 startContinuable / 结算通知 /
         // 返回指引）与代价（占用可继续子代理名额、需要持久化与 session query）留在 CHANGELOG 与
         // README（2026-10-07 用户裁定：高级选项里的提示句太密，长说明一律不进表单）。
-        "subagents.field.continuable": "允许追问（后台运行）", "subagents.field.continuable.short": "回执一个 id，之后还能继续对话",
+        "subagents.field.continuable": "追问", "subagents.field.continuable.on": "允许", "subagents.field.continuable.off": "禁止",
         // 收起态摘要用的两个「尾巴」。分隔号写在值里（而不是在代码里 join '；'）：英文侧要用
         // "; "，中文用「；」，写进词典才不用为语言改代码。空串 = 这一项没值，整段不出现。
-        "subagents.adv.continuable": "；允许追问（后台运行）",
+        "subagents.adv.continuable": "；可追问",
         "subagents.adv.legacy": "；旧格式：白名单 {allow} / 黑名单 {deny}",
         // 思考强度（0.14.0）。界面上只留"这一格现在能选什么"与**状态**（未选模型 / 拉取中 / 拉不到），
         // 不解释机制 —— 官方语义（改 provider/model 会丢掉继承值、不支持的档位直接拒）记在
@@ -4735,13 +4827,12 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "memory.import": "导入", "memory.import.title": "导入记忆", "memory.import.scene": "导入到场景",
         "memory.result.imported": "已导入 {count} 条记忆：{names}",
         "memory.import.scenesCreated": "为此新建了场景：{names}",
-        "memory.scene.global.hint": "全局",
        "import.clear": "清空选择", "import.submit": "导入",
         "import.none": "没有导入任何文件（全部被跳过）", "import.skipped": "已跳过：{items}",
         "error.import.noFiles": "没有选择要导入的文件",
         "nav.title": "工具",
-        "agm.stat.total": "全局提示词", "agm.stat.active": "生效中", "agm.loading": "加载中…", "agm.empty": "暂无提示词，点「新增」创建", "agm.empty.search": "没有匹配的提示词", "agm.search.placeholder": "搜索提示词 id 或描述", "agm.btn.delete.blocked.refs": "不能删除：{refs}。先解除引用再删 —— 场景绑定的去场景页换绑提示词、或退出场景；正被应用的那份先点左边那颗开关「取消应用」。", "agm.ref.sep": "；", "agm.ref.scene": "场景「{scene}」绑定了它", "agm.ref.sceneActive": "场景「{scene}」（已启用）绑定了它", "agm.ref.file": "AGENTS.md 当前内容就是它", "agm.ref.fileApplied": "它正被应用在 AGENTS.md 里（当前生效的那一份）", "agm.ref.restore": "退出场景后要恢复的全局提示词", "agm.sceneLock.notice": "场景「{scene}」接管中：当前生效的是它绑定的「{id}」。在这里应用别的预设 = 把该场景改绑到那一份（会同步写入场景档案）。", "agm.active": "生效中", "agm.active.hint.scene": "当前生效：场景「{scene}」绑定的提示词预设", "agm.active.hint.file": "当前生效：AGENTS.md 就是这一份", "agm.inactive": "未生效", "agm.file.applied": "文件里是它", "agm.file.applied.hint": "AGENTS.md 当前内容是它；启用的场景绑了别的提示词，切换场景时已按场景把文件改成那一份", "agm.apply.hint": "应用后写入 AGENTS.md；宿主每轮重读该文件，下一轮对话生效", "agm.apply.switch": "应用提示词", "agm.apply.switch.on": "当前生效的就是这一份 · 点一下重新写回 AGENTS.md（撤销手动改动）", "agm.applyModal.title": "应用预设", "agm.edit.title": "编辑预设", "agm.remove.title": "删除预设", "agm.btn.edit": "编辑", "agm.btn.delete": "删除", "agm.btn.new": "新增", "agm.new.title": "新增提示词", "agm.btn.import": "导入", "agm.result.imported": "已导入 {count} 份预设：{names}", "agm.btn.save": "保存", "agm.btn.create": "创建", "agm.btn.confirmRemove": "确认删除", "agm.btn.confirmApply": "确认应用", "agm.field.id": "id（目录名）", "agm.field.id.hint": "允许中文、空格、点；不能含斜杠/反斜杠与 : * ? < > 等符号；≤64 字符，改 id 即目录改名。", "agm.field.id.placeholder": "例如：工作基线", "agm.field.content": "内容", "agm.field.content.placeholder": "直接写这份预设的正文（Markdown）；留空 = 用空白模板", "agm.field.desc": "描述（模型在清单里看得到）", "agm.field.desc.placeholder": "这份预设是干什么的、什么时候用它", "agm.result.renamed": "已保存，id 改为「{id}」", "agm.result.rebound": "（同步了 {count} 个场景的绑定）", "agm.remove.suffix": " ？此操作不可恢复。", "agm.apply.prefix": "将把 ", "agm.apply.suffix": " 的内容写入 ~/.dsh/AGENTS.md。", "agm.apply.note": "下一轮对话生效；当前内容已备份到 __last-applied__（保留最近 5 代）", "agm.unapply.title": "取消应用", "agm.unapply.body": "将把 ~/.dsh/AGENTS.md 恢复成开始应用提示词之前的那份内容（__last-applied__ 里保存的），此后不再有任何提示词预设生效。", "agm.unapply.note": "回到的是开始应用之前的那一份，中途应用过别的预设也一并撤销 —— 想换成其中某一份，直接点它自己的开关即可（效果等价）。这一步本身也会备份，可以再应用回来。", "agm.btn.confirmUnapply": "确认取消应用", "agm.unapply.switch.on": "AGENTS.md 里就是这一份 · 点一下取消应用（把 AGENTS.md 恢复成开始应用之前的内容）", "agm.unapply.switch.blocked": "AGENTS.md 里就是这一份，但没有「应用之前的状态」可恢复 —— 它不是由「应用」写进去的，所以关不掉。要改掉文件内容请应用别的预设或直接编辑 AGENTS.md；删除这份预设不会改动 AGENTS.md", "agm.unapply.switch.onRemove": "AGENTS.md 里就是这一份 · 点一下取消应用（开始应用之前没有 AGENTS.md，这一步会把它删掉）", "agm.unapply.bodyRemove": "开始应用提示词之前 ~/.dsh/AGENTS.md 并不存在，所以取消应用会把这个文件删掉（而不是写回内容），此后不再有任何提示词预设生效。", "agm.unapply.noteRemove": "删掉的是「应用」写进去的内容；这一份已备份到 __last-applied__（保留最近 5 代），需要时可以再应用回来。", "agm.btn.confirmUnapplyRemove": "确认取消应用并删除文件", "agm.result.unapplied": "已取消应用：AGENTS.md 已恢复成开始应用之前的内容", "agm.result.unappliedRemove": "已取消应用：AGENTS.md 已删除（开始应用之前它不存在）", "agm.unapply.unavailable": "AGENTS.md 的当前内容不是由「应用」写进去的（例如首次打开时自动生成的那份预设），没有「应用之前的状态」可恢复，所以关不掉。要改掉文件里的内容：应用别的预设，或直接编辑 AGENTS.md 本身；删除这份预设不会改动 AGENTS.md。", "agm.remove.fileNote": "注意：AGENTS.md 里仍然是这份内容，全局提示词照旧生效 —— 删除预设只把它移进回收站，不会改动 AGENTS.md。要让它不再生效，请改 AGENTS.md 本身或应用别的预设。", "hist.err.load": "加载失败", "hist.err.unarchive": "恢复失败", "hist.err.delete": "删除失败", "hist.err.retention": "设置失败", "hist.err.import": "导入失败", "hist.err.sessions": "加载会话列表失败", "hist.err.export": "导出失败", "hist.err.archive": "归档失败", "hist.retention.forever": "永久保留", "hist.retention.days": "{count} 天", "hist.arch.all": "全部会话", "hist.arch.archived": "仅已归档", "hist.arch.live": "仅未归档", "hist.arch.missing": "仅目录丢失", "hist.ws.all": "全部工作区", "hist.ungrouped": "未分组", "hist.group.removed": "已移除", "hist.group.removed.hint": "该目录当前在 DSH 里没有工作区登记；分组按会话目录重建，重新登记后会自动并回同一组", "hist.group.dirMissing": "原目录不存在", "hist.group.dirMissing.hint": "工作区目录已从磁盘删除，无法重新登记；组内会话仍可恢复（归入未分组）或永久删除", "hist.btn.registerWs": "重新登记", "hist.btn.registerWs.hint": "重新登记这个目录，并把该目录下已有的会话挂回该组（只写工作区记账，不移动、不删除文件与会话）", "hist.register.title": "重新登记？", "hist.register.body": "将为「{title}」在 DSH 中重新创建一条工作区登记，并把该目录下已有的会话挂回这个工作区（恢复其分组）。只写工作区记账，不移动、不删除任何文件与会话。", "hist.register.confirm": "确认登记", "hist.register.done.title": "已重新登记", "hist.register.done.body": "工作区「{title}」已登记；该目录下的归档会话会在刷新后并入这一组。", "hist.register.done.attached": "已把该目录下 {count} 个已有会话挂回这个工作区。", "hist.register.done.skipped": "{count} 个会话未能挂回：{reason}", "hist.err.register": "登记失败", "scenes.field.prompt": "全局提示词",
-        "scenes.field.prompt.none": "无", "scenes.agents.note.applied": "已把「{id}」写入 AGENTS.md", "scenes.agents.note.restored": "已恢复进场景前的 AGENTS.md", "scenes.agents.note.error": "AGENTS.md 未写入：{reason}", "scenes.agents.note.baselineLost": "⚠ 退出场景时将恢复不回原来的 AGENTS.md：{reason}", "scenes.prompt.activeTag": "生效中", "scenes.prompt.noPresets": "还没有提示词预设；可先去「提示词」页新建一个。", "scenes.prompt.bound": "提示词：{id}", "scenes.prompt.live": "提示词生效中：{id}", "scenes.prompt.missing": "预设不存在：{id}", "scenes.prompt.tag.hint": "这个场景绑定的提示词预设", "scenes.prompt.mismatch.hint": "场景绑定的「{id}」与 AGENTS.md 当前内容不一致（可能被手动改过）；到提示词页对它点「重新应用」写回", "scenes.enable.blocked": "已启用场景「{name}」；先关掉它才能启用别的", "scenes.result.created.collapsed": "场景「{name}」已创建，默认不启动（原先的「全部启用」已收敛为单选）", "scenes.legacyAll": "检测到 {count} 个场景同时处于启用状态（历史「全部启用」遗留）；除「全局」外同时只能启用一个。", "scenes.legacyAll.fix": "收敛为单选", "scenes.preview.title": "进入场景「{name}」前，先看一眼会改什么", "scenes.preview.loading": "正在计算这次会改什么…", "scenes.preview.failed": "预览没算出来：{error}", "scenes.preview.enter": "确认进入", "scenes.preview.dismiss": "不再显示", "scenes.preview.dismiss.title": "关闭这张卡，并且以后进入场景前不再弹（想恢复用页面右上角的「开启提醒」）", "scenes.preview.toggle.off": "关闭提醒", "scenes.preview.toggle.on": "开启提醒", "scenes.preview.toggle.title": "进入场景前先弹一张「会改什么」的卡", "scenes.preview.nochange": "什么都不用改：当前运行时已经和这个场景要的一致了。", "scenes.preview.noArchive": "这个场景还没保存过档案 —— MCP / 技能 / 人设三个域都按「一个都没勾」处理，进入即全部停用。", "scenes.preview.exitFirst": "先退出「{scene}」：它改过的东西按进场景前的快照还原。", "scenes.preview.exitNoSnapshot": "当前在场景「{scene}」里，但进场景前的快照已丢失：退出只能清掉模式标记，运行时回不到原样。", "scenes.preview.row.serversOn": "启用 {count} 台 MCP 服务器：{names}", "scenes.preview.row.serversOff": "停用 {count} 台 MCP 服务器：{names}", "scenes.preview.row.toolsOn": "放回 {count} 个 MCP 工具：{names}", "scenes.preview.row.toolsOff": "停用 {count} 个 MCP 工具：{names}", "scenes.preview.row.sourcesOn": "启用 {count} 个技能目录：{names}", "scenes.preview.row.sourcesOff": "停用 {count} 个技能目录：{names}", "scenes.preview.row.skillsOn": "启用 {count} 个技能：{names}", "scenes.preview.row.skillsOff": "停用 {count} 个技能：{names}", "scenes.preview.row.personasOn": "启用 {count} 个人设：{names}", "scenes.preview.row.personasOff": "停用 {count} 个人设：{names}", "scenes.preview.enter.servers": "启用 {count} 台 MCP：{names}", "scenes.preview.enter.memories": "启用 {count} 条记忆：{names}", "scenes.preview.enter.personas": "启用 {count} 个子智能体：{names}", "scenes.preview.enter.personasNone": "子智能体一个都不启用",
+        "agm.stat.total": "全局提示词", "agm.stat.active": "生效中", "agm.loading": "加载中…", "agm.empty": "暂无提示词，点「新增」创建", "agm.empty.search": "没有匹配的提示词", "agm.search.placeholder": "搜索提示词 id 或描述", "agm.btn.delete.blocked.refs": "不能删除：{refs}。先解除引用再删 —— 场景绑定的去场景页换绑提示词、或退出场景；正被应用的那份先点左边那颗开关「取消应用」。", "agm.ref.sep": "；", "agm.ref.scene": "场景「{scene}」绑定了它", "agm.ref.sceneActive": "场景「{scene}」（已启用）绑定了它", "agm.ref.file": "AGENTS.md 当前内容就是它", "agm.ref.fileApplied": "它正被应用在 AGENTS.md 里（当前生效的那一份）", "agm.ref.restore": "退出场景后要恢复的全局提示词", "agm.sceneLock.notice": "场景「{scene}」接管中：当前生效的是它绑定的「{id}」。在这里应用别的预设 = 把该场景改绑到那一份（会同步写入场景档案）。", "agm.active": "生效中", "agm.active.hint.scene": "当前生效：场景「{scene}」绑定的提示词预设", "agm.active.hint.file": "当前生效：AGENTS.md 就是这一份", "agm.inactive": "未生效", "agm.file.applied": "文件里是它", "agm.file.applied.hint": "AGENTS.md 当前内容是它；启用的场景绑了别的提示词，切换场景时已按场景把文件改成那一份", "agm.apply.hint": "应用后写入 AGENTS.md；宿主每轮重读该文件，下一轮对话生效", "agm.apply.switch": "应用提示词", "agm.apply.switch.on": "当前生效的就是这一份 · 点一下重新写回 AGENTS.md（撤销手动改动）", "agm.applyModal.title": "应用预设", "agm.edit.title": "编辑预设", "agm.remove.title": "删除预设", "agm.btn.edit": "编辑", "agm.btn.delete": "删除", "agm.btn.new": "新增", "agm.new.title": "新增提示词", "agm.btn.import": "导入", "agm.result.imported": "已导入 {count} 份预设：{names}", "agm.btn.save": "保存", "agm.btn.create": "创建", "agm.btn.confirmRemove": "确认删除", "agm.btn.confirmApply": "确认应用", "agm.field.id": "显示名称", "agm.field.id.hint": "允许中文、空格、点；不能含斜杠/反斜杠与 : * ? < > 等符号；≤64 字符，改 id 即目录改名。", "agm.field.id.placeholder": "例如：工作基线", "agm.field.content": "内容", "agm.field.content.placeholder": "直接写这份预设的正文（Markdown）", "agm.field.desc": "描述（模型在清单里看得到）", "agm.field.desc.placeholder": "这份预设是干什么的、什么时候用它", "agm.result.renamed": "已保存，id 改为「{id}」", "agm.result.rebound": "（同步了 {count} 个场景的绑定）", "agm.remove.suffix": " ？此操作不可恢复。", "agm.apply.prefix": "将把 ", "agm.apply.suffix": " 的内容写入 ~/.dsh/AGENTS.md。", "agm.apply.note": "下一轮对话生效；当前内容已备份到 __last-applied__（保留最近 5 代）", "agm.unapply.title": "取消应用", "agm.unapply.body": "将把 ~/.dsh/AGENTS.md 恢复成开始应用提示词之前的那份内容（__last-applied__ 里保存的），此后不再有任何提示词预设生效。", "agm.unapply.note": "回到的是开始应用之前的那一份，中途应用过别的预设也一并撤销 —— 想换成其中某一份，直接点它自己的开关即可（效果等价）。这一步本身也会备份，可以再应用回来。", "agm.btn.confirmUnapply": "确认取消应用", "agm.unapply.switch.on": "AGENTS.md 里就是这一份 · 点一下取消应用（把 AGENTS.md 恢复成开始应用之前的内容）", "agm.unapply.switch.blocked": "AGENTS.md 里就是这一份，但没有「应用之前的状态」可恢复 —— 它不是由「应用」写进去的，所以关不掉。要改掉文件内容请应用别的预设或直接编辑 AGENTS.md；删除这份预设不会改动 AGENTS.md", "agm.unapply.switch.onRemove": "AGENTS.md 里就是这一份 · 点一下取消应用（开始应用之前没有 AGENTS.md，这一步会把它删掉）", "agm.unapply.bodyRemove": "开始应用提示词之前 ~/.dsh/AGENTS.md 并不存在，所以取消应用会把这个文件删掉（而不是写回内容），此后不再有任何提示词预设生效。", "agm.unapply.noteRemove": "删掉的是「应用」写进去的内容；这一份已备份到 __last-applied__（保留最近 5 代），需要时可以再应用回来。", "agm.btn.confirmUnapplyRemove": "确认取消应用并删除文件", "agm.result.unapplied": "已取消应用：AGENTS.md 已恢复成开始应用之前的内容", "agm.result.unappliedRemove": "已取消应用：AGENTS.md 已删除（开始应用之前它不存在）", "agm.unapply.unavailable": "AGENTS.md 的当前内容不是由「应用」写进去的（例如首次打开时自动生成的那份预设），没有「应用之前的状态」可恢复，所以关不掉。要改掉文件里的内容：应用别的预设，或直接编辑 AGENTS.md 本身；删除这份预设不会改动 AGENTS.md。", "agm.remove.fileNote": "注意：AGENTS.md 里仍然是这份内容，全局提示词照旧生效 —— 删除预设只把它移进回收站，不会改动 AGENTS.md。要让它不再生效，请改 AGENTS.md 本身或应用别的预设。", "hist.err.load": "加载失败", "hist.err.unarchive": "恢复失败", "hist.err.delete": "删除失败", "hist.err.retention": "设置失败", "hist.err.import": "导入失败", "hist.err.sessions": "加载会话列表失败", "hist.err.export": "导出失败", "hist.retention.forever": "永久保留", "hist.retention.days": "{count} 天", "hist.arch.all": "全部会话", "hist.arch.archived": "仅已归档", "hist.arch.live": "仅未归档", "hist.arch.missing": "仅目录丢失", "hist.ws.all": "全部工作区", "hist.ungrouped": "未分组", "hist.group.removed": "已移除", "hist.group.removed.hint": "该目录当前在 DSH 里没有工作区登记；分组按会话目录重建，重新登记后会自动并回同一组", "hist.group.dirMissing": "原目录不存在", "hist.group.dirMissing.hint": "工作区目录已从磁盘删除，无法重新登记；组内会话仍可恢复（归入未分组）或永久删除", "hist.btn.registerWs": "重新登记", "hist.btn.registerWs.hint": "重新登记这个目录，并把该目录下已有的会话挂回该组（只写工作区记账，不移动、不删除文件与会话）", "hist.register.title": "重新登记？", "hist.register.body": "将为「{title}」在 DSH 中重新创建一条工作区登记，并把该目录下已有的会话挂回这个工作区（恢复其分组）。只写工作区记账，不移动、不删除任何文件与会话。", "hist.register.confirm": "确认登记", "hist.register.done.title": "已重新登记", "hist.register.done.body": "工作区「{title}」已登记；该目录下的归档会话会在刷新后并入这一组。", "hist.register.done.attached": "已把该目录下 {count} 个已有会话挂回这个工作区。", "hist.register.done.skipped": "{count} 个会话未能挂回：{reason}", "hist.err.register": "登记失败", "scenes.field.prompt": "全局提示词",
+        "scenes.field.prompt.none": "无", "scenes.agents.note.applied": "已把「{id}」写入 AGENTS.md", "scenes.agents.note.restored": "已恢复进场景前的 AGENTS.md", "scenes.agents.note.error": "AGENTS.md 未写入：{reason}", "scenes.agents.note.baselineLost": "⚠ 退出场景时将恢复不回原来的 AGENTS.md：{reason}", "scenes.prompt.activeTag": "生效中", "scenes.prompt.noPresets": "还没有提示词预设；可先去「提示词」页新建一个。", "scenes.prompt.bound": "提示词：{id}", "scenes.prompt.live": "提示词生效中：{id}", "scenes.prompt.missing": "预设不存在：{id}", "scenes.prompt.tag.hint": "这个场景绑定的提示词预设", "scenes.prompt.mismatch.hint": "场景绑定的「{id}」与 AGENTS.md 当前内容不一致（可能被手动改过）；到提示词页对它点「重新应用」写回", "scenes.enable.blocked": "已启用场景「{name}」；先关掉它才能启用别的", "scenes.result.created.collapsed": "场景「{name}」已创建，默认不启动（原先的「全部启用」已收敛为单选）", "scenes.legacyAll": "检测到 {count} 个场景同时处于启用状态（历史「全部启用」遗留）；除「全局」外同时只能启用一个。", "scenes.legacyAll.fix": "收敛为单选", "scenes.preview.title": "进入场景「{name}」前，先看一眼会改什么", "scenes.preview.loading": "正在计算这次会改什么…", "scenes.preview.failed": "预览没算出来：{error}", "scenes.preview.enter": "确认进入", "scenes.preview.dismiss": "不再显示", "scenes.preview.dismiss.title": "关闭这张卡，并且以后进入场景前不再弹（想恢复用页面右上角的「开启提醒」）", "scenes.preview.toggle.off": "关闭提醒", "scenes.preview.toggle.on": "开启提醒", "scenes.preview.toggle.title": "进入场景前先弹一张「会改什么」的卡", "scenes.preview.nochange": "什么都不用改：当前运行时已经和这个场景要的一致了。", "scenes.preview.noArchive": "这个场景还没保存过档案 —— MCP / 技能 / 人设三个域都按「一个都没勾」处理，进入即全部停用。", "scenes.preview.exitFirst": "先退出「{scene}」：它改过的东西按进场景前的快照还原。", "scenes.preview.exitNoSnapshot": "当前在场景「{scene}」里，但进场景前的快照已丢失：退出只能清掉模式标记，运行时回不到原样。", "scenes.preview.row.serversOn": "启用 {count} 台 MCP 服务器：{names}", "scenes.preview.row.serversOff": "停用 {count} 台 MCP 服务器：{names}", "scenes.preview.row.toolsOn": "放回 {count} 个 MCP 工具：{names}", "scenes.preview.row.toolsOff": "停用 {count} 个 MCP 工具：{names}", "scenes.preview.row.skillsOn": "启用 {count} 个技能：{names}", "scenes.preview.row.skillsOff": "停用 {count} 个技能：{names}", "scenes.preview.row.personasOn": "启用 {count} 个人设：{names}", "scenes.preview.row.personasOff": "停用 {count} 个人设：{names}", "scenes.preview.enter.servers": "启用 {count} 台 MCP：{names}", "scenes.preview.enter.memories": "启用 {count} 条记忆：{names}", "scenes.preview.enter.personas": "启用 {count} 个子智能体：{names}", "scenes.preview.enter.personasNone": "子智能体一个都不启用",
         // 绑定三行（预览卡第一段）：一律 `标签：值`，"保持现状"必须带当前那份的名字。
         "scenes.preview.bind.prompt": "全局提示词：切到「{name}」",
         "scenes.preview.bind.promptSame": "全局提示词：不变（仍是「{name}」）",
@@ -4755,7 +4846,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "scenes.preview.bind.tool": "模型工具表：切到「{name}」（关 {count} 条）",
         "scenes.preview.bind.toolMissing": "模型工具表：「{name}」已不存在，这次不切换",
         "scenes.preview.bind.toolKeep": "模型工具表：保持现状（本场景未绑定）", "scenes.preview.row.notes": "用场景备注覆盖 {count} 台服务器的备注", "scenes.field.toolTable": "模型工具表方案", "scenes.field.quickPrompts": "快捷提示词", "scenes.field.quickPrompts.current": "当前设置", "scenes.field.quickPrompts.customCount": "自定义({picked}/{total})", "scenes.field.quickPrompts.none": "还没有快捷提示词，先到「提示词」页新增",
-        "scenes.field.quickPrompts.noneOption": "无", "scenes.field.quickPrompts.list": "本场景启用", "scenes.field.quickPrompts.pick": "选择", "scenes.quickPick.title": "选择本场景启用的快捷提示词", "scenes.quickPick.hint": "勾选的进入本场景后启用，没勾的停用；退出场景时按进入前那批开关还原。", "scenes.quickPick.confirm": "确定", "scenes.form.section.basic": "基本信息", "scenes.form.section.binding": "场景绑定", "scenes.field.toolTable.none": "当前设置", "scenes.field.toolTable.factory": "出厂默认（关 {count} 条）", "scenes.field.toolTable.count": "关 {count} 条", "scenes.field.toolTable.missing": "方案已不存在", "scenes.preview.more": " 等", "scenes.preview.truncated": "（每一类最多列前 60 项）", "scenes.preview.stale": "档案里有 {count} 项在当前环境里已经不存在，这次不会生效：{items}", "scenes.doctor.title": "有 {count} 处引用指向已经不存在的名字", "scenes.doctor.noneButSkipped": "体检没发现悬空引用", "scenes.doctor.hint": "改名或删除留下的：这一条看着还绑着，运行时按那个名字已经找不到东西了。改回正确的名字，或到档案里取消勾选。", "scenes.doctor.row": "{where}：「{name}」已不存在", "scenes.doctor.more": "另有 {count} 处未列出", "scenes.doctor.skipped": "（{domains} 这次没读到，这一类没有算进体检）", "agm.restore.tag": "退出场景后恢复它", "agm.restore.tag.hint": "它是进场景前的全局提示词，退出场景时会按快照里的正文恢复；快照存的是正文，删这份预设不影响恢复", "agm.file.mismatch": "文件里不是它", "agm.file.mismatch.hint": "AGENTS.md 当前内容与这份预设不一致（可能被手动改过）；点左边那颗开关把它写回", "hist.restore.note.registered": "已恢复 {count} 个会话；工作区「{title}」已重新登记，会话已挂回该组。", "hist.restore.note.attached": "已恢复 {count} 个会话，并挂回工作区「{title}」。", "hist.restore.note.skip": "{count} 个会话的工作区归属未能恢复：{reason}", "hist.purge.title": "永久删除？", "hist.purge.one": "永久删除会话「{title}」及其全部记录，不可恢复", "hist.purge.batch": "永久删除所选 {count} 个会话及其全部记录，不可恢复", "hist.btn.restore": "恢复", "hist.btn.purge": "永久删除", "hist.btn.confirmPurge": "确认删除", "hist.selectGroup": "全选组 {title}", "hist.select": "选择此会话", "hist.group.count": "{count} 个", "hist.selectAll": "全选", "hist.deselectAll": "取消全选", "hist.btn.import": "导入", "hist.btn.export": "导出", "hist.selected": "已选 {count} 项", "hist.btn.restoreSelected": "恢复所选 ({count})", "hist.btn.deleteSelected": "删除所选 ({count})", "hist.stat.archived": "归档", "hist.stat.projects": "工作区", "hist.stat.retention": "保留期", "hist.search.placeholder": "搜索标题 / 会话 ID / 项目路径", "hist.loading": "加载中…", "hist.empty.search": "无匹配的归档会话", "hist.empty.none": "暂无归档会话", "hist.import.cwd": "工作区（可留空）", "hist.import.cwd.placeholder": "选择、浏览或直接输入绝对路径；留空 = 归入未分组", "hist.import.workspace": "选工作区", "hist.import.browse": "选择", "hist.import.workspace.none": "本机还没有已登记的工作区：可以直接输入绝对路径，或用「浏览」选一个文件夹。", "hist.import.drop": "选择或拖入对话文件", "hist.import.done": "已创建会话 {id}（{count} 条消息），可在 DSH 会话列表中继续对话。", "hist.import.lossy": "⚠ 整份文本没有识别出任何说话人标记，已折成一条用户消息：原对话的分轮结构可能已丢失。若源文件是 JSONL 或 Markdown 转录稿，请按原扩展名重新导入。", "hist.export.hint": "导出选中会话为转录文件，可再次导入", "hist.export.dir": "导出目录（绝对路径，自动创建）", "hist.export.browse": "浏览并选择文件夹", "hist.btn.browse": "选择", "hist.export.pickDir": "选择导出目录", "hist.export.format": "格式", "hist.export.detail": "导出内容", "hist.export.detail.simple": "仅正文", "hist.export.detail.tools": "正文 + 工具", "hist.export.detail.full": "正文 + 工具 + 思考", "hist.export.scope": "会话范围", "hist.export.workspace": "工作区", "hist.export.sessions": "会话（{count} 个）", "hist.export.loading": "加载会话列表…", "hist.cwd.missing": "⚠ 工作区目录已不存在：", "hist.tag.archived": "已归档", "hist.tag.live": "未归档", "hist.export.empty": "没有符合条件的会话", "hist.result.exported": "已导出 {count} 个会话到 {dir}", "hist.result.skipped": "；跳过 {count} 个（{ids}）", "hist.result.archived": "已归档 {count} 个会话到 History，可到 History 页继续管理", "hist.result.archiveFailed": "；其中 {count} 个未能归档", "hist.btn.archiveSelected": "归档所选", "hist.btn.archiveSelected.title": "把选中的会话收进 History，纳入保留期管理", "hist.export.busy": "处理中…", "hist.btn.exportSelected": "导出 {count} 个会话", "hist.error.title": "操作失败", "hist.error.unknown": "未知错误",
+        "scenes.field.quickPrompts.noneOption": "无", "scenes.field.quickPrompts.list": "本场景启用", "scenes.field.quickPrompts.pick": "选择", "scenes.quickPick.title": "选择本场景启用的快捷提示词", "scenes.quickPick.hint": "勾选的进入本场景后启用，没勾的停用；退出场景时按进入前那批开关还原。", "scenes.quickPick.confirm": "确定", "scenes.form.section.basic": "基本信息", "scenes.form.section.binding": "场景绑定", "scenes.field.toolTable.none": "当前设置", "scenes.field.toolTable.factory": "出厂默认（关 {count} 条）", "scenes.field.toolTable.count": "关 {count} 条", "scenes.field.toolTable.missing": "方案已不存在", "scenes.preview.more": " 等", "scenes.preview.truncated": "（每一类最多列前 60 项）", "scenes.preview.stale": "档案里有 {count} 项在当前环境里已经不存在，这次不会生效：{items}", "scenes.doctor.title": "有 {count} 处引用指向已经不存在的名字", "scenes.doctor.noneButSkipped": "体检没发现悬空引用", "scenes.doctor.hint": "改名或删除留下的：这一条看着还绑着，运行时按那个名字已经找不到东西了。改回正确的名字，或到档案里取消勾选。", "scenes.doctor.row": "{where}：「{name}」已不存在", "scenes.doctor.more": "另有 {count} 处未列出", "scenes.doctor.skipped": "（{domains} 这次没读到，这一类没有算进体检）", "agm.restore.tag": "退出场景后恢复它", "agm.restore.tag.hint": "它是进场景前的全局提示词，退出场景时会按快照里的正文恢复；快照存的是正文，删这份预设不影响恢复", "agm.file.mismatch": "文件里不是它", "agm.file.mismatch.hint": "AGENTS.md 当前内容与这份预设不一致（可能被手动改过）；点左边那颗开关把它写回", "hist.restore.note.registered": "已恢复 {count} 个会话；工作区「{title}」已重新登记，会话已挂回该组。", "hist.restore.note.attached": "已恢复 {count} 个会话，并挂回工作区「{title}」。", "hist.restore.note.skip": "{count} 个会话的工作区归属未能恢复：{reason}", "hist.purge.title": "永久删除？", "hist.purge.one": "永久删除会话「{title}」及其全部记录，不可恢复", "hist.purge.batch": "永久删除所选 {count} 个会话及其全部记录，不可恢复", "hist.btn.restore": "恢复", "hist.btn.purge": "永久删除", "hist.btn.confirmPurge": "确认删除", "hist.selectGroup": "全选组 {title}", "hist.select": "选择此会话", "hist.group.count": "{count} 个", "hist.selectAll": "全选", "hist.deselectAll": "取消全选", "hist.btn.import": "导入", "hist.btn.export": "导出", "hist.btn.restoreSelected": "恢复所选 ({count})", "hist.btn.deleteSelected": "删除所选 ({count})", "hist.stat.archived": "归档", "hist.stat.projects": "工作区", "hist.stat.retention": "保留期", "hist.search.placeholder": "搜索标题 / 会话 ID / 项目路径", "hist.loading": "加载中…", "hist.empty.search": "无匹配的归档会话", "hist.empty.none": "暂无归档会话", "hist.import.cwd": "工作区（可留空）", "hist.import.cwd.placeholder": "从已登记工作区选，或直接输入绝对路径；留空 = 归入未分组", "hist.import.workspace": "选工作区", "hist.import.workspace.none": "本机还没有已登记的工作区：可以直接输入绝对路径。", "hist.import.done": "已创建会话 {id}（{count} 条消息），可在 DSH 会话列表中继续对话。", "hist.import.lossy": "⚠ 整份文本没有识别出任何说话人标记，已折成一条用户消息：原对话的分轮结构可能已丢失。若源文件是 JSONL 或 Markdown 转录稿，请按原扩展名重新导入。", "hist.export.hint": "导出选中会话为转录文件，可再次导入", "hist.export.dir": "导出目录（绝对路径，自动创建）", "hist.export.browse": "浏览并选择文件夹", "hist.btn.browse": "选择", "hist.export.pickDir": "选择导出目录", "hist.export.format": "格式", "hist.export.detail": "导出内容", "hist.export.detail.simple": "仅正文", "hist.export.detail.tools": "正文 + 工具", "hist.export.detail.full": "正文 + 工具 + 思考", "hist.export.scope": "会话范围", "hist.export.workspace": "工作区", "hist.export.sessions": "会话（{count} 个）", "hist.export.loading": "加载会话列表…", "hist.cwd.missing": "⚠ 工作区目录已不存在：", "hist.tag.archived": "已归档", "hist.tag.live": "未归档", "hist.export.empty": "没有符合条件的会话", "hist.result.exported": "已导出 {count} 个会话到 {dir}", "hist.result.skipped": "；跳过 {count} 个（{ids}）", "hist.export.busy": "处理中…", "hist.btn.exportSelected": "导出 {count} 个会话", "hist.error.title": "操作失败", "hist.error.unknown": "未知错误",
       },
       en: {
         "title": "Skills", "desc": "Manage skills: enable, import, create, trash.", "link.project": "GitHub", "link.feedback": "Issues",
@@ -4794,8 +4885,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "empty.search": "No matching skills", "empty.source": "This source is missing or has no skills", "loading": "Loading skills…", "note.missing": "No description provided", "source.toggle": "Toggle source", "skill.toggle": "Toggle skill",
         "source.external.note": "Read-only; toggles never rewrite source files", "source.dsh.note": "Create, import, trash; a default source, always read — it cannot be removed or toggled off",
         "detail.title": "Skill details", "detail.body": "Body", "detail.frontmatter": "Metadata", "detail.noFrontmatter": "This skill provides no metadata.", "detail.diagnostics": "Diagnostics", "detail.path": "Source file", "detail.noIssues": "No diagnostic issues found.",
-        "create.title": "Create skill", "create.target": "Create in", "create.name": "Name", "create.name.placeholder": "e.g. code-review-helper", "create.description": "Description", "create.description.placeholder": "One sentence describing when to use it", "create.body": "Body (Markdown)", "create.body.placeholder": "Write the instructions, steps, and boundaries…", "create.chat.note": "skill_manager_save in chat creates user-level skills",
-        "import.title": "Import skill", "upload.drop.title": "Click or drop here", "upload.drop.copy": "Supported: .zip, a skill folder, or one SKILL.md", "upload.req.mdzip": "Supports .md / .zip; same-name files are skipped", "upload.req.skills": "A zip or folder containing SKILL.md", "upload.req.prompt": "Supports .md; same-name files are skipped", "upload.req.session": "One at a time: .jsonl / .json / .md / .txt", "upload.selected.one": "{count} file · {size}", "upload.selected.other": "{count} files · {size}", "upload.remove": "Remove selection", "upload.requirements": "File requirements", "upload.requirement.skill": "Archives and folders must contain SKILL.md", "upload.requirement.frontmatter": "SKILL.md must include a YAML name and description", "upload.requirement.copy": "Import copies all content and never modifies the source", "upload.requirement.persona.1": "Accepts .md / .zip (multi-select or drag in)", "upload.requirement.persona.2": "One .md = one persona; the file name is the persona name", "upload.requirement.persona.3": "Same names are skipped, never overwritten", "upload.requirement.memory.1": "Accepts .md / .zip (multi-select or drag in)", "upload.requirement.memory.2": "One .md = one memory; the file name is the memory name", "upload.requirement.memory.3": "A folder with SKILL.md becomes a bundle memory (attachments included)", "upload.requirement.memory.4": "Folder names inside the zip are scenes; otherwise the scene field below applies (blank = global)", "upload.requirement.prompt.1": "Accepts .md (multi-select or drag in)", "upload.requirement.prompt.2": "One .md = one preset; the file name is the id", "upload.requirement.prompt.3": "A preset with the same name is skipped, never overwritten", "upload.requirement.session.1": "Accepts .jsonl / .json / .md / .txt (one file at a time)", "upload.requirement.session.2": "Transcripts from Claude Code / Cursor / Codex, or any plain text", "upload.requirement.session.3": "The workspace may be left blank (the session goes to Ungrouped)", "upload.importing": "Importing…", "status.selected": "Selected", "select.file.invalid": "Choose a .zip archive or one SKILL.md.", "select.folder.invalid": "No SKILL.md was found in the selected folder.", "error.browse.absolute": "Folder path must be absolute: {path}", "error.browse.unreadable": "Could not read folder: {path}", "error.browse.notDirectory": "Not a folder: {path}",
+        "create.title": "Create skill", "create.target": "Create in", "create.name": "Name", "create.name.placeholder": "e.g. code-review-helper", "create.description": "Description", "create.description.placeholder": "One sentence describing when to use it", "create.body": "Body (Markdown)", "create.body.placeholder": "Write the instructions, steps, and boundaries…",
+        "skill.attach.label": "Attachments (optional)", "skill.attach.new": "New attachment", "skill.attach.pick": "Choose attachments", "skill.attach.newTitle": "New attachment", "skill.attach.path": "Path (relative to the skill folder)", "skill.attach.path.placeholder": "e.g. references/api.md", "skill.attach.content": "Content", "skill.attach.content.placeholder": "Write this file's content here (may stay empty)", "skill.attach.add": "Add", "skill.attach.edit": "Edit", "skill.attach.remove": "Remove attachment", "skill.attach.dup": "An attachment with this path is already listed: {path}", "skill.attach.badpath": "Invalid path: use a relative path without a leading or trailing / and no ..", "skill.attach.reserved": "SKILL.md is the skill body and cannot be added as an attachment: {path}", "skill.attach.tooLarge": "{name} exceeds {limit} MB", "detail.attachments": "Attachments",
+        "import.title": "Import skill", "upload.drop.title": "Click or drop here", "upload.drop.copy": "Supported: .zip, a skill folder, or one SKILL.md", "upload.drop.mzip": "Supported: .md or .zip", "upload.drop.prompt": "Supported: .md", "upload.drop.session": "Supported: .jsonl / .json / .md / .txt", "upload.req.mdzip": "Supports .md / .zip; same-name files are skipped", "upload.req.skills": "A zip or folder containing SKILL.md", "upload.req.prompt": "Supports .md; same-name files are skipped", "upload.req.session": "One at a time: .jsonl / .json / .md / .txt", "upload.selected.one": "{count} file · {size}", "upload.selected.other": "{count} files · {size}", "upload.remove": "Remove selection", "upload.requirements": "File requirements", "upload.requirement.skill": "Archives and folders must contain SKILL.md", "upload.requirement.frontmatter": "SKILL.md must include a YAML name and description", "upload.requirement.copy": "Import copies all content and never modifies the source", "upload.requirement.persona.1": "Accepts .md / .zip (multi-select or drag in)", "upload.requirement.persona.2": "One .md = one persona; the file name is the persona name", "upload.requirement.persona.3": "Same names are skipped, never overwritten", "upload.requirement.memory.1": "Accepts .md / .zip (multi-select or drag in)", "upload.requirement.memory.2": "One .md = one memory; the file name is the memory name", "upload.requirement.memory.3": "A folder with SKILL.md becomes a bundle memory (attachments included)", "upload.requirement.memory.4": "Folder names inside the zip are scenes; otherwise the scene field below applies (blank = global)", "upload.requirement.prompt.1": "Accepts .md (multi-select or drag in)", "upload.requirement.prompt.2": "One .md = one preset; the file name is the id", "upload.requirement.prompt.3": "A preset with the same name is skipped, never overwritten", "upload.requirement.session.1": "Accepts .jsonl / .json / .md / .txt (one file at a time)", "upload.requirement.session.2": "Transcripts from Claude Code / Cursor / Codex, or any plain text", "upload.requirement.session.3": "The workspace may be left blank (the session goes to Ungrouped)", "upload.importing": "Importing…", "status.selected": "Selected", "select.file.invalid": "Choose a .zip archive or one SKILL.md.", "select.folder.invalid": "No SKILL.md was found in the selected folder.", "error.browse.absolute": "Folder path must be absolute: {path}", "error.browse.unreadable": "Could not read folder: {path}", "error.browse.notDirectory": "Not a folder: {path}",
         "error.custom.absolute": "The folder path must be absolute: {path}", "error.custom.notDirectory": "Not a folder: {path}", "error.custom.unreadable": "Could not read the folder: {path}", "error.custom.overlap": "The folder overlaps an existing skill source: {path} ↔ {other}", "error.custom.invalidKey": "Invalid custom source key: {key}", "error.custom.notFound": "Custom source not found: {key}",
         // 逐字对应宿主 http-fence.ts 的 TOKEN_MSG_*（见中文侧注释）。
         "error.token.required": "Missing access token, or the wrong one",
@@ -4858,16 +4950,32 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "confirm.trash.title": "Move to trash?", "confirm.trash.desc": "“{name}” moves to trash and can be restored", "confirm.delete.title": "Delete forever?", "confirm.delete.desc": "“{name}” is deleted forever and cannot be recovered",
         "done.enabled": "Enabled: {name}", "done.disabled": "Disabled: {name}",
         "done.created": "Created: {name}", "done.saved": "Saved: {name}",
-        "done.deleted": "Deleted: {name}", "done.restored": "Restored: {name}",
+        "done.deleted": "Deleted: {name}", "done.restored": "Restored: {name}", "done.restoredAs": "Restored as: {name}",
+        // Duplicate-name confirmation (user, 2026-10-14): shared by four domains (memories / scenes /
+        // skills / subagents) across create and trash-restore. A clash is no longer silently
+        // renumbered — we ask first — so these strings must stay domain-neutral; the caller passes
+        // the noun in from dup.kind.*.
+        "dup.title": "A {kind} with this name already exists", "dup.body": "The {kind} “{name}” already exists.",
+        "dup.create": "Continuing will create “{name}”.", "dup.restore": "Continuing will restore it as “{name}”.",
+        "dup.confirm.create": "Create anyway", "dup.confirm.restore": "Restore anyway",
+        "dup.kind.memory": "memory", "dup.kind.scene": "scene", "dup.kind.skill": "skill", "dup.kind.subagent": "subagent", "dup.kind.prompt": "prompt",
         "result.imported": "Imported: {names}", "result.importPartial": "Imported: {imported}; skipped existing skills: {skipped}", "result.importSkipped": "No skills were imported; existing skills were skipped: {names}", "result.importEmpty": "No skills were imported.", "result.importWarnings": "{result}; warnings: {warnings}", "result.trashed": "Moved to trash: {name}", "result.deleted": "Permanently deleted: {name}", "result.updated": "Status updated.", "result.preferred": "Now active: {name} ({source})", "result.unpreferred": "Cleared the manual choice: {name}", "error.action": "Action failed: {error}",
-        "warning.scan.truncated": "Some skills were not shown because the directory is too large or deeply nested: {path}", "warning.state.invalid": "The manager state file could not be read; all skills are disabled and state writes are blocked until it is repaired: {path}", "warning.backupUncleaned": "Old version backup was not cleaned up: {path} ({error})", "warning.project.unavailable": "The project directory of an active session is not accessible, so its project skills are hidden: {path}",
+        "warning.scan.truncated": "Some skills were not shown because the directory is too large or deeply nested: {path}", "warning.state.invalid": "The manager state file could not be read; all skills are disabled and state writes are blocked until it is repaired: {path}", "warning.backupUncleaned": "Old version backup was not cleaned up: {path} ({error})", "warning.project.unavailable": "The project directory of an active session is not accessible, so its project skills are hidden: {path}", "warning.retitleFailed": "The declared name was not updated alongside the renamed entry, so it may still show the old name: {path} ({error})",
         "error.root.readonly": "This source does not allow {action}", "error.root.disabled": "The “{name}” source is disabled as a whole — enable that source first", "error.root.unknown": "Unknown skill source: {root}", "error.root.unsafe": "The project skill directory is unsafe, so the write was refused: {path}", "error.skill.notFound": "Skill not found: {name}", "error.skill.noFrontmatter": "Skill lacks complete frontmatter, cannot {action}: {name}", "error.skill.notLoadable": "Skill structure is incomplete, cannot {action}: {name}", "error.skill.notDeletable": "Skills from this source cannot be deleted (disable them instead); deletion is available for project-level sources only (<project>/.dsh/skills)",
         "error.source.notFound": "Path does not exist: {path}", "error.source.symlink": "Symlinked sources are not supported: {path}", "error.source.unrecognized": "Unrecognized skill source: {path}", "error.source.tooDeep": "Skill source directory depth exceeds {depth} levels: {path}",
-        "error.import.overlap": "This folder overlaps the DSH skills folder", "error.import.emptySource": "No skill entries in this folder: {path}", "error.import.invalidName": "Invalid name: {name}", "error.import.duplicateName": "Batch source contains duplicate skill names: {name}", "error.import.failed": "Import failed", "error.import.rollbackFailed": "Overwrite import rollback failed; backups kept at: {path} ({error})",
-        "error.upload.path": "Upload contains an invalid path: {path}", "error.upload.encoding": "Upload encoding is invalid", "error.upload.empty": "Upload is empty", "error.upload.tooMany": "Too many uploaded files; maximum {limit}", "error.upload.tooLarge": "Upload is too large; limit {limit} bytes", "error.upload.archiveTooLarge": "ZIP archive is too large; limit {limit} bytes", "error.upload.duplicate": "Upload contains a duplicate path: {path}", "error.upload.zipInvalid": "ZIP archive could not be extracted",
+        "error.import.overlap": "This folder overlaps the DSH skills folder", "error.import.emptySource": "No skill entries in this folder: {path}", "error.import.invalidName": "Invalid name: {name}", "error.import.duplicateName": "Batch source contains duplicate skill names: {name}", "error.import.failed": "Import failed", "error.import.rollbackFailed": "Overwrite import rollback failed; backups kept at: {path} ({error})", "error.import.renameExhausted": "Too many entries share this name; no free suffixed name available: {name}",
+        "error.upload.path": "Upload contains an invalid path: {path}", "error.upload.encoding": "Upload encoding is invalid", "error.upload.empty": "Upload is empty", "error.upload.tooMany": "Too many uploaded files; maximum {limit}", "error.upload.tooLarge": "Upload is too large; limit {limit} bytes", "error.upload.archiveTooLarge": "ZIP archive is too large; limit {limit} bytes", "error.upload.duplicate": "Upload contains a duplicate path: {path}", "error.upload.zipInvalid": "ZIP archive could not be extracted", "error.upload.noSkillMd": "No SKILL.md found in {name}: place it in the root, or in a subdirectory",
         "error.trash.notFound": "Trash item not found: {id}", "error.trash.conflict": "Cannot restore because a skill with the same name exists: {name}", "error.trash.invalid": "Invalid trash item path: {id}", "error.trash.projectUnavailable": "The original project is not an active workspace, so this skill cannot be restored: {path}", "error.trash.rollbackFailed": "Move-to-trash rollback failed; unrecovered content was kept at: {path} ({error})", "error.trash.retention.invalid": "Retention must be a non-negative integer (0 = keep forever); got: {value}", "error.trash.retention.writeFailed": "Could not save the retention setting: {reason}",
+        // One shared "name already taken, nothing was restored" code for all four trash domains
+        // (user, 2026-10-14). The UI keys off this code to recognise a name clash and raise the
+        // confirm dialog — instead of string-matching. Previously each domain had its own code
+        // (skills: error.trash.conflict, memories: error.rules.exists, scenes borrowed
+        // error.rules.invalidGroup, subagents had none), so the UI could not tell a clash from an
+        // invalid name. The more specific wording lives in dup.*.
+        "error.dup.conflict": "An item with this name already exists, so nothing was restored: {name}",
         "error.state.invalid": "The manager state file could not be read, so overwriting it was refused: {path}",
         "error.create.descriptionRequired": "Skill description is required", "error.create.bodyRequired": "Skill body is required", "error.create.tooLarge": "Skill content is too large", "error.create.conflict": "A skill with the same name already exists: {name}",
+        "error.create.reservedPath": "An attachment cannot occupy SKILL.md (this creation writes the body): {path}", "error.create.filesWithFlat": "A single-file skill cannot carry attachments — they need the folder form",
         "error.proto.forbidden": "Forbidden mutation request (missing client marker)", "error.proto.forbiddenHost": "Forbidden request origin (invalid host)", "error.proto.contentType": "Content type must be application/json", "error.proto.method": "Method not allowed", "error.proto.unknownAction": "Unknown action", "error.proto.bodyTooLarge": "Request body too large", "error.proto.invalidJson": "Invalid JSON request body", "error.proto.nonJson": "Server returned a non-JSON response (HTTP {status})",
         "diagnostic.frontmatter.missing": "Missing complete YAML frontmatter", "diagnostic.name.missing": "Frontmatter is missing name", "diagnostic.name.invalid": "Skill name must be kebab-case: {name}", "diagnostic.description.missing": "Frontmatter is missing description", "diagnostic.invocation.invalid": "Invocation policy value is invalid", "diagnostic.shadowed": "Shadowed by higher-priority source {root}",
         "action.enable": "enable", "action.disable": "disable", "action.create": "create", "action.delete": "delete", "action.restore": "restore", "action.toggle": "enabling or disabling",
@@ -4876,24 +4984,24 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "mcp.stat.total": "Servers", "mcp.stat.tools": "Tools",
         "mcp.search": "Search servers", "mcp.search.placeholder": "Search a server name, URL or command",
         "mcp.btn.new": "New", "mcp.btn.add": "Add", "mcp.btn.save": "Save", "mcp.btn.detail": "Details", "mcp.btn.edit": "Edit", "mcp.btn.remove": "Delete",
-        "mcp.btn.enableAll": "Enable all", "mcp.btn.disableAll": "Disable all",
+        "mcp.btn.enableAll": "Enable all", "mcp.btn.restart.title": "Reconnect this server (up to ~11s, enabled state unchanged)", "mcp.btn.restart": "Restart", "mcp.btn.disableAll": "Disable all",
         "mcp.loading": "Loading MCP servers…", "mcp.empty": "No MCP servers yet — click “New”.", "mcp.empty.search": "No matching server.",
         "mcp.servers.count": "{count} server(s)", "mcp.tools.count": "{count} tool(s)", "mcp.tools.countPartial": "{enabled}/{total} tool(s)", "mcp.duplicate": "duplicate id",
         "mcp.table.name": "Server name and URL",
         "mcp.live.notLoaded": "not loaded", "mcp.live.failed": "start failed", "mcp.live.stopped": "disabled", "mcp.live.loading": "loading", "mcp.live.noTools": "no usable tools", "mcp.live.running": "enabled",
-        "mcp.live.failedHint": "Start failed — check the configuration, then toggle the switch off and on to retry", "mcp.live.offlineHint": "Not connected: no tools are registered, but it had {count} tools when it last connected. Check the network, command or credentials, then toggle the switch off and on", "mcp.live.neverHint": "Never connected: no tools have ever been registered. Check the command, arguments or credentials, then toggle the switch off and on", "mcp.live.allOffHint": "All tools are disabled: nothing is callable right now (re-enable them to restore)",
+        "mcp.live.failedHint": "Start failed — check the configuration, then try again", "mcp.live.offlineHint": "Start failed — check the configuration, then try again", "mcp.live.neverHint": "Start failed — check the configuration, then try again", "mcp.live.allOffHint": "All tools are disabled: nothing is callable right now (re-enable them to restore)",
         "mcp.note.prefix": "Note: ", "mcp.toggleServer": "Toggle server", "mcp.toggleTool": "Toggle tool",
-        "mcp.msg.ok": "Done", "mcp.msg.failed": "Operation failed", "mcp.msg.loadFailed": "Load failed", "mcp.msg.warn": "Done, but the loader reported: {warning}",
+        "mcp.msg.ok": "Done", "mcp.msg.failed": "Operation failed", "mcp.msg.loadFailed": "Load failed", "mcp.msg.warn": "Done, but the loader reported: {warning}", "mcp.msg.toolsRefreshed": "Fetched {count} tool(s)", "mcp.msg.restartWarn": "Restarted with warnings: {warning}", "mcp.msg.restarted": "Restarted: {name}",
                 "mcp.form.addTitle": "Add MCP server", "mcp.form.editTitle": "Edit MCP server: ",
         "mcp.form.err.serverName": "Server name must be 1-32 chars of letters, digits, underscore or hyphen (no spaces, no CJK)", "mcp.form.err.url": "URL must start with http:// or https://", "mcp.form.err.command": "Command cannot be empty",
         "mcp.form.maskedHint": "A masked value in a secret field (e.g. ••••••) is not the real value: saving leaves those entries untouched, because the plugin writes back the value found in the patch file. To read a secret in plain text, click Reveal secrets (if this plugin has an access token configured, enter the matching token first).",
-        "mcp.field.serverName": "Server name (serverName)", "mcp.field.serverName.hint": "1-32 chars of [A-Za-z0-9_-]; the patch registers it under this name",
+        "mcp.field.serverName": "Server name", "mcp.field.serverName.hint": "1-32 chars of [A-Za-z0-9_-]; the patch registers it under this name",
         "mcp.field.note": "Note (optional)", "mcp.field.note.placeholder": "A hint for the model, e.g. \“this one needs passwordless sudo\”; empty means nothing is stored",
         "mcp.field.transport": "Transport", "mcp.field.level": "Level",
         "mcp.field.level.project": "Profile level (this app: {path})", "mcp.field.level.global": "Global (across profiles: {path})",
         "mcp.field.url": "Server URL", "mcp.field.url.hint": "Must start with http(s)://",
         "mcp.field.command": "Command", "mcp.field.args": "Arguments (space or newline separated)",
-        "mcp.field.env": "Environment (one key=value per line)", "mcp.field.env.hint": "Use the platform's own path syntax (backslashes on Windows, / on macOS/Linux).",
+        "mcp.field.env": "Environment (one key=value per line)",
         "mcp.field.headers": "Headers (one key=value per line)",
         "mcp.detail.title": "Server details: ", "mcp.detail.config": "Configuration", "mcp.detail.showSecret": "Reveal secrets", "mcp.detail.hideSecret": "Hide secrets",
         "mcp.btn.compact": "Tidy patch", "mcp.btn.compact.title": "Clear the stale on/off records left in the patch file (each server's enabled/disabled state is unchanged)",
@@ -4901,23 +5009,22 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "mcp.compact.confirm": "Tidy now", "mcp.compact.done": "Patch file tidied: cleared {count} stale on/off record(s); no server changed state", "mcp.compact.clean": "The patch file is already clean — nothing stale to clear",
         "mcp.detail.entryId": "Entry id", "mcp.detail.status": "Status", "mcp.detail.loader": "Loader registration", "mcp.detail.loader.yes": "Registered", "mcp.detail.loader.no": "Not registered",
         "mcp.tools.stale": "from last run", "mcp.tools.expand": "Show more", "mcp.tools.collapse": "Show less",
-        "mcp.detail.note": "Note (sent to the model with the injected runtime snapshot; when a suppressing preset keeps it out, mcp_manager_list still reads it back)", "mcp.detail.note.placeholder": "e.g. fall back to B when A is unavailable", "mcp.detail.note.save": "Save note",
-        "mcp.detail.tools": "Tools ({count})",
+        "mcp.detail.note": "Note (sent to the model with the injected runtime snapshot)", "mcp.detail.note.placeholder": "e.g. fall back to B when A is unavailable", "mcp.detail.note.save": "Save note",
+        "mcp.detail.tools": "Tools ({count})", "mcp.detail.toolsRefresh": "Refresh tools",
         "mcp.field.headersShort": "Headers", "mcp.field.envShort": "Environment",
         "mcp.tools.loading": "Fetching the tool list…", "mcp.tools.loadFailed": "Could not load tools: ", "mcp.tools.none": "This server has no registered tools.",
         "mcp.tools.note": "Disabled tools are invisible to the model; changes take effect immediately",
         "mcp.remove.title": "Delete MCP server", "mcp.remove.desc": "Delete “{name}”? Its configuration is removed from the patch file and the tools go offline at once; this cannot be undone",
         "mcp.err.warnings": "Patch warnings: ",
-        "mcp.importJson.btn": "Import", "mcp.importJson.title": "Import MCP servers from JSON",
-        "mcp.importJson.hint": "Reads a {\"mcpServers\": {…}} map, {\"rows\": […]} or a bare array; check names and transport before submitting.",
-        "mcp.importJson.placeholder": "Paste {\"mcpServers\": {…}}, {\"rows\": […]} or an array",
+        "mcp.importJson.btn": "Import", "mcp.importJson.title": "Import MCP servers (patch snippet / JSON)",
+        "mcp.importJson.hint": "Reads a dsh patch snippet (- insert:) or mcpServers / rows / bare-array JSON; check names and transport before submitting.",
         "mcp.importJson.orPaste": "— or just paste it in the box above",
-        "mcp.importJson.secretHint": "These entries carry env / headers values: they are written into the patch file as-is, plaintext credentials included. Masked strings (••••) never get stored — the plugin swaps in the real values already in the patch.",
+        "mcp.importJson.secretHint": "Env vars and headers are written into the patch file verbatim; masked strings (••••) are not stored — the stored value is reused.",
         "mcp.importJson.parseError": "Parse failed: {error}",
-        "mcp.importJson.parseError.shape": "No importable structure found — needs an {\"mcpServers\": {…}} map, {\"rows\": […]} or an array",
-        "mcp.importJson.empty": "Nothing here: this JSON contains no servers",
+        "mcp.importJson.parsing": "Parsing the patch snippet…",
+        "mcp.importJson.parseError.shape": "No importable structure found — needs a dsh patch snippet (- insert:), an {\"mcpServers\": {…}} map, {\"rows\": […]} or an array",
+        "mcp.importJson.empty": "Nothing here: no MCP servers in this input",
         "mcp.importJson.bigBatch": "{count} entries in this batch — import it in smaller chunks (one request for the whole batch is hard to diagnose if it fails halfway)",
-        "mcp.importJson.preview.name": "Name and connection details", "mcp.importJson.preview.state": "Status",
         "mcp.importJson.preview.secret": "{count} secret/header field(s)",
         "mcp.importJson.disabled": "Import disabled",
         "mcp.importJson.original": "Original name: {name}",
@@ -4930,7 +5037,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "mcp.importJson.argsIgnored": "Unrecognized args shape — dropped",
         "mcp.importJson.kvIgnored": "{key} is not an object — dropped",
         "mcp.importJson.ignoredFields": "Unknown fields ignored: {keys}",
-        "mcp.importJson.conflict.skip": "Skip duplicates", "mcp.importJson.conflict.overwrite": "Overwrite duplicates",
+        "mcp.importJson.conflict.label": "Name conflicts", "mcp.importJson.conflict.skip": "Skip duplicates", "mcp.importJson.conflict.overwrite": "Overwrite duplicates",
         "mcp.importJson.chosen": "{count} selected",
         "mcp.importJson.submit": "Import {count}", "mcp.importJson.busy": "Importing…",
         "mcp.importJson.none": "Nothing importable (invalid entries cannot be checked)",
@@ -5061,7 +5168,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // AGENTS.md and stays in context, the other is just text pasted into the composer.
         "prompts.kind.label": "Prompt type",
         "prompts.kind.global": "Global prompt", "prompts.kind.quick": "Quick prompt",
-        "prompts.kind.global.hint": "Applying writes it into AGENTS.md and it takes effect next turn; scenes can bind it.",
+        "prompts.kind.global.hint": "Applies to the global AGENTS.md and gets injected on the next turn after startup",
         "prompts.kind.quick.hint": "For use in the composer: inserts the prompt into the input box.",
         "prompts.group.global": "Global prompts", "prompts.group.quick": "Quick prompts", "prompts.bulk.quick": "Turn every visible quick prompt in this group on / off", "prompts.bulk.failed": "{done} changed, {failed} did not",
         "quickprompt.stat": "Quick prompts",
@@ -5083,7 +5190,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "compat.ov.slashCommands.onTools": "Only the “Tools” section is on", "compat.ov.slashCommands.onQuick": "Only the “Quick prompts” section is on",
         "compat.ov.slashCommands.off": "Both sections turned off (re-enable them on this page)",
         "compat.slash.title": "Slash command entry (takes effect after restart)",
-        "compat.slash.tools": "“Tools”", "compat.slash.tools.desc": "Type \"/\" in the composer to control plugin features",
+        "compat.slash.tools": "“Smart dispatch”", "compat.slash.tools.desc": "Type \"/\" in the composer to control plugin features",
         "compat.slash.quick": "“Quick prompts”", "compat.slash.quick.desc": "Insert a preset prompt into the composer in one click",
         "compat.slash.live.on": "In effect", "compat.slash.live.off": "Not in effect",
         "compat.slash.mount.registered": "Mounted this startup", "compat.slash.mount.pending": "Not mounted yet (host service still starting)", "compat.slash.mount.unregistered": "Unmounted this startup",
@@ -5200,26 +5307,34 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // what the tool can actually do — several behaviours are joined with "/", never "or"
         // (these tools really do both: `save` creates *and* updates, `switch` enables *and*
         // disables). Keys are built from the tool name.
-        "compat.tools.about.memory_manager_list": "List memories and their state",
-        "compat.tools.about.memory_manager_read": "Read a memory body by id",
+        // 2026-10-15: the inline line is now a fixed `<verb> + <object>` template — verbs fixed by
+        // meaning (list / read / enter·leave / enable·disable / create·update / delete·restore /
+        // run / apply), object nouns fixed per domain. Detail lives in the hover tier only.
+        "compat.tools.about.scene_manager_list": "List scenes",
+        "compat.tools.about.scene_manager_switch": "Enter/leave a scene",
+        "compat.tools.about.scene_manager_save": "Create/update a scene",
+        "compat.tools.about.scene_manager_remove": "Delete/restore a scene",
+        "compat.tools.about.memory_manager_list": "List memories",
+        "compat.tools.about.memory_manager_read": "Read a memory body",
         "compat.tools.about.memory_manager_switch": "Enable/disable a memory",
         "compat.tools.about.memory_manager_save": "Create/update a memory",
-        "compat.tools.about.scene_manager_list": "List scenes and their archives",
-        "compat.tools.about.scene_manager_switch": "Enter/leave a scene",
-        "compat.tools.about.scene_manager_save": "Create/update a scene, write its archive, bind a prompt",
-        "compat.tools.about.mcp_manager_list": "List servers and tools",
-        "compat.tools.about.mcp_manager_switch": "Enable/disable/restart a server",
-        "compat.tools.about.mcp_manager_save": "Add/update a server",
-        "compat.tools.about.skill_manager_list": "List skills with state and path",
-        "compat.tools.about.skill_manager_read": "Read a skill body by name",
-        "compat.tools.about.skill_manager_switch": "Enable/disable a skill or source",
+        "compat.tools.about.memory_manager_remove": "Delete/restore a memory",
+        "compat.tools.about.mcp_manager_list": "List servers",
+        "compat.tools.about.mcp_manager_switch": "Enable/disable a server",
+        "compat.tools.about.mcp_manager_save": "Create/update a server",
+        "compat.tools.about.skill_manager_list": "List skills",
+        "compat.tools.about.skill_manager_read": "Read a skill body",
+        "compat.tools.about.skill_manager_switch": "Enable/disable a skill",
         "compat.tools.about.skill_manager_save": "Create/update a skill",
-        "compat.tools.about.subagent_manager_list": "List personas and descriptions",
+        "compat.tools.about.skill_manager_remove": "Delete/restore a skill",
+        "compat.tools.about.subagent_manager_list": "List personas",
         "compat.tools.about.subagent_manager_run": "Run a persona as a subagent",
         "compat.tools.about.subagent_manager_switch": "Enable/disable a persona",
         "compat.tools.about.subagent_manager_save": "Create/update a persona",
-        "compat.tools.about.prompt_manager_list": "List global prompt presets",
-        "compat.tools.about.prompt_manager_apply": "Apply a global prompt preset",
+        "compat.tools.about.subagent_manager_remove": "Delete/restore a persona",
+        "compat.tools.about.prompt_manager_list": "List global prompts",
+        "compat.tools.about.prompt_manager_apply": "Apply a global prompt",
+        "compat.tools.about.prompt_manager_remove": "Delete/restore a global prompt",
         "compat.tools.hover.memory_manager_list": "Lists each memory's id, scene, on/off state and one-line description, and says which scene injection follows. Only the memories that would actually be injected by default; all=true adds disabled, inactive-scene and shadowed entries. The scenes themselves (archives, bound presets, locks) are in scene_manager_list. Read-only.",
         "compat.tools.hover.memory_manager_read": "Reads the full body of one memory by id (<scene>/<name>). The list carries a one-line description only — use this for the body, especially for memories that are off, in an inactive scene, or dropped by the byte budget.",
         "compat.tools.hover.memory_manager_switch": "Flips the index switch only — the .md file is untouched and it is reversible. A disabled memory stops being injected, which frees byte budget for the others; prefer this over deleting when you want to spend fewer tokens.",
@@ -5232,7 +5347,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "compat.tools.hover.mcp_manager_save": "Adds a server (streamable-http or stdio) or updates the one with that name — the receipt says which. When updating, every field you omit keeps its current value, so changing one URL does not mean restating the whole config (and the secrets survive); for stdio, command+args is the command the host actually spawns, and changing it raises a confirmation card. Only on the user's explicit request.",
         "compat.tools.hover.skill_manager_list": "Lists each skill's on/off state, whether it wins or is shadowed, and its source path. The always-on catalog carries names and summaries only — use this to see what you turned off and which copy of a name wins; all=true includes disabled and shadowed copies.",
         "compat.tools.hover.skill_manager_read": "Reads one skill's SKILL.md body by name (the catalog has names and summaries only). Name collisions resolve to the copy actually in effect; pass root to inspect a shadowed copy instead. Not sent in conversations where the official skill tool is mounted.",
-        "compat.tools.hover.skill_manager_switch": "Toggles by skill name or by source directory. Disabled skills leave the catalog and cannot be loaded; when a name exists in several roots only the winning copy counts, so enabling the wrong one changes nothing.",
+        "compat.tools.hover.skill_manager_switch": "Toggles by skill name or by source directory. Disabled skills leave the catalog and cannot be loaded; when a name exists in several roots only the winning copy counts, so enabling the wrong one changes nothing. Omit `root` and the name is looked up across every source (new skills land in hub, so switching one right after saving works without a root). Pass `prefer` to change the same-name winner: true makes the `root` copy win, false drops the recorded choice — same path as the panel's button, no trip to the UI.",
         "compat.tools.hover.skill_manager_save": "Creates a skill, or updates the copy this plugin wrote itself — the receipt says which. It lands in hub (tool-management/skills/), matching the panel's \"Create skill\"; a new skill starts disabled, so enable it before use, and skills living in the official roots are never touched. The catalog is injected into every request, so make the description say when to use it.",
         "compat.tools.hover.subagent_manager_list": "Lists the available personas (pre-configured subagent roles) with their descriptions. The always-on catalog carries the same list; this tool always returns the current, complete version — including conversations the catalog does not reach.",
         "compat.tools.hover.subagent_manager_run": "Hands a task to a named persona: it gets the persona as its own system prompt, works in its own context and returns only the final result. With inherit it also sees this conversation's finished turns. It spends real tokens and asks the user by default.",
@@ -5240,6 +5355,11 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "compat.tools.hover.subagent_manager_save": "Creates a persona, or updates the existing one — the receipt says which. You can set the name, description, body (the body becomes the subagent's system prompt) and output contract; omitted fields keep their current values, and a rename makes scene and archive bindings follow. Provider, model and tool limits stay in the panel (the model cannot tell whether it got them right, so it is not offered them). The description decides when the model picks it.",
         "compat.tools.hover.prompt_manager_list": "Lists the global prompt presets (the ones written into AGENTS.md) with their summaries and marks the one currently in effect — only one is active at a time. Use it to confirm the name before switching. Quick prompts are not this domain: the user picks those in the composer, they never enter the context, and there is nothing for the model to do with them.",
         "compat.tools.hover.prompt_manager_apply": "Applies a preset to the user-level AGENTS.md; later conversations follow it immediately. Only one preset is in effect, so applying another replaces it.",
+        "compat.tools.hover.scene_manager_remove": "Moves a scene to the trash, restores one from the trash, or lists the trash. Deleting is reversible; emptying the trash is a panel action.",
+        "compat.tools.hover.memory_manager_remove": "Moves a memory to the trash, restores one from the trash, or lists the trash. Deleting is reversible — to just stop it being injected, disable it with switch instead. Emptying the trash is a panel action.",
+        "compat.tools.hover.skill_manager_remove": "Moves a skill to the trash, restores one from the trash, or lists the trash. Deleting is reversible — to just stop the model seeing it, disable it with switch; pass root to pick the source on trash (omit it and the name is looked up across every source, independently of where save put it). Emptying the trash is a panel action.",
+        "compat.tools.hover.subagent_manager_remove": "Moves a persona to the trash, restores one from the trash, or lists the trash. Deleting is reversible — to just take it out of the catalog, disable it with switch. Emptying the trash is a panel action.",
+        "compat.tools.hover.prompt_manager_remove": "Moves a global prompt preset to the trash, restores one from the trash, or lists the trash. Deleting is reversible; emptying the trash is a panel action.",
         "compat.live.title": "Live injection", "compat.live.hint": "What the model actually sees (read-only)",
         "compat.live.never": "nothing delivered in this conversation yet", "compat.live.delivered": "{count} delivered in this conversation · last {time}",
         "compat.live.copy": "Copy all", "compat.live.copied": "Copied", "compat.live.noAgent": "No session yet — send a message first",
@@ -5296,6 +5416,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
        
         "scenes.mem.title": "Memories", "scenes.mem.search": "Filter memories in this scene (name or description)",
         "scenes.mem.noMatch": "Nothing matches", "scenes.mem.emptyScene": "This scene has no memories yet",
+        "scenes.mem.createNeedScene": "Fill in the scene name first", "scenes.mem.pending": "{count} pending", "scenes.mem.pendingTag": "Pending", "scenes.mem.removePending": "Remove",
+        "scenes.mem.pendingTagTitle": "Written under whatever scene name is in the box when you click “Create”; the ones you check are enabled right after creation",
+        "scenes.mem.created": "Created {count} memory item(s)", "scenes.mem.createFailed": "{count} memory item(s) could not be created: {items}", "scenes.mem.incomplete": "{count} memory item(s) were created but not fully set up: {items}",
         "memory.mode.current": "Active mode", "memory.mode.exit": "Exit mode",
         "memory.archive.edit": "Profile", "memory.archive.title": "Scene profile",
         "memory.archive.tools": "MCP tools", "memory.archive.skills": "Skills", "memory.archive.subagents": "Subagent set", "memory.archive.memories": "Memory set", "memory.archive.applyFailed": "Could not apply at runtime: {reason}",
@@ -5314,7 +5437,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "memory.budget.truncated": "Over budget — the memories left out are listed at the end",
         "memory.budget.dropped": "Not injected this time: {names}",
         "memory.scene.enable": "Enabled", "memory.scene.enableAll": "Enable all", "memory.scene.off": "Off", "memory.scene.shared": "always on", "memory.scene.global.tag": "always injected",
-        "memory.scene.global": "Global", "memory.scene.count": "{count} memories", "memory.scene.new": "New memory", "memory.scene.browse": "Pick existing",
+        "memory.scene.global": "Global", "memory.scene.count": "{count} memories", "memory.scene.new": "New memory",
         "memory.scene.empty": "No memories in this scene yet",
         "memory.scene.orphan": "No scene", "memory.scene.orphan.tag": "never injected", "memory.scene.orphan.hint": "These memories sit directly in the memories/ root and belong to no scene, so they are never injected into the context. Move them into a scene directory (or into memories/global/ to make them “Global”).",
         "memory.scene.edit": "Edit", "memory.scene.editTitle": "Edit scene", "memory.scene.editHelp": "The name is its memory folder name; renaming moves the folder, profile and bindings along. Memory files stay untouched.",
@@ -5329,13 +5452,12 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "memory.form.flat": "flat", "memory.form.bundle": "bundle", "memory.derived": "derived", "memory.fill.frontmatter": "Fill frontmatter",
         "memory.shadowed.hint": "A bundle with the same name exists, so this one is not loaded",
         "memory.create.title": "New memory", "memory.edit.title": "Edit memory", "memory.edit.group.lock": "The scene cannot be changed while editing",
-        "memory.field.group": "Scene", "memory.field.group.placeholder": "e.g. office", "memory.field.group.hint": "Blank = global",
+        "memory.field.group": "Scene",
         "memory.field.name": "Name", "memory.field.name.placeholder": "e.g. 站会流程", "memory.name.invalid": "Invalid name (non-empty, ≤64 chars, no / \\ < > : \" | ? *, must not start with a dot)",
         "memory.field.description": "Description", "memory.field.description.placeholder": "One line on what it is for (blank = first body line)",
         "memory.field.body": "Body (Markdown)", "memory.field.body.placeholder": "Write down the conventions, steps, and boundaries to remember…",
         "memory.field.form": "Form", "memory.field.attach": "Attachments",
-        "memory.attach.add": "Add files", "memory.attach.empty": "No attachments yet", "memory.attach.pending": "pending", "memory.attach.remove": "Remove attachment",
-        "memory.attach.hint": "Stored with the memory; never injected into the prompt",
+        "memory.attach.add": "Add files", "memory.attach.pending": "pending", "memory.attach.remove": "Remove attachment",
         "memory.attach.count.one": "{count} attachment", "memory.attach.count.other": "{count} attachments",
         "memory.attach.tip": "Click to manage attachments: {count} · {size} total — {names}",
         "memory.attach.tip.empty": "No files yet — click to add",
@@ -5365,16 +5487,16 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         // without saying what it does affect, which is more confusing than saying nothing.
         "subagents.field.model": "Model", "subagents.field.provider": "Model provider",
         "subagents.field.offCatalog": "{id} · not in the catalogue",
-        "subagents.field.catalogDepth": "Catalog injection", "subagents.field.catalogDepth.onlyTop": "Top level only", "subagents.field.catalogDepth.toChild": "Top level and subagents", "subagents.field.catalogDepth.toGrand": "Top level and two levels down", "subagents.field.catalogDepth.unlimited": "No nesting limit",
+        "subagents.field.catalogDepth": "Catalog injection", "subagents.field.catalogDepth.d1": "1 level", "subagents.field.catalogDepth.d2": "2 levels", "subagents.field.catalogDepth.d3": "3 levels", "subagents.field.catalogDepth.unlimited": "Unlimited",
         // Continuable (0.19.0). The form keeps only the checkbox subtitle; the mechanism (the
         // official startContinuable, the settlement notice, the return guidance) and the cost
         // (capacity slot, persistence + session query) live in CHANGELOG and README, not here
         // (user ruling 2026-10-07: the advanced section carried far too many help sentences).
-        "subagents.field.continuable": "Continuable (runs in the background)", "subagents.field.continuable.short": "Returns an id you can keep talking to",
+        "subagents.field.continuable": "Continuable", "subagents.field.continuable.on": "Allow", "subagents.field.continuable.off": "Deny",
         // The two "tails" of the collapsed summary. The separator lives inside the value (not a
         // hard-coded join in code): English needs "; " where Chinese needs "；". Empty = no value,
         // so the whole clause disappears.
-        "subagents.adv.continuable": "; continuable (runs in the background)",
+        "subagents.adv.continuable": "; continuable",
         "subagents.adv.legacy": "; legacy allow: {allow} / deny: {deny}",
         // Reasoning effort (0.14.0). The form keeps only what this field offers right now plus the
         // transient states (no model picked / loading / none available); the official semantics (the
@@ -5418,13 +5540,12 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "memory.import": "Import", "memory.import.title": "Import memories", "memory.import.scene": "Import into scene",
         "memory.result.imported": "Imported {count} memory/memories: {names}",
         "memory.import.scenesCreated": "Scenes created for them: {names}",
-        "memory.scene.global.hint": "Global",
        "import.clear": "Clear", "import.submit": "Import",
         "import.none": "Nothing was imported (all skipped)", "import.skipped": "Skipped: {items}",
         "error.import.noFiles": "No files selected",
         "nav.title": "Tools",
-        "agm.stat.total": "Global prompts", "agm.stat.active": "In effect", "agm.loading": "Loading…", "agm.empty": "No prompts yet — click “New” to create one", "agm.empty.search": "No matching prompts", "agm.search.placeholder": "Search prompt ids or descriptions", "agm.btn.delete.blocked.refs": "Cannot delete: {refs}. Remove that reference first — for a scene binding, rebind the prompt on the scene page or leave the scene; for the one currently applied, flip the switch on the left to un-apply.", "agm.ref.sep": "; ", "agm.ref.scene": "bound by scene “{scene}”", "agm.ref.sceneActive": "bound by scene “{scene}” (enabled)", "agm.ref.file": "this is what AGENTS.md currently holds", "agm.ref.fileApplied": "it is applied in AGENTS.md (the one currently in effect)", "agm.ref.restore": "the global prompt to restore after leaving the scene", "agm.sceneLock.notice": "Scene “{scene}” is driving the baseline: the prompt in effect is its bound “{id}”. Applying another preset here rebinds that scene to it (written into the scene profile as well).", "agm.active": "Active", "agm.active.hint.scene": "Currently active: the prompt preset bound to scene “{scene}”", "agm.active.hint.file": "Currently active: AGENTS.md is exactly this preset", "agm.inactive": "Not applied", "agm.file.applied": "In AGENTS.md", "agm.file.applied.hint": "AGENTS.md currently holds this one; the enabled scene binds a different preset, which now takes effect", "agm.apply.hint": "Writes AGENTS.md; the host re-reads that file every turn, so it takes effect on the next turn", "agm.apply.switch": "Apply prompt", "agm.apply.switch.on": "This one is in effect · click to write AGENTS.md again (undoing hand edits)", "agm.applyModal.title": "Apply preset", "agm.edit.title": "Edit preset", "agm.remove.title": "Delete preset", "agm.btn.edit": "Edit", "agm.btn.delete": "Delete", "agm.btn.new": "New", "agm.new.title": "New prompt", "agm.btn.import": "Import", "agm.result.imported": "Imported {count} preset(s): {names}", "agm.btn.save": "Save", "agm.btn.create": "Create", "agm.btn.confirmRemove": "Delete", "agm.btn.confirmApply": "Apply", "agm.field.id": "id (directory name)", "agm.field.id.hint": "Letters, spaces and dots are fine; no slashes or : * ? < >; up to 64 chars. Changing it renames the directory.", "agm.field.id.placeholder": "e.g. work-baseline", "agm.field.content": "Content", "agm.field.content.placeholder": "Write the preset body (Markdown) here; leave blank to start from the empty template", "agm.field.desc": "Description (the model sees this in the list)", "agm.field.desc.placeholder": "What this preset is for and when to use it", "agm.result.renamed": "Saved; id is now “{id}”", "agm.result.rebound": " ({count} scene binding(s) updated)", "agm.remove.suffix": "? This cannot be undone.", "agm.apply.prefix": "Write the contents of ", "agm.apply.suffix": " into ~/.dsh/AGENTS.md.", "agm.apply.note": "Takes effect on the next turn; the current content is backed up to __last-applied__ (last 5 kept)", "agm.unapply.title": "Un-apply", "agm.unapply.body": "This restores ~/.dsh/AGENTS.md to the content from before you started applying presets (kept in __last-applied__); no preset takes effect afterwards.", "agm.unapply.note": "What comes back is the content from before you started applying: presets you applied in between are rolled back too — to switch to one of them instead, just flip its own switch (same result). This step is backed up too, so you can apply it again.", "agm.btn.confirmUnapply": "Un-apply", "agm.unapply.switch.on": "This one is in AGENTS.md · click to un-apply (restore AGENTS.md to the content from before you started applying)", "agm.unapply.switch.blocked": "This one is in AGENTS.md, but there is no “state from before the apply” to restore — it was not written by “Apply”, so it cannot be turned off. To change the file, apply another preset or edit AGENTS.md directly; deleting this preset does not touch AGENTS.md", "agm.unapply.switch.onRemove": "This one is in AGENTS.md · click to un-apply (there was no AGENTS.md before you started applying, so this deletes the file)", "agm.unapply.bodyRemove": "There was no ~/.dsh/AGENTS.md before you started applying presets, so un-applying deletes that file instead of restoring content; no preset takes effect afterwards.", "agm.unapply.noteRemove": "What gets deleted is the content “Apply” wrote; that content is backed up to __last-applied__ (last 5 kept), so you can apply it back if needed.", "agm.btn.confirmUnapplyRemove": "Un-apply and delete the file", "agm.result.unapplied": "Un-applied: AGENTS.md is back to the content from before you started applying", "agm.result.unappliedRemove": "Un-applied: AGENTS.md was deleted (it did not exist before you started applying)", "agm.unapply.unavailable": "The current AGENTS.md was not written by “Apply” (the preset created automatically the first time you open this page is one such case), so there is no “state from before the apply” to restore and it cannot be turned off. To change what AGENTS.md holds: apply another preset, or edit AGENTS.md itself; deleting this preset does not touch AGENTS.md.", "agm.remove.fileNote": "Note: AGENTS.md still holds this content and your global prompt stays in effect — deleting the preset only moves it to the trash and does not touch AGENTS.md. To stop it taking effect, edit AGENTS.md itself or apply another preset.", "hist.err.load": "Load failed", "hist.err.unarchive": "Restore failed", "hist.err.delete": "Delete failed", "hist.err.retention": "Update failed", "hist.err.import": "Import failed", "hist.err.sessions": "Failed to load sessions", "hist.err.export": "Export failed", "hist.err.archive": "Archive failed", "hist.retention.forever": "Keep forever", "hist.retention.days": "{count} days", "hist.arch.all": "All sessions", "hist.arch.archived": "Archived only", "hist.arch.live": "Not archived only", "hist.arch.missing": "Missing directory only", "hist.ws.all": "All workspaces", "hist.ungrouped": "Ungrouped", "hist.group.removed": "Removed", "hist.group.removed.hint": "This directory has no DSH workspace registration right now; the group is rebuilt from session directories and rejoins automatically once registered again", "hist.group.dirMissing": "Original folder missing", "hist.group.dirMissing.hint": "The workspace directory was deleted from disk, so it cannot be registered again; sessions in this group can still be restored (they join Ungrouped) or deleted forever", "hist.btn.registerWs": "Register", "hist.btn.registerWs.hint": "Register this directory again and attach its existing sessions back to that group (workspace accounting only — no file or session is moved or deleted)", "hist.register.title": "Register again?", "hist.register.body": "A workspace registration will be created in DSH for “{title}”, and the sessions under this directory will be attached back to it (restoring their grouping). This writes workspace accounting only — no file or session is moved or deleted.", "hist.register.confirm": "Register", "hist.register.done.title": "Registered", "hist.register.done.body": "Workspace “{title}” is registered; archived sessions under this directory join that group after a refresh.", "hist.register.done.attached": "Attached {count} existing session(s) under this directory back to the workspace.", "hist.register.done.skipped": "{count} session(s) could not be attached: {reason}", "hist.err.register": "Registration failed", "scenes.field.prompt": "Global prompt",
-        "scenes.field.prompt.none": "None", "scenes.agents.note.applied": "wrote “{id}” into AGENTS.md", "scenes.agents.note.restored": "restored the AGENTS.md baseline from before the scene", "scenes.agents.note.error": "AGENTS.md was not written: {reason}", "scenes.agents.note.baselineLost": "⚠ Leaving the scene will not restore the previous AGENTS.md: {reason}", "scenes.prompt.activeTag": "in effect", "scenes.prompt.noPresets": "No prompt presets yet — create one on the Prompts page.", "scenes.prompt.bound": "Prompt: {id}", "scenes.prompt.live": "Prompt active: {id}", "scenes.prompt.missing": "Preset missing: {id}", "scenes.prompt.tag.hint": "The prompt preset bound to this scene", "scenes.prompt.mismatch.hint": "The scene-bound “{id}” does not match the current contents of AGENTS.md (it may have been edited by hand); click “Apply again” for it on the Prompts page to write it back", "scenes.enable.blocked": "Scene “{name}” is already enabled; turn it off first", "scenes.result.created.collapsed": "Scene “{name}” created and left off (the legacy “all enabled” default collapsed to a single choice)", "scenes.legacyAll": "{count} scenes are enabled at once (a leftover of the legacy “all enabled” default); only one scene besides “Global” may be enabled.", "scenes.legacyAll.fix": "Collapse to one", "scenes.preview.title": "Before entering scene “{name}” — what this will change", "scenes.preview.loading": "Working out what changes…", "scenes.preview.failed": "Preview failed: {error}", "scenes.preview.enter": "Enter the scene", "scenes.preview.dismiss": "Don't show again", "scenes.preview.dismiss.title": "Close this card and stop showing it before entering scenes (bring it back with “Turn the reminder on” at the top of this page)", "scenes.preview.toggle.off": "Turn the reminder off", "scenes.preview.toggle.on": "Turn the reminder on", "scenes.preview.toggle.title": "Show a “what will change” card before entering a scene", "scenes.preview.nochange": "Nothing to change: the runtime already matches what this scene asks for.", "scenes.preview.noArchive": "This scene has no saved profile — MCP, skills and personas are all read as “none checked”, so entering disables every one of them.", "scenes.preview.exitFirst": "Leaves “{scene}” first: what it changed is restored from the before-entering snapshot.", "scenes.preview.exitNoSnapshot": "“{scene}” is active but its before-entering snapshot is gone: leaving only clears the mode flag, the runtime will not go back.", "scenes.preview.row.serversOn": "Enables {count} MCP server(s): {names}", "scenes.preview.row.serversOff": "Disables {count} MCP server(s): {names}", "scenes.preview.row.toolsOn": "Puts back {count} MCP tool(s): {names}", "scenes.preview.row.toolsOff": "Disables {count} MCP tool(s): {names}", "scenes.preview.row.sourcesOn": "Enables {count} skill director(ies): {names}", "scenes.preview.row.sourcesOff": "Disables {count} skill director(ies): {names}", "scenes.preview.row.skillsOn": "Enables {count} skill(s): {names}", "scenes.preview.row.skillsOff": "Disables {count} skill(s): {names}", "scenes.preview.row.personasOn": "Enables {count} persona(s): {names}", "scenes.preview.row.personasOff": "Disables {count} persona(s): {names}", "scenes.preview.enter.servers": "{count} MCP server(s) stay on: {names}", "scenes.preview.enter.memories": "{count} memory(ies) enabled: {names}", "scenes.preview.enter.personas": "{count} subagent(s) enabled: {names}", "scenes.preview.enter.personasNone": "No subagent stays enabled",
+        "agm.stat.total": "Global prompts", "agm.stat.active": "In effect", "agm.loading": "Loading…", "agm.empty": "No prompts yet — click “New” to create one", "agm.empty.search": "No matching prompts", "agm.search.placeholder": "Search prompt ids or descriptions", "agm.btn.delete.blocked.refs": "Cannot delete: {refs}. Remove that reference first — for a scene binding, rebind the prompt on the scene page or leave the scene; for the one currently applied, flip the switch on the left to un-apply.", "agm.ref.sep": "; ", "agm.ref.scene": "bound by scene “{scene}”", "agm.ref.sceneActive": "bound by scene “{scene}” (enabled)", "agm.ref.file": "this is what AGENTS.md currently holds", "agm.ref.fileApplied": "it is applied in AGENTS.md (the one currently in effect)", "agm.ref.restore": "the global prompt to restore after leaving the scene", "agm.sceneLock.notice": "Scene “{scene}” is driving the baseline: the prompt in effect is its bound “{id}”. Applying another preset here rebinds that scene to it (written into the scene profile as well).", "agm.active": "Active", "agm.active.hint.scene": "Currently active: the prompt preset bound to scene “{scene}”", "agm.active.hint.file": "Currently active: AGENTS.md is exactly this preset", "agm.inactive": "Not applied", "agm.file.applied": "In AGENTS.md", "agm.file.applied.hint": "AGENTS.md currently holds this one; the enabled scene binds a different preset, which now takes effect", "agm.apply.hint": "Writes AGENTS.md; the host re-reads that file every turn, so it takes effect on the next turn", "agm.apply.switch": "Apply prompt", "agm.apply.switch.on": "This one is in effect · click to write AGENTS.md again (undoing hand edits)", "agm.applyModal.title": "Apply preset", "agm.edit.title": "Edit preset", "agm.remove.title": "Delete preset", "agm.btn.edit": "Edit", "agm.btn.delete": "Delete", "agm.btn.new": "New", "agm.new.title": "New prompt", "agm.btn.import": "Import", "agm.result.imported": "Imported {count} preset(s): {names}", "agm.btn.save": "Save", "agm.btn.create": "Create", "agm.btn.confirmRemove": "Delete", "agm.btn.confirmApply": "Apply", "agm.field.id": "Display name", "agm.field.id.hint": "Letters, spaces and dots are fine; no slashes or : * ? < >; up to 64 chars. Changing it renames the directory.", "agm.field.id.placeholder": "e.g. work-baseline", "agm.field.content": "Content", "agm.field.content.placeholder": "Write the preset body (Markdown) here", "agm.field.desc": "Description (the model sees this in the list)", "agm.field.desc.placeholder": "What this preset is for and when to use it", "agm.result.renamed": "Saved; id is now “{id}”", "agm.result.rebound": " ({count} scene binding(s) updated)", "agm.remove.suffix": "? This cannot be undone.", "agm.apply.prefix": "Write the contents of ", "agm.apply.suffix": " into ~/.dsh/AGENTS.md.", "agm.apply.note": "Takes effect on the next turn; the current content is backed up to __last-applied__ (last 5 kept)", "agm.unapply.title": "Un-apply", "agm.unapply.body": "This restores ~/.dsh/AGENTS.md to the content from before you started applying presets (kept in __last-applied__); no preset takes effect afterwards.", "agm.unapply.note": "What comes back is the content from before you started applying: presets you applied in between are rolled back too — to switch to one of them instead, just flip its own switch (same result). This step is backed up too, so you can apply it again.", "agm.btn.confirmUnapply": "Un-apply", "agm.unapply.switch.on": "This one is in AGENTS.md · click to un-apply (restore AGENTS.md to the content from before you started applying)", "agm.unapply.switch.blocked": "This one is in AGENTS.md, but there is no “state from before the apply” to restore — it was not written by “Apply”, so it cannot be turned off. To change the file, apply another preset or edit AGENTS.md directly; deleting this preset does not touch AGENTS.md", "agm.unapply.switch.onRemove": "This one is in AGENTS.md · click to un-apply (there was no AGENTS.md before you started applying, so this deletes the file)", "agm.unapply.bodyRemove": "There was no ~/.dsh/AGENTS.md before you started applying presets, so un-applying deletes that file instead of restoring content; no preset takes effect afterwards.", "agm.unapply.noteRemove": "What gets deleted is the content “Apply” wrote; that content is backed up to __last-applied__ (last 5 kept), so you can apply it back if needed.", "agm.btn.confirmUnapplyRemove": "Un-apply and delete the file", "agm.result.unapplied": "Un-applied: AGENTS.md is back to the content from before you started applying", "agm.result.unappliedRemove": "Un-applied: AGENTS.md was deleted (it did not exist before you started applying)", "agm.unapply.unavailable": "The current AGENTS.md was not written by “Apply” (the preset created automatically the first time you open this page is one such case), so there is no “state from before the apply” to restore and it cannot be turned off. To change what AGENTS.md holds: apply another preset, or edit AGENTS.md itself; deleting this preset does not touch AGENTS.md.", "agm.remove.fileNote": "Note: AGENTS.md still holds this content and your global prompt stays in effect — deleting the preset only moves it to the trash and does not touch AGENTS.md. To stop it taking effect, edit AGENTS.md itself or apply another preset.", "hist.err.load": "Load failed", "hist.err.unarchive": "Restore failed", "hist.err.delete": "Delete failed", "hist.err.retention": "Update failed", "hist.err.import": "Import failed", "hist.err.sessions": "Failed to load sessions", "hist.err.export": "Export failed", "hist.retention.forever": "Keep forever", "hist.retention.days": "{count} days", "hist.arch.all": "All sessions", "hist.arch.archived": "Archived only", "hist.arch.live": "Not archived only", "hist.arch.missing": "Missing directory only", "hist.ws.all": "All workspaces", "hist.ungrouped": "Ungrouped", "hist.group.removed": "Removed", "hist.group.removed.hint": "This directory has no DSH workspace registration right now; the group is rebuilt from session directories and rejoins automatically once registered again", "hist.group.dirMissing": "Original folder missing", "hist.group.dirMissing.hint": "The workspace directory was deleted from disk, so it cannot be registered again; sessions in this group can still be restored (they join Ungrouped) or deleted forever", "hist.btn.registerWs": "Register", "hist.btn.registerWs.hint": "Register this directory again and attach its existing sessions back to that group (workspace accounting only — no file or session is moved or deleted)", "hist.register.title": "Register again?", "hist.register.body": "A workspace registration will be created in DSH for “{title}”, and the sessions under this directory will be attached back to it (restoring their grouping). This writes workspace accounting only — no file or session is moved or deleted.", "hist.register.confirm": "Register", "hist.register.done.title": "Registered", "hist.register.done.body": "Workspace “{title}” is registered; archived sessions under this directory join that group after a refresh.", "hist.register.done.attached": "Attached {count} existing session(s) under this directory back to the workspace.", "hist.register.done.skipped": "{count} session(s) could not be attached: {reason}", "hist.err.register": "Registration failed", "scenes.field.prompt": "Global prompt",
+        "scenes.field.prompt.none": "None", "scenes.agents.note.applied": "wrote “{id}” into AGENTS.md", "scenes.agents.note.restored": "restored the AGENTS.md baseline from before the scene", "scenes.agents.note.error": "AGENTS.md was not written: {reason}", "scenes.agents.note.baselineLost": "⚠ Leaving the scene will not restore the previous AGENTS.md: {reason}", "scenes.prompt.activeTag": "in effect", "scenes.prompt.noPresets": "No prompt presets yet — create one on the Prompts page.", "scenes.prompt.bound": "Prompt: {id}", "scenes.prompt.live": "Prompt active: {id}", "scenes.prompt.missing": "Preset missing: {id}", "scenes.prompt.tag.hint": "The prompt preset bound to this scene", "scenes.prompt.mismatch.hint": "The scene-bound “{id}” does not match the current contents of AGENTS.md (it may have been edited by hand); click “Apply again” for it on the Prompts page to write it back", "scenes.enable.blocked": "Scene “{name}” is already enabled; turn it off first", "scenes.result.created.collapsed": "Scene “{name}” created and left off (the legacy “all enabled” default collapsed to a single choice)", "scenes.legacyAll": "{count} scenes are enabled at once (a leftover of the legacy “all enabled” default); only one scene besides “Global” may be enabled.", "scenes.legacyAll.fix": "Collapse to one", "scenes.preview.title": "Before entering scene “{name}” — what this will change", "scenes.preview.loading": "Working out what changes…", "scenes.preview.failed": "Preview failed: {error}", "scenes.preview.enter": "Enter the scene", "scenes.preview.dismiss": "Don't show again", "scenes.preview.dismiss.title": "Close this card and stop showing it before entering scenes (bring it back with “Turn the reminder on” at the top of this page)", "scenes.preview.toggle.off": "Turn the reminder off", "scenes.preview.toggle.on": "Turn the reminder on", "scenes.preview.toggle.title": "Show a “what will change” card before entering a scene", "scenes.preview.nochange": "Nothing to change: the runtime already matches what this scene asks for.", "scenes.preview.noArchive": "This scene has no saved profile — MCP, skills and personas are all read as “none checked”, so entering disables every one of them.", "scenes.preview.exitFirst": "Leaves “{scene}” first: what it changed is restored from the before-entering snapshot.", "scenes.preview.exitNoSnapshot": "“{scene}” is active but its before-entering snapshot is gone: leaving only clears the mode flag, the runtime will not go back.", "scenes.preview.row.serversOn": "Enables {count} MCP server(s): {names}", "scenes.preview.row.serversOff": "Disables {count} MCP server(s): {names}", "scenes.preview.row.toolsOn": "Puts back {count} MCP tool(s): {names}", "scenes.preview.row.toolsOff": "Disables {count} MCP tool(s): {names}", "scenes.preview.row.skillsOn": "Enables {count} skill(s): {names}", "scenes.preview.row.skillsOff": "Disables {count} skill(s): {names}", "scenes.preview.row.personasOn": "Enables {count} persona(s): {names}", "scenes.preview.row.personasOff": "Disables {count} persona(s): {names}", "scenes.preview.enter.servers": "{count} MCP server(s) stay on: {names}", "scenes.preview.enter.memories": "{count} memory(ies) enabled: {names}", "scenes.preview.enter.personas": "{count} subagent(s) enabled: {names}", "scenes.preview.enter.personasNone": "No subagent stays enabled",
         "scenes.preview.bind.prompt": "Global prompt: switch to “{name}”",
         "scenes.preview.bind.promptSame": "Global prompt: unchanged (still “{name}”)",
         "scenes.preview.bind.promptKeep": "Global prompt: keeps “{name}” (this scene binds none)",
@@ -5437,7 +5558,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
         "scenes.preview.bind.tool": "Tool table: switch to scheme “{name}” (hides {count})",
         "scenes.preview.bind.toolMissing": "Tool table: scheme “{name}” no longer exists — nothing switches this time",
         "scenes.preview.bind.toolKeep": "Tool table: stays as it is (this scene binds none)", "scenes.preview.row.notes": "Overrides the notes of {count} server(s) with scene notes", "scenes.field.toolTable": "Model tool-table scheme", "scenes.field.quickPrompts": "Quick prompts", "scenes.field.quickPrompts.current": "Current settings", "scenes.field.quickPrompts.customCount": "Custom ({picked}/{total})", "scenes.field.quickPrompts.none": "No quick prompts yet — add some on the Prompts page",
-        "scenes.field.quickPrompts.noneOption": "None", "scenes.field.quickPrompts.list": "Enabled in this scene", "scenes.field.quickPrompts.pick": "Choose", "scenes.quickPick.title": "Choose the quick prompts enabled in this scene", "scenes.quickPick.hint": "Checked ones are enabled when you enter this scene, unchecked ones are disabled; leaving the scene restores the switches from before you entered.", "scenes.quickPick.confirm": "Done", "scenes.form.section.basic": "Basics", "scenes.form.section.binding": "Scene bindings", "scenes.field.toolTable.none": "Current settings", "scenes.field.toolTable.factory": "Factory default (hides {count})", "scenes.field.toolTable.count": "hides {count}", "scenes.field.toolTable.missing": "scheme no longer exists", "scenes.preview.more": " etc.", "scenes.preview.truncated": "(each kind lists its first 60 entries only)", "scenes.preview.stale": "{count} profile entry(ies) no longer exist in this environment and will not take effect: {items}", "scenes.doctor.title": "{count} reference(s) point at a name that no longer exists", "scenes.doctor.noneButSkipped": "The check found no dangling references", "scenes.doctor.hint": "Left behind by a rename or a delete: it still looks bound here, but nothing matches that name at runtime. Point it at the right name, or untick it in the profile.", "scenes.doctor.row": "{where}: “{name}” no longer exists", "scenes.doctor.more": "{count} more not listed", "scenes.doctor.skipped": "({domains} could not be read, so that kind was not checked)", "agm.restore.tag": "Restored after the scene", "agm.restore.tag.hint": "The global prompt from before the scene; leaving the scene restores it from the snapshot's text, so deleting this preset does not break the restore", "agm.file.mismatch": "Not in AGENTS.md", "agm.file.mismatch.hint": "AGENTS.md does not currently match this preset (it may have been edited by hand); flip the switch on the left to write it back", "hist.restore.note.registered": "Restored {count} session(s); workspace “{title}” was registered again and the sessions are back in that group.", "hist.restore.note.attached": "Restored {count} session(s) and attached them to workspace “{title}”.", "hist.restore.note.skip": "Workspace ownership could not be restored for {count} session(s): {reason}", "hist.purge.title": "Delete forever?", "hist.purge.one": "Delete “{title}” and all of its records forever — this cannot be undone", "hist.purge.batch": "Delete the {count} selected sessions and all of their records forever — this cannot be undone", "hist.btn.restore": "Restore", "hist.btn.purge": "Delete forever", "hist.btn.confirmPurge": "Delete", "hist.selectGroup": "Select group {title}", "hist.select": "Select this session", "hist.group.count": "{count}", "hist.selectAll": "Select all", "hist.deselectAll": "Deselect all", "hist.btn.import": "Import", "hist.btn.export": "Export", "hist.selected": "{count} selected", "hist.btn.restoreSelected": "Restore selected ({count})", "hist.btn.deleteSelected": "Delete selected ({count})", "hist.stat.archived": "Archived", "hist.stat.projects": "Workspaces", "hist.stat.retention": "Retention", "hist.search.placeholder": "Search title / session id / project path", "hist.loading": "Loading…", "hist.empty.search": "No matching archived sessions", "hist.empty.none": "No archived sessions yet", "hist.import.cwd": "Workspace (optional)", "hist.import.cwd.placeholder": "Pick, browse, or type an absolute path; leave blank to go to Ungrouped", "hist.import.workspace": "Workspace", "hist.import.browse": "Browse", "hist.import.workspace.none": "No registered workspace on this machine yet — type an absolute path, or use Browse to pick a folder.", "hist.import.drop": "Choose or drop a conversation file", "hist.import.done": "Created session {id} ({count} messages); continue it from the DSH session list.", "hist.import.lossy": "⚠ No speaker markers were found in the text, so it was folded into a single user message: the original turn structure may have been lost. If the source is a JSONL or Markdown transcript, import it with its original extension.", "hist.export.hint": "Export the selected sessions as transcript files that can be imported again", "hist.export.dir": "Export directory (absolute path, created automatically)", "hist.export.browse": "Browse and choose a folder", "hist.btn.browse": "Choose", "hist.export.pickDir": "Choose export directory", "hist.export.format": "Format", "hist.export.detail": "Export detail", "hist.export.detail.simple": "Text only", "hist.export.detail.tools": "Text + tools", "hist.export.detail.full": "Text + tools + thinking", "hist.export.scope": "Session scope", "hist.export.workspace": "Workspace", "hist.export.sessions": "Sessions ({count})", "hist.export.loading": "Loading sessions…", "hist.cwd.missing": "⚠ The workspace directory no longer exists: ", "hist.tag.archived": "Archived", "hist.tag.live": "Not archived", "hist.export.empty": "No matching sessions", "hist.result.exported": "Exported {count} session(s) to {dir}", "hist.result.skipped": "; skipped {count} ({ids})", "hist.result.archived": "Archived {count} session(s) to History; manage them on the History page", "hist.result.archiveFailed": "; {count} could not be archived", "hist.btn.archiveSelected": "Archive selected", "hist.btn.archiveSelected.title": "Move the selected sessions into History so retention applies to them", "hist.export.busy": "Working…", "hist.btn.exportSelected": "Export {count} session(s)", "hist.error.title": "Operation failed", "hist.error.unknown": "Unknown error",
+        "scenes.field.quickPrompts.noneOption": "None", "scenes.field.quickPrompts.list": "Enabled in this scene", "scenes.field.quickPrompts.pick": "Choose", "scenes.quickPick.title": "Choose the quick prompts enabled in this scene", "scenes.quickPick.hint": "Checked ones are enabled when you enter this scene, unchecked ones are disabled; leaving the scene restores the switches from before you entered.", "scenes.quickPick.confirm": "Done", "scenes.form.section.basic": "Basics", "scenes.form.section.binding": "Scene bindings", "scenes.field.toolTable.none": "Current settings", "scenes.field.toolTable.factory": "Factory default (hides {count})", "scenes.field.toolTable.count": "hides {count}", "scenes.field.toolTable.missing": "scheme no longer exists", "scenes.preview.more": " etc.", "scenes.preview.truncated": "(each kind lists its first 60 entries only)", "scenes.preview.stale": "{count} profile entry(ies) no longer exist in this environment and will not take effect: {items}", "scenes.doctor.title": "{count} reference(s) point at a name that no longer exists", "scenes.doctor.noneButSkipped": "The check found no dangling references", "scenes.doctor.hint": "Left behind by a rename or a delete: it still looks bound here, but nothing matches that name at runtime. Point it at the right name, or untick it in the profile.", "scenes.doctor.row": "{where}: “{name}” no longer exists", "scenes.doctor.more": "{count} more not listed", "scenes.doctor.skipped": "({domains} could not be read, so that kind was not checked)", "agm.restore.tag": "Restored after the scene", "agm.restore.tag.hint": "The global prompt from before the scene; leaving the scene restores it from the snapshot's text, so deleting this preset does not break the restore", "agm.file.mismatch": "Not in AGENTS.md", "agm.file.mismatch.hint": "AGENTS.md does not currently match this preset (it may have been edited by hand); flip the switch on the left to write it back", "hist.restore.note.registered": "Restored {count} session(s); workspace “{title}” was registered again and the sessions are back in that group.", "hist.restore.note.attached": "Restored {count} session(s) and attached them to workspace “{title}”.", "hist.restore.note.skip": "Workspace ownership could not be restored for {count} session(s): {reason}", "hist.purge.title": "Delete forever?", "hist.purge.one": "Delete “{title}” and all of its records forever — this cannot be undone", "hist.purge.batch": "Delete the {count} selected sessions and all of their records forever — this cannot be undone", "hist.btn.restore": "Restore", "hist.btn.purge": "Delete forever", "hist.btn.confirmPurge": "Delete", "hist.selectGroup": "Select group {title}", "hist.select": "Select this session", "hist.group.count": "{count}", "hist.selectAll": "Select all", "hist.deselectAll": "Deselect all", "hist.btn.import": "Import", "hist.btn.export": "Export", "hist.btn.restoreSelected": "Restore selected ({count})", "hist.btn.deleteSelected": "Delete selected ({count})", "hist.stat.archived": "Archived", "hist.stat.projects": "Workspaces", "hist.stat.retention": "Retention", "hist.search.placeholder": "Search title / session id / project path", "hist.loading": "Loading…", "hist.empty.search": "No matching archived sessions", "hist.empty.none": "No archived sessions yet", "hist.import.cwd": "Workspace (optional)", "hist.import.cwd.placeholder": "Pick a registered workspace or type an absolute path; leave blank to go to Ungrouped", "hist.import.workspace": "Workspace", "hist.import.workspace.none": "No registered workspace on this machine yet — type an absolute path.", "hist.import.done": "Created session {id} ({count} messages); continue it from the DSH session list.", "hist.import.lossy": "⚠ No speaker markers were found in the text, so it was folded into a single user message: the original turn structure may have been lost. If the source is a JSONL or Markdown transcript, import it with its original extension.", "hist.export.hint": "Export the selected sessions as transcript files that can be imported again", "hist.export.dir": "Export directory (absolute path, created automatically)", "hist.export.browse": "Browse and choose a folder", "hist.btn.browse": "Choose", "hist.export.pickDir": "Choose export directory", "hist.export.format": "Format", "hist.export.detail": "Export detail", "hist.export.detail.simple": "Text only", "hist.export.detail.tools": "Text + tools", "hist.export.detail.full": "Text + tools + thinking", "hist.export.scope": "Session scope", "hist.export.workspace": "Workspace", "hist.export.sessions": "Sessions ({count})", "hist.export.loading": "Loading sessions…", "hist.cwd.missing": "⚠ The workspace directory no longer exists: ", "hist.tag.archived": "Archived", "hist.tag.live": "Not archived", "hist.export.empty": "No matching sessions", "hist.result.exported": "Exported {count} session(s) to {dir}", "hist.result.skipped": "; skipped {count} ({ids})", "hist.export.busy": "Working…", "hist.btn.exportSelected": "Export {count} session(s)", "hist.error.title": "Operation failed", "hist.error.unknown": "Unknown error",
       }
     };
 
@@ -5912,6 +6033,8 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
           const [levelFilter, setLevelFilter] = React.useState('')
           const [collapsed, setCollapsed] = React.useState({})
           const [formModal, setFormModal] = React.useState(null)
+          // 切走这一页 → 这一页的关窗暂存作废（见 42-shared-ui.js 的 useFormDraftScope）。
+          useFormDraftScope('mcp:')
           // 表单的本地校验结果（不塞进 formModal：那对象是发给服务端的 payload 形状）。
           const [formError, setFormError] = React.useState(null)
           const [detail, setDetail] = React.useState(null)
@@ -6070,9 +6193,16 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             })
           }
 
-            const openAdd = () => { setFormError(null); setFormModal(Object.assign({ mode: 'add', id: null }, emptyForm())) }
+            // 新增与编辑各存一份（编辑按条目 id 分键：改 A 关窗不会串到 B）。
+            const formDraftKey = (modal) => (modal && modal.mode === 'edit' ? 'mcp:edit:' + modal.id : 'mcp:create')
+            const openAdd = () => {
+              setFormError(null)
+              setFormModal(takeFormDraft('mcp:create') || Object.assign({ mode: 'add', id: null }, emptyForm()))
+            }
               const openEdit = (row) => {
                 setFormError(null)
+                const draft = takeFormDraft('mcp:edit:' + row.id)
+                if (draft) { setFormModal(draft); return }
                 setFormModal({
                   mode: 'edit',
                   id: row.id,
@@ -6087,6 +6217,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
                 })
               }
             const closeForm = () => { setFormError(null); setFormModal(null) }
+            // 只有"关掉"这条路存草稿（提交成功走的是 closeForm 本身，不进这里）——
+            // 所以不需要"成功后清草稿"那一步。
+            const dismissForm = () => { const cur = formModal; closeForm(); if (cur) stashFormDraft(formDraftKey(cur), cur) }
             const setFormField = (key) => (ev) => { setFormError(null); setFormModal(Object.assign({}, formModal, { [key]: ev.target.value })) }
             const setFormValue = (key, value) => { setFormError(null); setFormModal(Object.assign({}, formModal, { [key]: value })) }
             /**
@@ -6127,11 +6260,36 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             run(payload.mode === 'edit' ? 'mcpm-edit' : 'mcpm-add', args, 'form', closeForm)
           }
 
+          // 「启动中」的乐观记账（用户 2026-10-15：呼吸灯要过一会才出现）：翻开开关那一刻宿主
+          // 还没把条目起起来，轮询到的仍是停用前的那份状态，于是灯要等下一次轮询（5 秒）才呼吸。
+          // 点下时先记一笔，相位报回 active 即不再算数；30 秒后自动作废 —— 真起不来的条目不该永远呼吸。
+          const STARTING_TTL_MS = 30000
+          const [startingRows, setStartingRows] = React.useState({})
+          const startingKey = (row) => row.id + '@' + row.level
+          const markStarting = (row) => {
+            setStartingRows((prev) => Object.assign({}, prev, { [startingKey(row)]: Date.now() }))
+          }
+          const clearStarting = (row) => {
+            setStartingRows((prev) => {
+              if (prev[startingKey(row)] === undefined) return prev
+              const next = Object.assign({}, prev)
+              delete next[startingKey(row)]
+              return next
+            })
+          }
+          const isStarting = (row) => {
+            const ts = startingRows[startingKey(row)]
+            return ts !== undefined && Date.now() - ts < STARTING_TTL_MS
+          }
+
           // Toggling updates only the clicked row (scroll position and expanded
           // groups survive); a failed write re-reads the server state instead.
           const toggleRow = (row) => {
             const nextDisabled = !row.disabled
             setMsg(null)
+            // 翻开（nextDisabled=false）= 立刻按「启动中」显示；关掉 = 销账，否则刚停用的那行
+            // 还在呼吸。（2026-10-15 这一条写反过一次：结果是"开了不绿、关了反而绿 30 秒"。）
+            if (nextDisabled) clearStarting(row); else markStarting(row)
             setState((prev) => Object.assign({}, prev, {
               rows: (prev.rows || []).map((item) => (
                 item.id === row.id && item.level === row.level
@@ -6142,16 +6300,38 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             setBusy(row.id + ':toggle')
             apiCall('mcpm-set-enabled', { id: row.id, level: row.level, enabled: row.disabled }).then((res) => {
               if (res && !res.ok) {
+                clearStarting(row)
                 setMsg({ kind: 'err', text: (res && res.error) || mt('mcp.msg.failed') })
                 refresh()
               } else if (res && res.warning) {
                 setMsg({ kind: 'warn', text: mt('mcp.msg.warn', { warning: res.warning }) })
               }
             }).catch((e) => {
+              clearStarting(row)
               setMsg({ kind: 'err', text: errMsg(e) })
               refresh()
             }).then(() => setBusy(null))
           }
+          /**
+           * 重连一台服务（`mcpm-restart`）：服务端先把它临时停用、等 loader 摘掉、再按重启前的
+           * 状态恢复 —— 最长约 11 秒，所以**不走 `run()`**（那条路只服务"一按就回"的写操作，
+           * 也没有地方放 warnings）。启用状态不变，这正是"重启"与"关掉再打开"的区别。
+           * 只有驻留在补丁文件里的条目可重连：loader 行没有可写的 id/level，调用点据此置灰。
+           */
+          const restartRow = (row) => {
+            setMsg(null)
+            setBusy(row.id + ':restart')
+            apiCall('mcpm-restart', { id: row.id, level: row.level }).then((res) => {
+              if (res && res.ok === false) {
+                setMsg({ kind: 'err', text: (res && res.error) || mt('mcp.msg.failed') })
+              } else if (res && res.warnings && res.warnings.length) {
+                setMsg({ kind: 'warn', text: mt('mcp.msg.restartWarn', { warning: res.warnings.join('；') }) })
+              } else {
+                setMsg({ kind: 'ok', text: mt('mcp.msg.restarted', { name: row.serverName }) })
+              }
+            }).catch((e) => setMsg({ kind: 'err', text: errMsg(e) })).then(() => { setBusy(null); refresh() })
+          }
+
           const toggleReveal = () => {
             const next = !reveal
             setReveal(next)
@@ -6250,6 +6430,31 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             }).catch((e) => setMsg({ kind: 'err', text: errMsg(e) })).then(() => setBusy(null))
           }
 
+          /**
+           * 详情页里"现在去问一次工具清单"（`mcpm-tools-refresh`）：对还没有缓存的服务器，
+           * 服务端是真的**临时启动一次**去抓工具名，拿到后恢复原启用状态 —— 所以它慢、也可能失败。
+           * 详情那节的「工具：N」平时只读缓存，这是唯一的主动刷新入口；在途响应按打开详情时的
+           * 序号作废（换了一台服务器就不该把旧结果写进去）。
+           */
+          const refreshTools = () => {
+            const row = detail && detail.row
+            if (!row) return
+            const seq = detailSeqRef.current
+            setMsg(null)
+            setBusy('tools:refresh')
+            apiCall('mcpm-tools-refresh', { serverName: row.serverName }).then((res) => {
+              if (seq !== detailSeqRef.current) return
+              if (res && res.ok === false) {
+                setMsg({ kind: 'err', text: (res && res.error) || mt('mcp.msg.failed') })
+                return
+              }
+              const tools = (res && res.tools) || []
+              setDetail((prev) => (prev === null ? prev : Object.assign({}, prev, { loading: false, error: null, tools: tools })))
+              if (res && res.warning) setMsg({ kind: 'warn', text: mt('mcp.msg.warn', { warning: res.warning }) })
+              else setMsg({ kind: 'ok', text: mt('mcp.msg.toolsRefreshed', { count: tools.length }) })
+            }).catch((e) => { if (seq === detailSeqRef.current) setMsg({ kind: 'err', text: errMsg(e) }) }).then(() => setBusy(null))
+          }
+
           const rows = state.rows || []
           // 工具数的三个口径（与 src/mcp/state-section.ts 同源，理由见那里的文件头）：
           //   liveToolCount        当前真实注册了几个工具（**不含**「已知工具」缓存）
@@ -6315,10 +6520,14 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
 
           // 状态口径：tone 只决定胶囊配色（ok=能用、bad=坏了、warn=当前没工具、muted=没在跑）。
           const liveStatus = (row) => {
+            // 「刚翻开开关」这一条排在最前（但仍在 failed 之后）：新写进补丁的条目在宿主读到
+            // 之前 `row.live` 干脆是空的，若让它先落到「未加载 / 已停止」，界面就是"点了开关
+            // 先灰几秒才绿" —— 用户 2026-10-15 报的"看不出是不是启动中"正是这几秒。
+            if (row.live && row.live.phase === 'failed') return { text: mt('mcp.live.failed'), tone: 'bad' }
+            if (isStarting(row) && !(row.live && row.live.phase === 'active')) return { text: mt('mcp.live.loading'), tone: 'busy' }
             if (!row.live) return { text: mt('mcp.live.notLoaded'), tone: 'muted' }
-            if (row.live.phase === 'failed') return { text: mt('mcp.live.failed'), tone: 'bad' }
             if (!row.live.enabled) return { text: mt('mcp.live.stopped'), tone: 'muted' }
-            if (row.live.phase && row.live.phase !== 'active') return { text: mt('mcp.live.loading'), tone: 'muted' }
+            if (row.live.phase && row.live.phase !== 'active') return { text: mt('mcp.live.loading'), tone: 'busy' }
             // 判"有没有可用工具"只看**真实注册**的那个数（缓存不算）。
             if (liveEnabledOf(row) === 0) return { text: mt('mcp.live.noTools'), tone: 'warn' }
             return { text: mt('mcp.live.running'), tone: 'ok' }
@@ -6460,9 +6669,10 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
           const maskedInForm = !!formModal && /•{3,}/.test(String(formModal.env || '') + String(formModal.headers || ''))
           const formModalNode = formModal && React.createElement(Modal, {
             key: 'mcp-form',
+            className: 'dsm-modal-mcp-form',
             title: formModal.mode === 'edit' ? mt('mcp.form.editTitle') + formModal.id : mt('mcp.form.addTitle'),
             closeLabel: mt('btn.close'),
-            onClose: closeForm,
+            onClose: dismissForm,
           },
               React.createElement('div', { className: 'dsm-form' },
                 maskedInForm ? React.createElement(Notice, { kind: 'warn', text: mt('mcp.form.maskedHint') }) : null,
@@ -6471,9 +6681,19 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
                 React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.serverName')),
                 React.createElement('input', { className: 'dsm-control', value: formModal.serverName, placeholder: 'e.g. github', onChange: setFormField('serverName') }),
                 React.createElement('span', { className: 'dsm-help' }, mt('mcp.field.serverName.hint'))),
-              React.createElement('label', { className: 'dsm-field' },
+              // 传输方式用分段控件而不是下拉（用户 2026-10-15）：只有 stdio /
+              // streamable-http 两个互斥值，下拉要多点一下才能看见全部选项，
+              // 且选中态只占一行里的一小条。与「重名处理」「提示词类型」同款。
+              React.createElement('div', { className: 'dsm-field' },
                 React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.transport')),
-                React.createElement(SourceSelect, { value: formModal.transport, options: MCP_TRANSPORT_OPTIONS, onChange: (value) => setFormValue('transport', value) })),
+                React.createElement('div', { className: 'dsm-form-seg', role: 'group', 'aria-label': mt('mcp.field.transport') },
+                  MCP_TRANSPORT_OPTIONS.map(function (o) {
+                    return React.createElement('button', {
+                      key: o.value, type: 'button',
+                      'aria-pressed': formModal.transport === o.value ? 'true' : 'false',
+                      onClick: function () { setFormValue('transport', o.value) },
+                    }, o.label);
+                  }))),
               React.createElement('label', { className: 'dsm-field' },
                 React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.level')),
                 React.createElement(SourceSelect, {
@@ -6493,15 +6713,16 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
                     React.createElement('label', { className: 'dsm-field' },
                       React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.command')),
                       React.createElement('input', { className: 'dsm-control', value: formModal.command, placeholder: 'npx -y @modelcontextprotocol/server-github', onChange: setFormField('command') })),
-                    React.createElement('label', { className: 'dsm-field' },
+                    React.createElement('label', { className: 'dsm-field dsm-field-fill' },
                       React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.args')),
                       React.createElement('textarea', { className: 'dsm-control dsm-textarea-sm', value: formModal.args, placeholder: '-y\n@modelcontextprotocol/server-github', onChange: setFormField('args') })),
-                    React.createElement('label', { className: 'dsm-field' },
+                    // 环境变量的「路径按系统写法填」那句提示删除（用户 2026-10-15）：它讲的是
+                    // 少数人才会碰的细节，却把这一格顶高一行、也让 stdio 与 http 两档更不齐。
+                    React.createElement('label', { className: 'dsm-field dsm-field-fill' },
                       React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.env')),
-                      React.createElement('span', { className: 'dsm-help' }, mt('mcp.field.env.hint')),
                       React.createElement('textarea', { className: 'dsm-control dsm-textarea-sm', value: formModal.env, placeholder: 'GITHUB_TOKEN=xxx', onChange: setFormField('env') }))),
               formModal.transport === 'streamable-http'
-                ? React.createElement('label', { className: 'dsm-field' },
+                ? React.createElement('label', { className: 'dsm-field dsm-field-fill' },
                     React.createElement('span', { className: 'dsm-label' }, mt('mcp.field.headers')),
                     React.createElement('textarea', { className: 'dsm-control dsm-textarea-sm', value: formModal.headers, placeholder: 'Authorization=Bearer xxx', onChange: setFormField('headers') }))
                 : null,
@@ -6538,7 +6759,11 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             React.createElement('div', { className: 'dsm-detail-section' },
               React.createElement('div', { className: 'dsm-detail-title dsm-detail-title-row' },
                 mt('mcp.detail.config'),
-                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: busy !== null, onClick: toggleReveal }, reveal ? mt('mcp.detail.hideSecret') : mt('mcp.detail.showSecret'))),
+                // 两颗动作包成一组（用户 2026-10-15：「重启怎么在中间」）—— space-between
+                // 摊三个子元素时中间那个会被顶到整行正中，标题左、动作组右才对。
+                React.createElement('span', { className: 'dsm-detail-title-acts' },
+                  React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', title: mt('mcp.btn.restart.title'), disabled: busy !== null || detail.row.level === 'loader', onClick: () => restartRow(detail.row) }, mt('mcp.btn.restart')),
+                  React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: busy !== null, onClick: toggleReveal }, reveal ? mt('mcp.detail.hideSecret') : mt('mcp.detail.showSecret')))),
               React.createElement('div', { className: 'dsm-fm' },
                 configRow(mt('mcp.detail.entryId'), detail.row.id),
                 configRow(mt('mcp.field.level'), mt('mcp.level.' + detail.row.level)),
@@ -6554,22 +6779,30 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
               React.createElement('div', { className: 'dsm-detail-title' }, mt('mcp.detail.status')),
               React.createElement('div', { className: 'dsm-feedback' + (detailStatus.tone === 'bad' ? ' dsm-error' : ' dsm-warning') }, detailHint)) : null,
             React.createElement('div', { className: 'dsm-detail-section' },
-              // 字数计数摆在小标题同一行右侧：备注的上限就是注入段的截断长度（`MCP_NOTE_MAX`）。
+              // 标题行只留标题 + 字数计数：备注的上限就是注入段的截断长度（`MCP_NOTE_MAX`）。
               // 超限标红沿用记忆页描述那套（`dsm-char-over`）—— 服务端不校验备注长度，
               // 这条之前存的长备注会整条存着、注入时被截掉，得让人看得见超了多少。
-              React.createElement('div', { className: 'dsm-budget-meta' },
-                React.createElement('div', { className: 'dsm-detail-title' }, mt('mcp.detail.note')),
+              React.createElement('div', { className: 'dsm-detail-title dsm-detail-title-row' },
+                mt('mcp.detail.note'),
                 React.createElement('span', { className: 'dsm-char-count' + (String(noteDraft || '').length > MCP_NOTE_MAX ? ' dsm-char-over' : '') }, String(noteDraft || '').length + ' / ' + MCP_NOTE_MAX)),
               React.createElement('textarea', { className: 'dsm-control dsm-textarea-sm', value: noteDraft, maxLength: MCP_NOTE_MAX, placeholder: mt('mcp.detail.note.placeholder'), onChange: (ev) => setNoteDraft(ev.target.value) }),
+              // 「保存备注」贴着自己要提交的输入框下方右对齐，且是全弹窗唯一的实心主按钮
+              // （用户 2026-10-15：上一版把它与「刷新工具」都摆成标题行里的 quiet 键，
+              // 两颗一模一样、还落在相邻两节的同一高度 —— 备注输完下意识就点到「刷新
+              // 工具」。两个信号把两颗分开：位置贴着 textarea，提交动作跟着被提交的
+              // 字段走；权重用实心主色，它才是备注区的提交，「刷新工具」保持 quiet
+              // 的工具区动作）。
+              React.createElement('div', { className: 'dsm-modal-actions' },
+                React.createElement('button', { type: 'button', className: 'dsm-btn', disabled: busy !== null || noteDraft.trim() === String(detail.row.notes || ''), onClick: saveNote }, mt('mcp.detail.note.save'))),
               // 备注保存的回执就地渲染（见 noteNotice 的说明）。文案原样来自服务端：
               // 成功走 Notice 的 ok 档（右下角浮出的 toast，与全站成功提示同一副长相）；
               // 被冻结闸拒掉是弹窗内的一条红色 feedback —— 这正是用户要看到的那句话，
               // 只是位置从页面挪进了弹窗。
-              React.createElement(Notice, { kind: noteNotice && noteNotice.kind, text: noteNotice && noteNotice.text }),
-              React.createElement('div', { className: 'dsm-modal-actions' },
-                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy !== null || noteDraft.trim() === String(detail.row.notes || ''), onClick: saveNote }, mt('mcp.detail.note.save')))),
+              React.createElement(Notice, { kind: noteNotice && noteNotice.kind, text: noteNotice && noteNotice.text })),
             React.createElement('div', { className: 'dsm-detail-section' },
-              React.createElement('div', { className: 'dsm-detail-title' }, mt('mcp.detail.tools', { count: detail.loading ? '…' : (detail.tools || []).length })),
+              React.createElement('div', { className: 'dsm-detail-title dsm-detail-title-row' },
+                mt('mcp.detail.tools', { count: detail.loading ? '…' : (detail.tools || []).length }),
+                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: busy !== null || detail.loading === true, onClick: refreshTools }, mt('mcp.detail.toolsRefresh'))),
               toolListNode))
 
 
@@ -6669,6 +6902,10 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
           var busyState = React.useState(null), busy = busyState[0], setBusy = busyState[1]
           var em = React.useState(null), editModal = em[0], setEditModal = em[1]
           var cm = React.useState(null), createModal = cm[0], setCreateModal = cm[1]
+          // 新建撞名确认窗（42-shared-ui.js 的 DupNameDialog）：`{ name, finalName, kind }`。
+          // 提示词是**第五个**用它的域（记忆 / 场景 / 技能 / 子智能体之外）—— 前四个在 2026-10-14
+          // 一起改成了"先问一句"，提示词当时漏在外面，撞名照旧是一句「id 已存在」把人挡回去。
+          var ca = React.useState(null), dupAsk = ca[0], setDupAsk = ca[1]
           var ac = React.useState(null), applyConfirm = ac[0], setApplyConfirm = ac[1]
           // 回收站：true = 打开本页那一个回收站（42-shared-ui.js 的 TrashModal，domain = prompts）。
           // 提示词域（预设 + 快捷）的清单加载与恢复/永久删除都在组件内部完成，
@@ -6683,6 +6920,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
           var quick = qs[0], setQuick = qs[1]
           var qk = React.useState(null), quickEdit = qk[0], setQuickEdit = qk[1]
           var qf = React.useState(null), quickConfirm = qf[0], setQuickConfirm = qf[1]
+          // 三个弹窗（新增预设 / 编辑预设 / 编辑快捷提示词）各自一份关窗暂存（见 42-shared-ui.js：
+          // 关窗存、打开取，成功提交不走这条路，所以没有"成功后要记得清"那一步）。
+          useFormDraftScope('prompt:')
           function refreshQuick() {
             apiCall('quickprompt-list', {})
               .then(function (res) {
@@ -6841,6 +7081,9 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
           }
           function openEdit(p) {
             beginAction()
+            // 30 秒内重开同一份：把刚才关掉的那份编辑内容填回去，不重读磁盘。
+            var draft = takeFormDraft('prompt:edit:' + p.id)
+            if (draft) { setEditModal(draft); return }
             // id 可改：改名 = 目录改名，宿主会把场景绑定一起改名（见 rules-rebind-prompt）。
             apiCall('agentsmd-read', { id: p.id }).then(function (res) {
               if (res && res.ok) setEditModal({ id: p.id, nextId: p.id, content: res.content, description: p.description || '' })
@@ -6901,6 +7144,32 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
               else refresh()
             }).catch(function (e) { setBusy(null); setApplyConfirm(null); actionFailed(e) })
           }
+          /**
+           * 新建提示词的**入口**：先按目标那一档的现有 id 查重（用户 2026-10-14）。
+           *
+           * 撞名原先只在服务端被拒（`agentsmd-create` / `quickprompt-create` 各回一句
+           * 「id 已存在」），用户看到的是"这条 id 不能用"，而不是"要不要叫 `1（1）`" ——
+           * 与其余四个域（记忆 / 场景 / 技能 / 子智能体）的口径不一致。这里补上同一套：
+           * 撞名先弹 `DupNameDialog`，确认了才带着退号后的 id 落盘。
+           *
+           * 查重只在**同一档内部**做：全局提示词与快捷提示词各占一个目录
+           * （`prompts/<id>/` 与 `quick-prompts/<id>/`），两边的 id 互不影响。
+           *
+           * 本地查重不替代服务端那道闸：期间别人（或模型工具）建了同一条，提交仍会被拒，
+           * 那时照旧如实报错 —— 这里只是把常见情形做顺手，不是替服务端下判断。
+           */
+          function submitCreate(id, content, description) {
+            var typed = String(id || '').trim()
+            var isQuick = createModal && createModal.kind === 'quick'
+            var taken = {}
+            ;(isQuick ? quick.prompts : state.presets).forEach(function (p) { taken[String(p.id)] = true })
+            var finalId = uniqueName(typed, taken)
+            // 正文与描述一并带进确认窗：确认时直接用它们，不再回头读 `createModal` ——
+            // 那样确认动作就依赖"那个弹窗还开着"，而这两件事没有必然关系。
+            if (finalId !== typed) { setDupAsk({ name: typed, finalId: finalId, content: content, description: description }); return }
+            doCreate(typed, content, description)
+          }
+          /** 真正落盘那一步（id 已定）。`id` 来自 `submitCreate` 或确认弹窗。 */
           function doCreate(id, content, description) {
             beginAction()
             setBusy('create')
@@ -6952,6 +7221,8 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
            */
           function openQuickEdit(p) {
             beginAction()
+            var draft = takeFormDraft('prompt:quick:' + p.id)
+            if (draft) { setQuickEdit(draft); return }
             setQuickEdit({ id: p.id, nextId: p.id, content: p.content || '', description: p.description || '' })
           }
           function doQuickUpdate() {
@@ -7217,7 +7488,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
                 [quickEnabledCount + '/' + quick.prompts.length, t('quickprompt.stat')],
               ],
               actions: [
-                React.createElement('button', { key: 'new', type: 'button', className: 'dsm-btn', disabled: state.anyLocked === true, onClick: function () { setCreateModal({ kind: 'global', id: '', content: '', description: '', error: null }) } }, t('agm.btn.new')),
+                React.createElement('button', { key: 'new', type: 'button', className: 'dsm-btn', disabled: state.anyLocked === true, onClick: function () { setCreateModal(takeFormDraft('prompt:create') || { kind: 'global', id: '', content: '', description: '', error: null }) } }, t('agm.btn.new')),
                 React.createElement('button', { key: 'import', type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy !== null || state.anyLocked === true, onClick: function () { setImportResult(null); setImportOpen(true) } }, t('agm.btn.import')),
                 React.createElement('button', { key: 'export', type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy !== null || !(state.presets.length || quick.prompts.length), onClick: function () { setExportState({ busy: false, result: null }) } }, t('export.presets')),
                 React.createElement('button', { key: 'trash', type: 'button', className: 'dsm-btn dsm-btn-secondary', onClick: function () { setTrash(true) } }, t('trash.btn.open')),
@@ -7285,7 +7556,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
               onReload: function () { refresh(true) },
             }) : null,
             // 编辑：id 与内容都可改（改 id = 目录改名，场景绑定由宿主一起改名）。
-            editModal ? React.createElement(Modal, { title: t('agm.edit.title') + ' · ' + editModal.id, closeLabel: t('btn.close'), onClose: function () { setEditModal(null) } },
+            editModal ? React.createElement(Modal, { className: 'dsm-modal-form-tall', title: t('agm.edit.title') + ' · ' + editModal.id, closeLabel: t('btn.close'), onClose: function () { stashFormDraft('prompt:edit:' + editModal.id, editModal); setEditModal(null) } },
               React.createElement('div', { className: 'dsm-field' },
                 React.createElement('label', { className: 'dsm-label' }, t('agm.field.id')),
                 React.createElement('input', { className: 'dsm-control', value: editModal.nextId || '', onChange: function (e) { setEditModal(Object.assign({}, editModal, { nextId: e.target.value, error: null })) } }),
@@ -7316,7 +7587,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             // 自己滚，正文框静止在 dsm-textarea-lg 的下限上、只能往下拖（与新建人设同款手感）。
             // 标题用 agm.new.title（「新增提示词」）而不是按钮那颗 agm.btn.new（「新增」）：
             // 弹窗里已经看不到那颗按钮了，标题光写"新增"不知道在新增什么（用户 2026-10-12）。
-            createModal ? React.createElement(Modal, { title: t('agm.new.title'), closeLabel: t('btn.close'), onClose: function () { setCreateModal(null) } },
+            createModal ? React.createElement(Modal, { className: 'dsm-modal-form-tall', title: t('agm.new.title'), closeLabel: t('btn.close'), onClose: function () { stashFormDraft('prompt:create', createModal); setCreateModal(null) } },
               kindPicker(createModal.kind, function (v) { setCreateModal(Object.assign({}, createModal, { kind: v, error: null })) }),
               React.createElement('div', { className: 'dsm-field' },
                 React.createElement('label', { className: 'dsm-label' }, t('agm.field.id')),
@@ -7334,7 +7605,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
                 React.createElement('textarea', { className: 'dsm-control dsm-textarea-lg', placeholder: t(createModal.kind === 'quick' ? 'quickprompt.field.content.placeholder' : 'agm.field.content.placeholder'), value: createModal.content || '', onChange: function (e) { setCreateModal(Object.assign({}, createModal, { content: e.target.value })) } })),
               createModal.error ? React.createElement('div', { className: 'dsm-feedback dsm-error' }, createModal.error) : null,
               React.createElement('div', { className: 'dsm-modal-actions' },
-                React.createElement('button', { type: 'button', className: 'dsm-btn', disabled: busy !== null || !String(createModal.id || '').trim(), onClick: function () { doCreate(createModal.id, createModal.content, createModal.description) } }, t('agm.btn.create')))) : null,
+                React.createElement('button', { type: 'button', className: 'dsm-btn', disabled: busy !== null || !String(createModal.id || '').trim(), onClick: function () { submitCreate(createModal.id, createModal.content, createModal.description) } }, t('agm.btn.create')))) : null,
             // 三种确认共用一个弹窗：删除 / 取消应用 / 应用（`applyConfirm` 上的标记位区分）。
             applyConfirm ? React.createElement(Modal, { className: 'dsm-modal-sm', title: applyConfirm.remove ? (t('agm.remove.title') + ' · ' + applyConfirm.id) : ((applyConfirm.unapply ? t('agm.unapply.title') : t('agm.applyModal.title')) + ' · ' + applyConfirm.id), closeLabel: t('btn.close'), onClose: function () { setApplyConfirm(null) } },
               applyConfirm.remove
@@ -7356,7 +7627,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
               React.createElement('div', { className: 'dsm-modal-actions' },
                 React.createElement('button', { type: 'button', className: 'dsm-btn ' + (applyConfirm.remove || (applyConfirm.unapply && unapplyRemoves) ? 'dsm-btn-danger' : ''), disabled: busy !== null, onClick: function () { if (applyConfirm.remove) doRemove({ id: applyConfirm.id }); else if (applyConfirm.unapply) doUnapply(); else doApply(applyConfirm.id) } }, applyConfirm.remove ? t('agm.btn.confirmRemove') : (applyConfirm.unapply ? (unapplyRemoves ? t('agm.btn.confirmUnapplyRemove') : t('agm.btn.confirmUnapply')) : t('agm.btn.confirmApply'))))) : null,
             importOpen ? React.createElement(ImportModal, {
-              key: 'imp', t: t, title: t('agm.btn.import'), accept: '.md',
+              key: 'imp', t: t, title: t('agm.btn.import'), accept: '.md', hint: t('upload.drop.prompt'),
               busy: importBusy, result: importResult,
               // 类型选择放在弹窗顶部（`extra` 槽）：一次导入只进一类，选完再拖文件。
               extra: kindPicker(importKind, setImportKind),
@@ -7367,7 +7638,7 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
             }) : null,
             // 快捷提示词的编辑：正文直接来自列表（`quickprompt-list` 连正文一起回），
             // 不像预设那样还要再发一次 read。
-            quickEdit ? React.createElement(Modal, { title: t('quickprompt.edit.title') + ' · ' + quickEdit.id, closeLabel: t('btn.close'), onClose: function () { setQuickEdit(null) } },
+            quickEdit ? React.createElement(Modal, { title: t('quickprompt.edit.title') + ' · ' + quickEdit.id, closeLabel: t('btn.close'), onClose: function () { stashFormDraft('prompt:quick:' + quickEdit.id, quickEdit); setQuickEdit(null) } },
               React.createElement('div', { className: 'dsm-field' },
                 React.createElement('label', { className: 'dsm-label' }, t('agm.field.id')),
                 React.createElement('input', { className: 'dsm-control', value: quickEdit.nextId || '', onChange: function (e) { setQuickEdit(Object.assign({}, quickEdit, { nextId: e.target.value, error: null })) } }),
@@ -7389,7 +7660,16 @@ button.dsm-rowselect-box:disabled{cursor:default;opacity:.45}
               React.createElement('p', { className: 'dsm-help' }, t('quickprompt.remove.hint')),
               React.createElement('div', { className: 'dsm-modal-actions' },
                 React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: busy !== null, onClick: function () { setQuickConfirm(null) } }, t('btn.cancel')),
-                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-danger', disabled: busy !== null, onClick: function () { doQuickRemove(quickConfirm.id) } }, t('agm.btn.confirmRemove')))) : null)
+                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-danger', disabled: busy !== null, onClick: function () { doQuickRemove(quickConfirm.id) } }, t('agm.btn.confirmRemove')))) : null,
+            // 新建撞名确认窗。放在最后渲染 = 盖在新建弹窗之上（两个弹窗都开着，用户确认/取消
+            // 之后回到那张还填着内容的表单，不用重新输入）。
+            dupAsk ? React.createElement(DupNameDialog, {
+              key: 'dup-name', t: t, kind: t('dup.kind.prompt'),
+              name: dupAsk.name, finalName: dupAsk.finalId, action: 'create',
+              busy: busy !== null,
+              onConfirm: function () { setDupAsk(null); doCreate(dupAsk.finalId, dupAsk.content, dupAsk.description) },
+              onCancel: function () { setDupAsk(null) },
+            }) : null)
         }
 
         // 「工具」设置页：一个侧栏项，内部 tab 切换 场景 / MCP / 技能 / 子智能体 / 提示词 / 记忆 / 会话。
@@ -8111,6 +8391,90 @@ function enabledMemoryCount(rules) {
       if (props.state === 'empty') return h(EmptyState, { text: props.text, action: props.action })
       return h(react.Fragment, null, props.children)
     }
+    /**
+     * 同名退号：`测` → `测（1）` → `测（2）`…（全角括号，用户 2026-10-14 定的写法）。
+     *
+     * `taken` 是「已经被占用的名字」集合 —— 数组按值判、对象按键判，两种写法在各调用点
+     * 手头的数据形状不同（一处是 `list.map(name)`，一处是现拼的字典），这里一并收下。
+     *
+     * `style`：`'paren'`（缺省）= 全角括号，用在**名字即文件名**的三个域（记忆 / 场景 /
+     * 子智能体）；`'dash'` = 半角连字符，只有技能域用 —— 技能名必须过 `KEBAB_RE`
+     * （`^[a-z0-9]+(?:-[a-z0-9]+)*$`），全角括号会被 `toKebab` 抹成 `-`，写出来是
+     * `foo-1` 而不是 `foo（1）`，不如一开始就按 `-1` 退号，省得"看着叫甲、落盘叫乙"。
+     *
+     * 上限 999 只是兜底：真到那里说明有一千条同名，再往后试没有意义。
+     */
+    function uniqueName(raw, taken, style) {
+      var isArray = Array.isArray(taken)
+      // `hasOwnProperty` 而不是 `!!taken[n]`：占用表是各调用点现拼的普通对象，直接取属性会
+      // 把原型上的东西（`constructor` / `toString` / `__proto__`）算成"已被占用" —— 用户给
+      // 记忆起名叫 `constructor` 就会被莫名退号。
+      var has = isArray
+        ? function (n) { return taken.indexOf(n) >= 0 }
+        : function (n) { return !!taken && Object.prototype.hasOwnProperty.call(taken, n) }
+      var name = String(raw == null ? '' : raw).trim()
+      if (!has(name)) return name
+      var dash = style === 'dash'
+      for (var i = 1; i <= 999; i += 1) {
+        var candidate = dash ? name + '-' + i : name + '（' + i + '）'
+        if (!has(candidate)) return candidate
+      }
+      return name
+    }
+    /**
+     * 「已存在同名 X」确认弹窗（用户 2026-10-14）。
+     *
+     * 起因：撞名原先在**提交那一刻静默退号**（`测` → `测（1）`）—— 名字是被自动改掉的，
+     * 用户看着输入框里写着「测」、落盘的却叫「测（1）」。改成先问一句：把撞上的名字与
+     * 将要用的名字都摆出来，确认了才建 / 才恢复。
+     *
+     * 刻意做成**最小的一档**（`dsm-modal-sm`）：这里只有「继续 / 取消」两个答案，没有别的
+     * 字段可填 —— 用大弹窗会让人以为还要再改点什么。四个域 × 新建 / 恢复共八个入口共用它，
+     * 所以文案走 `dup.*` 一组跨域词条，只有名词（记忆 / 场景 / 技能 / 子智能体）由调用方传。
+     *
+     * props：`t` / `kind`（已取过词的名词）/ `name`（撞上的名字）/ `finalName`（确认后实际
+     * 用的名字）/ `action`（`'create'` | `'restore'`）/ `busy` / `onConfirm` / `onCancel`。
+     */
+    function DupNameDialog(props) {
+      var t = props.t
+      var restore = props.action === 'restore'
+      return h(Modal, {
+        key: 'dup-name', className: 'dsm-modal-sm',
+        title: t('dup.title', { kind: props.kind }),
+        closeLabel: t('btn.close'), onClose: props.onCancel,
+      },
+        h('p', { className: 'dsm-desc' }, t('dup.body', { kind: props.kind, name: props.name })),
+        h('p', { className: 'dsm-help' }, t(restore ? 'dup.restore' : 'dup.create', { name: props.finalName })),
+        h('div', { className: 'dsm-modal-actions' },
+          h('button', { type: 'button', className: 'dsm-btn', disabled: props.busy === true, onClick: props.onConfirm }, t(restore ? 'dup.confirm.restore' : 'dup.confirm.create')),
+          h('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: props.busy === true, onClick: props.onCancel }, t('btn.cancel'))))
+    }
+    /**
+     * 创建 / 编辑弹窗的「关掉 ≠ 丢掉」（用户 2026-10-16：误点背板就得重头填一遍）。
+     *
+     * 只兜"手滑关掉"这一件事：关窗那一下把表单暂存，30 秒内重开就填回去。三条作废的路都
+     * 是"已经不需要它了"—— 提交成功（成功那条路不走 onClose，所以根本不进这里）、过点时间、
+     * 切走这一页（页面组件卸载）。不落盘、不跨重启，也就不需要「草稿」标记与清空键：
+     * 一分钟内回来就是要它，超过 30 秒它自己没了。
+     */
+    var FORM_DRAFT_TTL_MS = 30000
+    var formDrafts = {}
+    function stashFormDraft(key, value) { formDrafts[key] = { at: Date.now(), value: value } }
+    /** 取回即销账（一次性）：没有或已过期都回 null，调用方照常按空表打开。 */
+    function takeFormDraft(key) {
+      var hit = formDrafts[key]
+      if (!hit) return null
+      delete formDrafts[key]
+      return Date.now() - hit.at < FORM_DRAFT_TTL_MS ? hit.value : null
+    }
+    /** 页面组件挂一次：卸载（= 切到别的功能页）时把这一页的暂存全清掉。 */
+    function useFormDraftScope(prefix) {
+      react.useEffect(function () {
+        return function () {
+          Object.keys(formDrafts).forEach(function (key) { if (key.indexOf(prefix) === 0) delete formDrafts[key] })
+        }
+      }, [])
+    }
     function Modal(props) {
       var ref = react.useRef(null)
       // 弹窗存在期间，令牌提示交给**弹窗自己**渲染：页面级那份会被遮罩压暗、盖在弹窗背后，
@@ -8289,21 +8653,44 @@ function enabledMemoryCount(rules) {
      */
     function runSerial(items, one) {
       return new Promise(function (resolve) {
-        var out = { done: 0, failed: 0, firstErr: null }
+        // `results` 与 `items` **逐位对齐**（失败位是 null）：回收站恢复要用成功那一条回传的
+        // 最终名字来回执（退号恢复时它与回收站里的原名不同），只数成功个数是不够的。
+        var out = { done: 0, failed: 0, firstErr: null, firstFail: null, results: [] }
         var step = function (i) {
           if (i >= items.length) { resolve(out); return }
           Promise.resolve().then(function () { return one(items[i]) }).then(function (res) {
-            if (res && res.ok === true) out.done += 1
-            else { out.failed += 1; if (!out.firstErr) out.firstErr = (res && res.error) || res || 'error' }
+            if (res && res.ok === true) { out.done += 1; out.results.push(res) }
+            else {
+              out.failed += 1
+              // `firstErr` 仍旧只存**错误文案**（部分失败的回执一直用它，换成整份结果会把
+              // 措辞一起换掉 —— 词典里的模板句比 op 原文笼统）；`firstFail` 另存整份失败结果，
+              // 因为只有它带着 `code` / `params`（`error.dup.conflict` 的候选名字就在
+              // `params.next` 里），回收站那条"撞名先问一句"要靠它。
+              if (!out.firstErr) out.firstErr = (res && res.error) || res || 'error'
+              if (!out.firstFail) out.firstFail = res || null
+              out.results.push(null)
+            }
             step(i + 1)
           }, function (e) {
             out.failed += 1; if (!out.firstErr) out.firstErr = errMsg(e)
+            if (!out.firstFail) out.firstFail = null
+            out.results.push(null)
             step(i + 1)
           })
         }
         step(0)
       })
     }
+    /**
+     * 这条失败结果是不是「撞名」（四个回收站统一的 `error.dup.conflict`）？
+     *
+     * 判据是**错误码**，不是文案 —— 文案会随语言和措辞变，码不会。`params.next` 必须有：
+     * 弹窗要把它当作"确认后会叫什么"如实写出来，没有候选名字就退回普通报错，别弹一个
+     * 说不出结果的确认窗。
+     */
+    function isDupConflict(res) {
+      return !!(res && res.code === 'error.dup.conflict' && res.params && res.params.next)
+    }
     /**
      * 每一页的回收站包含哪几组（`TrashModal` 的 `domain`）。
      * 两组的那两页 —— 技能页（技能 + 已移除的目录）、提示词页（提示词预设 + 快捷提示词）——
@@ -8362,6 +8749,10 @@ function enabledMemoryCount(rules) {
       // 行内二次确认。存「哪一组的哪一行在确认」，批量条的 key 为 null。
       const cfx = React.useState(null)
       const confirm = cfx[0], setConfirm = cfx[1]
+      // 「已存在同名 X，是否恢复为 X（1）」确认窗（用户 2026-10-14）。null = 没开；开了就是
+      // 一条 `{ group, items, kind, name, finalName }` —— 点「继续恢复」才带 `dedupe` 重发。
+      const dfx = React.useState(null)
+      const dupAsk = dfx[0], setDupAsk = dfx[1]
       // 「详情」只读预览（用户 2026-10-12：「回收站的每条信息应该增加一个详情按键，点开就能看
       // 这个信息是什么样子，不能更改内容，没有保存按键」）。null = 没开；开了就是一条
       // `{ group, id, name, meta, loading, error, files }`：
@@ -8417,6 +8808,18 @@ function enabledMemoryCount(rules) {
       // ── 各组清单（`TRASH_DOMAINS` 按页取用）。每组的 restore / purge 都是**全局单条 op**
       //    （apiCall 直呼，信封原样返回）。──
       const noteDefault = function (item) { return t('trash.deletedAt', { time: item.deletedAt ? new Date(item.deletedAt).toLocaleString() : '—' }) }
+      /**
+       * 「已恢复」回执，四个可退号的域共用。
+       *
+       * 回执必须写**最终落盘的名字**：退号恢复（撞名 → `测（1）`）时它与回收站里显示的原名
+       * 不同，写原名就是谎报 —— 用户回到列表里找不到「测」，因为磁盘上那份叫「测（1）」。
+       * 判据用服务端回的 `renamed` 而不是自己比对 `res.name !== it.name`：服务端说没改名就是
+       * 没改名，界面不猜。
+       */
+      const restoredText = function (it, res) {
+        var name = (res && res.name) || it.name
+        return t(res && res.renamed === true ? 'done.restoredAs' : 'done.restored', { name: name })
+      }
       const memoryNote = function (item) {
         return sceneLabel(sceneList, item.group) + ' · '
           + t('memory.form.' + (item.form === 'bundle' ? 'bundle' : 'flat')) + ' · '
@@ -8449,9 +8852,10 @@ function enabledMemoryCount(rules) {
           //（用户 2026-10-12：「技能回收站应该和其他回收站一样灰色的不能选择」）。
           id: 'skills', title: t('trash.section.skills'), note: t('trash.section.skills.sub'), frozen: true,
           nameOf: function (it) { return it.name }, noteOf: noteDefault,
-          restore: function (it) { return apiCall('skill-trash-restore', { id: it.id }) },
+          dupKind: 'dup.kind.skill',
+          restore: function (it, dedupe) { return apiCall('skill-trash-restore', { id: it.id, dedupe: dedupe === true }) },
           purge: function (it) { return apiCall('skill-trash-delete', { id: it.id }) },
-          resultRestore: function (it) { return t('done.restored', { name: it.name }) },
+          resultRestore: restoredText,
           resultPurge: function (it) { return t('trash.purged', { name: it.name }) },
         },
         dirs: {
@@ -8496,20 +8900,22 @@ function enabledMemoryCount(rules) {
           id: 'agents', title: null, note: t('trash.section.agents.sub'), frozen: true,
           op: 'subagent-trash-list', pick: function (res) { return res.trash },
           nameOf: function (it) { return it.name }, noteOf: noteDefault,
-          restore: function (it) { return apiCall('subagent-trash-restore', { id: it.id }) },
+          dupKind: 'dup.kind.subagent',
+          restore: function (it, dedupe) { return apiCall('subagent-trash-restore', { id: it.id, dedupe: dedupe === true }) },
           purge: function (it) { return apiCall('subagent-trash-delete', { id: it.id }) },
           // 启停状态没能写回（服务端 stateSyncError）必须说出来，不能只报「已恢复」。
           restoreWarn: true,
-          resultRestore: function (it) { return t('done.restored', { name: it.name }) },
+          resultRestore: restoredText,
           resultPurge: function (it) { return t('trash.purged', { name: it.name }) },
         },
         scenes: {
           id: 'scenes', title: null, note: t('trash.section.scenes.sub'), frozen: false,
           op: 'scene-trash-list', pick: function (res) { return res.trash },
           nameOf: function (it) { return it.name }, noteOf: noteDefault,
-          restore: function (it) { return apiCall('scene-trash-restore', { id: it.id }) },
+          dupKind: 'dup.kind.scene',
+          restore: function (it, dedupe) { return apiCall('scene-trash-restore', { id: it.id, dedupe: dedupe === true }) },
           purge: function (it) { return apiCall('scene-trash-delete', { id: it.id }) },
-          resultRestore: function (it) { return t('done.restored', { name: it.name }) },
+          resultRestore: restoredText,
           resultPurge: function (it) { return t('trash.purged', { name: it.name }) },
         },
         memories: {
@@ -8517,9 +8923,10 @@ function enabledMemoryCount(rules) {
           op: 'rules-trash-list', pick: function (res) { return res.entries },
           idOf: function (it) { return it.trashId },
           nameOf: function (it) { return it.name }, noteOf: memoryNote,
-          restore: function (it) { return apiCall('rules-restore', { trashId: it.trashId }) },
+          dupKind: 'dup.kind.memory',
+          restore: function (it, dedupe) { return apiCall('rules-restore', { trashId: it.trashId, dedupe: dedupe === true }) },
           purge: function (it) { return apiCall('rules-trash-remove', { trashId: it.trashId }) },
-          resultRestore: function (it) { return t('done.restored', { name: it.name }) },
+          resultRestore: restoredText,
           resultPurge: function (it) { return t('memory.result.trashRemoved', { name: it.name }) },
         },
       }
@@ -8608,18 +9015,34 @@ function enabledMemoryCount(rules) {
         setConfirm(null)
         if (props.onReload) props.onReload()
       }
-      function runRestore(g, items) {
+      /**
+       * 恢复。`dedupe === true` = 用户在"已存在同名 X"确认窗里点过继续，这一次按退号的名字落盘。
+       *
+       * 撞名（用户 2026-10-14）：服务端**先拒**并回 `error.dup.conflict` + `params.next`，
+       * 这里认出它、把确认窗弹出来；用户点继续才带 `dedupe` 重来。批量恢复**不弹** ——
+       * 一次勾了八条、其中三条撞名时弹三个窗没人受得了，那种情形照旧走"部分失败"的回执，
+       * 用户看完自己挑单条重试。
+       */
+      function runRestore(g, items, dedupe) {
         setBusy(true)
         var warns = []
         runSerial(items, function (item) {
-          return g.restore(item).then(function (res) {
+          return g.restore(item, dedupe).then(function (res) {
             if (g.restoreWarn && res) { var w = stateSyncWarn(t, res); if (w) warns.push(w) }
             return res
           })
         }).then(function (out) {
           setBusy(false)
+          if (out.failed === 1 && items.length === 1 && dedupe !== true && isDupConflict(out.firstFail)) {
+            setDupAsk({
+              group: g.id, items: items, kind: g.dupKind,
+              name: String(out.firstFail.params.name || items[0].name || ''),
+              finalName: String(out.firstFail.params.next),
+            })
+            return
+          }
           if (out.failed === 0) {
-            var head = items.length === 1 ? g.resultRestore(items[0]) : t('trash.restoreMany.result', { count: out.done })
+            var head = items.length === 1 ? g.resultRestore(items[0], out.results[0]) : t('trash.restoreMany.result', { count: out.done })
             afterWrite(g, warns.length === 0, warns.length ? head + ' ' + warns.join(' ') : head)
           } else {
             setBusy(false)
@@ -8823,10 +9246,19 @@ function enabledMemoryCount(rules) {
                 groupIds.map(function (gid) { return groupNode(GROUPS[gid], true) }))
             : React.createElement('div', { className: 'dsm-trash-pane-scroll' },
                 groupIds.map(function (gid) { return groupNode(GROUPS[gid], false) }))))
-      if (!preview) return trashNode
+      // 「已存在同名 X」确认窗：叠在回收站之上（`Modal` 自带 gateModalDepth 计数，与「详情」
+      // 同一种叠法）。取消 → 回到回收站，勾选与滚动位置都不动，什么都没发生。
+      const dupNode = dupAsk ? React.createElement(DupNameDialog, {
+        key: 'dup-name', t: t, kind: t(dupAsk.kind),
+        name: dupAsk.name, finalName: dupAsk.finalName, action: 'restore',
+        busy: busy,
+        onCancel: function () { setDupAsk(null) },
+        onConfirm: function () { setDupAsk(null); runRestore(GROUPS[dupAsk.group], dupAsk.items, true) },
+      }) : null
+      if (!preview) return dupNode ? React.createElement(React.Fragment, null, trashNode, dupNode) : trashNode
       // 「详情」弹窗**叠在回收站上面**（`Modal` 自带 gateModalDepth 计数，叠弹窗是既有形态：
       // 导入套导出、自定义目录套选目录都是这样）。关掉它回到回收站，勾选与滚动位置都不动。
-      return React.createElement(React.Fragment, null, trashNode, previewModalNode())
+      return React.createElement(React.Fragment, null, trashNode, previewModalNode(), dupNode)
     }
     /**
      * 勾选行（2026-10-11 切片五收编）：本质就是行选择 RowSelect —— 导出列表、导入
@@ -8949,6 +9381,9 @@ function enabledMemoryCount(rules) {
             onDrop: function (e) { e.preventDefault(); if (e.currentTarget.classList) e.currentTarget.classList.remove("dsm-dropzone-active"); droppedFiles(e.dataTransfer).then(add) },
           },
             h("span", { className: "dsm-dropzone-title" }, t("upload.drop.title")),
+            // 默认文案是**技能页**的（zip / 技能文件夹 / SKILL.md）—— 别的页必须显式传
+            // hint（用户 2026-10-15：子智能体 / 提示词 / 记忆 / 会话四页都漏传过，
+            // 拖拽区挂着 SKILL.md，而它们根本不收技能）。
             h("span", { className: "dsm-dropzone-copy" }, props.hint || t("upload.drop.copy"))),
           h("input", { ref: ref, type: "file", multiple: true, accept: props.accept || ".md,.zip", className: "dsm-hidden-input", onChange: function (e) { add(e.target.files); e.target.value = "" } }),
           // 已选文件：一行一个（名字 + 大小 + 移除），与技能页同一形态。
@@ -9088,12 +9523,20 @@ function enabledMemoryCount(rules) {
       return h('span', { className: 'dsm-tag' + tone, title: props.title }, props.text)
     }
 
-    // ---------- MCP JSON 导入 / 导出（0.15.0 A1）------------------------------------
-    // 服务端 `mcpm-import` / `mcpm-export` 早就实现完整，缺的只是界面与**格式转换**：
-    // 社区流通的块是 `{"mcpServers": {...}}`，而服务端只认数组或 `{rows:[...]}`，
+    // ---------- MCP 导入 / 导出（0.15.0 A1；0.20.x 起收 dsh 补丁片段）------------------
+    // 服务端 `mcpm-import` / `mcpm-export` 早就实现完整，缺的只是界面与**格式转换**。
+    // 导入面（三条路）：
+    //   · 社区流通的 `{"mcpServers": {...}}`
+    //   · 服务端自己的 `{rows: [...]}` / 裸数组
+    //   · **dsh 补丁片段**（用户 2026-10-15 指出这才是真实模板）：`- insert:` 块 +
+    //     `name: '@deepseek-ai/dsh-mcp-client'` + `config:`，也就是 `cordis.patch.yml` 里
+    //     本插件自己写出来的形状（生成侧见 src/mcp/patch-yaml.ts 的 buildInsertBlock）。
     // 且 `transport` 只要不是字面 `'stdio'` 就一律落 streamable-http、`serverName` 不合规矩
     // 就整条丢弃。这些判定必须在提交前做完并让用户看见，否则导入完只剩一串跳过原因。
 
+    /** 本插件写入补丁时用的 loader 名（单一真相源在 src/host-names.ts 的 MCP_CLIENT_MODULE）。 */
+    var MCP_CLIENT_MODULE = '@deepseek-ai/dsh-mcp-client'
+
     function isPlainObject(v) { return !!v && typeof v === 'object' && !Array.isArray(v) }
 
     /** 名字净化：非 `[A-Za-z0-9_-]` → `-`，去空壳横线，截到 32（与服务端那条正则同口径）。 */
@@ -9126,6 +9569,31 @@ function enabledMemoryCount(rules) {
       return null
     }
 
+    // ---------- dsh 补丁片段（YAML）：解析在宿主侧 ------------------------------------
+    // 客户端**不解析 YAML**：这一半跑在浏览器里（`window.__ModuleLoader__`），那里的
+    // `require` 只认宿主注册过的浏览器模块（react / react-dom/client），`js-yaml` 取不到 ——
+    // 把它当"本机大概装了就能用"是 0.20.1 那次改错的根因。补丁片段一律发给
+    // `mcpm-parse-patch`（宿主侧 `parseRows`，纯字符串运算，与本插件读真身补丁同一口径）。
+    /** 文本看着像不像 dsh 补丁片段（只用来在"读通了但没有条目"与"结构不认识"之间挑一句对症的报错）。 */
+    function looksLikePatchText(raw) {
+      return String(raw).indexOf('- insert:') >= 0 || String(raw).indexOf(MCP_CLIENT_MODULE) >= 0
+    }
+    /**
+     * 宿主解析回来的条目 → `[名字, 配置]` 对。`config` 里的 serverName 优先，
+     * 没有就退回 insert 子条目的 id（与宿主写补丁时的取名口径一致）。
+     * 启停在子条目自己身上、或由后面的覆盖块改写，`parseRows` 已按文件顺序合好。
+     */
+    function patchEntriesToPairs(entries) {
+      var list = Array.isArray(entries) ? entries : []
+      return list.map(function (e) {
+        var cfg = isPlainObject(e && e.config) ? Object.assign({}, e.config) : {}
+        if (e && e.id !== undefined && cfg.id === undefined) cfg.id = String(e.id)
+        if (e && e.disabled !== undefined && cfg.disabled === undefined) cfg.disabled = e.disabled
+        var name = cfg.serverName !== undefined && String(cfg.serverName).trim() ? String(cfg.serverName) : String(e && e.id == null ? '' : e.id)
+        return [name, cfg]
+      })
+    }
+
     var MCP_CFG_KEYS = ['command', 'args', 'url', 'env', 'headers', 'disabled', 'type', 'transport', 'serverName', 'id', 'level']
 
     /** 一条配置 → 预览行（含服务端会拒绝的形状问题）。不取词：问题以 code 回给界面翻译。 */
@@ -9163,25 +9631,12 @@ function enabledMemoryCount(rules) {
     }
 
     /**
-     * 粘贴的任意 MCP JSON → `{ok, rows}` 或 `{ok:false, code}`。
-     * 识别顺序：`{mcpServers:{…}}` → `{rows:[…]}` → 裸数组 → 裸映射。
+     * `[名字, 配置]` 对 → 预览行。JSON 那条路与宿主补丁解析那条路共用这一份判定
+     * （重名退号 / 传输方式 / 致命项因此不会有两副口径）。
      */
-    function convertMcpJsonToRows(text) {
-      var parsed
-      try { parsed = JSON.parse(String(text == null ? '' : text).trim()) } catch (e) { return { ok: false, code: 'parse', error: errMsg(e) } }
-      if (!isPlainObject(parsed) && !Array.isArray(parsed)) return { ok: false, code: 'shape' }
-      var pairs = []
-      var map = isPlainObject(parsed) ? mcpServerMapOf(parsed) : null
-      if (map) {
-        Object.keys(map).forEach(function (k) { pairs.push([k, map[k]]) })
-      } else if (Array.isArray(parsed) || Array.isArray(parsed.rows)) {
-        var list = Array.isArray(parsed) ? parsed : parsed.rows
-        list.forEach(function (it, i) { pairs.push([it && it.serverName != null ? String(it.serverName) : String(i + 1), it]) })
-      } else if (looksLikeServerMap(parsed)) {
-        Object.keys(parsed).forEach(function (k) { pairs.push([k, parsed[k]]) })
-      } else return { ok: false, code: 'shape' }
+    function mcpRowsFromPairs(pairs) {
       var used = {}
-      var rows = pairs.map(function (pair, i) {
+      return pairs.map(function (pair, i) {
         var row = mcpRowFromConfig(pair[0], pair[1], i)
         // 批次内重名：serverName 全局唯一，第二条起服务端必然「serverName 已存在」。
         // 与其让用户导入一半才发现，不如现在就改名并在预览里标出来。
@@ -9202,11 +9657,72 @@ function enabledMemoryCount(rules) {
         row.id = row.payload.id || mcpImportIdOf(row.serverName)
         return row
       })
-      return { ok: true, rows: rows }
     }
 
+    /**
+     * 粘贴的文本按 **JSON** 试：`{mcpServers:{…}}` → `{rows:[…]}` → 裸数组 → 裸映射。
+     * 返回 `{ok, rows}` / `{ok:false, code}`；**JSON 根本不成立时返回 null** —— 那份文本
+     * 该走补丁片段那条路（宿主侧 `mcpm-parse-patch`，见上）。
+     */
+    function convertMcpJsonToRows(text) {
+      var raw = String(text == null ? '' : text).trim()
+      var parsed = null
+      try { parsed = JSON.parse(raw) } catch (e) { return null }
+      if (!isPlainObject(parsed) && !Array.isArray(parsed)) return { ok: false, code: 'shape' }
+      var pairs = []
+      var map = isPlainObject(parsed) ? mcpServerMapOf(parsed) : null
+      if (map) {
+        Object.keys(map).forEach(function (k) { pairs.push([k, map[k]]) })
+      } else if (Array.isArray(parsed) || Array.isArray(parsed.rows)) {
+        var list = Array.isArray(parsed) ? parsed : parsed.rows
+        list.forEach(function (it, i) { pairs.push([it && it.serverName != null ? String(it.serverName) : String(i + 1), it]) })
+      } else if (looksLikeServerMap(parsed)) {
+        Object.keys(parsed).forEach(function (k) { pairs.push([k, parsed[k]]) })
+      } else return { ok: false, code: 'shape' }
+      return { ok: true, rows: mcpRowsFromPairs(pairs) }
+    }
+
+    /**
+     * 导入框的「dsh 标准模板」。打开弹窗即预填这份，用户直接改；删空后 placeholder
+     * 显示同一份（useState 初值与 placeholder 同源，两条路径永远是这一份）。
+     *
+     * 用**真实**的补丁格式而不是社区的 `{"mcpServers": …}`（用户 2026-10-15：贴出
+     * `cordis.patch.yml` 里的真身，"默认模板不对"）：这正是 `buildInsertBlock`
+     * （src/mcp/patch-yaml.ts）写进补丁的形状，也是宿主真正读的那份 —— 缩进、引号、
+     * `config:` 的层级都按生成器逐字取。两条示例覆盖两种传输方式（stdio 看 command、
+     * http 看 url；判传输不看 `transport` 字段，见 mcpRowFromConfig 注释），
+     * serverName 带 example- 前缀就是让人一眼看出"这是模板，改我"。
+     *
+     * 顶层的 `# dsh-plugin-tool-management:server:<id>` 标记**不写进模板**：那是本插件
+     * 自己落盘时加的，用户手写的片段不需要它（解析时按注释忽略）。
+     */
+    var MCP_IMPORT_TEMPLATE = [
+      '- insert:',
+      '    - id: mcp-example',
+      "      name: '" + MCP_CLIENT_MODULE + "'",
+      '      config:',
+      '        serverName: "example"',
+      '        transport: "stdio"',
+      '        command: "npx"',
+      '        args:',
+      '          - "-y"',
+      '          - "your-package"',
+      '        env:',
+      '          "API_KEY": ""',
+      '- insert:',
+      '    - id: mcp-example-remote',
+      "      name: '" + MCP_CLIENT_MODULE + "'",
+      '      config:',
+      '        serverName: "example-remote"',
+      '        transport: "streamable-http"',
+      '        url: "https://your-server.com/mcp"',
+    ].join('\n')
+
     function McpJsonImportModal(props) {
       var t = props.t
+      // 打开时框子是空的（用户 2026-10-15 回退上一版的"预填模板"：预填让人以为已经填好了，
+      // 而且大多数人是要粘贴自己那份，不是改这份示例）。模板只留在 placeholder 里 ——
+      // 空框显示它，一敲字就没了，两处内容同源（MCP_IMPORT_TEMPLATE）。
       var ts = react.useState(''); var text = ts[0], setText = ts[1]
       // 解析走防抖值：整份 JSON 在每次按键上都重解析没有意义。
       var dq = useDebouncedValue(text)
@@ -9215,8 +9731,26 @@ function enabledMemoryCount(rules) {
       var cs = react.useState('skip'); var conflict = cs[0], setConflict = cs[1]
       var os = react.useState({}); var off = os[0], setOff = os[1]
       var fileRef = react.useRef(null)
-      var converted = react.useMemo(function () {
-        return String(dq || '').trim() ? convertMcpJsonToRows(dq) : null
+      // 预览结果。JSON 那条路在浏览器里同步算完；补丁片段（YAML）得问宿主，所以这份是
+      // effect 的产物 —— 换文本时先落一个 parsing 占位，回来再覆盖（alive 挡旧请求的迟到响应）。
+      var vs = react.useState(null); var converted = vs[0], setConverted = vs[1]
+      react.useEffect(function () {
+        var raw = String(dq || '').trim()
+        if (!raw) { setConverted(null); return }
+        var fromJson = convertMcpJsonToRows(raw)
+        if (fromJson) { setConverted(fromJson); return }
+        var alive = true
+        setConverted({ ok: false, code: 'parsing' })
+        apiCall('mcpm-parse-patch', { text: raw }).then(function (res) {
+          if (!alive) return
+          if (!res || !res.ok) { setConverted({ ok: false, code: 'parse', error: (res && res.error) || '' }); return }
+          var patchRows = mcpRowsFromPairs(patchEntriesToPairs(res.rows))
+          // 读通了却一条 MCP 也没有（整份文件只有别的 loader）→ 交给「没有条目」那一句。
+          if (patchRows.length) setConverted({ ok: true, rows: patchRows })
+          else if (looksLikePatchText(raw)) setConverted({ ok: true, rows: [] })
+          else setConverted({ ok: false, code: 'shape' })
+        }).catch(function (e) { if (alive) setConverted({ ok: false, code: 'parse', error: errMsg(e) }) })
+        return function () { alive = false }
       }, [dq])
       var rows = converted && converted.ok ? converted.rows : []
       var chosen = rows.filter(function (r) { return !r.fatal && off[r.key] !== true })
@@ -9256,15 +9790,15 @@ function enabledMemoryCount(rules) {
       }
 
       var preview = !converted ? null
+        : converted.code === 'parsing' ? h('div', { className: 'dsm-help' }, t('mcp.importJson.parsing'))
         : !converted.ok ? h('div', { className: 'dsm-feedback dsm-error', role: 'alert' },
             converted.code === 'parse' ? t('mcp.importJson.parseError', { error: converted.error }) : t('mcp.importJson.parseError.shape'))
         : !rows.length ? h('div', { className: 'dsm-empty' }, t('mcp.importJson.empty'))
         : h(react.Fragment, null,
             rows.length > 20 ? h('div', { className: 'dsm-help' }, t('mcp.importJson.bigBatch', { count: rows.length })) : null,
-            h('div', { className: 'dsm-imp-head' },
-              h('span', null, ''),
-              h('span', null, t('mcp.importJson.preview.name')),
-              h('span', null, t('mcp.importJson.preview.state'))),
+            // 预览表头整行删除（用户 2026-10-15）：「服务名与连接参数」「状态」两个
+            // 表头 label 是给三列网格看的，删掉后每行自带 transport 标签与端点，
+            // 信息不丢；勾选框随之改为随行内容垂直居中（.dsm-imp-row align-items:center）。
             h('div', { className: 'dsm-imp-list' }, rows.map(function (r) {
               var cf = conflictOf(r)
               var endpoint = r.transport === 'stdio' ? [r.command].concat(r.args).join(' ') : r.url
@@ -9283,26 +9817,30 @@ function enabledMemoryCount(rules) {
                   cf ? h('span', { className: 'dsm-tag' + (cf === 'skip' ? ' dsm-tag-off' : '') }, t('mcp.importJson.will.' + cf)) : null,
                   r.secretCount ? h('span', { className: 'dsm-tag' }, t('mcp.importJson.preview.secret', { count: r.secretCount })) : null))
             })),
+            // 冲突处理上移到预览之前（见 dsm-imp-conflict），页脚只剩计数。
             h('div', { className: 'dsm-imp-foot' },
-              h('label', { className: 'dsm-imp-radio' },
-                h('input', { type: 'radio', name: 'dsm-imp-conflict', checked: conflict === 'skip', onChange: function () { setConflict('skip') } }),
-                t('mcp.importJson.conflict.skip')),
-              h('label', { className: 'dsm-imp-radio' },
-                h('input', { type: 'radio', name: 'dsm-imp-conflict', checked: conflict === 'overwrite', onChange: function () { setConflict('overwrite') } }),
-                t('mcp.importJson.conflict.overwrite')),
               h('span', { className: 'dsm-imp-count' }, t('mcp.importJson.chosen', { count: chosen.length }))))
 
       return h(Modal, { className: 'dsm-modal-lg', title: t('mcp.importJson.title'), closeLabel: t('btn.close'), onClose: props.onClose },
         h('div', { className: 'dsm-form' },
-          h('p', { className: 'dsm-desc' }, t('mcp.importJson.hint')),
+          h('p', { className: 'dsm-help' }, t('mcp.importJson.hint')),
           h('textarea', {
-            className: 'dsm-control dsm-textarea-md', rows: 8, value: text, spellCheck: false,
-            placeholder: t('mcp.importJson.placeholder'), onChange: function (e) { setText(e.target.value) },
+            className: 'dsm-control dsm-textarea-md', rows: 14, value: text, spellCheck: false,
+            placeholder: MCP_IMPORT_TEMPLATE, onChange: function (e) { setText(e.target.value) },
           }),
           h('div', { className: 'dsm-upload-choices' },
             h('button', { type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: busy, onClick: function () { if (fileRef.current) fileRef.current.click() } }, t('btn.file.pick')),
             h('span', { className: 'dsm-upload-divider' }, t('mcp.importJson.orPaste')),
-            h('input', { ref: fileRef, type: 'file', accept: '.json', className: 'dsm-hidden-input', onChange: function (e) { onPickFile(e.target.files); e.target.value = '' } })),
+            h('input', { ref: fileRef, type: 'file', accept: '.json,.yml,.yaml,.txt', className: 'dsm-hidden-input', onChange: function (e) { onPickFile(e.target.files); e.target.value = '' } })),
+          // 重名处理（用户 2026-10-15 两连）：从预览底部上移到预览之前 —— 埋在列表
+          // 脚下的二选一，导入前根本看不见；radio 换成「提示词类型」同款分段控件 ——
+          // 排他二选一的正解控件，恒有一颗按下，没有「都不选」这一态。
+          rows.length ? h('div', { className: 'dsm-imp-conflict' },
+            // 「重名时」文字 label 删除（用户 2026-10-15）：两颗互斥按钮自己说清
+            // 「跳过 / 覆盖」，前置标签是废话；可访问性由 aria-label 承担。
+            h('div', { className: 'dsm-form-seg', role: 'group', 'aria-label': t('mcp.importJson.conflict.label') },
+              h('button', { key: 'skip', type: 'button', 'aria-pressed': conflict === 'skip' ? 'true' : 'false', onClick: function () { setConflict('skip') } }, t('mcp.importJson.conflict.skip')),
+              h('button', { key: 'ov', type: 'button', 'aria-pressed': conflict === 'overwrite' ? 'true' : 'false', onClick: function () { setConflict('overwrite') } }, t('mcp.importJson.conflict.overwrite')))) : null,
           rows.some(function (r) { return r.secretCount > 0 }) ? h(Notice, { kind: 'warn', text: t('mcp.importJson.secretHint') }) : null,
           preview,
           result ? h('div', { className: 'dsm-feedback' + (result.ok ? (result.warning ? ' dsm-warning' : '') : ' dsm-error'), role: 'status' },
@@ -9393,10 +9931,22 @@ function enabledMemoryCount(rules) {
       var es = react.useState({}), expanded = es[0], setExpanded = es[1];
       var ms = react.useState(null), modal = ms[0], setModal = ms[1];
       var rs = react.useState(null), result = rs[0], setResult = rs[1];
-      var fms = react.useState({ root: "dsh", name: "", description: "", body: "" }), form = fms[0], setForm = fms[1];
+      var fms = react.useState({ root: "dsh", name: "", description: "", body: "", files: [] }), form = fms[0], setForm = fms[1];
+      // 「已存在同名技能」确认弹窗（用户 2026-10-14）：`{ name, finalName }` 或 null。
+      // 撞名不再静默退号（`foo` → `foo-1`），先问一句再建。
+      var dups = react.useState(null), dupAsk = dups[0], setDupAsk = dups[1];
       var us = react.useState(null), upload = us[0], setUpload = us[1];
       var ds = react.useState(null), detail = ds[0], setDetail = ds[1];
       var cs = react.useState({ path: "", label: "" }), customForm = cs[0], setCustomForm = cs[1];
+      // 技能附件（用户 2026-10-16 裁定 A：技能不止名字 + 简介 + 正文，`references/`、`lib/`
+      // 这类参考资料也要能在界面里直接给，而且**能在界面里写**，不只是从本机挑文件）：
+      // 条目挂在 `form.files` 上随创建一起提交，形状 `{ path, size, data(base64), text? }`。
+      // `attachError` 是附件区自己的一行报错（超限 / 撞路径），`draftFile` 是「新建文件」小窗的载荷。
+      var afs = react.useState(null), attachError = afs[0], setAttachError = afs[1];
+      var dfs = react.useState(null), draftFile = dfs[0], setDraftFile = dfs[1];
+      var attachInputRef = react.useRef(null);
+      // 切走这一页 → 「创建技能」关窗时那份暂存作废（见 42-shared-ui.js 的 useFormDraftScope）。
+      useFormDraftScope('skill:');
       // 组内「启用的排前面」的定序表（见 42-shared-ui.js 的 rankedFirst）：整页一张，
       // 各来源卡片共用 —— 技能 key 带着来源前缀，跨卡片不会撞。
       var skillRank = useRank();
@@ -9457,7 +10007,52 @@ function enabledMemoryCount(rules) {
           setResult({ ok: false, text: (res && res.error) || t("error.action", { error: "unknown" }) });
         }).catch(function (error) { setResult({ ok: false, text: t("error.action", { error: translateError(t, error) }) }); }).finally(function () { setBusy(false); });
       }
-      function submitCreate() { post("/create", form, null).then(function (data) { setModal(null); setForm({ root: "dsh", name: "", description: "", body: "" }); setResult(function (prev) { return Object.assign({ ok: true, warning: false }, prev || {}, { text: t("done.created", { name: data.name }) }); }); }).catch(swallowPostError); }
+      /**
+       * 客户端侧的 `toKebab` 镜像（宿主实现在 `src/skills/frontmatter.ts`）。
+       *
+       * 为什么界面里要再写一份：技能名落盘前会被宿主归一化（`Foo Bar` → `foo-bar`），而
+       * 「新建撞名先问一句」必须在**提交之前**就知道归一化后的名字 —— 否则问出来的
+       * 「`Foo Bar-1`」和真正写下去的「`foo-bar-1`」对不上，等于换了个地方骗人。镜像宿主
+       * 谓词在本项目有先例（隔壁 `isValidSceneSegment`）。宿主改口径这里要一起改；不一致
+       * 的后果只是"提示里的名字和实际不符"，不是写坏数据 —— 服务端那道同名闸仍在。
+       */
+      function kebabName(raw) {
+        var s = String(raw == null ? "" : raw).trim();
+        if (s === "") return "";
+        return s.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase()
+          .replace(/[\s_.]+/g, "-").replace(/[^a-z0-9-]/g, "-")
+          .replace(/-+/g, "-").replace(/^-+|-+$/g, "");
+      }
+      /**
+       * 技能页「创建技能」的提交（用户 2026-10-14 第二轮）：**先问一句，再退号**。
+       *
+       * 判据只看**落点那一个来源**里的条目名 —— `skill-create` 的同名检查也是按目标根做的
+       * （`safeExistingEntryPaths(root, name)`），别的来源里有同名是另一回事（那个由"同名
+       * 首选"管，不是冲突）。比的是条目名（文件 / 目录名）而不是 frontmatter 里的展示名，
+       * 与服务端同口径。
+       *
+       * 退号用 `-1`（不是 `（1）`）：技能名必须过 KEBAB_RE，全角括号会被 `toKebab` 抹成 `-`，
+       * 写出来本来就是 `foo-1`，不如一开始就按这个写。
+       */
+      function submitCreate() {
+        var typed = String(form.name || "").trim();
+        var normalized = kebabName(typed);
+        var target = allRoots.filter(function (r) { return String(r.key) === String(form.root); })[0];
+        var taken = {};
+        ((target && target.skills) || []).forEach(function (sk) { taken[String(sk.name)] = true; });
+        var finalName = uniqueName(normalized, taken, "dash");
+        if (finalName !== normalized) { setDupAsk({ name: normalized, finalName: finalName }); return; }
+        createSkill(finalName);
+      }
+      /** 真正落盘那一步（名字已定）。`name` 来自 `submitCreate` 或确认弹窗。 */
+      function createSkill(name) {
+        // 附件只带 path + data：`text` 是界面里再编辑用的缓冲，一起发等于把同一份内容传两遍。
+        var payload = Object.assign({}, form, {
+          name: name,
+          files: (form.files || []).map(function (f) { return { path: f.path, data: f.data } }),
+        });
+        post("/create", payload, null).then(function (data) { setModal(null); setForm({ root: "dsh", name: "", description: "", body: "", files: [] }); setAttachError(null); setResult(function (prev) { return Object.assign({ ok: true, warning: false }, prev || {}, { text: t("done.created", { name: data.name }) }); }); }).catch(swallowPostError);
+      }
       function selectUploadFiles(files) { pickerOpenRef.current = false; var selected = inspectUploadSelection(files); if (!selected) return; if (selected.error) { setUpload(null); setResult({ ok: false, text: translateError(t, selected.error) }); return; } setUpload(selected); setResult(null); }
       /** D14：导出条目 = 按**来源文件夹**分组，组内列出该文件夹里的全部技能（含同名被遮蔽的）。 */
       function exportItems() {
@@ -9523,15 +10118,122 @@ function enabledMemoryCount(rules) {
         targets[""] = all;
         return { filtered: filtered, targets: targets };
       }, [roots, dq, activeSource, t]);
-      var createRoots = allRoots.filter(function (root) { return root.mutable === true; }), createOptions = createRoots.map(function (root) { return { value: root.key, label: rootDisplayName(t, root) }; }); if (!createOptions.length) createOptions.push({ value: "hub", label: t("root.hub") });
-      // 新建技能的默认落点：hub（`tool-management/skills/`）。
-      // 用户在技能页筛选了某个来源时，优先用那个来源；两者都不可用时退回 dsh。
+      // 创建位置候选：只要**用户级**可写根（DSH 技能 / 导入技能）。项目级来源
+      // （`project-dsh:<hash>`，标签「项目 DSH · <仓库名>」）排除在外 —— 用户裁定
+      // 2026-10-15「新增技能默认 DSH 技能；导入技能功能才是导入技能目录」，新建落点
+      // 只在用户级目录里选。更硬的理由是闭环：`skill_manager_save` 的改分支
+      // （`skill-update` op）只认 hub + dsh 两个可写根，建在项目目录里的技能模型侧
+      // 「再存一次」会被 error.update.notOwnRoot 拒；模型工具没有 root 参数、永远落
+      // dsh，这个下拉是唯一能把技能建进项目根的入口。项目来源本身不动 —— 来源卡片
+      // 照旧列它（发现 / 启停 / 删除），只是不再作为「创建位置」候选。
+      var createRoots = allRoots.filter(function (root) { return root.mutable === true && root.scope !== "project"; }), createOptions = createRoots.map(function (root) { return { value: root.key, label: rootDisplayName(t, root) }; }); if (!createOptions.length) createOptions.push({ value: "hub", label: t("root.hub") });
+      // 新建技能的默认落点：DSH 技能（`~/.dsh/skills/`，用户裁定 2026-10-15）。
+      // v0.4 起这里默认 hub，现在改回 dsh —— hub（`tool-management/skills/`）只留给「导入技能」
+      // 功能（import / upload 走 `skillCreateRootPath()`，不经这一处）。与 `skill-create` 的
+      // op 默认值、core.js 的 createSkill 默认值同口径：三处必须一致，否则人点界面和模型调用
+      // 会把同一个「新建技能」落到两个不同的根。
+      // 用户在技能页筛选了某个来源时，优先用那个来源；筛选来源与 dsh 都不可用时退回 hub。
+      // 筛到**项目来源**时不算数（项目来源已不在 createRoots 里，见上方）：那时仍落 dsh ——
+      // 新建技能的落点按裁定只在用户级目录里选，不跟着页面筛选拐进项目仓库。
       function defaultCreateRoot() {
         if (createRoots.some(function (root) { return root.key === activeSource; })) return activeSource;
-        if (createRoots.some(function (root) { return root.key === "hub"; })) return "hub";
-        return "dsh";
+        if (createRoots.some(function (root) { return root.key === "dsh"; })) return "dsh";
+        return "hub";
+      }
+      function openCreate() {
+        // 30 秒内重开 = 把刚才关掉的那份填回来（含附件）；落点仍按当前筛选重算。
+        var draft = takeFormDraft('skill:create')
+        if (draft) { setForm(Object.assign({}, draft, { root: defaultCreateRoot() })); setAttachError(null); setModal("create"); return }
+        setForm(Object.assign({}, form, { root: defaultCreateRoot(), files: [] })); setAttachError(null); setModal("create");
+      }
+      /** 关掉 ≠ 丢掉：只有 onClose 这条路存草稿（提交成功是就地 setModal(null)，不进这里）。 */
+      function dismissCreate() { stashFormDraft('skill:create', form); setModal(null); }
+      /** 并入清单：SKILL.md 与超限的当场拦下（服务端还会再拦一次），同路径的后者不盖前者。 */
+      function addAttachments(list) {
+        var accepted = [], skippedDup = ""
+        var lower = {}
+        ;(form.files || []).forEach(function (f) { lower[String(f.path).toLowerCase()] = true })
+        list.forEach(function (item) {
+          if (/(^|\/)skill\.md$/i.test(item.path)) { setAttachError(t('skill.attach.reserved', { path: item.path })); return }
+          if (item.size > MAX_UPLOAD_ENTRY_BYTES) { setAttachError(t('skill.attach.tooLarge', { name: item.path, limit: 32 })); return }
+          var key = String(item.path).toLowerCase()
+          if (lower[key]) { skippedDup = item.path; return }
+          lower[key] = true
+          accepted.push(item)
+        })
+        if (skippedDup) setAttachError(t('skill.attach.dup', { path: skippedDup }))
+        if (!accepted.length) return
+        setForm(function (prev) { return Object.assign({}, prev, { files: (prev.files || []).concat(accepted) }) })
+      }
+      function pickAttachments() { if (attachInputRef.current) attachInputRef.current.click() }
+      function onAttachmentsPicked(ev) {
+        var picked = Array.prototype.slice.call((ev.target && ev.target.files) || [])
+        if (ev.target) ev.target.value = '' // 允许连续选中同一个文件
+        if (!picked.length) return
+        setAttachError(null)
+        Promise.all(picked.map(function (file) {
+          return file.arrayBuffer().then(function (buf) {
+            return { path: uploadFilePath(file), size: buf.byteLength, data: bytesToBase64(buf) }
+          })
+        })).then(addAttachments).catch(function (error) { setAttachError(translateError(t, error)) })
+      }
+      function dropAttachment(index) {
+        setForm(function (prev) {
+          var next = (prev.files || []).slice()
+          next.splice(index, 1)
+          return Object.assign({}, prev, { files: next })
+        })
+        setAttachError(null)
+      }
+      /** 打开「新建附件」小窗：`index` 为数字 = 改已有那一条（只改界面里写的那份），null = 新增。 */
+      function openNewFile(index) {
+        var cur = typeof index === "number" ? (form.files || [])[index] : null
+        if (cur && cur.text === undefined) return
+        setDraftFile({ index: typeof index === "number" ? index : null, path: cur ? cur.path : "", content: cur ? String(cur.text || "") : "", error: null })
+      }
+      function submitNewFile() {
+        var path = String(draftFile.path || '').trim().replace(/\\/g, '/')
+        var content = String(draftFile.content || '')
+        if (!path || path.charAt(0) === '/' || path.slice(-1) === '/' || /(^|\/)(\.\.?)($|\/)/.test(path)) {
+          setDraftFile(Object.assign({}, draftFile, { error: t('skill.attach.badpath') })); return
+        }
+        var clash = (form.files || []).some(function (f, i) {
+          return i !== draftFile.index && String(f.path).toLowerCase() === path.toLowerCase()
+        })
+        if (clash) { setDraftFile(Object.assign({}, draftFile, { error: t('skill.attach.dup', { path: path }) })); return }
+        var bytes = new TextEncoder().encode(content)
+        var entry = { path: path, size: bytes.length, data: bytesToBase64(bytes.buffer), text: content }
+        setForm(function (prev) {
+          var list = (prev.files || []).slice()
+          if (typeof draftFile.index === "number") list.splice(draftFile.index, 1, entry)
+          else list.push(entry)
+          return Object.assign({}, prev, { files: list })
+        })
+        setDraftFile(null)
+        setAttachError(null)
+      }
+      /** 附件区：一行「标签 + 两颗动作键」，下面只在有条目时才占高度（清单封顶滚动，空着不占）。 */
+      function renderAttachField() {
+        var list = form.files || []
+        return h("div", { className: "dsm-field" },
+          h("div", { className: "dsm-budget-meta" },
+            h("span", { className: "dsm-label" }, list.length ? t("skill.attach.label") + " · " + list.length : t("skill.attach.label")),
+            h("span", { className: "dsm-attach-actions" },
+              h("button", { type: "button", className: "dsm-btn dsm-btn-quiet", onClick: function () { openNewFile(null) } }, t("skill.attach.new")),
+              h("button", { type: "button", className: "dsm-btn dsm-btn-quiet", onClick: pickAttachments }, t("skill.attach.pick")))),
+          h("input", { ref: attachInputRef, type: "file", multiple: true, className: "dsm-hidden-input", onChange: onAttachmentsPicked }),
+          list.length
+            ? h("div", { className: "dsm-attach-list dsm-attach-cap" }, list.map(function (f, i) {
+              return h("div", { key: i + ":" + f.path, className: "dsm-file", title: f.path },
+                h("span", { className: "dsm-file-kind", "aria-hidden": "true" }, f.text === undefined ? "FILE" : "NEW"),
+                h("span", { className: "dsm-file-name" }, f.path),
+                h("span", { className: "dsm-file-meta" }, fmtBytes(f.size)),
+                f.text === undefined ? null : h("button", { type: "button", className: "dsm-btn dsm-btn-quiet", onClick: function () { openNewFile(i) } }, t("skill.attach.edit")),
+                h("button", { type: "button", className: "dsm-file-remove", "aria-label": t("skill.attach.remove") + " " + f.path, onClick: function () { dropAttachment(i) } }, "×"))
+            }))
+            : null,
+          attachError ? h("div", { className: "dsm-feedback dsm-error", role: "alert" }, attachError) : null)
       }
-      function openCreate() { setForm(Object.assign({}, form, { root: defaultCreateRoot() })); setModal("create"); }
       // 项目作用域的来源不一定带 projectName / projectRoot（hub「导入技能」就没有），
       // 旧实现直接拼字符串会把字面量 "undefined" 显示到回收站里。
       function trashRootLabel(item) {
@@ -9591,7 +10293,18 @@ function enabledMemoryCount(rules) {
         // 锁定期间**只有「详情」还活着**：它是只读动作；其余三颗都会改配置，一律置灰
         //（用户 2026-10-12：「锁定情况下删除键应该变灰且不能点击」—— 与子智能体页锁定态同长相）。
         var actions = [];
-        if (canToggle && skill.shadowedBy) actions.push(h("button", { key: "activate", type: "button", className: "dsm-btn dsm-btn-quiet", disabled: busy || anyLocked, title: t("btn.activate.title"), onClick: function () { activateShadowed(root, skill); } }, t("btn.activate")));
+        /**
+         * 「启用这个」写的是「同名技能该用哪个**来源**」的首选表（`/prefer` →
+         * `preferredSkills[名] = 来源 key`，`shadowedBy.root === 本行来源` 即表示撞名发生在
+         * **同一个来源目录内部**（两个文件夹都写着 `name: X`）—— 那种情况下首选表怎么指都
+         * 指不出区别（值就是来源 key，两份在同一个来源里），按下去只会回一句"已改为生效"、
+         * 实际什么都没变（用户 2026-10-14 实测到的那颗假按钮）。
+         *
+         * 「被覆盖」这个标记照旧保留（同来源里的落选那份确实不会被加载，如实说比不说好），
+         * 收掉的只是那颗**做不到它承诺的事**的按钮。判据是来源 key，不是文案。
+         */
+        var canPrefer = !!skill.shadowedBy && skill.shadowedBy.root !== root.key;
+        if (canToggle && canPrefer) actions.push(h("button", { key: "activate", type: "button", className: "dsm-btn dsm-btn-quiet", disabled: busy || anyLocked, title: t("btn.activate.title"), onClick: function () { activateShadowed(root, skill); } }, t("btn.activate")));
         if (skill.preferred === true) actions.push(h("button", { key: "unprefer", type: "button", className: "dsm-btn dsm-btn-quiet", disabled: busy || anyLocked, title: t("btn.unprefer.title"), onClick: function () { clearPreferred(root, skill); } }, t("btn.unprefer")));
         actions.push(h("button", { key: "detail", type: "button", className: "dsm-btn dsm-btn-quiet", onClick: function () { openDetail(root, skill); } }, t("btn.detail")));
         if (root.deletable === true) actions.push(h("button", { key: "trash", type: "button", className: "dsm-btn dsm-btn-quiet dsm-btn-danger", disabled: busy || anyLocked, onClick: function () { setModal({ type: "trash-confirm", root: root.key, name: skill.name }); } }, t("btn.trash")));
@@ -9627,16 +10340,16 @@ function enabledMemoryCount(rules) {
           // 只展开、不收起 —— 两个方向（全选 / 取消全选）都要能看见结果，收起是点卡片头的事。
           if (bulk.targets.length) acts.push(h("button", { key: "all", type: "button", className: "dsm-btn dsm-btn-quiet dsm-btn-bulk", disabled: busy || anyLocked, title: t("source.bulk.title"), onClick: function () { setExpanded(Object.assign({}, expanded, { [root.key]: true })); submitBulk(bulk.targets, !bulk.on, root.key); } }, bulkPair(bulk.on ? t("bulk.unselectAll") : t("bulk.selectAll"), bulk.on ? t("bulk.selectAll") : t("bulk.unselectAll"))));
           if (showSwitch) {
-            // 「移除来源」只留图标（用户裁定 2026-09-17）：它是低频的破坏性操作，却和「全选」
-            // 并列、还带红框描边 —— 于是整行的视觉重心落在它身上，四字宽度也占地方。
-            // 图标按钮必须自带 title + aria-label（没有可见文字）；点击照旧弹确认弹窗，
-            // 那里仍是带文字的红色「移除来源」，破坏性操作的说明没有丢。
-            if (root.removable === true) acts.push(h("button", { key: "rm", type: "button", className: "dsm-btn dsm-btn-quiet dsm-btn-danger dsm-btn-icon", disabled: busy || anyLocked, title: t("btn.source.remove.title"), "aria-label": t("btn.source.remove.title"), onClick: function () { setModal({ type: "source-remove-confirm", key: root.key, name: displayName }); } }, h(TrashIcon, { size: 14 })));
             // 开关来源时**顺带把卡片展开**（用户裁定 2026-09-17），与旁边那颗「全选」同口径：
             // 启停的结果就是下面这些技能行（开启 = 整目录可用了，关闭 = 逐行变停用），卡片收着
             // 的话点完只剩标签从「已停用」变「已启用」，目录里到底有什么、哪些真的可用了看不见。
             // 只展开、不收起 —— 两个方向都要能看见结果，收起仍然是点卡片头那一行的事。
             acts.push(h(Switch, { key: "sw", on: root.enabled, disabled: busy || anyLocked, label: t("source.toggle") + " " + displayName, onClick: function () { setExpanded(Object.assign({}, expanded, { [root.key]: true })); (root.enabled ? post("/source-disable", { root: root.key }, "done.disabled", { name: displayName }) : post("/source-enable", { root: root.key }, "done.enabled", { name: displayName })).then(function () { dropUndoForRoot(root.key, displayName); }); } }));
+            // 「移除来源」只要文字，放在开关**右侧**（用户裁定 2026-10-15，连续推翻两次：
+            // 2026-09-17 的「只留图标」与当天早些时候的「图标 + 文字」—— 图标在这颗 quiet
+            // 键里只是装饰，「移除来源」四个字已把语义说全；破坏性操作的郑重感由确认弹窗
+            // 承担，点击照旧弹红色「移除来源」确认框，说明没有丢）。
+            if (root.removable === true) acts.push(h("button", { key: "rm", type: "button", className: "dsm-btn dsm-btn-quiet dsm-btn-danger", disabled: busy || anyLocked, title: t("btn.source.remove.title"), "aria-label": t("btn.source.remove"), onClick: function () { setModal({ type: "source-remove-confirm", key: root.key, name: displayName }); } }, t("btn.source.remove")));
           }
           return acts.length ? h("span", { className: "dsm-source-actions" }, acts) : null;
         })()), open ? h("div", { className: "dsm-source-body" }, filtered.length ? rankedFirst(skillRank, function (skill) { return skill.key || (root.key + "/" + skill.name) }, filtered, function (skill) { return isSkillEnabled(skill); }).map(function (skill) { return renderSkill(root, skill); }) : h("div", { className: "dsm-empty" }, dq ? t("empty.search") : t("empty.source"))) : null);
@@ -9787,7 +10500,27 @@ function enabledMemoryCount(rules) {
         : snapshot.error && !snapshot.data ? h(ListStates, { key: "errstate", t: t, state: "error", text: snapshot.error, onRetry: function () { refresh(); } })
           : h("div", { key: "sources", className: "dsm-sources" }, roots.map(renderRoot))]);
 
-      if (modal === "create") content.push(h(Modal, { key: "create", title: t("create.title"), closeLabel: t("btn.close"), onClose: function () { setModal(null); } }, h("div", { className: "dsm-form" }, h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("create.target")), h(SourceSelect, { value: form.root, options: createOptions, onChange: function (value) { updateForm("root", value); } })), [["name", "create.name", "create.name.placeholder"], ["description", "create.description", "create.description.placeholder"]].map(function (field) { return h("label", { key: field[0], className: "dsm-field" }, h("div", { className: "dsm-budget-meta" }, h("span", { className: "dsm-label" }, t(field[1])), field[0] === "description" ? h("span", { className: "dsm-char-count" }, String(form.description || "").length + " / " + CATALOG_DESC_MAX) : null), h("input", { className: "dsm-control", value: form[field[0]], placeholder: t(field[2]), maxLength: field[0] === "description" ? CATALOG_DESC_MAX : undefined, onChange: function (e) { updateForm(field[0], e.target.value); } })); }), h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("create.body")), h("textarea", { className: "dsm-control", value: form.body, placeholder: t("create.body.placeholder"), onChange: function (e) { updateForm("body", e.target.value); } })), h("p", { className: "dsm-help" }, t("create.chat.note"))), h("div", { className: "dsm-modal-actions" }, h("button", { className: "dsm-btn", disabled: busy || !form.name.trim() || !form.description.trim() || !form.body.trim(), onClick: submitCreate }, t("btn.create.now")))));
+      if (modal === "create") content.push(h(Modal, { key: "create", title: t("create.title"), closeLabel: t("btn.close"), onClose: dismissCreate }, h("div", { className: "dsm-form" },
+        // 创建位置用分段控件而不是下拉（用户 2026-10-15）：候选就是全部可写来源，
+        // 互斥单选，与「重名处理」「提示词类型」同款；只有一项时也如实显示"只有这一个去处"。
+        h("div", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("create.target")),
+          h("div", { className: "dsm-form-seg", role: "group", "aria-label": t("create.target") },
+            createOptions.map(function (o) { return h("button", { key: o.value, type: "button", "aria-pressed": form.root === o.value ? "true" : "false", onClick: function () { updateForm("root", o.value); } }, o.label); }))),
+        [["name", "create.name", "create.name.placeholder"], ["description", "create.description", "create.description.placeholder"]].map(function (field) { return h("label", { key: field[0], className: "dsm-field" }, h("div", { className: "dsm-budget-meta" }, h("span", { className: "dsm-label" }, t(field[1])), field[0] === "description" ? h("span", { className: "dsm-char-count" }, String(form.description || "").length + " / " + CATALOG_DESC_MAX) : null), h("input", { className: "dsm-control", value: form[field[0]], placeholder: t(field[2]), maxLength: field[0] === "description" ? CATALOG_DESC_MAX : undefined, onChange: function (e) { updateForm(field[0], e.target.value); } })); }), h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("create.body")), h("textarea", { className: "dsm-control", value: form.body, placeholder: t("create.body.placeholder"), onChange: function (e) { updateForm("body", e.target.value); } })), renderAttachField()), h("div", { className: "dsm-modal-actions" }, h("button", { className: "dsm-btn", disabled: busy || !form.name.trim() || !form.description.trim() || !form.body.trim(), onClick: submitCreate }, t("btn.create.now")))));
+      // 「新建附件」小窗叠在创建弹窗之上：路径 + 内容两个框，确定即并入清单（可再点开改）。
+      // 目录不用单独给 —— 路径里写 `references/api.md`，服务端按那段建目录。
+      if (draftFile) content.push(h(Modal, {
+        key: "attach-new", title: t("skill.attach.newTitle"), closeLabel: t("btn.close"), className: "dsm-modal-compact",
+        onClose: function () { setDraftFile(null); },
+      }, h("div", { className: "dsm-form" },
+        h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("skill.attach.path")),
+          h("input", { className: "dsm-control", value: draftFile.path, placeholder: t("skill.attach.path.placeholder"), onChange: function (e) { setDraftFile(Object.assign({}, draftFile, { path: e.target.value })) } })),
+        h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("skill.attach.content")),
+          h("textarea", { className: "dsm-control dsm-textarea-md", value: draftFile.content, placeholder: t("skill.attach.content.placeholder"), onChange: function (e) { setDraftFile(Object.assign({}, draftFile, { content: e.target.value })) } })),
+        draftFile.error ? h("div", { className: "dsm-feedback dsm-error", role: "alert" }, draftFile.error) : null),
+        h("div", { className: "dsm-modal-actions" },
+          h("button", { type: "button", className: "dsm-btn dsm-btn-secondary", onClick: function () { setDraftFile(null); } }, t("btn.cancel")),
+          h("button", { type: "button", className: "dsm-btn", disabled: !String(draftFile.path || "").trim(), onClick: submitNewFile }, t("skill.attach.add")))));
       // D13：导入弹窗统一用共享 ImportModal（能力取三者并集：拖拽区 + 已选文件行 +
       // 文件要求清单 + 结果反馈）。技能页只保留自己的校验与提交逻辑。
       if (modal === "import") content.push(h(ImportModal, {
@@ -9809,7 +10542,17 @@ function enabledMemoryCount(rules) {
         // 原来是路径一行 + .dsm-modal-actions（右对齐）又一行，两行之间一大片空白。
         // 路径条 flex:1 吃掉剩余宽度、按钮固定不动，窄了路径自己折行（word-break:break-all）。
         h("div", { className: "dsm-detail-path-row" }, h("div", { className: "dsm-detail-path" }, detail.path), h("button", { type: "button", className: "dsm-btn dsm-btn-secondary", disabled: busy, onClick: openSource }, t("btn.open.editor"))),
-        h("div", { className: "dsm-detail-section" }, h("div", { className: "dsm-detail-title" }, t("detail.diagnostics")), detail.diagnostics.length ? detail.diagnostics.map(function (item, index) { return h("div", { key: index, className: "dsm-diag" }, t(item.code, item.params || {})); }) : h("div", { className: "dsm-note" }, t("detail.noIssues"))), h("div", { className: "dsm-detail-section" }, h("div", { className: "dsm-detail-title" }, t("detail.frontmatter")), renderFrontmatter(t, detail.frontmatter)), h("div", { className: "dsm-detail-section" }, h("div", { className: "dsm-detail-title" }, t("detail.body")), h("pre", { className: "dsm-code" }, detail.body || ""))) : h("div", { className: "dsm-empty" }, t("loading"))));
+        h("div", { className: "dsm-detail-section" }, h("div", { className: "dsm-detail-title" }, t("detail.diagnostics")), detail.diagnostics.length ? detail.diagnostics.map(function (item, index) { return h("div", { key: index, className: "dsm-diag" }, t(item.code, item.params || {})); }) : h("div", { className: "dsm-note" }, t("detail.noIssues"))), h("div", { className: "dsm-detail-section" }, h("div", { className: "dsm-detail-title" }, t("detail.frontmatter")), renderFrontmatter(t, detail.frontmatter)),
+        // 附件清单（服务端 skill-detail 现在会列 bundle 目录里 SKILL.md 之外的文件）：
+        // 建完之后要能在界面里看到它们真的落进去了，否则「加了附件」只有创建那一次是可信的。
+        detail.attachments && detail.attachments.length ? h("div", { className: "dsm-detail-section" },
+          h("div", { className: "dsm-detail-title" }, t("detail.attachments") + " · " + detail.attachments.length + (detail.attachmentsTruncated ? " +" : "")),
+          h("div", { className: "dsm-attach-list dsm-attach-cap" }, detail.attachments.map(function (a) {
+            return h("div", { key: a.path, className: "dsm-file", title: a.path },
+              h("span", { className: "dsm-file-name" }, a.path),
+              h("span", { className: "dsm-file-meta" }, fmtBytes(a.size)))
+          }))) : null,
+        h("div", { className: "dsm-detail-section" }, h("div", { className: "dsm-detail-title" }, t("detail.body")), h("pre", { className: "dsm-code" }, detail.body || ""))) : h("div", { className: "dsm-empty" }, t("loading"))));
       if (modal === "export") content.push(h(ExportModal, {
         key: "export", t: t, title: t("export.skills"),
         items: exportItems(), busy: busy, result: result,
@@ -9825,6 +10568,15 @@ function enabledMemoryCount(rules) {
       if (modal === "custom-add") content.push(h(Modal, { key: "custom-add", title: t("custom.add.title"), closeLabel: t("btn.close"), onClose: function () { setModal(null); } }, h("div", { className: "dsm-form" }, h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("custom.add.path")), h("div", { className: "dsm-dir-row" }, h("input", { className: "dsm-control", value: customForm.path, placeholder: defaultIoDir(), onChange: function (e) { setCustomForm(Object.assign({}, customForm, { path: e.target.value })); } }), h("button", { type: "button", className: "dsm-btn dsm-btn-secondary", disabled: busy, onClick: openCustomDir, title: t("custom.add.openDir.title") }, t("btn.openDir")))), h("label", { className: "dsm-field" }, h("span", { className: "dsm-label" }, t("custom.add.label")), h("input", { className: "dsm-control", value: customForm.label, placeholder: t("custom.add.label.placeholder"), onChange: function (e) { setCustomForm(Object.assign({}, customForm, { label: e.target.value })); } })), h("p", { className: "dsm-help" }, t("custom.add.help")), result ? h("div", { className: "dsm-feedback" + (result.warning ? " dsm-warning" : result.ok ? "" : " dsm-error"), role: "alert" }, result.text) : null), customForm.picking ? h(DirPickerModal, { key: "custom-dir-picker", title: t("custom.add.picker.title"), initial: String(customForm.path || ""), closeLabel: t("btn.close"), onClose: function () { setCustomForm(Object.assign({}, customForm, { picking: false })); }, onPick: function (path) { setCustomForm(Object.assign({}, customForm, { path: path, picking: false })); } }) : null, h("div", { className: "dsm-modal-actions" }, h("button", { type: "button", className: "dsm-btn", disabled: busy || !String(customForm.path || "").trim(), onClick: submitCustomAdd }, t("custom.add.submit")))));
       if (modal && modal.type === "source-remove-confirm") content.push(h(Modal, { key: "source-remove-confirm", title: t("confirm.source.remove.title"), closeLabel: t("btn.close"), className: "dsm-modal-sm", onClose: function () { setModal(null); } }, h("p", { className: "dsm-desc" }, t("confirm.source.remove.desc", { name: modal.name })), h("p", { className: "dsm-help" }, t("confirm.source.remove.hint")), h("div", { className: "dsm-modal-actions" }, h("button", { className: "dsm-btn dsm-btn-danger", disabled: busy, onClick: function () { post("/source-remove", { root: modal.key }, "result.sourceRemoved", { name: modal.name }).then(function () { setModal(null); }).catch(swallowPostError); } }, t("btn.source.remove")))));
       if (modal && modal.type === "custom-remove-confirm") content.push(h(Modal, { key: "custom-remove-confirm", title: t("confirm.custom.remove.title"), closeLabel: t("btn.close"), className: "dsm-modal-sm", onClose: function () { setModal(null); } }, h("p", { className: "dsm-desc" }, t("confirm.custom.remove.desc", { name: modal.name })), h("div", { className: "dsm-modal-actions" }, h("button", { className: "dsm-btn dsm-btn-danger", disabled: busy, onClick: function () { submitCustomRemove(modal.key, modal.name); } }, t("btn.custom.remove")))));
+      // 「已存在同名技能」小窗：叠在「创建技能」弹窗之上（`Modal` 自带 gateModalDepth 计数）。
+      // 取消 → 回到创建弹窗改名字，简介与正文一个字都不动。
+      if (dupAsk) content.push(h(DupNameDialog, {
+        key: "dup-name", t: t, kind: t("dup.kind.skill"),
+        name: dupAsk.name, finalName: dupAsk.finalName, action: "create",
+        busy: busy,
+        onCancel: function () { setDupAsk(null); },
+        onConfirm: function () { setDupAsk(null); createSkill(dupAsk.finalName); },
+      }));
       return h("section", { className: "dsm-section" }, content);
     }
 
@@ -9927,7 +10679,7 @@ function enabledMemoryCount(rules) {
           // 多选集合：勾选的 sessionId。最小 React 支持函数式初值（Set 惰性创建）。
           var selState = React.useState(function () { return new Set() })
           var selected = selState[0], setSelected = selState[1]
-          // 导入对话弹窗：null = 关闭；{ busy, error, result, cwd, pickingDir } = 打开。
+          // 导入对话弹窗：null = 关闭；{ busy, error, result, cwd } = 打开。
           var impState = React.useState(null)
           var imp = impState[0], setImp = impState[1]
           // 导出对话弹窗：null = 关闭；{ busy, error, result, outDir, format, detail, wsFilter, selectedIds } = 打开。
@@ -10102,7 +10854,7 @@ function enabledMemoryCount(rules) {
             reader.readAsText(file)
           }
           function openImportPicker() {
-            setImp({ busy: false, error: null, result: null, cwd: '', pickingDir: false })
+            setImp({ busy: false, error: null, result: null, cwd: '' })
           }
           // ---------- 导出对话：弹窗内选范围/工作区 → 勾选会话 → 写入指定目录 ----------
           function openExportPicker() {
@@ -10147,31 +10899,6 @@ function enabledMemoryCount(rules) {
               setExp(Object.assign({}, exp, { busy: false, error: t('hist.err.export') }))
             })
           }
-          // 把选中的会话批量归档到 History（纳入保留期管理），随后刷新列表与页面。
-          function doArchiveSelected() {
-            var ids = Array.from(exp.selectedIds)
-            if (!ids.length || exp.busy) return
-            setExp(Object.assign({}, exp, { busy: true, error: null, result: null }))
-            apiCall('history-archive-batch', { sessionIds: ids }).then(function (res) {
-              if (res && res.ok) {
-                refresh()
-                return apiCall('history-sessions', {}).then(function (r2) {
-                  setExp(function (prev) {
-                    if (!prev) return prev
-                    return Object.assign({}, prev, {
-                      busy: false,
-                      selectedIds: new Set(),
-                      result: { archived: (res.archived || []).length, failed: (res.failed || []).length },
-                      items: (r2 && r2.ok && Array.isArray(r2.items)) ? r2.items : prev.items,
-                    })
-                  })
-                })
-              }
-              setExp(function (prev) { return prev ? Object.assign({}, prev, { busy: false, error: (res && res.error) || t('hist.err.archive') }) : prev })
-            }).catch(function () {
-              setExp(function (prev) { return prev ? Object.assign({}, prev, { busy: false, error: t('hist.err.archive') }) : prev })
-            })
-          }
 
           var RETENTION_OPTS = [
             { value: 0, label: t('hist.retention.forever') },
@@ -10248,6 +10975,13 @@ function enabledMemoryCount(rules) {
               return it.workspaceId === wid && !!data.workspaces[wid]
             })
           }
+          // 「全选」只看**当前筛出来的**那些（折叠的组也算在里面：折叠不是排除）。
+          var allExportPicked = !!(exp && exportItems.length) && exportItems.every(function (it) { return exp.selectedIds.has(it.sessionId) })
+          function toggleAllExportPicked() {
+            setExp(Object.assign({}, exp, {
+              selectedIds: allExportPicked ? new Set() : new Set(exportItems.map(function (it) { return it.sessionId })),
+            }))
+          }
 
           function renderRow(it) {
             // 列表行两行制（REDESIGN §3.4，切片四）：行 1 标题，行 2 目录（截断 + title）；
@@ -10390,6 +11124,7 @@ function enabledMemoryCount(rules) {
               t: t,
               title: t('hist.btn.import'),
               accept: '.jsonl,.json,.md,.markdown,.txt',
+              hint: t('upload.drop.session'),
               busy: imp.busy === true,
               requirement: t('upload.req.session'),
               requirementTitle: [t('upload.requirement.session.1'), t('upload.requirement.session.2'), t('upload.requirement.session.3')].join('\n'),
@@ -10397,18 +11132,17 @@ function enabledMemoryCount(rules) {
               extra: React.createElement('div', null,
                 React.createElement('div', { className: 'dsm-field' },
                   React.createElement('label', { className: 'dsm-label' }, t('hist.import.cwd')),
-                  // 三条路并存：从已登记的工作区挑、浏览一个文件夹、直接粘路径。
+                  // 两条路：从已登记的工作区挑、直接粘路径（用户 2026-10-15：删掉
+                  // 「浏览文件夹」那颗 —— 它和底下的文件拖拽区在 import 语境里都叫
+                  // "选择"，功能重叠；要选没登记过的目录，粘绝对路径即可）。
                   // 标签是 combo 的**兄弟**而不是祖先 —— 嵌套 label 会把点击转给清单里第一项。
                   React.createElement(SceneCombo, {
                     options: importWsOptions, value: imp.cwd || '',
                     placeholder: t('hist.import.cwd.placeholder'), label: t('hist.import.cwd'),
                     browseLabel: t('hist.import.workspace'),
-                    pickFolderLabel: t('hist.import.browse'), pickFolderTitle: t('hist.export.browse'),
                     disabled: imp.busy === true,
                     onChange: function (v) { setImp(Object.assign({}, imp, { cwd: v })) },
-                    onPickFolder: function () { requestHostDirectory(function (path) { setImp(Object.assign({}, imp, { cwd: path })) }, function () { setImp(Object.assign({}, imp, { pickingDir: true })) }) },
                   }),
-                  imp.pickingDir ? React.createElement(DirPickerModal, { key: 'imp-dir-picker', title: t('dir.title'), initial: String(imp.cwd || ''), closeLabel: t('btn.close'), onClose: function () { setImp(Object.assign({}, imp, { pickingDir: false })) }, onPick: function (path) { setImp(Object.assign({}, imp, { cwd: path, pickingDir: false })) } }) : null,
                   importWsOptions.length ? null : React.createElement('p', { className: 'dsm-help' }, t('hist.import.workspace.none')))),
               onClose: function () { setImp(null) },
               onSubmit: function (entries, files) { doImportFile(files[0]) },
@@ -10477,14 +11211,12 @@ function enabledMemoryCount(rules) {
               // ↑ 最后那个括号收掉 .dsm-export-form：结果条与动作行留在表单外面，才能常驻不动。
               exp.error ? React.createElement('div', { className: 'dsm-feedback dsm-error' }, String(exp.error)) : null,
               exp.result ? React.createElement('div', { className: 'dsm-feedback' },
-                exp.result.exported
-                  ? (t('hist.result.exported', { count: (exp.result.exported || []).length, dir: String(exp.outDir || '').trim() })
-                    + ((exp.result.skipped && exp.result.skipped.length) ? t('hist.result.skipped', { count: exp.result.skipped.length, ids: exp.result.skipped.map(function (s) { return s.sessionId }).join('、') }) : ''))
-                  : (t('hist.result.archived', { count: exp.result.archived })
-                    + (exp.result.failed ? t('hist.result.archiveFailed', { count: exp.result.failed }) : ''))) : null,
+                t('hist.result.exported', { count: (exp.result.exported || []).length, dir: String(exp.outDir || '').trim() })
+                + ((exp.result.skipped && exp.result.skipped.length) ? t('hist.result.skipped', { count: exp.result.skipped.length, ids: exp.result.skipped.map(function (s) { return s.sessionId }).join('、') }) : '')) : null,
               React.createElement('div', { className: 'dsm-modal-actions' },
-                React.createElement('span', { className: 'dsm-hist-batch-count' }, t('hist.selected', { count: exp.selectedIds.size })),
-                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: exp.busy || !exp.selectedIds.size, onClick: doArchiveSelected, title: t('hist.btn.archiveSelected.title') }, t('hist.btn.archiveSelected')),
+                // 「已选 N 项」不占一栏：右边那颗导出键本身就带着份数（导出 N 个会话），
+                // 与本页回收站那条批量条同一口径。「归档所选」换成「全选」（用户 2026-10-16）。
+                React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-secondary dsm-btn-bulk', disabled: exp.busy || !exportItems.length, onClick: toggleAllExportPicked }, bulkPair(allExportPicked ? t('hist.deselectAll') : t('hist.selectAll'), allExportPicked ? t('hist.selectAll') : t('hist.deselectAll'))),
                 React.createElement('button', { type: 'button', className: 'dsm-btn', disabled: exp.busy || !exp.selectedIds.size || !String(exp.outDir || '').trim(), onClick: doExport }, exp.busy ? t('hist.export.busy') : t('hist.btn.exportSelected', { count: exp.selectedIds.size })))) : null,
             modal && modal.type === 'error' ? React.createElement(Modal, { key: 'err', className: 'dsm-modal-sm', title: t('hist.error.title'), closeLabel: t('btn.close'), onClose: function () { setModal(null) } },
               React.createElement('p', { className: 'dsm-help' }, String(modal.message || t('hist.error.unknown')))) : null)
@@ -10609,6 +11341,8 @@ function enabledMemoryCount(rules) {
           var modal = ms[0], setModal = ms[1]
           var sfs = React.useState({ name: '', error: null })
           var sceneForm = sfs[0], setSceneForm = sfs[1]
+          // 切走这一页 → 场景编辑器关窗时那份暂存作废（见 42-shared-ui.js 的 useFormDraftScope）。
+          useFormDraftScope('scene:')
           var pos = React.useState([])
           var presetOptions = pos[0], setPresetOptions = pos[1]
           // 当前**生效中**的提示词预设 id（`agentsmd-list` 里 active 的那份）。预览卡要用它把
@@ -10630,6 +11364,24 @@ function enabledMemoryCount(rules) {
           var quickPick = qks[0], setQuickPick = qks[1]
           var dts = React.useState(null)
           var drillTools = dts[0], setDrillTools = dts[1]
+          // 记忆集组头的「创建」（用户 2026-10-14）：套用记忆页的「新建记忆」表单，但**不带场景
+          // 选择器** —— 记忆归属由当前编辑的场景定死，于是这里建出来的条目立刻出现在本组清单里。
+          // null = 关闭；{ name, description, body, form, files, error } = 草稿。
+          var mns = React.useState(null)
+          var memNew = mns[0], setMemNew = mns[1]
+          // 「已存在同名记忆」确认弹窗（用户 2026-10-14 第二轮）：`{ name, finalName }` 或 null。
+          // 撞名不再在提交那一刻静默退号，先问一句；确认后才按 `finalName` 攒成草稿。
+          var mds = React.useState(null)
+          var memDupAsk = mds[0], setMemDupAsk = mds[1]
+          // 场景本身撞名的确认弹窗（同一天同一套设计）：`{ name, finalName }` 或 null。
+          // 场景与记忆共用一颗弹窗组件，但状态分开 —— 两个入口能同时存在（编辑器里开着
+          // 记忆新建窗时再点保存场景），合成一个状态会让其中一个把另一个顶掉。
+          var sds = React.useState(null)
+          var sceneDupAsk = sds[0], setSceneDupAsk = sds[1]
+          var memAttachRef = React.useRef(null)
+          // 附件上限与服务端 MAX_ATTACH_ENTRY_BYTES 对齐（记忆页同一口径）。
+          var MEM_ATTACH_MAX_MB = 8
+          var MEM_ATTACH_MAX_BYTES = MEM_ATTACH_MAX_MB << 20
           // 场景回收站：true = 打开本页那一个回收站（42-shared-ui.js 的 TrashModal）。
           // 清单加载 / 恢复 / 永久删除 / 批量都在组件内部完成，本页只在写操作后重读自己的数据。
           var sts = React.useState(false)
@@ -10797,17 +11549,24 @@ function enabledMemoryCount(rules) {
           function openEditor(scene) {
             var name = scene ? scene.name : null
             var sceneArchive = scene ? ((data.archives || {})[name] || {}) : {}
-            setSceneForm({
+            // 子弹窗（新建记忆）随编辑器一起重开：留着上一轮的草稿会让人以为"我上次填的还在"。
+            setMemNew(null)
+            var draftKey = name ? 'scene:edit:' + name : 'scene:create'
+            var draft = takeFormDraft(draftKey)
+            setSceneForm(Object.assign({
               name: name || '', description: scene ? scene.description || '' : '', prompt: scene ? scene.prompt || '' : '',
               toolTablePreset: typeof sceneArchive.toolTablePreset === 'string' ? sceneArchive.toolTablePreset : '',
               quickMode: !Array.isArray(sceneArchive.quickPrompts)
                 ? 'current' : (sceneArchive.quickPrompts.length ? 'custom' : 'none'),
               quickPrompts: Array.isArray(sceneArchive.quickPrompts) ? sceneArchive.quickPrompts.slice() : null,
               error: null,
-            })
+            }, draft || {}, { error: null }))
             setModal({
-              type: 'scene-editor', name: name, drill: null, drillError: null, error: null, inventory: null,
+              type: 'scene-editor', name: name, draftKey: draftKey, drill: null, drillError: null, error: null, inventory: null,
               mcpQuery: '', skillQuery: '', subQuery: '', memQuery: '',
+              // 创建态里攒下的记忆（见 flushPendingMemories）：`rules-create` 要求目标场景已存在，
+              // 所以场景还没落盘时只能先记在这里，等场景建出来再补。编辑态恒为空数组。
+              pendingMems: [],
               sections: {
                 mcp: sceneArchive.mcp ? Object.assign({}, sceneArchive.mcp) : null,
                 mcpNotes: sceneArchive.mcpNotes && Object.keys(sceneArchive.mcpNotes).length ? Object.assign({}, sceneArchive.mcpNotes) : null,
@@ -10874,6 +11633,27 @@ function enabledMemoryCount(rules) {
             var isEdit = modal.name != null
             var name = String(sceneForm.name || '').trim()
             if (!isValidSceneSegment(name)) { setSceneForm(Object.assign({}, sceneForm, { error: t('error.rules.invalidGroup') })); return }
+            /*
+             * 新建撞名：**先问一句再退号**（用户 2026-10-14 第二轮）。
+             *
+             * 这一处不能像记忆页那样"交给服务端报错再问" —— `rules-create-scene` 是**幂等
+             * upsert**（已存在则更新描述/标签，不报错），而且模型工具依赖这条语义（见
+             * `scene-records.ts` 的注释）。所以撞名只能由界面自己认出来：场景名就是记录键、
+             * 不经过任何归一化，`data.scenes` 里查得到就是真的撞了。
+             *
+             * 编辑态不做这一步：改的是自己，不存在撞名。
+             */
+            if (!isEdit) {
+              var taken = {}
+              ;(data.scenes || []).forEach(function (s) { taken[String(s.name)] = true })
+              var finalName = uniqueName(name, taken)
+              if (finalName !== name) { setSceneDupAsk({ name: name, finalName: finalName }); return }
+            }
+            saveScene(name, isEdit)
+          }
+          /** 真正落盘那一步（名字已定）。`name` 来自 `submitSceneEditor` 或确认弹窗。 */
+          function saveScene(name, isEdit) {
+            if (!modal || modal.type !== 'scene-editor') return
             var description = String(sceneForm.description || '').trim()
             var prompt = String(sceneForm.prompt || '').trim()
             setBusy(true)
@@ -10900,9 +11680,10 @@ function enabledMemoryCount(rules) {
               // 编辑态沿用旧档案弹窗的口径：保存 = 整份档案落盘（四段全删 = 存空档案）；
               // 创建态只在真的配了组时才写档案，不给新场景凭空落一份空档案。
               if (isEdit) hasArchive = true
-              if (!hasArchive) { finishSceneEditor(name, isEdit, res, null); return }
+              // 场景已落盘 → 才能补建创建态里攒下的记忆（`rules-create` 要求场景已存在）。
+              if (!hasArchive) { flushPendingMemories(name, isEdit, res, null); return }
               apiCall('scene-archive-save', { scene: name, archive: archivePayload }).then(function (ares) {
-                if (ares && ares.ok) finishSceneEditor(name, isEdit, res, ares)
+                if (ares && ares.ok) flushPendingMemories(name, isEdit, res, ares)
                 else {
                   // 场景已建/已改、档案没存上：留在编辑器里如实报错，主按钮变「保存到场景」可重试。
                   setBusy(false)
@@ -10914,7 +11695,7 @@ function enabledMemoryCount(rules) {
               })
             }).catch(function (e) { setBusy(false); setSceneForm(Object.assign({}, sceneForm, { error: errMsg(e) })) })
           }
-          function finishSceneEditor(name, isEdit, sceneRes, archiveRes) {
+          function finishSceneEditor(name, isEdit, sceneRes, archiveRes, memRes) {
             setBusy(false)
             setModal(null)
             // 新建时若把历史默认（全部启用）收敛成单选，如实说一句，别让用户以为场景"自己开了"。
@@ -10927,6 +11708,13 @@ function enabledMemoryCount(rules) {
               if (archiveRes.stale && archiveRes.stale.length) text += ' · ' + t('memory.archive.stale', { items: archiveRes.stale.join('、') })
               if (archiveRes.applyError) { ok = false; text += ' · ' + t('memory.archive.applyFailed', { reason: archiveRes.applyError }) }
             }
+            // 攒下的记忆草稿的落盘结果（flushPendingMemories）。三个数分开报：「建了几条」
+            // 与两种失败（压根没建上 / 建好了但没配全）—— 后者记忆是存在的，混进前者就是谎报。
+            if (memRes) {
+              if (memRes.created) text += ' · ' + t('scenes.mem.created', { count: memRes.created })
+              if (memRes.incomplete.length) { ok = false; text += ' · ' + t('scenes.mem.incomplete', { count: memRes.incomplete.length, items: memRes.incomplete.join('；') }) }
+              if (memRes.failed.length) { ok = false; text += ' · ' + t('scenes.mem.createFailed', { count: memRes.failed.length, items: memRes.failed.join('；') }) }
+            }
             setResult({ ok: ok, text: text })
             refresh(true)
           }
@@ -11043,7 +11831,9 @@ function enabledMemoryCount(rules) {
           // 与记忆页同一个写入口（`rules-toggle`）。于是「记忆页开了 → 档案页显示开启」
           // 天然成立，不存在两套状态、也不需要双向同步代码。
           //
-          // 勾选**立即提交**（不等「保存到场景」）：它是全局状态，不属于场景档案。
+          // 已存在记忆的勾选**立即提交**（不等「保存到场景」）：它是全局状态，不属于场景档案。
+          // 本次新配的记忆是**草稿**，走另一条路 —— 存在 `modal.pendingMems` 里，点「创建 /
+          // 保存到场景」时才落盘（见 flushPendingMemories），所以两种时机的行为没有分叉。
           //
           // **只列被编辑场景自己的记忆**：保留场景 `global` 恒定注入（任何对话都生效），
           // 不需要在这里配置，列出来只会让人以为「不勾就不注入」。
@@ -11124,7 +11914,11 @@ function enabledMemoryCount(rules) {
                 opts.hideFilter ? null : segFilter(opts.query, opts.onQuery, opts.queryPlaceholder),
                 opts.body))
           }
-          /** 组 4：记忆集（P5：单一真相源 = `rules[*].enabled`，勾选立即提交、不随「保存」落盘）。 */
+          /**
+           * 组 4：记忆集。两段内容拼在一张清单里：
+           *   · 已存在的记忆 —— 勾选**立即提交**（P5：单一真相源 = `rules[*].enabled`，不随「保存」落盘）；
+           *   · 本次新配的草稿 —— 只存在于编辑器里，随「创建 / 保存到场景」一起落盘（`pendingMems`）。
+           */
           function memoriesGroup() {
             var inv = modal.inventory || { memories: [] }
             var own = sceneMemoriesOf(inv.memories, modal.name || '')
@@ -11134,35 +11928,327 @@ function enabledMemoryCount(rules) {
                 || String(m.description || '').toLowerCase().indexOf(q) >= 0
             }) : own, function (m) { return String(m.id) }, function (m) { return memoryEnabled(String(m.id)) })
             var enabledCount = own.filter(function (m) { return memoryEnabled(String(m.id)) }).length
+            // 草稿**另算一栏**（`· N 条待创建`），不并进 `x/y 已勾选`：那一栏是「全选 / 全不选」
+            // 的作用面（它只认已存在的记忆），并进去就会出现"写着 5/5、全选却只勾了 3 条"。
+            // 两栏各说各的：前者 = 这个场景现在有几条、开着几条；后者 = 我这次还配了几条。
+            var pending = modal.pendingMems || []
+            // 本次编辑里攒下的记忆草稿（还没落盘，两种时机都有）。它们：
+            //   · 勾选框照常可用 —— 勾 = 落盘时直接开启，与下面那些真记忆同一语义（新草稿默认勾上）；
+            //   · 「编辑」回填草稿，「移除」撤掉草稿；
+            //   · 行首标「待创建」，免得跟真的记忆混成一片（标签的 title 补两句非显然的话：
+            //     落点取点「创建」那一刻的场景名、勾选的含义）。
+            // 草稿行**不受筛选框影响**：它是"我这次配了什么"的台账，被搜索词筛掉只会让人以为它没了。
+            var rows = pending.map(function (m, i) {
+              return RowSelect({
+                disabled: busy,
+                key: 'pending:' + i,
+                checked: m.enabled === true,
+                name: m.name,
+                desc: m.description ? clipText(m.description, MEM_DESC_MAX) : null,
+                descTitle: m.description || null,
+                meta: React.createElement('span', { className: 'dsm-tag', title: t('scenes.mem.pendingTagTitle') }, t('scenes.mem.pendingTag')),
+                actions: [
+                  React.createElement('button', { key: 'edit', type: 'button', className: 'dsm-btn dsm-btn-quiet', disabled: busy, onClick: function () { openMemoryEdit(i) } }, t('memory.edit')),
+                  React.createElement('button', { key: 'rm', type: 'button', className: 'dsm-btn dsm-btn-quiet dsm-btn-danger', disabled: busy, onClick: function () { dropPendingMemory(i) } }, t('scenes.mem.removePending')),
+                ],
+                onChange: function () { togglePendingMemory(i) },
+              })
+            }).concat(items.map(function (m) {
+              return RowSelect({
+                disabled: busy,
+                key: m.id,
+                checked: memoryEnabled(String(m.id)),
+                name: m.name,
+                // 记忆描述是自由正文的首行，可能很长：截断到 MEM_DESC_MAX，全文放 title。
+                desc: m.description ? clipText(m.description, MEM_DESC_MAX) : null,
+                descTitle: m.description || null,
+                onChange: function () { toggleMemory(String(m.id)) },
+              })
+            }))
             return editorGroupNode({
               title: t('memory.archive.memories'),
-              count: t('scenes.seg.checked', { checked: enabledCount, total: own.length }),
-              actions: segActions({
+              count: t('scenes.seg.checked', { checked: enabledCount, total: own.length })
+                + (pending.length ? ' · ' + t('scenes.mem.pending', { count: pending.length }) : ''),
+              // 「创建」排在最前（用户 2026-10-14：在全选左边），点开的是记忆页那个「新建记忆」
+              // 弹窗（少了场景选择器，见 memoryCreateNode）。其余三个组没有这颗 —— 它们的条目
+              // 来自磁盘扫描（服务器 / 技能 / 人设），不在这里现造。
+              actions: [memoryCreateButton()].concat(segActions({
                 defined: true, busy: busy,
                 selectAllLabel: t('bulk.selectAll'), clearLabel: t('bulk.unselectAll'),
                 onAll: function () { setAllMemories(true) },
                 onClear: function () { setAllMemories(false) },
                 allChecked: own.length > 0 && enabledCount === own.length,
-              }),
+              })),
               query: modal.memQuery,
               onQuery: function (v) { setModal(Object.assign({}, modal, { memQuery: v })) },
               queryPlaceholder: t('scenes.mem.search'),
-              body: items.length
-                ? React.createElement('div', null, items.map(function (m) {
-                    return RowSelect({
-                      disabled: busy,
-                      key: m.id,
-                      checked: memoryEnabled(String(m.id)),
-                      name: m.name,
-                      // 记忆描述是自由正文的首行，可能很长：截断到 MEM_DESC_MAX，全文放 title。
-                      desc: m.description ? clipText(m.description, MEM_DESC_MAX) : null,
-                      descTitle: m.description || null,
-                      onChange: function () { toggleMemory(String(m.id)) },
-                    })
-                  }))
+              body: rows.length
+                ? React.createElement('div', null, rows)
                 : React.createElement('div', { className: 'dsm-pick-empty' }, q ? t('scenes.mem.noMatch') : t('scenes.mem.emptyScene')),
             })
           }
+          /*
+           * 记忆集组头的「创建」（用户 2026-10-14）：套用记忆页那个「新建记忆」弹窗，**只少了
+           * 场景选择器** —— 场景由编辑器上下文定死，以只读一行显示。
+           *
+           * 与其余三组同一条模型：**弹窗里建出来的都只是草稿**，存在 `modal.pendingMems` 里，
+           * 点「创建 / 保存到场景」那一刻才真正落盘（`flushPendingMemories`）。创建态如此，
+           * 编辑态也一样（用户 2026-10-14：「已经存在的场景，本次创建记忆应该也能编辑、移除，
+           * 也是未创建的记录」）—— 于是两种时机只有**落点**不同，行为不再分叉：草稿行一律
+           * 可勾选、可编辑、可移除。
+           *
+           * 落盘仍走记忆页那两个宿主 op（`rules-create` + `rules-attach`）。一处刻意的偏离：
+           * 服务端新建记忆默认 `enabled: false`（`ops/memory.ts` 的 P5 口径，记忆页照此），
+           * 而这里的草稿**默认勾选**（用户 2026-10-14 裁定）—— 在这个场景里新建记忆本就是为了
+           * 让它生效，落盘时按勾选补一次 `rules-toggle`；记忆页那条路径不受影响。
+           *
+           * 落点：编辑态 = 场景名；创建态 = 左边**正在填**的场景名（没填或非法就没有落点，
+           * 入口置灰）。草稿**不记场景名** —— 落点统一取点「创建」那一刻的名字，所以中途改名
+           * 不会把早先那条留在旧名字下，也不会各落一半。场景名此刻还只是表单里的一个字串，
+           * 把它抄进草稿只会抄出一个马上过期的副本；代价是草稿行上不能写场景名（写了改名后
+           * 就是假话），这件事由「待创建」标签的 title 说清。
+           */
+          /** 这次新建的记忆落到哪个场景：编辑态是场景名，创建态是表单里正在填的那个名字。 */
+          function memoryCreateTarget() {
+            if (!modal || modal.type !== 'scene-editor') return ''
+            return modal.name != null ? String(modal.name) : String(sceneForm.name || '').trim()
+          }
+          function memoryCreateReady() {
+            if (!modal || modal.type !== 'scene-editor') return false
+            if (modal.name != null) return true
+            return isValidSceneSegment(String(sceneForm.name || '').trim())
+          }
+          function openMemoryCreate() {
+            if (!memoryCreateReady()) return
+            // `editing` = 这一窗改的是第几条草稿；null = 新建一条。
+            setMemNew({ editing: null, name: '', description: '', body: '', form: 'flat', files: [], error: null })
+          }
+          /** 改一条待创建的记忆：草稿回填进弹窗，保存时**替换**原来那条，而不是又添一条。 */
+          function openMemoryEdit(index) {
+            if (!modal || modal.type !== 'scene-editor') return
+            var m = (modal.pendingMems || [])[index]
+            if (!m) return
+            setMemNew({
+              editing: index, name: m.name, description: m.description || '', body: m.body || '',
+              form: m.form || 'flat', files: (m.files || []).slice(), error: null,
+            })
+          }
+          /** 撤掉一条还没落盘的记忆草稿。 */
+          function dropPendingMemory(index) {
+            if (!modal || modal.type !== 'scene-editor') return
+            var next = (modal.pendingMems || []).slice()
+            next.splice(index, 1)
+            setModal(Object.assign({}, modal, { pendingMems: next }))
+          }
+          /**
+           * 勾 / 取消勾一条待创建的记忆。语义与记忆页、本组其余行**完全一致**（勾 = 启用），
+           * 只是生效时刻晚一步：服务端新建记忆默认不开启（`ops/memory.ts`），所以落盘时
+           * create 之后要显式补一次 `rules-toggle`（见 flushPendingMemories）。
+           */
+          function togglePendingMemory(index) {
+            if (!modal || modal.type !== 'scene-editor') return
+            var next = (modal.pendingMems || []).slice()
+            if (!next[index]) return
+            next[index] = Object.assign({}, next[index], { enabled: next[index].enabled !== true })
+            setModal(Object.assign({}, modal, { pendingMems: next }))
+          }
+          function pickMemAttach() { if (memAttachRef.current) memAttachRef.current.click() }
+          function onMemAttachPicked(ev) {
+            var picked = Array.prototype.slice.call((ev.target && ev.target.files) || [])
+            if (ev.target) ev.target.value = '' // 允许连续选中同一个文件
+            if (!picked.length) return
+            Promise.all(picked.map(function (f) {
+              return f.arrayBuffer().then(function (buf) {
+                return { name: String(f.name || ''), size: buf.byteLength, data: bytesToBase64(buf) }
+              })
+            })).then(function (entries) {
+              var tooBig = entries.filter(function (e) { return e.size > MEM_ATTACH_MAX_BYTES })
+              var keep = entries.filter(function (e) { return e.size <= MEM_ATTACH_MAX_BYTES })
+              setMemNew(function (prev) {
+                if (!prev) return prev
+                var next = Object.assign({}, prev, { files: (prev.files || []).concat(keep) })
+                // 超限的当场拦下（服务端还会再拦一次），其余照常加入。
+                if (tooBig.length) next.error = t('memory.attach.tooLarge', { name: tooBig[0].name, limit: MEM_ATTACH_MAX_MB })
+                return next
+              })
+            }).catch(function (e) { setMemNew(function (prev) { return prev ? Object.assign({}, prev, { error: errMsg(e) }) : prev }) })
+          }
+          function dropMemPending(index) {
+            setMemNew(function (prev) {
+              if (!prev) return prev
+              var next = (prev.files || []).slice()
+              next.splice(index, 1)
+              return Object.assign({}, prev, { files: next })
+            })
+          }
+          /**
+           * 名称去重：`测` 已被占用就退成 `测（1）`，再撞就 `测（2）`……
+           *
+           * 判据是**会落盘的那一套名字** = 本场景已有的记忆 + 本次已攒下的其它草稿。
+           * 服务端 `rules-create` 撞名是直接拒绝的（`error.rules.exists`），所以这一步的作用是
+           * 让「配两条同名」能正常落盘，而不是报个错让用户自己回去改名（用户 2026-10-14 要求）。
+           *
+           * `skipIndex` 跳过正在编辑的那条草稿：不跳的话改一次名就会把自己也算成占用者，
+           * 于是每保存一次名字就往后挪一位。
+           *
+           * 退号本身走共享的 `uniqueName`（42-shared-ui.js，八个入口同一套）；这里只负责
+           * 把"占用者"凑出来 —— 各域的判据不同，凑法也就留在各域。
+           */
+          function uniqueMemoryName(raw, skipIndex) {
+            var taken = {}
+            sceneMemories(modal.name).forEach(function (m) { taken[String(m.name)] = true })
+            ;(modal.pendingMems || []).forEach(function (m, i) { if (i !== skipIndex) taken[String(m.name)] = true })
+            return uniqueName(raw, taken)
+          }
+          /**
+           * 弹窗的提交动作：**先问一句再退号**（用户 2026-10-14 第二轮）。
+           *
+           * 原来这里静默退号 —— 输入框里写着「测」，草稿行上却是「测（1）」。现在撞名先弹一个
+           * 小窗说明，确认后才按 `测（1）` 攒草稿。落盘仍然是点「创建 / 保存到场景」那一刻
+           * （见 flushPendingMemories）：这里一个请求都不发。
+           */
+          function submitMemoryCreate() {
+            if (!memNew || !modal || modal.type !== 'scene-editor') return
+            var typed = String(memNew.name || '').trim()
+            var finalName = uniqueMemoryName(typed, memNew.editing != null ? memNew.editing : null)
+            if (finalName !== typed) { setMemDupAsk({ name: typed, finalName: finalName }); return }
+            stageMemoryDraft(typed)
+          }
+          /**
+           * 把草稿写回 `modal.pendingMems`（新增一条，或**替换**被编辑的那条）。`name` 已定。
+           *
+           * 写的是草稿的**拷贝**：弹窗一关 `memNew` 就归 null，不能再引用它。
+           */
+          function stageMemoryDraft(name) {
+            if (!memNew || !modal || modal.type !== 'scene-editor') return
+            var list = (modal.pendingMems || []).slice()
+            var editing = memNew.editing != null && list[memNew.editing] ? memNew.editing : null
+            var draft = {
+              name: name,
+              description: String(memNew.description || '').trim(),
+              body: memNew.body || '',
+              form: memNew.form || 'flat',
+              files: (memNew.files || []).slice(),
+              // 新草稿默认勾选（用户 2026-10-14 裁定：这个场景里新建的记忆就是要它生效）；
+              // 勾选本身住在**行上**（编辑弹窗里没有这一栏，与记忆页的新建弹窗一致），
+              // 所以改草稿时原样保留它，别让一次改名顺手抹掉「建好后开启」的意图。
+              enabled: editing != null ? list[editing].enabled === true : true,
+            }
+            if (editing != null) list[editing] = draft
+            else list.push(draft)
+            setModal(Object.assign({}, modal, { pendingMems: list }))
+            setMemNew(null)
+          }
+          /** 组头那颗「创建」：创建态且场景名还没填/非法时置灰，title 说清差什么。 */
+          function memoryCreateButton() {
+            var ready = memoryCreateReady()
+            return React.createElement('button', {
+              key: 'memnew', type: 'button', className: 'dsm-btn dsm-btn-quiet',
+              disabled: busy || !ready,
+              title: ready ? '' : t('scenes.mem.createNeedScene'),
+              onClick: openMemoryCreate,
+            }, t('memory.btn.create'))
+          }
+          /**
+           * 把攒下的记忆草稿真正落盘 —— 排在场景本体（与档案）之后，因为 `rules-create` 要求
+           * 目标场景**已存在**。两种时机共用这一条：创建态是"场景刚建出来"，编辑态是"场景已改完"。
+           * 某一条失败不回滚场景、也不影响同批其余条目，逐条如实报出名字与原因。
+           */
+          function flushPendingMemories(name, isEdit, sceneRes, archiveRes) {
+            var pending = (modal && modal.pendingMems) || []
+            if (!pending.length) { finishSceneEditor(name, isEdit, sceneRes, archiveRes, null); return }
+            setBusy(true)
+            var created = 0
+            // 两个失败桶分开：`failed` = 这条记忆压根没建出来；`incomplete` = 建出来了，但
+            // 后续两步（开启 / 传附件）有一处没做成。混成一个桶就会谎报 —— 后者文件是存在的。
+            var failed = []
+            var incomplete = []
+            var chain = Promise.resolve()
+            pending.forEach(function (m) {
+              chain = chain.then(function () {
+                return apiCall('rules-create', { group: name, name: m.name, description: m.description, body: m.body, form: m.form }).then(function (res) {
+                  if (!res || !res.ok) { failed.push(m.name + '（' + translateError(t, res) + '）'); return null }
+                  created += 1
+                  var id = (res.rule && res.rule.id) || (name + '/' + m.name)
+                  var post = []
+                  // 勾选 = 建好后直接开启（服务端新建记忆默认不开启）。
+                  if (m.enabled === true) post.push(apiCall('rules-toggle', { id: id, enabled: true }).then(function (tg) {
+                    if (!tg || !tg.ok) incomplete.push(m.name + '（' + translateError(t, tg) + '）')
+                  }, function (e) { incomplete.push(m.name + '（' + errMsg(e) + '）') }))
+                  if ((m.files || []).length) post.push(apiCall('rules-attach', { id: id, files: m.files.map(function (f) { return { path: f.name, data: f.data } }) }).then(function (att) {
+                    if (att && att.ok === false) incomplete.push(m.name + '（' + translateError(t, att) + '）')
+                  }, function (e) { incomplete.push(m.name + '（' + errMsg(e) + '）') }))
+                  // 两个 onRejected 都就地收下错误：漏出去会被外层 catch 记成"没建出来"，
+                  // 而那时记忆其实已经在磁盘上了。
+                  return post.length ? Promise.all(post) : null
+                }).catch(function (e) { failed.push(m.name + '（' + errMsg(e) + '）') })
+              })
+            })
+            chain.then(function () {
+              setBusy(false)
+              finishSceneEditor(name, isEdit, sceneRes, archiveRes, { created: created, failed: failed, incomplete: incomplete })
+            })
+          }
+          /**
+           * 「新建记忆」弹窗本体。字段与记忆页逐项一致（名称 / 描述 / 正文 / 形态 + bundle 附件），
+           * 场景一栏改成只读展示 —— 这正是「套用记忆页的新建，但不需要选择场景」。
+           */
+          function memoryCreateNode() {
+            if (!memNew || !modal || modal.type !== 'scene-editor') return null
+            var nameInvalid = String(memNew.name || '').trim() !== '' && !isValidSceneSegment(String(memNew.name || '').trim())
+            var descLen = String(memNew.description || '').length
+            var target = memoryCreateTarget()
+            // 撞名改由提交时的确认窗处理（`DupNameDialog`）：输入框下面那行"保存会记为「X」"
+            // 是它的**预告版**，用户 2026-10-14 裁定啰嗦，删掉 —— 真撞上了才弹窗问一句。
+            // 改草稿时标题与主按钮换成「编辑 / 保存」那一套（与记忆页同词条）——否则同一个弹窗
+            // 在"新建"和"改一条已存在的东西"两种语义下长得一模一样，用户分不清点下去会加一条还是改一条。
+            var editing = memNew.editing != null
+            return React.createElement(Modal, { key: 'memnew', className: 'dsm-modal-compact', title: editing ? t('memory.edit.title') : t('memory.create.title'), closeLabel: t('btn.close'), onClose: function () { setMemNew(null) } },
+              React.createElement('div', { className: 'dsm-form' },
+                React.createElement('label', { className: 'dsm-field' },
+                  React.createElement('span', { className: 'dsm-label' }, t('memory.field.group')),
+                  // 只读一行：场景由上下文决定，不给选择器，也不加说明（用户 2026-10-14 裁定
+                  // 撤掉那句「记忆归属于当前编辑的场景」—— 灰掉的框里写着场景名，本身就是答案）。
+                  React.createElement('input', { className: 'dsm-control', value: sceneLabel(data.scenes, target), disabled: true, onChange: function () {} })),
+                React.createElement('label', { className: 'dsm-field' },
+                  React.createElement('span', { className: 'dsm-label' }, t('memory.field.name')),
+                  React.createElement('input', { className: 'dsm-control' + (nameInvalid ? ' dsm-rule-invalid' : ''), value: memNew.name || '', placeholder: t('memory.field.name.placeholder'), onChange: function (e) { setMemNew(Object.assign({}, memNew, { name: e.target.value })) } }),
+                  nameInvalid ? React.createElement('p', { className: 'dsm-rule-hint' }, t('memory.name.invalid')) : null),
+                React.createElement('label', { className: 'dsm-field' },
+                  React.createElement('div', { className: 'dsm-budget-meta' },
+                    React.createElement('span', { className: 'dsm-label' }, t('memory.field.description')),
+                    React.createElement('span', { className: 'dsm-char-count' + (descLen > 500 ? ' dsm-char-over' : '') }, descLen + ' / 500')),
+                  React.createElement('input', { className: 'dsm-control', value: memNew.description || '', placeholder: t('memory.field.description.placeholder'), onChange: function (e) { setMemNew(Object.assign({}, memNew, { description: e.target.value })) } })),
+                React.createElement('label', { className: 'dsm-field' },
+                  React.createElement('span', { className: 'dsm-label' }, t('memory.field.body')),
+                  React.createElement('textarea', { className: 'dsm-control dsm-textarea-md', value: memNew.body || '', placeholder: t('memory.field.body.placeholder'), onChange: function (e) { setMemNew(Object.assign({}, memNew, { body: e.target.value })) } })),
+                React.createElement('div', { className: 'dsm-field' },
+                  React.createElement('span', { className: 'dsm-label' }, t('memory.field.form')),
+                  // flat / bundle 就两个值：分段按钮摊开、点击即切（与记忆页同一控件）。
+                  React.createElement('div', { className: 'dsm-form-seg', role: 'group' },
+                    RULE_FORM_OPTIONS.map(function (o) {
+                      return React.createElement('button', { key: o.value, type: 'button', 'aria-pressed': (memNew.form || 'flat') === o.value, onClick: function () { setMemNew(Object.assign({}, memNew, { form: o.value })) } }, o.label);
+                    })),
+                  memNew.form === 'bundle'
+                    ? React.createElement('div', { className: 'dsm-field' },
+                      React.createElement('div', { className: 'dsm-budget-meta' },
+                        React.createElement('span', { className: 'dsm-label' }, t('memory.field.attach')),
+                        React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy, onClick: pickMemAttach }, t('memory.attach.add'))),
+                      React.createElement('input', { ref: memAttachRef, type: 'file', multiple: true, className: 'dsm-hidden-input', onChange: onMemAttachPicked }),
+                      (memNew.files || []).length
+                        ? React.createElement('div', { className: 'dsm-attach-list' }, (memNew.files || []).map(function (f, i) {
+                            return React.createElement('div', { key: 'p:' + i + ':' + f.name, className: 'dsm-file', title: f.name },
+                              React.createElement('span', { className: 'dsm-file-kind', 'aria-hidden': 'true' }, 'NEW'),
+                              React.createElement('span', { className: 'dsm-file-name' }, f.name),
+                              React.createElement('span', { className: 'dsm-file-meta' }, fmtBytes(f.size) + ' · ' + t('memory.attach.pending')),
+                              React.createElement('button', { type: 'button', className: 'dsm-file-remove', disabled: busy, 'aria-label': t('memory.attach.remove') + ' ' + f.name, onClick: function () { dropMemPending(i) } }, '×'))
+                          }))
+                        : null)
+                    : null),
+                memNew.error ? React.createElement('div', { className: 'dsm-feedback dsm-error', role: 'alert' }, String(memNew.error)) : null),
+              React.createElement('div', { className: 'dsm-modal-actions' },
+                React.createElement('button', { type: 'button', className: 'dsm-btn', disabled: busy || nameInvalid || descLen > 500 || !String(memNew.name || '').trim() || !String(memNew.body || '').trim(), onClick: submitMemoryCreate }, editing ? t('memory.btn.save') : t('memory.btn.create'))))
+          }
           /** 组 1：MCP 工具集（服务器级行选择 → 行内「编辑」打开次级弹窗：备注 + 工具行选择）。 */
           function mcpGroup() {
             var sections = modalSections()
@@ -11463,7 +12549,8 @@ function enabledMemoryCount(rules) {
               mcp: modal.sections.mcp ? Object.keys(modal.sections.mcp).length : 0,
               skills: modal.sections.skills ? modal.sections.skills.length : 0,
               subagents: modal.sections.subagents ? modal.sections.subagents.length : 0,
-              memories: own.length,
+              // 创建态还没落盘的那批也算进去：它们同样会在「创建」那一刻变成这个场景的记忆。
+              memories: own.length + ((modal.pendingMems || []).length),
             })
             var descLen = String(sceneForm.description || '').length
             // 字段级错误只留**真正关于本字段**的（用户 2026-10-12：「场景名下面的删除」）。
@@ -11489,7 +12576,7 @@ function enabledMemoryCount(rules) {
               title: React.createElement('span', { className: 'dsm-modal-title-row' },
                 isEdit ? t('scenes.editor.title', { name: label }) : t('memory.scene.createTitle'),
                 React.createElement('span', { className: 'dsm-editor-summary' }, summary)),
-              closeLabel: t('btn.close'), onClose: function () { setModal(null) } },
+              closeLabel: t('btn.close'), onClose: function () { if (modal.draftKey) stashFormDraft(modal.draftKey, sceneForm); setModal(null) } },
               modal.error ? React.createElement(Notice, { kind: 'err', text: modal.error }) : null,
               React.createElement('div', { className: 'dsm-form' },
                 React.createElement('div', { className: 'dsm-field-row dsm-editor-basics' },
@@ -11645,7 +12732,10 @@ function enabledMemoryCount(rules) {
            *
            * `nameOnly`：技能键是 `<来源>/<名字>`，而自定义来源的键是一串机器名
            * （`custom-d38da02b873bdb5c`）—— 铺在卡上没人认得出那是哪个技能。技能只取名字
-           * （最后一段），来源与人设本来就是短名（用户 2026-09-23 裁定）。
+           * （最后一段），人设本来就是短名。**技能目录（来源）不上卡**：来源级切换是技能
+           * 启停的实现细节（勾了技能的来源才启用、一条都没勾就停用），项目来源的 key 还是
+           * 一串路径哈希（`project-dsh:47d48f408c5edc5e`），而那个目录对用户可能根本不存在、
+           * 也不是新建技能的落点 —— 报出来只会被当成故障（用户 2026-10-15 裁定）。
            */
           function previewNames(list, nameOnly) {
             var names = (list || []).map(function (item) {
@@ -11749,8 +12839,6 @@ function enabledMemoryCount(rules) {
             pushRow(rest, 'scenes.preview.row.serversOff', mcp.serversOff)
             pushRow(rest, 'scenes.preview.row.toolsOn', mcp.toolsOn)
             pushRow(rest, 'scenes.preview.row.toolsOff', mcp.toolsOff)
-            pushRow(rest, 'scenes.preview.row.sourcesOn', sk.sourcesOn)
-            pushRow(rest, 'scenes.preview.row.sourcesOff', sk.sourcesOff)
             pushRow(rest, 'scenes.preview.row.skillsOn', sk.on, true)
             pushRow(rest, 'scenes.preview.row.skillsOff', sk.off, true)
             pushRow(rest, 'scenes.preview.row.personasOn', sub.on)
@@ -12063,6 +13151,26 @@ function enabledMemoryCount(rules) {
                 React.createElement('button', { type: 'button', className: 'dsm-btn', disabled: busy || preview.loading, onClick: confirmEnter }, t('scenes.preview.enter')))) : null,
             // 场景编辑器（新建 / 编辑 / 档案三弹窗融合，见 editorNode）。
             editorNode(),
+            // 「新建记忆」弹窗（记忆集组头那颗「创建」）：同样排在编辑器之后 —— 它是编辑器里
+            // 开出来的子弹窗，后渲染的盖在上面。
+            memoryCreateNode(),
+            // 「已存在同名记忆」小窗：叠在「新建记忆」弹窗之上（三个入口的层级从下往上依次是
+            // 场景编辑器 → 新建记忆 → 同名确认）。取消 → 回到新建记忆弹窗改名字，正文与附件不动。
+            memDupAsk ? React.createElement(DupNameDialog, {
+              key: 'memdup', t: t, kind: t('dup.kind.memory'),
+              name: memDupAsk.name, finalName: memDupAsk.finalName, action: 'create',
+              busy: busy,
+              onCancel: function () { setMemDupAsk(null) },
+              onConfirm: function () { setMemDupAsk(null); stageMemoryDraft(memDupAsk.finalName) },
+            }) : null,
+            // 「已存在同名场景」小窗：叠在场景编辑器之上。取消 → 回到编辑器改名，档案四组不动。
+            sceneDupAsk ? React.createElement(DupNameDialog, {
+              key: 'scenedup', t: t, kind: t('dup.kind.scene'),
+              name: sceneDupAsk.name, finalName: sceneDupAsk.finalName, action: 'create',
+              busy: busy,
+              onCancel: function () { setSceneDupAsk(null) },
+              onConfirm: function () { setSceneDupAsk(null); saveScene(sceneDupAsk.finalName, false) },
+            }) : null,
             // 快捷提示词勾选弹窗（2026-10-12）：**排在编辑器之后**，两层遮罩同 z-index，
             // 后渲染的在上面 —— 它是编辑器里那颗按钮开出来的子弹窗。
             quickPick ? React.createElement(Modal, {
@@ -12130,6 +13238,12 @@ function enabledMemoryCount(rules) {
           var result = rs[0], setResult = rs[1]
           var ms = React.useState(null)
           var modal = ms[0], setModal = ms[1]
+          // 切走这一页 → 编辑弹窗关窗时那份暂存作废（见 42-shared-ui.js 的 useFormDraftScope）。
+          useFormDraftScope('sub:')
+          // 「已存在同名人设」确认弹窗（用户 2026-10-14）：`{ name, finalName }` 或 null。
+          // 撞名不再静默退号（`写作助手` → `写作助手（1）`），先问一句再建。
+          var dups = React.useState(null)
+          var dupAsk = dups[0], setDupAsk = dups[1]
           /**
            * 「思考强度」的加载状态。key = 已拉取/正在拉取的 `provider\0model`（空串 = 还没选模型）。
            * 与 `cands` 分开两个 state：档位是**按模型**懒加载的，而候选目录是一次性拉的，
@@ -12284,12 +13398,12 @@ function enabledMemoryCount(rules) {
           /** 高级选项：默认收起；已经在用模型/工具限制的人设自动展开（否则用户看不见自己配了什么）。 */
           /** 「不限制嵌套」的取值（与 src/subagents/service.ts 的 UNLIMITED_PERSONA_CATALOG_DEPTH 同值）。 */
           var CATALOG_DEPTH_UNLIMITED = 99
-          /** 目录注入深度的选项文案：下拉与折叠摘要共用一处，免得两处说法分叉。 */
+          /** 目录注入深度的四档文案（分段按钮的键面）；手写过 4-98 的旧值一律报「3层」。 */
           function catalogDepthLabel(n) {
-            if (n === 1) return t('subagents.field.catalogDepth.onlyTop')
-            if (n === 2) return t('subagents.field.catalogDepth.toChild')
+            if (n === 1) return t('subagents.field.catalogDepth.d1')
+            if (n === 2) return t('subagents.field.catalogDepth.d2')
             if (n >= CATALOG_DEPTH_UNLIMITED) return t('subagents.field.catalogDepth.unlimited')
-            return t('subagents.field.catalogDepth.toGrand')
+            return t('subagents.field.catalogDepth.d3')
           }
           function initialAdvanced(p) {
             var modes = p && p.toolsByPreset ? Object.keys(p.toolsByPreset).length : 0
@@ -12312,9 +13426,23 @@ function enabledMemoryCount(rules) {
             })
             return out
           }
+          /**
+           * 关窗 ≠ 丢掉：打开时按这个键取回刚才那份（30 秒内），关窗时按同一个键存回去。
+           * 键带在 modal 上而不是从 `form.name` 推 —— 名字框是用户正在改的那个字段，拿它当键
+           * 会出现"存进 A 键、取回时读 B 键"。
+           */
+          function applyDraft(base, draft) {
+            if (!draft) return base
+            return Object.assign({}, base, {
+              advanced: draft.advanced === true,
+              form: Object.assign({}, base.form, draft.form, { error: null }),
+            })
+          }
           function openEditor(name) {
+            var draftKey = name ? 'sub:edit:' + name : 'sub:create'
+            var draft = takeFormDraft(draftKey)
             if (!name) {
-              setModal({ type: 'editor', mode: 'create', advanced: false, openMode: null, stoppedRules: {}, modeQuery: '', legacyTarget: '', form: { name: '', description: '', provider: '', model: '', reasoningEffort: '', catalogDepth: 1, continuable: false, tools: [], toolsDeny: [], toolsByPreset: {}, body: '', output: '', error: null } })
+              setModal(applyDraft({ type: 'editor', mode: 'create', draftKey: draftKey, advanced: false, openMode: null, stoppedRules: {}, modeQuery: '', legacyTarget: '', form: { name: '', description: '', provider: '', model: '', reasoningEffort: '', catalogDepth: 1, continuable: false, tools: [], toolsDeny: [], toolsByPreset: {}, body: '', output: '', error: null } }, draft))
               return
             }
             setBusy(true)
@@ -12323,7 +13451,7 @@ function enabledMemoryCount(rules) {
               if (res && res.ok) {
                 var p = res.persona || {}
                 var advanced = initialAdvanced(p)
-                setModal({ type: 'editor', mode: 'edit', originalName: String(p.name || name), advanced: advanced, openMode: null, stoppedRules: {}, modeQuery: '', legacyTarget: '', form: {
+                setModal(applyDraft({ type: 'editor', mode: 'edit', draftKey: draftKey, originalName: String(p.name || name), advanced: advanced, openMode: null, stoppedRules: {}, modeQuery: '', legacyTarget: '', form: {
                   name: p.name || name, description: p.description || '', provider: p.provider || '', model: p.model || '',
                   // 思考强度：服务端回空串 = 这份人设没指定（不是"没有档位"）。空值不落盘，见 serializePersona。
                   reasoningEffort: p.reasoningEffort || '',
@@ -12333,14 +13461,19 @@ function enabledMemoryCount(rules) {
                   continuable: p.continuable === true,
                   tools: (p.tools || []).slice(), toolsDeny: (p.toolsDeny || []).slice(),
                   toolsByPreset: cloneRules(p.toolsByPreset), body: p.body || '', output: p.output || '', error: null,
-                } })
+                } }, draft))
                 // 已配过限制的人设**一打开就是展开的**（initialAdvanced）→ 候选数据必须在这里也拉，
                 // 否则四行模式先亮"宿主没有回传预设名单"，非得点两次「高级选项」才补上（用户实测）。
                 // 思考强度同理：展开着就要有档位清单（它按模型懒加载，所以这里显式带上 model）。
-                if (advanced) { loadCandidates(); loadEfforts(p.provider, p.model) }
+                if (advanced || (draft && draft.advanced === true)) { loadCandidates(); loadEfforts(p.provider, p.model) }
               } else setResult({ ok: false, text: translateError(t, res) })
             }).catch(function (e) { setBusy(false); setResult({ ok: false, text: errMsg(e) }) })
           }
+          /** 关掉编辑弹窗：存下这一份再关（提交成功那条路不走这里，所以不必事后清）。 */
+          function dismissEditor() {
+            if (modal && modal.type === 'editor' && modal.draftKey) stashFormDraft(modal.draftKey, { advanced: modal.advanced, form: modal.form })
+            setModal(null)
+          }
           function setForm(patch) { if (modal && modal.type === 'editor') setModal(Object.assign({}, modal, { form: Object.assign({}, modal.form, patch) })) }
           /** 列表里增删一项（勾选语义：存在 = 勾上）。 */
           function toggled(list, name) {
@@ -12686,15 +13819,34 @@ function enabledMemoryCount(rules) {
               loadEfforts(modal.form.provider, modal.form.model)
             }
           }
+          /**
+           * 编辑器唯一的保存动作。**新建撞名先问一句**（用户 2026-10-14 第二轮）。
+           *
+           * 判据是当前人设清单（`data.subagents` 的 `name`）—— 人设名就是文件名、
+           * `validPersonaName` 不做任何归一化，所以本地查得到就是真的撞了。编辑态不做这一步：
+           * 改的是自己，而且改名撞上别人由服务端 `subagent-update` 自己拒（`人设已存在`）。
+           */
           function submitEditor() {
+            if (!modal || modal.type !== 'editor') return
+            var typed = String(modal.form.name || '').trim()
+            if (modal.mode === 'create') {
+              var taken = {}
+              ;(data.subagents || []).forEach(function (p) { taken[String(p.name)] = true })
+              var finalName = uniqueName(typed, taken)
+              if (finalName !== typed) { setDupAsk({ name: typed, finalName: finalName }); return }
+            }
+            saveEditor(typed)
+          }
+          /** 真正落盘那一步（名字已定）。`name` 来自 `submitEditor` 或确认弹窗。 */
+          function saveEditor(name) {
             if (!modal || modal.type !== 'editor') return
             setBusy(true)
             var op = modal.mode === 'create' ? 'subagent-create' : 'subagent-update'
             // 编辑时名字可改：nextName 只在真的改过时才传（服务端按原名定位文件）。
-            var renamed = modal.mode === 'edit' && modal.originalName && modal.originalName !== modal.form.name
+            var renamed = modal.mode === 'edit' && modal.originalName && modal.originalName !== name
             apiCall(op, {
-              name: renamed ? String(modal.originalName) : modal.form.name,
-              ...(renamed ? { nextName: String(modal.form.name || '').trim() } : {}),
+              name: renamed ? String(modal.originalName) : name,
+              ...(renamed ? { nextName: name } : {}),
               description: modal.form.description,
               provider: modal.form.provider, model: modal.form.model,
               catalogDepth: modal.form.catalogDepth,
@@ -12706,7 +13858,7 @@ function enabledMemoryCount(rules) {
               output: modal.form.output || '',
             }).then(function (res) {
               setBusy(false)
-              if (res && res.ok) { var sw = stateSyncWarn(t, res); setModal(null); setResult({ ok: !sw, warning: !!sw, text: t('done.saved', { name: modal.form.name }) + (sw ? ' ' + sw : '') }); refresh(true) }
+              if (res && res.ok) { var sw = stateSyncWarn(t, res); setModal(null); setResult({ ok: !sw, warning: !!sw, text: t('done.saved', { name: name }) + (sw ? ' ' + sw : '') }); refresh(true) }
               else setModal(Object.assign({}, modal, { form: Object.assign({}, modal.form, { error: translateError(t, res) }) }))
             }).catch(function (e) { setBusy(false); setModal(Object.assign({}, modal, { form: Object.assign({}, modal.form, { error: errMsg(e) }) })) })
           }
@@ -12825,13 +13977,13 @@ function enabledMemoryCount(rules) {
                   ],
                 })
               })),
-            modal && modal.type === 'editor' ? React.createElement(Modal, { key: 'sedit', wide: true, className: 'dsm-modal-compact', title: modal.mode === 'create' ? t('subagents.create') : t('subagents.edit') + ' · ' + modal.form.name, closeLabel: t('btn.close'), onClose: function () { setModal(null) } },
+            modal && modal.type === 'editor' ? React.createElement(Modal, { key: 'sedit', wide: true, className: 'dsm-modal-compact dsm-modal-form-tall', title: modal.mode === 'create' ? t('subagents.create') : t('subagents.edit') + ' · ' + modal.form.name, closeLabel: t('btn.close'), onClose: dismissEditor },
               React.createElement('div', { className: 'dsm-form' },
                 React.createElement('label', { className: 'dsm-field' },
                   React.createElement('span', { className: 'dsm-label' }, t('subagents.field.name')),
                   React.createElement('input', { className: 'dsm-control', value: modal.form.name || '', placeholder: 'code-review', onChange: function (e) { setForm({ name: e.target.value }) } })),
                 React.createElement('label', { className: 'dsm-field' },
-                  // 描述会整段进「可委派的子智能体」目录，上限就是注入侧的截断长度（`CATALOG_DESC_MAX`）；
+                  // 描述会整段进「当前子智能体」目录，上限就是注入侧的截断长度（`CATALOG_DESC_MAX`）；
                   // 存量人设的超长描述标红（服务端不校验这个长度，只有注入时截）。
                   React.createElement('div', { className: 'dsm-budget-meta' },
                     React.createElement('span', { className: 'dsm-label' }, t('subagents.field.description')),
@@ -12955,40 +14107,41 @@ function enabledMemoryCount(rules) {
                     // ── 运行方式：这份人设"什么时候跑、跑在哪些会话里" ──
                     React.createElement('div', { className: 'dsm-adv-group' },
                       React.createElement('div', { className: 'dsm-adv-group-head' }, t('subagents.adv.group.runtime')),
-                      // 目录注入深度：人设目录注入到哪些会话（默认 1 = 只在顶层）。用下拉而不是数字
-                      // 输入：只有 1/2/3 三个有意义的档，手写数字写错要到注入时才暴露。
+                      // 目录注入与启动追问并排一行（用户 2026-10-16）：两项都是这一组的一次性
+                      // 选择，各占一行会把「运行方式」拉成三条长行；控件统一用分段按钮（与
+                      // 「创建位置」「提示词类型」同款）—— 档数就 4 个 / 2 个，下拉要点开才看得到全部。
                       //
+                      // 目录注入深度：人设目录注入到哪些会话（默认 1 = 只在顶层）。
                       // ⚠️ 它**不是**递归上限。2026-09-17 用户实测后改名（原名 maxDepth /「委派预算」）：
                       // 官方 `dsh-tool-subagent` 默认 `maxDepth: 3`，子代理本来就能继续嵌套，本插件
                       // 也不再向官方传 maxDepth。这个字段只决定常驻目录出现在哪些深度的会话里。
-                      React.createElement('label', { className: 'dsm-field dsm-adv-half' },
-                        React.createElement('span', { className: 'dsm-label' }, t('subagents.field.catalogDepth')),
-                        React.createElement(SourceSelect, {
-                          options: [1, 2, 3, CATALOG_DEPTH_UNLIMITED].map(function (n) {
-                            // 选项文字不带序号：前面再加一个「2 ·」是同一件事说两遍（用户 2026-09-17
-                            // 指出）。下拉的 value 仍是数字，存的还是 catalogDepth 本身。
-                            return { value: String(n), label: catalogDepthLabel(n) }
-                          }),
-                          value: String(typeof modal.form.catalogDepth === 'number' ? modal.form.catalogDepth : 1),
-                          disabled: busy,
-                          onChange: function (v) { setForm({ catalogDepth: Number(v) }) },
-                        })),
-                      // 允许追问（frontmatter `continuable: true`）：这条通道的**产出是异步的** ——
-                      // 委派只回执一个 agent id，子代理在后台跑、完成后自己把结果发回来，
-                      // 之后可以用宿主自带的 `send_message` 追问、`interrupt_agent` 中止。
-                      // 默认关：它占用宿主"可继续子代理"的名额（`maxActiveSubagents`，默认 8），
-                      // 且要求宿主加载了持久化与 session query 两个服务。
-                      // 机制与代价的完整说明记在 CHANGELOG / README，不进表单（0.19.0 重排）。
-                      // 切片五：开关行换 SettingsRow + Switch（REDESIGN §5.2），原生勾选框退场。
-                      React.createElement(SettingsRow, {
-                        name: t('subagents.field.continuable'),
-                        desc: t('subagents.field.continuable.short'),
-                        control: React.createElement(Switch, {
-                          on: modal.form.continuable === true, disabled: busy,
-                          label: t('subagents.field.continuable'),
-                          onClick: function () { setForm({ continuable: !(modal.form.continuable === true) }) },
-                        }),
-                      })),
+                      React.createElement('div', { className: 'dsm-field-row' },
+                        React.createElement('div', { className: 'dsm-field' },
+                          React.createElement('span', { className: 'dsm-label' }, t('subagents.field.catalogDepth')),
+                          React.createElement('div', { className: 'dsm-form-seg', role: 'group', 'aria-label': t('subagents.field.catalogDepth') },
+                            [1, 2, 3, CATALOG_DEPTH_UNLIMITED].map(function (n) {
+                              return React.createElement('button', {
+                                key: n, type: 'button',
+                                'aria-pressed': String(typeof modal.form.catalogDepth === 'number' ? modal.form.catalogDepth : 1) === String(n) ? 'true' : 'false',
+                                onClick: function () { setForm({ catalogDepth: n }) },
+                              }, catalogDepthLabel(n))
+                            }))),
+                        // 启动追问（frontmatter `continuable: true`）：这条通道的**产出是异步的** ——
+                        // 委派只回执一个 agent id，子代理在后台跑、完成后自己把结果发回来，
+                        // 之后可以用宿主自带的 `send_message` 追问、`interrupt_agent` 中止。
+                        // 默认禁止：它占用宿主"可继续子代理"的名额（`maxActiveSubagents`，默认 8），
+                        // 且要求宿主加载了持久化与 session query 两个服务。
+                        // 机制与代价的完整说明记在 CHANGELOG / README，不进表单（0.19.0 重排）。
+                        React.createElement('div', { className: 'dsm-field' },
+                          React.createElement('span', { className: 'dsm-label' }, t('subagents.field.continuable')),
+                          React.createElement('div', { className: 'dsm-form-seg', role: 'group', 'aria-label': t('subagents.field.continuable') },
+                            [{ key: 'on', value: true }, { key: 'off', value: false }].map(function (choice) {
+                              return React.createElement('button', {
+                                key: choice.key, type: 'button',
+                                'aria-pressed': (modal.form.continuable === true) === choice.value ? 'true' : 'false',
+                                onClick: function () { setForm({ continuable: choice.value }) },
+                              }, t('subagents.field.continuable.' + choice.key))
+                            }))))),
                     // ── 工具限制：按 Agent 预设一行一个模式（默认全折叠、全部未启动，白/黑互斥）。
                     // 旧格式的全局名单（老文件 / 别处导入）在这里只读呈现，点「转换」才搬进某个模式。
                     React.createElement('div', { className: 'dsm-adv-group' },
@@ -13011,7 +14164,7 @@ function enabledMemoryCount(rules) {
               React.createElement('p', { className: 'dsm-help' }, t('subagents.delete.desc', { name: modal.name })),
               React.createElement('div', { className: 'dsm-modal-actions' },
                 React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-danger', disabled: busy, onClick: function () { submitDelete(modal.name) } }, t('memory.btn.delete.confirm')))) : null,
-            modal && modal.type === 'import' ? React.createElement(ImportModal, { key: 'simp', t: t, title: t('subagents.import.title'), busy: busy, requirement: t('upload.req.mdzip'), requirementTitle: [t('upload.requirement.persona.1'), t('upload.requirement.persona.2'), t('upload.requirement.persona.3')].join('\n'), onClose: function () { setModal(null) }, onSubmit: submitImport }) : null,
+            modal && modal.type === 'import' ? React.createElement(ImportModal, { key: 'simp', t: t, title: t('subagents.import.title'), busy: busy, hint: t('upload.drop.mzip'), requirement: t('upload.req.mdzip'), requirementTitle: [t('upload.requirement.persona.1'), t('upload.requirement.persona.2'), t('upload.requirement.persona.3')].join('\n'), onClose: function () { setModal(null) }, onSubmit: submitImport }) : null,
             modal && modal.type === 'export' ? React.createElement(ExportModal, {
               key: 'export', t: t, title: t('export.subagents'),
               items: data.subagents.map(function (p) { return { key: p.name, name: p.name, desc: p.description || '' } }),
@@ -13032,6 +14185,15 @@ function enabledMemoryCount(rules) {
               domain: 'agents',
               onClose: function () { setTrash(false) },
               onReload: function () { refresh(true) },
+            }) : null,
+            // 「已存在同名人设」小窗：叠在编辑器之上（`Modal` 自带 gateModalDepth 计数）。
+            // 取消 → 回到编辑器改名字，简介与正文一个字都不动。
+            dupAsk ? React.createElement(DupNameDialog, {
+              key: 'dup-name', t: t, kind: t('dup.kind.subagent'),
+              name: dupAsk.name, finalName: dupAsk.finalName, action: 'create',
+              busy: busy,
+              onCancel: function () { setDupAsk(null) },
+              onConfirm: function () { setDupAsk(null); saveEditor(dupAsk.finalName) },
             }) : null)
         }
 
@@ -13106,6 +14268,8 @@ function enabledMemoryCount(rules) {
             warnings: [],
           })
           var data = state[0], setData = state[1]
+          // 切走这一页 → 记忆编辑弹窗关窗时那份暂存作废（见 42-shared-ui.js 的 useFormDraftScope）。
+          useFormDraftScope('mem:')
           var qs = React.useState('')
           // 场景锁定（v0.8）：任一场景锁定 = 五个域整体冻结；本页全部写控件禁用。
           var anyLocked = data.anyLocked === true
@@ -13130,7 +14294,7 @@ function enabledMemoryCount(rules) {
           var editor = es[0], setEditor = es[1]
           var ups = useUndoState()
           var undo = ups[0], setUndo = ups[1], dismissUndo = ups[2]
-          var imps = React.useState('')
+          var imps = React.useState('global')
           var importScene = imps[0], setImportScene = imps[1]
           // 新建场景弹窗与场景建/删已移至「场景」页（ScenesPage）。
           // 记忆回收站：true = 打开本页那一个回收站（42-shared-ui.js 的 TrashModal）。
@@ -13140,6 +14304,10 @@ function enabledMemoryCount(rules) {
           // 那个是页面级回执（会自动消失），导出结果只该出现在弹窗里。
           var exs = React.useState(null)
           var exportState = exs[0], setExportState = exs[1]
+          // 「已存在同名记忆」确认弹窗的状态（用户 2026-10-14）：`{ name, finalName }` 或 null。
+          // 撞名不再静默退号，先问一句；确认后才按 `finalName` 提交（见 submitCreate）。
+          var dqs = React.useState(null)
+          var dupAsk = dqs[0], setDupAsk = dqs[1]
           // bundle 附件的隐藏文件选择器；上限与服务端 MAX_ATTACH_ENTRY_BYTES 对齐。
           var attachRef = React.useRef(null)
           var ATTACH_MAX_MB = 8
@@ -13211,22 +14379,41 @@ function enabledMemoryCount(rules) {
 
           // ── 记忆 CRUD ──
           function openCreate(sceneName) {
-            setEditor({ mode: 'create', id: '', group: sceneName || '', name: '', description: '', body: '', form: 'flat', path: '', error: null, files: [], attachments: [] })
+            /**
+             * 默认落点 = 保留场景「全局」（`GLOBAL_SCENE`，与 48-slash.js 那份同名常量同值，
+             * 服务端出处 `src/memories/constants.ts`）。
+             *
+             * 这里必须把"空"落成一个**具体名字**，不能留着 `''`：
+             *   · 界面上 `''` 会被 `SourceSelect` 兜到第一项，看着是「全局」，但那是巧合；
+             *   · `submitCreate` 的本地查重是按 `r.group` **精确比对**的，而全局桶里那些记忆
+             *     的 `group` 是 `'global'` 而不是 `''` —— 留着空值就查不到，撞名要等到服务端
+             *     才被拒（`error.rules.exists`），用户拿到的是报错而不是那颗确认弹窗。
+             * 宿主侧两种写法等价（`rules-create` 自己把空 group 映射到 `global`），所以这里
+             * 只是把它提前落定，不改变任何落盘结果。
+             */
+            setEditor(takeFormDraft('mem:create') || { mode: 'create', id: '', group: sceneName || GLOBAL_SCENE, name: '', description: '', body: '', form: 'flat', path: '', error: null, files: [], attachments: [] })
             setModal({ type: 'editor' })
           }
           function openEditor(rule, focusAttach) {
             if (busy) return
             setBusy(true); setResult(null)
+            var draftKey = 'mem:edit:' + rule.id
             apiCall('rules-read', { id: rule.id }).then(function (res) {
               setBusy(false)
               if (res && res.ok && res.rule) {
                 var rd = res.rule
-                setEditor({ mode: 'edit', id: rd.id, group: rd.group, name: rd.name, description: rd.description || '', body: rd.body || '', form: rd.form === 'bundle' ? 'bundle' : 'flat', path: rd.path || '', error: null, files: [], attachments: rd.attachments || [], focusAttach: focusAttach === true })
+                // 30 秒内重开同一条：把刚才关掉的那份填回来（磁盘那份的内容已经读出来了，
+                // 但用户改过的字段以草稿为准，未改的字段两种路径读到的是一样的）。
+                var draft = takeFormDraft(draftKey)
+                // focusAttach 是"打开就替你把文件框点开"的一次性指令，重放它会凭空弹一次文件选择框。
+                if (draft) draft = Object.assign({}, draft, { focusAttach: false, error: null })
+                setEditor(draft || { mode: 'edit', id: rd.id, group: rd.group, name: rd.name, description: rd.description || '', body: rd.body || '', form: rd.form === 'bundle' ? 'bundle' : 'flat', path: rd.path || '', error: null, files: [], attachments: rd.attachments || [], focusAttach: focusAttach === true })
                 setModal({ type: 'editor' })
               } else setResult({ ok: false, text: translateError(t, res) })
             }).catch(function (e) { setBusy(false); setResult({ ok: false, text: errMsg(e) }) })
           }
-          function closeEditor() { setModal(null) }
+          // 关掉 ≠ 丢掉：只有这一条路存草稿（提交成功走 finishEditor，就地 setModal(null)）。
+          function closeEditor() { if (editor) stashFormDraft(editor.mode === 'edit' ? 'mem:edit:' + editor.id : 'mem:create', editor); setModal(null) }
           // ── 导入记忆（.md / .zip；场景留空 = 保留场景「全局」）──
           function submitImport(files) {
             if (!files || !files.length) return
@@ -13401,10 +14588,32 @@ function enabledMemoryCount(rules) {
               refresh(true)
             })
           }
+          /**
+           * 记忆页「新增」的提交（用户 2026-10-14 第二轮）：**先问一句，再退号**。
+           *
+           * 服务端 `rules-create` 撞名是直接拒绝的（`error.rules.exists`），原先界面把这句话
+           * 原样摆出来、让用户自己回去改名。现在改成：本地先查一遍**同一组**里的记忆（记忆 id
+           * 是 `<场景>/<名>`，所以判据只看同组，跨场景同名是合法的、不该拦），撞上了就弹一个
+           * 小窗说明"已有同名"，确认后用 `测（1）` 建 —— 名字在这一刻定死，落盘的就是界面上
+           * 写着的那个，不再有"看着叫甲、落盘叫乙"。
+           *
+           * 本地查重不替代服务端那道闸：期间别人（或模型工具）建了一条同名，提交仍会被拒，
+           * 那时照旧如实报错 —— 这里只是把常见情形做顺手，不是替服务端下判断。
+           */
           function submitCreate() {
+            var typed = String(editor.name || '').trim()
+            var group = String(editor.group || '').trim()
+            var taken = {}
+            ;(data.rules || []).forEach(function (r) { if (String(r.group || '') === group) taken[String(r.name)] = true })
+            var finalName = uniqueName(typed, taken)
+            if (finalName !== typed) { setDupAsk({ name: typed, finalName: finalName }); return }
+            createMemory(typed)
+          }
+          /** 真正落盘那一步（名字已定）。`name` 来自 `submitCreate` 或确认弹窗。 */
+          function createMemory(name) {
             var payload = {
               group: String(editor.group || '').trim(),
-              name: String(editor.name || '').trim(),
+              name: name,
               description: String(editor.description || '').trim(),
               body: editor.body || '',
               form: editor.form || 'flat',
@@ -13418,8 +14627,8 @@ function enabledMemoryCount(rules) {
                 return null
               }
               var id = (res.rule && res.rule.id) || (payload.group ? payload.group + '/' + payload.name : payload.name)
-              var name = (res.rule && (res.rule.id || res.rule.name)) || payload.name
-              return finishEditor(id, name, pending, 'done.created', 'memory.result.createdAttached')
+              var doneName = (res.rule && (res.rule.id || res.rule.name)) || payload.name
+              return finishEditor(id, doneName, pending, 'done.created', 'memory.result.createdAttached')
             }).catch(function (e) { setBusy(false); setEditor(Object.assign({}, editor, { error: errMsg(e) })) })
           }
           function submitUpdate() {
@@ -13540,9 +14749,12 @@ function enabledMemoryCount(rules) {
             var statusKey = shadowed ? 'status.shadowed' : !enabled ? 'memory.status.off' : sceneActive === false ? 'memory.status.sceneOff' : 'status.enabled'
             // 灰=不进上下文但不是故障（被遮蔽 / 本条停用 / 场景没启用），绿=这条真的会注入。
             var statusTone = shadowed || !enabled || sceneActive === false ? 'muted' : 'ok'
-            // 「需要处理」的两种（被覆盖 / 场景未启用）走行 1 的 tag，启停复述走行首状态点
-            //（REDESIGN §3.4；切片三移交的「状态点前移」）。
-            var attention = statusKey !== 'status.enabled' && statusKey !== 'memory.status.off'
+            // 「需要处理」只剩「被覆盖」一种：它看着是开的、实际不注入，必须在行上说出来。
+            // 「场景未启用」不再占行内标签（用户 2026-10-15 两条一起提的）：分组卡头已经写着
+            // 「未启用」，逐行复述是噪音；更要紧的是它原先会把**行首那颗状态点整颗吃掉** ——
+            // 在同一场景里启用一条记忆，点当场消失，看着像这一行坏了。现在点照常画
+            //（灰 = 不进上下文），原因留在 title 上。
+            var attention = shadowed
             // 行 2 元信息（切片三移交的「tags 列清理」）：描述 / 多级分组路径 / 附件 / 派生。
             // 附件计数保持**可点**（进编辑弹窗并滚到附件区），其余降为弱色文字。
             //
@@ -13674,7 +14886,7 @@ function enabledMemoryCount(rules) {
               ],
               actions: [
                 React.createElement('button', { key: 'new', type: 'button', className: 'dsm-btn', disabled: busy || anyLocked, onClick: function () { openCreate(sceneFilter || '') } }, t('memory.btn.new')),
-                React.createElement('button', { key: 'import', type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy || anyLocked, onClick: function () { setResult(null); setImportScene(''); setModal({ type: 'import' }) } }, t('memory.import')),
+                React.createElement('button', { key: 'import', type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy || anyLocked, onClick: function () { setResult(null); setImportScene('global'); setModal({ type: 'import' }) } }, t('memory.import')),
                 React.createElement('button', { key: 'export', type: 'button', className: 'dsm-btn dsm-btn-secondary', disabled: busy || !exportableRules.length, onClick: function () { setResult(null); setExportState({ busy: false, result: null }) } }, t('export.memories')),
                 // 「全选」从工具条搬到页头、紧挨回收站左侧（用户 2026-10-12：「全选移到回收站
                 // 旁边」）。它管的是列表，但和「回收站」一样是**整页范围**的动作，跟其余页头键
@@ -13720,21 +14932,22 @@ function enabledMemoryCount(rules) {
               React.createElement('div', { className: 'dsm-modal-actions' },
                 React.createElement('button', { type: 'button', className: 'dsm-btn dsm-btn-danger', disabled: busy, onClick: function () { submitDelete(modal.rule) } }, t('memory.btn.delete.confirm')))) : null,
             modal && modal.type === 'import' ? React.createElement(ImportModal, {
-              key: 'mimp', t: t, title: t('memory.import.title'), busy: busy,
+              key: 'mimp', t: t, title: t('memory.import.title'), busy: busy, hint: t('upload.drop.mzip'),
               requirement: t('upload.req.mdzip'),
               requirementTitle: [t('upload.requirement.memory.1'), t('upload.requirement.memory.2'), t('upload.requirement.memory.3'), t('upload.requirement.memory.4')].join('\n'),
-              // 「导入到场景」与记忆编辑器的「场景」用**同一个**控件（用户 2026-10-12：
-              // 「应该是选择场景的样子，现在只能手动填写」）。SceneCombo 既能从已有场景里挑，
-              // 也保留手输新场景名的能力（宿主 rules-create 用 mkdir(recursive) 落盘，
-              // 自定义场景不必先建目录）—— 换过去是"多一个下拉"，不是"少一种填法"。
-              extra: React.createElement('label', { className: 'dsm-field' },
+              // 「导入到场景」**只能选**（用户 2026-10-15：手输入口去掉；此前用的是可手输的
+              // SceneCombo）。代价说清楚：`rules-import` 本来会为引用的目录名补出场景记录
+              // （回传 `scenes`，界面用 `memory.import.scenesCreated` 如实告知），去掉手输之后
+              // 要导入到一个全新场景，得先去「场景」页把它建出来。
+              // 默认「全局」：`sceneLabel` 已把保留场景 global 映成「全局」，选项里排最前 ——
+              // 也就是原来"留空 = 全局"那条语义，只是现在看得见、点得着。选项剔掉 `''`
+              // （「未归属场景」那个游离桶）：那不是"新记忆该去的地方"（与编辑器同一口径）。
+              extra: React.createElement('div', { className: 'dsm-field' },
                 React.createElement('span', { className: 'dsm-label' }, t('memory.import.scene')),
-                React.createElement(SceneCombo, {
-                  options: sceneChoices,
+                React.createElement(SourceSelect, {
+                  options: sceneChoices.filter(function (o) { return o.value !== '' }),
                   value: importScene,
-                  placeholder: t('memory.scene.global.hint'),
-                  browseLabel: t('memory.scene.browse'),
-                  label: t('memory.import.scene'),
+                  ariaLabel: t('memory.import.scene'),
                   disabled: busy,
                   onChange: setImportScene,
                 })),
@@ -13752,21 +14965,30 @@ function enabledMemoryCount(rules) {
               React.createElement('div', { className: 'dsm-form' },
                 React.createElement('label', { className: 'dsm-field' },
                   React.createElement('span', { className: 'dsm-label' }, t('memory.field.group')),
+                  /**
+                   * 场景**只能选**，不能手输（用户 2026-10-14）。
+                   *
+                   * 除了"手输容易打错"，更硬的理由在宿主那一侧：`rules-create` 对非全局场景
+                   * **要求它已经存在**（`error.rules.sceneNotFound`：「请先在「场景」页创建该场景」），
+                   * 所以手输一个不存在的场景名除了换来一条报错之外没有别的结果。要新场景就去
+                   * 场景页建 —— 那条路径本来就在，而且它还会把提示词绑定、启用集合一起配好。
+                   *
+                   * 「全局」是**选项里的一项**，不是"留空"：宿主把空 group 映射到保留场景
+                   * `global`（`GLOBAL_SCENE`，恒常注入的真实场景）。所以默认值直接就是它，
+                   * 底下那句「留空 = 全局」也一并删掉 —— 字段自己写着「全局」，那句话不再说明什么。
+                   *
+                   * 选项里剔掉 `''`（「未归属场景」那个游离桶）：那是给历史数据做清理用的分组，
+                   * 不是"新记忆该去的地方"（那里的记忆不会被注入上下文）。
+                   */
                   editor.mode === 'create'
-                    ? React.createElement(SceneCombo, {
-                      options: sceneChoices,
+                    ? React.createElement(SourceSelect, {
+                      options: sceneChoices.filter(function (o) { return o.value !== '' }),
                       value: editor.group || '',
-                      placeholder: t('memory.field.group.placeholder'),
-                      browseLabel: t('memory.scene.browse'),
-                      label: t('memory.field.group'),
+                      ariaLabel: t('memory.field.group'),
                       disabled: busy,
-                      invalid: editorGroupInvalid,
                       onChange: function (v) { setEditor(Object.assign({}, editor, { group: v })) },
                     })
                     : React.createElement('input', { className: 'dsm-control', value: editor.group || '', disabled: true, onChange: function () {} }),
-                editor.mode === 'create'
-                  ? React.createElement('p', { className: 'dsm-help' }, t('memory.field.group.hint'))
-                  : null,
                 editorGroupInvalid ? React.createElement('p', { className: 'dsm-rule-hint' }, t('error.rules.invalidGroup')) : null),
                 React.createElement('label', { className: 'dsm-field' },
                   React.createElement('span', { className: 'dsm-label' }, t('memory.field.name')),
@@ -13811,8 +15033,7 @@ function enabledMemoryCount(rules) {
                               React.createElement('span', { className: 'dsm-file-meta' }, fmtBytes(f.size) + ' · ' + t('memory.attach.pending')),
                               React.createElement('button', { type: 'button', className: 'dsm-file-remove', disabled: busy, 'aria-label': t('memory.attach.remove') + ' ' + f.name, onClick: function () { dropPending(i) } }, '×'))
                           }))
-                        : React.createElement('p', { className: 'dsm-help' }, t('memory.attach.empty')),
-                      React.createElement('span', { className: 'dsm-help' }, t('memory.attach.hint')))
+                        : null)
                     : null),
                 editor.error ? React.createElement('div', { className: 'dsm-feedback dsm-error', role: 'alert' }, String(editor.error)) : null),
               // 锁定态把「为什么保存键是灰的」写在弹窗里：编辑页能打开（看内容是只读的），
@@ -13829,6 +15050,15 @@ function enabledMemoryCount(rules) {
               domain: 'memories',
               onClose: function () { setModal(null) },
               onReload: function () { refresh(true) },
+            }) : null,
+            // 「已存在同名记忆」小窗叠在编辑弹窗之上（`Modal` 自带 gateModalDepth 计数，
+            // 叠弹窗是既有形态）。取消 → 回到编辑弹窗改名字，编辑器里的内容一个字都不动。
+            dupAsk ? React.createElement(DupNameDialog, {
+              key: 'dup-name', t: t, kind: t('dup.kind.memory'),
+              name: dupAsk.name, finalName: dupAsk.finalName, action: 'create',
+              busy: busy,
+              onCancel: function () { setDupAsk(null) },
+              onConfirm: function () { setDupAsk(null); createMemory(dupAsk.finalName) },
             }) : null)
         }
     // ── 斜杠命令「工具」段（对话输入框里直接管六个域）────────────────────────────