Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(subprocess): absolutize relative PATH lookups

Browse Source
This commit is contained in:
Tianyi Cui
2026-07-29 03:45:06 +08:00
parent a0200376a1
commit 03f1c8eb43
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/subprocess/subprocess-local/src/index.ts
View File

@@ -11,7 +11,7 @@ import { constants } from 'node:fs'
import { mkdtempSync } from 'node:fs' import { mkdtempSync } from 'node:fs'
import { access, rm, stat } from 'node:fs/promises' import { access, rm, stat } from 'node:fs/promises'
import { tmpdir } from 'node:os' import { tmpdir } from 'node:os'
import { delimiter, extname, isAbsolute, join } from 'node:path' import { delimiter, extname, isAbsolute, join, resolve } from 'node:path'
import { Context } from 'cordis' import { Context } from 'cordis'
import * as nodePty from 'node-pty' import * as nodePty from 'node-pty'
import type { IPtyForkOptions } from 'node-pty' import type { IPtyForkOptions } from 'node-pty'
@@ -107,7 +107,7 @@ export class LocalSubprocessService extends SubprocessService {
? (env.PATHEXT ?? '.COM;.EXE;.BAT;.CMD').split(';') ? (env.PATHEXT ?? '.COM;.EXE;.BAT;.CMD').split(';')
: [''] : ['']
return path.split(delimiter).flatMap(directory => return path.split(delimiter).flatMap(directory =>
directory === '' ? [] : extensions.map(extension => join(directory, command + extension))) directory === '' ? [] : extensions.map(extension => resolve(this.cwd, directory, command + extension)))
} }
spawn(spec: SubprocessSpawnSpec): SubprocessHandle { spawn(spec: SubprocessSpawnSpec): SubprocessHandle {

5
packages/subprocess/subprocess-local/tests/local.spec.ts
View File

@@ -1,7 +1,7 @@
import { PassThrough } from 'node:stream' import { PassThrough } from 'node:stream'
import { describe, expect, it, vi } from 'vitest' import { describe, expect, it, vi } from 'vitest'
import { stat } from 'node:fs/promises' import { stat } from 'node:fs/promises'
import { basename, delimiter, dirname } from 'node:path' import { basename, delimiter, dirname, relative } from 'node:path'
import { Context } from 'cordis' import { Context } from 'cordis'
import LocalSubprocessService from '@deepseek-ai/dsh-subprocess-local' import LocalSubprocessService from '@deepseek-ai/dsh-subprocess-local'
import type { SubprocessSpawnSpec, SubprocessTerminalHandle, SubprocessTerminalSpawnSpec } from '@deepseek-ai/dsh-subprocess' import type { SubprocessSpawnSpec, SubprocessTerminalHandle, SubprocessTerminalSpawnSpec } from '@deepseek-ai/dsh-subprocess'
@@ -38,6 +38,9 @@ describe('LocalSubprocessService', () => {
expect(await ctx.subprocess.resolveExecutable(basename(process.execPath), { expect(await ctx.subprocess.resolveExecutable(basename(process.execPath), {
PATH: dirname(process.execPath), PATH: dirname(process.execPath),
})).toBe(process.execPath) })).toBe(process.execPath)
expect(await ctx.subprocess.resolveExecutable(basename(process.execPath), {
PATH: relative(process.cwd(), dirname(process.execPath)) || '.',
})).toBe(process.execPath)
await expect(ctx.subprocess.resolveExecutable('')).rejects.toThrow('must be non-empty') await expect(ctx.subprocess.resolveExecutable('')).rejects.toThrow('must be non-empty')
await expect(ctx.subprocess.resolveExecutable('dsh-command-that-does-not-exist', { PATH: '' })) await expect(ctx.subprocess.resolveExecutable('dsh-command-that-does-not-exist', { PATH: '' }))
.rejects.toThrow('was not found on PATH') .rejects.toThrow('was not found on PATH')