dsh-plugin-wsl-env 0.14.0 → 0.16.0

package/scripts/doctor.mjs

@@ -36,6 +36,7 @@ import { fileURLToPath } from "node:url";
 import { parseDistroList } from "../lib/wsl.js";
 import { AGENT_NAME, PROTOCOL_VERSION } from "../lib/agent-protocol.js";
 import { sessionScopeSweepScript } from "../lib/session-scope.js";
+import { parseListeningPorts, procNetScript } from "../lib/ports.js";
 
 const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const WSL = "wsl.exe";
@@ -63,10 +64,10 @@ const STALE_SCOPE_REPORT = [
   '  if [ -n "$cg" ] && [ -r "/sys/fs/cgroup$cg/cgroup.procs" ]; then',
   '    while read -r pid; do',
   '      [ -n "$pid" ] || continue',
-  "      if tr '\\0' ' ' < \"/proc/$pid/cmdline\" 2>/dev/null | grep -q -e 'wsl-agent.sh' -e 'dsh-wsl-agent'; then alive=1; break; fi",
+  "      if tr '\\0' ' ' < \"/proc/$pid/cmdline\" 2>/dev/null | grep -q -e 'wsl-agent.sh' -e 'dsh-wsl-agent'; then alive=1; pids=\"$pids $pid\"; fi",
   '    done < "/sys/fs/cgroup$cg/cgroup.procs"',
   "  fi",
-  '  echo "$unit $([ "$alive" -eq 1 ] && echo active || echo stale)"',
+  '  echo "$unit $([ "$alive" -eq 1 ] && echo active || echo stale) pids:${pids:-none}"',
   "done",
 ].join("\n");
 /** The agent-cache inventory: one `state digest` line per cached binary. */
@@ -254,7 +255,7 @@ function installRemedy(distro, family) {
  * @returns {number} the exit status.
  */
 function rejectReadOnly() {
-  console.error("doctor: --read-only refuses --fix/--install; run `pnpm run doctor -- --fix` instead");
+  console.error("doctor: --read-only refuses --fix/--install; run `pnpm run doctor --fix` instead");
   return 2;
 }
 
@@ -333,7 +334,7 @@ async function main(options) {
   const bwrapPath = (await inDistro(distro, "command -v bwrap")).stdout.trim();
   const install = installRemedy(distro, family);
   if (bwrapPath.length === 0) {
-    check("sandbox.bwrap", "fail", "bubblewrap", "missing; every confined command fails closed without it", `${install}, or run "pnpm run bootstrap -- ${distro} --install"`);
+    check("sandbox.bwrap", "fail", "bubblewrap", "missing; every confined command fails closed without it", `${install}, or run "pnpm run bootstrap ${distro} --install"`);
   } else {
     check("sandbox.bwrap", "ok", "bubblewrap", bwrapPath);
     const userns = await inDistro(distro, "bwrap --ro-bind / / -- true");
@@ -385,6 +386,14 @@ async function main(options) {
     check("agent.cache", bad > 0 ? "warn" : "ok", "Agent cache", `${entries.length} cached binary(ies)${bad > 0 ? `, ${bad} not executable` : ""}`, bad > 0 ? `rm -rf ~/.cache/dsh-wsl/agent inside "${distro}"; the next command repopulates it` : undefined);
   }
 
+  const scopes = (await inDistro(distro, STALE_SCOPE_REPORT)).stdout.trim();
+  const scopeLines = scopes === "none" || scopes.length === 0 ? [] : scopes.split(/\r?\n/);
+  const stale = scopeLines.filter((line) => /\sstale(\s|$)/.test(line)).length;
+  const livePids = scopeLines.flatMap((line) => {
+    const m = /\spids:([0-9 ]+)$/.exec(line);
+    if (m === null) return [];
+    return (m[1] ?? "").trim().split(/\s+/).filter((p) => p.length > 0);
+  });
   // ---- resident handshake --------------------------------------------------
   const agentScript = join(ROOT, "agent", "wsl-agent.sh");
   if (!agentScript.startsWith("/")) {
@@ -394,8 +403,11 @@ async function main(options) {
   } else {
     const handshake = await probeResident(distro, agentScript);
     if (handshake.ok) {
+      const live = livePids.length > 0
+        ? `; a live resident (pid${livePids.length > 1 ? "s" : ""} ${livePids.join(", ")}) is already running in this distro — this check starts a fresh one, which cannot read its last error`
+        : "";
       check("agent.handshake", handshake.digestMatches ? "ok" : "fail", "Agent handshake",
-        `pid ${handshake.pid}, protocol ${PROTOCOL_VERSION}, digest ${handshake.digestMatches ? "matches" : "MISMATCH — the distro reads a different script than this package"}`,
+        `pid ${handshake.pid}, protocol ${PROTOCOL_VERSION}, digest ${handshake.digestMatches ? "matches" : "MISMATCH — the distro reads a different script than this package"}${live}`,
         handshake.digestMatches ? undefined : "resync the runtime copy (pnpm run sync:windows), then restart the app");
     } else {
       check("agent.handshake", "fail", "Agent handshake", handshake.detail, "restart the DSH app; if it persists, delete ~/.cache/dsh-wsl/agent inside the distro and rerun the doctor");
@@ -403,13 +415,75 @@ async function main(options) {
   }
 
   // ---- stale session scopes ------------------------------------------------
-  const scopes = (await inDistro(distro, STALE_SCOPE_REPORT)).stdout.trim();
-  const scopeLines = scopes === "none" || scopes.length === 0 ? [] : scopes.split(/\r?\n/);
-  const stale = scopeLines.filter((line) => line.endsWith(" stale")).length;
   if (scopeLines.length === 0) check("runtime.scopes", "info", "Session scopes", "none (no user manager, or none left behind)");
   else if (stale === 0) check("runtime.scopes", "ok", "Session scopes", `${scopeLines.length} live, none stale`);
   else check("runtime.scopes", "warn", "Session scopes", `${stale} stale of ${scopeLines.length}`, "--fix stops them (the same sweep the session preflight runs); they are safe to stop when no agent process is inside");
 
+  // ---- sessions across running distros (WSL-309) ----------------------------
+  // The single-distro checks above answer "is this distro healthy?"; this
+  // survey answers "what is running right now, everywhere?" — the concurrent
+  // sessions coordinate routing makes possible, made visible. Idle timers are
+  // the host process's private state and stay out: a scope's presence and its
+  // resident pids are the facts the distro side can attest.
+  // The distro lists both surveys share: `run` settles an object
+  // ({ ok, stdout, code }); `-q` prints plain names, and the running list's
+  // header is dropped by the intersection with them. The default distro
+  // carries a localized marker ("ubuntu (默认值)" / "ubuntu (default)") —
+  // strip a trailing parenthesized note before the intersection.
+  const distroNames = ((await run([WSL, "--list", "-q"])).stdout ?? "").split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+  const running = ((await run([WSL, "--list", "--running"])).stdout ?? "").split(/\r?\n/).map((line) => line.trim().replace(/\s+\([^)]*\)$/, "")).filter((line) => distroNames.includes(line));
+  if (!options.json) {
+    console.log("");
+    console.log("sessions across running distros");
+    if (running.length === 0) {
+      console.log("  (none)");
+    } else {
+      for (const d of running) {
+        const report = (await inDistro(d, STALE_SCOPE_REPORT)).stdout.trim();
+        const lines = report === "none" || report.length === 0 ? [] : report.split(/\r?\n/);
+        if (report === "none") {
+          console.log(`  ${d}  no user manager — scopes unavailable`);
+          continue;
+        }
+        if (lines.length === 0) {
+          console.log(`  ${d}  no session scopes`);
+          continue;
+        }
+        for (const line of lines) {
+          const m = /^(\S+) (active|stale) pids:(.*)$/.exec(line);
+          if (m === null) { console.log(`  ${d}  ${line}`); continue; }
+          const scope = m[1] ?? line;
+          const state = m[2] ?? "";
+          const pidNote = m[3] === "none" ? "" : `  resident pids:${(m[3] ?? "").trim()}`;
+          console.log(`  ${d}  ${scope}  ${state}${pidNote}`);
+        }
+      }
+    }
+  }
+
+  // ---- listening ports across running distros (WSL-308) ----------------------
+  // The port poller serves the model's session (DSH_WSL_PORTS); this survey
+  // serves the human, with the two actions the facts imply: the localhost URL
+  // WSL2's forwarding already makes reachable, and the netsh line that would
+  // extend reach beyond the host (printed, never applied).
+  if (!options.json) {
+    const portScript = procNetScript();
+    let anyPorts = false;
+    for (const d of running) {
+      const answer = await inDistro(d, portScript);
+      const ports = parseListeningPorts(answer.stdout);
+      if (ports.length === 0) continue;
+      anyPorts = true;
+      const ip = ((await inDistro(d, "hostname -I")).stdout ?? "").trim().split(/\s+/)[0] ?? "";
+      console.log("");
+      console.log(`listening ports in ${d}`);
+      for (const port of ports) {
+        console.log(`  :${port}  http://localhost:${port}   (LAN: netsh interface portproxy add v4tov4 listenport=${port} listenaddress=0.0.0.0 connectport=${port} connectaddress=${ip})`);
+      }
+    }
+    if (!anyPorts && running.length > 0) console.log("\nno listening ports in the running distros");
+  }
+
   // ---- peers ---------------------------------------------------------------
   const manifest = /** @type {{ peerDependencies?: Record<string, string> }} */ (JSON.parse(readFileSync(join(ROOT, "package.json"), "utf8")));
   const peers = Object.entries(manifest.peerDependencies ?? {});
@@ -442,7 +516,7 @@ async function main(options) {
       if (/^\s*-\s*id:\s*(wsl-shell|wsl-fs)\s*$/m.test(text)) trapped.push(entry.name);
     }
     if (trapped.length > 0) {
-      check("config.preset-trap", "warn", "Profile patches", `nested rows patched by id in: ${trapped.join(", ")}`, "wsl-shell and wsl-fs live inside preset-wsl; an id patch matches nothing and is silently ignored. Run \"pnpm run preset -- --check <patch>\" to get the complete block, or see docs/CONFIGURATION.md#overriding-the-rows-inside-preset-wsl");
+      check("config.preset-trap", "warn", "Profile patches", `nested rows patched by id in: ${trapped.join(", ")}`, "wsl-shell and wsl-fs live inside preset-wsl; an id patch matches nothing and is ignored with a warning. Run \"pnpm run preset --check <patch>\" to get the complete block, or see docs/CONFIGURATION.md#configure-wsl-shell-and-wsl-fs");
     } else {
       check("config.profiles", "ok", "Profile patches", `${seen} profile patch(es) scanned`);
     }