dsh-over-ssh 0.2.0 → 0.2.2

package/lib/file-references.js

@@ -154,11 +154,28 @@ function normalizeLocalPath2(path, options = {}) {
   return normalizeLocalPath(path, { caseInsensitive: options.caseInsensitive ?? process.platform === "win32" });
 }
 
+// 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);

package/lib/fs.js

@@ -559,6 +559,7 @@ var USER_ROOTS_FILE_NAME = "user-roots.json";
 var USER_ROOTS_LOCK_FILE_NAME = `${USER_ROOTS_FILE_NAME}.lock`;
 
 // src/shared/routes.ts
+var GIT_STATUS_API_PATH = "/api/over-ssh/git-status";
 function asRouteHost(value) {
   if (typeof value !== "object" || value === null) return void 0;
   const register = value.register;
@@ -629,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;
@@ -649,9 +664,41 @@ 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_PATH = "/api/over-ssh/git-status";
+var GIT_STATUS_API_PATH2 = GIT_STATUS_API_PATH;
 function toPublicAnswer(snapshot) {
   return {
     ok: true,
@@ -667,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);
@@ -677,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 === "") {
@@ -707,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 };
@@ -720,7 +768,7 @@ function registerGitStatusRoute(provider, deps) {
       const host = asRouteHost(scoped.get("webServer"));
       if (host === void 0) return void 0;
       try {
-        const dispose = host.register({ kind: "exact", path: GIT_STATUS_API_PATH, handler: api.handle });
+        const dispose = host.register({ kind: "exact", path: GIT_STATUS_API_PATH2, handler: api.handle });
         return () => dispose();
       } catch {
         return void 0;
@@ -779,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;
@@ -795,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);
@@ -856,7 +923,7 @@ function readSessionCwd(ctx, sessionId) {
   }
   return found.cwd;
 }
-function readSessionCwds(ctx) {
+function readSessionWorkspaces(ctx) {
   let list;
   try {
     const sessions = ctx.get("sessions");
@@ -865,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;
@@ -939,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;
@@ -954,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();
@@ -1481,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)) {