dsh-over-ssh 0.2.1 → 0.2.3

package/lib/file-references.js

@@ -2,7 +2,7 @@
 import "@deepseek-ai/cordis";
 
 // src/host/integration/fs/file-reference-provider.ts
-import { readdir } from "node:fs/promises";
+import { readdir, realpath, stat } from "node:fs/promises";
 import { join } from "node:path";
 import "@deepseek-ai/cordis";
 import FileReferenceService from "@deepseek-ai/dsh-file-reference";
@@ -47,7 +47,7 @@ var DEFAULTS = {
   outputCap: 8 * 1024 * 1024
 };
 function rankMatches(paths, query, limit) {
-  const needle = query.trim().toLowerCase();
+  const needle = separatorsForMatching(query.trim().toLowerCase());
   if (needle === "") {
     const top = [];
     const better = (left, right) => {
@@ -72,7 +72,8 @@ function rankMatches(paths, query, limit) {
   }
   const scored = [];
   for (const path of paths) {
-    const lower = path.toLowerCase();
+    const normalized = separatorsForMatching(path);
+    const lower = normalized.toLowerCase();
     const base = lower.slice(lower.lastIndexOf("/") + 1);
     let score;
     if (base.startsWith(needle)) score = 0;
@@ -87,11 +88,15 @@ function rankMatches(paths, query, limit) {
   );
   return scored.slice(0, limit).map((entry) => entry.path);
 }
+function separatorsForMatching(path) {
+  return path.includes("\\") && !path.includes("/") ? path.replaceAll("\\", "/") : path;
+}
 function depth(path) {
   let segments = 0;
   let inSegment = false;
   for (let index = 0; index < path.length; index += 1) {
-    if (path.charCodeAt(index) === 47) {
+    const code = path.charCodeAt(index);
+    if (code === 47 || code === 92) {
       inSegment = false;
       continue;
     }
@@ -153,12 +158,37 @@ function makeLocalRoot(path, options = {}) {
 function normalizeLocalPath2(path, options = {}) {
   return normalizeLocalPath(path, { caseInsensitive: options.caseInsensitive ?? process.platform === "win32" });
 }
+function localPathContains(root, candidate, options = {}) {
+  const normalizedRoot = normalizeLocalPath2(root, options);
+  const normalizedCandidate = normalizeLocalPath2(candidate, options);
+  if (normalizedRoot === "/" || /^[a-z]:\/$/.test(normalizedRoot)) {
+    return normalizedCandidate.startsWith(normalizedRoot);
+  }
+  return normalizedCandidate === normalizedRoot || normalizedCandidate.startsWith(`${normalizedRoot}/`);
+}
+
+// src/host/integration/session-fork-pending.ts
+var pending = /* @__PURE__ */ new Map();
+function pendingForkSources(sessionId) {
+  if (sessionId === void 0 || sessionId === "") return [];
+  const source = pending.get(sessionId);
+  return source === void 0 ? [] : [source];
+}
 
 // src/host/integration/session-scope.ts
 var MAX_FORK_DEPTH = 32;
 var ancestorCache = /* @__PURE__ */ new Map();
 var ANCESTOR_CACHE_MAX = 256;
 function readSessionAncestors(ctx, sessionId) {
+  const pending2 = pendingForkSources(sessionId);
+  if (pending2.length > 0) {
+    const inherited = /* @__PURE__ */ new Set();
+    for (const source of pending2) {
+      inherited.add(source);
+      for (const ancestor of walkAncestors(ctx, source).ancestors) inherited.add(ancestor);
+    }
+    return [...inherited];
+  }
   const cached = ancestorCache.get(sessionId);
   if (cached !== void 0) {
     ancestorCache.delete(sessionId);
@@ -231,6 +261,17 @@ var RemoteFileReferenceService = class extends FileReferenceService {
    * (`local-backend.ts:53`), so there is no change signal to hook — only a short TTL.
    */
   #localCache = /* @__PURE__ */ new Map();
+  /**
+   * 正在进行中的本地走查，按根合并。
+   *
+   * 为什么需要它：缓存只覆盖"上一次走查**已完成**"的情况。用户敲 `@mo` 时的间隔可能短于一次走查
+   * （10 000 条目约 68 ms），于是几次击键会各自发起一次全树走查——同一棵树在宿主事件循环上被重复
+   * 扫描。这里让并发的同根调用共享一次走查；查询不同不影响，因为**排序仍按每次调用自己的 query 现算**，
+   * 共享的只有与 query 无关的树枚举。
+   */
+  #inflight = /* @__PURE__ */ new Map();
+  /** 已经告警过的来源标签；一次故障只提示一次，避免每个按键都刷一行日志。 */
+  #warned = /* @__PURE__ */ new Set();
   constructor(ctx, options = {}) {
     super(ctx);
     this.#options = options;
@@ -262,20 +303,53 @@ var RemoteFileReferenceService = class extends FileReferenceService {
    *   without an index, or a cwd that is not an absolute host path.
    */
   async list(agent, query, signal) {
+    signal.throwIfAborted();
     const cwd = agent.session.header.cwd ?? process.cwd();
     const registry = this.ctx.sshDevRoots;
     if (registry === void 0) return [];
     const identity = sessionIdentityOf(this.ctx, agent.session.header.id);
     const gated = identity.sessionId === void 0 ? registry.routed.tryResolve(cwd) : registry.routed.tryResolve(cwd, { session: identity });
-    const addedTask = this.#addedRemoteCandidates(cwd, identity, query, signal);
+    const addedTask = this.#degrade(
+      "\u672C\u4F1A\u8BDD\u6DFB\u52A0\u7684\u8FDC\u7AEF\u6839",
+      void 0,
+      () => this.#addedRemoteCandidates(cwd, identity, query, signal)
+    );
     const ungated = gated.ok ? void 0 : registry.routed.tryResolve(cwd);
     const implicit = gated.ok || ungated?.ok === true ? void 0 : sessionLocalRoot(cwd);
-    const namedTask = gated.ok ? this.#namedCandidates(gated.target.root, query, signal) : implicit === void 0 ? void 0 : this.#localCandidates(implicit.path, query, signal);
+    const namedTask = gated.ok ? this.#degrade("cwd \u547D\u540D\u7684\u6839", [], () => this.#namedCandidates(gated.target.root, query, signal)) : implicit === void 0 ? void 0 : this.#degrade("cwd \u81EA\u8EAB\u76EE\u5F55", [], () => this.#localCandidates(implicit.path, query, signal));
     const [added, named] = await Promise.all([addedTask, namedTask]);
+    signal.throwIfAborted();
     if (gated.ok) return this.#merge(added, named ?? []);
     if (ungated?.ok === true) return added ?? [];
     return this.#merge(added, named ?? []);
   }
+  /**
+   * Run one candidate source, degrading a failure to `fallback`.
+   *
+   * 为什么不让一次失败冒到上层：`@` 补全有两个独立来源（本会话「添加目录」的远端根、cwd 命名的根）。
+   * 旧写法直接 `Promise.all`，其中**任何一个**失败（连接断、远端超时、walk 抛错）都会让整个 `list()`
+   * 拒绝——明明本地候选已经拿到，也会一起消失。取消是例外：调用方已经取消时必须继续抛出，不能把
+   * "取消"伪装成"空结果"。
+   *
+   * @param label - 日志里标识来源的短名，同一来源只告警一次。
+   * @param fallback - 失败时返回的降级值。
+   * @param task - 真正的枚举任务。
+   * @returns 任务结果，或降级值。
+   */
+  async #degrade(label, fallback, task) {
+    try {
+      return await task();
+    } catch (error) {
+      if (isAbortError(error)) throw error;
+      if (!this.#warned.has(label)) {
+        this.#warned.add(label);
+        this.ctx.logger?.warn?.(
+          `file-references: ${label} \u53D6\u5019\u9009\u5931\u8D25\uFF0C\u672C\u6B21\u53EA\u8DF3\u8FC7\u8BE5\u6765\u6E90\uFF1A${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+      return fallback;
+    }
+  }
   /** cwd 命名的那个根自己的候选：远端走索引，本地走有界走查。 */
   #namedCandidates(root, query, signal) {
     return root.location === "remote" && root.connectionId !== void 0 ? this.#remoteCandidates(root.connectionId, root.path, query, signal) : this.#localCandidates(root.path, query, signal);
@@ -342,6 +416,7 @@ var RemoteFileReferenceService = class extends FileReferenceService {
    * @returns the entries, from cache when the previous walk is still fresh.
    */
   async #walkCached(root, walk, signal) {
+    signal.throwIfAborted();
     const started = this.#now();
     const cached = this.#localCache.get(root);
     if (cached !== void 0) {
@@ -352,10 +427,33 @@ var RemoteFileReferenceService = class extends FileReferenceService {
       }
       this.#localCache.delete(root);
     }
-    const entries = await walk(root, signal);
-    signal.throwIfAborted();
-    this.#rememberLocal(root, entries, started);
-    return entries;
+    let shared = this.#inflight.get(root);
+    if (shared === void 0) {
+      const controller = new AbortController();
+      const entry = { controller, waiters: 0, promise: Promise.resolve([]) };
+      const promise = (async () => {
+        const entries = await walk(root, controller.signal);
+        controller.signal.throwIfAborted();
+        this.#rememberLocal(root, entries, started);
+        return entries;
+      })();
+      entry.promise = promise;
+      void promise.catch(() => void 0).finally(() => {
+        if (this.#inflight.get(root) === entry) this.#inflight.delete(root);
+      });
+      this.#inflight.set(root, entry);
+      shared = entry;
+    }
+    shared.waiters += 1;
+    try {
+      return await raceAbort(shared.promise, signal);
+    } finally {
+      shared.waiters -= 1;
+      if (shared.waiters === 0 && this.#inflight.get(root) === shared) {
+        this.#inflight.delete(root);
+        shared.controller.abort(new DOMException("no active @ completion callers", "AbortError"));
+      }
+    }
   }
   /** Store one local enumeration, evicting the least recently used root past the cap. */
   #rememberLocal(root, entries, at) {
@@ -371,6 +469,12 @@ var RemoteFileReferenceService = class extends FileReferenceService {
     const maxEntries = this.#options.maxEntries ?? LOCAL_MAX_ENTRIES;
     const maxDepth = this.#options.maxDepth ?? LOCAL_MAX_DEPTH;
     const found = [];
+    const visited = /* @__PURE__ */ new Set();
+    const rootReal = await realpath(root).catch(() => root);
+    const caseInsensitive = process.platform === "win32";
+    const withinRoot = (candidate) => localPathContains(rootReal, candidate, { caseInsensitive });
+    visited.add(rootReal);
+    const excluded = (name) => LOCAL_EXCLUDED_DIRECTORIES.includes(caseInsensitive ? name.toLowerCase() : name);
     let frontier = [{ path: root, depth: 0 }];
     while (frontier.length > 0 && found.length < maxEntries) {
       signal.throwIfAborted();
@@ -386,11 +490,27 @@ var RemoteFileReferenceService = class extends FileReferenceService {
         }
         for (const child of children) {
           if (found.length >= maxEntries) break;
-          const isDirectory = child.isDirectory();
-          if (isDirectory && LOCAL_EXCLUDED_DIRECTORIES.includes(child.name)) continue;
+          let isDirectory = child.isDirectory();
+          let traversable = child.isDirectory();
           const path = join(entry.path, child.name);
+          if (!isDirectory && child.isSymbolicLink()) {
+            try {
+              const target = await stat(path);
+              isDirectory = target.isDirectory();
+              if (isDirectory) {
+                const real = await realpath(path);
+                if (visited.has(real) || !withinRoot(real)) traversable = false;
+                else {
+                  visited.add(real);
+                  traversable = true;
+                }
+              }
+            } catch {
+            }
+          }
+          if (isDirectory && excluded(child.name)) continue;
           found.push({ path, kind: isDirectory ? "directory" : "file" });
-          if (isDirectory) next.push({ path, depth: entry.depth + 1 });
+          if (traversable) next.push({ path, depth: entry.depth + 1 });
         }
       }
       frontier = next;
@@ -398,6 +518,26 @@ var RemoteFileReferenceService = class extends FileReferenceService {
     return found;
   }
 };
+function raceAbort(promise, signal) {
+  if (signal.aborted) return Promise.reject(signal.reason ?? new DOMException("aborted", "AbortError"));
+  return new Promise((resolve, reject) => {
+    const onAbort = () => reject(signal.reason ?? new DOMException("aborted", "AbortError"));
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then(
+      (value) => {
+        signal.removeEventListener("abort", onAbort);
+        resolve(value);
+      },
+      (error) => {
+        signal.removeEventListener("abort", onAbort);
+        reject(error);
+      }
+    );
+  });
+}
+function isAbortError(error) {
+  return error instanceof Error && (error.name === "AbortError" || error.name === "TimeoutError") || typeof error === "object" && error !== null && "name" in error && (error.name === "AbortError" || error.name === "TimeoutError");
+}
 function sessionLocalRoot(cwd) {
   if (cwd === "" || !isAbsoluteLocalPath(cwd)) return void 0;
   return makeLocalRoot(cwd);

package/lib/fs.js

@@ -630,6 +630,20 @@ async function readBody(req, maxBytes) {
   }
   return Buffer.concat(chunks).toString("utf8");
 }
+async function readJsonObject(req, maxBytes) {
+  const text = (await readBody(req, maxBytes)).trim();
+  if (text === "") return {};
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    throw new SshDevError("ROOT_INVALID", "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5 JSON");
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    throw new SshDevError("ROOT_INVALID", "\u8BF7\u6C42\u4F53\u9876\u5C42\u5FC5\u987B\u662F\u5BF9\u8C61");
+  }
+  return parsed;
+}
 function toBytes(chunk) {
   if (typeof chunk === "string") return Buffer.from(chunk, "utf8");
   if (chunk instanceof Uint8Array) return chunk;
@@ -650,6 +664,38 @@ function asRecord(value) {
 function messageOf(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function reasonOf(error) {
+  const reason = asRecord(asRecord(error)?.["details"])?.["reason"];
+  return typeof reason === "string" && reason !== "" ? reason : void 0;
+}
+var STATUS_BY_CODE = {
+  // 输入问题：调用方改一下请求就能成功。
+  ROOT_INVALID: 400,
+  CONNECTION_INVALID: 400,
+  CONNECTION_NOT_FOUND: 400,
+  // 路径不在任何已注册的根内 / 根没有注册：客户端换一个路径或先加根就能成功，不是服务器故障。
+  // 它此前漏在表外，于是**所有**经 HTTP 暴露的根外访问都报 500（审计 2026-11-06 第 4 轮 P1）。
+  ROOT_OUTSIDE: 400,
+  // 目标不存在 / 状态冲突 / 本组合不支持：客户端可以据此换一条路。
+  TRASH_NOT_FOUND: 404,
+  TRANSFER_CONFLICT: 409,
+  SESSION_ACTIVE: 409,
+  REMOTE_UNSUPPORTED: 501,
+  // 调用方主动取消（客户端断开/关掉面板）。499 是 nginx 的 "client closed request" 约定：它不是一个错误，
+  // 只是说明"没人等这个回答了"；映射成 500 会让日志里出现一堆假故障。
+  CANCELLED: 499
+};
+function codeOf(error) {
+  const code = asRecord(error)?.["code"];
+  return typeof code === "string" && code !== "" ? code : void 0;
+}
+function statusForCode(code) {
+  if (code === void 0) return 500;
+  return STATUS_BY_CODE[code] ?? 500;
+}
+function statusForError(error) {
+  return statusForCode(codeOf(error));
+}
 
 // src/host/infra/transport/git-status-route.ts
 var GIT_STATUS_API_PATH2 = GIT_STATUS_API_PATH;
@@ -668,9 +714,9 @@ function toPublicAnswer(snapshot) {
 function createGitStatusApi(deps) {
   const handle = async (req, res) => {
     const method = (req.method ?? "GET").toUpperCase();
-    if (method !== "POST" && method !== "GET" && method !== "HEAD") {
-      res.setHeader("allow", "GET, HEAD, POST");
-      send(req, res, 405, { ok: false, error: `\u4E0D\u652F\u6301\u7684\u65B9\u6CD5\uFF1A${method}` });
+    if (method !== "POST") {
+      res.setHeader("allow", "POST");
+      send(req, res, 405, { ok: false, error: "git-status \u53EA\u63A5\u53D7 POST" });
       return;
     }
     const verdict = trustVerdict(req);
@@ -678,13 +724,8 @@ function createGitStatusApi(deps) {
       send(req, res, 403, { ok: false, error: trustMessage(verdict) });
       return;
     }
-    if (method !== "POST") {
-      res.setHeader("allow", "POST");
-      send(req, res, 405, { ok: false, error: "git-status \u53EA\u63A5\u53D7 POST" });
-      return;
-    }
     try {
-      const body = asRecord(JSON.parse(await readBody(req, ROOTS_API_MAX_BODY_BYTES)));
+      const body = await readJsonObject(req, ROOTS_API_MAX_BODY_BYTES);
       const connectionId = body?.["connectionId"];
       const path = body?.["path"];
       if (typeof connectionId !== "string" || connectionId === "") {
@@ -708,8 +749,14 @@ function createGitStatusApi(deps) {
       }
       send(req, res, 200, toPublicAnswer(snapshot));
     } catch (error) {
-      const invalidBody = error instanceof SyntaxError;
-      send(req, res, invalidBody ? 400 : 500, { ok: false, error: messageOf(error) });
+      const code = codeOf(error);
+      const reason = reasonOf(error);
+      send(req, res, statusForError(error), {
+        ok: false,
+        error: messageOf(error),
+        ...code === void 0 ? {} : { code },
+        ...reason === void 0 ? {} : { reason }
+      });
     }
   };
   return { handle };
@@ -780,6 +827,16 @@ function replaceLiteral(source, needle, replacement, all) {
 
 // src/host/integration/session-scope.ts
 import { AsyncLocalStorage } from "node:async_hooks";
+
+// src/host/integration/session-fork-pending.ts
+var pending = /* @__PURE__ */ new Map();
+function pendingForkSources(sessionId) {
+  if (sessionId === void 0 || sessionId === "") return [];
+  const source = pending.get(sessionId);
+  return source === void 0 ? [] : [source];
+}
+
+// src/host/integration/session-scope.ts
 var STORE_KEY = /* @__PURE__ */ Symbol.for("dsh-over-ssh/session-scope");
 function store() {
   const holder = globalThis;
@@ -796,6 +853,15 @@ var MAX_FORK_DEPTH = 32;
 var ancestorCache = /* @__PURE__ */ new Map();
 var ANCESTOR_CACHE_MAX = 256;
 function readSessionAncestors(ctx, sessionId) {
+  const pending2 = pendingForkSources(sessionId);
+  if (pending2.length > 0) {
+    const inherited = /* @__PURE__ */ new Set();
+    for (const source of pending2) {
+      inherited.add(source);
+      for (const ancestor of walkAncestors(ctx, source).ancestors) inherited.add(ancestor);
+    }
+    return [...inherited];
+  }
   const cached = ancestorCache.get(sessionId);
   if (cached !== void 0) {
     ancestorCache.delete(sessionId);
@@ -857,7 +923,7 @@ function readSessionCwd(ctx, sessionId) {
   }
   return found.cwd;
 }
-function readSessionCwds(ctx) {
+function readSessionWorkspaces(ctx) {
   let list;
   try {
     const sessions = ctx.get("sessions");
@@ -866,12 +932,14 @@ function readSessionCwds(ctx) {
     return [];
   }
   if (!Array.isArray(list)) return [];
-  const cwds = [];
+  const pairs = [];
   for (const session of list) {
+    const id = session?.header?.id;
     const cwd = session?.header?.cwd;
-    if (typeof cwd === "string" && cwd !== "") cwds.push(cwd);
+    if (typeof id !== "string" || id === "" || typeof cwd !== "string" || cwd === "") continue;
+    pairs.push({ sessionId: id, cwd });
   }
-  return cwds;
+  return pairs;
 }
 var sessionCwdCache = /* @__PURE__ */ new Map();
 var SESSION_CWD_CACHE_MAX = 256;
@@ -940,7 +1008,7 @@ var RoutedFsProvider = class extends FileSystem {
   // it"). Every method here may run with the Proxy as `this`, so the state it touches cannot be `#private`.
   rangeReader;
   rangeChunkBytes;
-  /** Reads the live sessions' working directories; see {@link RoutedFsProviderOptions.sessionWorkspaceCwds}. */
+  /** Reads the live sessions' working directories (with ids when available); see {@link RoutedFsProviderOptions.sessionWorkspaceCwds}. */
   sessionWorkspaceCwds;
   /** Reads one session's fork lineage; see {@link RoutedFsProviderOptions.sessionAncestors}. */
   sessionAncestors;
@@ -955,7 +1023,7 @@ var RoutedFsProvider = class extends FileSystem {
   constructor(ctx, options = {}) {
     super(ctx);
     this.rangeReader = options.readBytesRange;
-    this.sessionWorkspaceCwds = options.sessionWorkspaceCwds ?? (() => readSessionCwds(ctx));
+    this.sessionWorkspaceCwds = options.sessionWorkspaceCwds ?? (() => readSessionWorkspaces(ctx));
     this.sessionAncestors = options.sessionAncestors ?? ((sessionId) => readSessionAncestors(ctx, sessionId));
     this.sessionSync = { lastSignature: "" };
     startHostErrorDetection();
@@ -1482,7 +1550,8 @@ async function* pagedText(reader, chunkBytes, routed, firstWindow, signal) {
 }
 function sessionSyncSignature(cwds, registry) {
   const roots = registry.sessionWorkspaceRecords.map((record) => record.key).join("\0");
-  return `${cwds.join("\0")}
${roots}`;
+  const items = cwds.map((item) => typeof item === "string" ? item : `${item.sessionId}${item.cwd}`).join("\0");
+  return `${items}
${roots}`;
 }
 function assertText(displayPath, bytes) {
   if (bytes.subarray(0, BINARY_SNIFF_BYTES).includes(0)) {