@sparkelf/dsh-patch-wsl-native-open 0.2.0-rc.20 → 0.2.0-rc.22

package/package.json

@@ -4,11 +4,11 @@
     "formatVersion": 1,
     "variants": [
       {
-        "dsh": ">=0.1.6-alpha.1",
+        "dsh": ">=0.1.7-rc.1",
         "file": "./patches/wsl-native-open.patch",
         "id": "wsl-native-path-translation",
         "target": {
-          "baseRevision": "ddefc45fbc7f8e46dd73185e68295696d1297887",
+          "baseRevision": "46a7f68b0922371ce7144b668b90e377d8e799f4",
           "kind": "dsh-source",
           "paths": [
             "packages/host/open-in-app/",
@@ -32,5 +32,5 @@
     "url": "git+https://github.com/SparkElf/deepseek-harness-plus.git"
   },
   "type": "module",
-  "version": "0.2.0-rc.20"
+  "version": "0.2.0-rc.22"
 }

package/patches/wsl-native-open.patch

@@ -1,8 +1,8 @@
 diff --git a/packages/host/open-in-app/src/icons.ts b/packages/host/open-in-app/src/icons.ts
-index 6908ce795b..570dc45c96 100644
+index 4b07441c8c..519ba1344b 100644
 --- a/packages/host/open-in-app/src/icons.ts
 +++ b/packages/host/open-in-app/src/icons.ts
-@@ -97,6 +97,41 @@ const EXTRACT_ICON_PS1 = [
+@@ -98,6 +98,41 @@ const EXTRACT_ICON_PS1 = [
    '',
  ].join('\n')
  
@@ -44,7 +44,7 @@ index 6908ce795b..570dc45c96 100644
  /** Extract one Windows executable's associated icon as a 32px PNG. */
  async function extractExecutableIconPng(
    executablePath: string, timeoutMs: number, internals: ResolvedInternals,
-@@ -106,8 +141,12 @@ async function extractExecutableIconPng(
+@@ -107,8 +142,12 @@ async function extractExecutableIconPng(
      const script = join(workDir, 'extract-icon.ps1')
      const outPng = join(workDir, 'icon.png')
      await writeFile(script, EXTRACT_ICON_PS1, 'utf8')
@@ -58,7 +58,7 @@ index 6908ce795b..570dc45c96 100644
      ], timeoutMs, internals)
      if (ran === null) return null
      try {
-@@ -192,6 +231,13 @@ export async function extractAppIcon(
+@@ -148,6 +187,13 @@ export async function extractAppIcon(
  ): Promise<OpenInAppIcon | null> {
    const completed = resolveInternals(internals)
    if (completed.platform === 'linux') {
@@ -73,10 +73,10 @@ index 6908ce795b..570dc45c96 100644
      return desktopId === undefined ? null : extractLinuxIcon(desktopId, completed)
    }
 diff --git a/packages/host/open-in-app/src/resolver.ts b/packages/host/open-in-app/src/resolver.ts
-index 7ab964b4fd..8ea7318975 100644
+index 970118e22a..ad8d176da4 100644
 --- a/packages/host/open-in-app/src/resolver.ts
 +++ b/packages/host/open-in-app/src/resolver.ts
-@@ -14,10 +14,10 @@
+@@ -14,10 +14,11 @@
  
  import { spawn } from 'node:child_process'
  import { readdir, readFile, stat } from 'node:fs/promises'
@@ -84,12 +84,13 @@ index 7ab964b4fd..8ea7318975 100644
 +import { homedir, release as osRelease, platform as osPlatform } from 'node:os'
  import { dirname, isAbsolute, join } from 'node:path'
  import {
--  canOpenNativePath, openNativePath, runNativeCommand, type NativeCommandRunner,
-+  canOpenLinuxDesktop, canOpenNativePath, openNativePath, runNativeCommand, type NativeCommandRunner,
+-  canOpenNativePath, openNativePath, runNativeCommand, desktopEntryFields, desktopDataDirectories, type NativeCommandRunner,
++  canOpenLinuxDesktop, canOpenNativePath, openNativePath, runNativeCommand,
++  desktopEntryFields, desktopDataDirectories, type NativeCommandRunner,
  } from '@deepseek-ai/dsh-native-command'
  import { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess'
  import {
-@@ -98,6 +98,8 @@ export const launchDetachedApp: OpenInAppLauncher = (command, args, options) =>
+@@ -98,6 +99,8 @@ export const launchDetachedApp: OpenInAppLauncher = (command, args, options) =>
  /** Injectable platform facts for deterministic tests. */
  export interface OpenInAppInternals {
    platform?: NodeJS.Platform
@@ -98,7 +99,7 @@ index 7ab964b4fd..8ea7318975 100644
    /** SSH launch fact from the inherited process layer, independent of `.env` values. */
    ssh?: boolean
    /** Bundle-directory roots replacing `/Applications` and `~/Applications`. */
-@@ -115,6 +117,7 @@ export interface OpenInAppInternals {
+@@ -115,6 +118,7 @@ export interface OpenInAppInternals {
  /** Platform facts after the one explicit defaulting step at each public entry. */
  export interface ResolvedInternals {
    platform: NodeJS.Platform
@@ -106,7 +107,7 @@ index 7ab964b4fd..8ea7318975 100644
    ssh: boolean
    applicationRoots: readonly string[]
    env: Readonly<Record<string, string | undefined>>
-@@ -140,6 +143,7 @@ export function resolveInternals(internals: OpenInAppInternals): ResolvedInterna
+@@ -140,6 +144,7 @@ export function resolveInternals(internals: OpenInAppInternals): ResolvedInterna
    }
    return {
      platform: internals.platform ?? osPlatform(),
@@ -114,7 +115,7 @@ index 7ab964b4fd..8ea7318975 100644
      ssh: internals.ssh ?? false,
      applicationRoots: internals.applicationRoots ?? ['/Applications', join(home, 'Applications')],
      env: internals.env ?? process.env,
-@@ -467,6 +471,14 @@ export function specFor(app: OpenInAppApp, platform: NodeJS.Platform): OpenInApp
+@@ -453,6 +458,14 @@ export function specFor(app: OpenInAppApp, platform: NodeJS.Platform): OpenInApp
      : undefined
  }
  
@@ -129,7 +130,7 @@ index 7ab964b4fd..8ea7318975 100644
  /** Icon source for a resolved executable: Windows extracts from the binary itself. */
  function executableIcon(path: string, internals: ResolvedInternals): OpenInAppIconSource | undefined {
    return internals.platform === 'win32' ? { kind: 'executable', path } : undefined
-@@ -518,10 +530,29 @@ async function locate(
+@@ -504,10 +517,29 @@ async function locate(
        }
      }
      case 'cli': {
@@ -164,7 +165,7 @@ index 7ab964b4fd..8ea7318975 100644
        return found === null
          ? null
 diff --git a/packages/util/native-command/src/index.ts b/packages/util/native-command/src/index.ts
-index a2e23a35be..f1ea7c6233 100644
+index 9ad8e0883c..3377ddcb6f 100644
 --- a/packages/util/native-command/src/index.ts
 +++ b/packages/util/native-command/src/index.ts
 @@ -6,6 +6,7 @@
@@ -176,21 +177,13 @@ index a2e23a35be..f1ea7c6233 100644
    nativeFileManager,
    revealNativePath,
 diff --git a/packages/util/native-command/src/path-opener.ts b/packages/util/native-command/src/path-opener.ts
-index 8f3443b3c1..3962fd8523 100644
+index 67bbc35902..dd062cc003 100644
 --- a/packages/util/native-command/src/path-opener.ts
 +++ b/packages/util/native-command/src/path-opener.ts
-@@ -11,7 +11,6 @@
- 
- import { release as osRelease } from 'node:os'
- import { dirname, extname } from 'node:path'
--import { pathToFileURL } from 'node:url'
- import { runNativeCommand, type NativeCommandRunner } from './runner.ts'
- 
- /** Testable command boundary; native implementations never invoke a shell. */
-@@ -99,13 +98,49 @@ function isWsl(internals: PathOpenerInternals): boolean {
-   return (internals.osRelease ?? osRelease()).toLowerCase().includes('microsoft')
- }
- 
+@@ -150,8 +150,55 @@ async function runExplorer(args: readonly string[], signal: AbortSignal, run: Pa
+  * @param signal - caller lifetime; abort terminates the command.
+  * @param run - shell-free command runner.
+  */
 +/**
 + * Windows PowerShell locations to try when PATH carries no Windows entry.
 + *
@@ -200,37 +193,42 @@ index 8f3443b3c1..3962fd8523 100644
 + * the volume the distribution mounts, and naming it there is what keeps the Windows
 + * desktop reachable from those processes.
 + */
-+const WINDOWS_POWERSHELL_CANDIDATES = [
-+  '/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe',
-+  '/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe',
++const WINDOWS_EXPLORER_CANDIDATES = [
++  '/mnt/c/Windows/explorer.exe',
++  '/c/Windows/explorer.exe',
 +] as const
 +
- /** Open one Windows-resolvable path through its registered desktop application. */
++/**
++ * Open one Windows-resolvable path through its registered desktop application.
++ *
++ * Explorer resolves the association, but a process whose PATH lost its Windows entries
++ * cannot name the shell. WSL injects those entries only for the processes it starts
++ * interactively, so a service or scheduled job resolves nothing by name; naming the
++ * shell on the volume the distribution mounts keeps the Windows desktop reachable.
++ * @param path - Windows-resolvable path.
++ * @param signal - caller lifetime; abort terminates the command.
++ * @param run - shell-free command runner.
++ */
  async function openWindowsPath(path: string, signal: AbortSignal, run: PathOpenerRunner): Promise<void> {
--  await run('powershell.exe', [
-+  const args = [
-     '-NoProfile',
-     '-Command',
-     `Invoke-Item -LiteralPath ${powershellLiteral(path)}`,
--  ], signal)
-+  ]
+-  await runExplorer([explorerTarget(path)], signal, run)
++  const target = explorerTarget(path)
 +  try {
-+    await run('powershell.exe', args, signal)
++    await runExplorer([target], signal, run)
 +    return
 +  } catch (error) {
-+    // A missing executable is the one failure a mounted path can answer; a non-zero
-+    // exit from PowerShell itself is a real launch failure and must stay reported.
++    // A missing executable is the one failure a mounted path can answer; any other
++    // failure is Explorer's own and must stay reported.
 +    if (!isMissingExecutable(error)) throw error
 +  }
-+  for (const candidate of WINDOWS_POWERSHELL_CANDIDATES) {
++  for (const candidate of WINDOWS_EXPLORER_CANDIDATES) {
 +    try {
-+      await run(candidate, args, signal)
++      await run(candidate, [target], signal)
 +      return
 +    } catch (error) {
 +      if (!isMissingExecutable(error)) throw error
 +    }
 +  }
-+  throw new Error('Windows PowerShell is not reachable from this WSL mount')
++  throw new Error('Windows Explorer is not reachable from this WSL mount')
 +}
 +
 +/** Whether a spawn failed because the executable could not be found at all. */
@@ -239,7 +237,7 @@ index 8f3443b3c1..3962fd8523 100644
  }
  
  /** Translate a WSL path before handing it to the Windows desktop. */
-@@ -154,6 +189,25 @@ async function openNativePathWithIntent(
+@@ -200,6 +247,25 @@ async function openNativePathWithIntent(
    throw new Error(`native path opener is unsupported on ${platform}`)
  }
  
@@ -265,20 +263,3 @@ index 8f3443b3c1..3962fd8523 100644
  /**
   * Whether {@link openNativePath} plausibly reaches a desktop on this host.
   *
-@@ -244,10 +298,13 @@ export async function revealNativePath(
-       windowsPath = translated.stdout.replace(/[\r\n]+$/, '')
-       if (windowsPath === '') throw new Error('wslpath returned no Windows path')
-     }
--    // Explorer parses commas itself; a file URI preserves commas and whitespace in the path.
--    const target = pathToFileURL(windowsPath, { windows: true }).href.replaceAll(',', '%2C')
-+    // Explorer takes the path itself: `wslpath -w` already produced the spelling it reads.
-+    // A `file://` URL is not interchangeable here — a percent-encoded non-ASCII path (a CJK
-+    // directory such as 题库) fails to resolve, and Explorer then opens its default location
-+    // instead of selecting the file. Measured with a directory it had never opened: the native
-+    // path selected 子目录/测试文件.txt, the URL form changed nothing.
-     try {
--      await run('explorer.exe', ['/select,', target], signal)
-+      await run('explorer.exe', ['/select,', windowsPath], signal)
-     } catch (error) {
-       signal.throwIfAborted()
-       // Explorer can exit 1 after delegating to the existing desktop process.