dsh-focus-overlay 0.12.4 → 0.13.1

package/README.en.md

@@ -5,7 +5,7 @@
 </p>
 
 <p align="center">
-  A <b>focus mode</b> for the DeepSeek Harness (DSH) web GUI: one click to a full-screen reading overlay that hides the header, composer and sidebars, folding the AI tool-call flow into official-style count summaries — leaving only the conversation between you and the AI.<br>
+  A <b>focus mode</b> for the DeepSeek Harness (DSH) web GUI and the macOS / Windows desktop app: one click to a full-screen reading overlay that hides the header, composer and sidebars, folding the AI tool-call flow into official-style count summaries — leaving only the conversation between you and the AI.<br>
   Text, images, the turn rail, width handles and the answer card all reuse or 1:1 replicate official components, matching the chat view's look.
 </p>
 
@@ -26,6 +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 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.
@@ -56,7 +57,9 @@ Click the line to expand that turn's full work detail (per-category one-line sum
 | Feature | Description |
 | --- | --- |
 | 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 through the official `projectUserText` projection; buttons, modals and icons are all official primitives |
+| 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 | 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 |
 | Categorized summaries | The expanded detail counts tools by family: commands / edits / searches / reads / directory listings / subagents / todos / goals / workflows / skills / questions / plans / background jobs / context injections |
@@ -82,11 +85,11 @@ Click the line to expand that turn's full work detail (per-category one-line sum
 | Render error boundary | The overlay content is wrapped in an error boundary: one render crash never bricks the Focus button — the next open retries |
 | DSH-better-sidebar compatibility | While in focus, a `<body>` marker makes the package stylesheet hide better-sidebar's top-right panel toggles and any open right/bottom panels (and release the squeezed layout); restored on exit |
 | Legacy compatibility mode | On dsh < 0.1.2 missing the new services, the overlay degrades gracefully (legacy snapshot adapters) with a one-time console notice — no crash |
-| Cross-release primitive compatibility | Official primitives renamed between major releases fall back by availability (dsh 0.2 removed the fixed-size `…14` / `…16` icons in favour of `…Regular` + `size`), so an `undefined` component can never throw React #130 |
+| Cross-release primitive compatibility | Official primitives renamed between major releases fall back by availability (dsh 0.2 removed the fixed-size `…14` / `…16` icons in favour of `…Regular` + `size`; the dsh 0.2.2 desktop runtime removed `projectUserText` in favour of `UserTextRun`), so an `undefined` component can never throw React #130 |
 
 ## Install
 
-Requires the `dsh` CLI (`>= 0.1.2-rc.1`) and Node `>= 22.19.0`.
+Requires `dsh` (Web CLI or the desktop app, `>= 0.1.2-rc.1`) and, for source installs, Node `>= 22.19.0`.
 
 **From npm (recommended)**
 
@@ -121,6 +124,14 @@ dsh web
 
 Restart `dsh web` after install.
 
+**DSH desktop app (macOS / Windows)**
+
+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 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.
+
 > **First run**: after restarting, the welcome page shows a one-time "Focus Mode" intro that explains the features and lets you configure them in place; all of these settings can be changed anytime — on newer dsh open this plugin's detail page from the sidebar "Plugins" page, on older dsh use "Settings → Plugins → Plugin configuration".
 
 ## Usage

package/README.md

@@ -3,7 +3,7 @@
 <p align="center">中文 | <a href="README.en.md">English</a></p>
 
 <p align="center">
-  为 DeepSeek Harness（DSH）Web GUI 提供的<b>专注模式</b>：一键进入全屏阅读遮罩，隐藏标题区、输入区与侧栏，把 AI 的工具调用过程折叠成官方样式的计数摘要，只保留「你与 AI 的对话」本身。<br>
+  为 DeepSeek Harness（DSH）Web GUI 与桌面版（macOS / Windows）提供的<b>专注模式</b>：一键进入全屏阅读遮罩，隐藏标题区、输入区与侧栏，把 AI 的工具调用过程折叠成官方样式的计数摘要，只保留「你与 AI 的对话」本身。<br>
   文本、图片、导航条、宽度调节与答题卡均复用或 1:1 复刻官方组件，观感与聊天视图一致。
 </p>
 
@@ -24,6 +24,7 @@
 - **自动专注与提醒** —— 回复正常完成后可自动进入专注并定位到你的提问；专注中收到新回复、或 AI 等待你回答时弹出提醒
 - **宽度调节** —— 正文两侧的拖拽把手（官方 WidthHandle 复刻），实时拖动阅读列宽并持久化
 - **快捷键 F** —— 任意界面按 `F` 一键进入专注模式，可在设置中关闭；输入框内打字不会误触发
+- **桌面版窗口适配** —— 适配 dsh 桌面版（macOS / Windows）：专注标题栏直接并进官方窗口留白（macOS 红绿灯 48px / Windows 原生标题栏 40px），标题与「退出专注」就在这一行里，整条标题栏可拖动窗口，不再额外占一行空白；原生全屏时收紧为 40px 紧凑标题行
 - **专注计数** —— 设置卡片最底部累计展示你进入专注模式的次数；超过 100 次后出现 GitHub Star 引导，点过一次即被记住，之后提供「前往 GitHub 项目页面」直达按钮
 
 这些功能专为**小屏幕**提供更多内容呈现空间：收起常驻的标题 / 输入区与工具步骤，让有限的屏幕尽可能多地展示对话。
@@ -54,7 +55,9 @@
 | 功能 | 说明 |
 | --- | --- |
 | 全屏专注遮罩 | 经 `shell.overlay` 注册（纯增量、`replaceRisk: none`），覆盖标题区 / 输入区 / 侧栏；顶部只留会话标题与「退出专注」按钮 |
-| 官方渲染原语 | AI 文本走官方 `MarkdownText`（GFM + 代码高亮 + TeX + 代码复制按钮 + 脚注），用户消息走官方 `projectUserText` 投影；按钮、模态、图标均为官方原语 |
+| 官方渲染原语 | AI 文本走官方 `MarkdownText`（GFM + 代码高亮 + TeX + 代码复制按钮 + 脚注）；用户消息按运行版本选择官方用户文本投影：dsh 0.1.2–0.2.0 用 `projectUserText`（纯文本 + `@`/`/` 引用 chip），dsh 0.2.2 桌面版移除了该函数后自动回退到官方 `UserTextRun`（纯文本 run），不会因 `undefined` 组件崩溃；按钮、模态、图标均为官方原语 |
+| 桌面版窗口框架 | 专注标题栏与官方窗口留白合并为一条：只预留官方 `--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 消息始终独立成行不被折叠；流式中的最后一轮保持展开直到结束 |
 | 分类摘要明细 | 展开后按工具类别计数：命令 / 编辑 / 搜索 / 读取 / 列目录 / 子代理 / 待办 / 目标 / 工作流 / 技能 / 提问 / 计划 / 后台任务 / 上下文注入 |
@@ -80,11 +83,11 @@
 | 渲染错误兜底 | 遮罩内容包裹错误边界：一次渲染崩溃不会永久打死「专注」按钮，下次打开自动重试 |
 | 兼容 DSH-better-sidebar | 进入专注时在 `<body>` 打标记，样式层自动隐藏其右上角的收放面板按钮与已开启的右侧 / 底部面板，并释放被挤压的布局；退出专注后按原状态还原 |
 | 旧版兼容模式 | dsh < 0.1.2 缺少新服务时降级运行（legacy 快照适配），控制台一次性提示，不会崩溃 |
-| 跨版本构件兼容 | 图标等官方构件在两个大版本间改名时按可用性回退（dsh 0.2 移除了 `…14` / `…16` 定尺图标，改用 `…Regular` + `size`），不会因为 `undefined` 组件触发 React #130 |
+| 跨版本构件兼容 | 图标等官方构件在两个大版本间改名时按可用性回退（dsh 0.2 移除了 `…14` / `…16` 定尺图标，改用 `…Regular` + `size`；dsh 0.2.2 桌面版移除了 `projectUserText`，回退到 `UserTextRun`），不会因为 `undefined` 组件触发 React #130 |
 
 ## 安装
 
-需要 `dsh` CLI（`>= 0.1.2-rc.1`），Node `>= 22.19.0`。
+需要 `dsh`（Web CLI 或桌面版，`>= 0.1.2-rc.1`），Node `>= 22.19.0`（仅源码安装时需要 Node）。
 
 **从 npm（推荐）**
 
@@ -119,6 +122,14 @@ dsh web
 
 安装后重启 `dsh web` 生效。
 
+**DSH 桌面版（macOS / Windows）**
+
+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 最大化按钮）收紧为 40px 紧凑标题行。
+
+> 桌面版使用独立的 `desktop` profile：如果只在 Web CLI 的 `web` profile 里装过本插件，桌面版仍需在 Plugins 页面安装一次。
+
 > **首次安装**：重启后欢迎页会弹出一次「专注模式」引导，说明功能并让你就地完成配置；其中所有设置随时可以更改——新版 dsh 在侧栏「Plugins」页面中打开本插件的详情页，旧版在「设置 → 插件 → 插件配置」中。
 
 ## 使用

package/lib/client.js

@@ -29,6 +29,46 @@ window.__ModuleLoader__.load({
 		let _deepseek_ai_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 		_deepseek_ai_dsh_client_ui_primitives = __toESM(_deepseek_ai_dsh_client_ui_primitives, 1);
 		let react_jsx_runtime = require("react/jsx-runtime");
+		//#region src/client/primitives.ts
+		/** Cross-release primitives resolution.
+		*
+		*  dsh keeps renaming/removing symbols in `@deepseek-ai/dsh-client-ui-primitives`
+		*  between releases, and a stale named import resolves to `undefined` — React
+		*  then throws #130 ("element type is invalid") the moment it renders. Two
+		*  such breaks are already in this repo's history: `MessageText` (0.1.3) and
+		*  the fixed-size icon variants (0.2). The 0.2.2 desktop runtime adds a third:
+		*  `projectUserText` is gone.
+		*
+		*  The official user-text pipeline changed shape in 0.2.2: the conversation
+		*  surface now parses text itself and renders inline nodes, falling back to
+		*  the `UserTextRun` primitive (a plain inline run) for unmatched text. This
+		*  module picks whichever projection the running primitives module actually
+		*  exports, so one client bundle serves 0.1.2 through 0.2.2:
+		*
+		*  - dsh 0.1.2 … 0.2.0: `projectUserText(text, sessionLabels, …)` returns
+		*    inline plain runs plus `@session` / `/skill` chips (the richer path).
+		*  - dsh 0.2.2+: `UserTextRun` renders the text as a plain inline run; the
+		*    overlay's bubble chrome still supplies `white-space: pre-wrap`, so the
+		*    text keeps its shape. Reference chips in *user* text are the only
+		*    cosmetic loss on that generation.
+		*  - Anything else: return the raw string (React renders it as a text node).
+		*
+		*  Import the namespace once (not named symbols) so the resolver can never
+		*  crash at module-evaluation time. */
+		/** Render one user prompt's text through the projection the running dsh
+		*  exports. `sessionLabels` feeds the older chip projection; newer
+		*  generations ignore it. */
+		function projectUserTextCompat(text, sessionLabels = []) {
+			const primitives = _deepseek_ai_dsh_client_ui_primitives;
+			const project = primitives.projectUserText;
+			if (typeof project === "function") try {
+				return project(text, sessionLabels);
+			} catch {}
+			const UserTextRun = primitives.UserTextRun;
+			if (typeof UserTextRun === "function") return (0, react.createElement)(UserTextRun, { text });
+			return text;
+		}
+		//#endregion
 		//#region src/client/icons.ts
 		/** Cross-release product-icon resolution.
 		*
@@ -200,6 +240,44 @@ window.__ModuleLoader__.load({
 			const body = relative.split("/").map(encode).join("/");
 			return `dsh-resource://file/session/${encode(String(sessionId))}/${body}`;
 		}
+		/** Resolve the owner object the official `chatFileMentions.forClosing` expects.
+		*
+		*  dsh 0.2.x's provider resolves a turn's produced / presented files through
+		*  `owner.turn.data.get('deliverables')` — the owner the official ui-chat turn
+		*  tail passes — and throws on the plain `{turn: {turn, step}}` owner shape the
+		*  overlay used to pass; the caller's catch then silently disabled the inline
+		*  file-mention chips (pre-existing on every 0.2 build, not a desktop
+		*  regression). The Chat snapshot's `timeline.turns` carries the real Turn
+		*  faces, so look one up by the assistant node's turn number. Chips belong to
+		*  the settled closing reply only, so a missing or still-running turn resolves
+		*  to null. Generations without a `timeline` (0.1.x) keep the legacy shape
+		*  their provider accepts. */
+		function fileMentionOwnerOf(chatView, node, openFile) {
+			const turns = chatView && chatView.timeline ? chatView.timeline.turns : null;
+			if (turns && typeof turns.get === "function") {
+				const turnFace = turns.get(node && node.turn);
+				if (!turnFace || turnFace.status !== "closed") return null;
+				return {
+					owner: {
+						turn: turnFace,
+						seq: node.seq,
+						openFile
+					},
+					modern: true
+				};
+			}
+			return {
+				owner: {
+					turn: {
+						turn: node.turn,
+						step: node.step
+					},
+					seq: node.seq,
+					openFile
+				},
+				modern: false
+			};
+		}
 		function flattenText(content) {
 			if (!content || !content.length) return "";
 			let out = "";
@@ -1783,8 +1861,81 @@ 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;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}
-.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}
+.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 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
+   collapsed it, or the window is narrower than 768px — Windows has no drawer),
+   dsh-client-ui-sidebar promotes its "new session" control to the same fixed
+   z-30 titlebar layer (left:48px, top:6px). It would sit above the overlay and
+   click-through would start a new session under the reader, so hide it with
+   the rest of the window chrome while focus is on. The hashed class name is
+   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}
+/* 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}
@@ -2399,16 +2550,18 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 		}
 		/** Body of a sent user message / steering row.
 		*
-		*  dsh 0.1.3-alpha.2 removed the `MessageText` component from the primitives
-		*  module in favour of the `projectUserText` display projection (which has
-		*  existed since 0.1.2 and is still exported by 0.1.5). Importing the removed
-		*  name made it `undefined`, so the overlay threw React #130 the moment it
-		*  rendered a session containing a user message — the "toggle does nothing"
-		*  symptom. `projectUserText` returns inline plain runs plus `@session` /
-		*  `/skill` chips; `.fm-user` still supplies the bubble chrome and
-		*  `white-space: pre-wrap`, so the text keeps its shape. */
+		*  The official user-text projection has now changed twice: dsh 0.1.3-alpha.2
+		*  removed `MessageText` in favour of `projectUserText` (which this component
+		*  then imported as a named binding — React #130 the moment a user row
+		*  rendered when the later removal made it `undefined`), and dsh 0.2.2's
+		*  desktop runtime removed `projectUserText` itself (the conversation surface
+		*  parses user text and falls back to the `UserTextRun` primitive).
+		*  `projectUserTextCompat` resolves the projection the running primitives
+		*  module exports (`projectUserText` → `UserTextRun` → raw text), so one
+		*  bundle serves 0.1.2 through 0.2.2. `.fm-user` still supplies the bubble
+		*  chrome and `white-space: pre-wrap`, so the text keeps its shape. */
 		function UserText({ text }) {
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: (0, _deepseek_ai_dsh_client_ui_primitives.projectUserText)(text, []) });
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: projectUserTextCompat(text) });
 		}
 		let bodyEl = null;
 		const anchors = {};
@@ -2964,22 +3117,28 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 				sessions,
 				currentId
 			]);
+			/** Assistant-row inline-code file mentions. The official provider resolves
+			*  only a turn's produced / presented files, and dsh 0.2.x reads them from
+			*  the real Turn face (`owner.turn.data.get('deliverables')`) — the same
+			*  owner the official ui-chat turn tail passes. Handing it a plain
+			*  `{turn: number, step}` makes `forClosing` throw, and the plugin's catch
+			*  silently disabled the chips on every 0.2 build (pre-existing bug, not a
+			*  0.2.2 regression). `fileMentionOwnerOf` (model.ts) resolves the Turn face
+			*  from the Chat snapshot's `timeline.turns`, and keeps the legacy owner
+			*  shape for generations without a timeline. */
 			const fileMentionsFor = (0, react.useCallback)((node) => {
 				if (!chatFileMentions) return void 0;
 				try {
-					return chatFileMentions.forClosing({
-						turn: {
-							turn: node.turn,
-							step: node.step
-						},
-						seq: node.seq,
-						openFile: (path, options) => openMentionedFile(path, options)
-					}, currentId);
+					const openFile = (path, options) => openMentionedFile(path, options);
+					const resolved = fileMentionOwnerOf(chatView, node, openFile);
+					if (resolved === null) return void 0;
+					return chatFileMentions.forClosing(resolved.owner, currentId);
 				} catch {
 					return;
 				}
 			}, [
 				chatFileMentions,
+				chatView,
 				currentId,
 				openMentionedFile
 			]);
@@ -3030,7 +3189,7 @@ body[data-fm-focus] #root :has(> [data-slot="conversation"]){margin-bottom:0!imp
 				setDockFocused(f);
 				if (!f) setEngaged(false);
 			};
-			const queueCount = snap && snap.queue ? snap.queue.length : 0;
+			const queueCount = inputState && Array.isArray(inputState.queue) ? inputState.queue.length : snap && snap.queue ? snap.queue.length : 0;
 			const occCount = inputState && inputState.occurrences ? inputState.occurrences.length : 0;
 			const promptErr = snap && snap.promptError && snap.promptError.op === "send" ? snap.promptError.error : null;
 			const errorLine = promptErr ? promptErr.message || promptErr.code || "send failed" : null;
@@ -3348,18 +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.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", {
@@ -3399,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.12.4",
+  "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",
@@ -32,7 +32,8 @@
         "0.1.2-rc.1": "compatible",
         "0.1.3-alpha.1": "compatible",
         "0.1.5-rc.1": "compatible",
-        "0.2.0-rc.2": "compatible"
+        "0.2.0-rc.2": "compatible",
+        "0.2.2-rc.1": "compatible"
       }
     }
   },