Skip to content

Commit b5dd5ac

Browse files
authored
feat: enable agents app for stable (#308650)
1 parent 5bfbf02 commit b5dd5ac

4 files changed

Lines changed: 7 additions & 11 deletions

File tree

build/gulpfile.vscode.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
393393
}));
394394

395395

396-
const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
397-
const embedded = isInsiderOrExploration
396+
const embedded = quality
398397
? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
399398
: undefined;
400399

@@ -556,8 +555,8 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
556555
'**',
557556
'!LICENSE',
558557
'!version',
559-
...(platform === 'darwin' && !isInsiderOrExploration ? ['!**/Contents/Applications', '!**/Contents/Applications/**'] : []),
560-
...(platform === 'win32' && !isInsiderOrExploration ? ['!**/electron_proxy.exe'] : []),
558+
...(platform === 'darwin' && !quality ? ['!**/Contents/Applications', '!**/Contents/Applications/**'] : []),
559+
...(platform === 'win32' && !quality ? ['!**/electron_proxy.exe'] : []),
561560
], { dot: true }));
562561

563562
if (platform === 'linux') {

build/gulpfile.vscode.win32.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
112112
Quality: quality
113113
};
114114

115-
const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
116-
const embedded = isInsiderOrExploration
115+
const embedded = quality
117116
? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
118117
: undefined;
119118

src/vs/code/electron-main/app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,7 @@ export class CodeApplication extends Disposable {
13541354
const args = this.environmentMainService.args;
13551355

13561356
// Handle agents window first based on context
1357-
if ((process as INodeProcess).isEmbeddedApp || (args['agents'] && this.productService.quality !== 'stable')) {
1357+
if ((process as INodeProcess).isEmbeddedApp || args['agents']) {
13581358
return windowsMainService.openAgentsWindow({
13591359
context,
13601360
cli: args,
@@ -1736,7 +1736,7 @@ export class CodeApplication extends Disposable {
17361736
}
17371737

17381738
private registerEmbeddedAppWithLaunchServices(): void {
1739-
if (!isMacintosh || (process as INodeProcess).isEmbeddedApp || !this.productService.embedded?.nameShort || this.productService.quality === 'stable') {
1739+
if (!isMacintosh || (process as INodeProcess).isEmbeddedApp || !this.productService.embedded?.nameShort) {
17401740
return;
17411741
}
17421742

src/vs/platform/launch/electron-main/launchMainService.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { ICodeWindow } from '../../window/electron-main/window.js';
1818
import { IWindowSettings } from '../../window/common/window.js';
1919
import { IOpenConfiguration, IWindowsMainService, OpenContext } from '../../windows/electron-main/windows.js';
2020
import { IProtocolUrl } from '../../url/electron-main/url.js';
21-
import { IProductService } from '../../product/common/productService.js';
2221

2322
export const ID = 'launchMainService';
2423
export const ILaunchMainService = createDecorator<ILaunchMainService>(ID);
@@ -46,7 +45,6 @@ export class LaunchMainService implements ILaunchMainService {
4645
@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
4746
@IURLService private readonly urlService: IURLService,
4847
@IConfigurationService private readonly configurationService: IConfigurationService,
49-
@IProductService private readonly productService: IProductService,
5048
) { }
5149

5250
async start(args: NativeParsedArgs, userEnv: IProcessEnvironment): Promise<void> {
@@ -146,7 +144,7 @@ export class LaunchMainService implements ILaunchMainService {
146144
}
147145

148146
// Agents window
149-
else if (args['agents'] && this.productService.quality !== 'stable') {
147+
else if (args['agents']) {
150148
usedWindows = await this.windowsMainService.openAgentsWindow(baseConfig);
151149
}
152150

0 commit comments

Comments
 (0)