diff --git a/src/main/pty/wsl-orca-env.test.ts b/src/main/pty/wsl-orca-env.test.ts index 00d6800acc0..36eb9ecd027 100644 --- a/src/main/pty/wsl-orca-env.test.ts +++ b/src/main/pty/wsl-orca-env.test.ts @@ -87,9 +87,11 @@ describe('addOrcaWslInteropEnv', () => { ORCA_OMP_STATUS_EXTENSION: 'C:\\Users\\jin\\.omp\\agent\\extensions\\orca-agent-status.ts', ORCA_PRIME_AGENT_STATUS_EXTENSION: 'C:\\stale\\orca-agent-status.ts', ORCA_PANE_KEY: 'tab-1:leaf-1', + ORCA_AGENT_PANE: 'tab-1:leaf-1', ORCA_TAB_ID: 'tab-1', ORCA_WORKTREE_ID: 'repo::\\\\wsl.localhost\\Ubuntu\\home\\jin\\repo', ORCA_AGENT_LAUNCH_TOKEN: 'launch-secret', + ORCA_AGENT_LAUNCH: 'launch-secret', ORCA_OPENCODE_AGENT: 'opencode2', ORCA_AGENT_HOOK_PORT: '4567', ORCA_AGENT_HOOK_TOKEN: 'token', @@ -117,9 +119,11 @@ describe('addOrcaWslInteropEnv', () => { expect(env.WSLENV).toContain('ORCA_OMP_FRESH_CONFIG/p') expect(env.WSLENV).not.toContain('ORCA_PRIME_AGENT_STATUS_EXTENSION') expect(env.WSLENV).toContain('ORCA_PANE_KEY/u') + expect(env.WSLENV).toContain('ORCA_AGENT_PANE/u') expect(env.WSLENV).toContain('ORCA_TAB_ID/u') expect(env.WSLENV).toContain('ORCA_WORKTREE_ID/u') expect(env.WSLENV).toContain('ORCA_AGENT_LAUNCH_TOKEN/u') + expect(env.WSLENV).toContain('ORCA_AGENT_LAUNCH/u') expect(env.WSLENV).toContain('ORCA_OPENCODE_AGENT/u') expect(env.WSLENV).toContain('ORCA_AGENT_HOOK_PORT/u') expect(env.WSLENV).toContain('ORCA_AGENT_HOOK_TOKEN/u') diff --git a/src/main/pty/wsl-orca-env.ts b/src/main/pty/wsl-orca-env.ts index 1f6bdfff016..5ea399fdb46 100644 --- a/src/main/pty/wsl-orca-env.ts +++ b/src/main/pty/wsl-orca-env.ts @@ -1,3 +1,7 @@ +import { + ORCA_SCRUB_SAFE_PANE_ENV, + ORCA_SCRUB_SAFE_LAUNCH_ENV +} from '../../shared/agent-hook-scrub-safe-env' import { ORCHESTRATION_COMPATIBILITY_ATTACHMENT_ENV, ORCHESTRATION_COMPATIBILITY_HOST_ID_ENV, @@ -90,11 +94,13 @@ export function addOrcaWslInteropEnv(env: Record): void { 'ORCA_CODEX_LAUNCH_PREFLIGHT/p', 'ORCA_CODEX_ISOLATE/u', 'ORCA_PANE_KEY/u', + `${ORCA_SCRUB_SAFE_PANE_ENV}/u`, 'ORCA_TAB_ID/u', 'ORCA_WORKTREE_ID/u', // An id, never a path; agent wrappers and the guest CLI read it like ORCA_WORKTREE_ID. 'ORCA_WORKSPACE_ID/u', 'ORCA_AGENT_LAUNCH_TOKEN/u', + `${ORCA_SCRUB_SAFE_LAUNCH_ENV}/u`, // The guest plugin uses this marker to select the OpenCode variant that // owns the pane when both native and WSL installations are present. 'ORCA_OPENCODE_AGENT/u',