dsh-wsl-workspace 0.3.0 → 0.3.2

package/src/index.ts

@@ -34,6 +34,7 @@ import { joinUnc, mntToWindowsPath, normalizeLinuxPath, isAbsoluteLinuxPath, isV
 import { canonicalWslUnc, getWindowsWorkspace, getWorkspaceUsername, listWorkspaceKeys, registerWindowsWorkspace, setWorkspaceUsername } from './shared/wsl-credentials.ts'
 import { defaultDistro, listDistros } from './shared/wsl.ts'
 import { isWslVariantId, transformPresetForWsl, variantIdFor } from './host/variants.ts'
+import { WslSkillsProvider, type WslSkillsRegistryFace } from './host/wsl-skills.ts'
 
 /** The HTTP route this plugin serves (a relative, same-origin path). */
 export const DEFAULT_ROUTE = '/wsl-workspace/api'
@@ -448,6 +449,20 @@ export function apply(ctx: Context, config: Config): void {
     }, 'dsh-wsl-workspace: WSL preset variants')
   }
 
+  const skills = ctx.get('skills') as unknown as WslSkillsRegistryFace | undefined
+  if (skills !== undefined && typeof skills.registerProvider === 'function') {
+    // The shipped skill-filesystem provider scans only the session cwd's
+    // project root, so WSL workspaces whose `.dsh/skills` live in nested
+    // projects would show an empty skill catalog. This provider mirrors the
+    // host's project discovery for WSL UNC workspaces, bounded to the
+    // workspace root (issue #10). The method check keeps a host whose
+    // `skills` service exists with a different shape from breaking plugin
+    // load; the provider is an enhancement, never a load-time requirement.
+    ctx.effect(() => skills.registerProvider(
+      control => new WslSkillsProvider(control),
+    ), 'dsh-wsl-workspace: WSL workspace skills provider')
+  }
+
   const shellEnv = ctx.get('shellEnv') as unknown as ShellEnvService | undefined
   if (shellEnv !== undefined) {
     ctx.effect(() => shellEnv.register({

package/lib/paths-BDE1NVOv.js

@@ -1,120 +0,0 @@
-//#region src/shared/paths.ts
-/** The two UNC hosts WSL exposes a distribution's filesystem under. */
-const UNC_HOSTS = ["wsl.localhost", "wsl$"];
-/**
-* Parse a WSL UNC path into its distro and Linux path. Accepts the WSL2
-* `\\wsl.localhost\<distro>\<linux>` form, the legacy `\\wsl$\<distro>\<linux>`
-* interop form, and forward-slash spellings of either.
-* @param raw - candidate absolute path.
-* @returns the parsed target, or null when the path is not a WSL UNC.
-*/
-function parseWslUnc(raw) {
-	const normalized = raw.replace(/\\/g, "/").replace(/\/\/+/g, "//");
-	if (!normalized.startsWith("//")) return null;
-	const segments = normalized.slice(2).split("/");
-	const host = (segments[0] ?? "").toLowerCase();
-	if (!UNC_HOSTS.includes(host)) return null;
-	const distro = segments[1] ?? "";
-	if (distro === "") return null;
-	return {
-		distro,
-		linuxPath: `/${segments.slice(2).filter((segment) => segment.length > 0).join("/")}`
-	};
-}
-/**
-* Normalize a Linux absolute path for the Host: collapse repeated slashes and
-* strip a trailing slash (root becomes `/`).
-* @param path - absolute Linux path.
-* @returns the normalized path.
-*/
-function normalizeLinuxPath(path) {
-	const collapsed = path.replace(/\/+/g, "/");
-	return collapsed === "/" ? "/" : collapsed.replace(/\/$/, "");
-}
-/**
-* Whether a path is an absolute, non-empty Linux path.
-* @param path - candidate.
-* @returns whether it starts with `/` and contains no NUL.
-*/
-function isAbsoluteLinuxPath(path) {
-	return path.startsWith("/") && !path.includes("\0");
-}
-/**
-* Join a distro and a Linux absolute path into the WSL2 UNC form used as the
-* workspace identity (`\\wsl.localhost\<distro>\<linux>`, backslash segments).
-* @param distro - distro name.
-* @param linuxPath - absolute Linux path (leading `/`).
-* @returns the UNC path.
-*/
-function joinUnc(distro, linuxPath) {
-	if (!isAbsoluteLinuxPath(linuxPath)) throw new Error(`wsl-workspace: cannot map a non-absolute Linux path "${linuxPath}" to UNC`);
-	if (distro === "" || distro === "." || distro === ".." || /[\\/]/.test(distro)) throw new Error(`wsl-workspace: invalid distribution name "${distro}"`);
-	const normalized = linuxPath.replace(/\/+/g, "/").replace(/\/$/, "");
-	const windowsSegments = (normalized.startsWith("/") ? normalized.slice(1) : normalized).replace(/\//g, "\\");
-	return `\\\\wsl.localhost\\${distro}${windowsSegments === "" ? "" : `\\${windowsSegments}`}`;
-}
-/**
-* Translate a Windows drive path to the drvfs mount path WSL distributions
-* conventionally expose it at (`C:\foo` → `/mnt/c/foo`). Only single-letter
-* drives under `/mnt` are mapped; custom mount points are out of scope.
-* @param path - the candidate Windows path.
-* @returns the `/mnt/<drive>/…` path, or `null` for non-drive paths.
-*/
-function windowsToMntPath(path) {
-	const match = /^([A-Za-z]):[\\/](.*)$/.exec(path);
-	if (match === null) return null;
-	const rest = (match[2] ?? "").replace(/\\/g, "/").replace(/\/+/g, "/").replace(/\/$/, "");
-	return `/mnt/${(match[1] ?? "").toLowerCase()}${rest === "" ? "" : `/${rest}`}`;
-}
-/**
-* Translate a `/mnt/<drive>/…` path back to its Windows drive path.
-* @param linuxPath - the candidate Linux path.
-* @returns the `X:\…` drive path, or `null` when the path is not a drvfs mount.
-*/
-function mntToWindowsPath(linuxPath) {
-	const match = /^\/mnt\/([a-zA-Z])(?:\/(.*))?$/.exec(linuxPath);
-	if (match === null) return null;
-	const rest = (match[2] ?? "").replace(/\//g, "\\");
-	return `${(match[1] ?? "").toUpperCase()}:\\${rest}`;
-}
-/**
-* Canonical Windows drive path for store keys and cross-realm identity:
-* separators unified to `\`, trailing separator stripped, and the WHOLE path
-* lowercased — Windows paths compare case-insensitively, and the workspace
-* registry may realpath a different casing than the caller spelled (8.3 or
-* on-disk casing), so the store key must collide across casings.
-* @param path - candidate Windows drive path.
-* @returns the canonical form, or `null` when not drive-shaped.
-*/
-function canonicalWindowsPath(path) {
-	const match = /^([A-Za-z]):[\\/](.*)$/.exec(path);
-	if (match === null) return null;
-	const rest = (match[2] ?? "").replace(/[\\/]+/g, "\\").replace(/\\$/, "").toLowerCase();
-	return `${(match[1] ?? "").toLowerCase()}:\\${rest}`;
-}
-/**
-* True when a value is a Windows-shaped path (drive or UNC), which is how
-* the shell executor decides the WSLENV `/p` translation flag: only Windows
-* path values need translation when they cross into the Linux process.
-* @param value - the environment value to classify.
-* @returns whether the value looks like a Windows path.
-*/
-function isWindowsPathShaped(value) {
-	return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith("\\\\");
-}
-/** Linux username shape for `wsl.exe -u`: starts with a letter or underscore, then letters/digits/`_`/`.`/`-` (max 64). */
-const WSL_USERNAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_.-]{0,63}$/;
-/**
-* Whether a value is a safe Linux username for `wsl.exe -u`. The check is
-* strict on purpose: a value starting with `-` could be parsed as a wsl.exe
-* option instead of a username.
-* @param value - candidate username.
-* @returns whether it matches the Linux username shape.
-*/
-function isValidWslUsername(value) {
-	return WSL_USERNAME_PATTERN.test(value);
-}
-//#endregion
-export { joinUnc as a, parseWslUnc as c, isWindowsPathShaped as i, windowsToMntPath as l, isAbsoluteLinuxPath as n, mntToWindowsPath as o, isValidWslUsername as r, normalizeLinuxPath as s, canonicalWindowsPath as t };
-
-//# sourceMappingURL=paths-BDE1NVOv.js.map

package/lib/paths-BDE1NVOv.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"paths-BDE1NVOv.js","names":[],"sources":["../src/shared/paths.ts"],"sourcesContent":["/**\r\n * WSL path helpers shared by the client and host halves. Pure and\r\n * dependency-free so both planes can import them without a runtime edge.\r\n */\r\n\r\n/** WSL2 default loopback bridge host: `\\\\wsl.localhost\\<distro>\\...`. */\r\nconst WSL_LOCALHOST_HOST = 'wsl.localhost'\r\n/** Legacy WSL interop host: `\\\\wsl$\\<distro>\\...`. */\r\nconst WSL_LEGACY_HOST = 'wsl$'\r\n\r\n/** The two UNC hosts WSL exposes a distribution's filesystem under. */\r\nconst UNC_HOSTS = [WSL_LOCALHOST_HOST, WSL_LEGACY_HOST]\r\n\r\n/** One WSL workspace coordinate parsed out of a UNC path. */\r\nexport interface WslUncTarget {\r\n  /** Distro name (e.g. `Ubuntu`) as `wsl -l -q` reports it. */\r\n  readonly distro: string\r\n  /** Normalized absolute Linux path (leading `/`; no trailing slash except root). */\r\n  readonly linuxPath: string\r\n}\r\n\r\n/**\r\n * Parse a WSL UNC path into its distro and Linux path. Accepts the WSL2\r\n * `\\\\wsl.localhost\\<distro>\\<linux>` form, the legacy `\\\\wsl$\\<distro>\\<linux>`\r\n * interop form, and forward-slash spellings of either.\r\n * @param raw - candidate absolute path.\r\n * @returns the parsed target, or null when the path is not a WSL UNC.\r\n */\r\nexport function parseWslUnc(raw: string): WslUncTarget | null {\r\n  const normalized = raw.replace(/\\\\/g, '/').replace(/\\/\\/+/g, '//')\r\n  if (!normalized.startsWith('//')) return null\r\n  const segments = normalized.slice(2).split('/')\r\n  const host = (segments[0] ?? '').toLowerCase()\r\n  if (!UNC_HOSTS.includes(host)) return null\r\n  const distro = segments[1] ?? ''\r\n  if (distro === '') return null\r\n  const rest = segments.slice(2).filter(segment => segment.length > 0)\r\n  return { distro, linuxPath: `/${rest.join('/')}` }\r\n}\r\n\r\n/**\r\n * Whether a path resolves into a WSL distro through either UNC form.\r\n * @param raw - candidate absolute path.\r\n * @returns whether the path parses as a WSL UNC.\r\n */\r\nexport function isWslUnc(raw: string): boolean {\r\n  return parseWslUnc(raw) !== null\r\n}\r\n\r\n/**\r\n * Translate a WSL UNC path to the absolute Linux path a process inside the\r\n * distribution can open. Throws on non-WSL input: callers rely on this\r\n * conversion to hand paths to the Linux world, so a silent pass-through\r\n * would hand a Windows path to bash.\r\n * @param uncPath - a path {@link parseWslUnc} accepts.\r\n * @returns the absolute Linux path.\r\n */\r\nexport function uncToLinux(uncPath: string): string {\r\n  const parts = parseWslUnc(uncPath)\r\n  if (parts === null) {\r\n    throw new Error(`wsl-workspace: \"${uncPath}\" is not a WSL UNC path`)\r\n  }\r\n  return parts.linuxPath\r\n}\r\n\r\n/**\r\n * Normalize a Linux absolute path for the Host: collapse repeated slashes and\r\n * strip a trailing slash (root becomes `/`).\r\n * @param path - absolute Linux path.\r\n * @returns the normalized path.\r\n */\r\nexport function normalizeLinuxPath(path: string): string {\r\n  const collapsed = path.replace(/\\/+/g, '/')\r\n  return collapsed === '/' ? '/' : collapsed.replace(/\\/$/, '')\r\n}\r\n\r\n/**\r\n * Whether a path is an absolute, non-empty Linux path.\r\n * @param path - candidate.\r\n * @returns whether it starts with `/` and contains no NUL.\r\n */\r\nexport function isAbsoluteLinuxPath(path: string): boolean {\r\n  return path.startsWith('/') && !path.includes('\\0')\r\n}\r\n\r\n/**\r\n * Join a distro and a Linux absolute path into the WSL2 UNC form used as the\r\n * workspace identity (`\\\\wsl.localhost\\<distro>\\<linux>`, backslash segments).\r\n * @param distro - distro name.\r\n * @param linuxPath - absolute Linux path (leading `/`).\r\n * @returns the UNC path.\r\n */\r\nexport function joinUnc(distro: string, linuxPath: string): string {\r\n  if (!isAbsoluteLinuxPath(linuxPath)) {\r\n    throw new Error(`wsl-workspace: cannot map a non-absolute Linux path \"${linuxPath}\" to UNC`)\r\n  }\r\n  // Defense in depth: a distribution name with separators or dot-dirs would\r\n  // escape the `\\\\wsl.localhost\\` share structure (the host route validates\r\n  // wire-supplied names too; every other caller passes through here).\r\n  if (distro === '' || distro === '.' || distro === '..' || /[\\\\/]/.test(distro)) {\r\n    throw new Error(`wsl-workspace: invalid distribution name \"${distro}\"`)\r\n  }\r\n  const normalized = linuxPath.replace(/\\/+/g, '/').replace(/\\/$/, '')\r\n  const withoutLeading = normalized.startsWith('/') ? normalized.slice(1) : normalized\r\n  const windowsSegments = withoutLeading.replace(/\\//g, '\\\\')\r\n  const suffix = windowsSegments === '' ? '' : `\\\\${windowsSegments}`\r\n  return `\\\\\\\\wsl.localhost\\\\${distro}${suffix}`\r\n}\r\n\r\n/**\r\n * Translate a Windows drive path to the drvfs mount path WSL distributions\r\n * conventionally expose it at (`C:\\foo` → `/mnt/c/foo`). Only single-letter\r\n * drives under `/mnt` are mapped; custom mount points are out of scope.\r\n * @param path - the candidate Windows path.\r\n * @returns the `/mnt/<drive>/…` path, or `null` for non-drive paths.\r\n */\r\nexport function windowsToMntPath(path: string): string | null {\r\n  const match = /^([A-Za-z]):[\\\\/](.*)$/.exec(path)\r\n  if (match === null) return null\r\n  const rest = (match[2] ?? '').replace(/\\\\/g, '/').replace(/\\/+/g, '/').replace(/\\/$/, '')\r\n  return `/mnt/${(match[1] ?? '').toLowerCase()}${rest === '' ? '' : `/${rest}`}`\r\n}\r\n\r\n/**\r\n * Translate a `/mnt/<drive>/…` path back to its Windows drive path.\r\n * @param linuxPath - the candidate Linux path.\r\n * @returns the `X:\\…` drive path, or `null` when the path is not a drvfs mount.\r\n */\r\nexport function mntToWindowsPath(linuxPath: string): string | null {\r\n  const match = /^\\/mnt\\/([a-zA-Z])(?:\\/(.*))?$/.exec(linuxPath)\r\n  if (match === null) return null\r\n  const rest = (match[2] ?? '').replace(/\\//g, '\\\\')\r\n  return `${(match[1] ?? '').toUpperCase()}:\\\\${rest}`\r\n}\r\n\r\n/**\r\n * Canonical Windows drive path for store keys and cross-realm identity:\r\n * separators unified to `\\`, trailing separator stripped, and the WHOLE path\r\n * lowercased — Windows paths compare case-insensitively, and the workspace\r\n * registry may realpath a different casing than the caller spelled (8.3 or\r\n * on-disk casing), so the store key must collide across casings.\r\n * @param path - candidate Windows drive path.\r\n * @returns the canonical form, or `null` when not drive-shaped.\r\n */\r\nexport function canonicalWindowsPath(path: string): string | null {\r\n  const match = /^([A-Za-z]):[\\\\/](.*)$/.exec(path)\r\n  if (match === null) return null\r\n  const rest = (match[2] ?? '').replace(/[\\\\/]+/g, '\\\\').replace(/\\\\$/, '').toLowerCase()\r\n  return `${(match[1] ?? '').toLowerCase()}:\\\\${rest}`\r\n}\r\n\r\n/**\r\n * True when a value is a Windows-shaped path (drive or UNC), which is how\r\n * the shell executor decides the WSLENV `/p` translation flag: only Windows\r\n * path values need translation when they cross into the Linux process.\r\n * @param value - the environment value to classify.\r\n * @returns whether the value looks like a Windows path.\r\n */\r\nexport function isWindowsPathShaped(value: string): boolean {\r\n  return /^[A-Za-z]:[\\\\/]/.test(value) || value.startsWith('\\\\\\\\')\r\n}\r\n\r\n/** Linux username shape for `wsl.exe -u`: starts with a letter or underscore, then letters/digits/`_`/`.`/`-` (max 64). */\r\nconst WSL_USERNAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_.-]{0,63}$/\r\n\r\n/**\r\n * Whether a value is a safe Linux username for `wsl.exe -u`. The check is\r\n * strict on purpose: a value starting with `-` could be parsed as a wsl.exe\r\n * option instead of a username.\r\n * @param value - candidate username.\r\n * @returns whether it matches the Linux username shape.\r\n */\r\nexport function isValidWslUsername(value: string): boolean {\r\n  return WSL_USERNAME_PATTERN.test(value)\r\n}\r\n"],"mappings":";;AAWA,MAAM,YAAY,CAAC,iBAAoB,MAAe;;;;;;;;AAiBtD,SAAgB,YAAY,KAAkC;CAC5D,MAAM,aAAa,IAAI,QAAQ,OAAO,GAAG,CAAC,CAAC,QAAQ,UAAU,IAAI;CACjE,IAAI,CAAC,WAAW,WAAW,IAAI,GAAG,OAAO;CACzC,MAAM,WAAW,WAAW,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG;CAC9C,MAAM,QAAQ,SAAS,MAAM,GAAA,CAAI,YAAY;CAC7C,IAAI,CAAC,UAAU,SAAS,IAAI,GAAG,OAAO;CACtC,MAAM,SAAS,SAAS,MAAM;CAC9B,IAAI,WAAW,IAAI,OAAO;CAE1B,OAAO;EAAE;EAAQ,WAAW,IADf,SAAS,MAAM,CAAC,CAAC,CAAC,QAAO,YAAW,QAAQ,SAAS,CAC/B,CAAC,CAAC,KAAK,GAAG;CAAI;AACnD;;;;;;;AAiCA,SAAgB,mBAAmB,MAAsB;CACvD,MAAM,YAAY,KAAK,QAAQ,QAAQ,GAAG;CAC1C,OAAO,cAAc,MAAM,MAAM,UAAU,QAAQ,OAAO,EAAE;AAC9D;;;;;;AAOA,SAAgB,oBAAoB,MAAuB;CACzD,OAAO,KAAK,WAAW,GAAG,KAAK,CAAC,KAAK,SAAS,IAAI;AACpD;;;;;;;;AASA,SAAgB,QAAQ,QAAgB,WAA2B;CACjE,IAAI,CAAC,oBAAoB,SAAS,GAChC,MAAM,IAAI,MAAM,wDAAwD,UAAU,SAAS;CAK7F,IAAI,WAAW,MAAM,WAAW,OAAO,WAAW,QAAQ,QAAQ,KAAK,MAAM,GAC3E,MAAM,IAAI,MAAM,6CAA6C,OAAO,EAAE;CAExE,MAAM,aAAa,UAAU,QAAQ,QAAQ,GAAG,CAAC,CAAC,QAAQ,OAAO,EAAE;CAEnE,MAAM,mBADiB,WAAW,WAAW,GAAG,IAAI,WAAW,MAAM,CAAC,IAAI,WAAA,CACnC,QAAQ,OAAO,IAAI;CAE1D,OAAO,sBAAsB,SADd,oBAAoB,KAAK,KAAK,KAAK;AAEpD;;;;;;;;AASA,SAAgB,iBAAiB,MAA6B;CAC5D,MAAM,QAAQ,yBAAyB,KAAK,IAAI;CAChD,IAAI,UAAU,MAAM,OAAO;CAC3B,MAAM,QAAQ,MAAM,MAAM,GAAA,CAAI,QAAQ,OAAO,GAAG,CAAC,CAAC,QAAQ,QAAQ,GAAG,CAAC,CAAC,QAAQ,OAAO,EAAE;CACxF,OAAO,SAAS,MAAM,MAAM,GAAA,CAAI,YAAY,IAAI,SAAS,KAAK,KAAK,IAAI;AACzE;;;;;;AAOA,SAAgB,iBAAiB,WAAkC;CACjE,MAAM,QAAQ,iCAAiC,KAAK,SAAS;CAC7D,IAAI,UAAU,MAAM,OAAO;CAC3B,MAAM,QAAQ,MAAM,MAAM,GAAA,CAAI,QAAQ,OAAO,IAAI;CACjD,OAAO,IAAI,MAAM,MAAM,GAAA,CAAI,YAAY,EAAE,KAAK;AAChD;;;;;;;;;;AAWA,SAAgB,qBAAqB,MAA6B;CAChE,MAAM,QAAQ,yBAAyB,KAAK,IAAI;CAChD,IAAI,UAAU,MAAM,OAAO;CAC3B,MAAM,QAAQ,MAAM,MAAM,GAAA,CAAI,QAAQ,WAAW,IAAI,CAAC,CAAC,QAAQ,OAAO,EAAE,CAAC,CAAC,YAAY;CACtF,OAAO,IAAI,MAAM,MAAM,GAAA,CAAI,YAAY,EAAE,KAAK;AAChD;;;;;;;;AASA,SAAgB,oBAAoB,OAAwB;CAC1D,OAAO,kBAAkB,KAAK,KAAK,KAAK,MAAM,WAAW,MAAM;AACjE;;AAGA,MAAM,uBAAuB;;;;;;;;AAS7B,SAAgB,mBAAmB,OAAwB;CACzD,OAAO,qBAAqB,KAAK,KAAK;AACxC"}