dsh-over-ssh 0.1.0 → 0.2.0

package/lib/file-references.js

@@ -49,7 +49,26 @@ var DEFAULTS = {
 function rankMatches(paths, query, limit) {
   const needle = query.trim().toLowerCase();
   if (needle === "") {
-    return paths.map((path) => ({ path, depth: depth(path) })).sort((left, right) => left.depth - right.depth || (left.path < right.path ? -1 : 1)).slice(0, limit).map((entry) => entry.path);
+    const top = [];
+    const better = (left, right) => {
+      const leftDepth = depth(paths[left]);
+      const rightDepth = depth(paths[right]);
+      if (leftDepth !== rightDepth) return leftDepth < rightDepth;
+      return paths[left] < paths[right];
+    };
+    for (let index = 0; index < paths.length; index += 1) {
+      if (top.length >= limit && !better(index, top[top.length - 1])) continue;
+      let low = 0;
+      let high = top.length;
+      while (low < high) {
+        const middle = low + high >> 1;
+        if (better(index, top[middle])) high = middle;
+        else low = middle + 1;
+      }
+      top.splice(low, 0, index);
+      if (top.length > limit) top.pop();
+    }
+    return top.map((index) => paths[index]);
   }
   const scored = [];
   for (const path of paths) {
@@ -69,30 +88,27 @@ function rankMatches(paths, query, limit) {
   return scored.slice(0, limit).map((entry) => entry.path);
 }
 function depth(path) {
-  return path.split("/").filter((segment) => segment !== "").length;
-}
-
-// src/host/domain/roots/root.ts
-function makeLocalRoot(path, options = {}) {
-  const normalized = normalizeLocalPath(path, { caseInsensitive: false });
-  if (!isAbsoluteLocalPath(normalized)) {
-    throw new SshDevError("ROOT_INVALID", `\u672C\u5730\u6839\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF1A${path}`, { path });
+  let segments = 0;
+  let inSegment = false;
+  for (let index = 0; index < path.length; index += 1) {
+    if (path.charCodeAt(index) === 47) {
+      inSegment = false;
+      continue;
+    }
+    if (!inSegment) {
+      segments += 1;
+      inSegment = true;
+    }
   }
-  return {
-    location: "local",
-    path: normalized,
-    writable: options.writable ?? true,
-    ...options.label === void 0 ? {} : { label: options.label },
-    ...options.workspaces === void 0 ? {} : { workspaces: options.workspaces },
-    ...options.sessions === void 0 ? {} : { sessions: options.sessions },
-    ...options.shared === void 0 ? {} : { shared: options.shared }
-  };
+  return segments;
 }
+
+// src/shared/root-keys.ts
 function isAbsoluteLocalPath(path) {
-  return /^[A-Za-z]:[\\/]/.test(path) || path.startsWith("//") || path.startsWith("/");
+  return /^[A-Za-z]:[\\/]/.test(path) || path.startsWith("/") || path.startsWith("\\\\");
 }
 function normalizeLocalPath(path, options = {}) {
-  const caseInsensitive = options.caseInsensitive ?? process.platform === "win32";
+  const caseInsensitive = options.caseInsensitive ?? false;
   const unified = path.replace(/\\/g, "/");
   const unc = unified.startsWith("//");
   const posixAbsolute = unified.startsWith("/");
@@ -118,15 +134,46 @@ function normalizeLocalPath(path, options = {}) {
   return caseInsensitive ? normalized.toLowerCase() : normalized;
 }
 
+// src/host/domain/roots/root.ts
+function makeLocalRoot(path, options = {}) {
+  const normalized = normalizeLocalPath2(path, { caseInsensitive: false });
+  if (!isAbsoluteLocalPath(normalized)) {
+    throw new SshDevError("ROOT_INVALID", `\u672C\u5730\u6839\u5FC5\u987B\u662F\u7EDD\u5BF9\u8DEF\u5F84\uFF1A${path}`, { path });
+  }
+  return {
+    location: "local",
+    path: normalized,
+    writable: options.writable ?? true,
+    ...options.label === void 0 ? {} : { label: options.label },
+    ...options.workspaces === void 0 ? {} : { workspaces: options.workspaces },
+    ...options.sessions === void 0 ? {} : { sessions: options.sessions },
+    ...options.shared === void 0 ? {} : { shared: options.shared }
+  };
+}
+function normalizeLocalPath2(path, options = {}) {
+  return normalizeLocalPath(path, { caseInsensitive: options.caseInsensitive ?? process.platform === "win32" });
+}
+
 // 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 cached = ancestorCache.get(sessionId);
-  if (cached !== void 0) return cached;
+  if (cached !== void 0) {
+    ancestorCache.delete(sessionId);
+    ancestorCache.set(sessionId, cached);
+    return cached;
+  }
   const walked = walkAncestors(ctx, sessionId);
-  if (walked.settled && ancestorCache.size < ANCESTOR_CACHE_MAX) ancestorCache.set(sessionId, walked.ancestors);
+  if (walked.settled) {
+    ancestorCache.set(sessionId, walked.ancestors);
+    while (ancestorCache.size > ANCESTOR_CACHE_MAX) {
+      const oldest = ancestorCache.keys().next();
+      if (oldest.done === true) break;
+      ancestorCache.delete(oldest.value);
+    }
+  }
   return walked.ancestors;
 }
 function walkAncestors(ctx, sessionId) {
@@ -220,16 +267,18 @@ var RemoteFileReferenceService = class extends FileReferenceService {
     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 added = await this.#addedRemoteCandidates(cwd, identity, query, signal);
-    if (gated.ok) {
-      const root = gated.target.root;
-      const named = root.location === "remote" && root.connectionId !== void 0 ? await this.#remoteCandidates(root.connectionId, root.path, query, signal) : await this.#localCandidates(root.path, query, signal);
-      return this.#merge(added, named);
-    }
-    if (registry.routed.tryResolve(cwd).ok) return added ?? [];
-    const implicit = sessionLocalRoot(cwd);
-    const local = implicit === void 0 ? [] : await this.#localCandidates(implicit.path, query, signal);
-    return this.#merge(added, local);
+    const addedTask = 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 [added, named] = await Promise.all([addedTask, namedTask]);
+    if (gated.ok) return this.#merge(added, named ?? []);
+    if (ungated?.ok === true) return added ?? [];
+    return this.#merge(added, named ?? []);
+  }
+  /** 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);
   }
   /** Remote candidates for one root, or `[]` when the composition has no index. */
   async #remoteCandidates(connectionId, root, query, signal) {
@@ -241,12 +290,20 @@ var RemoteFileReferenceService = class extends FileReferenceService {
   async #localCandidates(rootPath, query, signal) {
     const walk = this.#options.walk ?? ((root, walkSignal) => this.#walkLocal(root, walkSignal));
     const entries = await this.#walkCached(rootPath, walk, signal);
-    const kinds = new Map(entries.map((entry) => [entry.path, entry.kind]));
-    return rankMatches(
+    const ranked = rankMatches(
       entries.map((entry) => entry.path),
       query,
       this.#options.maxResults ?? DEFAULT_MAX_RESULTS
-    ).map((path) => ({ path, kind: kinds.get(path) ?? "file" }));
+    );
+    if (ranked.length === 0) return [];
+    const wanted = new Set(ranked);
+    const kinds = /* @__PURE__ */ new Map();
+    for (const entry of entries) {
+      if (!wanted.has(entry.path)) continue;
+      kinds.set(entry.path, entry.kind);
+      if (kinds.size === wanted.size) break;
+    }
+    return ranked.map((path) => ({ path, kind: kinds.get(path) ?? "file" }));
   }
   /**
    * Candidates from the remote directory this conversation added with 「添加目录」, when there is one.