tabby-sftp-ui 0.2.2 → 0.2.4

package/README.md

@@ -126,8 +126,13 @@ Then restart Tabby.
 
 ### Changelog
 
-- See [`CHANGELOG.md`](CHANGELOG.md)
-
+- **0.2.4**
+  - Fix: OS drag-and-drop from Explorer
+  - Fix: Multiple files drag-and-drop between panes works again.
+- **0.2.3**
+  - Fix: Remote folders drag-and-drop (Remote → Local) works again.
+  - Feature: Replace confirmation is now symmetric (both Local → Remote and Remote → Local).
+  - UI: Added “Go up” row to the Local pane.
 - **0.2.2**
   - Integrate Tabby’s native `startUploadFromDragEvent` for more reliable OS drag-and-drop (files & folders).
   - Refine Delete key handling so it works normally inside input dialogs while still triggering delete in lists.

package/dist/index.js

@@ -309,6 +309,9 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         this.deleteConfirmText = '';
         this.pendingLocalDelete = [];
         this.pendingRemoteDelete = [];
+        this.replaceConfirmVisible = false;
+        this.replaceConfirmText = '';
+        this.replaceConfirmResolve = null;
         this.inputDialogVisible = false;
         this.inputDialogTitle = '';
         this.inputDialogPlaceholder = '';
@@ -593,12 +596,13 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         const sources = this.selectedLocal.includes(e) && this.selectedLocal.length ? this.selectedLocal : [e];
         const movePayload = sources.map(x => x.fullPath);
         ev.dataTransfer?.setData('application/x-tabby-sftp-ui-local-move', JSON.stringify(movePayload));
-        // Existing cross-device drag (local -> remote) only for files
-        if (!e.isDirectory) {
-            const payload = { kind: 'local-file', fullPath: e.fullPath, name: e.name };
-            ev.dataTransfer?.setData('application/x-tabby-sftp-ui', JSON.stringify(payload));
-            ev.dataTransfer?.setData('text/plain', e.fullPath);
-        }
+        // Cross-device drag (local -> remote) supports multi-select
+        const payload = {
+            kind: 'local-paths',
+            paths: sources.map(x => ({ fullPath: x.fullPath, name: x.name, isDirectory: x.isDirectory })),
+        };
+        ev.dataTransfer?.setData('application/x-tabby-sftp-ui', JSON.stringify(payload));
+        ev.dataTransfer?.setData('text/plain', e.fullPath);
         ev.dataTransfer?.setDragImage?.(ev.target ?? document.body, 0, 0);
     }
     onDragStartRemote(ev, item) {
@@ -608,18 +612,19 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         const sources = this.selectedRemote.includes(item) && this.selectedRemote.length ? this.selectedRemote : [item];
         const movePayload = sources.map(x => x.fullPath);
         ev.dataTransfer?.setData('application/x-tabby-sftp-ui-remote-move', JSON.stringify(movePayload));
-        // Existing cross-device drag (remote -> local) only for files
-        if (!item.isDirectory) {
-            const payload = {
-                kind: 'remote-file',
-                remotePath: item.fullPath,
-                name: item.name,
-                size: item.size,
-                mode: item.mode,
-            };
-            ev.dataTransfer?.setData('application/x-tabby-sftp-ui', JSON.stringify(payload));
-            ev.dataTransfer?.setData('text/plain', item.fullPath);
-        }
+        // Cross-device drag (remote -> local) supports multi-select
+        const payload = {
+            kind: 'remote-paths',
+            paths: sources.map(x => ({
+                remotePath: x.fullPath,
+                name: x.name,
+                isDirectory: x.isDirectory,
+                size: x.size,
+                mode: x.mode,
+            })),
+        };
+        ev.dataTransfer?.setData('application/x-tabby-sftp-ui', JSON.stringify(payload));
+        ev.dataTransfer?.setData('text/plain', item.fullPath);
         ev.dataTransfer?.setDragImage?.(ev.target ?? document.body, 0, 0);
     }
     async onDropOnRemote(ev) {
@@ -636,6 +641,16 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         if (osPaths.length) {
             try {
                 for (const p of osPaths) {
+                    const baseName = path__WEBPACK_IMPORTED_MODULE_0__.basename(p);
+                    const existing = this.remoteEntries.find(e => e.name === baseName);
+                    if (existing) {
+                        const ok = await this.showReplaceConfirm(`Replace existing "${baseName}" on remote?`);
+                        if (!ok) {
+                            continue;
+                        }
+                        const remoteTarget = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, baseName);
+                        await this.deleteRemotePathRecursive(remoteTarget);
+                    }
                     await this.uploadLocalPathToRemote(this.remotePath, p);
                 }
                 await this.refreshRemote();
@@ -668,15 +683,40 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         catch {
             return;
         }
-        if (payload.kind !== 'local-file') {
-            return;
-        }
         try {
-            const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, payload.name);
-            const upload = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileUpload(payload.fullPath);
-            this.trackTransfer(upload, 'upload', targetRemotePath, payload.fullPath);
-            await this.sftpSession.upload(targetRemotePath, upload);
-            await this.refreshRemote();
+            if (payload.kind === 'local-file') {
+                const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, payload.name);
+                const existsOnRemote = this.remoteEntries.some(e => e.name === payload.name);
+                if (existsOnRemote) {
+                    const ok = await this.showReplaceConfirm(`Replace existing "${payload.name}" on remote?`);
+                    if (!ok) {
+                        return;
+                    }
+                    await this.deleteRemotePathRecursive(targetRemotePath);
+                }
+                const upload = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileUpload(payload.fullPath);
+                this.trackTransfer(upload, 'upload', targetRemotePath, payload.fullPath);
+                await this.sftpSession.upload(targetRemotePath, upload);
+                await this.refreshRemote();
+                return;
+            }
+            if (payload.kind === 'local-paths') {
+                for (const p of payload.paths) {
+                    const targetRemotePath = path__WEBPACK_IMPORTED_MODULE_0__.posix.join(this.remotePath, p.name);
+                    const existsOnRemote = this.remoteEntries.some(e => e.name === p.name);
+                    if (existsOnRemote) {
+                        const ok = await this.showReplaceConfirm(`Replace existing "${p.name}" on remote?`);
+                        if (!ok) {
+                            continue;
+                        }
+                        await this.deleteRemotePathRecursive(targetRemotePath);
+                    }
+                    // uploadLocalPathToRemote handles both files and directories
+                    await this.uploadLocalPathToRemote(this.remotePath, p.fullPath);
+                }
+                await this.refreshRemote();
+                return;
+            }
         }
         catch (e) {
             console.error('[SFTP-UI] Upload failed', e);
@@ -685,11 +725,103 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
     async onDropOnLocal(ev) {
         ev.preventDefault();
         this.localDropActive = false;
+        // 1) Tabby's internal drag (remote -> local download)
+        const rawInternal = ev.dataTransfer?.getData('application/x-tabby-sftp-ui');
+        if (rawInternal) {
+            let payload;
+            try {
+                payload = JSON.parse(rawInternal);
+            }
+            catch {
+                payload = null;
+            }
+            if (payload && payload.kind === 'remote-file') {
+                try {
+                    const targetLocalPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, payload.name);
+                    if (!this.sftpSession) {
+                        throw new Error('Not connected');
+                    }
+                    if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(targetLocalPath)) {
+                        const ok = await this.showReplaceConfirm(`Replace existing "${payload.name}"?`);
+                        if (!ok) {
+                            return;
+                        }
+                    }
+                    const dl = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileDownload(targetLocalPath, payload.mode, payload.size);
+                    this.trackTransfer(dl, 'download', payload.remotePath, targetLocalPath);
+                    await this.sftpSession.download(payload.remotePath, dl);
+                    await this.refreshLocal();
+                }
+                catch (e) {
+                    console.error('[SFTP-UI] Download failed', e);
+                }
+                return;
+            }
+            if (payload && payload.kind === 'remote-dir') {
+                try {
+                    if (!this.sftpSession) {
+                        throw new Error('Not connected');
+                    }
+                    const targetLocalPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, payload.name);
+                    if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(targetLocalPath)) {
+                        const ok = await this.showReplaceConfirm(`Replace existing folder "${payload.name}"?`);
+                        if (!ok) {
+                            return;
+                        }
+                        await this.deleteLocalPathRecursive(targetLocalPath);
+                    }
+                    await this.downloadRemoteDirectoryRecursive(payload.remotePath, targetLocalPath);
+                    await this.refreshLocal();
+                }
+                catch (e) {
+                    console.error('[SFTP-UI] Download directory failed', e);
+                }
+                return;
+            }
+            if (payload && payload.kind === 'remote-paths') {
+                try {
+                    if (!this.sftpSession) {
+                        throw new Error('Not connected');
+                    }
+                    for (const it of payload.paths) {
+                        const targetLocalPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, it.name);
+                        if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(targetLocalPath)) {
+                            const ok = await this.showReplaceConfirm(it.isDirectory ? `Replace existing folder "${it.name}"?` : `Replace existing "${it.name}"?`);
+                            if (!ok) {
+                                continue;
+                            }
+                            await this.deleteLocalPathRecursive(targetLocalPath);
+                        }
+                        if (it.isDirectory) {
+                            await this.downloadRemoteDirectoryRecursive(it.remotePath, targetLocalPath);
+                        }
+                        else {
+                            const dl = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileDownload(targetLocalPath, it.mode ?? 0o644, it.size ?? 0);
+                            this.trackTransfer(dl, 'download', it.remotePath, targetLocalPath);
+                            await this.sftpSession.download(it.remotePath, dl);
+                        }
+                    }
+                    await this.refreshLocal();
+                }
+                catch (e) {
+                    console.error('[SFTP-UI] Download paths failed', e);
+                }
+                return;
+            }
+        }
         // Drag & drop from OS file manager into the local pane (copy into current local folder)
         const osPaths = this.getDroppedOsPaths(ev);
         if (osPaths.length) {
             try {
                 for (const p of osPaths) {
+                    const baseName = path__WEBPACK_IMPORTED_MODULE_0__.basename(p);
+                    const destPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, baseName);
+                    if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(destPath)) {
+                        const ok = await this.showReplaceConfirm(`Replace existing "${baseName}"?`);
+                        if (!ok) {
+                            continue;
+                        }
+                    }
                     await this.copyLocalPathIntoLocalDir(this.localPath, p);
                 }
                 await this.refreshLocal();
@@ -722,17 +854,41 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         catch {
             return;
         }
-        if (payload.kind !== 'remote-file') {
+        if (payload.kind !== 'remote-file' && payload.kind !== 'remote-dir') {
             return;
         }
         try {
-            const targetLocalPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, payload.name);
+            if (payload.kind === 'remote-file') {
+                const targetLocalPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, payload.name);
+                if (!this.sftpSession) {
+                    throw new Error('Not connected');
+                }
+                if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(targetLocalPath)) {
+                    const ok = await this.showReplaceConfirm(`Replace existing "${payload.name}"?`);
+                    if (!ok) {
+                        return;
+                    }
+                    await this.deleteLocalPathRecursive(targetLocalPath);
+                }
+                const dl = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileDownload(targetLocalPath, payload.mode, payload.size);
+                this.trackTransfer(dl, 'download', payload.remotePath, targetLocalPath);
+                await this.sftpSession.download(payload.remotePath, dl);
+                await this.refreshLocal();
+                return;
+            }
+            // remote-dir -> local-dir (recursive download)
             if (!this.sftpSession) {
                 throw new Error('Not connected');
             }
-            const dl = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileDownload(targetLocalPath, payload.mode, payload.size);
-            this.trackTransfer(dl, 'download', payload.remotePath, targetLocalPath);
-            await this.sftpSession.download(payload.remotePath, dl);
+            const targetLocalPath = path__WEBPACK_IMPORTED_MODULE_0__.join(this.localPath, payload.name);
+            if (fs__WEBPACK_IMPORTED_MODULE_3__.existsSync(targetLocalPath)) {
+                const ok = await this.showReplaceConfirm(`Replace existing folder "${payload.name}"?`);
+                if (!ok) {
+                    return;
+                }
+                await this.deleteLocalPathRecursive(targetLocalPath);
+            }
+            await this.downloadRemoteDirectoryRecursive(payload.remotePath, targetLocalPath);
             await this.refreshLocal();
         }
         catch (e) {
@@ -837,11 +993,40 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
         }
     }
+    async downloadRemoteDirectoryRecursive(remoteDir, localDir) {
+        if (!this.sftpSession) {
+            return;
+        }
+        await fs_promises__WEBPACK_IMPORTED_MODULE_2__.mkdir(localDir, { recursive: true });
+        const entries = await this.sftpSession.readdir(remoteDir).catch(() => null);
+        if (!entries) {
+            return;
+        }
+        for (const e of entries) {
+            const targetLocal = path__WEBPACK_IMPORTED_MODULE_0__.join(localDir, e.name);
+            if (e.isDirectory) {
+                await this.downloadRemoteDirectoryRecursive(e.fullPath, targetLocal);
+            }
+            else {
+                const dl = new _local_transfers__WEBPACK_IMPORTED_MODULE_7__.LocalPathFileDownload(targetLocal, e.mode, e.size);
+                this.trackTransfer(dl, 'download', e.fullPath, targetLocal);
+                await this.sftpSession.download(e.fullPath, dl);
+            }
+        }
+    }
     getDroppedOsPaths(ev) {
         const dt = ev.dataTransfer;
         if (!dt) {
             return [];
         }
+        const isWin = os__WEBPACK_IMPORTED_MODULE_1__.platform() === 'win32';
+        const isLocalPath = (p) => {
+            if (isWin) {
+                // Accept both `C:\...` and `C:/...` (some drag sources provide forward slashes)
+                return /^[A-Za-z]:[\\/]/.test(p) || p.startsWith('\\\\');
+            }
+            return p.startsWith('/');
+        };
         // 1) Electron-style File.path
         const filePaths = Array.from(dt.files ?? [])
             .map(f => f.path)
@@ -866,7 +1051,14 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
             return x;
         })
-            .filter(x => x && (x.includes(':\\') || x.startsWith('/') || x.startsWith('\\\\')));
+            .map(x => {
+            // Some sources may produce `/C:/Users/...`
+            if (isWin && /^\/[A-Za-z]:[\\/]/.test(x)) {
+                return x.slice(1);
+            }
+            return x;
+        })
+            .filter(x => x && isLocalPath(x));
         if (uris.length) {
             return uris;
         }
@@ -885,7 +1077,13 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
             }
             return x;
         })
-            .filter(x => x.includes(':\\') || x.startsWith('/') || x.startsWith('\\\\'));
+            .map(x => {
+            if (isWin && /^\/[A-Za-z]:[\\/]/.test(x)) {
+                return x.slice(1);
+            }
+            return x;
+        })
+            .filter(x => x && isLocalPath(x));
         return textPaths;
     }
     getFilteredLocalEntries() {
@@ -1800,6 +1998,11 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
                 this.cancelDelete();
                 return;
             }
+            if (this.replaceConfirmVisible) {
+                event.preventDefault();
+                this.cancelReplace();
+                return;
+            }
         }
         if (event.key === 'Delete' || event.key === 'Backspace') {
             // Don't intercept Delete/Backspace while typing in inputs
@@ -1881,6 +2084,37 @@ let SftpManagerTabComponent = class SftpManagerTabComponent extends tabby_core__
         this.pendingLocalDelete = [];
         this.pendingRemoteDelete = [];
     }
+    async showReplaceConfirm(text) {
+        if (this.replaceConfirmVisible) {
+            // Prevent stacking multiple confirmations; choose the latest replacement intent.
+            return false;
+        }
+        this.replaceConfirmText = text;
+        this.replaceConfirmVisible = true;
+        return new Promise(resolve => {
+            this.replaceConfirmResolve = resolve;
+        });
+    }
+    async confirmReplace() {
+        if (!this.replaceConfirmVisible) {
+            return;
+        }
+        this.replaceConfirmVisible = false;
+        const resolve = this.replaceConfirmResolve;
+        this.replaceConfirmResolve = null;
+        this.replaceConfirmText = '';
+        resolve?.(true);
+    }
+    cancelReplace() {
+        if (!this.replaceConfirmVisible) {
+            return;
+        }
+        this.replaceConfirmVisible = false;
+        const resolve = this.replaceConfirmResolve;
+        this.replaceConfirmResolve = null;
+        this.replaceConfirmText = '';
+        resolve?.(false);
+    }
     async deleteLocalEntry(entry) {
         await this.deleteLocalPathRecursive(entry.fullPath);
     }
@@ -2188,6 +2422,16 @@ SftpManagerTabComponent = __decorate([
               <span class="size sortable" (click)="setLocalSort('size')">Size</span>
               <span class="date sortable" (click)="setLocalSort('modified')">Modified</span>
             </div>
+            <div
+              class="entry"
+              *ngIf="canLocalUp()"
+              (dblclick)="localUp()"
+            >
+              <span class="icon">⬆</span>
+              <span class="name">Go up</span>
+              <span class="size"></span>
+              <span class="date"></span>
+            </div>
             <div
               class="entry"
               *ngFor="let e of getFilteredLocalEntries()"
@@ -2366,6 +2610,16 @@ SftpManagerTabComponent = __decorate([
         </div>
       </div>
 
+      <div class="delete-overlay" *ngIf="replaceConfirmVisible">
+        <div class="delete-dialog">
+          <div class="delete-text">{{ replaceConfirmText }}</div>
+          <div class="delete-buttons">
+            <button class="danger" (click)="confirmReplace()">Replace</button>
+            <button (click)="cancelReplace()">Cancel</button>
+          </div>
+        </div>
+      </div>
+
       <div class="delete-overlay" *ngIf="inputDialogVisible">
         <div class="delete-dialog" (click)="$event.stopPropagation()">
           <div class="delete-text">{{ inputDialogTitle }}</div>