dsh-vscode-mode 0.1.26 → 0.1.28

package/lib/client.js

@@ -3409,17 +3409,20 @@ window.__ModuleLoader__.load({
 		* @param ctx 客户端上下文（slots 服务）
 		* @param spec slot 描述
 		* @param render 渲染函数
+		* @returns 注销函数（未注册返回 null；形态切换时用于卸载旧 slot）
 		*/
 		function registerSlotSafely(ctx, spec, render) {
 			const slots = ctx?.slots;
 			if (!slots || typeof slots.inject !== "function" || typeof slots.register !== "function") {
 				console.warn("[dsh-vscode-mode] slots 服务不可用，跳过 slot " + spec.name);
-				return;
+				return null;
 			}
 			try {
-				slots.inject(spec.name, () => slots.register(spec, render));
+				const disposer = slots.inject(spec.name, () => slots.register(spec, render));
+				return typeof disposer === "function" ? disposer : null;
 			} catch (error) {
 				console.warn("[dsh-vscode-mode] slot " + spec.name + " 注册失败（" + String(error) + "），已跳过");
+				return null;
 			}
 		}
 		/**
@@ -5598,8 +5601,7 @@ window.__ModuleLoader__.load({
 			"workspaces",
 			"sessions",
 			"conversation",
-			"settingsScope",
-			"webUiSettings"
+			"settingsScope"
 		];
 		/**
 		* 装配客户端：注册中央编辑区视图与 header 差异角标。
@@ -5631,7 +5633,7 @@ window.__ModuleLoader__.load({
 			const settings = binder.scope;
 			let selected = autoValue("auto");
 			/** 可选探测 betterSidebar 服务（不进 inject：缺失会让插件停靠等待，杀死回退路径）。 */
-			const sideService = detectSidebarService(ctx);
+			let sideService = detectSidebarService(ctx);
 			/** 「添加到对话」动作集：编辑区/Tab 右键菜单注入文件引用与代码块（conversation 服务缺失时各动作安全降级）。 */
 			const addToConversation = createAddToConversation(ctx);
 			/** 客户端侧兼容摘要（与 host 报告合并展示；惰性求值保证 HMR 后仍新鲜）。 */
@@ -5705,7 +5707,7 @@ window.__ModuleLoader__.load({
 				logger: (message) => console.warn("[dsh-vscode-mode] " + message)
 			}), "vscode-mode: file link routing");
 			const registerLegacyTab = () => {
-				registerSlotSafely(ctx, {
+				return registerSlotSafely(ctx, {
 					name: "conversation.view",
 					id: "edrv-editor",
 					order: 5,
@@ -5721,30 +5723,60 @@ window.__ModuleLoader__.load({
 					fileMenuItems
 				})));
 			};
-			if (sideService) ctx.effect(() => installSideEditor({
-				service: sideService,
-				renderTab: (props) => react.default.createElement(SideEditorTab, Object.assign({}, props, {
-					schedule,
-					addToConversation,
-					sidebarPanels,
-					outlineSources,
-					fileMenuItems
-				})),
-				activeSession: () => {
-					const snapshot = sessions?.list?.getSnapshot?.();
-					const sessionId = snapshot?.current;
-					if (!sessionId) return void 0;
-					return {
-						sessionId,
-						cwd: snapshot?.byId?.[sessionId]?.cwd
-					};
-				},
-				registerLegacyFallback: registerLegacyTab
-			}), "vscode-mode: sidebar editor tab");
-			else {
-				setEnsureSideEditor(null);
-				registerLegacyTab();
-			}
+			let sideDisposer = null;
+			let legacyDisposer = null;
+			const applySideForm = () => {
+				if (sideService) {
+					if (sideDisposer !== null) return;
+					if (legacyDisposer !== null) {
+						legacyDisposer();
+						legacyDisposer = null;
+					}
+					sideDisposer = ctx.effect(() => installSideEditor({
+						service: sideService,
+						renderTab: (props) => react.default.createElement(SideEditorTab, Object.assign({}, props, {
+							schedule,
+							addToConversation,
+							sidebarPanels,
+							outlineSources,
+							fileMenuItems
+						})),
+						activeSession: () => {
+							const snapshot = sessions?.list?.getSnapshot?.();
+							const sessionId = snapshot?.current;
+							if (!sessionId) return void 0;
+							return {
+								sessionId,
+								cwd: snapshot?.byId?.[sessionId]?.cwd
+							};
+						},
+						registerLegacyFallback: registerLegacyTab
+					}), "vscode-mode: sidebar editor tab");
+				} else {
+					if (legacyDisposer !== null) return;
+					if (sideDisposer !== null) {
+						sideDisposer();
+						sideDisposer = null;
+					}
+					setEnsureSideEditor(null);
+					legacyDisposer = registerLegacyTab();
+				}
+			};
+			applySideForm();
+			let sideRetries = 0;
+			const retrySideService = () => {
+				if (sideService !== void 0 || sideRetries >= 15) return;
+				sideRetries += 1;
+				schedule(() => {
+					if (sideService !== void 0) return;
+					sideService = detectSidebarService(ctx);
+					if (sideService !== void 0) {
+						console.info("[dsh-vscode-mode] 检测到 dsh-better-sidebar，切换侧边栏编辑形态");
+						applySideForm();
+					} else retrySideService();
+				}, 2e3);
+			};
+			retrySideService();
 			registerSlotSafely(ctx, {
 				name: "conversation.input.dock",
 				id: "edrv-diff-dock",