dsh-stall-guard 0.1.2 → 0.1.4

package/CHANGELOG.md

@@ -5,6 +5,34 @@
 格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)，
 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
 
+## [0.1.4] - 2026-10-21
+
+### 修复
+
+- **切到「浮动」后图标消失**：0.1.3 把浮动态拆到 overlay 渲染时，标题栏座位的守卫
+  `if (supervisorOff || floating) return null` 同时也把 overlay 座位挡掉了 ——
+  因为 overlay 座位收到的 `floating` 恒为 true。结果是图标彻底不画。
+  现在区分「这个座位要画的形态（forcedFloat）」与「用户选择的形态（wantsFloat）」：
+  标题栏在 `wantsFloat && !forcedFloat` 时让位，overlay 座位永不让位。
+- **两个座位可能同时画图标**：overlay 座位现在只在 `place === 'float'` 时渲染。
+- 外观状态改为共享 `useAppearance()` 钩子（`useSyncExternalStore`），
+  三个消费点（标题栏、浮动态、面板）对同一份记录同步重绘，
+  修掉面板改尺寸时图标不实时变化的问题。
+
+## [0.1.3] - 2026-10-21
+
+### 修复
+
+- **拖动图标会带动上方状态栏**：浮动态原先仍渲染在标题栏槽位里，那个槽位是正常文档流
+  中的 flex 项，`position:fixed` 在那里无效，图标移动时会把整行撑动。
+  现在浮动态改由 `shell.overlay` 渲染（真正脱离所有列与滚动容器），标题栏在浮动时
+  渲染空。这样图标可以像贴纸一样拖到任意位置，不影响任何其他元素。
+- **调整大小时看不到实时预览**：设置面板原先从 `top:56px` 开始展开，正好压住标题栏
+  上的图标，所以拖滑块时看不到尺寸变化。面板改为从标题栏下方开始（`top:118px`）。
+- 浮动态的层级提到面板之上（`z-index:75`），即使图标被拖到面板范围内也仍然可见可拖。
+- 拖动位置改从 store 读取而不是每帧读 localStorage，避免高频拖动时状态竞争、
+  丢中间位置。
+
 ## [0.1.2] - 2026-10-21
 
 ### 修复

package/client.js

@@ -955,7 +955,7 @@ window.__ModuleLoader__.load({
       /* Hidden state: the bubble is not rendered at all, so there is nothing to dim. */
 
       /* ---- overlay panel ---- */
-      '.dsg-panel{position:fixed;top:56px;right:14px;left:auto;z-index:70;box-sizing:border-box;width:min(430px,calc(100vw - 40px));max-height:min(74vh,660px);overflow:hidden;pointer-events:auto;display:flex;flex-direction:column;gap:0;padding:12px;border:1px solid var(--dsw-alias-border-l1,var(--dsh-border,rgba(255,255,255,.12)));border-radius:var(--dsw-radius-panel,12px);background:var(--dsw-alias-bg-overlay,var(--dsh-surface,rgba(20,22,28,.96)));box-shadow:var(--dsw-elevation-soft,0 8px 28px rgba(0,0,0,.22));color:var(--dsw-alias-label-primary,var(--dsh-text-primary,#e6e6e6));font:inherit;font-size:12px;line-height:18px}',
+      '.dsg-panel{position:fixed;top:118px;right:14px;left:auto;z-index:70;box-sizing:border-box;width:min(430px,calc(100vw - 40px));max-height:min(74vh,660px);overflow:hidden;pointer-events:auto;display:flex;flex-direction:column;gap:0;padding:12px;border:1px solid var(--dsw-alias-border-l1,var(--dsh-border,rgba(255,255,255,.12)));border-radius:var(--dsw-radius-panel,12px);background:var(--dsw-alias-bg-overlay,var(--dsh-surface,rgba(20,22,28,.96)));box-shadow:var(--dsw-elevation-soft,0 8px 28px rgba(0,0,0,.22));color:var(--dsw-alias-label-primary,var(--dsh-text-primary,#e6e6e6));font:inherit;font-size:12px;line-height:18px}',
       '.dsg-head{display:flex;align-items:center;gap:8px;flex-wrap:wrap;flex:0 0 auto;padding-bottom:8px}',
       /* The title bar holds Save and Close now, so the title must not push them out. */
       '.dsg-title{flex:0 1 auto;min-width:0;margin:0;font-size:13px;font-weight:600;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}',
@@ -1040,7 +1040,7 @@ window.__ModuleLoader__.load({
       '.dsg-offTab{display:block;width:100%;height:100%;border-radius:50%}',
       '.dsg-orb[data-floating="yes"]{box-shadow:0 2px 10px rgba(0,0,0,.28);background:var(--dsw-alias-bg-overlay,var(--dsh-surface,rgba(20,22,28,.9)));border:1px solid var(--dsw-alias-border-l1,var(--dsh-border,rgba(255,255,255,.12)))}',
       '.dsg-orb[data-dragging="yes"]{transition:none!important;cursor:grabbing}',
-      '.dsg-seat[data-floating="yes"]{position:fixed}',
+      '.dsg-seat[data-floating="yes"]{position:fixed;z-index:75}',
       /* Only visible while the supervisor is hidden: a 14px grab handle in the corner. */
       '.dsg-restoreTab{position:fixed;right:10px;bottom:10px;z-index:67;width:14px;height:14px;padding:0;border:1px solid var(--dsw-alias-border-l1,var(--dsh-border,rgba(255,255,255,.2)));border-radius:50%;background:var(--dsw-alias-label-tertiary,var(--dsh-text-muted,#8b93a7));opacity:.4;cursor:pointer;transition:opacity .15s ease,transform .15s ease}',
       '.dsg-restoreTab:hover,.dsg-restoreTab:focus-visible{opacity:1;transform:scale(1.35);background:var(--dsw-alias-brand-primary,var(--dsh-accent,#4d6bfe))}',
@@ -1188,6 +1188,19 @@ window.__ModuleLoader__.load({
       }
     }
 
+    /**
+     * Subscribe to the appearance record.
+     *
+     * The record lives outside the polled snapshot, so it needs its own subscription. A
+     * shared hook keeps every consumer honest: an appearance change re-renders all of them.
+     */
+    function useAppearance() {
+      return useSyncExternalStore(
+        (listener) => store.subscribeAppearance(listener),
+        () => store.getAppearance(),
+      );
+    }
+
     function useTranslate(props) {
       return props.t !== undefined && typeof props.t === 'function' ? props.t : (boundT || ((key) => key));
     }
@@ -1208,11 +1221,10 @@ window.__ModuleLoader__.load({
       const snapshot = useStore();
       const orbRef = useRef(null);
       const [bubbleBelow, setBubbleBelow] = useState(false);
-      const [appearance, setAppearance] = useState(readAppearance);
+      const appearance = useAppearance();
       const [dragging, setDragging] = useState(false);
 
       useEffect(() => store.start(), []);
-      useEffect(() => store.subscribeAppearance(setAppearance), []);
 
       const config = snapshot.config;
       const supervisorOff = config !== null && config.supervisor.show === false;
@@ -1238,7 +1250,16 @@ window.__ModuleLoader__.load({
 
       /* Float placement: drag moves the control, and the position is clamped into the
        * viewport on release so a window resize cannot strand it off-screen. */
-      const floating = appearance.place === 'float';
+      /**
+       * Which posture this render draws.
+       *
+       * The overlay seat forces floating; the header seat reads the user's setting. The two
+       * must be distinguished, because the header seat has to bail out when the chosen
+       * posture is floating — while the overlay seat must not bail out for the same reason.
+       */
+      const forcedFloat = props.forcePlace === 'float';
+      const wantsFloat = appearance.place === 'float';
+      const floating = forcedFloat || wantsFloat;
       const startDrag = useCallback((event) => {
         if (!floating) return;
         if (event.button !== undefined && event.button !== 0) return;
@@ -1254,7 +1275,9 @@ window.__ModuleLoader__.load({
           setDragging(true);
           const nextX = Math.max(0, Math.min(window.innerWidth - rect.width, moveEvent.clientX - offsetX));
           const nextY = Math.max(0, Math.min(window.innerHeight - rect.height, moveEvent.clientY - offsetY));
-          store.setAppearance({ ...readAppearance(), x: Math.round(nextX), y: Math.round(nextY) });
+          // Read from the store, not localStorage: a per-frame disk read would race with
+          // the in-memory value and drop intermediate positions.
+          store.setAppearance({ ...store.getAppearance(), x: Math.round(nextX), y: Math.round(nextY) });
         };
         const onUp = () => {
           window.removeEventListener('pointermove', onMove);
@@ -1267,10 +1290,11 @@ window.__ModuleLoader__.load({
         event.preventDefault();
       }, [floating]);
 
-      // Hidden: the header renders nothing. A restore tab is drawn by the overlay seat
-      // instead, because the header does not exist in a blank session and the user would
-      // otherwise have no way back in.
+      // The header seat renders nothing when the figure is hidden OR when the overlay owns
+      // it — a floating figure inside the header's flow would push that row around as it
+      // moved. The overlay seat asked for this render, so it never bails out here.
       if (supervisorOff) return null;
+      if (wantsFloat && !forcedFloat) return null;
 
       const label = t('supervisor') + ' — ' + t(MODE_KEY[mode]);
       const size = appearance.size;
@@ -1341,6 +1365,26 @@ window.__ModuleLoader__.load({
       );
     }
 
+    /**
+     * The floating posture, rendered in the frame-wide overlay.
+     *
+     * `shell.overlay` is outside every column and scroll container, so an absolutely
+     * positioned figure there cannot affect the header's layout. The component is shared
+     * with the header seat; only the posture differs.
+     */
+    function FloatingSeat(props) {
+      const t = useTranslate(props);
+      const snapshot = useStore();
+      /* The overlay draws the figure only in the floating posture. Without this check both
+       * seats would render it, and the header would show a second copy. */
+      const appearance = useAppearance();
+      useEffect(() => store.start(), []);
+      if (snapshot.config === null) return null;
+      if (snapshot.config.supervisor.show === false) return null;
+      if (appearance.place !== 'float') return null;
+      return h(SupervisorSeat, { t, forcePlace: 'float' });
+    }
+
     /* ------------------------------------------------------------ the panel */
 
     function StatValue(props) {
@@ -1382,8 +1426,7 @@ window.__ModuleLoader__.load({
       const presetLocale = hostLocale() === 'en' ? 'en' : 'zh';
       /* Appearance is browser-local, so the panel mirrors it separately from the
        * Host draft; saving the config must not overwrite it and vice versa. */
-      const [localAppearance, setLocalAppearance] = useState(() => store.getAppearance());
-      useEffect(() => store.subscribeAppearance(setLocalAppearance), []);
+      const localAppearance = useAppearance();
       const [dirty, setDirty] = useState(false);
       const [status, setStatus] = useState({ kind: 'idle', text: '' });
 
@@ -1979,6 +2022,15 @@ window.__ModuleLoader__.load({
           inject: () => ({}),
         }, PanelSeat));
 
+        // The floating posture lives in the overlay so it cannot disturb the header row.
+        ctx.slots.inject('shell.overlay', () => ctx.slots.register({
+          name: 'shell.overlay',
+          id: 'stall-guard-floating',
+          order: 69,
+          locale: NS,
+          inject: () => ({}),
+        }, FloatingSeat));
+
         // The way back when the supervisor is hidden.
         ctx.slots.inject('shell.overlay', () => ctx.slots.register({
           name: 'shell.overlay',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-stall-guard",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "DSH 卡顿守卫：下载类命令（git clone / pnpm install / pip / curl）超时后自动中止，并把「换个下载源重试」的提示写进工具结果给智能体看，解决 GitHub 在国内网络不稳导致智能体一直干等的问题。另可按工具类型自定义超时秒数，并附一个只在卡顿时唤醒的 DeepSeek 监督员。",
   "keywords": [
     "dsh",