diff --git a/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist-summary.md b/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist-summary.md
index 7cf1f1509fa..7e1eb5c768b 100644
--- a/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist-summary.md
+++ b/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist-summary.md
@@ -10,14 +10,15 @@ A checked box means the work has evidence in the detailed ledger. Design approva
complete a box.
Active checkpoint: **Milestone 6 / Work Package 5 bounded runtime transfer — explicit Windows
-no-input launcher-path adapter locally green, exact-head native rerun next, 2026-07-17, Codex implementation owner.** Exact head
-`a6feb8c3be0e15ae45fc6b431c1665e5fd84d2c9`, run `29554814775`, and Windows x64/ARM64 jobs
-`87804630533`/`87804630504` prove the strict-trust diagnostic naturally completes through the
-private-console launcher while the unchanged direct-spawn product probe still hangs after remote
-session close. The candidate is constructor-injected only into the native full-size purpose test;
-`E-M6-WINDOWS-NOINPUT-LAUNCHER-ADAPTER-LOCAL-001` records syntax, 124 focused cases, 285 release
-contracts, typecheck, lint/reliability/max-lines, formatting, diff, and protected-resolver isolation
-green. Exact-head native x64/ARM64 full-size and teardown gates remain before any product/default caller.
+no-input launcher adapter native selection diagnostic next, 2026-07-17, Codex implementation owner.**
+Exact head `42098d1b1393a97c03fec6e7b685859f8296b90d`, run `29555939964`, and Windows x64/ARM64 jobs
+`87807875088`/`87807875112` pass every artifact/launcher/cache gate and the standalone strict-trust
+launcher in 944.6233/852.6974 ms. The injected `SshConnection` probe still times out in
+32211/32140 ms with no lifecycle events before transfer; both teardowns retain locked
+`UsrClass.dat`. `E-M6-WINDOWS-NOINPUT-ARGUMENT-MATRIX-LOCAL-001` records non-secret launch-mode
+telemetry plus a bounded production/strict/verbose argument matrix locally green with 124 focused
+cases, 285 release contracts, typecheck, lint/reliability/max-lines, diff, and resolver isolation.
+Commit/push this diagnostic next; no adapter change or product/default caller is authorized yet.
`E-M6-WINDOWS-SYSTEM-SSH-TREE-LIVE-PORTABLE-FIXTURE-LOCAL-001` records the portable-fixture
correction locally green: the no-Orca-publication workflow oracle permits the one exact pinned
Microsoft fixture release URL while Orca release URLs, `gh release`, and `contents: write` remain
diff --git a/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist.md b/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist.md
index 9cd2d87cdaa..a9191d5f529 100644
--- a/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist.md
+++ b/docs/reference/plans/2026-07-14-ssh-relay-github-release-implementation-checklist.md
@@ -8,8 +8,8 @@ work; keep exact commands, runner identities, hashes, metrics, and residual gaps
Date created: 2026-07-14
Last updated: 2026-07-17
-Current phase: Milestone 6 / Work Package 5 bounded runtime transfer — **In progress — explicit Windows no-input launcher-path adapter exact-head native qualification, 2026-07-17, Codex implementation owner**. Exact head `a6feb8c3be0e15ae45fc6b431c1665e5fd84d2c9`, run `29554814775`, and x64/ARM64 jobs `87804630533`/`87804630504` prove strict pinned trust, public-key authentication, command execution, and natural launcher settlement on both architectures. `E-M6-WINDOWS-NOINPUT-LAUNCHER-ADAPTER-LOCAL-001` records the adapter package locally green behind constructor injection for the no-input probe only. Commit/push and exact-head x64/ARM64 full-size transfer and teardown proof remain required. Keep the path absent from every product/default caller and keep legacy as the sole production path. Real Apple/SignPath rehearsals remain deferred.
-Session checkpoint: **ADAPTER LOCAL GREEN / NATIVE RERUN NEXT — 2026-07-17, Codex implementation owner** — the candidate preserves direct spawn when no path is supplied, ignores the Windows-only path on POSIX, does not infer it from the runner environment, and injects it only from the native full-size purpose test. Syntax, 124 focused cases with ten declared native/live skips, 285 release contracts with eight declared Windows skips, typecheck, full lint/reliability/max-lines, formatting, diff, and protected-resolver isolation pass. No product caller, full-size Windows transfer claim, upload, default/fallback, Beta, tuple publication, or signing behavior changed.
+Current phase: Milestone 6 / Work Package 5 bounded runtime transfer — **In progress — Windows launcher adapter argument-matrix native qualification, 2026-07-17, Codex implementation owner**. Exact head `42098d1b1393a97c03fec6e7b685859f8296b90d`, run `29555939964`, and x64/ARM64 jobs `87807875088`/`87807875112` preserve every artifact/launcher/cache gate and independently prove the standalone strict-trust launcher, but the injected `SshConnection` probe still times out with no lifecycle events before any full-size transfer. `E-M6-WINDOWS-NOINPUT-ARGUMENT-MATRIX-LOCAL-001` adds non-secret launch-mode telemetry and a bounded four-vector native comparison without changing behavior. Commit/push only that diagnostic. Keep the path absent from every product/default caller and keep legacy as the sole production path. Real Apple/SignPath rehearsals remain deferred.
+Session checkpoint: **ADAPTER NATIVE RED / ARGUMENT MATRIX LOCAL GREEN — 2026-07-17, Codex implementation owner** — the next diagnostic compares production args, strict trust only, verbosity only, and strict plus verbose under the same launcher deadline, while timeout errors report only `direct`, `windows-no-input-launcher`, or `unknown`. Syntax, 124 focused cases with ten declared skips, 285 release contracts with eight declared skips, typecheck, lint/reliability/max-lines, formatting, diff, and protected-resolver isolation pass. The prior x64/ARM64 full-size and teardown gates remain red; no launch behavior, product caller, upload, default/fallback, Beta, tuple publication, or signing behavior changed.
Primary design: [SSH relay GitHub Release plan](./2026-07-14-ssh-relay-github-release-plan.html)
Motivating issues: [#8450](https://github.com/stablyai/orca/issues/8450), [#1693](https://github.com/stablyai/orca/issues/1693)
@@ -20116,6 +20116,85 @@ lint` passes in 18.59 seconds real with the 26 existing warnings, all 41 reliabi
cancellation settlement, connection reuse, and exact profile/directory teardown. Do not check
the broad Milestone 6 Windows cell or add any product/default caller until both jobs pass.
+### E-M6-WINDOWS-NOINPUT-LAUNCHER-ADAPTER-CI-RED-001 — injected connection probe still does not settle
+
+- Date/owner/source/run: 2026-07-17, Codex implementation owner; exact head
+ `42098d1b1393a97c03fec6e7b685859f8296b90d`, artifact run
+ [29555939964](https://github.com/stablyai/orca/actions/runs/29555939964), Windows x64 job
+ [87807875088](https://github.com/stablyai/orca/actions/runs/29555939964/job/87807875088) on
+ `windows-2022`, and native ARM64 job
+ [87807875112](https://github.com/stablyai/orca/actions/runs/29555939964/job/87807875112) on
+ `windows-11-arm64`; both use Node 24.18.0.
+- Preserved gates: both Windows jobs pass 101 artifact files, 863 runnable cases, and 19 declared
+ skips, including legacy .NET compilation, every launcher argv/EOF/binary/overflow/cleanup/
+ cancellation contract, exact clean-build identity, runtime smoke, and both full-size cache gates.
+ Darwin x64/ARM64 jobs `87807875081`/`87807875114`, Linux x64/ARM64 jobs
+ `87807875099`/`87807875105`, and Linux oldest-userland supplements
+ `87808435117`/`87808435146` pass at the same exact head.
+- Standalone launcher control: x64 completes in 944.6233 ms and ARM64 in 852.6974 ms. Both report
+ `success=true`, `timedOut=false`, `sentinel=true`, `stdoutEnded=true`, `processExit=0`,
+ `channelClosed=true`, `closeCode=0`, and `stderrBytes=11090`; their verbose traces prove exact
+ pinned host trust, public-key authentication, command completion, output drain, and natural
+ OpenSSH exit.
+- Injected connection RED: the immediately following full-size purpose test supplies the same
+ runner-built launcher path through the new `SshConnection` constructor. X64 still times out in
+ 32,211 ms and ARM64 in 32,140 ms before transfer with `sentinel=false`, `stdoutEnded=false`,
+ `processExit=not-observed`, and `channelClosed=false`. Both server logs prove the separate attempt
+ authenticates, starts its command session, closes that remote session, and then loses the client
+ connection. No serial/concurrent/collision/cancellation/reuse metrics run.
+- Teardown/residual: both fixture teardowns fail visibly after bounded retries because unloading the
+ owned SID's `_Classes` hive returns exit 1 and `UsrClass.dat` remains locked. This remains a
+ separate teardown gate and is not hidden by the probe failure.
+- Classification/next boundary: unit and source contracts prove intended option propagation, but
+ this native result does not prove that the spawned full-size probe actually selected the launcher
+ or explain why its argv differs from the standalone control. Add only non-secret launch-mode
+ telemetry plus a bounded standalone comparison of the production and strict/verbose argument
+ vectors. Do not change handles, enable fallback, package the launcher, add a product/default
+ caller, or claim the broad Windows cell until the exact difference is selected on both
+ architectures.
+
+### E-M6-WINDOWS-NOINPUT-ARGUMENT-MATRIX-LOCAL-001 — bounded launch-mode and argv diagnostics are locally green
+
+- Date/owner/base/runner: 2026-07-17, Codex implementation owner; uncommitted diagnostic atop exact
+ red head `42098d1b1393a97c03fec6e7b685859f8296b90d` on Apple arm64, macOS 26.2 build 25C56, Node
+ 26.5.0, and pnpm 10.24.0. The repository requests Node 24; native jobs remain authoritative.
+- Boundary: each wrapped system-SSH command now carries only a non-secret
+ `direct`/`windows-no-input-launcher` launch-mode label. Probe timeouts include that label beside
+ the existing sentinel/stdout/process/channel booleans; no path or argv content is logged. The
+ native purpose diagnostic runs four sequential launcher children with the same 6,000 ms internal
+ deadline: exact production args, strict fixture trust only, verbosity only, and strict trust plus
+ verbosity. Each child retains the same private-console/bounded-output handles, pinned target,
+ command, identity, and external settlement bounds. The matrix deliberately expects every vector
+ to settle so a native failure selects the exact differing vector without hiding RED.
+- Behavior isolation: the launcher selection, handles, OpenSSH `-n` policy, connection timeout,
+ transfer code, fixture, production/default callers, Beta mode, fallback, tuple, publication, and
+ signing remain unchanged. Unit contracts prove explicit Windows injection reports
+ `windows-no-input-launcher`, while POSIX ignores the supplied Windows path and reports `direct`.
+- Syntax/focused evidence: both launcher scripts pass `node --check`. `/usr/bin/time -l pnpm exec
+ vitest run --config config/vitest.config.ts --maxWorkers=1
+ src/main/ssh/ssh-connection.test.ts src/main/ssh/ssh-system-fallback.test.ts
+ src/main/ssh/system-ssh-command-launcher.test.ts
+ src/main/ssh/ssh-system-no-input-windows-openssh.test.ts
+ src/main/ssh/ssh-relay-runtime-windows-system-ssh-openssh-full-size.test.ts
+ config/scripts/ssh-relay-runtime-windows-no-input-launcher.test.mjs
+ config/scripts/ssh-relay-runtime-workflow.test.mjs` passes six files with one skipped, 124
+ runnable cases, and ten declared native/live skips in 18.18 seconds real; maximum RSS is
+ 139,968,512 bytes and peak footprint is 97,785,640 bytes.
+- Release/static evidence: the exact unquoted release-contract command passes 51 files and 285
+ runnable cases with eight declared Windows skips in 383.15 seconds real; maximum RSS is
+ 189,906,944 bytes and peak footprint is 97,523,424 bytes. The machine was under sustained load,
+ so this timing is retained as observed evidence rather than a performance baseline. `/usr/bin/time
+ -l pnpm typecheck` passes in 110.83 seconds real with 1,795,964,928-byte maximum RSS and
+ 98,195,288-byte peak footprint. `/usr/bin/time -l pnpm lint` passes in 199.22 seconds real with
+ the same 26 existing warnings, all 41 reliability gates, and the 355-entry max-lines ratchet;
+ maximum RSS is 2,102,296,576 bytes and peak footprint is 97,589,080 bytes.
+- Formatting/isolation: `pnpm exec oxfmt --write` passes for every modified TypeScript file;
+ `git diff --check` and exact protected-resolver comparison pass. No Milestone 0 resolver byte
+ changed.
+- Residual gate: local Darwin skips do not classify the native argument matrix or prove launch-mode
+ selection in the failing connection probe. Commit/push this diagnostic and require exact-head
+ x64/ARM64 matrix plus timeout-label evidence before any behavior correction.
+
## Accepted Gaps
No product gap is accepted merely because it appears in this list. Each entry requires explicit
@@ -20174,11 +20253,11 @@ The project is not complete until every applicable item below is checked with ev
## Next Required Action
-Commit and push only the explicit Windows no-input launcher-path adapter recorded by
-`E-M6-WINDOWS-NOINPUT-LAUNCHER-ADAPTER-LOCAL-001`, then require exact-head Windows x64/ARM64
-launcher-backed probe, full-size transfer, cancellation, concurrency, connection
-reuse, and exact profile/directory teardown evidence. Do not check the broad Milestone 6 Windows
-system-SSH item or add an
+Commit and push only the launch-mode and bounded argument-matrix diagnostic recorded by
+`E-M6-WINDOWS-NOINPUT-ARGUMENT-MATRIX-LOCAL-001`, then require exact-head Windows x64/ARM64 evidence
+before changing the adapter. The full-size transfer, cancellation, concurrency,
+connection reuse, and exact profile/directory teardown gates remain open. Do not check the broad
+Milestone 6 Windows system-SSH item or add an
Electron/startup/product importer, per-target mode wiring, fallback, tuple
enablement, release publication, or default behavior.
Keep Node upstream `.tar.xz` inputs, Windows ZIP, `ORCA_RELAY_PATH`, existing desktop required-assets
diff --git a/src/main/ssh/ssh-connection.test.ts b/src/main/ssh/ssh-connection.test.ts
index 3b31f55b081..09836a9e1ec 100644
--- a/src/main/ssh/ssh-connection.test.ts
+++ b/src/main/ssh/ssh-connection.test.ts
@@ -1264,7 +1264,7 @@ describe('SshConnection', () => {
try {
const connect = expect(conn.connect()).rejects.toThrow(
- 'System SSH connection timed out (sentinel=true, stdoutEnded=true, processExit=0, channelClosed=false)'
+ 'System SSH connection timed out (launchMode=unknown, sentinel=true, stdoutEnded=true, processExit=0, channelClosed=false)'
)
await vi.advanceTimersByTimeAsync(0)
channel.emit('data', Buffer.from('ORCA-SYSTEM-SSH-OK\r\n'))
diff --git a/src/main/ssh/ssh-connection.ts b/src/main/ssh/ssh-connection.ts
index adb3aa3762f..88b077b0381 100644
--- a/src/main/ssh/ssh-connection.ts
+++ b/src/main/ssh/ssh-connection.ts
@@ -14,6 +14,7 @@ import {
writeBufferViaSystemSsh,
writeFileViaSystemSsh,
type SystemSshBuildArgsOptions,
+ type SystemSshCommandChannel,
type SystemSshCommandOptions,
type SystemSshProcess
} from './ssh-system-fallback'
@@ -774,9 +775,11 @@ export class SshConnection {
channel.close()
// Why: native Windows can separate process exit from inherited
// stdio closure; these booleans diagnose that boundary safely.
+ const launchMode =
+ (channel as SystemSshCommandChannel)._systemSshLaunchMode ?? 'unknown'
reject(
new Error(
- `System SSH connection timed out (sentinel=${sentinelObserved}, stdoutEnded=${stdoutEnded}, processExit=${processExit}, channelClosed=false)`
+ `System SSH connection timed out (launchMode=${launchMode}, sentinel=${sentinelObserved}, stdoutEnded=${stdoutEnded}, processExit=${processExit}, channelClosed=false)`
)
)
})
diff --git a/src/main/ssh/ssh-system-fallback.ts b/src/main/ssh/ssh-system-fallback.ts
index e597d67b09b..9b434a545b7 100644
--- a/src/main/ssh/ssh-system-fallback.ts
+++ b/src/main/ssh/ssh-system-fallback.ts
@@ -7,6 +7,8 @@ export {
export {
spawnSystemSsh,
spawnSystemSshCommand,
+ type SystemSshCommandChannel,
+ type SystemSshCommandLaunchMode,
type SystemSshCommandOptions,
type SystemSshProcess
} from './system-ssh-command'
diff --git a/src/main/ssh/ssh-system-no-input-windows-openssh.test.ts b/src/main/ssh/ssh-system-no-input-windows-openssh.test.ts
index 2b3f476ccb8..4d2298e9ae0 100644
--- a/src/main/ssh/ssh-system-no-input-windows-openssh.test.ts
+++ b/src/main/ssh/ssh-system-no-input-windows-openssh.test.ts
@@ -8,7 +8,11 @@ import type { SshTarget } from '../../shared/ssh-types'
import { buildSshArgs } from './system-ssh-args'
import { findSystemSsh } from './system-ssh-binary'
-type DiagnosticMode = 'private-console-regular-output-verbose-timeout'
+type DiagnosticMode =
+ | 'private-console-regular-output-production-args'
+ | 'private-console-regular-output-strict-trust'
+ | 'private-console-regular-output-verbose'
+ | 'private-console-regular-output-verbose-strict-trust'
type DiagnosticResult = {
mode: DiagnosticMode
@@ -48,36 +52,33 @@ function createTarget(): SshTarget {
}
}
-function buildDiagnosticSshArgs(target: SshTarget, knownHostsPath: string): string[] {
+function buildDiagnosticSshArgs(
+ target: SshTarget,
+ knownHostsPath: string,
+ options: { strictTrust: boolean; verbose: boolean } = { strictTrust: true, verbose: true }
+): string[] {
const sshArgs = buildSshArgs(target)
const destinationSeparator = sshArgs.indexOf('--')
if (destinationSeparator < 0) {
throw new Error('Windows OpenSSH diagnostic arguments lost the destination separator')
}
// Why: Win32-OpenSSH ignores overridden profile variables; use only the fixture's pinned trust.
- sshArgs.splice(
- destinationSeparator,
- 0,
- '-vvv',
- '-o',
- 'StrictHostKeyChecking=yes',
- '-o',
- `UserKnownHostsFile=${knownHostsPath}`
- )
+ const diagnosticArgs = [
+ ...(options.verbose ? ['-vvv'] : []),
+ ...(options.strictTrust
+ ? ['-o', 'StrictHostKeyChecking=yes', '-o', `UserKnownHostsFile=${knownHostsPath}`]
+ : [])
+ ]
+ sshArgs.splice(destinationSeparator, 0, ...diagnosticArgs)
return sshArgs
}
-async function runDiagnostic(): Promise {
+async function runDiagnostic(mode: DiagnosticMode, sshArgs: string[]): Promise {
const sshPath = findSystemSsh()
if (!sshPath) {
throw new Error('Native Windows OpenSSH client is unavailable')
}
- const mode: DiagnosticMode = 'private-console-regular-output-verbose-timeout'
const startedAt = performance.now()
- const sshArgs = buildDiagnosticSshArgs(
- createTarget(),
- join(clientHome as string, '.ssh', 'known_hosts')
- )
const child = spawn(
launcherPath as string,
['--diagnostic-timeout-ms', '6000', sshPath, ...sshArgs, 'echo ORCA-SYSTEM-SSH-OK'],
@@ -204,16 +205,38 @@ describe('Windows OpenSSH no-input diagnostic trust arguments', () => {
describe.skipIf(!hasLiveInput)('Windows OpenSSH no-input child-handle diagnostic', () => {
it(
- 'captures the verbose client phase after a bounded private-console diagnostic timeout',
- { timeout: 15_000 },
+ 'isolates production, strict-trust, and verbose launcher argument effects',
+ { timeout: 40_000 },
async () => {
expect(process.platform).toBe('win32')
- const privateConsoleRegularOutputVerboseTimeout = await runDiagnostic()
+ const target = createTarget()
+ const knownHostsPath = join(clientHome as string, '.ssh', 'known_hosts')
+ const production = await runDiagnostic(
+ 'private-console-regular-output-production-args',
+ buildSshArgs(target)
+ )
+ const strictTrust = await runDiagnostic(
+ 'private-console-regular-output-strict-trust',
+ buildDiagnosticSshArgs(target, knownHostsPath, { strictTrust: true, verbose: false })
+ )
+ const verbose = await runDiagnostic(
+ 'private-console-regular-output-verbose',
+ buildDiagnosticSshArgs(target, knownHostsPath, { strictTrust: false, verbose: true })
+ )
+ const verboseStrictTrust = await runDiagnostic(
+ 'private-console-regular-output-verbose-strict-trust',
+ buildDiagnosticSshArgs(target, knownHostsPath)
+ )
console.log(
- `ssh_windows_no_input_handle_diagnostic=${JSON.stringify({ privateConsoleRegularOutputVerboseTimeout })}`
+ `ssh_windows_no_input_argument_matrix=${JSON.stringify({ production, strictTrust, verbose, verboseStrictTrust })}`
)
- expect(privateConsoleRegularOutputVerboseTimeout.success).toBe(true)
+ expect({
+ production: production.success,
+ strictTrust: strictTrust.success,
+ verbose: verbose.success,
+ verboseStrictTrust: verboseStrictTrust.success
+ }).toEqual({ production: true, strictTrust: true, verbose: true, verboseStrictTrust: true })
}
)
})
diff --git a/src/main/ssh/system-ssh-command-launcher.test.ts b/src/main/ssh/system-ssh-command-launcher.test.ts
index a6b0606975e..d3905fe3150 100644
--- a/src/main/ssh/system-ssh-command-launcher.test.ts
+++ b/src/main/ssh/system-ssh-command-launcher.test.ts
@@ -63,8 +63,9 @@ describe('system SSH Windows no-input launcher selection', () => {
const windowsSshPath = 'C:\\Windows\\System32\\OpenSSH\\ssh.exe'
const previousSystemSshPath = process.env.ORCA_SYSTEM_SSH_PATH
process.env.ORCA_SYSTEM_SSH_PATH = windowsSshPath
+ let channel: ReturnType
try {
- spawnSystemSshCommand(createTarget(), 'echo ready', {
+ channel = spawnSystemSshCommand(createTarget(), 'echo ready', {
noInput: true,
windowsNoInputLauncherPath: launcherPath
})
@@ -89,12 +90,14 @@ describe('system SSH Windows no-input launcher selection', () => {
expect.objectContaining({ stdio: ['ignore', 'pipe', 'pipe'] })
)
expect(args).not.toContain('-n')
+ expect(channel._systemSshLaunchMode).toBe('windows-no-input-launcher')
})
it('ignores a supplied launcher on POSIX and preserves OpenSSH no-input handling', () => {
const platform = vi.spyOn(process, 'platform', 'get').mockReturnValue('linux')
+ let channel: ReturnType
try {
- spawnSystemSshCommand(createTarget(), 'echo ready', {
+ channel = spawnSystemSshCommand(createTarget(), 'echo ready', {
noInput: true,
windowsNoInputLauncherPath: '/tmp/not-a-posix-launcher'
})
@@ -107,5 +110,6 @@ describe('system SSH Windows no-input launcher selection', () => {
expect.arrayContaining(['-n', '--', 'deploy@example.com']),
expect.objectContaining({ stdio: ['ignore', 'pipe', 'pipe'] })
)
+ expect(channel._systemSshLaunchMode).toBe('direct')
})
})
diff --git a/src/main/ssh/system-ssh-command.ts b/src/main/ssh/system-ssh-command.ts
index 0f5a84e0b55..e3c712f6386 100644
--- a/src/main/ssh/system-ssh-command.ts
+++ b/src/main/ssh/system-ssh-command.ts
@@ -17,8 +17,11 @@ export type SystemSshProcess = {
export type SystemSshCommandChannel = ClientChannel & {
_process?: ChildProcess
+ _systemSshLaunchMode?: SystemSshCommandLaunchMode
}
+export type SystemSshCommandLaunchMode = 'direct' | 'windows-no-input-launcher'
+
export type SystemSshCommandOptions = SshExecOptions &
SystemSshBuildArgsOptions & {
windowsNoInputLauncherPath?: string
@@ -87,7 +90,11 @@ export function spawnSystemSshCommand(
if (noInput && process.platform === 'win32' && !windowsNoInputLauncherPath) {
proc.stdin?.destroy()
}
- return wrapCommandProcess(proc, !noInput)
+ return wrapCommandProcess(
+ proc,
+ !noInput,
+ windowsNoInputLauncherPath ? 'windows-no-input-launcher' : 'direct'
+ )
}
function wrapChildProcess(proc: ChildProcess): SystemSshProcess {
@@ -109,7 +116,11 @@ function wrapChildProcess(proc: ChildProcess): SystemSshProcess {
}
}
-function wrapCommandProcess(proc: ChildProcess, acceptsInput: boolean): SystemSshCommandChannel {
+function wrapCommandProcess(
+ proc: ChildProcess,
+ acceptsInput: boolean,
+ launchMode: SystemSshCommandLaunchMode
+): SystemSshCommandChannel {
const duplex = new Duplex({
read() {
proc.stdout?.resume()
@@ -128,6 +139,7 @@ function wrapCommandProcess(proc: ChildProcess, acceptsInput: boolean): SystemSs
stdin: NodeJS.WritableStream
stderr: NodeJS.ReadableStream
_process?: ChildProcess
+ _systemSshLaunchMode?: SystemSshCommandLaunchMode
close: () => void
}
mutableChannel.stdin =
@@ -141,6 +153,7 @@ function wrapCommandProcess(proc: ChildProcess, acceptsInput: boolean): SystemSs
})
mutableChannel.stderr = proc.stderr!
mutableChannel._process = proc
+ mutableChannel._systemSshLaunchMode = launchMode
mutableChannel.close = () => {
try {
proc.kill('SIGTERM')