@lemoncat7/dsh-ssh 1.16.20 → 1.16.22

package/lib/sidebar-anchor.d.ts

@@ -1,8 +1,8 @@
-import { type RefObject } from 'react';
-/**
- * Place the plugin's official footer-slot contribution above Workspace without
- * replacing the single `sidebar.workspaces` slot. If the current sidebar shell
- * cannot be identified, the entry remains in the supported footer slot.
- */
-export declare function useWorkspaceTopAnchor(ref: RefObject<HTMLElement>): void;
+import { type ReactNode } from 'react';
+/** Keep the official slot's React node in place. Only our private portal host moves. */
+export declare function WorkspaceTopAnchor({ children, id, order }: {
+    children: ReactNode;
+    id: string;
+    order: number;
+}): JSX.Element;
 //# sourceMappingURL=sidebar-anchor.d.ts.map

package/lib/sidebar-anchor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sidebar-anchor.d.ts","sourceRoot":"","sources":["../src/sidebar-anchor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,SAAS,CAAC,WAAW,CAAC,GAAG,IAAI,CAuCvE"}
+{"version":3,"file":"sidebar-anchor.d.ts","sourceRoot":"","sources":["../src/sidebar-anchor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,SAAS,EAAE,MAAM,OAAO,CAAA;AAGzE,wFAAwF;AACxF,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,EAAE,SAAS,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,CAAC,OAAO,CAmD3H"}

package/lib/sidebar-anchor.js

@@ -1,50 +1,57 @@
-import { useEffect } from 'react';
-/**
- * Place the plugin's official footer-slot contribution above Workspace without
- * replacing the single `sidebar.workspaces` slot. If the current sidebar shell
- * cannot be identified, the entry remains in the supported footer slot.
- */
-export function useWorkspaceTopAnchor(ref) {
-    useEffect(() => {
-        const element = ref.current;
-        const originalParent = element?.parentElement;
-        if (element === null || element === undefined || originalParent === null || originalParent === undefined)
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useLayoutEffect, useRef, useState } from 'react';
+import { createPortal } from 'react-dom';
+/** Keep the official slot's React node in place. Only our private portal host moves. */
+export function WorkspaceTopAnchor({ children, id, order }) {
+    const placeholder = useRef(null);
+    const [target, setTarget] = useState(null);
+    useLayoutEffect(() => {
+        const marker = placeholder.current;
+        if (marker === null)
             return;
-        const parent = originalParent;
-        let moved = false;
-        let observer;
+        const anchor = document.createElement('div');
+        anchor.dataset.dshWorkspaceAnchor = id;
+        anchor.dataset.dshWorkspaceOrder = String(order);
+        anchor.style.display = 'contents';
         const place = () => {
-            // List-slot entries may be wrapped by the slot renderer. Walk out from
-            // the entry until the preceding sibling is the flexible Workspace
-            // region, instead of assuming the entry is a direct footer child.
-            let ancestor = element.parentElement;
+            // A temporarily detached sidebar must not attach an entry elsewhere.
+            if (!marker.isConnected)
+                return;
+            let parent = marker;
+            let ancestor = marker.parentElement;
             while (ancestor !== null && ancestor !== document.body) {
                 const candidate = ancestor.previousElementSibling;
                 if (candidate instanceof HTMLElement) {
                     const style = getComputedStyle(candidate);
-                    const flexGrow = Number.parseFloat(style.flexGrow);
-                    if (style.display === 'flex' && style.flexDirection === 'column' && flexGrow > 0) {
-                        candidate.insertBefore(element, candidate.firstChild);
-                        element.dataset.dshSshAnchored = 'true';
-                        moved = true;
-                        return true;
+                    if (style.display === 'flex' && style.flexDirection === 'column' && Number.parseFloat(style.flexGrow) > 0) {
+                        parent = candidate;
+                        break;
                     }
                 }
                 ancestor = ancestor.parentElement;
             }
-            return false;
-        };
-        if (!place()) {
-            observer = new MutationObserver(() => { if (place())
-                observer?.disconnect(); });
-            observer.observe(document.body, { childList: true, subtree: true });
-        }
-        return () => {
-            observer?.disconnect();
-            delete element.dataset.dshSshAnchored;
-            if (moved && parent.isConnected)
-                parent.append(element);
+            // Preserve both plugin order and the native Workspace subtree. A new
+            // instance never adopts/removes an old instance's private portal host.
+            const siblings = Array.from(parent.children);
+            const before = parent === marker ? null : siblings.find(child => child !== anchor && (!(child instanceof HTMLElement) || child.dataset.dshWorkspaceAnchor === undefined || Number(child.dataset.dshWorkspaceOrder) > order)) ?? null;
+            if (anchor.parentElement === parent) {
+                if (anchor.nextSibling === before)
+                    return;
+                const current = siblings.indexOf(anchor);
+                const next = before === null ? siblings.length : siblings.indexOf(before);
+                // Overlapping old/new instances with equal order retain their DOM
+                // order instead of repeatedly moving past each other.
+                if (current >= 0 && current < next && siblings.slice(current + 1, next).every(child => child instanceof HTMLElement && child.dataset.dshWorkspaceAnchor !== undefined && Number(child.dataset.dshWorkspaceOrder) === order))
+                    return;
+            }
+            parent.insertBefore(anchor, before);
         };
-    }, [ref]);
+        place();
+        setTarget(anchor);
+        const observer = new MutationObserver(place);
+        observer.observe(marker.closest('[data-slot="sidebar"]') ?? document.body, { childList: true, subtree: true });
+        return () => { observer.disconnect(); anchor.remove(); };
+    }, [id, order]);
+    return _jsx("span", { ref: placeholder, style: { display: 'contents' }, children: target === null ? null : createPortal(children, target) });
 }
 //# sourceMappingURL=sidebar-anchor.js.map

package/lib/sidebar-anchor.js.map

@@ -1 +1 @@
-{"version":3,"file":"sidebar-anchor.js","sourceRoot":"","sources":["../src/sidebar-anchor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,MAAM,OAAO,CAAA;AAEjD;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAA2B;IAC/D,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;QAC3B,MAAM,cAAc,GAAG,OAAO,EAAE,aAAa,CAAA;QAC7C,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,IAAI,cAAc,KAAK,SAAS;YAAE,OAAM;QAChH,MAAM,MAAM,GAAG,cAAc,CAAA;QAC7B,IAAI,KAAK,GAAG,KAAK,CAAA;QACjB,IAAI,QAAsC,CAAA;QAC1C,MAAM,KAAK,GAAG,GAAY,EAAE;YAC1B,uEAAuE;YACvE,kEAAkE;YAClE,kEAAkE;YAClE,IAAI,QAAQ,GAAuB,OAAO,CAAC,aAAa,CAAA;YACxD,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACvD,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAA;gBACjD,IAAI,SAAS,YAAY,WAAW,EAAE,CAAC;oBACrC,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;oBACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;oBAClD,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,QAAQ,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;wBACjF,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;wBACrD,OAAO,CAAC,OAAO,CAAC,cAAc,GAAG,MAAM,CAAA;wBACvC,KAAK,GAAG,IAAI,CAAA;wBACZ,OAAO,IAAI,CAAA;oBACb,CAAC;gBACH,CAAC;gBACD,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAA;YACnC,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAA;QACD,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YACb,QAAQ,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,GAAG,IAAI,KAAK,EAAE;gBAAE,QAAQ,EAAE,UAAU,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;YAC9E,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QACrE,CAAC;QACD,OAAO,GAAG,EAAE;YACV,QAAQ,EAAE,UAAU,EAAE,CAAA;YACtB,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,CAAA;YACrC,IAAI,KAAK,IAAI,MAAM,CAAC,WAAW;gBAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACzD,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AACX,CAAC"}
+{"version":3,"file":"sidebar-anchor.js","sourceRoot":"","sources":["../src/sidebar-anchor.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAkB,MAAM,OAAO,CAAA;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAExC,wFAAwF;AACxF,MAAM,UAAU,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAsD;IAC5G,MAAM,WAAW,GAAG,MAAM,CAAkB,IAAI,CAAC,CAAA;IACjD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAqB,IAAI,CAAC,CAAA;IAC9D,eAAe,CAAC,GAAG,EAAE;QACnB,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAA;QAClC,IAAI,MAAM,KAAK,IAAI;YAAE,OAAM;QAC3B,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QAC5C,MAAM,CAAC,OAAO,CAAC,kBAAkB,GAAG,EAAE,CAAA;QACtC,MAAM,CAAC,OAAO,CAAC,iBAAiB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAChD,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,UAAU,CAAA;QACjC,MAAM,KAAK,GAAG,GAAS,EAAE;YACvB,qEAAqE;YACrE,IAAI,CAAC,MAAM,CAAC,WAAW;gBAAE,OAAM;YAC/B,IAAI,MAAM,GAAgB,MAAM,CAAA;YAChC,IAAI,QAAQ,GAAuB,MAAM,CAAC,aAAa,CAAA;YACvD,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACvD,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAA;gBACjD,IAAI,SAAS,YAAY,WAAW,EAAE,CAAC;oBACrC,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;oBACzC,IAAI,KAAK,CAAC,OAAO,KAAK,MAAM,IAAI,KAAK,CAAC,aAAa,KAAK,QAAQ,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC1G,MAAM,GAAG,SAAS,CAAA;wBAClB,MAAK;oBACP,CAAC;gBACH,CAAC;gBACD,QAAQ,GAAG,QAAQ,CAAC,aAAa,CAAA;YACnC,CAAC;YACD,qEAAqE;YACrE,uEAAuE;YACvE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC9D,KAAK,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,KAAK,YAAY,WAAW,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,CAC3J,IAAI,IAAI,CAAA;YACT,IAAI,MAAM,CAAC,aAAa,KAAK,MAAM,EAAE,CAAC;gBACpC,IAAI,MAAM,CAAC,WAAW,KAAK,MAAM;oBAAE,OAAM;gBACzC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACxC,MAAM,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACzE,kEAAkE;gBAClE,sDAAsD;gBACtD,IAAI,OAAO,IAAI,CAAC,IAAI,OAAO,GAAG,IAAI,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CACpF,KAAK,YAAY,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,KAAK,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,KAAK,CACpI;oBAAE,OAAM;YACX,CAAC;YACD,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACrC,CAAC,CAAA;QACD,KAAK,EAAE,CAAA;QACP,SAAS,CAAC,MAAM,CAAC,CAAA;QACjB,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAA;QAC5C,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9G,OAAO,GAAG,EAAE,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA,CAAC,CAAC,CAAA;IACzD,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAA;IACf,OAAO,eAAM,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,YAAG,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAQ,CAAA;AACjI,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemoncat7/dsh-ssh",
-  "version": "1.16.20",
+  "version": "1.16.22",
   "description": "Secure SSH, FTP/FTPS/SFTP file transfer, browser terminals, proxies, port forwarding, and session-scoped AI access for DeepSeek Harness",
   "keywords": [
     "deepseek-harness",
@@ -47,7 +47,10 @@
     "docs/releases/1.10.4.md",
     "docs/dsh-021-compatibility.md",
     "docs/releases/1.11.4.md",
-    "docs/compatibility-0.2.2-rc.1.md"
+    "docs/compatibility-0.2.2-rc.1.md",
+    "docs/compatibility-0.2.2-rc.2.md",
+    "docs/releases/1.16.21.md",
+    "docs/releases/1.16.22.md"
   ],
   "dsh": {
     "bundle": {
@@ -70,14 +73,15 @@
   },
   "engines": {
     "node": ">=24.9.0",
-    "dsh": "=0.2.2-rc.1"
+    "dsh": "=0.2.2-rc.1 || =0.2.2-rc.2"
   },
   "scripts": {
     "clean": "node -e \"require('node:fs').rmSync('lib', { recursive: true, force: true })\"",
     "build": "tsc -p tsconfig.json && node scripts/build-client.mjs",
     "prepare": "npm run clean && npm run build",
     "test": "npm run build && node --test test/*.test.mjs",
-    "pack:check": "npm pack --dry-run"
+    "pack:check": "npm pack --dry-run",
+    "test:sidebar-browser": "node test/sidebar-anchor.browser.mjs"
   },
   "dependencies": {
     "@deepseek-ai/schemastery": "~3.19.0",
@@ -139,7 +143,9 @@
     "@deepseek-ai/dsh-sandbox-policy": "0.2.2-rc.1",
     "@deepseek-ai/dsh-ptc-runtime": "0.2.2-rc.1",
     "@hugeicons/core-free-icons": "^4.3.5",
-    "@hugeicons/react": "^1.1.10"
+    "@hugeicons/react": "^1.1.10",
+    "@types/react-dom": "18.3.7",
+    "react-dom": "18.3.1"
   },
   "publishConfig": {
     "access": "public"