pi-ssh-remote 0.1.12 → 0.1.13

package/CHANGELOG.md

@@ -18,6 +18,22 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Rel
 
 - None.
 
+## [0.1.13] - 2026-09-18
+
+### Added
+
+- None.
+
+### Changed
+
+- Increased the SSH handshake timeout to 30 seconds for slower remote connections.
+
+### Fixed
+
+- Stored SSH config, known hosts, and server memory in Pi's agent directory (`~/.pi/agent`, or `PI_CODING_AGENT_DIR`) instead of falling back to the current working directory when `HOME` is unset, which mainly affected Windows.
+- Expanded `ssh -i ~/...` identity paths with the user home directory from `os.homedir()`, so private keys resolve on Windows.
+- Fell back to the remote login directory with a warning when a saved remote working directory is unavailable, instead of failing the SSH connection.
+
 ## [0.1.12] - 2026-08-25
 
 ### Added
@@ -220,7 +236,8 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Rel
 
 - None.
 
-[Unreleased]: https://github.com/petrichor20211/pi-ssh-remote/compare/v0.1.12...HEAD
+[Unreleased]: https://github.com/petrichor20211/pi-ssh-remote/compare/v0.1.13...HEAD
+[0.1.13]: https://github.com/petrichor20211/pi-ssh-remote/compare/v0.1.12...v0.1.13
 [0.1.12]: https://github.com/petrichor20211/pi-ssh-remote/compare/v0.1.11...v0.1.12
 [0.1.11]: https://github.com/petrichor20211/pi-ssh-remote/compare/v0.1.10...v0.1.11
 [0.1.10]: https://github.com/petrichor20211/pi-ssh-remote/compare/v0.1.9...v0.1.10

package/README.md

@@ -234,13 +234,13 @@ The extension currently supports direct SSH commands with `-p`, `-l`, and `-i`.
 
 ## Releases
 
-Latest release: [v0.1.12](https://github.com/petrichor20211/pi-ssh-remote/releases/tag/v0.1.12)
+Latest release: [v0.1.13](https://github.com/petrichor20211/pi-ssh-remote/releases/tag/v0.1.13)
 
 | Version | Date | Highlights |
 |---|---|---|
+| [0.1.13](CHANGELOG.md#0113---2026-09-18) | 2026-09-18 | Graceful working-directory fallback, longer SSH handshakes, and Windows path fixes |
 | [0.1.12](CHANGELOG.md#0112---2026-08-25) | 2026-08-25 | Safe handling of repeated SSH errors when a connection is lost during handshake |
 | [0.1.11](CHANGELOG.md#0111---2026-08-16) | 2026-08-16 | JSON memory entries, prompt-guided CRUD, and `/remote memory` listing |
-| [0.1.10](CHANGELOG.md#0110---2026-08-16) | 2026-08-16 | Safe inspect-by-default and append-only agent updates for server memory |
 
 See [CHANGELOG.md](CHANGELOG.md) for the complete release history, including additions, behavior changes, and bug fixes.
 

package/README.zh-CN.md

@@ -312,13 +312,13 @@ pi install npm:pi-ssh-remote
 
 ## 版本发布
 
-最新版本：[v0.1.12](https://github.com/petrichor20211/pi-ssh-remote/releases/tag/v0.1.12)
+最新版本：[v0.1.13](https://github.com/petrichor20211/pi-ssh-remote/releases/tag/v0.1.13)
 
 | 版本 | 日期 | 主要内容 |
 |---|---|---|
+| [0.1.13](CHANGELOG.md#0113---2026-09-18) | 2026-09-18 | 工作目录不可用时平滑回退、延长 SSH 握手等待并修复 Windows 路径 |
 | [0.1.12](CHANGELOG.md#0112---2026-08-25) | 2026-08-25 | 安全处理 SSH 握手期间断线所触发的连续错误 |
 | [0.1.11](CHANGELOG.md#0111---2026-08-16) | 2026-08-16 | JSON 记忆条目、Prompt 引导增删查改与 `/remote memory` 展示命令 |
-| [0.1.10](CHANGELOG.md#0110---2026-08-16) | 2026-08-16 | 默认安全读取且仅追加的服务器记忆 agent 更新逻辑 |
 
 完整的新增内容、行为变更和 Bug 修复记录请查看 [CHANGELOG.md](CHANGELOG.md)。
 

package/index.ts

@@ -10,12 +10,12 @@ import ssh2, { type Client as SshClient, type ClientChannel, type ConnectConfig,
 import { closeSync, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, statSync, writeFileSync, writeSync } from "node:fs";
 import { dirname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
 import { createServer, type Server, type Socket } from "node:net";
-import { tmpdir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { Type } from "typebox";
 import { StringEnum } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
-  CONFIG_DIR_NAME,
+  getAgentDir,
   DEFAULT_MAX_BYTES,
   DEFAULT_MAX_LINES,
   createBashTool,
@@ -47,6 +47,7 @@ interface ParsedSsh {
 interface RemoteState extends ParsedSsh {
   client: SshClient;
   cwd: string;
+  unavailableCwd?: string;
 }
 
 interface CredentialCache {
@@ -106,7 +107,8 @@ interface SessionRemoteState {
   forwards?: string[];
 }
 
-const AGENT_DIR = join(process.env.HOME || ".", CONFIG_DIR_NAME, "agent");
+// Use Pi's agent dir so Windows follows USERPROFILE and PI_CODING_AGENT_DIR is honored.
+const AGENT_DIR = getAgentDir();
 const KNOWN_HOSTS_FILE = join(AGENT_DIR, "ssh-remote-known-hosts.json");
 const REMOTE_CONFIG_FILE = join(AGENT_DIR, "ssh-remote-config.json");
 const SERVER_MEMORY_DIR = join(AGENT_DIR, "ssh-remote-memories");
@@ -120,6 +122,7 @@ const DEFAULT_EXEC_MAX_BYTES = 8 * 1024;
 const DEFAULT_TURN_MAX_BYTES = 32 * 1024;
 const MIN_MODEL_OUTPUT_BYTES = 1024;
 const OUTPUT_FOOTER_RESERVE_BYTES = 512;
+const SSH_HANDSHAKE_TIMEOUT_MS = 30_000;
 const DEFAULT_REMOTE_TIMEOUT_SECONDS = 30;
 const MAX_REMOTE_TIMEOUT_SECONDS = 2_147_483_647 / 1000;
 const MAX_PRIVATE_KEY_BYTES = 1024 * 1024;
@@ -147,6 +150,10 @@ function shellWords(input: string): string[] {
   return words;
 }
 
+function isHomeRelativePath(filePath: string): boolean {
+  return filePath === "~" || filePath.startsWith("~/");
+}
+
 function parseSshCommand(command: string): ParsedSsh {
   const args = shellWords(command);
   if (args[0] !== "ssh") throw new Error("Command must start with ssh, for example: ssh root@host -p 22");
@@ -175,7 +182,7 @@ function parseSshCommand(command: string): ParsedSsh {
     else throw new Error("Unexpected extra argument in SSH command");
   }
   if (!target || !Number.isInteger(port) || port < 1 || port > 65535) throw new Error("Invalid SSH host or port");
-  if (identityFile && identityFile !== "~" && !identityFile.startsWith("~/") && !isAbsolute(identityFile)) {
+  if (identityFile && !isHomeRelativePath(identityFile) && !isAbsolute(identityFile)) {
     throw new Error("SSH identity file must use an absolute path or ~/...");
   }
   const at = target.lastIndexOf("@");
@@ -207,10 +214,9 @@ function deleteCachedPassword(config: ParsedSsh): void {
 
 function resolveIdentityPath(config: ParsedSsh): string {
   if (!config.identityFile) throw new Error("No SSH identity file is configured");
-  if (config.identityFile === "~" || config.identityFile.startsWith("~/")) {
-    const home = process.env.HOME;
-    if (!home) throw new Error("Cannot expand SSH identity path because HOME is not set");
-    return config.identityFile === "~" ? home : join(home, config.identityFile.slice(2));
+  // Expand ~ with the user home directory, not Pi's agent directory.
+  if (isHomeRelativePath(config.identityFile)) {
+    return config.identityFile === "~" ? homedir() : join(homedir(), config.identityFile.slice(2));
   }
   return config.identityFile;
 }
@@ -690,7 +696,7 @@ function probeFingerprint(config: ParsedSsh): Promise<string> {
     let settled = false;
     const timer = setTimeout(() => {
       if (!settled) { settled = true; client.end(); reject(new Error("Connection timed out")); }
-    }, 10000);
+    }, SSH_HANDSHAKE_TIMEOUT_MS + 2000);
     client.on("error", (error) => {
       if (!settled) { settled = true; clearTimeout(timer); reject(error); }
     });
@@ -698,7 +704,7 @@ function probeFingerprint(config: ParsedSsh): Promise<string> {
       host: config.host,
       port: config.port,
       username: config.username,
-      readyTimeout: 8000,
+      readyTimeout: SSH_HANDSHAKE_TIMEOUT_MS,
       hostHash: "sha256",
       hostVerifier: (hash) => {
         if (!settled) { settled = true; clearTimeout(timer); resolve(hash); }
@@ -719,7 +725,7 @@ function connect(config: ParsedSsh, authentication: SshAuthentication, fingerpri
       port: config.port,
       username: config.username,
       ...authentication,
-      readyTimeout: 12000,
+      readyTimeout: SSH_HANDSHAKE_TIMEOUT_MS,
       keepaliveInterval: 15000,
       keepaliveCountMax: 3,
       hostHash: "sha256",
@@ -1038,8 +1044,16 @@ export default function sshRemoteExtension(pi: ExtensionAPI) {
     const client = await connect(parsed, authentication, fingerprint);
     try {
       const cdCommand = cwd === FALLBACK_REMOTE_CWD ? "cd -- ~" : `cd -- ${quote(cwd)}`;
-      const resolved = (await execRemote(client, `${cdCommand} && pwd -P`)).toString().trim();
-      const state = { ...parsed, client, cwd: resolved };
+      let resolved: string;
+      let unavailableCwd: string | undefined;
+      try {
+        resolved = (await execRemote(client, `${cdCommand} && pwd -P`)).toString().trim();
+      } catch (error) {
+        if (cwd === FALLBACK_REMOTE_CWD) throw error;
+        unavailableCwd = cwd;
+        resolved = (await execRemote(client, "cd -- ~ && pwd -P")).toString().trim();
+      }
+      const state = { ...parsed, client, cwd: resolved, ...(unavailableCwd ? { unavailableCwd } : {}) };
       attachClient(state);
       return state;
     } catch (error) {
@@ -1067,7 +1081,11 @@ export default function sshRemoteExtension(pi: ExtensionAPI) {
       oldClient?.end();
       if (currentCtx) {
         status(currentCtx);
-        currentCtx.ui.notify(`SSH remote reconnected automatically: ${endpointDisplayLabel(next)}:${next.cwd}`, "info");
+        if (next.unavailableCwd) {
+          currentCtx.ui.notify(`SSH remote directory unavailable: ${next.unavailableCwd}; reconnected in default directory ${next.cwd}`, "warning");
+        } else {
+          currentCtx.ui.notify(`SSH remote reconnected automatically: ${endpointDisplayLabel(next)}:${next.cwd}`, "info");
+        }
       }
       return next;
     })().finally(() => { reconnectPromise = null; });
@@ -1168,7 +1186,11 @@ export default function sshRemoteExtension(pi: ExtensionAPI) {
       saveEndpointConfig(command, { remoteCwd: next.cwd }, true);
       status(ctx);
       persistSessionRemoteState();
-      ctx.ui.notify(`SSH remote connected: ${endpointDisplayLabel(next)}:${next.cwd}`, "info");
+      if (next.unavailableCwd) {
+        ctx.ui.notify(`SSH remote directory unavailable: ${next.unavailableCwd}; connected in default directory ${next.cwd}`, "warning");
+      } else {
+        ctx.ui.notify(`SSH remote connected: ${endpointDisplayLabel(next)}:${next.cwd}`, "info");
+      }
       return next;
     } catch (error) {
       if (!parsed.identityFile) deleteCachedPassword(parsed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ssh-remote",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Persistent remote SSH workspaces for Pi.",
   "type": "module",
   "author": "Yutong Bian",