@zhangfengshun/dsh-remote-ssh 2.0.0 → 2.0.1

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 本文件的版本号与 `package.json` 的 `version` 保持一致。每个版本对应一个 Cordis Package 快照（`pkg-N`）。
 
+## [2.0.1] — 修复远程检测：从 payload.path 也查找 .remote-ssh.json
+### 修复
+- **sessionCwd 为空时无法检测远程工作区**：客户端请求有时只带 `payload.path` 不带 `cwd`，而 `ctx.sessions.get(sessionId)` 可能返回 undefined（session 未创建或 ID 不匹配）。现改为：先尝试 `sessionCwd`，再尝试 `payload.path`，两者都会检查 `.remote-ssh.json`。
+- 添加调试日志（`ctx.logger.info`）记录每次拦截的方法、sessionId、cwd 和远程检测结果。
+
 ## [2.0.0] — 内置文件页签直接 SSH 读写远程文件（不再需要同步）
 ### 重大变更
 - **内置「文件」页签直接操作远程文件**：通过注册更长前缀 `/sidebar/api/fs.` 拦截 better-sidebar 的文件 API（`fs.tree`/`fs.read`/`fs.write`/`fs.search`），在远程工作区中直接通过 SSH 读写远程文件，不再需要 sync/push 同步。

package/lib/index.js

@@ -1564,30 +1564,42 @@ function apply(ctx, config) {
           const session = ctx.sessions.get(sessionId);
           sessionCwd = session && session.header && session.header.cwd;
         }
+        // 如果 sessionCwd 还是空，尝试用 payload.path 的父目录（文件操作时 path 是文件路径）
+        if ((!sessionCwd || sessionCwd === "") && payload && payload.path) {
+          sessionCwd = payload.path;
+        }
         // 检查是否远程工作区
         const remoteInfo = readRemoteInfoSync(sessionCwd);
+        // 如果 cwd 本身没有 .remote-ssh.json，尝试从 payload.path 向上查找
+        let remoteInfoFromPath = remoteInfo;
+        if (!remoteInfo && payload && payload.path) {
+          remoteInfoFromPath = readRemoteInfoSync(payload.path);
+        }
+        ctx.logger?.info("[dsh-remote-ssh] fs.* intercept: method=" + method + " sessionId=" + sessionId + " cwd=" + sessionCwd + " payload.path=" + (payload && payload.path) + " remoteInfo=" + (remoteInfo ? "YES" : "NO") + " remoteInfoFromPath=" + (remoteInfoFromPath ? "YES" : "NO"));
         let result;
-        if (remoteInfo && remoteInfo.keyPath && remoteInfo.host && remoteInfo.user) {
+        if (remoteInfoFromPath && remoteInfoFromPath.keyPath && remoteInfoFromPath.host && remoteInfoFromPath.user) {
+          const actualRemoteInfo = remoteInfo || remoteInfoFromPath;
+          const actualCwd = sessionCwd || (payload && payload.path) || "";
           // ---- 远程工作区：走 SSH ----
-          const profile = getProfile(remoteInfo.profileId);
+          const profile = getProfile(actualRemoteInfo.profileId);
           if (!profile) { writeJson(res, 500, { ok: false, error: { code: "internal", message: "remote profile not found" } }); return; }
           if (method === "fs.tree") {
-            const localPath = payload.path || sessionCwd;
-            const rp = localToRemote(localPath, sessionCwd, remoteInfo.remotePath);
+            const localPath = payload.path || actualCwd;
+            const rp = localToRemote(localPath, actualCwd, actualRemoteInfo.remotePath);
             result = await remoteListForSidebar(profile, rp, localPath);
           } else if (method === "fs.read") {
-            const localPath = payload.path || sessionCwd;
-            const rp = localToRemote(localPath, sessionCwd, remoteInfo.remotePath);
+            const localPath = payload.path || actualCwd;
+            const rp = localToRemote(localPath, actualCwd, actualRemoteInfo.remotePath);
             result = await remoteReadForSidebar(profile, rp);
           } else if (method === "fs.write") {
-            const localPath = payload.path || sessionCwd;
-            const rp = localToRemote(localPath, sessionCwd, remoteInfo.remotePath);
+            const localPath = payload.path || actualCwd;
+            const rp = localToRemote(localPath, actualCwd, actualRemoteInfo.remotePath);
             result = await remoteWriteFile(runPooled, profile, rp, payload.content || "");
           } else if (method === "fs.search") {
-            const rp = remoteInfo.remotePath;
+            const rp = actualRemoteInfo.remotePath;
             const r = await remoteGlob(runPooled, profile, "*" + (payload.query || "") + "*", rp);
             result = { entries: (r.files || []).map(function (f) {
-              return { path: join(sessionCwd, f), isDir: false };
+              return { path: join(actualCwd, f), isDir: false };
             }), truncated: !!r.truncated };
           } else {
             writeJson(res, 404, { ok: false, error: { code: "not-found", message: "unknown method " + method } }); return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "DSH web plugin: VSCode Remote-SSH-like remote development (SSH to supercomputers/servers, remote workspace, file explorer, integrated terminal), integrated with dsh-better-sidebar and DSH settings.",
   "keywords": [
     "dsh",