dsh-config-manager 0.1.79 → 0.1.80

package/lib/client.js

@@ -782,6 +782,7 @@ const uiZh = {
 	"report.unit.notes": "条说明",
 	"report.action.done": "完成",
 	"error.notMounted": "config-manager 服务未挂载（插件未加载）：请确认 profile 中已安装 dsh-config-manager 并重启 DSH",
+	"error.apiPathMissed": "接口路径未命中（HTTP {status}）：请求前缀为 {base}，但该路径没有返回 JSON —— 若你经反向代理挂在子路径下，请检查代理是否转发了这个前缀（issue #108）",
 	"error.httpInvalidJson": "HTTP {status}: 无效的 JSON 响应",
 	"error.fallback": "操作失败",
 	"error.requestTimeout": "请求超时（{seconds} 秒）：未在时限内收到宿主响应，请重试",
@@ -1327,6 +1328,7 @@ const uiEn = {
 	"report.unit.notes": "note(s)",
 	"report.action.done": "Done",
 	"error.notMounted": "config-manager service is not mounted (plugin not loaded): make sure dsh-config-manager is installed in the profile and restart DSH",
+	"error.apiPathMissed": "API path not matched (HTTP {status}): the request prefix is {base} but that path did not return JSON — if you serve DSH under a reverse-proxy sub-path, check that this prefix is proxied (issue #108)",
 	"error.httpInvalidJson": "HTTP {status}: invalid JSON response",
 	"error.fallback": "Operation failed",
 	"error.requestTimeout": "Request timed out ({seconds}s): the host did not respond in time, please retry",
@@ -2004,10 +2006,40 @@ var ExportFlow = class {
 * `route-parity.test.ts` 会点名缺失的那条。宿主 **prefix 路由**（recovery / lifecycle，
 * 由宿主内部按 path 分发，无逐条字面量）在该测试里单独登记。
 *
-* 边界：纯字符串模块，无任何 import（client bundle 自包含）。
+* 边界：无任何 import（client bundle 自包含）。浏览器下按 `document.baseURI` 解析前缀
+* （issue #108：反代子路径），Node / 无 document 环境回落根路径默认常量。
 */
-/** API 前缀（与宿主 `src/index.ts` 的 `API` 常量完全一致）。 */
-const API_BASE = "/api/dsh-config-manager";
+/** API 前缀的**默认**位置（同源根路径；与宿主 `src/index.ts` 的 `API` 常量完全一致）。 */
+const DEFAULT_API_BASE = "/api/dsh-config-manager";
+/**
+* 解析 API 前缀（issue #108）：**不能再写死根路径**。
+*
+* 反代把 DSH 挂在子路径下（如 `https://gw.example.com/app/dsh/`）时，浏览器的
+* `location.origin + '/api/dsh-config-manager'` 会丢掉前缀 → 网关回 HTML 404 →
+* 界面误报「插件未挂载」。这里改为按 `document.baseURI` 的**目录**解析：
+*
+*   /                      → /api/dsh-config-manager
+*   /app/dsh              → /app/dsh/api/dsh-config-manager
+*   /app/dsh/             → /app/dsh/api/dsh-config-manager
+*   /app/dsh/index.html   → /app/dsh/api/dsh-config-manager
+*
+* Node（单测 / 离线 CLI / 无 document 环境）一律回落 `DEFAULT_API_BASE`，与宿主常量逐字相同。
+*/
+function resolveApiBase(baseUri) {
+	if (typeof baseUri !== "string" || baseUri === "") return DEFAULT_API_BASE;
+	let pathname;
+	try {
+		pathname = new URL(baseUri).pathname;
+	} catch {
+		return DEFAULT_API_BASE;
+	}
+	if (!pathname.startsWith("/")) return DEFAULT_API_BASE;
+	const dir = pathname.endsWith("/index.html") ? pathname.slice(0, -10) : pathname;
+	const prefix = dir.endsWith("/") ? dir : dir + "/";
+	return prefix === "/" ? DEFAULT_API_BASE : `${prefix}api/dsh-config-manager`;
+}
+/** API 前缀：按当前页面的 base 解析（无 document 时即默认根路径）。 */
+const API_BASE = resolveApiBase(typeof document === "undefined" ? void 0 : document.baseURI);
 /** 主 API 路由族（导出 / 导入 / 快照 / 档案 / 备份文件 / 咨询 / 弹窗偏好）。 */
 const CONFIG_MANAGER_API = {
 	base: API_BASE,
@@ -2213,7 +2245,8 @@ var ConfigManagerApiError = class extends Error {
 * 解析 JSON 响应；非 2xx 时抛出带路由 error 消息的 ConfigManagerApiError。
 *
 * 错误口径（唯一实现，7 个 api 文件共用）：
-*  1. 响应体不是 JSON：404 → 「插件未挂载」；其余 → `error.httpInvalidJson`；
+*  1. 响应体不是 JSON：404 → 「接口路径未命中」（issue #108：网关对未知路径回 HTML 404，
+*     常见于反代丢了子路径前缀，不能再说成「插件未加载」）；其余 → `error.httpInvalidJson`；
 *  2. 非 2xx：`{message}` → `{error}` → 404「未挂载」→ `HTTP <status>`。
 */
 async function readJson(response, t) {
@@ -2222,7 +2255,10 @@ async function readJson(response, t) {
 	try {
 		body = await response.json();
 	} catch {
-		if (response.status === 404) throw new ConfigManagerApiError(notMountedMessage);
+		if (response.status === 404) throw new ConfigManagerApiError(t("error.apiPathMissed", {
+			status: "404",
+			base: API_BASE
+		}), 404);
 		throw new ConfigManagerApiError(t("error.httpInvalidJson", { status: String(response.status) }));
 	}
 	if (!response.ok) {
@@ -14793,565 +14829,565 @@ if (typeof document !== "undefined" && document.querySelector("style[data-tag=\"
 	document.head.appendChild(tag);
 }
 var config_manager_module_css_default = {
-	"rollbackLedger": "_367UGW_rollbackLedger",
-	"primaryButton": "_367UGW_primaryButton",
-	"chatFileExt": "_367UGW_chatFileExt",
-	"skeletonRows": "_367UGW_skeletonRows",
-	"cellMain": "_367UGW_cellMain",
-	"skeletonCard": "_367UGW_skeletonCard",
-	"pullScroll": "_367UGW_pullScroll",
-	"taskPanel": "_367UGW_taskPanel",
-	"choiceCard": "_367UGW_choiceCard",
-	"actionRow": "_367UGW_actionRow",
-	"categoryItem": "_367UGW_categoryItem",
+	"historyMeta": "_367UGW_historyMeta",
+	"modeHint": "_367UGW_modeHint",
+	"snapshotRow": "_367UGW_snapshotRow",
+	"confirmItemDesc": "_367UGW_confirmItemDesc",
+	"artifactRowHead": "_367UGW_artifactRowHead",
+	"maskIn": "_367UGW_maskIn",
+	"snapshotList": "_367UGW_snapshotList",
+	"groupLabel": "_367UGW_groupLabel",
+	"dialogContentCenter": "_367UGW_dialogContentCenter",
+	"artifactMeta": "_367UGW_artifactMeta",
+	"logPanel": "_367UGW_logPanel",
+	"reportView": "_367UGW_reportView",
+	"diffCellDel": "_367UGW_diffCellDel",
+	"rowActions": "_367UGW_rowActions",
+	"rollbackSessionId": "_367UGW_rollbackSessionId",
+	"mergeTileLabel": "_367UGW_mergeTileLabel",
+	"errorList": "_367UGW_errorList",
 	"iconBtn": "_367UGW_iconBtn",
-	"runsWarnNote": "_367UGW_runsWarnNote",
-	"modeTabs": "_367UGW_modeTabs",
-	"diffPane": "_367UGW_diffPane",
-	"skeletonRowMeta": "_367UGW_skeletonRowMeta",
-	"groupHeader": "_367UGW_groupHeader",
-	"logScroll": "_367UGW_logScroll",
-	"kvValue": "_367UGW_kvValue",
+	"selectMenuIn": "_367UGW_selectMenuIn",
+	"progressPercent": "_367UGW_progressPercent",
+	"runsOptionTitle": "_367UGW_runsOptionTitle",
+	"sourceList": "_367UGW_sourceList",
+	"chatFileIcon": "_367UGW_chatFileIcon",
+	"historyRow": "_367UGW_historyRow",
+	"marketReviewScroll": "_367UGW_marketReviewScroll",
+	"authorRow": "_367UGW_authorRow",
+	"pickerList": "_367UGW_pickerList",
+	"conflictLineLabel": "_367UGW_conflictLineLabel",
+	"activityTime": "_367UGW_activityTime",
+	"restorePlanRow": "_367UGW_restorePlanRow",
+	"diffNoHead": "_367UGW_diffNoHead",
+	"choiceTitle": "_367UGW_choiceTitle",
+	"toastViewport": "_367UGW_toastViewport",
+	"reportBody": "_367UGW_reportBody",
+	"previewChoiceRow": "_367UGW_previewChoiceRow",
+	"indet": "_367UGW_indet",
+	"mergeColValue": "_367UGW_mergeColValue",
+	"conflictHead": "_367UGW_conflictHead",
+	"sectionRow": "_367UGW_sectionRow",
+	"snapshotPickerRow": "_367UGW_snapshotPickerRow",
 	"cliCommand": "_367UGW_cliCommand",
-	"badgeHost": "_367UGW_badgeHost",
-	"skipRow": "_367UGW_skipRow",
-	"progressBlock": "_367UGW_progressBlock",
-	"sourceRow": "_367UGW_sourceRow",
-	"mergeTileValue": "_367UGW_mergeTileValue",
-	"diffStatDel": "_367UGW_diffStatDel",
-	"chatRawPre": "_367UGW_chatRawPre",
-	"restorePlanList": "_367UGW_restorePlanList",
-	"navMore": "_367UGW_navMore",
-	"dataTable": "_367UGW_dataTable",
-	"activityRows": "_367UGW_activityRows",
-	"sparseFill": "_367UGW_sparseFill",
-	"aboutAuthor": "_367UGW_aboutAuthor",
-	"conflictChoices": "_367UGW_conflictChoices",
-	"shIssue": "_367UGW_shIssue",
+	"skeletonRowTitle": "_367UGW_skeletonRowTitle",
+	"pickerAction": "_367UGW_pickerAction",
+	"logHeader": "_367UGW_logHeader",
+	"reportProblemRow": "_367UGW_reportProblemRow",
+	"field": "_367UGW_field",
+	"artifactActions": "_367UGW_artifactActions",
+	"cellMetaNoteText": "_367UGW_cellMetaNoteText",
+	"rollbackLedgerMain": "_367UGW_rollbackLedgerMain",
+	"activityBadge": "_367UGW_activityBadge",
+	"toastText": "_367UGW_toastText",
+	"sourcePaths": "_367UGW_sourcePaths",
+	"cliName": "_367UGW_cliName",
+	"restorePlanNote": "_367UGW_restorePlanNote",
+	"chatBubbleText": "_367UGW_chatBubbleText",
+	"mergeCol": "_367UGW_mergeCol",
+	"skipText": "_367UGW_skipText",
+	"reportProblemText": "_367UGW_reportProblemText",
+	"diffFileStat": "_367UGW_diffFileStat",
+	"logCounts": "_367UGW_logCounts",
+	"restorePlan": "_367UGW_restorePlan",
+	"activityHeader": "_367UGW_activityHeader",
+	"reportText": "_367UGW_reportText",
+	"rollbackTabIcon": "_367UGW_rollbackTabIcon",
+	"runsCardActions": "_367UGW_runsCardActions",
+	"logScroll": "_367UGW_logScroll",
+	"taskBody": "_367UGW_taskBody",
+	"statSegDim": "_367UGW_statSegDim",
+	"factCell": "_367UGW_factCell",
 	"pathNew": "_367UGW_pathNew",
-	"skeletonCards": "_367UGW_skeletonCards",
-	"skeletonRow": "_367UGW_skeletonRow",
-	"statusDot": "_367UGW_statusDot",
-	"logPanel": "_367UGW_logPanel",
-	"mergeSectionHead": "_367UGW_mergeSectionHead",
-	"card": "_367UGW_card",
+	"rollbackPointsScroll": "_367UGW_rollbackPointsScroll",
+	"librarySkeletonRegion": "_367UGW_librarySkeletonRegion",
 	"rollbackSummary": "_367UGW_rollbackSummary",
-	"shSectionHead": "_367UGW_shSectionHead",
-	"updateNotesLoading": "_367UGW_updateNotesLoading",
-	"statSeg": "_367UGW_statSeg",
-	"badge": "_367UGW_badge",
-	"badgeRow": "_367UGW_badgeRow",
-	"runsLogLine": "_367UGW_runsLogLine",
-	"chatAttachmentRow": "_367UGW_chatAttachmentRow",
-	"rollbackSessionItem": "_367UGW_rollbackSessionItem",
-	"errorItem": "_367UGW_errorItem",
-	"selectMenuIn": "_367UGW_selectMenuIn",
+	"kindTagOk": "_367UGW_kindTagOk",
+	"stepperDot": "_367UGW_stepperDot",
+	"pathOld": "_367UGW_pathOld",
+	"libraryListState": "_367UGW_libraryListState",
+	"skeletonCards": "_367UGW_skeletonCards",
+	"pullScroll": "_367UGW_pullScroll",
+	"aboutAuthor": "_367UGW_aboutAuthor",
+	"marketReviewPage": "_367UGW_marketReviewPage",
+	"artifactMain": "_367UGW_artifactMain",
+	"mergeColLabel": "_367UGW_mergeColLabel",
+	"tableScroll": "_367UGW_tableScroll",
+	"progressBar": "_367UGW_progressBar",
+	"formError": "_367UGW_formError",
+	"nextStepsList": "_367UGW_nextStepsList",
+	"chatActionBtn": "_367UGW_chatActionBtn",
+	"rollbackGroup": "_367UGW_rollbackGroup",
+	"rollbackLedger": "_367UGW_rollbackLedger",
+	"progressBadgeCount": "_367UGW_progressBadgeCount",
+	"rollbackPointTurn": "_367UGW_rollbackPointTurn",
+	"reportHeadline": "_367UGW_reportHeadline",
+	"progressMeta": "_367UGW_progressMeta",
+	"modeTab": "_367UGW_modeTab",
+	"shRowMeta": "_367UGW_shRowMeta",
 	"shScroll": "_367UGW_shScroll",
-	"chatEntryReference": "_367UGW_chatEntryReference",
-	"shHeaderTrailing": "_367UGW_shHeaderTrailing",
-	"mergeFooterSummary": "_367UGW_mergeFooterSummary",
-	"taskPanelIn": "_367UGW_taskPanelIn",
-	"selectMenuPortal": "_367UGW_selectMenuPortal",
-	"activityTime": "_367UGW_activityTime",
+	"errorFooter": "_367UGW_errorFooter",
+	"shMetrics": "_367UGW_shMetrics",
+	"cellActions": "_367UGW_cellActions",
+	"hiddenFile": "_367UGW_hiddenFile",
+	"conflictOptions": "_367UGW_conflictOptions",
 	"sectionGrid": "_367UGW_sectionGrid",
-	"cellMeta": "_367UGW_cellMeta",
-	"sectionSize": "_367UGW_sectionSize",
-	"pathOld": "_367UGW_pathOld",
-	"navMoreRoot": "_367UGW_navMoreRoot",
-	"toastViewport": "_367UGW_toastViewport",
-	"categoryName": "_367UGW_categoryName",
+	"logLine": "_367UGW_logLine",
+	"pickerFooter": "_367UGW_pickerFooter",
 	"restorePlanRowStatic": "_367UGW_restorePlanRowStatic",
-	"historyGroup": "_367UGW_historyGroup",
-	"profileRowHeader": "_367UGW_profileRowHeader",
-	"rollbackFileStat": "_367UGW_rollbackFileStat",
-	"shSeverityCount": "_367UGW_shSeverityCount",
-	"fillCard": "_367UGW_fillCard",
-	"paletteItem": "_367UGW_paletteItem",
-	"pickerModalBody": "_367UGW_pickerModalBody",
-	"chatEntryNotice": "_367UGW_chatEntryNotice",
-	"chatFileIcon": "_367UGW_chatFileIcon",
-	"logCounts": "_367UGW_logCounts",
-	"pickerSubgroup": "_367UGW_pickerSubgroup",
-	"modeHint": "_367UGW_modeHint",
-	"shPanelHead": "_367UGW_shPanelHead",
-	"mono": "_367UGW_mono",
-	"chatFallbackBubble": "_367UGW_chatFallbackBubble",
-	"chatRawSummary": "_367UGW_chatRawSummary",
-	"historySections": "_367UGW_historySections",
-	"updateVersionRow": "_367UGW_updateVersionRow",
-	"diffPaneFill": "_367UGW_diffPaneFill",
-	"rollbackLedgerMain": "_367UGW_rollbackLedgerMain",
-	"reportScroll": "_367UGW_reportScroll",
-	"shRowTop": "_367UGW_shRowTop",
-	"fieldLabel": "_367UGW_fieldLabel",
-	"reportBlock": "_367UGW_reportBlock",
-	"errorReason": "_367UGW_errorReason",
-	"libraryFilterCount": "_367UGW_libraryFilterCount",
-	"rollbackToolbar": "_367UGW_rollbackToolbar",
-	"consultDimension": "_367UGW_consultDimension",
-	"conflictLineLabel": "_367UGW_conflictLineLabel",
-	"shSeverity": "_367UGW_shSeverity",
-	"pickerSubgroupName": "_367UGW_pickerSubgroupName",
-	"radioLabel": "_367UGW_radioLabel",
-	"dialogIn": "_367UGW_dialogIn",
-	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
-	"progressBadgeCount": "_367UGW_progressBadgeCount",
-	"marketFilterSearch": "_367UGW_marketFilterSearch",
-	"mergeActions": "_367UGW_mergeActions",
+	"mergeToolbar": "_367UGW_mergeToolbar",
+	"selectMenu": "_367UGW_selectMenu",
+	"shHeaderTrailing": "_367UGW_shHeaderTrailing",
 	"skipList": "_367UGW_skipList",
-	"skipCode": "_367UGW_skipCode",
-	"pickerUnitNested": "_367UGW_pickerUnitNested",
-	"chatBubble": "_367UGW_chatBubble",
-	"shRow": "_367UGW_shRow",
-	"statStrip": "_367UGW_statStrip",
-	"rollbackGroup": "_367UGW_rollbackGroup",
-	"selectRoot": "_367UGW_selectRoot",
-	"paletteItemLabel": "_367UGW_paletteItemLabel",
-	"tableScroll": "_367UGW_tableScroll",
-	"dim": "_367UGW_dim",
-	"dialogBodyScroll": "_367UGW_dialogBodyScroll",
-	"severityError": "_367UGW_severityError",
-	"rollbackPointTurn": "_367UGW_rollbackPointTurn",
-	"rollbackPointActions": "_367UGW_rollbackPointActions",
-	"runsCardHead": "_367UGW_runsCardHead",
 	"selectLabel": "_367UGW_selectLabel",
-	"shPanel": "_367UGW_shPanel",
-	"paletteList": "_367UGW_paletteList",
-	"pageEnter": "_367UGW_pageEnter",
-	"shSectionTitle": "_367UGW_shSectionTitle",
-	"errorBanner": "_367UGW_errorBanner",
-	"toast": "_367UGW_toast",
-	"runsOptionDesc": "_367UGW_runsOptionDesc",
-	"kindTagOk": "_367UGW_kindTagOk",
-	"statRow": "_367UGW_statRow",
-	"factLabel": "_367UGW_factLabel",
-	"diffNoColW5": "_367UGW_diffNoColW5",
-	"statusBar": "_367UGW_statusBar",
-	"noticeSlot": "_367UGW_noticeSlot",
-	"categoryDesc": "_367UGW_categoryDesc",
-	"progressTrack": "_367UGW_progressTrack",
-	"wizardStepperRow": "_367UGW_wizardStepperRow",
-	"conflictList": "_367UGW_conflictList",
-	"shRowFacts": "_367UGW_shRowFacts",
-	"consultScroll": "_367UGW_consultScroll",
-	"activityTitle": "_367UGW_activityTitle",
-	"diffFileStat": "_367UGW_diffFileStat",
-	"indet": "_367UGW_indet",
-	"confirmScroll": "_367UGW_confirmScroll",
-	"infoHint": "_367UGW_infoHint",
-	"restorePlan": "_367UGW_restorePlan",
-	"shLines": "_367UGW_shLines",
+	"statSeg": "_367UGW_statSeg",
+	"sectionSize": "_367UGW_sectionSize",
+	"skeletonRowMeta": "_367UGW_skeletonRowMeta",
+	"fillCard": "_367UGW_fillCard",
+	"selectRoot": "_367UGW_selectRoot",
 	"shellMain": "_367UGW_shellMain",
-	"rollbackFileRow": "_367UGW_rollbackFileRow",
-	"spinnerWrap": "_367UGW_spinnerWrap",
-	"shMetricLabel": "_367UGW_shMetricLabel",
-	"snapshotPickerRow": "_367UGW_snapshotPickerRow",
-	"restorePlanRow": "_367UGW_restorePlanRow",
-	"diffNoHead": "_367UGW_diffNoHead",
-	"chatEntryRow": "_367UGW_chatEntryRow",
-	"reportHeadline": "_367UGW_reportHeadline",
-	"shMetric": "_367UGW_shMetric",
-	"syncActivity": "_367UGW_syncActivity",
-	"conflictLine": "_367UGW_conflictLine",
-	"statusIndeterminate": "_367UGW_statusIndeterminate",
-	"aboutLinkRow": "_367UGW_aboutLinkRow",
-	"marketReviewScroll": "_367UGW_marketReviewScroll",
-	"shellContent": "_367UGW_shellContent",
-	"librarySkeletonRegion": "_367UGW_librarySkeletonRegion",
-	"historySummary": "_367UGW_historySummary",
-	"libraryListState": "_367UGW_libraryListState",
-	"skipMeta": "_367UGW_skipMeta",
-	"artifactTitle": "_367UGW_artifactTitle",
-	"statusText": "_367UGW_statusText",
-	"artifactDetailInner": "_367UGW_artifactDetailInner",
-	"empty": "_367UGW_empty",
-	"rollbackFilePath": "_367UGW_rollbackFilePath",
-	"rollbackSessionId": "_367UGW_rollbackSessionId",
-	"shRowActions": "_367UGW_shRowActions",
-	"mergeMeta": "_367UGW_mergeMeta",
-	"errorLine": "_367UGW_errorLine",
-	"dialogOut": "_367UGW_dialogOut",
-	"dialogHeaderRow": "_367UGW_dialogHeaderRow",
-	"sectionTitleRow": "_367UGW_sectionTitleRow",
-	"resultScroll": "_367UGW_resultScroll",
-	"diffFileHead": "_367UGW_diffFileHead",
-	"secretsList": "_367UGW_secretsList",
-	"pickerUnitName": "_367UGW_pickerUnitName",
-	"rollbackPointTop": "_367UGW_rollbackPointTop",
-	"chatFileMeta": "_367UGW_chatFileMeta",
-	"fillViewport": "_367UGW_fillViewport",
-	"chatEntryStack": "_367UGW_chatEntryStack",
-	"historyMeta": "_367UGW_historyMeta",
-	"reasonLine": "_367UGW_reasonLine",
-	"diffTable": "_367UGW_diffTable",
-	"conflictLineValue": "_367UGW_conflictLineValue",
-	"runsCardActions": "_367UGW_runsCardActions",
-	"syncChannelBody": "_367UGW_syncChannelBody",
+	"groupItems": "_367UGW_groupItems",
+	"profileRowHeader": "_367UGW_profileRowHeader",
+	"taskTitle": "_367UGW_taskTitle",
+	"activityKind": "_367UGW_activityKind",
+	"badge": "_367UGW_badge",
+	"spinnerLabel": "_367UGW_spinnerLabel",
+	"marketFilterGrid": "_367UGW_marketFilterGrid",
+	"diffStatDel": "_367UGW_diffStatDel",
+	"runsSummaryTitle": "_367UGW_runsSummaryTitle",
+	"reasonList": "_367UGW_reasonList",
+	"shRow": "_367UGW_shRow",
+	"runsSummary": "_367UGW_runsSummary",
+	"navMoreRoot": "_367UGW_navMoreRoot",
 	"infoValue": "_367UGW_infoValue",
-	"rollbackScroll": "_367UGW_rollbackScroll",
-	"updateVersionArrow": "_367UGW_updateVersionArrow",
-	"progressBadge": "_367UGW_progressBadge",
 	"activityResultOk": "_367UGW_activityResultOk",
+	"reportScroll": "_367UGW_reportScroll",
+	"chatEntryStack": "_367UGW_chatEntryStack",
+	"pickerGroupTitleName": "_367UGW_pickerGroupTitleName",
+	"sectionSubtitle": "_367UGW_sectionSubtitle",
+	"libraryFilters": "_367UGW_libraryFilters",
+	"mergeSectionName": "_367UGW_mergeSectionName",
+	"skeletonShimmer": "_367UGW_skeletonShimmer",
+	"confirmItemHead": "_367UGW_confirmItemHead",
+	"actionRow": "_367UGW_actionRow",
+	"shRowActions": "_367UGW_shRowActions",
+	"libraryFooter": "_367UGW_libraryFooter",
+	"snapshotRowName": "_367UGW_snapshotRowName",
+	"reportProblemReason": "_367UGW_reportProblemReason",
+	"sourceRowMain": "_367UGW_sourceRowMain",
+	"dialogWide": "_367UGW_dialogWide",
+	"snapshotRowFacts": "_367UGW_snapshotRowFacts",
+	"rollbackSessions": "_367UGW_rollbackSessions",
 	"mergeConflictPath": "_367UGW_mergeConflictPath",
-	"diffCellAdd": "_367UGW_diffCellAdd",
-	"artifactExpand": "_367UGW_artifactExpand",
-	"groupNote": "_367UGW_groupNote",
-	"collapse": "_367UGW_collapse",
-	"shMetricValue": "_367UGW_shMetricValue",
-	"kindTagError": "_367UGW_kindTagError",
-	"skeletonTitle": "_367UGW_skeletonTitle",
-	"restorePlanStat": "_367UGW_restorePlanStat",
-	"syncActivityLabel": "_367UGW_syncActivityLabel",
-	"spinnerTrack": "_367UGW_spinnerTrack",
-	"chatEntryTime": "_367UGW_chatEntryTime",
-	"artifactDetailWrap": "_367UGW_artifactDetailWrap",
-	"viewEnter": "_367UGW_viewEnter",
-	"pathRow": "_367UGW_pathRow",
-	"snapshotRowMain": "_367UGW_snapshotRowMain",
-	"spinner": "_367UGW_spinner",
-	"shCommands": "_367UGW_shCommands",
-	"statHealthAction": "_367UGW_statHealthAction",
-	"cellActions": "_367UGW_cellActions",
-	"artifactActions": "_367UGW_artifactActions",
-	"kvRow": "_367UGW_kvRow",
-	"previewScopeOff": "_367UGW_previewScopeOff",
-	"controlRow": "_367UGW_controlRow",
-	"taskHead": "_367UGW_taskHead",
 	"pickerChevronSpacer": "_367UGW_pickerChevronSpacer",
-	"historyRow": "_367UGW_historyRow",
-	"copyBtn": "_367UGW_copyBtn",
-	"reportView": "_367UGW_reportView",
-	"skeletonBlock": "_367UGW_skeletonBlock",
-	"logFilterButton": "_367UGW_logFilterButton",
-	"diffNoAdd": "_367UGW_diffNoAdd",
-	"sourcePaths": "_367UGW_sourcePaths",
-	"rollbackPointsScroll": "_367UGW_rollbackPointsScroll",
-	"stepperConnector": "_367UGW_stepperConnector",
-	"activityKind": "_367UGW_activityKind",
-	"rollbackFileIcon": "_367UGW_rollbackFileIcon",
-	"groupList": "_367UGW_groupList",
-	"rollbackDeleted": "_367UGW_rollbackDeleted",
-	"runsCardTitle": "_367UGW_runsCardTitle",
-	"snapshotRowBadges": "_367UGW_snapshotRowBadges",
-	"restorePlanGroupHead": "_367UGW_restorePlanGroupHead",
-	"selectOptionLabel": "_367UGW_selectOptionLabel",
-	"pickerRoot": "_367UGW_pickerRoot",
-	"conflictOptions": "_367UGW_conflictOptions",
-	"stepperLabel": "_367UGW_stepperLabel",
+	"rollbackGroupTitle": "_367UGW_rollbackGroupTitle",
+	"stepper": "_367UGW_stepper",
+	"rollbackPointMeta": "_367UGW_rollbackPointMeta",
+	"runsOption": "_367UGW_runsOption",
+	"historyScroll": "_367UGW_historyScroll",
+	"cellMain": "_367UGW_cellMain",
 	"diffFilePath": "_367UGW_diffFilePath",
+	"taskHead": "_367UGW_taskHead",
+	"shCommand": "_367UGW_shCommand",
+	"skeletonCard": "_367UGW_skeletonCard",
+	"statHealthAction": "_367UGW_statHealthAction",
+	"dialogClose": "_367UGW_dialogClose",
+	"categoryDesc": "_367UGW_categoryDesc",
+	"resultFooter": "_367UGW_resultFooter",
+	"diffPane": "_367UGW_diffPane",
+	"warnText": "_367UGW_warnText",
+	"radioLabel": "_367UGW_radioLabel",
+	"groupNote": "_367UGW_groupNote",
+	"navMeasure": "_367UGW_navMeasure",
+	"shPanelHead": "_367UGW_shPanelHead",
+	"shNotes": "_367UGW_shNotes",
+	"input": "_367UGW_input",
+	"primaryButton": "_367UGW_primaryButton",
+	"spinnerArc": "_367UGW_spinnerArc",
+	"progressBlock": "_367UGW_progressBlock",
+	"shSeverity": "_367UGW_shSeverity",
+	"mergeSectionHead": "_367UGW_mergeSectionHead",
+	"shCommands": "_367UGW_shCommands",
+	"profileRow": "_367UGW_profileRow",
+	"paletteList": "_367UGW_paletteList",
+	"runsOptionTag": "_367UGW_runsOptionTag",
+	"empty": "_367UGW_empty",
+	"conflictId": "_367UGW_conflictId",
+	"runsCardHead": "_367UGW_runsCardHead",
+	"progressTrack": "_367UGW_progressTrack",
 	"rollbackFileDir": "_367UGW_rollbackFileDir",
-	"libraryFilters": "_367UGW_libraryFilters",
-	"diffNo": "_367UGW_diffNo",
-	"sectionCount": "_367UGW_sectionCount",
-	"shellNav": "_367UGW_shellNav",
 	"libraryFilter": "_367UGW_libraryFilter",
-	"factValue": "_367UGW_factValue",
-	"pickerChildren": "_367UGW_pickerChildren",
-	"mergeActionActive": "_367UGW_mergeActionActive",
-	"snapshotRowMeta": "_367UGW_snapshotRowMeta",
-	"progressBarFailed": "_367UGW_progressBarFailed",
-	"planScroll": "_367UGW_planScroll",
-	"rollbackMetaDot": "_367UGW_rollbackMetaDot",
-	"sectionRow": "_367UGW_sectionRow",
-	"snapshotRowFacts": "_367UGW_snapshotRowFacts",
-	"mergeView": "_367UGW_mergeView",
-	"skeletonRowTitle": "_367UGW_skeletonRowTitle",
-	"mergeToolbar": "_367UGW_mergeToolbar",
-	"diffCellDel": "_367UGW_diffCellDel",
-	"activitySummary": "_367UGW_activitySummary",
-	"diffCell": "_367UGW_diffCell",
-	"historyRowMain": "_367UGW_historyRowMain",
-	"selectOption": "_367UGW_selectOption",
-	"conflictHead": "_367UGW_conflictHead",
-	"statusTask": "_367UGW_statusTask",
-	"skeletonRoot": "_367UGW_skeletonRoot",
-	"artifactMeta": "_367UGW_artifactMeta",
-	"taskBody": "_367UGW_taskBody",
+	"shLines": "_367UGW_shLines",
+	"skeletonBars": "_367UGW_skeletonBars",
+	"dialogHeader": "_367UGW_dialogHeader",
+	"navDot": "_367UGW_navDot",
+	"reportFooter": "_367UGW_reportFooter",
+	"paletteItemGroup": "_367UGW_paletteItemGroup",
+	"statRow": "_367UGW_statRow",
+	"statusBar": "_367UGW_statusBar",
 	"libraryCount": "_367UGW_libraryCount",
-	"activitySummaryText": "_367UGW_activitySummaryText",
+	"historyRowMain": "_367UGW_historyRowMain",
+	"sourceRowName": "_367UGW_sourceRowName",
+	"diffNoColW5": "_367UGW_diffNoColW5",
+	"consultSection": "_367UGW_consultSection",
+	"skipRow": "_367UGW_skipRow",
+	"sectionTitle": "_367UGW_sectionTitle",
+	"progressBarDone": "_367UGW_progressBarDone",
+	"card": "_367UGW_card",
+	"groupHintRow": "_367UGW_groupHintRow",
+	"runsCenter": "_367UGW_runsCenter",
+	"shMetric": "_367UGW_shMetric",
+	"bannerSlot": "_367UGW_bannerSlot",
+	"factGrid": "_367UGW_factGrid",
+	"optionsRow": "_367UGW_optionsRow",
+	"noticeSlot": "_367UGW_noticeSlot",
+	"sourceRow": "_367UGW_sourceRow",
+	"errorLine": "_367UGW_errorLine",
+	"cellTitle": "_367UGW_cellTitle",
+	"mergeResult": "_367UGW_mergeResult",
+	"diskUsageScroll": "_367UGW_diskUsageScroll",
+	"taskPanel": "_367UGW_taskPanel",
+	"pageEnter": "_367UGW_pageEnter",
+	"activityRow": "_367UGW_activityRow",
+	"sourceRowHead": "_367UGW_sourceRowHead",
+	"updateVersionRow": "_367UGW_updateVersionRow",
+	"activityEmpty": "_367UGW_activityEmpty",
+	"previewScope": "_367UGW_previewScope",
+	"num": "_367UGW_num",
+	"spinnerWrap": "_367UGW_spinnerWrap",
+	"activityTitle": "_367UGW_activityTitle",
+	"reportBlock": "_367UGW_reportBlock",
+	"spinnerTrack": "_367UGW_spinnerTrack",
+	"chatBubble": "_367UGW_chatBubble",
+	"shRowTop": "_367UGW_shRowTop",
+	"viewEnter": "_367UGW_viewEnter",
+	"diffStatAdd": "_367UGW_diffStatAdd",
+	"rollbackScroll": "_367UGW_rollbackScroll",
+	"errorTitle": "_367UGW_errorTitle",
+	"activityCard": "_367UGW_activityCard",
+	"shSeverities": "_367UGW_shSeverities",
+	"infoHintBubble": "_367UGW_infoHintBubble",
 	"mergeIconLabel": "_367UGW_mergeIconLabel",
-	"pickerUnit": "_367UGW_pickerUnit",
-	"navStrip": "_367UGW_navStrip",
-	"libraryFooter": "_367UGW_libraryFooter",
-	"mergeConflictReason": "_367UGW_mergeConflictReason",
-	"dialogWide": "_367UGW_dialogWide",
-	"runsOption": "_367UGW_runsOption",
-	"kindTagInfo": "_367UGW_kindTagInfo",
-	"segGroup": "_367UGW_segGroup",
-	"reportProblemHead": "_367UGW_reportProblemHead",
-	"syncActivityTrack": "_367UGW_syncActivityTrack",
-	"groupLabel": "_367UGW_groupLabel",
-	"errorActionLabel": "_367UGW_errorActionLabel",
-	"dialogFooter": "_367UGW_dialogFooter",
-	"statHealth": "_367UGW_statHealth",
-	"rollbackPoint": "_367UGW_rollbackPoint",
-	"paletteEmpty": "_367UGW_paletteEmpty",
-	"mergeColValue": "_367UGW_mergeColValue",
-	"progressPercent": "_367UGW_progressPercent",
-	"headRow": "_367UGW_headRow",
-	"selectMenu": "_367UGW_selectMenu",
-	"stepperStep": "_367UGW_stepperStep",
-	"diffNoDel": "_367UGW_diffNoDel",
-	"chatBubbleText": "_367UGW_chatBubbleText",
-	"sourceRowMain": "_367UGW_sourceRowMain",
-	"librarySearch": "_367UGW_librarySearch",
-	"logEmpty": "_367UGW_logEmpty",
-	"kindTagWarn": "_367UGW_kindTagWarn",
-	"skeletonRowBody": "_367UGW_skeletonRowBody",
-	"authorRow": "_367UGW_authorRow",
-	"rollbackTabIcon": "_367UGW_rollbackTabIcon",
-	"choiceTitle": "_367UGW_choiceTitle",
-	"infoHintIn": "_367UGW_infoHintIn",
+	"runsLogLine": "_367UGW_runsLogLine",
+	"syncChannelBody": "_367UGW_syncChannelBody",
+	"logDetail": "_367UGW_logDetail",
+	"selectMenuPortal": "_367UGW_selectMenuPortal",
+	"controlRow": "_367UGW_controlRow",
+	"skipMeta": "_367UGW_skipMeta",
+	"statValueSkeleton": "_367UGW_statValueSkeleton",
+	"pickerTreeRow": "_367UGW_pickerTreeRow",
+	"reportSectionRow": "_367UGW_reportSectionRow",
+	"listHeaderRow": "_367UGW_listHeaderRow",
+	"diffHunkRow": "_367UGW_diffHunkRow",
+	"checkboxRow": "_367UGW_checkboxRow",
+	"progressBadgeSection": "_367UGW_progressBadgeSection",
+	"dialogBody": "_367UGW_dialogBody",
+	"chatFileExt": "_367UGW_chatFileExt",
+	"rollbackSessionMeta": "_367UGW_rollbackSessionMeta",
+	"mergeView": "_367UGW_mergeView",
+	"statusText": "_367UGW_statusText",
+	"fieldLabel": "_367UGW_fieldLabel",
+	"runsCardTime": "_367UGW_runsCardTime",
+	"pickerUnitNested": "_367UGW_pickerUnitNested",
+	"groupList": "_367UGW_groupList",
+	"mergeActions": "_367UGW_mergeActions",
+	"stepperStep": "_367UGW_stepperStep",
+	"diffNoColW6": "_367UGW_diffNoColW6",
+	"rollbackPointTop": "_367UGW_rollbackPointTop",
+	"snapshotRowIssues": "_367UGW_snapshotRowIssues",
+	"reportWarningRow": "_367UGW_reportWarningRow",
+	"diffStatTotal": "_367UGW_diffStatTotal",
+	"activitySummaryText": "_367UGW_activitySummaryText",
+	"chatEntryReference": "_367UGW_chatEntryReference",
+	"rollbackWarnings": "_367UGW_rollbackWarnings",
+	"factLabel": "_367UGW_factLabel",
+	"shMetaDot": "_367UGW_shMetaDot",
+	"rollbackToolbar": "_367UGW_rollbackToolbar",
+	"collapse": "_367UGW_collapse",
+	"mergeKind": "_367UGW_mergeKind",
+	"segGroup": "_367UGW_segGroup",
+	"paletteInput": "_367UGW_paletteInput",
+	"chatEntryScope": "_367UGW_chatEntryScope",
+	"skeletonTableRow": "_367UGW_skeletonTableRow",
+	"rollbackMetaDot": "_367UGW_rollbackMetaDot",
+	"skeletonRowItem": "_367UGW_skeletonRowItem",
+	"diskUsageCard": "_367UGW_diskUsageCard",
+	"skeletonRoot": "_367UGW_skeletonRoot",
+	"historySummary": "_367UGW_historySummary",
+	"compositionViewport": "_367UGW_compositionViewport",
 	"dialogCard": "_367UGW_dialogCard",
-	"errorTitle": "_367UGW_errorTitle",
-	"mergeTile": "_367UGW_mergeTile",
-	"shRowId": "_367UGW_shRowId",
-	"shCommand": "_367UGW_shCommand",
-	"runsSummary": "_367UGW_runsSummary",
-	"snapshotPickerHint": "_367UGW_snapshotPickerHint",
-	"rollbackFileList": "_367UGW_rollbackFileList",
+	"headRow": "_367UGW_headRow",
+	"mergeConflictRow": "_367UGW_mergeConflictRow",
 	"spin": "_367UGW_spin",
-	"mergeSectionName": "_367UGW_mergeSectionName",
-	"artifactRow": "_367UGW_artifactRow",
-	"spinnerLabel": "_367UGW_spinnerLabel",
-	"progressIndeterminate": "_367UGW_progressIndeterminate",
-	"groupHintRow": "_367UGW_groupHintRow",
-	"navActions": "_367UGW_navActions",
-	"artifactList": "_367UGW_artifactList",
-	"rollbackPoints": "_367UGW_rollbackPoints",
-	"diffGroupToggle": "_367UGW_diffGroupToggle",
-	"diffScroll": "_367UGW_diffScroll",
-	"progressBar": "_367UGW_progressBar",
-	"taskTitle": "_367UGW_taskTitle",
-	"progressBadgeSection": "_367UGW_progressBadgeSection",
-	"skeletonTable": "_367UGW_skeletonTable",
-	"hint": "_367UGW_hint",
-	"chatFileContent": "_367UGW_chatFileContent",
-	"stepperDot": "_367UGW_stepperDot",
-	"diskUsageScroll": "_367UGW_diskUsageScroll",
-	"detailLines": "_367UGW_detailLines",
-	"checkboxRow": "_367UGW_checkboxRow",
-	"chatEntryActions": "_367UGW_chatEntryActions",
-	"marketReviewPage": "_367UGW_marketReviewPage",
-	"dangerButton": "_367UGW_dangerButton",
-	"rollbackPointNote": "_367UGW_rollbackPointNote",
-	"pickerCount": "_367UGW_pickerCount",
-	"dialogMask": "_367UGW_dialogMask",
-	"activityHeader": "_367UGW_activityHeader",
-	"secretFields": "_367UGW_secretFields",
-	"selectTrigger": "_367UGW_selectTrigger",
-	"field": "_367UGW_field",
-	"skeletonBar": "_367UGW_skeletonBar",
-	"pickerMore": "_367UGW_pickerMore",
-	"diffStatAdd": "_367UGW_diffStatAdd",
-	"groupItems": "_367UGW_groupItems",
-	"sectionTitle": "_367UGW_sectionTitle",
-	"toastIn": "_367UGW_toastIn",
-	"rollbackSessions": "_367UGW_rollbackSessions",
+	"updateVersionArrow": "_367UGW_updateVersionArrow",
 	"selectChevron": "_367UGW_selectChevron",
-	"mergeSection": "_367UGW_mergeSection",
-	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
-	"maskIn": "_367UGW_maskIn",
 	"noticeLine": "_367UGW_noticeLine",
-	"infoHintBubble": "_367UGW_infoHintBubble",
-	"groupCard": "_367UGW_groupCard",
-	"reportWarningRow": "_367UGW_reportWarningRow",
-	"infoHintBtn": "_367UGW_infoHintBtn",
-	"historyTime": "_367UGW_historyTime",
-	"num": "_367UGW_num",
-	"profileRowName": "_367UGW_profileRowName",
-	"profileRow": "_367UGW_profileRow",
-	"sourceRowHead": "_367UGW_sourceRowHead",
-	"artifactName": "_367UGW_artifactName",
+	"confirmScroll": "_367UGW_confirmScroll",
+	"paletteItem": "_367UGW_paletteItem",
+	"taskPanelIn": "_367UGW_taskPanelIn",
+	"groupHeader": "_367UGW_groupHeader",
+	"runsWarnNote": "_367UGW_runsWarnNote",
+	"navMore": "_367UGW_navMore",
+	"chatFileContent": "_367UGW_chatFileContent",
+	"factValue": "_367UGW_factValue",
+	"statHealth": "_367UGW_statHealth",
+	"dialogIn": "_367UGW_dialogIn",
+	"paletteGroup": "_367UGW_paletteGroup",
+	"fillViewport": "_367UGW_fillViewport",
+	"itemEnter": "_367UGW_itemEnter",
+	"segItem": "_367UGW_segItem",
+	"dialogOut": "_367UGW_dialogOut",
+	"pathValue": "_367UGW_pathValue",
+	"kindTagInfo": "_367UGW_kindTagInfo",
+	"shRowFacts": "_367UGW_shRowFacts",
+	"statusDot": "_367UGW_statusDot",
+	"profileRowTitle": "_367UGW_profileRowTitle",
+	"errorBanner": "_367UGW_errorBanner",
+	"sectionTitleBlock": "_367UGW_sectionTitleBlock",
+	"mergeActionActive": "_367UGW_mergeActionActive",
+	"artifactTitle": "_367UGW_artifactTitle",
+	"dangerButton": "_367UGW_dangerButton",
+	"mergeScroll": "_367UGW_mergeScroll",
 	"runsLogTail": "_367UGW_runsLogTail",
-	"diffNoColW4": "_367UGW_diffNoColW4",
-	"warnText": "_367UGW_warnText",
-	"chatRawBlock": "_367UGW_chatRawBlock",
-	"previewScope": "_367UGW_previewScope",
-	"profileRowMeta": "_367UGW_profileRowMeta",
-	"navDot": "_367UGW_navDot",
-	"sectionSubtitle": "_367UGW_sectionSubtitle",
-	"activityEmpty": "_367UGW_activityEmpty",
+	"conflictLineValue": "_367UGW_conflictLineValue",
+	"statusMeta": "_367UGW_statusMeta",
+	"diffNo": "_367UGW_diffNo",
+	"paletteHint": "_367UGW_paletteHint",
+	"pickerUnitDetail": "_367UGW_pickerUnitDetail",
+	"nextStepsGroup": "_367UGW_nextStepsGroup",
+	"shSectionHead": "_367UGW_shSectionHead",
+	"diffGroupToggle": "_367UGW_diffGroupToggle",
+	"skeletonLine": "_367UGW_skeletonLine",
+	"infoHintBtn": "_367UGW_infoHintBtn",
+	"statStrip": "_367UGW_statStrip",
+	"secretFields": "_367UGW_secretFields",
+	"reportDetails": "_367UGW_reportDetails",
+	"pickerSubgroup": "_367UGW_pickerSubgroup",
+	"mergeConflictReason": "_367UGW_mergeConflictReason",
+	"syncActivity": "_367UGW_syncActivity",
+	"rollbackFileStat": "_367UGW_rollbackFileStat",
+	"errorAction": "_367UGW_errorAction",
+	"skeletonRowIcon": "_367UGW_skeletonRowIcon",
+	"rollbackFileRow": "_367UGW_rollbackFileRow",
+	"librarySearch": "_367UGW_librarySearch",
+	"kvValue": "_367UGW_kvValue",
+	"mergeFooterSummary": "_367UGW_mergeFooterSummary",
+	"confirmItem": "_367UGW_confirmItem",
+	"progressBadge": "_367UGW_progressBadge",
+	"tableWrap": "_367UGW_tableWrap",
+	"artifactDetailWrap": "_367UGW_artifactDetailWrap",
+	"logFilterButton": "_367UGW_logFilterButton",
+	"rollbackRemoved": "_367UGW_rollbackRemoved",
+	"errorItem": "_367UGW_errorItem",
+	"runsOptionDesc": "_367UGW_runsOptionDesc",
+	"severityError": "_367UGW_severityError",
+	"shMetricLabel": "_367UGW_shMetricLabel",
 	"reportList": "_367UGW_reportList",
-	"rollbackGroupTitle": "_367UGW_rollbackGroupTitle",
-	"activityCard": "_367UGW_activityCard",
+	"artifactDetailInner": "_367UGW_artifactDetailInner",
+	"restorePlanChevron": "_367UGW_restorePlanChevron",
+	"viewBody": "_367UGW_viewBody",
+	"kvKey": "_367UGW_kvKey",
+	"updateNotesLoading": "_367UGW_updateNotesLoading",
+	"navActions": "_367UGW_navActions",
+	"conflictList": "_367UGW_conflictList",
+	"chatFileMeta": "_367UGW_chatFileMeta",
+	"sectionCount": "_367UGW_sectionCount",
+	"historyGroup": "_367UGW_historyGroup",
+	"rollbackGroupHead": "_367UGW_rollbackGroupHead",
+	"snapshotRowHeader": "_367UGW_snapshotRowHeader",
+	"conflictItem": "_367UGW_conflictItem",
 	"optionsCard": "_367UGW_optionsCard",
-	"kindTag": "_367UGW_kindTag",
-	"hiddenFile": "_367UGW_hiddenFile",
-	"errorAction": "_367UGW_errorAction",
-	"mergeOverview": "_367UGW_mergeOverview",
-	"runsSummaryTitle": "_367UGW_runsSummaryTitle",
-	"factGrid": "_367UGW_factGrid",
-	"formError": "_367UGW_formError",
-	"reportProblemReason": "_367UGW_reportProblemReason",
-	"chatActionBtn": "_367UGW_chatActionBtn",
 	"profileRowMain": "_367UGW_profileRowMain",
-	"sectionName": "_367UGW_sectionName",
-	"pickerGroupTitleName": "_367UGW_pickerGroupTitleName",
+	"snapshotRowText": "_367UGW_snapshotRowText",
+	"categoryItem": "_367UGW_categoryItem",
+	"mergeToolbarLabel": "_367UGW_mergeToolbarLabel",
+	"marketFilterMeta": "_367UGW_marketFilterMeta",
+	"diffNoAdd": "_367UGW_diffNoAdd",
+	"runsCardTitle": "_367UGW_runsCardTitle",
+	"diffPaneFill": "_367UGW_diffPaneFill",
+	"historySections": "_367UGW_historySections",
+	"chatFileCard": "_367UGW_chatFileCard",
+	"cellMeta": "_367UGW_cellMeta",
+	"artifactList": "_367UGW_artifactList",
+	"tableCompact": "_367UGW_tableCompact",
+	"dialogFooter": "_367UGW_dialogFooter",
+	"logJumpButton": "_367UGW_logJumpButton",
+	"pickerRoot": "_367UGW_pickerRoot",
+	"kindTagError": "_367UGW_kindTagError",
+	"infoHintIn": "_367UGW_infoHintIn",
 	"progressDetail": "_367UGW_progressDetail",
-	"paletteItemGroup": "_367UGW_paletteItemGroup",
-	"skeletonBars": "_367UGW_skeletonBars",
-	"pagePad": "_367UGW_pagePad",
-	"tableWrap": "_367UGW_tableWrap",
-	"conflictDetail": "_367UGW_conflictDetail",
+	"snapshotRowBadges": "_367UGW_snapshotRowBadges",
+	"skeletonRow": "_367UGW_skeletonRow",
+	"chatFallbackBubble": "_367UGW_chatFallbackBubble",
+	"activitySummary": "_367UGW_activitySummary",
+	"dialogHeaderRow": "_367UGW_dialogHeaderRow",
+	"pickerSubgroupName": "_367UGW_pickerSubgroupName",
+	"activityRows": "_367UGW_activityRows",
+	"rollbackFileList": "_367UGW_rollbackFileList",
+	"chatEntryTime": "_367UGW_chatEntryTime",
+	"marketFilterSearch": "_367UGW_marketFilterSearch",
+	"copyBtn": "_367UGW_copyBtn",
+	"wizardStepperRow": "_367UGW_wizardStepperRow",
+	"rollbackPoints": "_367UGW_rollbackPoints",
+	"progressLabel": "_367UGW_progressLabel",
+	"mergeMeta": "_367UGW_mergeMeta",
+	"kindTag": "_367UGW_kindTag",
+	"dim": "_367UGW_dim",
+	"dialogBodyScroll": "_367UGW_dialogBodyScroll",
+	"restorePlanGroupHead": "_367UGW_restorePlanGroupHead",
+	"runsWarnNoteDetail": "_367UGW_runsWarnNoteDetail",
+	"diffCell": "_367UGW_diffCell",
+	"rollbackBox": "_367UGW_rollbackBox",
+	"badgeHost": "_367UGW_badgeHost",
+	"diffCellAdd": "_367UGW_diffCellAdd",
+	"restorePlanPath": "_367UGW_restorePlanPath",
+	"statusPulse": "_367UGW_statusPulse",
+	"rollbackGroupUnit": "_367UGW_rollbackGroupUnit",
+	"conflictChoices": "_367UGW_conflictChoices",
+	"aboutLinkRow": "_367UGW_aboutLinkRow",
+	"statusIndeterminate": "_367UGW_statusIndeterminate",
+	"sectionName": "_367UGW_sectionName",
+	"reasonLine": "_367UGW_reasonLine",
+	"skeletonCaption": "_367UGW_skeletonCaption",
+	"mergeOverview": "_367UGW_mergeOverview",
+	"selectOption": "_367UGW_selectOption",
+	"skeletonTable": "_367UGW_skeletonTable",
+	"toast": "_367UGW_toast",
 	"diffNoColW3": "_367UGW_diffNoColW3",
-	"skeletonLine": "_367UGW_skeletonLine",
+	"actionRowTop": "_367UGW_actionRowTop",
+	"toastIn": "_367UGW_toastIn",
+	"rollbackFileIcon": "_367UGW_rollbackFileIcon",
+	"chatEntryActions": "_367UGW_chatEntryActions",
+	"mergeSection": "_367UGW_mergeSection",
+	"chatFileName": "_367UGW_chatFileName",
+	"spinner": "_367UGW_spinner",
+	"errorActionLabel": "_367UGW_errorActionLabel",
+	"rollbackPointNote": "_367UGW_rollbackPointNote",
+	"progressIndeterminate": "_367UGW_progressIndeterminate",
+	"progressBarFailed": "_367UGW_progressBarFailed",
+	"pickerChildren": "_367UGW_pickerChildren",
+	"skeletonTableCell": "_367UGW_skeletonTableCell",
+	"consultDimension": "_367UGW_consultDimension",
+	"skipCode": "_367UGW_skipCode",
+	"mergeTile": "_367UGW_mergeTile",
+	"banner": "_367UGW_banner",
+	"mergeCols": "_367UGW_mergeCols",
+	"conflictPrefix": "_367UGW_conflictPrefix",
+	"modeTabs": "_367UGW_modeTabs",
+	"libraryFilterCount": "_367UGW_libraryFilterCount",
+	"statusProgress": "_367UGW_statusProgress",
+	"sectionTitleRow": "_367UGW_sectionTitleRow",
+	"shMetricValue": "_367UGW_shMetricValue",
+	"historyTime": "_367UGW_historyTime",
+	"emptySteps": "_367UGW_emptySteps",
+	"infoHint": "_367UGW_infoHint",
 	"pickerGroup": "_367UGW_pickerGroup",
+	"conflictDetail": "_367UGW_conflictDetail",
+	"paletteItemLabel": "_367UGW_paletteItemLabel",
+	"rollbackAdded": "_367UGW_rollbackAdded",
+	"pickerMore": "_367UGW_pickerMore",
+	"badgeRow": "_367UGW_badgeRow",
+	"chatRawPre": "_367UGW_chatRawPre",
+	"rollbackPointActions": "_367UGW_rollbackPointActions",
+	"previewScopeStats": "_367UGW_previewScopeStats",
+	"previewScopeOff": "_367UGW_previewScopeOff",
+	"inlineDiffBox": "_367UGW_inlineDiffBox",
+	"rollbackPoint": "_367UGW_rollbackPoint",
+	"profileRowMeta": "_367UGW_profileRowMeta",
+	"diffNoColW4": "_367UGW_diffNoColW4",
+	"pickerUnitName": "_367UGW_pickerUnitName",
+	"shPanel": "_367UGW_shPanel",
 	"navTab": "_367UGW_navTab",
-	"pickerUnitDetail": "_367UGW_pickerUnitDetail",
-	"snapshotRowName": "_367UGW_snapshotRowName",
-	"skeletonRowAction": "_367UGW_skeletonRowAction",
-	"maskOut": "_367UGW_maskOut",
-	"conflictPrefix": "_367UGW_conflictPrefix",
+	"selectTrigger": "_367UGW_selectTrigger",
+	"pickerUnit": "_367UGW_pickerUnit",
+	"consultScroll": "_367UGW_consultScroll",
+	"syncActivityLabel": "_367UGW_syncActivityLabel",
+	"skeletonRows": "_367UGW_skeletonRows",
+	"conflictLine": "_367UGW_conflictLine",
+	"shSectionTitle": "_367UGW_shSectionTitle",
+	"statusSpacer": "_367UGW_statusSpacer",
+	"stepperLabel": "_367UGW_stepperLabel",
+	"shellContent": "_367UGW_shellContent",
+	"statusAction": "_367UGW_statusAction",
+	"pathRow": "_367UGW_pathRow",
+	"secretsList": "_367UGW_secretsList",
+	"restorePlanStat": "_367UGW_restorePlanStat",
+	"pickerOverlay": "_367UGW_pickerOverlay",
+	"chatRawBlock": "_367UGW_chatRawBlock",
+	"restorePlanList": "_367UGW_restorePlanList",
+	"skeletonBlock": "_367UGW_skeletonBlock",
+	"choiceCard": "_367UGW_choiceCard",
+	"reportProblemHead": "_367UGW_reportProblemHead",
+	"navStrip": "_367UGW_navStrip",
+	"inspectGroup": "_367UGW_inspectGroup",
+	"tableFixed": "_367UGW_tableFixed",
 	"logEntry": "_367UGW_logEntry",
-	"reportSectionRow": "_367UGW_reportSectionRow",
-	"snapshotRowIssues": "_367UGW_snapshotRowIssues",
-	"rollbackWarnings": "_367UGW_rollbackWarnings",
-	"factCell": "_367UGW_factCell",
-	"skeletonTableCell": "_367UGW_skeletonTableCell",
-	"modeTab": "_367UGW_modeTab",
-	"marketFilterMeta": "_367UGW_marketFilterMeta",
+	"snapshotPickerHint": "_367UGW_snapshotPickerHint",
+	"shIssue": "_367UGW_shIssue",
 	"collapseInner": "_367UGW_collapseInner",
-	"confirmItemDesc": "_367UGW_confirmItemDesc",
-	"confirmItemHead": "_367UGW_confirmItemHead",
-	"statusProgress": "_367UGW_statusProgress",
-	"pickerOverlay": "_367UGW_pickerOverlay",
-	"chatEntryScope": "_367UGW_chatEntryScope",
-	"updateVersionTarget": "_367UGW_updateVersionTarget",
-	"mergeCols": "_367UGW_mergeCols",
-	"progressLabel": "_367UGW_progressLabel",
-	"nextStepsList": "_367UGW_nextStepsList",
 	"toolRow": "_367UGW_toolRow",
-	"skipText": "_367UGW_skipText",
-	"shSeverities": "_367UGW_shSeverities",
-	"ghostButton": "_367UGW_ghostButton",
-	"compositionViewport": "_367UGW_compositionViewport",
-	"logHeader": "_367UGW_logHeader",
-	"logDetail": "_367UGW_logDetail",
-	"spinnerArc": "_367UGW_spinnerArc",
-	"statValueSkeleton": "_367UGW_statValueSkeleton",
-	"resultFooter": "_367UGW_resultFooter",
-	"pickerGroupTitle": "_367UGW_pickerGroupTitle",
-	"nextStepsGroup": "_367UGW_nextStepsGroup",
-	"skeletonRowItem": "_367UGW_skeletonRowItem",
-	"inspectGroup": "_367UGW_inspectGroup",
-	"rowActions": "_367UGW_rowActions",
-	"marketFilterGrid": "_367UGW_marketFilterGrid",
-	"paletteHint": "_367UGW_paletteHint",
-	"artifactMain": "_367UGW_artifactMain",
-	"runsCenter": "_367UGW_runsCenter",
-	"diskUsageCard": "_367UGW_diskUsageCard",
-	"logJumpButton": "_367UGW_logJumpButton",
+	"chatRawSummary": "_367UGW_chatRawSummary",
 	"shPanelTitle": "_367UGW_shPanelTitle",
-	"shMetaDot": "_367UGW_shMetaDot",
-	"rollbackGroupHead": "_367UGW_rollbackGroupHead",
-	"conflictId": "_367UGW_conflictId",
-	"rollbackPointMeta": "_367UGW_rollbackPointMeta",
-	"previewScopeStats": "_367UGW_previewScopeStats",
-	"toastText": "_367UGW_toastText",
-	"reportProblemRow": "_367UGW_reportProblemRow",
-	"tableCompact": "_367UGW_tableCompact",
-	"statSegDim": "_367UGW_statSegDim",
-	"sourceList": "_367UGW_sourceList",
-	"navMeasure": "_367UGW_navMeasure",
-	"kvKey": "_367UGW_kvKey",
-	"optionsRow": "_367UGW_optionsRow",
-	"pickerToolbar": "_367UGW_pickerToolbar",
-	"chatFileCard": "_367UGW_chatFileCard",
-	"dialogHeader": "_367UGW_dialogHeader",
-	"input": "_367UGW_input",
-	"section": "_367UGW_section",
-	"shNotes": "_367UGW_shNotes",
-	"pickerTreeRow": "_367UGW_pickerTreeRow",
-	"banner": "_367UGW_banner",
-	"runsOptionTitle": "_367UGW_runsOptionTitle",
-	"snapshotList": "_367UGW_snapshotList",
-	"statusSpacer": "_367UGW_statusSpacer",
-	"runsOptionTag": "_367UGW_runsOptionTag",
-	"diffNoColW6": "_367UGW_diffNoColW6",
-	"dialogClose": "_367UGW_dialogClose",
-	"logLine": "_367UGW_logLine",
-	"cellMetaNoteText": "_367UGW_cellMetaNoteText",
-	"chatFileName": "_367UGW_chatFileName",
-	"reasonList": "_367UGW_reasonList",
-	"mergeCol": "_367UGW_mergeCol",
-	"conflictItem": "_367UGW_conflictItem",
-	"segItem": "_367UGW_segItem",
-	"pickerFooter": "_367UGW_pickerFooter",
-	"errorFooter": "_367UGW_errorFooter",
-	"snapshotRowText": "_367UGW_snapshotRowText",
+	"kvRow": "_367UGW_kvRow",
+	"pathIssueKind": "_367UGW_pathIssueKind",
+	"paletteEmpty": "_367UGW_paletteEmpty",
+	"skeletonBar": "_367UGW_skeletonBar",
+	"shSummary": "_367UGW_shSummary",
+	"resultScroll": "_367UGW_resultScroll",
+	"pathMappingList": "_367UGW_pathMappingList",
+	"profileRowName": "_367UGW_profileRowName",
 	"warnList": "_367UGW_warnList",
-	"cliName": "_367UGW_cliName",
-	"runsWarnNoteDetail": "_367UGW_runsWarnNoteDetail",
-	"restorePlanNote": "_367UGW_restorePlanNote",
-	"pickerList": "_367UGW_pickerList",
-	"rollbackGroupUnit": "_367UGW_rollbackGroupUnit",
-	"progressBarDone": "_367UGW_progressBarDone",
+	"detailLines": "_367UGW_detailLines",
+	"rollbackSessionItem": "_367UGW_rollbackSessionItem",
+	"planScroll": "_367UGW_planScroll",
 	"runsCounts": "_367UGW_runsCounts",
-	"paletteInput": "_367UGW_paletteInput",
-	"restorePlanPath": "_367UGW_restorePlanPath",
-	"pickerAction": "_367UGW_pickerAction",
-	"shSummary": "_367UGW_shSummary",
-	"actionRowTop": "_367UGW_actionRowTop",
-	"shMetrics": "_367UGW_shMetrics",
+	"sparseFill": "_367UGW_sparseFill",
+	"syncActivityTrack": "_367UGW_syncActivityTrack",
+	"skeletonRowAction": "_367UGW_skeletonRowAction",
+	"groupCard": "_367UGW_groupCard",
+	"logEmpty": "_367UGW_logEmpty",
+	"chatAttachmentRow": "_367UGW_chatAttachmentRow",
+	"pagePad": "_367UGW_pagePad",
+	"statusTask": "_367UGW_statusTask",
+	"skeletonTitle": "_367UGW_skeletonTitle",
+	"stepperConnector": "_367UGW_stepperConnector",
+	"pickerToolbar": "_367UGW_pickerToolbar",
+	"diffScroll": "_367UGW_diffScroll",
+	"artifactName": "_367UGW_artifactName",
+	"categoryName": "_367UGW_categoryName",
+	"errorReason": "_367UGW_errorReason",
+	"snapshotRowMain": "_367UGW_snapshotRowMain",
+	"diffFileHead": "_367UGW_diffFileHead",
+	"mono": "_367UGW_mono",
+	"chatEntryNotice": "_367UGW_chatEntryNotice",
+	"kindTagWarn": "_367UGW_kindTagWarn",
+	"selectOptionLabel": "_367UGW_selectOptionLabel",
+	"updateVersionTarget": "_367UGW_updateVersionTarget",
+	"pickerCount": "_367UGW_pickerCount",
+	"rollbackFilePath": "_367UGW_rollbackFilePath",
+	"toastGlyph": "_367UGW_toastGlyph",
 	"artifactBadges": "_367UGW_artifactBadges",
-	"dialogBody": "_367UGW_dialogBody",
-	"reportBody": "_367UGW_reportBody",
-	"skeletonShimmer": "_367UGW_skeletonShimmer",
+	"dataTable": "_367UGW_dataTable",
+	"artifactExpand": "_367UGW_artifactExpand",
+	"maskOut": "_367UGW_maskOut",
 	"sectionOptionRow": "_367UGW_sectionOptionRow",
-	"viewBody": "_367UGW_viewBody",
-	"diffStatTotal": "_367UGW_diffStatTotal",
-	"itemEnter": "_367UGW_itemEnter",
-	"inlineDiffBox": "_367UGW_inlineDiffBox",
-	"progressMeta": "_367UGW_progressMeta",
-	"consultSection": "_367UGW_consultSection",
-	"mergeKind": "_367UGW_mergeKind",
-	"pathIssueKind": "_367UGW_pathIssueKind",
-	"pathValue": "_367UGW_pathValue",
-	"statusAction": "_367UGW_statusAction",
-	"dialogContentCenter": "_367UGW_dialogContentCenter",
-	"diffHunkRow": "_367UGW_diffHunkRow",
-	"emptySteps": "_367UGW_emptySteps",
-	"skeletonRowIcon": "_367UGW_skeletonRowIcon",
-	"snapshotRow": "_367UGW_snapshotRow",
-	"confirmItem": "_367UGW_confirmItem",
-	"skeletonTableRow": "_367UGW_skeletonTableRow",
-	"sourceRowName": "_367UGW_sourceRowName",
-	"pathMappingList": "_367UGW_pathMappingList",
-	"reportFooter": "_367UGW_reportFooter",
-	"errorList": "_367UGW_errorList",
-	"rollbackBox": "_367UGW_rollbackBox",
-	"statusMeta": "_367UGW_statusMeta",
-	"mergeToolbarLabel": "_367UGW_mergeToolbarLabel",
-	"skeletonCaption": "_367UGW_skeletonCaption",
-	"bannerSlot": "_367UGW_bannerSlot",
-	"toastGlyph": "_367UGW_toastGlyph",
-	"mergeResult": "_367UGW_mergeResult",
-	"stepper": "_367UGW_stepper",
-	"shRowMeta": "_367UGW_shRowMeta",
-	"rollbackAdded": "_367UGW_rollbackAdded",
-	"listHeaderRow": "_367UGW_listHeaderRow",
-	"rollbackSessionMeta": "_367UGW_rollbackSessionMeta",
-	"artifactRowHead": "_367UGW_artifactRowHead",
-	"paletteGroup": "_367UGW_paletteGroup",
-	"reportText": "_367UGW_reportText",
-	"mergeTileLabel": "_367UGW_mergeTileLabel",
-	"cellTitle": "_367UGW_cellTitle",
-	"reportProblemText": "_367UGW_reportProblemText",
-	"reportDetails": "_367UGW_reportDetails",
-	"activityRow": "_367UGW_activityRow",
-	"activityBadge": "_367UGW_activityBadge",
-	"historyScroll": "_367UGW_historyScroll",
-	"restorePlanChevron": "_367UGW_restorePlanChevron",
-	"rollbackRemoved": "_367UGW_rollbackRemoved",
-	"mergeColLabel": "_367UGW_mergeColLabel",
-	"runsCardTime": "_367UGW_runsCardTime",
-	"profileRowTitle": "_367UGW_profileRowTitle",
-	"mergeScroll": "_367UGW_mergeScroll",
-	"mergeConflictRow": "_367UGW_mergeConflictRow",
-	"statusPulse": "_367UGW_statusPulse",
-	"tableFixed": "_367UGW_tableFixed",
-	"previewChoiceRow": "_367UGW_previewChoiceRow"
+	"snapshotRowMeta": "_367UGW_snapshotRowMeta",
+	"shRowId": "_367UGW_shRowId",
+	"artifactRow": "_367UGW_artifactRow",
+	"section": "_367UGW_section",
+	"dialogMask": "_367UGW_dialogMask",
+	"diffNoDel": "_367UGW_diffNoDel",
+	"shSeverityCount": "_367UGW_shSeverityCount",
+	"mergeTileValue": "_367UGW_mergeTileValue",
+	"pickerModalBody": "_367UGW_pickerModalBody",
+	"diffTable": "_367UGW_diffTable",
+	"skeletonRowBody": "_367UGW_skeletonRowBody",
+	"shellNav": "_367UGW_shellNav",
+	"pickerGroupTitle": "_367UGW_pickerGroupTitle",
+	"ghostButton": "_367UGW_ghostButton",
+	"rollbackDeleted": "_367UGW_rollbackDeleted",
+	"chatEntryRow": "_367UGW_chatEntryRow",
+	"hint": "_367UGW_hint"
 };
 // src/client/common/Modal.tsx
 /**
@@ -28389,13 +28425,17 @@ function mergeDecisionCounts(preview, draft) {
 	let conflictItems = 0;
 	let applicable = 0;
 	for (const row of mergeSectionRows(preview)) {
+		const action = draft[row.resolutionId];
 		if (!row.needsDecision) {
-			if (row.decision !== "skip") applicable++;
+			if (row.decision !== "skip" || decisionWillApply(row, action)) applicable++;
 			continue;
 		}
 		needsDecision++;
 		conflictItems += row.conflicts.length > 0 ? row.conflicts.length : row.conflictCount;
-		if (draft[row.resolutionId] !== void 0) decided++;
+		if (action !== void 0) {
+			decided++;
+			if (decisionWillApply(row, action)) applicable++;
+		}
 	}
 	return {
 		needsDecision,
@@ -28406,13 +28446,26 @@ function mergeDecisionCounts(preview, draft) {
 	};
 }
 /**
+* 单条裁决是否**真的会写盘**（issue #106）。
+*
+* - useMerged：只有存在可用自动合并结果（decision === 'merge'）时才有内容可写；
+* - useRemote / keepLocal：都会写盘，选哪侧不影响「会写」这件事。
+*/
+function decisionWillApply(row, action) {
+	if (action === void 0) return false;
+	if (action === "useMerged") return row.canUseMerged;
+	return true;
+}
+/**
 * 本次是否存在**可应用的分区**（决定「执行合并」主按钮是否可用）。
 *
-* 判据是预览本身而不是草稿：引擎对未点名的分区按自己的结论应用，所以只要有任一
-* 非「无变化」、非「待裁决」的分区，执行合并就真的会写东西；全部无变化时按钮必须禁用。
+* 判据 = 预览自身会写的分区 **或** 已裁决且裁决会写盘的分区（issue #106）：
+* 引擎对未点名的分区按自己的结论应用（skip 不动、conflict 进 pendingConflicts），
+* 但只要用户已经逐条裁决了冲突，这次执行就真的会写东西 —— 只看预览会让
+* 「0 可自动应用 + 全是冲突」的合并**永久禁用**，裁决完也点不动。
 */
-function hasApplicableSections(preview) {
-	return mergeSectionRows(preview).some((row) => row.decision !== "skip" && row.decision !== "conflict");
+function hasApplicableSections(preview, draft = {}) {
+	return mergeSectionRows(preview).some((row) => row.needsDecision ? decisionWillApply(row, draft[row.resolutionId]) : row.decision !== "skip" || decisionWillApply(row, draft[row.resolutionId]));
 }
 /** 结果归一化（字段缺失按 0 / 空数组处理，绝不显示 undefined）。 */
 function mergeResultView(result) {
@@ -31589,7 +31642,7 @@ function MergePreviewView({ api, t, preview, draft, result, loading, rollingBack
 	const rows = mergeSectionRows(preview);
 	const summary = mergeSummaryItems(preview);
 	const counts = mergeDecisionCounts(preview, draft);
-	const applicable = hasApplicableSections(preview);
+	const applicable = hasApplicableSections(preview, draft);
 	const anyMerged = rows.some((row) => row.canUseMerged);
 	const resultView = mergeResultView(result);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -32018,7 +32071,7 @@ function MergeModal({ seed, onClose, api, t, channelBody, sectionName, decryptPa
 	};
 	const rows = mergeSectionRows(preview);
 	const counts = mergeDecisionCounts(preview, draft);
-	const applicable = hasApplicableSections(preview);
+	const applicable = hasApplicableSections(preview, draft);
 	const blocked = busy || loading || preview === null || rows.length === 0;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Modal, {
 		open: seed !== null,