dsh-vscode-mode 0.1.7 → 0.1.11

package/lib/client.js

@@ -29,13 +29,13 @@ window.__ModuleLoader__.load({
 		let react = require("react");
 		react = __toESM(react, 1);
 		//#region \0dsh-css:/home/runner/work/DSH_VsCodeMode/DSH_VsCodeMode/src/client/styles/editor.css.mjs
-		const css = "/* dsh-vscode-mode 编辑区样式（原 ensureEdrvStyles 字符串，落盘为真 .css，由 tsdown CSS-inline 注入） */\n/* 浅色主题（对齐参考图：#f8f8f8 近白底 + 薄荷绿药丸 + 青绿文字 + 三文鱼 undo + 浅灰边框）：\n   在 [data-edrv-view] 作用域内重定义 --dsw-alias-*，级联命中组件内联样式与 CSS。 */\n[data-edrv-view] { --edrv-tab-h: 34px; --dsw-alias-bg-base: #f8f8f8; --dsw-alias-bg-layer-1: #ffffff; --dsw-alias-bg-layer-2: #f0f4f4; --dsw-alias-bg-overlay: #ffffff; --dsw-alias-label-primary: #1f2933; --dsw-alias-label-secondary: #52606d; --dsw-alias-label-tertiary: #9aa5b1; --dsw-alias-border-l1: #e0e6e8; --dsw-alias-border-l2: #cbd2d9; --dsw-alias-brand-primary: #0f9d58; --dsw-alias-state-success-primary: #0f9d58; --dsw-alias-state-error-primary: #d9534f; --dsw-alias-state-warn-primary: #d97706; --dsw-alias-interactive-bg-hover: rgba(15,157,88,.08); }\n\n[data-edrv-view] .edrv-tabs { display: flex; align-items: center; gap: 2px; padding: 2px 8px 0; background: var(--dsw-alias-bg-layer-1, transparent); overflow-x: auto; scrollbar-width: thin; flex-shrink: 0; }\n[data-edrv-view] .edrv-tab { display: inline-flex; align-items: center; gap: 6px; height: 28px; padding: 0 8px 0 12px; border: none; border-radius: 6px 6px 0 0; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 12px; cursor: pointer; white-space: nowrap; flex-shrink: 0; }\n[data-edrv-view] .edrv-tab:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-tab.edrv-tab-active { background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); box-shadow: inset 0 -2px 0 var(--dsw-alias-brand-primary, #4f8cff); }\n[data-edrv-view] .edrv-tab .edrv-tab-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--dsw-alias-brand-primary, #4f8cff); flex-shrink: 0; }\n[data-edrv-view] .edrv-tab .edrv-tab-x { display: inline-flex; align-items: center; justify-content: center; width: 16px; height: 16px; border-radius: 4px; color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; }\n[data-edrv-view] .edrv-tab .edrv-tab-x:hover { background: rgba(255,255,255,.12); color: var(--dsw-alias-label-primary, #eee); }\n[data-edrv-view] .edrv-tab-add { display: inline-flex; align-items: center; justify-content: center; width: 24px; height: 24px; margin-left: 2px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 14px; cursor: pointer; flex-shrink: 0; }\n[data-edrv-view] .edrv-tab-add:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-pathbar { display: flex; align-items: center; gap: 8px; height: 26px; padding: 0 10px; background: var(--dsw-alias-bg-layer-1, #ffffff); border-bottom: 1px solid var(--dsw-alias-border-l1, #e0e6e8); font-size: 12px; flex-shrink: 0; overflow: hidden; }\n[data-edrv-view] .edrv-pathbar .edrv-pb-name { font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); white-space: nowrap; }\n[data-edrv-view] .edrv-pathbar .edrv-pb-full { flex: 1; min-width: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; direction: rtl; text-align: left; }\n[data-edrv-view] .edrv-path-input { flex: 1; min-width: 140px; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }\n[data-edrv-view] .edrv-search-wrap { position: relative; flex-shrink: 0; display: flex; align-items: center; padding: 2px 8px 2px 4px; }\n[data-edrv-view] .edrv-search { width: 190px; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }\n[data-edrv-view] .edrv-search:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }\n[data-edrv-view] .edrv-search-pop { position: absolute; top: calc(100% + 4px); right: 8px; width: min(460px, calc(100vw - 24px)); max-height: 300px; overflow: auto; background: var(--dsw-alias-bg-overlay, #1c1c1c); border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 10px; box-shadow: 0 6px 20px rgba(0,0,0,.4); z-index: 60; padding: 4px; }\n[data-edrv-view] .edrv-search-item { display: flex; flex-direction: column; gap: 1px; padding: 5px 8px; border-radius: 6px; cursor: pointer; }\n[data-edrv-view] .edrv-search-item:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.07)); }\n[data-edrv-view] .edrv-search-item .n { color: var(--dsw-alias-label-primary, #eee); font-size: 12px; word-break: break-all; }\n[data-edrv-view] .edrv-search-item .d { color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }\n[data-edrv-view] .edrv-search-empty { padding: 8px; font-size: 12px; color: var(--dsw-alias-label-tertiary, #888); }\n[data-edrv-view] .edrv-btn-mini { font-size: 11px; padding: 2px 9px; border: none; border-radius: 999px; cursor: pointer; color: #fff; font-weight: 600; white-space: nowrap; }\n[data-edrv-view] .edrv-btn-keep { background: var(--dsw-alias-state-success-primary, #2e9e44); }\n[data-edrv-view] .edrv-btn-undo { background: var(--dsw-alias-state-warn-primary, #d97706); }\n[data-edrv-view] .edrv-btn-mini:disabled { opacity: .45; cursor: default; }\n[data-edrv-view] .edrv-statusbar { display: flex; align-items: center; gap: 10px; padding: 3px 10px; border-top: 1px solid var(--dsw-alias-border-l1, #333); background: var(--dsw-alias-bg-layer-1, transparent); font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); flex-shrink: 0; white-space: nowrap; overflow: hidden; }\n[data-edrv-view] .edrv-statusbar .edrv-sp-path { flex: 1; overflow: hidden; text-overflow: ellipsis; }\n[data-edrv-view] .edrv-diffchip { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-state-warn-primary, #b7791f); cursor: pointer; white-space: nowrap; flex-shrink: 0; }\n[data-edrv-view] .edrv-chip-btn { font-size: 12px; padding: 2px 6px; border: none; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; border-radius: 4px; flex-shrink: 0; }\n[data-edrv-view] .edrv-chip-btn:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-mn-add-line { background: rgba(15,157,88,.10); }\n[data-edrv-view] .edrv-mn-gutter-add { color: #0f9d58 !important; font-weight: 700; display: flex !important; align-items: center; justify-content: center; }\n[data-edrv-view] .edrv-mn-gutter-add::before { content: \"+\"; }\n[data-edrv-view] .edrv-del-zone { background: #fdeaea; border-top: 1px solid rgba(217,83,79,.35); border-bottom: 1px solid rgba(217,83,79,.35); box-shadow: inset 0 0 0 1px rgba(217,83,79,.12); }\n[data-edrv-view] .edrv-del-row { white-space: pre; font-family: var(--ds-font-family-code, ui-monospace, monospace); font-size: 12.5px; line-height: 20px; color: #c0392b; }\n[data-edrv-view] .edrv-del-text { display: inline-block; white-space: pre; }\n[data-edrv-view] .edrv-minus-overlay { position: absolute; left: 0; top: 0; pointer-events: none; z-index: 6; }\n[data-edrv-view] .edrv-minus-item { position: absolute; width: 16px; text-align: center; color: #d9534f; font-weight: 700; font-size: 12.5px; line-height: 20px; }\n[data-edrv-view] .edrv-monaco-host { flex: 1; min-height: 0; position: relative; }\n[data-edrv-view] .edrv-monaco-host > div { position: absolute; inset: 0; }\n[data-edrv-view] .edrv-empty { display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 10px; height: 100%; color: var(--dsw-alias-label-tertiary, #777); font-size: 13px; }\n[data-edrv-view] .edrv-diffbar { position: absolute; left: 0; right: 0; bottom: 10px; margin: 0 auto; z-index: 25; width: fit-content; max-width: calc(100% - 20px); border-radius: 10px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 4px 16px rgba(31,41,51,.12); overflow: visible; display: flex; flex-direction: column; }\n[data-edrv-view] .edrv-diffbar-row { display: flex; align-items: center; gap: 6px; height: 34px; padding: 0 8px; flex-wrap: nowrap; }\n[data-edrv-view] .edrv-diffbar-count { font-size: 12px; font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); min-width: 42px; text-align: center; white-space: nowrap; cursor: pointer; }\n[data-edrv-view] .edrv-diffbar-count.edrv-count-file { min-width: 64px; cursor: default; }\n[data-edrv-view] .edrv-diffbar-file { flex: 1; min-width: 0; font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }\n[data-edrv-view] .edrv-pill { font-size: 11px; padding: 3px 10px; border: none; border-radius: 999px; cursor: pointer; white-space: nowrap; font-weight: 600; }\n[data-edrv-view] .edrv-pill-keep { background: #e8f8e8; color: #0f7a45; border: 1px solid rgba(15,157,88,.4); }\n[data-edrv-view] .edrv-pill-undo { background: #fdeaea; color: #c0392b; border: 1px solid rgba(217,83,79,.4); }\n[data-edrv-view] .edrv-pill-ghost { background: #ffffff; color: var(--dsw-alias-label-secondary, #52606d); border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-pill:disabled { opacity: .45; cursor: default; }\n[data-edrv-view] .edrv-diffbar-menu { position: absolute; right: 8px; bottom: calc(100% + 6px); z-index: 45; min-width: 160px; border-radius: 10px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 6px 20px rgba(31,41,51,.16); padding: 4px; display: flex; flex-direction: column; gap: 2px; }\n[data-edrv-view] .edrv-diffmenu-item { display: flex; align-items: center; gap: 8px; font-size: 12px; padding: 6px 10px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-primary, #1f2933); cursor: pointer; text-align: left; }\n[data-edrv-view] .edrv-diffmenu-item:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }\n[data-edrv-view] .edrv-diffmenu-item.danger { color: var(--dsw-alias-state-error-primary, #d9534f); }\n[data-edrv-view] .edrv-diffmenu-sep { height: 1px; margin: 2px 4px; background: var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-diffbar-body { max-height: 130px; max-width: min(560px, calc(100vw - 40px)); overflow: auto; padding: 4px 8px 8px; display: flex; flex-direction: column; gap: 4px; border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-diffrow { display: flex; align-items: center; gap: 8px; padding: 3px 6px; border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); border-radius: 6px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); cursor: pointer; flex-wrap: wrap; }\n[data-edrv-view] .edrv-diffrow:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }\n[data-edrv-view] .edrv-diffrow-l { font-size: 11px; color: var(--dsw-alias-label-primary, #1f2933); min-width: 74px; font-family: var(--ds-font-family-code, ui-monospace, monospace); }\n[data-edrv-view] .edrv-diffrow-o { font-size: 11px; color: var(--dsw-alias-state-error-primary, #d9534f); font-family: var(--ds-font-family-code, ui-monospace, monospace); }\n[data-edrv-view] .edrv-diffrow-n { font-size: 11px; color: var(--dsw-alias-state-success-primary, #0f9d58); font-family: var(--ds-font-family-code, ui-monospace, monospace); }\n[data-edrv-view] .edrv-diffrow-tag { font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); }\n[data-edrv-view] .edrv-diffrow-stale { border-color: rgba(217,119,6,.5); cursor: default; }\n[data-edrv-view] .edrv-diffbox-others { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; padding: 4px 2px 0; border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); margin-top: 2px; }\n[data-edrv-view] .edrv-diffrow-file { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); color: var(--dsw-alias-label-secondary, #52606d); cursor: pointer; white-space: nowrap; max-width: 200px; overflow: hidden; text-overflow: ellipsis; }\n[data-edrv-view] .edrv-diffrow-file:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); color: var(--dsw-alias-label-primary, #1f2933); }\n/* 编辑区 hover 差异块的 Keep/Undo 浮层 */\n[data-edrv-view] .edrv-hoveract { position: absolute; z-index: 30; display: flex; align-items: center; gap: 4px; padding: 2px 6px; border-radius: 8px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 4px 14px rgba(31,41,51,.14); }\n[data-edrv-view] .edrv-launch { position: absolute; left: 12px; right: 12px; bottom: 12px; z-index: 40; border-radius: 10px; background: var(--dsw-alias-bg-overlay, #1c1c1c); border: 1px solid var(--dsw-alias-border-l2, #555); box-shadow: 0 6px 24px rgba(0,0,0,.5); display: flex; flex-direction: column; max-height: 60%; overflow: hidden; }\n[data-edrv-view] .edrv-launch-head { display: flex; align-items: center; gap: 6px; padding: 6px 8px; border-bottom: 1px solid var(--dsw-alias-border-l1, #333); }\n[data-edrv-view] .edrv-launch-tab { font-size: 12px; padding: 3px 12px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; }\n[data-edrv-view] .edrv-launch-tab.on { background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-label-primary, #eee); font-weight: 600; }\n[data-edrv-view] .edrv-launch-body { flex: 1; min-height: 0; overflow: auto; padding: 6px 8px; display: flex; flex-direction: column; gap: 4px; }\n[data-edrv-view] .edrv-launch-row { display: flex; align-items: center; gap: 8px; padding: 3px 6px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 6px; cursor: pointer; flex-wrap: wrap; }\n[data-edrv-view] .edrv-launch-row:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-launch-path { flex: 1; min-width: 0; font-size: 12px; color: var(--dsw-alias-label-primary, #eee); word-break: break-all; }\n[data-edrv-view] .edrv-launch-cnt { font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); white-space: nowrap; }\n[data-edrv-view] .edrv-launch-arch { display: flex; flex-direction: column; gap: 6px; }\n[data-edrv-view] .monaco-editor, [data-edrv-view] .monaco-editor .margin, [data-edrv-view] .monaco-editor-background { background: transparent !important; }\n[data-edrv-view] .monaco-editor .scrollbar .slider { background: rgba(128,128,128,.3) !important; }\n";
-		const tagId = "dsh-vscode-mode/editor.css";
-		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
+		const css$1 = "/* dsh-vscode-mode 编辑区样式（原 ensureEdrvStyles 字符串，落盘为真 .css，由 tsdown CSS-inline 注入） */\n/* 浅色主题（对齐参考图：#f8f8f8 近白底 + 薄荷绿药丸 + 青绿文字 + 三文鱼 undo + 浅灰边框）：\n   在 [data-edrv-view] 作用域内重定义 --dsw-alias-*，级联命中组件内联样式与 CSS。 */\n[data-edrv-view] { --edrv-tab-h: 34px; --dsw-alias-bg-base: #f8f8f8; --dsw-alias-bg-layer-1: #ffffff; --dsw-alias-bg-layer-2: #f0f4f4; --dsw-alias-bg-overlay: #ffffff; --dsw-alias-label-primary: #1f2933; --dsw-alias-label-secondary: #52606d; --dsw-alias-label-tertiary: #9aa5b1; --dsw-alias-border-l1: #e0e6e8; --dsw-alias-border-l2: #cbd2d9; --dsw-alias-brand-primary: #0f9d58; --dsw-alias-state-success-primary: #0f9d58; --dsw-alias-state-error-primary: #d9534f; --dsw-alias-state-warn-primary: #d97706; --dsw-alias-interactive-bg-hover: rgba(15,157,88,.08); }\n\n[data-edrv-view] .edrv-tabs { display: flex; align-items: center; gap: 2px; padding: 2px 8px 0; background: var(--dsw-alias-bg-layer-1, transparent); overflow-x: auto; scrollbar-width: thin; flex-shrink: 0; }\n[data-edrv-view] .edrv-tab { display: inline-flex; align-items: center; gap: 6px; height: 28px; padding: 0 8px 0 12px; border: none; border-radius: 6px 6px 0 0; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 12px; cursor: pointer; white-space: nowrap; flex-shrink: 0; }\n[data-edrv-view] .edrv-tab:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-tab.edrv-tab-active { background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); box-shadow: inset 0 -2px 0 var(--dsw-alias-brand-primary, #4f8cff); }\n[data-edrv-view] .edrv-tab .edrv-tab-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--dsw-alias-brand-primary, #4f8cff); flex-shrink: 0; }\n[data-edrv-view] .edrv-tab .edrv-tab-x { display: inline-flex; align-items: center; justify-content: center; width: 16px; height: 16px; border-radius: 4px; color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; }\n[data-edrv-view] .edrv-tab .edrv-tab-x:hover { background: rgba(255,255,255,.12); color: var(--dsw-alias-label-primary, #eee); }\n[data-edrv-view] .edrv-tab-add { display: inline-flex; align-items: center; justify-content: center; width: 24px; height: 24px; margin-left: 2px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); font-size: 14px; cursor: pointer; flex-shrink: 0; }\n[data-edrv-view] .edrv-tab-add:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-pathbar { display: flex; align-items: center; gap: 8px; height: 26px; padding: 0 10px; background: var(--dsw-alias-bg-layer-1, #ffffff); border-bottom: 1px solid var(--dsw-alias-border-l1, #e0e6e8); font-size: 12px; flex-shrink: 0; overflow: hidden; }\n[data-edrv-view] .edrv-pathbar .edrv-pb-name { font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); white-space: nowrap; }\n[data-edrv-view] .edrv-pathbar .edrv-pb-full { flex: 1; min-width: 0; color: var(--dsw-alias-label-tertiary, #9aa5b1); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; direction: rtl; text-align: left; }\n[data-edrv-view] .edrv-path-input { flex: 1; min-width: 140px; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }\n[data-edrv-view] .edrv-search-wrap { position: relative; flex-shrink: 0; display: flex; align-items: center; padding: 2px 8px 2px 4px; }\n[data-edrv-view] .edrv-search { width: 190px; height: 24px; padding: 0 8px; border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 6px; background: var(--dsw-alias-bg-base, #111); color: var(--dsw-alias-label-primary, #eee); font-size: 12px; outline: none; }\n[data-edrv-view] .edrv-search:focus { border-color: var(--dsw-alias-brand-primary, #4f8cff); }\n[data-edrv-view] .edrv-search-pop { position: absolute; top: calc(100% + 4px); right: 8px; width: min(460px, calc(100vw - 24px)); max-height: 300px; overflow: auto; background: var(--dsw-alias-bg-overlay, #1c1c1c); border: 1px solid var(--dsw-alias-border-l2, #555); border-radius: 10px; box-shadow: 0 6px 20px rgba(0,0,0,.4); z-index: 60; padding: 4px; }\n[data-edrv-view] .edrv-search-item { display: flex; flex-direction: column; gap: 1px; padding: 5px 8px; border-radius: 6px; cursor: pointer; }\n[data-edrv-view] .edrv-search-item:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.07)); }\n[data-edrv-view] .edrv-search-item .n { color: var(--dsw-alias-label-primary, #eee); font-size: 12px; word-break: break-all; }\n[data-edrv-view] .edrv-search-item .d { color: var(--dsw-alias-label-tertiary, #888); font-size: 11px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }\n[data-edrv-view] .edrv-search-empty { padding: 8px; font-size: 12px; color: var(--dsw-alias-label-tertiary, #888); }\n[data-edrv-view] .edrv-btn-mini { font-size: 11px; padding: 2px 9px; border: none; border-radius: 999px; cursor: pointer; color: #fff; font-weight: 600; white-space: nowrap; }\n[data-edrv-view] .edrv-btn-keep { background: var(--dsw-alias-state-success-primary, #2e9e44); }\n[data-edrv-view] .edrv-btn-undo { background: var(--dsw-alias-state-warn-primary, #d97706); }\n[data-edrv-view] .edrv-btn-mini:disabled { opacity: .45; cursor: default; }\n[data-edrv-view] .edrv-statusbar { display: flex; align-items: center; gap: 10px; padding: 3px 10px; border-top: 1px solid var(--dsw-alias-border-l1, #333); background: var(--dsw-alias-bg-layer-1, transparent); font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); flex-shrink: 0; white-space: nowrap; overflow: hidden; }\n[data-edrv-view] .edrv-statusbar .edrv-sp-path { flex: 1; overflow: hidden; text-overflow: ellipsis; }\n[data-edrv-view] .edrv-diffchip { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-state-warn-primary, #b7791f); cursor: pointer; white-space: nowrap; flex-shrink: 0; }\n[data-edrv-view] .edrv-chip-btn { font-size: 12px; padding: 2px 6px; border: none; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; border-radius: 4px; flex-shrink: 0; }\n[data-edrv-view] .edrv-chip-btn:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-mn-add-line { background: rgba(15,157,88,.10); }\n[data-edrv-view] .edrv-mn-gutter-add { color: #0f9d58 !important; font-weight: 700; display: flex !important; align-items: center; justify-content: center; }\n[data-edrv-view] .edrv-mn-gutter-add::before { content: \"+\"; }\n[data-edrv-view] .edrv-del-zone { background: #fdeaea; border-top: 1px solid rgba(217,83,79,.35); border-bottom: 1px solid rgba(217,83,79,.35); box-shadow: inset 0 0 0 1px rgba(217,83,79,.12); }\n[data-edrv-view] .edrv-del-row { white-space: pre; font-family: var(--ds-font-family-code, ui-monospace, monospace); font-size: 12.5px; line-height: 20px; color: #c0392b; }\n[data-edrv-view] .edrv-del-text { display: inline-block; white-space: pre; }\n[data-edrv-view] .edrv-minus-overlay { position: absolute; left: 0; top: 0; width: 100%; height: 100%; max-width: 100%; overflow: visible; pointer-events: none; z-index: 6; }\n[data-edrv-view] .edrv-minus-item { position: absolute; box-sizing: border-box; max-width: 100%; overflow: hidden; }\n[data-edrv-view] .edrv-minus-item::before { content: ''; position: absolute; left: 4px; top: 50%; width: 8px; height: 2px; transform: translateY(-50%); border-radius: 2px; background: #d9534f; }\n[data-edrv-view] .edrv-monaco-host { flex: 1; min-height: 0; position: relative; }\n[data-edrv-view] .edrv-monaco-host > div { position: absolute; inset: 0; }\n[data-edrv-view] .edrv-empty { display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 10px; height: 100%; color: var(--dsw-alias-label-tertiary, #777); font-size: 13px; }\n[data-edrv-view] .edrv-diffbar { position: absolute; left: 0; right: 0; bottom: 10px; margin: 0 auto; z-index: 25; width: fit-content; max-width: calc(100% - 20px); border-radius: 10px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 4px 16px rgba(31,41,51,.12); overflow: visible; display: flex; flex-direction: column; }\n[data-edrv-view] .edrv-diffbar-row { display: flex; align-items: center; gap: 6px; height: 34px; padding: 0 8px; flex-wrap: nowrap; }\n[data-edrv-view] .edrv-diffbar-count { font-size: 12px; font-weight: 600; color: var(--dsw-alias-label-primary, #1f2933); min-width: 42px; text-align: center; white-space: nowrap; cursor: pointer; }\n[data-edrv-view] .edrv-diffbar-count.edrv-count-file { min-width: 64px; cursor: default; }\n[data-edrv-view] .edrv-diffbar-file { flex: 1; min-width: 0; font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }\n[data-edrv-view] .edrv-pill { font-size: 11px; padding: 3px 10px; border: none; border-radius: 999px; cursor: pointer; white-space: nowrap; font-weight: 600; }\n[data-edrv-view] .edrv-pill-keep { background: #e8f8e8; color: #0f7a45; border: 1px solid rgba(15,157,88,.4); }\n[data-edrv-view] .edrv-pill-undo { background: #fdeaea; color: #c0392b; border: 1px solid rgba(217,83,79,.4); }\n[data-edrv-view] .edrv-pill-ghost { background: #ffffff; color: var(--dsw-alias-label-secondary, #52606d); border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-pill:disabled { opacity: .45; cursor: default; }\n[data-edrv-view] .edrv-diffbar-menu { position: absolute; right: 8px; bottom: calc(100% + 6px); z-index: 45; min-width: 160px; border-radius: 10px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 6px 20px rgba(31,41,51,.16); padding: 4px; display: flex; flex-direction: column; gap: 2px; }\n[data-edrv-view] .edrv-diffmenu-item { display: flex; align-items: center; gap: 8px; font-size: 12px; padding: 6px 10px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-primary, #1f2933); cursor: pointer; text-align: left; }\n[data-edrv-view] .edrv-diffmenu-item:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }\n[data-edrv-view] .edrv-diffmenu-item.danger { color: var(--dsw-alias-state-error-primary, #d9534f); }\n[data-edrv-view] .edrv-diffmenu-sep { height: 1px; margin: 2px 4px; background: var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-diffbar-body { max-height: 130px; max-width: min(560px, calc(100vw - 40px)); overflow: auto; padding: 4px 8px 8px; display: flex; flex-direction: column; gap: 4px; border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-diffrow { display: flex; align-items: center; gap: 8px; padding: 3px 6px; border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); border-radius: 6px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); cursor: pointer; flex-wrap: wrap; }\n[data-edrv-view] .edrv-diffrow:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); }\n[data-edrv-view] .edrv-diffrow-l { font-size: 11px; color: var(--dsw-alias-label-primary, #1f2933); min-width: 74px; font-family: var(--ds-font-family-code, ui-monospace, monospace); }\n[data-edrv-view] .edrv-diffrow-o { font-size: 11px; color: var(--dsw-alias-state-error-primary, #d9534f); font-family: var(--ds-font-family-code, ui-monospace, monospace); }\n[data-edrv-view] .edrv-diffrow-n { font-size: 11px; color: var(--dsw-alias-state-success-primary, #0f9d58); font-family: var(--ds-font-family-code, ui-monospace, monospace); }\n[data-edrv-view] .edrv-diffrow-tag { font-size: 11px; color: var(--dsw-alias-label-tertiary, #9aa5b1); }\n[data-edrv-view] .edrv-diffrow-stale { border-color: rgba(217,119,6,.5); cursor: default; }\n[data-edrv-view] .edrv-diffbox-others { display: flex; align-items: center; gap: 6px; flex-wrap: wrap; padding: 4px 2px 0; border-top: 1px solid var(--dsw-alias-border-l1, #e0e6e8); margin-top: 2px; }\n[data-edrv-view] .edrv-diffrow-file { font-size: 11px; padding: 2px 10px; border: 1px solid var(--dsw-alias-border-l1, #e0e6e8); border-radius: 999px; background: var(--dsw-alias-bg-layer-2, #f0f4f4); color: var(--dsw-alias-label-secondary, #52606d); cursor: pointer; white-space: nowrap; max-width: 200px; overflow: hidden; text-overflow: ellipsis; }\n[data-edrv-view] .edrv-diffrow-file:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(15,157,88,.08)); color: var(--dsw-alias-label-primary, #1f2933); }\n/* 编辑区 hover 差异块的 Keep/Undo 浮层 */\n[data-edrv-view] .edrv-hoveract { position: absolute; z-index: 30; display: flex; align-items: center; gap: 4px; padding: 2px 6px; border-radius: 8px; background: var(--dsw-alias-bg-overlay, #ffffff); border: 1px solid var(--dsw-alias-border-l2, #cbd2d9); box-shadow: 0 4px 14px rgba(31,41,51,.14); }\n[data-edrv-view] .edrv-launch { position: absolute; left: 12px; right: 12px; bottom: 12px; z-index: 40; border-radius: 10px; background: var(--dsw-alias-bg-overlay, #1c1c1c); border: 1px solid var(--dsw-alias-border-l2, #555); box-shadow: 0 6px 24px rgba(0,0,0,.5); display: flex; flex-direction: column; max-height: 60%; overflow: hidden; }\n[data-edrv-view] .edrv-launch-head { display: flex; align-items: center; gap: 6px; padding: 6px 8px; border-bottom: 1px solid var(--dsw-alias-border-l1, #333); }\n[data-edrv-view] .edrv-launch-tab { font-size: 12px; padding: 3px 12px; border: none; border-radius: 6px; background: transparent; color: var(--dsw-alias-label-secondary, #aaa); cursor: pointer; }\n[data-edrv-view] .edrv-launch-tab.on { background: var(--dsw-alias-bg-layer-2, transparent); color: var(--dsw-alias-label-primary, #eee); font-weight: 600; }\n[data-edrv-view] .edrv-launch-body { flex: 1; min-height: 0; overflow: auto; padding: 6px 8px; display: flex; flex-direction: column; gap: 4px; }\n[data-edrv-view] .edrv-launch-row { display: flex; align-items: center; gap: 8px; padding: 3px 6px; border: 1px solid var(--dsw-alias-border-l1, #333); border-radius: 6px; cursor: pointer; flex-wrap: wrap; }\n[data-edrv-view] .edrv-launch-row:hover { background: var(--dsw-alias-interactive-bg-hover, rgba(255,255,255,.06)); }\n[data-edrv-view] .edrv-launch-path { flex: 1; min-width: 0; font-size: 12px; color: var(--dsw-alias-label-primary, #eee); word-break: break-all; }\n[data-edrv-view] .edrv-launch-cnt { font-size: 11px; color: var(--dsw-alias-label-tertiary, #888); white-space: nowrap; }\n[data-edrv-view] .edrv-launch-arch { display: flex; flex-direction: column; gap: 6px; }\n[data-edrv-view] .monaco-editor { overflow: hidden !important; }\n[data-edrv-view] .monaco-editor .sticky-widget { z-index: 30 !important; background: var(--dsw-alias-bg-base, #f8f8f8) !important; }\n[data-edrv-view] .monaco-editor .sticky-widget .sticky-line-content,\n[data-edrv-view] .monaco-editor .sticky-widget .sticky-line-number { background: var(--dsw-alias-bg-base, #f8f8f8) !important; }\n[data-edrv-view] .monaco-editor, [data-edrv-view] .monaco-editor .margin, [data-edrv-view] .monaco-editor-background { background: transparent !important; }\n[data-edrv-view] .monaco-editor .scrollbar .slider { background: rgba(128,128,128,.3) !important; }\n[data-edrv-view] .edrv-loading { gap: 8px; padding: 20px; }\n[data-edrv-view] .edrv-loading-title { color: var(--dsw-alias-label-primary, #1f2933); font-size: 13px; }\n[data-edrv-view] .edrv-progress { width: min(360px, 72%); height: 6px; overflow: hidden; border-radius: 999px; background: var(--dsw-alias-border-l1, #e0e6e8); }\n[data-edrv-view] .edrv-progress-value { height: 100%; border-radius: inherit; background: var(--dsw-alias-brand-primary, #0f9d58); transition: width .24s ease; }\n[data-edrv-view] .edrv-loading-percent { color: var(--dsw-alias-label-tertiary, #9aa5b1); font-size: 11px; font-variant-numeric: tabular-nums; }\n@media (prefers-reduced-motion: reduce) {\n  [data-edrv-view] .edrv-progress-value { transition: none; }\n}\n\n";
+		const tagId$1 = "dsh-vscode-mode/editor.css";
+		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId$1) + "]") === null) {
 			const tag = document.createElement("style");
 			tag.dataset.plugin = "dsh-vscode-mode";
-			tag.dataset.pluginCss = tagId;
-			tag.textContent = css;
+			tag.dataset.pluginCss = tagId$1;
+			tag.textContent = css$1;
 			document.head.appendChild(tag);
 		}
 		//#endregion
@@ -114,6 +114,63 @@ window.__ModuleLoader__.load({
 		*/
 		const MONACO_BASE = "/edrv/vendor/monaco/vs";
 		let monacoPromise = null;
+		let monacoStage = {
+			phase: "idle",
+			progress: 0,
+			message: "准备加载 Monaco…"
+		};
+		const stageListeners = /* @__PURE__ */ new Set();
+		/**
+		* Monaco 加载阶段：这是阶段进度而非网络字节进度，避免误导用户。
+		* @author ddj 2026年08月22号
+		*/
+		const MONACO_STAGES = {
+			loader: {
+				progress: 18,
+				message: "加载 Monaco 引导模块…"
+			},
+			core: {
+				progress: 72,
+				message: "加载编辑器核心模块…"
+			},
+			ready: {
+				progress: 100,
+				message: "Monaco 编辑器已就绪"
+			},
+			error: {
+				progress: 0,
+				message: "Monaco 编辑器加载失败"
+			}
+		};
+		/**
+		* 发布 Monaco 加载阶段，监听器异常不得影响编辑器加载。
+		* @author ddj 2026年08月22号
+		* @param phase 阶段名
+		* @param progress 阶段百分比
+		* @param message 用户可读状态
+		*/
+		function publishStage(phase, progress, message) {
+			monacoStage = {
+				phase,
+				progress,
+				message
+			};
+			for (const listener of stageListeners) try {
+				listener(monacoStage);
+			} catch (error) {}
+		}
+		/**
+		* 订阅 Monaco 加载阶段。
+		* @author ddj 2026年08月22号
+		* @param listener 阶段回调
+		* @returns 取消订阅函数
+		*/
+		function subscribeStage(listener) {
+			if (typeof listener !== "function") return () => {};
+			stageListeners.add(listener);
+			listener(monacoStage);
+			return () => stageListeners.delete(listener);
+		}
 		/** 扩展名 → Monaco language id（常见语言；未知回退 plaintext）。 */
 		const LANG_BY_EXT = {
 			js: "javascript",
@@ -184,34 +241,40 @@ window.__ModuleLoader__.load({
 		* @author ddj 2026年08月20号
 		* @returns Promise<object> window.monaco
 		*/
-		function loadMonaco() {
-			if (!monacoPromise) monacoPromise = new Promise((resolve, reject) => {
-				const boot = () => {
-					try {
-						window.require.config({ paths: { vs: MONACO_BASE } });
-						window.require(["vs/editor/editor.main"], () => resolve(window.monaco), (err) => {
-							monacoPromise = null;
-							reject(/* @__PURE__ */ new Error("Monaco 模块加载失败：" + String(err)));
-						});
-					} catch (error) {
+		function loadMonaco(onProgress) {
+			const unsubscribe = subscribeStage(onProgress);
+			if (!monacoPromise) {
+				publishStage("loader", MONACO_STAGES.loader.progress, MONACO_STAGES.loader.message);
+				monacoPromise = new Promise((resolve, reject) => {
+					const fail = (error) => {
 						monacoPromise = null;
+						publishStage("error", MONACO_STAGES.error.progress, MONACO_STAGES.error.message);
 						reject(error);
-					}
-				};
-				if (document.querySelector("script[data-edrv-monaco-loader]")) boot();
-				else {
-					const s = document.createElement("script");
-					s.src = "/edrv/vendor/monaco/vs/loader.js";
-					s.dataset.edrvMonacoLoader = "1";
-					s.onload = boot;
-					s.onerror = () => {
-						monacoPromise = null;
-						reject(/* @__PURE__ */ new Error("Monaco loader 加载失败"));
 					};
-					document.head.appendChild(s);
-				}
-			});
-			return monacoPromise;
+					const boot = () => {
+						try {
+							window.require.config({ paths: { vs: MONACO_BASE } });
+							publishStage("core", MONACO_STAGES.core.progress, MONACO_STAGES.core.message);
+							window.require(["vs/editor/editor.main"], () => {
+								publishStage("ready", MONACO_STAGES.ready.progress, MONACO_STAGES.ready.message);
+								resolve(window.monaco);
+							}, (err) => fail(/* @__PURE__ */ new Error("Monaco 模块加载失败：" + String(err))));
+						} catch (error) {
+							fail(error);
+						}
+					};
+					if (document.querySelector("script[data-edrv-monaco-loader]")) boot();
+					else {
+						const s = document.createElement("script");
+						s.src = "/edrv/vendor/monaco/vs/loader.js";
+						s.dataset.edrvMonacoLoader = "1";
+						s.onload = boot;
+						s.onerror = () => fail(/* @__PURE__ */ new Error("Monaco loader 加载失败"));
+						document.head.appendChild(s);
+					}
+				});
+			}
+			return monacoPromise.finally(unsubscribe);
 		}
 		//#endregion
 		//#region src/client/monaco/diffRender.ts
@@ -305,8 +368,10 @@ window.__ModuleLoader__.load({
 						try {
 							li = editor.getLayoutInfo();
 						} catch (e) {}
-						const left = li ? li.decorationsLeft : 0;
+						const rawLeft = li ? li.decorationsLeft : 0;
 						const width = li && li.decorationsWidth > 0 ? li.decorationsWidth : 16;
+						const maxLeft = Math.max(0, root.clientWidth - width);
+						const left = Math.max(0, Math.min(maxLeft, rawLeft + 12));
 						const lineCount = editor.getModel().getLineCount();
 						let itemIdx = 0;
 						let zi = 0;
@@ -318,7 +383,7 @@ window.__ModuleLoader__.load({
 							for (let i = 0; i < z.n; i++) {
 								const item = document.createElement("div");
 								item.className = "edrv-minus-item";
-								item.textContent = "-";
+								item.textContent = "";
 								item.style.width = width + "px";
 								item.style.height = lineH + "px";
 								item.dataset.zone = String(zi);
@@ -346,7 +411,14 @@ window.__ModuleLoader__.load({
 								const edRect = root.getBoundingClientRect();
 								const st = editor.getScrollTop() || 0;
 								const items = overlay.querySelectorAll(".edrv-minus-item");
+								let correctedLeft = left;
+								try {
+									const layout = editor.getLayoutInfo();
+									const markerWidth = layout.decorationsWidth > 0 ? layout.decorationsWidth : width;
+									correctedLeft = Math.max(0, Math.min(Math.max(0, root.clientWidth - markerWidth), (layout.decorationsLeft || 0) + 12));
+								} catch (e) {}
 								for (const item of items) {
+									item.style.left = correctedLeft + "px";
 									const zIndex = Number(item.dataset.zone);
 									const rIndex = Number(item.dataset.row);
 									const z = createdZones[zIndex];
@@ -378,6 +450,121 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/shared/diff.ts
+		/** 统一取对应 hunk；callHunk 只用于旧记录缺失 hunks 时兼容。 */
+		function preciseHunk(record, idx) {
+			return hunkOf(record, idx);
+		}
+		/** 取记录第 idx 个有效 hunk；只有记录缺 hunk 时才回退 callHunk。 */
+		function hunkOf(record, idx) {
+			const hunk = Array.isArray(record.hunks) ? record.hunks[idx] : void 0;
+			if (hunk && typeof hunk.newText === "string") return hunk;
+			if (idx === 0 && record.callHunk && typeof record.callHunk.newText === "string") return record.callHunk;
+			return null;
+		}
+		/** splitLines 的空文本语义：真实空文件没有一行变更内容。 */
+		function splitLines(text) {
+			return text.length ? text.split("\n") : [];
+		}
+		/** 计算 index 前的 0 基行数。 */
+		function lineBefore(text, index) {
+			let n = 0;
+			const end = Math.max(0, Math.min(index, text.length));
+			for (let i = 0; i < end; i++) if (text.charCodeAt(i) === 10) n++;
+			return n;
+		}
+		/** 找出文本的全部非重叠出现位置。 */
+		function allMatches(content, needle) {
+			if (!needle.length) return [];
+			const out = [];
+			let from = 0;
+			while (from <= content.length - needle.length) {
+				const at = content.indexOf(needle, from);
+				if (at < 0) break;
+				out.push({
+					start: at,
+					end: at + needle.length
+				});
+				from = at + Math.max(1, needle.length);
+			}
+			return out;
+		}
+		/**
+		* 从 after 快照定位所有 hunk，按 hunk 顺序优先选未占用且靠近前一块的候选。
+		* 若 hunk 带 afterStart/afterEnd，则优先验证快照坐标，避免重复文本错配。
+		* @author ddj 2026年08月24号
+		* @param content 当前文件内容
+		* @param hunks 待定位 hunk
+		* @returns 每个 hunk 一个结果，matched=false 表示冲突/stale
+		*/
+		function locateHunks(content, hunks) {
+			const locations = [];
+			let cursor = 0;
+			const occupied = [];
+			for (let idx = 0; idx < hunks.length; idx++) {
+				const hunk = hunks[idx];
+				const newText = hunk.newText;
+				const snapshot = Number.isInteger(hunk.afterStart) && Number.isInteger(hunk.afterEnd) ? {
+					start: hunk.afterStart,
+					end: hunk.afterEnd
+				} : null;
+				const snapshotMatches = snapshot && snapshot.start >= 0 && snapshot.end >= snapshot.start && (newText.length === 0 || content.slice(snapshot.start, snapshot.end) === newText) ? snapshot : null;
+				const candidates = snapshotMatches ? [snapshotMatches] : allMatches(content, newText);
+				const candidate = candidates.find((range) => range.start >= cursor && !occupied.some((used) => overlaps(range, used))) ?? candidates.find((range) => !occupied.some((used) => overlaps(range, used)));
+				if (candidate) {
+					locations.push({
+						idx,
+						hunk,
+						...candidate,
+						matched: true
+					});
+					occupied.push(candidate);
+					cursor = Math.max(cursor, candidate.end);
+					continue;
+				}
+				if (newText.length === 0 && hunk.afterStart === void 0 && hunk.afterEnd === void 0 && content.length === 0) {
+					locations.push({
+						idx,
+						hunk,
+						start: 0,
+						end: 0,
+						matched: true
+					});
+					continue;
+				}
+				if (newText.length === 0 && hunk.afterStart !== void 0 && hunk.afterEnd !== void 0 && hunk.afterStart === hunk.afterEnd && hunk.afterStart >= 0 && hunk.afterStart <= content.length) {
+					const point = {
+						start: hunk.afterStart,
+						end: hunk.afterEnd
+					};
+					if (!occupied.some((used) => overlaps(point, used))) {
+						locations.push({
+							idx,
+							hunk,
+							...point,
+							matched: true
+						});
+						occupied.push(point);
+						cursor = Math.max(cursor, point.end);
+						continue;
+					}
+				}
+				locations.push({
+					idx,
+					hunk,
+					start: -1,
+					end: -1,
+					matched: false
+				});
+			}
+			return locations;
+		}
+		/** 判断两个半开区间是否重叠。零长度区间只与同一位置的零长度区间重叠。 */
+		function overlaps(left, right) {
+			if (left.start === left.end || right.start === right.end) return left.start === right.start && left.end === right.end;
+			return left.start < right.end && right.start < left.end;
+		}
+		//#endregion
 		//#region src/client/state/records.ts
 		/** 差异决策状态。 */
 		const ST = {
@@ -398,14 +585,14 @@ window.__ModuleLoader__.load({
 		/** hunk 是否为空差异（old===new，无实际内容变化，不可操作）。create 记录不视为空差异。 */
 		function noopHunk(rec, h) {
 			if (!rec || rec.create === true) return false;
-			const precise = rec.toolName === "edit" && rec.callHunk ? rec.callHunk : h;
+			const precise = rec && h && rec.hunks.indexOf(h) >= 0 ? preciseHunk(rec, rec.hunks.indexOf(h)) : h;
 			const oldText = precise?.oldText ?? null;
 			const newText = precise?.newText ?? null;
 			return oldText !== null && oldText === newText;
 		}
 		/** 记录是否仍有待处理差异（superseded / 全部已决策 = false）。 */
 		function isRecPending(rec) {
-			if (!rec || rec.superseded === true) return false;
+			if (!rec || rec.superseded === true || rec.conflict === true) return false;
 			const perHunk = Array.isArray(rec.decisions?.perHunk) ? rec.decisions.perHunk : [];
 			if (perHunk.length) {
 				for (let i = 0; i < perHunk.length; i++) if (perHunk[i] !== "accepted" && perHunk[i] !== "rejected" && !noopHunk(rec, (rec.hunks || [])[i])) return true;
@@ -454,9 +641,7 @@ window.__ModuleLoader__.load({
 		//#region src/client/state/regions.ts
 		/** 统计 index 之前（不含）的换行数 → 0 基行号。 */
 		function countLinesBefore(text, index) {
-			let n = 0;
-			for (let i = 0; i < index; i++) if (text.charCodeAt(i) === 10) n++;
-			return n;
+			return lineBefore(text, index);
 		}
 		/**
 		* 行级公共前缀/后缀裁剪：old/new 首尾相同的行视为未变化（上下文），只保留真正变更的中间段。
@@ -482,59 +667,71 @@ window.__ModuleLoader__.load({
 		function diffRegions(records, content) {
 			const regions = [];
 			if (content === null) return regions;
-			const lines = content.split("\n");
-			for (const rec of records) for (let i = 0; i < rec.hunks.length; i++) {
-				const h = rec.hunks[i];
-				if (noopHunk(rec, h)) continue;
-				const status = statusAt(rec, i);
+			const lines = splitLines(content);
+			for (const rec of records) {
 				if (rec.create) {
-					regions.push({
-						callId: rec.callId,
+					for (let i = 0; i < rec.hunks.length; i++) {
+						const h = preciseHunk(rec, i);
+						if (!h || noopHunk(rec, h)) continue;
+						regions.push({
+							callId: rec.callId,
+							idx: i,
+							start: 1,
+							end: Math.max(1, lines.length),
+							oldLines: [],
+							newLines: lines.slice(),
+							whole: true,
+							status: statusAt(rec, i),
+							create: true,
+							rec,
+							superseded: rec.superseded === true
+						});
+					}
+					continue;
+				}
+				const entries = [];
+				for (let i = 0; i < rec.hunks.length; i++) {
+					const hunk = preciseHunk(rec, i);
+					if (hunk && !noopHunk(rec, hunk)) entries.push({
 						idx: i,
-						start: 1,
-						end: lines.length,
-						oldLines: [],
-						newLines: lines.slice(),
-						whole: true,
-						status,
-						create: true,
-						rec,
-						superseded: rec.superseded === true
+						hunk
 					});
-					continue;
 				}
-				const precise = rec.toolName === "edit" && rec.callHunk ? rec.callHunk : h;
-				const newText = precise.newText ?? "";
-				const at = content.indexOf(newText);
-				if (at < 0) {
+				const locations = locateHunks(content, entries.map((entry) => entry.hunk));
+				for (let i = 0; i < entries.length; i++) {
+					const entry = entries[i];
+					const location = locations[i];
+					const status = statusAt(rec, entry.idx);
+					if (!location.matched) {
+						regions.push({
+							callId: rec.callId,
+							idx: entry.idx,
+							stale: true,
+							status,
+							create: false,
+							oldLines: entry.hunk.oldText === null ? [] : entry.hunk.oldText.split("\n"),
+							newLines: entry.hunk.newText ? entry.hunk.newText.split("\n") : [],
+							rec,
+							superseded: rec.superseded === true
+						});
+						continue;
+					}
+					const start = countLinesBefore(content, location.start) + 1;
+					const trimmed = trimCommonLines(entry.hunk.oldText === null ? [] : entry.hunk.oldText.split("\n"), entry.hunk.newText.split("\n"));
+					const regionStart = start + trimmed.shift;
 					regions.push({
 						callId: rec.callId,
-						idx: i,
-						stale: true,
+						idx: entry.idx,
+						start: regionStart,
+						end: regionStart + trimmed.newLines.length,
+						oldLines: trimmed.oldLines,
+						newLines: trimmed.newLines,
 						status,
 						create: false,
-						oldLines: [],
-						newLines: [],
 						rec,
 						superseded: rec.superseded === true
 					});
-					continue;
 				}
-				const start = countLinesBefore(content, at) + 1;
-				const trimmed = trimCommonLines(precise.oldText === null ? [] : precise.oldText.split("\n"), newText.split("\n"));
-				const regionStart = start + trimmed.shift;
-				regions.push({
-					callId: rec.callId,
-					idx: i,
-					start: regionStart,
-					end: regionStart + trimmed.newLines.length,
-					oldLines: trimmed.oldLines,
-					newLines: trimmed.newLines,
-					status,
-					create: false,
-					rec,
-					superseded: rec.superseded === true
-				});
 			}
 			regions.sort((a, b) => (a.start ?? Infinity) - (b.start ?? Infinity));
 			return regions;
@@ -698,7 +895,7 @@ window.__ModuleLoader__.load({
 					key: "stale" + callIdAttr(r.callId, r.idx),
 					className: "edrv-diffrow edrv-diffrow-stale",
 					title: "差异无法定位（文件可能已被手动修改）"
-				}, react.default.createElement("span", { className: "edrv-diffrow-l" }, "L" + (r.start ?? "?") + " 无法定位"), react.default.createElement("span", { className: "edrv-diffrow-tag" }, badgeOf(r.status))));
+				}, react.default.createElement("span", { className: "edrv-diffrow-l" }, "L" + (r.start ?? "?") + " 无法定位"), react.default.createElement("span", { className: "edrv-diffrow-tag" }, "冲突/需刷新"), react.default.createElement("span", { className: "edrv-diffrow-tag" }, badgeOf(r.status))));
 				let othersEl = null;
 				if (otherFiles.length) othersEl = react.default.createElement("div", { className: "edrv-diffbox-others" }, react.default.createElement("span", { className: "edrv-diffrow-tag" }, "其他差异文件 (" + otherFiles.length + "):"), otherFiles.map((f) => react.default.createElement("button", {
 					key: f.path,
@@ -1116,6 +1313,11 @@ window.__ModuleLoader__.load({
 			const [content, setContent] = react.default.useState(null);
 			const [status, setStatus] = react.default.useState("");
 			const [error, setError] = react.default.useState(null);
+			const [loadError, setLoadError] = react.default.useState(null);
+			const [loadStage, setLoadStage] = react.default.useState({
+				progress: 0,
+				message: "准备加载编辑器…"
+			});
 			const [openInput, setOpenInput] = react.default.useState(false);
 			const [pathDraft, setPathDraft] = react.default.useState("");
 			const [cursor, setCursor] = react.default.useState("");
@@ -1190,6 +1392,11 @@ window.__ModuleLoader__.load({
 			};
 			const loadContent = (path, sid) => {
 				const seq = ++loadSeqRef.current;
+				setLoadError(null);
+				setLoadStage({
+					progress: monaco ? 72 : 12,
+					message: "读取文件内容…"
+				});
 				rpc("edrv.read", {
 					sessionId: sid,
 					path
@@ -1197,16 +1404,23 @@ window.__ModuleLoader__.load({
 					if (seq !== loadSeqRef.current || path !== active) return;
 					if (res && res.ok) {
 						setContent(res.content);
+						setLoadStage((prev) => ({
+							progress: Math.max(84, prev.progress),
+							message: "文件已读取，准备创建编辑器…"
+						}));
 						setStatus("已加载");
 					} else {
-						setError(res?.error ? String(res.error) : "读取失败");
+						const message = res?.error ? String(res.error) : "读取失败";
+						setLoadError(message);
+						setError(message);
 						setStatus("读取失败");
 					}
 				}).catch((e) => {
-					if (seq === loadSeqRef.current) {
-						setError("read异常:" + String(e));
-						setStatus("读取失败");
-					}
+					if (seq !== loadSeqRef.current) return;
+					const message = "read异常:" + String(e);
+					setLoadError(message);
+					setError(message);
+					setStatus("读取失败");
 				});
 			};
 			react.default.useEffect(() => {
@@ -1263,13 +1477,26 @@ window.__ModuleLoader__.load({
 			react.default.useEffect(() => {
 				if (!active) return;
 				setContent(null);
+				setLoadError(null);
+				setLoadStage({
+					progress: 10,
+					message: "准备读取文件…"
+				});
 				setStatus("加载中…");
 				loadContent(active, sessionId);
 			}, [active, sessionId]);
 			react.default.useEffect(() => {
 				if (monaco || monacoErr) return;
 				let alive = true;
-				loadMonaco().then((m) => {
+				const onProgress = (stage) => {
+					if (!alive) return;
+					const progress = stage.phase === "ready" ? 70 : Math.round(10 + stage.progress * .6);
+					setLoadStage((prev) => ({
+						progress: Math.max(prev.progress, progress),
+						message: stage.message
+					}));
+				};
+				loadMonaco(onProgress).then((m) => {
 					if (alive) setMonaco(m);
 				}).catch((e) => {
 					if (alive) {
@@ -1338,6 +1565,10 @@ window.__ModuleLoader__.load({
 				const ed = editorRef.current;
 				const model = getModel(active, content);
 				if (ed.getModel() !== model) ed.setModel(model);
+				setLoadStage((prev) => ({
+					progress: Math.max(96, prev.progress),
+					message: "创建编辑器视图…"
+				}));
 			}, [
 				monaco,
 				active,
@@ -1346,6 +1577,10 @@ window.__ModuleLoader__.load({
 			react.default.useEffect(() => {
 				if (!monaco || !editorRef.current || !active || content === null) return;
 				diffRendererRef.current.render(monaco, editorRef.current, pendingRegions, sessionId);
+				setLoadStage({
+					progress: 100,
+					message: "编辑器已就绪"
+				});
 			}, [
 				monaco,
 				active,
@@ -1713,11 +1948,54 @@ window.__ModuleLoader__.load({
 				onClick: reloadFile
 			}, "⟳"));
 			const otherFiles = sum.pendingFiles.filter((f) => f.path !== active);
+			/**
+			* 渲染编辑器/文件加载进度面板。
+			* @author ddj 2026年08月22号
+			* @param message 当前加载阶段
+			* @param progress 阶段进度
+			* @param retry 可选重试回调
+			* @returns 加载面板 React 元素
+			*/
+			const loadingBody = (message, progress, retry) => react.default.createElement("div", {
+				className: "edrv-empty edrv-loading",
+				"aria-live": "polite"
+			}, react.default.createElement("div", { className: "edrv-loading-title" }, message), react.default.createElement("div", {
+				className: "edrv-progress",
+				role: "progressbar",
+				"aria-label": "编辑器加载进度",
+				"aria-valuemin": 0,
+				"aria-valuemax": 100,
+				"aria-valuenow": progress
+			}, react.default.createElement("div", {
+				className: "edrv-progress-value",
+				style: { width: Math.max(0, Math.min(100, progress)) + "%" }
+			})), react.default.createElement("div", { className: "edrv-loading-percent" }, Math.round(progress) + "%"), retry ? react.default.createElement("button", {
+				className: "edrv-pill edrv-pill-ghost",
+				onClick: retry
+			}, "重试") : null);
 			let body;
-			if (!monaco && !monacoErr) body = react.default.createElement("div", { className: "edrv-empty" }, "正在加载 Monaco 编辑器…");
-			else if (monacoErr) body = react.default.createElement("div", { className: "edrv-empty" }, react.default.createElement("div", null, "Monaco 编辑器加载失败：" + String(monacoErr)), react.default.createElement("div", { style: { fontSize: 11 } }, "请确认插件包 assets/vendor/monaco 完整（/edrv/vendor 路由可达）"));
+			if (!monaco && !monacoErr) body = loadingBody(loadStage.message, loadStage.progress);
+			else if (monacoErr) body = react.default.createElement("div", { className: "edrv-empty" }, react.default.createElement("div", null, "Monaco 编辑器加载失败：" + String(monacoErr)), react.default.createElement("div", { style: { fontSize: 11 } }, "请确认插件包 assets/vendor/monaco 完整（/edrv/vendor 路由可达）"), react.default.createElement("button", {
+				className: "edrv-pill edrv-pill-ghost",
+				onClick: () => {
+					setMonacoErr(null);
+					setLoadStage({
+						progress: 0,
+						message: "准备重试 Monaco…"
+					});
+				}
+			}, "重试"));
 			else if (!active) body = react.default.createElement("div", { className: "edrv-empty" }, react.default.createElement("div", null, "暂无打开的文件"), react.default.createElement("div", { style: { fontSize: 12 } }, "使用右上搜索框 (Ctrl+P) 打开工作区文件；agent 修改文件后顶部会出现差异角标"));
-			else if (content === null) body = react.default.createElement("div", { className: "edrv-empty" }, "加载中…");
+			else if (content === null && loadError) body = loadingBody("文件加载失败：" + loadError, 0, () => {
+				setLoadError(null);
+				setContent(null);
+				setLoadStage({
+					progress: 10,
+					message: "重新读取文件…"
+				});
+				loadContent(active, sessionId);
+			});
+			else if (content === null) body = loadingBody(loadStage.message || "读取文件内容…", loadStage.progress);
 			else body = react.default.createElement("div", { className: "edrv-monaco-host" }, react.default.createElement("div", { ref: ensureEditor }));
 			const hoverEl = hoverAct && !launcherOpen ? react.default.createElement("div", {
 				className: "edrv-hoveract",
@@ -1918,6 +2196,352 @@ window.__ModuleLoader__.load({
 			} }, String(n)));
 		}
 		//#endregion
+		//#region \0dsh-css:/home/runner/work/DSH_VsCodeMode/DSH_VsCodeMode/src/client/styles/mcp.css.mjs
+		const css = "/* dsh-vscode-mode MCP 管理界面样式。\n   全部使用 DSH 真实主题变量（--dsw-alias-*），不再用不存在的 fg-* 变量。 */\n.vsm-mcp-page{display:flex;flex-direction:column;gap:18px;width:100%;max-width:920px;box-sizing:border-box;color:var(--dsw-alias-label-primary,#e6e6e6);padding-bottom:32px}\n\n/* 顶部：标题 + 副标题 + 添加按钮 */\n.vsm-mcp-header{display:flex;align-items:flex-start;justify-content:space-between;gap:20px}\n.vsm-mcp-header h2{margin:0 0 4px;font-size:20px;font-weight:600;line-height:1.35;color:var(--dsw-alias-label-primary,#e6e6e6)}\n.vsm-mcp-header p{margin:0;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:13px;line-height:1.5}\n.vsm-primary{border:0;border-radius:6px;padding:8px 16px;background:var(--dsw-alias-button-primary-fill,#6d55ff);color:var(--dsw-alias-button-contrast-fill,#fff);font-size:13px;font-weight:500;cursor:pointer;white-space:nowrap}\n.vsm-primary:hover{background:var(--dsw-alias-button-primary-hover,#5a46e6)}\n.vsm-primary:disabled{opacity:.55;cursor:default}\n\n/* 子 Tab：我的 MCP / MCP 市场 */\n.vsm-mcp-tabs{display:flex;gap:24px;border-bottom:1px solid var(--dsw-alias-border-l2,#3a3a3a)}\n.vsm-mcp-tabs button{border:0;background:none;color:var(--dsw-alias-label-tertiary,#9aa5b1);padding:9px 2px 11px;cursor:pointer;font-size:14px;position:relative}\n.vsm-mcp-tabs button:hover{color:var(--dsw-alias-label-secondary,#c8c8c8)}\n.vsm-mcp-tabs button.active{color:var(--dsw-alias-label-primary,#fff);font-weight:500}\n.vsm-mcp-tabs button.active::after{content:\"\";position:absolute;left:0;right:0;bottom:-1px;height:2px;background:var(--dsw-alias-brand-primary,#6d55ff);border-radius:2px}\n\n/* 服务卡片 */\n.vsm-mcp-card{border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:10px;padding:14px 16px;margin-bottom:10px;background:var(--dsw-alias-bg-layer-2,transparent);transition:border-color .15s}\n.vsm-mcp-card:hover{border-color:var(--dsw-alias-border-l3,#555)}\n.vsm-mcp-card-head{display:flex;justify-content:space-between;align-items:center;gap:12px}\n.vsm-mcp-title{display:flex;align-items:center;gap:9px;font-weight:600;font-size:14px;color:var(--dsw-alias-label-primary,#e6e6e6);min-width:0}\n.vsm-mcp-source{font-size:11px;font-weight:400;padding:2px 7px;border-radius:4px;background:var(--dsw-alias-bg-mask-2,#ffffff22);color:var(--dsw-alias-label-tertiary,#9aa5b1);flex-shrink:0}\n.vsm-mcp-dot{width:8px;height:8px;border-radius:50%;flex-shrink:0;background:var(--dsw-alias-state-error-primary,#e05252)}\n.vsm-mcp-dot.connected{background:var(--dsw-alias-state-success-primary,#38bd75)}\n.vsm-mcp-dot.connecting{background:var(--dsw-alias-state-warn-primary,#e5b93f)}\n.vsm-mcp-dot.disabled{background:var(--dsw-alias-label-tertiary,#9aa5b1)}\n.vsm-mcp-actions{display:flex;align-items:center;gap:4px;flex-shrink:0}\n.vsm-mcp-actions button{border:0;background:none;color:var(--dsw-alias-label-tertiary,#9aa5b1);cursor:pointer;font-size:15px;width:28px;height:28px;border-radius:6px;line-height:1}\n.vsm-mcp-actions button:hover{color:var(--dsw-alias-label-primary,#fff);background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}\n.vsm-mcp-actions button.vsm-danger:hover{color:var(--dsw-alias-state-error-primary,#f07878);background:var(--dsw-alias-interactive-bg-hover-danger,#ff000014)}\n.vsm-switch{font-size:14px !important}\n.vsm-switch.on{color:var(--dsw-alias-state-success-primary,#38bd75)}\n.vsm-mcp-meta{font-size:12px;color:var(--dsw-alias-label-tertiary,#9aa5b1);margin:9px 0}\n.vsm-mcp-error{color:var(--dsw-alias-state-error-primary,#f07878);font-size:12px;margin:8px 0}\n.vsm-mcp-banner{padding:9px 12px;border:1px solid var(--dsw-alias-state-error-secondary,#d9534f55);border-radius:6px;background:var(--dsw-alias-state-error-secondary,#d9534f1a);margin-bottom:10px}\n\n/* 工具 chips */\n.vsm-mcp-tools{display:flex;flex-wrap:wrap;gap:6px}\n.vsm-mcp-chip{font:12px var(--ds-font-family-code,ui-monospace,monospace);padding:4px 8px;border-radius:5px;background:var(--dsw-alias-bg-mask-2,#ffffff14);color:var(--dsw-alias-label-secondary,#c8c8c8);border:1px solid var(--dsw-alias-border-l1,#333)}\n\n/* 空态 / 加载态 */\n.vsm-mcp-empty{text-align:center;padding:56px 20px;color:var(--dsw-alias-label-tertiary,#9aa5b1);border:1px dashed var(--dsw-alias-border-l2,#3a3a3a);border-radius:8px;font-size:13px}\n\n/* 项目搜索下拉框 */\n.vsm-project-picker{position:relative;width:100%;z-index:4}\n.vsm-project-picker-trigger{width:100%;display:flex;align-items:center;justify-content:space-between;gap:12px;padding:10px 12px;border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:8px;background:var(--dsw-alias-bg-layer-1,transparent);color:var(--dsw-alias-label-primary,#e6e6e6);cursor:pointer;text-align:left}\n.vsm-project-picker-trigger:hover{border-color:var(--dsw-alias-brand-primary,#6d55ff)}\n.vsm-project-picker-label{display:flex;flex-direction:column;min-width:0;font-size:13px;font-weight:500}\n.vsm-project-picker-label small{margin-top:3px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font:11px var(--ds-font-family-code,ui-monospace,monospace);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}\n.vsm-project-picker-arrow{color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:16px}\n.vsm-project-picker-menu{position:absolute;top:calc(100% + 6px);left:0;right:0;padding:8px;border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:9px;background:var(--dsw-alias-bg-overlay,#202020);box-shadow:0 12px 36px #0008}\n.vsm-project-picker-search{width:100%;box-sizing:border-box;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;background:var(--dsw-alias-bg-layer-1,#2b2b2b);color:var(--dsw-alias-label-primary,#eee);outline:none}\n.vsm-project-picker-search:focus{border-color:var(--dsw-alias-brand-primary,#6d55ff)}\n.vsm-project-picker-options{max-height:260px;overflow:auto;margin-top:6px}\n.vsm-project-option{display:flex;width:100%;flex-direction:column;gap:3px;padding:8px 9px;border:0;border-radius:6px;background:none;color:var(--dsw-alias-label-primary,#eee);cursor:pointer;text-align:left}\n.vsm-project-option:hover,.vsm-project-option.highlight{background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}\n.vsm-project-option.selected{color:var(--dsw-alias-brand-primary,#6d55ff)}\n.vsm-project-option small{overflow:hidden;color:var(--dsw-alias-label-tertiary,#9aa5b1);font:11px var(--ds-font-family-code,ui-monospace,monospace);text-overflow:ellipsis;white-space:nowrap}\n.vsm-project-picker-empty{padding:18px 8px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:12px;text-align:center}\n\n/* 项目级 MCP 分组 */\n.vsm-project{border:1px solid var(--dsw-alias-border-l2,#3a3a3a);border-radius:12px;margin-bottom:14px;overflow:hidden;background:var(--dsw-alias-bg-layer-1,transparent)}\n.vsm-project-head{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 16px;border-bottom:1px solid var(--dsw-alias-border-l1,#333);background:var(--dsw-alias-bg-mask-1,#ffffff0a)}\n.vsm-project-title{display:flex;align-items:center;gap:10px;min-width:0}\n.vsm-project-icon{color:var(--dsw-alias-brand-primary,#6d55ff);font-size:15px;flex-shrink:0}\n.vsm-project-name{font-size:14px;font-weight:600;color:var(--dsw-alias-label-primary,#e6e6e6);display:block}\n.vsm-project-path{font-size:11px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-family:var(--ds-font-family-code,ui-monospace,monospace);display:block;margin-top:2px;word-break:break-all}\n.vsm-primary.vsm-small{padding:5px 12px;font-size:12px}\n.vsm-project-empty{text-align:center;padding:26px 16px;color:var(--dsw-alias-label-tertiary,#9aa5b1);font-size:12px}\n.vsm-project .vsm-mcp-card{border:0;border-radius:0;margin:0;border-bottom:1px solid var(--dsw-alias-border-l1,#333);background:transparent}\n.vsm-project .vsm-mcp-card:last-child{border-bottom:0}\n.vsm-project .vsm-mcp-banner{border-radius:0;margin:0}\n\n/* 新增 MCP 弹窗 */\n.vsm-mcp-modal{position:fixed;inset:0;background:var(--dsw-alias-bg-mask-drop,#000000aa);display:flex;align-items:center;justify-content:center;z-index:50}\n.vsm-mcp-dialog{width:min(560px,calc(100vw - 40px));max-height:88vh;overflow:auto;padding:22px 24px;border-radius:12px;background:var(--dsw-alias-bg-overlay,#202020);border:1px solid var(--dsw-alias-border-l2,#444);box-shadow:0 16px 60px #000c;color:var(--dsw-alias-label-primary,#e6e6e6)}\n.vsm-mcp-dialog h3{margin:0 0 14px;font-size:16px;font-weight:600}\n.vsm-mcp-dialog label{display:flex;flex-direction:column;gap:6px;margin:12px 0;font-size:12px;color:var(--dsw-alias-label-secondary,#aaa)}\n.vsm-mcp-dialog input,.vsm-mcp-dialog select,.vsm-mcp-dialog textarea{font:inherit;color:var(--dsw-alias-label-primary,#eee);background:var(--dsw-alias-bg-layer-1,#2b2b2b);border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;padding:8px 10px}\n.vsm-mcp-dialog input:focus,.vsm-mcp-dialog select:focus,.vsm-mcp-dialog textarea:focus{outline:none;border-color:var(--dsw-alias-brand-primary,#6d55ff)}\n.vsm-mcp-dialog textarea{min-height:64px;resize:vertical;font-family:var(--ds-font-family-code,ui-monospace,monospace)}\n.vsm-mcp-dialog-actions{display:flex;justify-content:flex-end;gap:10px;margin-top:20px}\n.vsm-mcp-dialog-actions button{padding:8px 14px;border:1px solid var(--dsw-alias-border-l2,#555);border-radius:6px;background:none;color:var(--dsw-alias-label-primary,#eee);cursor:pointer;font-size:13px}\n.vsm-mcp-dialog-actions button:hover{background:var(--dsw-alias-interactive-bg-hover,#ffffff14)}\n";
+		const tagId = "dsh-vscode-mode/mcp.css";
+		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
+			const tag = document.createElement("style");
+			tag.dataset.plugin = "dsh-vscode-mode";
+			tag.dataset.pluginCss = tagId;
+			tag.textContent = css;
+			document.head.appendChild(tag);
+		}
+		//#endregion
+		//#region src/client/ui/McpSettings.ts
+		/**
+		* dsh-vscode-mode client — VSCodeMode 设置区内的 MCP 管理。
+		* 子 Tab：我的 MCP（profile 全局）/ 项目 MCP（各项目 .mcp.json）/ MCP 市场（占位）。
+		* 作者 ddj 2026年08月22号
+		*/
+		const EMPTY = {
+			serverName: "",
+			transport: "stdio",
+			command: "",
+			args: "",
+			cwd: "",
+			url: "",
+			headers: ""
+		};
+		/** 将表单草稿转换为 Host MCP 配置。 */
+		function configOf(draft) {
+			const config = {
+				serverName: draft.serverName.trim(),
+				transport: draft.transport
+			};
+			if (draft.transport === "stdio") {
+				config.command = draft.command.trim();
+				config.args = draft.args.split(/\r?\n|\s+/).filter(Boolean);
+				if (draft.cwd.trim()) config.cwd = draft.cwd.trim();
+			} else {
+				config.url = draft.url.trim();
+				config.headers = parsePairs(draft.headers);
+			}
+			return config;
+		}
+		/** 解析每行 key=value 的表单字段。 */
+		function parsePairs(text) {
+			return Object.fromEntries(text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).map((line) => {
+				const idx = line.indexOf("=");
+				return idx > 0 ? [line.slice(0, idx).trim(), line.slice(idx + 1).trim()] : [line, ""];
+			}));
+		}
+		/** 服务状态文案。 */
+		function statusOf(server) {
+			return server.status === "connected" ? "在线" : server.status === "connecting" ? "连接中" : server.status === "disabled" ? "已禁用" : "错误";
+		}
+		/** MCP 服务卡片（全局与项目共用）。 */
+		function ServerCard({ server, onRefresh, onToggle, onRemove }) {
+			return react.default.createElement("article", { className: "vsm-mcp-card" }, react.default.createElement("div", { className: "vsm-mcp-card-head" }, react.default.createElement("div", { className: "vsm-mcp-title" }, react.default.createElement("span", { className: "vsm-mcp-dot " + (server.enabled ? server.status : "disabled") }), server.serverName), react.default.createElement("div", { className: "vsm-mcp-actions" }, react.default.createElement("button", {
+				onClick: () => onRefresh(server.id),
+				title: "刷新连接"
+			}, "↻"), react.default.createElement("button", {
+				className: "vsm-danger",
+				onClick: () => onRemove(server.id),
+				title: "删除 MCP"
+			}, "⌫"), react.default.createElement("button", {
+				className: "vsm-switch " + (server.enabled ? "on" : ""),
+				onClick: () => onToggle(server),
+				"aria-label": server.enabled ? "禁用" : "启用"
+			}, server.enabled ? "●" : "○"))), react.default.createElement("div", { className: "vsm-mcp-meta" }, statusOf(server), " · ", server.toolCount, " 个工具 · ", server.transport), server.error && react.default.createElement("div", { className: "vsm-mcp-error" }, server.error), react.default.createElement("div", { className: "vsm-mcp-tools" }, server.tools.map((tool) => react.default.createElement("span", {
+				key: tool.name,
+				className: "vsm-mcp-chip",
+				title: tool.description || tool.name
+			}, tool.name))));
+		}
+		/** 按项目标题或路径过滤，大小写不敏感。 */
+		function filterProjects(projects, query) {
+			const needle = String(query ?? "").trim().toLowerCase();
+			if (!needle) return projects;
+			return projects.filter((project) => `${project.title} ${project.workspacePath}`.toLowerCase().includes(needle));
+		}
+		/** 带搜索的项目组合框。 */
+		function ProjectPicker({ projects, value, onChange }) {
+			const [open, setOpen] = react.default.useState(false);
+			const [query, setQuery] = react.default.useState("");
+			const [highlight, setHighlight] = react.default.useState(0);
+			const rootRef = react.default.useRef(null);
+			const selected = projects.find((project) => project.workspacePath === value);
+			const filtered = react.default.useMemo(() => filterProjects(projects, query), [projects, query]);
+			react.default.useEffect(() => {
+				const close = (event) => {
+					if (!rootRef.current?.contains(event.target)) setOpen(false);
+				};
+				document.addEventListener("mousedown", close);
+				return () => document.removeEventListener("mousedown", close);
+			}, []);
+			const choose = (project) => {
+				onChange(project.workspacePath);
+				setQuery("");
+				setOpen(false);
+			};
+			const move = (delta) => setHighlight((old) => Math.max(0, Math.min(Math.max(0, filtered.length - 1), old + delta)));
+			const keyDown = (event) => {
+				if (event.key === "ArrowDown") {
+					event.preventDefault();
+					move(1);
+				} else if (event.key === "ArrowUp") {
+					event.preventDefault();
+					move(-1);
+				} else if (event.key === "Enter" && filtered[highlight]) {
+					event.preventDefault();
+					choose(filtered[highlight]);
+				} else if (event.key === "Escape") {
+					event.preventDefault();
+					setOpen(false);
+				}
+			};
+			return react.default.createElement("div", {
+				className: "vsm-project-picker",
+				ref: rootRef
+			}, react.default.createElement("button", {
+				className: "vsm-project-picker-trigger",
+				role: "combobox",
+				"aria-expanded": open,
+				onClick: () => setOpen((old) => !old)
+			}, react.default.createElement("span", { className: "vsm-project-picker-label" }, selected?.title || "选择项目", selected && react.default.createElement("small", null, selected.workspacePath)), react.default.createElement("span", { className: "vsm-project-picker-arrow" }, open ? "⌃" : "⌄")), open && react.default.createElement("div", { className: "vsm-project-picker-menu" }, react.default.createElement("input", {
+				autoFocus: true,
+				className: "vsm-project-picker-search",
+				value: query,
+				placeholder: "搜索项目名称或路径…",
+				onChange: (event) => {
+					setQuery(event.target.value);
+					setHighlight(0);
+				},
+				onKeyDown: keyDown
+			}), react.default.createElement("div", {
+				className: "vsm-project-picker-options",
+				role: "listbox"
+			}, filtered.length ? filtered.map((project, index) => react.default.createElement("button", {
+				key: project.workspacePath,
+				role: "option",
+				"aria-selected": project.workspacePath === value,
+				className: "vsm-project-option " + (index === highlight ? "highlight" : "") + (project.workspacePath === value ? " selected" : ""),
+				onMouseEnter: () => setHighlight(index),
+				onClick: () => choose(project)
+			}, react.default.createElement("span", null, project.title), react.default.createElement("small", null, project.workspacePath, " · ", project.servers.length, " 个 MCP"))) : react.default.createElement("div", { className: "vsm-project-picker-empty" }, "没有匹配的项目"))));
+		}
+		/** 单个项目的 MCP 分组。 */
+		function ProjectGroup({ project, busy, onAdd, onRefresh, onToggle, onRemove }) {
+			const head = react.default.createElement("div", { className: "vsm-project-head" }, react.default.createElement("div", { className: "vsm-project-title" }, react.default.createElement("span", { className: "vsm-project-icon" }, "▣"), react.default.createElement("div", null, react.default.createElement("span", { className: "vsm-project-name" }, project.title), react.default.createElement("span", { className: "vsm-project-path" }, project.workspacePath))), react.default.createElement("button", {
+				className: "vsm-primary vsm-small",
+				onClick: () => onAdd(project)
+			}, "+ 添加 MCP"));
+			let body;
+			if (project.missingDir) body = react.default.createElement("div", { className: "vsm-project-empty" }, "项目目录已不存在，无法管理 MCP");
+			else if (project.fileError) body = react.default.createElement("div", { className: "vsm-mcp-error vsm-mcp-banner" }, project.fileError);
+			else if (!project.servers.length) body = react.default.createElement("div", { className: "vsm-project-empty" }, "此项目未配置 MCP");
+			else body = project.servers.map((server) => react.default.createElement(ServerCard, {
+				key: server.serverName,
+				server,
+				onRefresh: (id) => onRefresh(project, server, id),
+				onToggle: () => onToggle(project, server),
+				onRemove: (id) => onRemove(project, server, id)
+			}));
+			return react.default.createElement("section", { className: "vsm-project" }, head, body);
+		}
+		/** MCP 管理主面板。 */
+		function McpSettings() {
+			const [servers, setServers] = react.default.useState([]);
+			const [projects, setProjects] = react.default.useState([]);
+			const [loading, setLoading] = react.default.useState(true);
+			const [busy, setBusy] = react.default.useState("");
+			const [error, setError] = react.default.useState("");
+			const [tab, setTab] = react.default.useState("mine");
+			const [draft, setDraft] = react.default.useState(EMPTY);
+			const [showForm, setShowForm] = react.default.useState(false);
+			const [projectForm, setProjectForm] = react.default.useState(null);
+			const [selectedPath, setSelectedPath] = react.default.useState("");
+			react.default.useEffect(() => {
+				if (!projects.length) {
+					setSelectedPath("");
+					return;
+				}
+				if (!projects.some((project) => project.workspacePath === selectedPath)) setSelectedPath(projects[0].workspacePath);
+			}, [projects, selectedPath]);
+			const loadAll = react.default.useCallback(() => {
+				setLoading(true);
+				setError("");
+				Promise.all([rpc("mcp.list", {}), rpc("mcp.projects", {})]).then(([list, prj]) => {
+					if (!list.ok) throw new Error(list.error);
+					if (!prj.ok) throw new Error(prj.error);
+					setServers(list.servers);
+					setProjects(prj.projects);
+				}).catch((e) => setError(String(e))).finally(() => setLoading(false));
+			}, []);
+			react.default.useEffect(loadAll, [loadAll]);
+			const finish = (result) => {
+				if (!result.ok) throw new Error(result.error);
+				return result;
+			};
+			const action = (label, id, method, args, patch) => {
+				setBusy(id);
+				setError("");
+				return rpc(method, args).then(finish).then((result) => {
+					if (patch) patch(result);
+				}).catch((e) => setError(String(e))).finally(() => setBusy("")).then(() => label);
+			};
+			const refreshGlobal = (id) => action("refresh", id, "mcp.refresh", { id }, (r) => setServers((old) => old.map((s) => s.id === id ? r.server : s)));
+			const toggleGlobal = (s) => action("toggle", s.id, "mcp.toggle", {
+				id: s.id,
+				enabled: !s.enabled
+			}, (r) => setServers((old) => old.map((x) => x.id === s.id ? r.server : x)));
+			const removeGlobal = (s) => window.confirm("确认删除此 MCP 服务？") && action("remove", s.id, "mcp.remove", { id: s.id }, (r) => setServers((old) => old.filter((x) => x.id !== s.id)));
+			const replaceProject = (workspacePath) => (result) => setProjects((old) => old.map((p) => p.workspacePath === workspacePath ? result.project : p));
+			const projectAction = (workspacePath, serverName, method, args, patch) => {
+				setBusy(workspacePath + ":" + serverName);
+				setError("");
+				return rpc(method, args).then(finish).then((result) => {
+					if (patch) patch(result);
+				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
+			};
+			const refreshProject = (p, s) => projectAction(p.workspacePath, s.serverName, "mcp.projectRefresh", {
+				workspacePath: p.workspacePath,
+				serverName: s.serverName
+			}, replaceProject(p.workspacePath));
+			const toggleProject = (p, s) => projectAction(p.workspacePath, s.serverName, "mcp.projectToggle", {
+				workspacePath: p.workspacePath,
+				serverName: s.serverName,
+				enabled: !s.enabled
+			}, replaceProject(p.workspacePath));
+			const removeProject = (p, s) => window.confirm("确认删除此项目的 MCP「" + s.serverName + "」？") && projectAction(p.workspacePath, s.serverName, "mcp.projectRemove", {
+				workspacePath: p.workspacePath,
+				serverName: s.serverName
+			}, replaceProject(p.workspacePath));
+			const saveGlobal = () => {
+				setBusy("save");
+				setError("");
+				rpc("mcp.save", { config: configOf(draft) }).then(finish).then((result) => {
+					setServers((old) => old.some((s) => s.id === result.server.id) ? old.map((s) => s.id === result.server.id ? result.server : s) : old.concat(result.server));
+					setDraft(EMPTY);
+					setShowForm(false);
+				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
+			};
+			const saveProject = () => {
+				if (!projectForm) return;
+				setBusy("project-save");
+				setError("");
+				const config = configOf(draft);
+				rpc("mcp.projectSave", {
+					workspacePath: projectForm.workspacePath,
+					serverName: config.serverName,
+					config
+				}).then(finish).then((result) => {
+					setProjects((old) => old.map((p) => p.workspacePath === projectForm.workspacePath ? result.project : p));
+					setDraft(EMPTY);
+					setProjectForm(null);
+				}).catch((e) => setError(String(e))).finally(() => setBusy(""));
+			};
+			const edit = (key, value) => setDraft((old) => ({
+				...old,
+				[key]: value
+			}));
+			const marketBody = react.default.createElement("div", { className: "vsm-mcp-empty" }, "MCP 市场暂未接入");
+			const selectedProject = projects.find((project) => project.workspacePath === selectedPath);
+			const projectBody = projects.length ? react.default.createElement(react.default.Fragment, null, react.default.createElement(ProjectPicker, {
+				projects,
+				value: selectedPath,
+				onChange: setSelectedPath
+			}), selectedProject ? react.default.createElement(ProjectGroup, {
+				project: selectedProject,
+				busy,
+				onAdd: (project) => {
+					setDraft(EMPTY);
+					setProjectForm({
+						workspacePath: project.workspacePath,
+						title: project.title
+					});
+				},
+				onRefresh: refreshProject,
+				onToggle: toggleProject,
+				onRemove: removeProject
+			}) : react.default.createElement("div", { className: "vsm-mcp-empty" }, "请选择项目")) : react.default.createElement("div", { className: "vsm-mcp-empty" }, "还没有项目");
+			let body;
+			if (loading) body = react.default.createElement("div", { className: "vsm-mcp-empty" }, "正在读取 MCP 服务…");
+			else if (tab === "mine") body = react.default.createElement("div", null, servers.length ? servers.map((s) => react.default.createElement(ServerCard, {
+				key: s.id,
+				server: s,
+				onRefresh: refreshGlobal,
+				onToggle: toggleGlobal,
+				onRemove: removeGlobal
+			})) : react.default.createElement("div", { className: "vsm-mcp-empty" }, "还没有配置全局 MCP"));
+			else if (tab === "projects") body = projectBody;
+			else body = marketBody;
+			const form = showForm ? react.default.createElement(McpForm, {
+				title: "添加全局 MCP",
+				draft,
+				busy,
+				edit,
+				save: saveGlobal,
+				close: () => setShowForm(false)
+			}) : projectForm ? react.default.createElement(McpForm, {
+				title: "添加项目 MCP · " + projectForm.title,
+				draft,
+				busy,
+				edit,
+				save: saveProject,
+				close: () => setProjectForm(null)
+			}) : null;
+			return react.default.createElement("section", { className: "vsm-mcp-page" }, react.default.createElement("header", { className: "vsm-mcp-header" }, react.default.createElement("div", null, react.default.createElement("h2", null, "VSCodeMode"), react.default.createElement("p", null, "管理当前 profile 与各项目的 Model Context Protocol 服务。")), react.default.createElement("button", {
+				className: "vsm-primary",
+				onClick: () => {
+					setDraft(EMPTY);
+					setShowForm(true);
+				}
+			}, "+ 添加全局 MCP")), react.default.createElement("nav", { className: "vsm-mcp-tabs" }, react.default.createElement("button", {
+				className: tab === "mine" ? "active" : "",
+				onClick: () => setTab("mine")
+			}, "我的 MCP"), react.default.createElement("button", {
+				className: tab === "projects" ? "active" : "",
+				onClick: () => setTab("projects")
+			}, "项目 MCP"), react.default.createElement("button", {
+				className: tab === "market" ? "active" : "",
+				onClick: () => setTab("market")
+			}, "MCP 市场")), error && react.default.createElement("div", { className: "vsm-mcp-error vsm-mcp-banner" }, error), body, form);
+		}
+		/** MCP 新增表单（全局/项目共用）。 */
+		function McpForm({ title, draft, busy, edit, save, close }) {
+			const input = (key, placeholder) => react.default.createElement("input", {
+				value: draft[key],
+				onChange: (e) => edit(key, e.target.value),
+				placeholder
+			});
+			const fields = draft.transport === "stdio" ? react.default.createElement(react.default.Fragment, null, react.default.createElement("label", null, "命令", input("command", "npx")), react.default.createElement("label", null, "参数（空格或换行分隔）", react.default.createElement("textarea", {
+				value: draft.args,
+				onChange: (e) => edit("args", e.target.value)
+			})), react.default.createElement("label", null, "工作目录（可选）", input("cwd", ""))) : react.default.createElement(react.default.Fragment, null, react.default.createElement("label", null, "URL", input("url", "http://localhost:3000/mcp")), react.default.createElement("label", null, "请求头（每行 key=value）", react.default.createElement("textarea", {
+				value: draft.headers,
+				onChange: (e) => edit("headers", e.target.value)
+			})));
+			return react.default.createElement("div", { className: "vsm-mcp-modal" }, react.default.createElement("div", { className: "vsm-mcp-dialog" }, react.default.createElement("h3", null, title), react.default.createElement("label", null, "名称", input("serverName", "例如 codegraph")), react.default.createElement("label", null, "传输方式", react.default.createElement("select", {
+				value: draft.transport,
+				onChange: (e) => edit("transport", e.target.value)
+			}, react.default.createElement("option", { value: "stdio" }, "stdio"), react.default.createElement("option", { value: "streamable-http" }, "streamable-http"))), fields, react.default.createElement("div", { className: "vsm-mcp-dialog-actions" }, react.default.createElement("button", { onClick: close }, "取消"), react.default.createElement("button", {
+				className: "vsm-primary",
+				disabled: busy === "save" || busy === "project-save",
+				onClick: save
+			}, "保存并连接"))));
+		}
+		//#endregion
 		//#region src/client/index.ts
 		/**
 		* dsh-vscode-mode client — 浏览器半入口：slot 注册 + 装配。
@@ -1932,7 +2556,13 @@ window.__ModuleLoader__.load({
 		* 故跨版本兼容。slot 名未变：conversation.view / conversation.session.header.utilities。
 		* 作者 ddj 2026-08-20
 		*/
-		const inject = ["slots", "timer"];
+		const inject = [
+			"slots",
+			"timer",
+			"locale",
+			"connection",
+			"remote"
+		];
 		/**
 		* 装配客户端：注册中央编辑区视图与 header 差异角标。
 		* @author ddj 2026年08月20号
@@ -1953,6 +2583,12 @@ window.__ModuleLoader__.load({
 				order: 90,
 				label: "差异"
 			}, (props) => react.default.createElement(DiffBadge, Object.assign({}, props))));
+			ctx.slots.inject("settings.section", () => ctx.slots.register({
+				name: "settings.section",
+				id: "vscode-mode",
+				order: 30,
+				label: "VSCodeMode"
+			}, () => react.default.createElement(McpSettings)));
 		}
 		//#endregion
 		exports.apply = apply;