dsh-focus-overlay 0.13.0 → 0.13.1

package/README.en.md

@@ -26,7 +26,7 @@
 - **Auto-focus & reminders** — after a reply completes normally, optionally auto-enter focus at your question; while in focus, get a toast for a new reply or when the AI is waiting on you
 - **Width handles** — draggable strips beside the content column (official WidthHandle replica) that resize the reading column live and persist
 - **Hotkey F** — press `F` anywhere to enter focus mode instantly (toggleable in settings); typing in an input never triggers it
-- **Desktop window chrome** — adapts to the dsh desktop app (macOS / Windows): the top of the overlay reserves the official frame clearance for the macOS traffic lights and the Windows native titlebar, that top band drags the window while focused, and the reservation shrinks automatically in native fullscreen
+- **Desktop window chrome** — adapts to the dsh desktop app (macOS / Windows): the focus title row is merged into the official frame clearance (48px macOS traffic lights / 40px Windows native titlebar), so the title and exit control share one line with the window controls and the whole row drags the window — no extra blank band above it; native fullscreen keeps a compact 40px title row
 - **Focus counter** — the settings card keeps a running total of your focus-mode entries; past 100 entries a GitHub Star nudge appears, is remembered after the first use, and then becomes a direct "open the project page" button
 
 These features are designed to give **small screens** more content space: tucking away the persistent header/composer and tool steps lets the conversation use as much of the screen as possible.
@@ -58,7 +58,7 @@ Click the line to expand that turn's full work detail (per-category one-line sum
 | --- | --- |
 | Full-screen overlay | Registered into `shell.overlay` (additive, `replaceRisk: none`) — covers header / composer / sidebar; the thin top bar keeps only the session title and an exit button |
 | Official rendering primitives | Assistant text through official `MarkdownText` (GFM + code highlighting + TeX + code copy buttons + footnotes); user messages pick the official user-text projection the running dsh exports: `projectUserText` on 0.1.2–0.2.0 (plain runs plus `@`/`/` reference chips), and the official `UserTextRun` plain run after the 0.2.2 desktop runtime removed that function — a missing projection can never crash the overlay; buttons, modals and icons are all official primitives |
-| Desktop window frame | Reserves top space from the official `--dsh-frame-overlay-top` / `--dsh-frame-top-clearance` / `--dsh-frame-chrome-top` variables for the macOS traffic lights (~48px) and the Windows native titlebar (40px), and provides a top drag strip matching the official drag region (`data-window-drag` + `-webkit-app-region: drag`) so the window stays draggable while focused; native fullscreen (`data-fullscreen`) drops the reservation to 20px; on Windows it also hides the official sidebar-collapse and new-session controls that the window chrome promotes into the titlebar layer when the sidebar is collapsed / the window is narrow — otherwise they painted above the focus layer and a stray click switched sessions while reading; both come back with the chrome on exit. In a plain browser the variables and markers are absent, so the 0px fallback keeps the old pixel-identical layout |
+| Desktop window frame | The focus title row and the official window clearance are merged into one band: the overlay reserves ONLY `--dsh-frame-top-clearance` (48px macOS traffic lights / 40px Windows native titlebar), the title and exit control sit inside that row, and the transcript starts right below it — the old stacked 48px title row and the extra 20px dialog gap are gone. The row is the overlay’s last effective drag claim on macOS (Windows keeps the separate `.fm-frame-strip` over the caption band as the overlay’s last child; both carry `data-window-drag` + `-webkit-app-region: drag`), so scrolled content / the turn rail’s no-drag rects cannot cancel the band, while the exit control is explicitly `no-drag` and stays clickable; the title starts at x=88px on macOS to clear the traffic lights and clears the top-right native caption buttons on Windows. Native fullscreen (`data-fullscreen`) keeps only a compact 40px title row. On Windows it also hides the official sidebar-collapse and new-session controls that the window chrome promotes into the titlebar layer when the sidebar is collapsed / the window is narrow — otherwise they painted above the focus layer and a stray click switched sessions while reading; both come back with the chrome on exit. In a plain browser the variables and markers are absent, so the 0px fallback keeps the old pixel-identical layout |
 | File-mention chips | Inline-code paths in AI replies resolve through the official `chatFileMentions` into clickable chips: on dsh 0.2.x the overlay passes the same real Turn face (`deliverables` projection) the official chat turn tail uses and opens through the sidebar resource controller's `dsh-resource://file/session/…` address; on dsh ≤ 0.1.x it keeps the legacy owner shape and `workspaces.openPath`. No chip without projection data, and a resolver failure never crashes the overlay |
 | Image resolution | Assistant `image` blocks resolve through `uiConversation.imageUrl` (the dsh 0.1.2+ session-authorized image cache), falling back to the legacy resolver on older dsh |
 | Tool-call folding | Follows the official "transcript view" preference (normal / compact); compact mode folds each turn's work part into a "N tool calls · M messages · K subagents" disclosure line ("Thought for a while" when nothing is countable), clickable to expand the full detail; steering messages always stay top-level, never buried; the last turn stays unfolded while streaming |
@@ -128,7 +128,7 @@ Restart `dsh web` after install.
 
 The desktop app manages plugins itself, no CLI needed: **Plugins → Add plugin** in the sidebar, enter `dsh-focus-overlay` (or a local directory / `link:` path such as `link:/path/to/dsh-focus-overlay`), then configure it on this plugin's detail page. Reload the desktop window (or restart the app) after installing or updating.
 
-Desktop support is verified against **dsh desktop 0.2.2-rc.1**: macOS and Windows share the same Electron renderer and client contracts; the window-chrome differences (macOS traffic lights / Windows native titlebar) are driven by the official `data-platform` / `data-windows-titlebar` / `data-fullscreen` markers, and the plugin adapts through the official frame variables — one install serves both platforms. In focus mode the top of the overlay is a draggable title band; native fullscreen (macOS green button / Windows maximize) shrinks the reservation automatically.
+Desktop support is verified against **dsh desktop 0.2.2-rc.1**: macOS and Windows share the same Electron renderer and client contracts; the window-chrome differences (macOS traffic lights / Windows native titlebar) are driven by the official `data-platform` / `data-windows-titlebar` / `data-fullscreen` markers, and the plugin adapts through the official frame variables — one install serves both platforms. In focus mode the top of the overlay is a single draggable title row that shares the window-control line (no extra blank band above it); native fullscreen (macOS green button / Windows maximize) tightens it to a compact 40px row.
 
 > The desktop app uses its own `desktop` profile: installing the plugin only into the Web CLI's `web` profile does not install it in the desktop app — add it once on the Plugins page there too.
 

package/README.md

@@ -24,7 +24,7 @@
 - **自动专注与提醒** —— 回复正常完成后可自动进入专注并定位到你的提问；专注中收到新回复、或 AI 等待你回答时弹出提醒
 - **宽度调节** —— 正文两侧的拖拽把手（官方 WidthHandle 复刻），实时拖动阅读列宽并持久化
 - **快捷键 F** —— 任意界面按 `F` 一键进入专注模式，可在设置中关闭；输入框内打字不会误触发
-- **桌面版窗口适配** —— 适配 dsh 桌面版（macOS / Windows）：顶部按官方窗口框架变量为 macOS 红绿灯与 Windows 原生标题栏让出空间，专注时这段顶部空白条可直接拖动窗口，进入全屏后自动收起预留空间
+- **桌面版窗口适配** —— 适配 dsh 桌面版（macOS / Windows）：专注标题栏直接并进官方窗口留白（macOS 红绿灯 48px / Windows 原生标题栏 40px），标题与「退出专注」就在这一行里，整条标题栏可拖动窗口，不再额外占一行空白；原生全屏时收紧为 40px 紧凑标题行
 - **专注计数** —— 设置卡片最底部累计展示你进入专注模式的次数；超过 100 次后出现 GitHub Star 引导，点过一次即被记住，之后提供「前往 GitHub 项目页面」直达按钮
 
 这些功能专为**小屏幕**提供更多内容呈现空间：收起常驻的标题 / 输入区与工具步骤，让有限的屏幕尽可能多地展示对话。
@@ -56,7 +56,7 @@
 | --- | --- |
 | 全屏专注遮罩 | 经 `shell.overlay` 注册（纯增量、`replaceRisk: none`），覆盖标题区 / 输入区 / 侧栏；顶部只留会话标题与「退出专注」按钮 |
 | 官方渲染原语 | AI 文本走官方 `MarkdownText`（GFM + 代码高亮 + TeX + 代码复制按钮 + 脚注）；用户消息按运行版本选择官方用户文本投影：dsh 0.1.2–0.2.0 用 `projectUserText`（纯文本 + `@`/`/` 引用 chip），dsh 0.2.2 桌面版移除了该函数后自动回退到官方 `UserTextRun`（纯文本 run），不会因 `undefined` 组件崩溃；按钮、模态、图标均为官方原语 |
-| 桌面版窗口框架 | 按官方 `--dsh-frame-overlay-top` / `--dsh-frame-top-clearance` / `--dsh-frame-chrome-top` 变量为 macOS 红绿灯（≈48px）与 Windows 原生标题栏（40px）预留顶部空间，并提供一个与官方拖拽区一致的顶部拖拽条（`data-window-drag` + `-webkit-app-region: drag`），专注时可拖动窗口；原生全屏（`data-fullscreen`）时预留自动降为 20px；Windows 上还会隐藏被官方提升到标题栏层的「侧边栏开关」与「新建会话」按钮（侧栏折叠 / 窄窗口时出现），避免它们浮在专注层之上、误触后在你阅读时切换会话；退出专注后随窗口 chrome 一起恢复。普通浏览器中这些变量与标记不存在，回退 0px、与旧版逐像素一致 |
+| 桌面版窗口框架 | 专注标题栏与官方窗口留白合并为一条：只预留官方 `--dsh-frame-top-clearance`（macOS 红绿灯 48px / Windows 原生标题栏 40px），标题与「退出专注」就在这条标题栏内，正文紧接着从留白下沿开始，不再叠加原来那行 48px 标题栏、也不再占用官方弹窗额外的 20px 间距；标题行是叠加层里最后生效的拖拽矩形（macOS 由合并后的标题行自身声明；Windows 由 overlay 最后一个子节点 `.fm-frame-strip` 声明，均为 `data-window-drag` + `-webkit-app-region: drag`），保证滚动内容 / 右侧导航等 `no-drag` 矩形不会覆盖它，「退出专注」按钮显式排除拖拽、保持可点；标题在 macOS 从 x=88px 起避开红绿灯、在 Windows 避开右上角原生按钮；原生全屏（`data-fullscreen`）时只保留 40px 紧凑标题行；Windows 上还会隐藏被官方提升到标题栏层的「侧边栏开关」与「新建会话」按钮（侧栏折叠 / 窄窗口时出现），避免它们浮在专注层之上、误触后在你阅读时切换会话；退出专注后随窗口 chrome 一起恢复。普通浏览器中这些变量与标记不存在，回退 0px、与旧版逐像素一致 |
 | 文件引用 chip | AI 回复中的行内代码路径由官方 `chatFileMentions` 解析为可点击 chip：dsh 0.2.x 传入官方同款的真实 Turn face（`deliverables` 投影），点击经右侧栏资源控制器以 `dsh-resource://file/session/…` 打开；dsh ≤ 0.1.x 继续使用旧的 owner 形状与 `workspaces.openPath`；无投影数据时不显示 chip，绝不因解析异常崩溃 |
 | 图片解析 | assistant 的 `image` 块经 `uiConversation.imageUrl`（dsh 0.1.2+ 的会话授权图片缓存）解析，旧版 dsh 自动回退到 legacy 解析器 |
 | 工具调用折叠 | 遵循官方「对话显示」偏好（normal / compact）；compact 模式把每轮的工作部分折叠成「N 次工具调用 · M 条消息 · K 个 subagent」披露行（无内容时显示「已思考」），点击可展开完整明细；steering 消息始终独立成行不被折叠；流式中的最后一轮保持展开直到结束 |
@@ -126,7 +126,7 @@ dsh web
 
 dsh 桌面版自带插件管理，不需要 CLI：侧栏 **Plugins → 添加插件**，填入 `dsh-focus-overlay`（或本机目录 / `link:` 路径，例如 `link:/path/to/dsh-focus-overlay`），安装后在本插件详情页中配置。安装或更新后重新加载桌面窗口（或重启桌面应用）生效。
 
-桌面版适配基于 **dsh 桌面版 0.2.2-rc.1** 验证：macOS 与 Windows 共用同一套 Electron 渲染层与客户端契约，窗口框架差异（macOS 红绿灯 / Windows 原生标题栏）由官方 `data-platform` / `data-windows-titlebar` / `data-fullscreen` 标记驱动，插件按官方窗口框架变量自适应，无需按平台分别安装。专注模式下顶部为可拖动窗口的标题空白条；按原生全屏切换后（macOS 绿灯 / Windows 最大化按钮）自动收起预留空间。
+桌面版适配基于 **dsh 桌面版 0.2.2-rc.1** 验证：macOS 与 Windows 共用同一套 Electron 渲染层与客户端契约，窗口框架差异（macOS 红绿灯 / Windows 原生标题栏）由官方 `data-platform` / `data-windows-titlebar` / `data-fullscreen` 标记驱动，插件按官方窗口框架变量自适应，无需按平台分别安装。专注模式下顶部只有一条与窗口控制键同行的可拖动标题栏（不再有额外的空白条）；按原生全屏切换后（macOS 绿灯 / Windows 最大化按钮）收紧为 40px 紧凑标题行。
 
 > 桌面版使用独立的 `desktop` profile：如果只在 Web CLI 的 `web` profile 里装过本插件，桌面版仍需在 Plugins 页面安装一次。
 

package/lib/client.js

@@ -1861,23 +1861,38 @@ window.__ModuleLoader__.load({
 		//#region src/client/styles.ts
 		/** Package-owned stylesheet text (injected by the client apply, cleaned up on unload). */
 		const FOCUS_CSS = `
-.fm-overlay{position:fixed;inset:0;z-index:2147483000;box-sizing:border-box;padding-top:var(--dsh-frame-overlay-top,0px);background:var(--dsw-alias-bg-base,#fff);color:var(--dsw-alias-label-primary,#1a1a1a);display:flex;flex-direction:column;pointer-events:auto;font-family:var(--dsw-font-family,sans-serif);outline:none}
-/* Desktop window frame (dsh desktop 0.2.2+, macOS and Windows): the shell's
-   hidden native titlebar area is web content owned by whatever fills the
-   viewport, so this overlay reserves it via *.fm-overlay's padding-top and
-   provides the drag surface itself. Heights come from the official layout
-   variables set on <html> by dsh-client-ui-layout (+ the desktop preload for
-   --dsh-windows-titlebar-height); the 0px fallback keeps the plain web
-   generation pixel-identical. On macOS the shell's own
-   [data-window-drag]{-webkit-app-region:drag} applies; the explicit
-   app-region also makes the strip draggable in the Windows renderer.
-   pointer-events stays enabled: a drag region must be hit-testable. */
-.fm-frame-strip{position:absolute;top:0;left:0;right:0;height:var(--dsh-frame-overlay-top,0px);flex:none;-webkit-app-region:drag;-webkit-user-select:none;user-select:none;z-index:0}
+.fm-overlay{position:fixed;inset:0;z-index:2147483000;box-sizing:border-box;--fm-frame-band:0px;padding-top:var(--fm-frame-band);background:var(--dsw-alias-bg-base,#fff);color:var(--dsw-alias-label-primary,#1a1a1a);display:flex;flex-direction:column;pointer-events:auto;font-family:var(--dsw-font-family,sans-serif);outline:none}
+/* Desktop window frame (dsh desktop 0.2.2+, macOS and Windows) — the top band.
+   The shell's hidden native titlebar area is ordinary web content owned by
+   whatever fills the viewport, and the official layout publishes the
+   clearance on <html> (dsh-client-ui-layout + the desktop preload):
+   --dsh-frame-top-clearance is 48px on macOS (traffic lights: x16..77,
+   y18..32) and the 40px caption height on Windows (--dsh-windows-titlebar-
+   height). The overlay reserves EXACTLY that band, not
+   --dsh-frame-overlay-top — that variable is clearance + 20px because the
+   official full-window surfaces are dialogs that want a gap; a full-window
+   reading surface must not pay the dialog gap.
+   macOS: the band holds nothing but the traffic lights, so the focus title row
+   is merged INTO it (see .fm-topbar) and the transcript starts right below it;
+   native fullscreen has no traffic lights, so the band shrinks to a compact
+   40px title row.
+   Windows: the band is NOT merged into, because the preload-injected web
+   caption MENUBAR ([data-windows-menu], shadow DOM, z-index 1100) sits at the
+   top-left of that band ABOVE this overlay (the overlay lives inside the
+   official z-20 shell.overlay stacking context) and must stay visible — it is
+   the only app menu. Merging the title row into the band would hide the title
+   behind the menubar, so Windows keeps the band as caption chrome and puts the
+   title row directly underneath it (see the win32 rules below).
+   The 0px fallback keeps the plain web generation pixel-identical (no band;
+   the topbar sits in normal flow). */
+html[data-platform=darwin] .fm-overlay{--fm-frame-band:var(--dsh-frame-top-clearance,48px)}
+html[data-platform=darwin][data-fullscreen] .fm-overlay{--fm-frame-band:40px}
+html[data-windows-titlebar] .fm-overlay{--fm-frame-band:var(--dsh-windows-titlebar-height,40px)}
 /* Windows desktop: dsh-client-ui-sidebar promotes the sidebar collapse toggle
    to a fixed z-30 layer itself, above the official shell.overlay layer (z-20)
    that hosts this overlay — so without this rule the toggle floats above focus
-   mode inside the titlebar band and steals clicks/drags from the drag strip
-   (macOS keeps it behind the overlay). Hide it exactly while focus is on; it
+   mode inside the titlebar band and steals clicks/drags from the merged
+   title row's drag band (macOS keeps it behind the overlay). Hide it exactly while focus is on; it
    comes back with the rest of the chrome when focus exits. */
 html[data-windows-titlebar] body[data-fm-focus] [data-sidebar-toggle]{display:none!important}
 /* Same Windows titlebar band: when the official sidebar is collapsed (user
@@ -1889,7 +1904,38 @@ html[data-windows-titlebar] body[data-fm-focus] [data-sidebar-toggle]{display:no
    the only stable hook the shipped CSS exposes; the e2e desktop-frame leak
    guard fails loudly if a future build renames it. */
 html[data-windows-titlebar] body[data-fm-focus] [class*="newSession"]{display:none!important}
-.fm-topbar{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:10px 16px;border-bottom:1px solid var(--dsw-alias-border-l1,rgba(0,0,0,.12));flex:0 0 auto}
+/* Focus titlebar row. Plain web: an ordinary flow row above the body (it is
+   the overlay's last-but-one DOM child because the Windows drag strip follows
+   it; order:-1 keeps it visually first here).
+   macOS desktop: merged INTO the reserved band — absolutely positioned over
+   the overlay's padding-top area, exactly as tall as the band, so the title
+   shares the line with the native traffic lights instead of stacking another
+   48px bar underneath an empty band. The title is cleared past the traffic
+   lights (they end at x≈76.7; the official leading seat uses left:88). This
+   row IS the macOS drag surface: data-window-drag (the official darwin rule)
+   plus an explicit app-region declaration, with every interactive descendant
+   excluded so controls inside the band stay clickable (darwin's official
+   no-drag for button/[tabindex] is repeated here so the contract is local).
+   Windows desktop: the caption band above is owned by the native caption
+   buttons and the web caption menubar (which paints above the overlay), so the
+   title row is an ordinary row BELOW that band — no drag region here and no
+   overlap with the menubar; the Windows drag surface is the separate
+   .fm-frame-strip over the band. */
+.fm-topbar{order:-1;display:flex;align-items:center;justify-content:space-between;gap:12px;padding:10px 16px;border-bottom:1px solid var(--dsw-alias-border-l1,rgba(0,0,0,.12));flex:0 0 auto}
+html[data-platform=darwin] .fm-topbar{position:absolute;top:0;left:0;right:0;height:var(--fm-frame-band);box-sizing:border-box;margin:0;padding:0 16px 0 88px;z-index:4;-webkit-app-region:drag;-webkit-user-select:none;user-select:none}
+html[data-platform=darwin][data-fullscreen] .fm-topbar{padding:0 16px}
+html[data-platform=darwin] .fm-topbar :is(button,a,input,select,textarea,summary,[contenteditable=true],[tabindex]){-webkit-app-region:no-drag}
+html[data-windows-titlebar] .fm-topbar{height:40px;box-sizing:border-box;margin:0;padding:0 16px;flex:0 0 40px}
+/* Windows desktop drag band: the 40px caption band above the title row is
+   ordinary overlay background, with the web caption menubar (painted above the
+   overlay) at its left and the native caption buttons (OS overlay) at its
+   right. This strip claims the band as the window drag surface; it is the
+   overlay's LAST child because Electron applies the renderer's app-region
+   rects in layout-tree order and the later rect wins (see FocusView.tsx).
+   Hidden on the plain web and on macOS, where the merged title row itself is
+   the drag surface and there is no separate element to claim. */
+.fm-frame-strip{display:none}
+html[data-windows-titlebar] .fm-frame-strip{display:block;position:absolute;top:0;left:0;right:0;height:var(--fm-frame-band);-webkit-app-region:drag;-webkit-user-select:none;user-select:none;z-index:0}
 .fm-title{font-size:calc(14px + var(--dsh-content-font-delta,0px));font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .fm-body-wrap{position:relative;flex:1 1 auto;display:flex;min-height:0}
 .fm-body{flex:1 1 auto;min-width:0;overflow-y:auto;padding:28px 28px 160px}
@@ -3461,23 +3507,6 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 				ref: overlayRef,
 				tabIndex: -1,
 				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: "fm-frame-strip",
-						"data-window-drag": true,
-						"aria-hidden": "true"
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-						className: "fm-topbar",
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "fm-title",
-							children: title
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
-							variant: "outline",
-							size: "sm",
-							onClick: () => focusStore.set(false),
-							children: t("exit")
-						})]
-					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "fm-body-wrap",
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -3517,7 +3546,25 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 							onJumpBottom: scrollToBottom
 						})
 					}) : null,
-					replyNotice
+					replyNotice,
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "fm-topbar",
+						"data-window-drag": true,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "fm-title",
+							children: title
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+							variant: "outline",
+							size: "sm",
+							onClick: () => focusStore.set(false),
+							children: t("exit")
+						})]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "fm-frame-strip",
+						"data-window-drag": true,
+						"aria-hidden": "true"
+					})
 				]
 			});
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-focus-overlay",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "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",