@artenx/dshb 0.1.26 → 0.1.28

package/lib/client.js

@@ -510,7 +510,8 @@ window.__ModuleLoader__.load({
 		const dialogStyle = {
 			width: "min(92vw, 560px)",
 			maxWidth: "100%",
-			maxHeight: "80vh",
+			maxHeight: "80dvh",
+			paddingBottom: "max(env(safe-area-inset-bottom), 12px)",
 			overflow: "auto",
 			overflowX: "hidden",
 			background: "var(--dsw-alias-bg-layer-1)",
@@ -952,7 +953,8 @@ window.__ModuleLoader__.load({
 					style: {
 						width: "min(92vw, 600px)",
 						maxWidth: "100%",
-						maxHeight: "85vh",
+						maxHeight: "85dvh",
+						paddingBottom: "max(env(safe-area-inset-bottom), 12px)",
 						overflow: "auto",
 						overflowX: "hidden",
 						background: "var(--dsw-alias-bg-layer-1)",
@@ -1129,7 +1131,7 @@ window.__ModuleLoader__.load({
   /* footer 容器各项间距 16px 偏松 */
   [data-phase] [class*="_root"][class*="osXY9a"] { gap: 8px !important; }
   /* footer 统计行窄屏可横向滑动看全，不溢出页面 */
-  [data-phase] [class*="_actions"] { max-width: 100% !important; overflow-x: auto !important; scrollbar-width: none; touch-action: pan-x pan-y !important; }
+  [data-phase] [class*="_actions"] { max-width: 100% !important; overflow-x: auto !important; scrollbar-width: none; touch-action: pan-x pan-y pinch-zoom !important; }
   [data-phase] [class*="_actions"]::-webkit-scrollbar { display: none; }
 
   /* 模型切换菜单：名称完整展示，长名称在菜单项内换行。 */
@@ -1156,19 +1158,8 @@ window.__ModuleLoader__.load({
      overflow: visible !important;
    }
 
-  /* 模型选择器弹窗：JS（installModelMenuPosition）在窄屏下改为 position:fixed
-     视口级浮层（fixed 不受祖先 overflow 裁剪），这里仅做静态兜底（JS 未生效时
-     仍从触发按钮左缘向右展开、宽度收进视口）。 */
-  [class*="7KE1Ra_menu"],
-  [class*="_menu"]:has([class*="modelName"]) {
-    left: 0 !important;
-    right: auto !important;
-    width: calc(100vw - 32px) !important;
-    min-width: 0 !important;
-    max-width: calc(100vw - 32px) !important;
-    overflow-y: auto !important;
-    max-height: calc(100vh - 120px) !important;
-  }
+  /* 菜单定位完全交还上游（0.2.1-rc.2 起菜单 position:fixed 且自带视口钳制；
+     此前插件的 left/width !important 兜底会覆盖上游 place() 的计算结果）。 */
 
   /* 工具调用执行结果/代码/JSON：窄屏可横向滑动。details 抽屉宽 min(92%,420px)
      较窄，命令行输出/JSON 长行溢出被外层 overflow:hidden 裁剪看不到。命令行输出
@@ -1183,7 +1174,7 @@ window.__ModuleLoader__.load({
     overflow-x: auto !important;
     -webkit-overflow-scrolling: touch;
     scrollbar-width: none;
-    touch-action: pan-x pan-y !important;
+    touch-action: pan-x pan-y pinch-zoom !important;
   }
   [data-phase] [class*="resultBlockText"]::-webkit-scrollbar,
   [data-phase] [class*="payload"]::-webkit-scrollbar,
@@ -1201,7 +1192,7 @@ window.__ModuleLoader__.load({
     overflow-x: auto !important;
     -webkit-overflow-scrolling: touch;
     scrollbar-width: none;
-    touch-action: pan-x pan-y !important;
+    touch-action: pan-x pan-y pinch-zoom !important;
   }
   [data-phase] [class*="jsonPayload"]::-webkit-scrollbar,
   [data-phase] [class*="jsonPreview"]::-webkit-scrollbar,
@@ -1224,7 +1215,7 @@ window.__ModuleLoader__.load({
     overflow-x: auto !important;
     -webkit-overflow-scrolling: touch;
     scrollbar-width: none;
-    touch-action: pan-x pan-y !important;
+    touch-action: pan-x pan-y pinch-zoom !important;
   }
   /* xterm uses a transparent helper textarea for all terminal input. Keep it
      focusable and non-zero-sized so mobile browsers can present their keyboard. */
@@ -1251,7 +1242,7 @@ window.__ModuleLoader__.load({
     max-width: 100% !important;
     overflow-x: auto !important;
     overscroll-behavior-x: contain;
-    touch-action: pan-x pan-y !important;
+    touch-action: pan-x pan-y pinch-zoom !important;
   }
   [data-phase] [class*="_prompt_1gdtu_"],
   [data-phase] [class*="_promptLine_1gdtu_"],
@@ -1273,7 +1264,7 @@ window.__ModuleLoader__.load({
     overflow-x: auto !important;
     -webkit-overflow-scrolling: touch;
     scrollbar-width: none;
-    touch-action: pan-x pan-y !important;
+    touch-action: pan-x pan-y pinch-zoom !important;
   }
   [data-phase] [class*="_output_1gdtu_"]::-webkit-scrollbar { display: none !important; }
   [data-phase] [class*="_line_1gdtu_"] {
@@ -1286,7 +1277,7 @@ window.__ModuleLoader__.load({
   [data-phase] [class*="_copyButton_"] { touch-action: manipulation !important; }
   [data-phase] [class*="_copyAnchor_"],
   [data-phase] [class*="_body_1ye18_"],
-  [data-phase] [class*="_root_4qrvp_"] { touch-action: pan-x pan-y !important; }
+  [data-phase] [class*="_root_4qrvp_"] { touch-action: pan-x pan-y pinch-zoom !important; }
 
   /* 上下文用量弹窗（ContextMeter .JObwrW_panel）：上游 dsh-client-ui-trajectory 的
      [class*="panel"] 全局规则给它加了 max-width:100%!important，命中本弹窗，使宽度
@@ -1340,10 +1331,19 @@ window.__ModuleLoader__.load({
     z-index: 2 !important;
     display: inline-flex !important;
     align-items: center; justify-content: center;
-    width: 28px; height: 28px;
+    width: 32px; height: 32px;
     padding: 0; border: none; background: none; cursor: pointer; color: inherit;
     -webkit-tap-highlight-color: transparent;
   }
+  /* 触控命中区扩展：视觉尺寸不变，可点区域扩到 ~44px（Apple HIG 建议值） */
+  [${FRAME_ATTR}="toggle"]::after,
+  [${FRAME_ATTR}="fab"]::after,
+  [class*="_iconButton"]::after {
+    content: "";
+    position: absolute;
+    inset: -7px;
+  }
+  [class*="_iconButton"] { position: relative !important; }
 
   /* 首页/hero（无活跃会话，session header 不存在）的抽屉切换 FAB：
      浮在顶部相机带下方，避免与 hero 头部内容重叠 */
@@ -1354,7 +1354,7 @@ window.__ModuleLoader__.load({
     z-index: 21 !important;
     display: inline-flex !important;
     align-items: center; justify-content: center;
-    width: 38px; height: 38px;
+    width: 44px; height: 44px;
     padding: 0;
     border: 1px solid var(--dsw-alias-border-l1, rgba(0, 0, 0, .12)) !important;
     border-radius: 50% !important;
@@ -1364,6 +1364,30 @@ window.__ModuleLoader__.load({
     box-shadow: 0 2px 12px rgba(0, 0, 0, .18) !important;
     -webkit-tap-highlight-color: transparent;
   }
+
+  /* iOS 对 computed font-size <16px 的可编辑元素聚焦时自动放大视口；
+     表单与 composer 提到 16px（消息正文不受影响），聚焦后页面不再错位。 */
+  input, textarea, select, [contenteditable="true"] {
+    font-size: max(16px, 1em) !important;
+  }
+
+  /* 底部安全区（iPhone home 条）：viewport-fit=cover 后浏览器 UI 退出底部，
+     home 指示条叠在 composer / 抽屉 / 设置 sheet 上，遮挡发送按钮与会话列表末项。 */
+  [class*="composerSeat"], [data-composer-seat] {
+    padding-bottom: max(env(safe-area-inset-bottom, 0px), 4px) !important;
+  }
+  [${FRAME_ATTR}="frame"] > :first-child {
+    padding-bottom: env(safe-area-inset-bottom, 0px) !important;
+  }
+  [aria-modal="true"]:has(> :first-child > :last-child > button):not(:has([role="navigation"])):not(:has([class*="ZuhsRW"])) {
+    max-height: calc(100dvh - 24px - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px)) !important;
+  }
+  [aria-modal="true"]:has(> :first-child > :last-child > button):not(:has([role="navigation"])):not(:has([class*="ZuhsRW"])) > :last-child > :last-child {
+    padding-bottom: max(env(safe-area-inset-bottom, 0px), 24px) !important;
+  }
+
+  /* 会话行触控高度 */
+  [class*="sessionRow"] { min-height: 44px !important; }
 }
 
 /* 宽屏 / 鼠标指针：隐藏切换按钮 */
@@ -1385,7 +1409,7 @@ window.__ModuleLoader__.load({
 				if (viewport === null) return () => {};
 				const original = viewport.content;
 				const sync = () => {
-					viewport.content = narrow.matches ? "width=device-width, initial-scale=1, viewport-fit=cover" : original;
+					viewport.content = narrow.matches ? "width=device-width, initial-scale=1, viewport-fit=cover, interactive-widget=resizes-content" : original;
 				};
 				sync();
 				narrow.addEventListener("change", sync);
@@ -1560,69 +1584,11 @@ window.__ModuleLoader__.load({
 				};
 			}, "dshb-mobile: stats line");
 		}
-		/** 浮层 fixed 定位需管理的内联样式键，清理时逐一移除以交还上游 CSS。 */
-		const SHEET_PROPS = [
-			"position",
-			"width",
-			"left",
-			"right",
-			"top",
-			"bottom",
-			"min-width",
-			"max-width",
-			"max-height",
-			"overflow-y",
-			"box-sizing"
-		];
 		/** 幂等写入 important 内联样式：值未变化时跳过，避免 MutationObserver(attributes) 自触发循环。 */
 		function setImportantIfChanged(el, prop, value) {
 			if (el.style.getPropertyValue(prop) === value && el.style.getPropertyPriority(prop) === "important") return;
 			el.style.setProperty(prop, value, "important");
 		}
-		/** 当前视口下的可视区域（手机键盘弹出时 visualViewport 与布局视口错位）。 */
-		function visibleViewport() {
-			const vv = window.visualViewport;
-			if (vv) return {
-				vw: vv.width,
-				vh: vv.offsetTop + vv.height,
-				top: vv.offsetTop
-			};
-			return {
-				vw: window.innerWidth,
-				vh: window.innerHeight,
-				top: 0
-			};
-		}
-		/** Keep the model menu anchored to its trigger while fitting it in the viewport. */
-		function positionAnchoredMenu(el, triggerRect, maxWidth, maxHeight) {
-			const margin = 8;
-			const { vw, vh } = visibleViewport();
-			setImportantIfChanged(el, "position", "fixed");
-			setImportantIfChanged(el, "box-sizing", "border-box");
-			setImportantIfChanged(el, "left", "0");
-			setImportantIfChanged(el, "right", "auto");
-			setImportantIfChanged(el, "top", "0");
-			setImportantIfChanged(el, "bottom", "auto");
-			setImportantIfChanged(el, "min-width", "0");
-			setImportantIfChanged(el, "max-width", `${Math.max(0, Math.min(maxWidth, vw - 16))}px`);
-			setImportantIfChanged(el, "max-height", `${Math.max(0, Math.min(maxHeight, vh - 16))}px`);
-			setImportantIfChanged(el, "overflow-y", "auto");
-			let width = el.offsetWidth;
-			let height = el.offsetHeight;
-			const { top: viewportTop } = visibleViewport();
-			const spaceAbove = Math.max(0, triggerRect.top - viewportTop - 16);
-			const spaceBelow = Math.max(0, vh - triggerRect.bottom - 16);
-			const expandUp = height <= spaceAbove || spaceAbove >= spaceBelow;
-			const available = expandUp ? spaceAbove : spaceBelow;
-			if (height > available) {
-				setImportantIfChanged(el, "max-height", `${Math.max(0, available - margin)}px`);
-				height = el.offsetHeight;
-				width = el.offsetWidth;
-			}
-			const top = expandUp ? triggerRect.top - margin - height : triggerRect.bottom + margin;
-			setImportantIfChanged(el, "left", `${Math.max(margin, Math.min(triggerRect.right - width, vw - width - margin))}px`);
-			setImportantIfChanged(el, "top", `${Math.max(viewportTop + margin, Math.min(top, vh - height - margin))}px`);
-		}
 		/**
 		* 模型名多为纯连字符词（DeepSeek-V4-Flash-Vision-Exp）；white-space:normal 下
 		* 每个 "-" 都是软断点，名字一旦超列宽就在第一个连字符处断行（"换行太早"）。
@@ -1674,18 +1640,13 @@ window.__ModuleLoader__.load({
 				n.style.removeProperty("font-size");
 			}
 		}
-		/** 清除 anchored menu 写入的内联样式，交还上游 CSS。 */
-		function clearFixedSheet(el) {
-			if (el === null || el === void 0) return;
-			for (const key of SHEET_PROPS) el.style.removeProperty(key);
-		}
 		/**
-		* 模型选择弹窗（dsh-client-ui-model-selection）是两级 pane 的同一个 `_7KE1Ra_menu`
-		* 元素：一级 Model/Effort 单元格列表（cellLabel），点击后切到模型列表（modelName）
-		* 或档位列表。上游默认 `position:absolute;right:0` 贴触发按钮右缘，触发按钮在
-		* 可横向滚动的 stats 行内时菜单会整体出屏。两级 pane 都必须接管（不能只按
-		* modelName 匹配，否则一级 pane 漏掉）。所有视口都把菜单锚定到触发按钮，
-		* 在上方/下方可用空间中选择更合适的一侧，避免上游空间不足时把菜单钳到屏幕顶端。
+		* 模型选择弹窗（dsh-client-ui-model-selection）：上游 0.2.1-rc.2 起菜单已是
+		* `position:fixed` 并自带 place() 视口钳制定位（portal 到 body，ResizeObserver
+		* 跟随尺寸变化）。插件不再接管定位——此前写入的 fixed/left/top 与上游 menuPos
+		* 内联样式互相拉扯；且对自动聚焦搜索框的 blur 拦截会触发上游 onBlur 的
+		* close()（焦点移出菜单即关闭），手机上表现为菜单刚打开就被关掉（"弹不出来"）。
+		* 这里只保留窄屏下的视觉适配：模型名不换行连字符 + 按最宽名字缩放字号。
 		*/
 		function installModelMenuPosition(ctx) {
 			ctx.effect(() => {
@@ -1699,45 +1660,27 @@ window.__ModuleLoader__.load({
 					fallbackLast = now;
 					return Array.from(document.querySelectorAll("[class*=\"_menu\"]")).filter((el) => el.querySelector("[class*=\"cellLabel\"], [class*=\"modelName\"]") !== null);
 				};
-				const findTrigger = (menu) => {
-					if (menu.id) {
-						const controlled = Array.from(document.querySelectorAll("[aria-controls]")).find((el) => el.getAttribute("aria-controls") === menu.id);
-						if (controlled) return controlled;
-					}
-					return document.querySelector("[class*=\"7KE1Ra_trigger\"][aria-expanded=\"true\"]");
-				};
 				let fittedVw = 0;
 				let fittedSig = -1;
 				let fittedMenus = [];
-				let positionedMenus = [];
 				const sync = () => {
-					const menus = findMenus();
 					let vw = 0;
 					let sig = 0;
 					const modelMenus = [];
-					const visibleMenus = [];
-					for (const menu of menus) {
-						const trigger = findTrigger(menu);
-						if (trigger === null || trigger.getAttribute("aria-expanded") !== "true") continue;
-						const rect = menu.getBoundingClientRect();
-						if (rect.width === 0 && rect.height === 0) continue;
-						positionAnchoredMenu(menu, trigger.getBoundingClientRect(), Math.min(420, window.innerWidth - 16), 360);
-						visibleMenus.push(menu);
-						if (menu.querySelector("[class*=\"modelName\"]")) {
-							modelMenus.push(menu);
-							if (narrow.matches) {
-								applyNonBreakingHyphens(menu);
-								vw = window.innerWidth;
-								for (const n of menu.querySelectorAll("[class*=\"modelName\"]")) sig += n.textContent?.length ?? 0;
-							}
+					for (const menu of findMenus()) {
+						if (!menu.querySelector("[class*=\"modelName\"]")) continue;
+						if (menu.getBoundingClientRect().width === 0) continue;
+						modelMenus.push(menu);
+						if (narrow.matches) {
+							applyNonBreakingHyphens(menu);
+							vw = window.innerWidth;
+							for (const n of menu.querySelectorAll("[class*=\"modelName\"]")) sig += n.textContent?.length ?? 0;
 						}
 					}
-					for (const previous of positionedMenus) {
-						if (visibleMenus.includes(previous)) continue;
-						clearFixedSheet(previous);
+					for (const previous of fittedMenus) {
+						if (modelMenus.includes(previous)) continue;
 						clearModelNameFit(previous);
 					}
-					positionedMenus = visibleMenus;
 					if (!narrow.matches) {
 						for (const menu of modelMenus) clearModelNameFit(menu);
 						fittedVw = 0;
@@ -1757,42 +1700,14 @@ window.__ModuleLoader__.load({
 				const mo = new MutationObserver(() => requestAnimationFrame(sync));
 				mo.observe(document.documentElement, {
 					childList: true,
-					subtree: true,
-					attributes: true,
-					attributeFilter: ["style"]
+					subtree: true
 				});
 				narrow.addEventListener("change", sync);
 				window.addEventListener("resize", sync);
-				window.addEventListener("scroll", sync, true);
-				window.visualViewport?.addEventListener("resize", sync);
-				window.visualViewport?.addEventListener("scroll", sync);
-				let lastPointerTarget = null;
-				const keyboardLikelyOpen = () => {
-					const vv = window.visualViewport;
-					if (!vv) return false;
-					return window.innerHeight - vv.height > 150;
-				};
-				const onPointerDown = (event) => {
-					lastPointerTarget = event.target instanceof Element ? event.target : null;
-				};
-				const onFocusIn = (event) => {
-					if (!narrow.matches || !(event.target instanceof Element) || keyboardLikelyOpen()) return;
-					const input = event.target.closest("input");
-					if (!input || input.closest("[class*=\"7KE1Ra_menu\"], [class*=\"_menu\"]") === null) return;
-					if (lastPointerTarget !== null && (lastPointerTarget === input || input.contains(lastPointerTarget))) return;
-					input.blur();
-				};
-				document.addEventListener("pointerdown", onPointerDown, true);
-				document.addEventListener("focusin", onFocusIn, true);
 				return () => {
 					mo.disconnect();
 					narrow.removeEventListener("change", sync);
 					window.removeEventListener("resize", sync);
-					window.removeEventListener("scroll", sync, true);
-					window.visualViewport?.removeEventListener("resize", sync);
-					window.visualViewport?.removeEventListener("scroll", sync);
-					document.removeEventListener("pointerdown", onPointerDown, true);
-					document.removeEventListener("focusin", onFocusIn, true);
 				};
 			}, "dshb-mobile: model menu position");
 		}
@@ -1858,6 +1773,47 @@ window.__ModuleLoader__.load({
 				return () => document.removeEventListener("pointerdown", focusInput, true);
 			}, "dshb-mobile: terminal input focus");
 		}
+		/**
+		* iOS 键盘只缩小 visualViewport，布局视口不动，sticky 在滚动容器底部的
+		* composer 会整个留在键盘后面（发送按钮不可达、最新消息被遮）。监听
+		* visualViewport，键盘开启时把 composer seat 上移键盘高度并在下一帧把
+		* 会话滚动补到最底；Android 由 meta 的 interactive-widget=resizes-content
+		* 让布局视口直接收缩，无需此补偿。
+		*/
+		function installComposerKeyboardLift(ctx) {
+			ctx.effect(() => {
+				const mobile = window.matchMedia(MOBILE_QUERY);
+				const vv = window.visualViewport;
+				if (!vv) return () => {};
+				let raf = 0;
+				const seat = () => document.querySelector("[class*=\"composerSeat\"]") ?? document.querySelector("[data-composer-seat]");
+				const sync = () => {
+					if (raf !== 0) return;
+					raf = requestAnimationFrame(() => {
+						raf = 0;
+						if (!mobile.matches) return;
+						const el = seat();
+						if (el === null) return;
+						const occluded = window.innerHeight - vv.height - vv.offsetTop;
+						if (occluded > 150) {
+							el.style.transform = `translateY(${-occluded}px)`;
+							const body = document.querySelector("[class*=\"scrollBody\"]");
+							body?.scrollTo({ top: body.scrollHeight });
+						} else if (el.style.transform !== "") el.style.transform = "";
+					});
+				};
+				sync();
+				vv.addEventListener("resize", sync);
+				vv.addEventListener("scroll", sync);
+				return () => {
+					if (raf !== 0) cancelAnimationFrame(raf);
+					const el = seat();
+					if (el !== null) el.style.transform = "";
+					vv.removeEventListener("resize", sync);
+					vv.removeEventListener("scroll", sync);
+				};
+			}, "dshb-mobile: composer keyboard lift");
+		}
 		/** 目录抽屉切换按钮（仅切换，不含文件浏览/日志导出等功能按钮）。 */
 		function DrawerToggle({ toggleSidebar }) {
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
@@ -1948,6 +1904,7 @@ window.__ModuleLoader__.load({
 		function installMobile(ctx) {
 			installStyles(ctx);
 			installMobileTerminalInputFocus(ctx);
+			installComposerKeyboardLift(ctx);
 			installViewport(ctx);
 			installFrameMarker(ctx);
 			installStatsLine(ctx);
@@ -1988,7 +1945,7 @@ window.__ModuleLoader__.load({
 			const dialog = document.createElement("div");
 			dialog.setAttribute("role", "dialog");
 			dialog.setAttribute("aria-label", `修改 ${workspaceTitle} 的项目指令`);
-			dialog.style.cssText = "box-sizing:border-box;width:min(92vw,600px);max-height:85vh;overflow:auto;padding:20px;border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary)";
+			dialog.style.cssText = "box-sizing:border-box;width:min(92vw,600px);max-height:85dvh;overflow:auto;padding:20px;padding-bottom:max(env(safe-area-inset-bottom),20px);border:1px solid var(--dsw-alias-border-l2);border-radius:12px;background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary)";
 			const title = document.createElement("h2");
 			title.textContent = `项目指令 - ${workspaceTitle}`;
 			title.style.cssText = "margin:0 0 10px;font-size:16px";
@@ -3226,9 +3183,9 @@ window.__ModuleLoader__.load({
 										onClick: () => copyText(archive.originSessionId),
 										style: {
 											...secondaryBtn,
-											height: 22,
-											padding: "0 6px",
-											fontSize: 10
+											height: 30,
+											padding: "0 10px",
+											fontSize: 11
 										},
 										children: "复制 ID"
 									})]
@@ -4643,7 +4600,10 @@ window.__ModuleLoader__.load({
        依赖祖先 overflow:visible 才能展开到输入框之外，禁止给任何中间祖先加裁剪。 */
     html, body { overflow-x: hidden !important; max-width: 100vw !important }
     * { min-width: 0 !important; }
-    table { display: block !important; overflow-x: auto !important; }
+    /* 表格不设 display:block：上游 markdown 表格已自带滚动容器（tableScroll），
+       display:block 会破坏 caption/sticky 语义且与上游 width:max-content 冲突；
+       这里仅保留溢出约束，宽表由上游 wrapper 横向滚动。 */
+    table { max-width: 100% !important; overflow-x: auto !important; }
     img, video, canvas, svg { max-width: 100% !important; height: auto !important }
     pre, code { white-space: pre-wrap !important; word-break: break-all !important }
     input, select, textarea { max-width: 100% !important; }