dsh-focus-overlay 0.4.0 → 0.6.0

package/README.en.md

@@ -60,6 +60,7 @@ Once in focus mode, an assistant turn no longer shows every step — it folds in
 | Plugin configuration card | A collapsible card under "Settings → Plugins → Plugin configuration": navbar toggle, open-position strategy, text-area width — persisted to `localStorage` |
 | Auto-enter focus | After a reply **completes normally**, auto-open focus at your question; abnormal endings (stop / error / max-tokens / interrupt) never fire |
 | Reply / waiting reminders | In focus, a "New reply ready + View" toast on completion; an "AI is waiting for your reply + Reply" toast on a question/approval, auto-cleared once answered |
+| DSH-better-sidebar compatibility | While in focus, auto-hide its top-right panel toggle buttons and any open right/bottom panels (and release the squeezed layout); restored on exit |
 
 ## Install
 
@@ -105,6 +106,8 @@ Restart `dsh web` after install.
 3. Hover the right-side dots to preview, click to jump; a centered "↓ back to latest" button appears when you're not at the bottom.
 4. Press `Esc` or click "Exit focus" to return — the original UI is untouched.
 
+> **Compatibility note**: if [DSH-better-sidebar](https://github.com/omdsh-dev/DSH-better-sidebar) is also installed, entering focus mode auto-hides its two top-right panel toggle buttons and any open right/bottom panels (releasing the squeezed layout); they're restored as they were on exit, without touching that plugin's layout state.
+
 ## Settings
 
 In the sidebar "Settings → Plugins → Plugin configuration", expand the "Focus Mode" card:

package/README.md

@@ -58,6 +58,7 @@
 | 插件配置卡片 | 在「设置 → 插件 → 插件配置」中的可折叠卡片，含导航条开关、打开定位策略、文字区宽度，持久化到 `localStorage` |
 | 自动进入专注 | 回复**正常完成**后自动打开专注并定位到本轮你的提问；异常结束（停止 / 报错 / 超 token / 打断）不触发 |
 | 回复 / 等待提醒 | 专注中回复完成弹「新回复已生成 + 查看」；AI 提问 / 审批等待时弹「AI 正在等待你的回复 + 去回复」，回答完自动消失 |
+| 兼容 DSH-better-sidebar | 进入专注时自动隐藏其右上角的收放面板按钮与已开启的右侧/底部面板，并释放被挤压的布局；退出专注后按原状态还原 |
 
 ## 安装
 
@@ -103,6 +104,8 @@ dsh web
 3. 右侧导航圆点可悬停预览、点击跳转；离开底部时右下出现居中的「↓ 回到最新」。
 4. 按 `Esc` 或点「退出专注」返回原界面，原位置/状态保持不变。
 
+> **兼容提示**：若同时安装了 [DSH-better-sidebar](https://github.com/omdsh-dev/DSH-better-sidebar)，进入专注模式会自动隐藏其右上角的两个收放面板按钮以及已开启的右侧/底部面板（并释放被挤压的布局）；退出专注后按原状态恢复，不会改动该插件的面板布局。
+
 ## 设置
 
 侧栏「设置 → 插件 → 插件配置」中，展开「专注模式」卡片：

package/lib/client.js

@@ -915,6 +915,15 @@ window.__ModuleLoader__.load({
 .fm-plugin-check input[type="checkbox"]{width:16px;height:16px;margin:0;cursor:pointer;accent-color:var(--dsw-alias-brand-primary,#4176e6)}
 .fm-plugin-check-label{color:var(--dsw-alias-label-primary);font-size:13px;line-height:1.5}
 .fm-plugin-range{width:100%;max-width:280px;cursor:pointer;accent-color:var(--dsw-alias-brand-primary,#4176e6)}
+/* DSH-better-sidebar compatibility: its panel host (top-right toggle cluster +
+   right/bottom panels) is appended to document.body at z-index 40/45, above
+   shell.overlay's z-20 layer, so this overlay cannot cover it. Hide the host
+   while focus is on, and neutralize the #root layout push it applies when its
+   panels are open. Selectors mirror better-sidebar's own layout.css exactly. */
+body[data-fm-focus] [data-dsh-panel-host]{display:none!important}
+body[data-fm-focus] #root{margin-right:0!important;width:100%!important}
+body[data-fm-focus] #root [data-dsh-frame] > [data-pane="conversation"],
+body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!important}
 `;
 		//#endregion
 		//#region src/client/locales.ts
@@ -1029,6 +1038,18 @@ window.__ModuleLoader__.load({
 						style.remove();
 					};
 				});
+				ctx.effect(() => {
+					const sync = () => {
+						if (focusStore.get()) document.body.setAttribute("data-fm-focus", "");
+						else document.body.removeAttribute("data-fm-focus");
+					};
+					sync();
+					const unsub = focusStore.subscribe(sync);
+					return () => {
+						unsub();
+						document.body.removeAttribute("data-fm-focus");
+					};
+				});
 				ctx.effect(() => ctx.locale.register(NS, {
 					zh,
 					en
@@ -1111,9 +1132,9 @@ window.__ModuleLoader__.load({
 				}, () => (0, react.createElement)(FocusToggle, { t })));
 				ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
 					name: "settings.plugin.item",
+					key: "dsh-focus-overlay",
 					id: "dsh-focus-overlay",
-					order: 1e3,
-					label: () => t("settings.label")
+					order: 1e3
 				}, () => (0, react.createElement)(FocusSettingsCard, { t })));
 			}
 		};

package/lib/index.mjs

@@ -1,4 +1,24 @@
+import z from "@deepseek-ai/schemastery";
 //#region src/index.mjs
-function apply() {}
+/** Settings namespace owned by this plugin (must match /^[a-z][a-z0-9-]*$/). */
+const NAMESPACE = "dsh-focus-overlay";
+/** Durable settings schema; defaults mirror the browser localStorage DEFAULTS. */
+const FocusSettingsSchema = z.object({
+	navbar: z.boolean().default(true),
+	scroll: z.union(["preserve", "bottom"]).default("preserve"),
+	width: z.number().default(760),
+	autoFocus: z.boolean().default(false)
+});
+function apply(ctx) {
+	ctx.inject(["settings"], (settingsCtx) => {
+		const settings = settingsCtx.settings;
+		if (!settings || typeof settings.register !== "function") return;
+		try {
+			settings.register(NAMESPACE, FocusSettingsSchema);
+		} catch (error) {
+			console.warn("[dsh-focus-overlay] settings namespace registration failed:", error);
+		}
+	});
+}
 //#endregion
-export { apply as default };
+export { FocusSettingsSchema, NAMESPACE, apply as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-focus-overlay",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Focus Mode for the dsh web GUI: a full-screen reading overlay that hides chrome and folds the AI tool-call flow into summaries, reusing the official Markdown / image primitives.",
   "type": "module",
   "main": "lib/index.mjs",
@@ -55,5 +55,8 @@
     "type": "git",
     "url": "https://github.com/boogoo619/dsh-focus-overlay.git"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
+  }
 }