From fba64aef1bd65a2ff8b00e7d8e232e3f852e688e Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Fri, 30 Oct 2026 16:42:15 -0700 Subject: [PATCH] fix(wsl): keep the orcad idle window out of user shells; require the agent for discovered effort menus (#36492) --- src/main/claude/claude-model-catalog-probe.test.ts | 2 +- src/main/daemon/pty-subprocess-env-inheritance.test.ts | 5 ++++- src/main/daemon/pty-subprocess/spawn-environment.ts | 5 ++++- src/main/providers/local-pty-launch-helpers.ts | 5 ++++- src/main/providers/local-pty-provider-spawn-env.test.ts | 5 ++++- src/shared/structured-agent-session-discovered-model.test.ts | 2 +- src/shared/structured-agent-session-discovered-model.ts | 4 ++-- src/shared/structured-agent-session-options.ts | 2 +- 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/claude/claude-model-catalog-probe.test.ts b/src/main/claude/claude-model-catalog-probe.test.ts index 08dd2482a42..1ea96ca1691 100644 --- a/src/main/claude/claude-model-catalog-probe.test.ts +++ b/src/main/claude/claude-model-catalog-probe.test.ts @@ -130,7 +130,7 @@ describe('claude model catalog probe', () => { expect(fastModeSupport).toEqual({ supported: true }) expect(models[0]?.supportsFastMode).toBe(true) expect( - models[0] && discoveredModel(models[0], fastModeSupport?.supported === true).options + models[0] && discoveredModel(models[0], fastModeSupport?.supported === true, 'claude').options ).toContainEqual(expect.objectContaining({ id: 'fastMode' })) expect( models.map(({ id, isDefault, supportsAutoMode }) => ({ id, isDefault, supportsAutoMode })) diff --git a/src/main/daemon/pty-subprocess-env-inheritance.test.ts b/src/main/daemon/pty-subprocess-env-inheritance.test.ts index 4d80d1ca595..4536a19da0e 100644 --- a/src/main/daemon/pty-subprocess-env-inheritance.test.ts +++ b/src/main/daemon/pty-subprocess-env-inheritance.test.ts @@ -129,9 +129,11 @@ describe('createPtySubprocess', () => { ORCA_WORKTREE_ID: process.env.ORCA_WORKTREE_ID, ORCA_WSL_CLI_DIR: process.env.ORCA_WSL_CLI_DIR, ORCA_ORCAD_MANAGED_ACTIVATION_ROOT: process.env.ORCA_ORCAD_MANAGED_ACTIVATION_ROOT, - ORCA_REMOTE_VIEWER_CLIPBOARD: process.env.ORCA_REMOTE_VIEWER_CLIPBOARD + ORCA_REMOTE_VIEWER_CLIPBOARD: process.env.ORCA_REMOTE_VIEWER_CLIPBOARD, + ORCA_ORCAD_IDLE_TIMEOUT_MS: process.env.ORCA_ORCAD_IDLE_TIMEOUT_MS } process.env.ORCA_ORCAD_MANAGED_ACTIVATION_ROOT = '/home/u/.orca-remote/.activation' + process.env.ORCA_ORCAD_IDLE_TIMEOUT_MS = '300000' process.env.ORCA_REMOTE_VIEWER_CLIPBOARD = '1' process.env.ORCA_PANE_KEY = 'parent-tab:parent-leaf' process.env.ORCA_TAB_ID = 'parent-tab' @@ -157,6 +159,7 @@ describe('createPtySubprocess', () => { expect(env.ORCA_WSL_CLI_DIR).toBeUndefined() expect(env.ORCA_ORCAD_MANAGED_ACTIVATION_ROOT).toBeUndefined() expect(env.ORCA_REMOTE_VIEWER_CLIPBOARD).toBeUndefined() + expect(env.ORCA_ORCAD_IDLE_TIMEOUT_MS).toBeUndefined() }) it('preserves explicit child Orca pane identity over parent env', async () => { diff --git a/src/main/daemon/pty-subprocess/spawn-environment.ts b/src/main/daemon/pty-subprocess/spawn-environment.ts index 8b6051b71e1..8c7c968d5e2 100644 --- a/src/main/daemon/pty-subprocess/spawn-environment.ts +++ b/src/main/daemon/pty-subprocess/spawn-environment.ts @@ -30,6 +30,7 @@ import type { TuiAgent } from '../../../shared/tui-agent' import type { PtySubprocessOptions } from '../pty-subprocess' import { ORCAD_MANAGED_ACTIVATION_ROOT_ENV } from '../../../shared/orcad-managed-launch-env' import { REMOTE_VIEWER_CLIPBOARD_ENV } from '../../../shared/remote-viewer-clipboard-env' +import { ORCAD_IDLE_TIMEOUT_ENV } from '../../../shared/orcad-idle-exit' const PANE_IDENTITY_ENV_KEYS = [ 'ORCA_PANE_KEY', @@ -42,7 +43,9 @@ const PANE_IDENTITY_ENV_KEYS = [ // Per-viewer: an Orca started from a remote viewer's pane must not mark its own local panes. REMOTE_VIEWER_CLIPBOARD_ENV, // A server's own launch marker; a user's `orcad` in this shell is not client-managed. - ORCAD_MANAGED_ACTIVATION_ROOT_ENV + ORCAD_MANAGED_ACTIVATION_ROOT_ENV, + // A WSL server's idle window; an `orcad` started from its shell must keep the default. + ORCAD_IDLE_TIMEOUT_ENV ] as const const WINDOWS_PATH_ENV_KEY_RE = /^path$/i diff --git a/src/main/providers/local-pty-launch-helpers.ts b/src/main/providers/local-pty-launch-helpers.ts index 3b4883f0f54..79424fa389f 100644 --- a/src/main/providers/local-pty-launch-helpers.ts +++ b/src/main/providers/local-pty-launch-helpers.ts @@ -6,6 +6,7 @@ import { expandWindowsEnvironmentVariables } from '../../shared/windows-environm import { resolveSafePtyDefaultCwd } from './pty-default-cwd' import { ORCAD_MANAGED_ACTIVATION_ROOT_ENV } from '../../shared/orcad-managed-launch-env' import { REMOTE_VIEWER_CLIPBOARD_ENV } from '../../shared/remote-viewer-clipboard-env' +import { ORCAD_IDLE_TIMEOUT_ENV } from '../../shared/orcad-idle-exit' const PANE_IDENTITY_ENV_KEYS = [ 'ORCA_PANE_KEY', @@ -16,7 +17,9 @@ const PANE_IDENTITY_ENV_KEYS = [ // Per-viewer: an Orca started from a remote viewer's pane must not mark its own local panes. REMOTE_VIEWER_CLIPBOARD_ENV, // A server's own launch marker; a user's `orcad` in this shell is not client-managed. - ORCAD_MANAGED_ACTIVATION_ROOT_ENV + ORCAD_MANAGED_ACTIVATION_ROOT_ENV, + // A WSL server's idle window; an `orcad` started from its shell must keep the default. + ORCAD_IDLE_TIMEOUT_ENV ] as const export function getDefaultCwd(): string { diff --git a/src/main/providers/local-pty-provider-spawn-env.test.ts b/src/main/providers/local-pty-provider-spawn-env.test.ts index 457d9fd83d7..1f5ea286b60 100644 --- a/src/main/providers/local-pty-provider-spawn-env.test.ts +++ b/src/main/providers/local-pty-provider-spawn-env.test.ts @@ -567,9 +567,11 @@ describe('LocalPtyProvider', () => { ORCA_TAB_ID: process.env.ORCA_TAB_ID, ORCA_WORKTREE_ID: process.env.ORCA_WORKTREE_ID, ORCA_ORCAD_MANAGED_ACTIVATION_ROOT: process.env.ORCA_ORCAD_MANAGED_ACTIVATION_ROOT, - ORCA_REMOTE_VIEWER_CLIPBOARD: process.env.ORCA_REMOTE_VIEWER_CLIPBOARD + ORCA_REMOTE_VIEWER_CLIPBOARD: process.env.ORCA_REMOTE_VIEWER_CLIPBOARD, + ORCA_ORCAD_IDLE_TIMEOUT_MS: process.env.ORCA_ORCAD_IDLE_TIMEOUT_MS } process.env.ORCA_ORCAD_MANAGED_ACTIVATION_ROOT = '/home/u/.orca-remote/.activation' + process.env.ORCA_ORCAD_IDLE_TIMEOUT_MS = '300000' process.env.ORCA_REMOTE_VIEWER_CLIPBOARD = '1' process.env.ORCA_PANE_KEY = 'parent-tab:parent-leaf' process.env.ORCA_TAB_ID = 'parent-tab' @@ -593,6 +595,7 @@ describe('LocalPtyProvider', () => { expect(spawnCall[2].env.ORCA_WORKTREE_ID).toBeUndefined() expect(spawnCall[2].env.ORCA_ORCAD_MANAGED_ACTIVATION_ROOT).toBeUndefined() expect(spawnCall[2].env.ORCA_REMOTE_VIEWER_CLIPBOARD).toBeUndefined() + expect(spawnCall[2].env.ORCA_ORCAD_IDLE_TIMEOUT_MS).toBeUndefined() }) it('preserves explicit child Orca pane identity over parent env', async () => { diff --git a/src/shared/structured-agent-session-discovered-model.test.ts b/src/shared/structured-agent-session-discovered-model.test.ts index 9e22feee16a..042705710dc 100644 --- a/src/shared/structured-agent-session-discovered-model.test.ts +++ b/src/shared/structured-agent-session-discovered-model.test.ts @@ -17,7 +17,7 @@ describe('unconfirmed effort menus', () => { expect(discoveredModel(unconfirmed, false, 'pi').options).toEqual([]) }) - it.each(['omp', 'claude', 'codex', undefined] as const)('still offers them for %s', (agent) => { + it.each(['omp', 'claude', 'codex'] as const)('still offers them for %s', (agent) => { const [effort] = discoveredModel(unconfirmed, false, agent).options expect(effort?.kind).toMatchObject({ type: 'select', choices: unconfirmed.efforts }) }) diff --git a/src/shared/structured-agent-session-discovered-model.ts b/src/shared/structured-agent-session-discovered-model.ts index f7df95ff9a6..a7d0716f2e3 100644 --- a/src/shared/structured-agent-session-discovered-model.ts +++ b/src/shared/structured-agent-session-discovered-model.ts @@ -4,7 +4,7 @@ import type { AgentType } from './agent-status-types' function effortOption( model: AgentSessionOptionsResult['models'][number], - agent: AgentType | undefined + agent: AgentType ): CatalogOption | null { // Pi menus are exact; other agents (OMP's recorded menus) still offer unconfirmed choices. if ((agent === 'pi' && model.effortsKnown === false) || model.efforts.length === 0) { @@ -52,7 +52,7 @@ export function serviceTierOption(tiers: readonly AgentSessionOptionChoice[]): C export function discoveredModel( model: AgentSessionOptionsResult['models'][number], sessionSupportsFastMode: boolean, - agent?: AgentType + agent: AgentType ): CatalogModel { const effort = effortOption(model, agent) const serviceTier = model.serviceTiers?.length ? serviceTierOption(model.serviceTiers) : null diff --git a/src/shared/structured-agent-session-options.ts b/src/shared/structured-agent-session-options.ts index b148bd1fce6..9284e4329b7 100644 --- a/src/shared/structured-agent-session-options.ts +++ b/src/shared/structured-agent-session-options.ts @@ -33,7 +33,7 @@ export { export function structuredAgentSessionOptionCatalog( seed: AgentSessionOptionCatalog, result: AgentSessionOptionsResult, - agent?: StructuredAgentSessionOptionRecord['agent'] + agent: StructuredAgentSessionOptionRecord['agent'] ): AgentSessionOptionCatalog { const models: CatalogModel[] = result.models.map((model) => discoveredModel(model, result.fastModeSupport?.supported === true, agent)