dsh-plugin-wsl-env 0.6.0 → 0.7.2

package/lib/wsl.js

@@ -158,45 +158,6 @@ export async function linuxHome(distro, options = {}) {
  * @returns the canonical absolute Linux path, or undefined when it cannot be
  *   determined (missing file, broken link, or a failed query).
  */
-export async function canonicalLinuxPath(distro, linuxPath, options = {}) {
-  try {
-    const stdout = await runCapture(
-      [options.wslPath ?? DEFAULT_WSL_PATH, "-d", distro, "--exec", "readlink", "-f", linuxPath],
-      options.signal,
-    );
-    const resolved = stdout.trim();
-    return resolved.startsWith("/") ? resolved : undefined;
-  } catch {
-    return undefined;
-  }
-}
-
-/**
- * Give `targetLinux` the same POSIX mode `sourceLinux` has, inside the distro.
- *
- * The UNC share does not carry POSIX modes to the host: a host-side `chmod` on a
- * share path is silently ignored, and a host-side `stat` reports 0666 no matter
- * what the distro sees. The distro itself has the real mode, so the mode has to
- * be applied there — and because a rename preserves the inode's mode, applying
- * it to a staged temp file *before* publication is enough for the published file
- * to come out with the right bits.
- *
- * `stat` + `chmod` rather than `chmod --reference` keeps this working on distros
- * whose chmod is busybox's.
- *
- * @param distro - distro name.
- * @param sourceLinux - absolute Linux path whose mode is copied.
- * @param targetLinux - absolute Linux path that receives the mode.
- * @param options - the `wsl.exe` path and optional cancellation.
- * @throws when the mode cannot be applied.
- */
-export async function copyModeInDistro(distro, sourceLinux, targetLinux, options = {}) {
-  const script = 'if [ -e "$1" ]; then mode=$(stat -c %a "$1") && chmod "$mode" "$2"; fi';
-  await runCapture(
-    [options.wslPath ?? DEFAULT_WSL_PATH, "-d", distro, "--exec", "sh", "-c", script, "sh", sourceLinux, targetLinux],
-    options.signal,
-  );
-}
 
 /**
  * Shells known to accept the combined POSIX `-lc` login-plus-command form.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-wsl-env",
-  "version": "0.6.0",
+  "version": "0.7.2",
   "description": "让 DeepSeek Harness 以 WSL 子系统作为会话的执行环境：shell、文件读写与命令执行均在子系统内完成，目录选择器与 GUI 终端同样定位到子系统路径，并通过子系统内的 bubblewrap 对命令进行沙箱隔离",
   "keywords": [
     "deepseek-harness",
@@ -18,6 +18,8 @@
     "./fs": "./lib/fs.js",
     "./subprocess": "./lib/subprocess.js",
     "./picker": "./lib/picker.js",
+    "./workspace-files-wsl": "./lib/workspace-files-wsl.js",
+    "./fs-routing": "./lib/fs-routing.js",
     "./auto-preset": "./lib/auto-preset.js",
     "./shell-env": "./lib/shell-env.js",
     "./wsl": "./lib/wsl.js",
@@ -63,9 +65,9 @@
   ],
   "scripts": {
     "test": "npm run lint:style && npm run test:syntax && npm run test:unit",
-    "test:coverage": "node --test --experimental-test-coverage --test-coverage-lines=85 --test-coverage-branches=85 --test-coverage-functions=70 test/agent-exec.test.mjs test/agent-fs-script.test.mjs test/agent-protocol.test.mjs test/agent.test.mjs test/fs-publish.test.mjs test/fs-substrate.test.mjs test/fsio-agent.test.mjs test/listing.test.mjs test/paths.test.mjs test/ports.test.mjs test/preset-choice.test.mjs test/probe-cache.test.mjs test/sandbox.test.mjs test/shell.test.mjs test/terminal.test.mjs test/watcher.test.mjs test/wsl.test.mjs test/fs-decisions.test.mjs",
+    "test:coverage": "node --test --experimental-test-coverage --test-coverage-lines=85 --test-coverage-branches=85 --test-coverage-functions=70 test/agent-exec.test.mjs test/agent-fs-script.test.mjs test/agent-protocol.test.mjs test/agent.test.mjs test/fs-substrate.test.mjs test/fs.boot.test.mjs test/workspace-files-wsl.test.mjs test/composition.test.mjs test/fsio-agent.test.mjs test/fsio-text.test.mjs test/git-route.test.mjs test/listing.test.mjs test/paths.test.mjs test/ports.test.mjs test/preset-choice.test.mjs test/probe-cache.test.mjs test/sandbox.test.mjs test/search-exec.test.mjs test/search-route.test.mjs test/fs.boot.test.mjs test/shell.test.mjs test/terminal-activity.test.mjs test/terminal.test.mjs test/watcher.test.mjs test/wsl.test.mjs test/fs-decisions.test.mjs",
     "test:syntax": "node test/syntax.mjs",
-    "test:unit": "node --test test/paths.test.mjs test/listing.test.mjs test/shell.test.mjs test/terminal.test.mjs test/probe-cache.test.mjs test/preset-choice.test.mjs test/sandbox.test.mjs test/agent-protocol.test.mjs test/agent.test.mjs test/agent-fs-script.test.mjs test/fsio-agent.test.mjs test/fs-substrate.test.mjs test/fs-publish.test.mjs test/agent-exec.test.mjs test/ports.test.mjs test/watcher.test.mjs test/wsl.test.mjs test/fs-decisions.test.mjs",
+    "test:unit": "node --test test/fs.boot.test.mjs test/fsio-text.test.mjs test/workspace-files-wsl.test.mjs test/composition.test.mjs test/paths.test.mjs test/listing.test.mjs test/shell.test.mjs test/terminal.test.mjs test/probe-cache.test.mjs test/preset-choice.test.mjs test/sandbox.test.mjs test/agent-protocol.test.mjs test/agent.test.mjs test/agent-fs-script.test.mjs test/fsio-agent.test.mjs test/fs-substrate.test.mjs test/agent-exec.test.mjs test/ports.test.mjs test/watcher.test.mjs test/wsl.test.mjs test/fs-decisions.test.mjs test/git-route.test.mjs test/fsio-text.test.mjs test/search-route.test.mjs test/search-exec.test.mjs test/terminal-activity.test.mjs",
     "lint:style": "node test/style.mjs",
     "prepublishOnly": "npm test",
     "probe": "bash test/probe/run.sh",
@@ -103,6 +105,23 @@
   "bugs": {
     "url": "https://github.com/Big-Dao/dsh-plugin-wsl-env/issues"
   },
+  "devDependencies": {
+    "@deepseek-ai/cordis": "4.0.4",
+    "@deepseek-ai/cordis-plugin-include": "*",
+    "@deepseek-ai/cordis-plugin-loader": "*",
+    "@deepseek-ai/dsh-api-workspace-files": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-bash-local": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-fs": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-fs-local": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-fs-sandbox": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-host-directory-picker": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-sandbox": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-sandbox-policy": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-subprocess": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-subprocess-local": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-typert-protocol": "0.2.0-rc.2",
+    "js-yaml": "4.1.0"
+  },
   "peerDependencies": {
     "@deepseek-ai/cordis": "~4.0.4",
     "@deepseek-ai/dsh-bash-local": "0.2.0-rc.2",

package/lib/fs-publish.js

@@ -1,42 +0,0 @@
-/**
- * The in-distro publication step for `WslFileSystem.writeText`/`editText`.
- *
- * Today's publication is two round trips: `copyModeInDistro` (one `wsl.exe`
- * chmod) plus the staged file's rename over the 9p share. Under the resident
- * agent it collapses into ONE `exec`: a small POSIX shell step that copies the
- * replaced file's mode onto the staged temp (`chmod --reference`, skipped for
- * a creation, where there is nothing to copy from) and renames it into place
- * atomically — the rename preserving the inode's mode bits, exactly as the
- * old path arranged.
- *
- * Pure by construction: this module only builds the argv; execution and
- * fallback belong to the caller.
- *
- * @module dsh-plugin-wsl/fs-publish
- */
-
-/**
- * The publication script. `$1` is the target's Linux path (may not exist —
- * a creation), `$2` the staged temp's Linux path (always exists).
- * @returns {string} the `sh -c` body.
- */
-export function publicationScript() {
-  return [
-    // Creation: there is no source mode; the staged file keeps its umask mode,
-    // which is exactly what the old two-step path produced for new files.
-    'if [ -e "$1" ]; then',
-    '  chmod --reference="$1" "$2" || exit 3',
-    'fi',
-    'mv -f "$2" "$1" || exit 4',
-  ].join("\n");
-}
-
-/**
- * The argv to execute inside the distro for one publication.
- * @param {string} targetLinuxPath - the file being written.
- * @param {string} stagedLinuxPath - the staged temp holding the new content.
- * @returns {string[]} the argv, ready for the agent (or a one-shot `wsl.exe`).
- */
-export function publicationArgv(targetLinuxPath, stagedLinuxPath) {
-  return ["sh", "-c", publicationScript(), "publish", targetLinuxPath, stagedLinuxPath];
-}