fix: Fix regression related to ability to show banner message inside the editor

RomanNikitenko · RomanNikitenko · commit d6ae90f1fa5c · 2026-06-03T13:43:45.000+03:00
Signed-off-by: Roman Nikitenko &lt;rnikiten@redhat.com&gt;
Assisted-by: Cursor AI
diff --git a/.rebase/replace/code/build/lib/stylelint/vscode-known-variables.json.json b/.rebase/replace/code/build/lib/stylelint/vscode-known-variables.json.json
@@ -0,0 +1,6 @@
+[
+  {
+    "from": "\t\t\"--vscode-agentStatusIndicator-background\",\n\t\t\"--vscode-badge-background\",",
+    "by": "\t\t\"--vscode-agentStatusIndicator-background\",\n\t\t\"--vscode-agentStatusIndicator-labelForeground\",\n\t\t\"--vscode-badge-background\","
+  }
+]
diff --git a/.rebase/replace/code/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css.json b/.rebase/replace/code/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css.json
@@ -0,0 +1,14 @@
+[
+  {
+    "from": "\tcolor: var(--vscode-titleBar-activeForeground);\n\tbackground-color: var(--vscode-titleBar-activeBackground);\n\tborder-bottom: 1px solid var(--vscode-titleBar-border, transparent);",
+    "by": "\tcolor: var(--vscode-editorGroupHeader-tabsForeground, var(--vscode-foreground));\n\tbackground-color: var(--vscode-editorGroupHeader-tabsBackground);\n\tborder-bottom: 1px solid var(--vscode-editorGroupHeader-tabsBorder, transparent);"
+  },
+  {
+    "from": "\t\tcolor: var(--vscode-titleBar-activeForeground);\n\t\toverflow: hidden;",
+    "by": "\t\tcolor: inherit;\n\t\toverflow: hidden;"
+  },
+  {
+    "from": "\t\t\tbackground-color: var(--vscode-titleBar-activeForeground);\n\t\t\topacity: 0.3;",
+    "by": "\t\t\tbackground-color: currentColor;\n\t\t\topacity: 0.3;"
+  }
+]
diff --git a/.rebase/replace/code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts.json b/.rebase/replace/code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts.json
@@ -5,6 +5,10 @@
   },
   {
     "from": "\tisCustomTitleFormat(): boolean {",
-    "by": "\tgetHeader(): string | undefined{\n\t\tconst header = this.configurationService.inspect<string>(WindowSettingNames.header);\n\t\treturn header.value;\n\t}\n\n\tisCustomTitleFormat(): boolean {"
+    "by": "\tgetHeader(): string | undefined{\n\t\treturn this.configurationService.getValue<string>(WindowSettingNames.header);\n\t}\n\n\tisCustomTitleFormat(): boolean {"
+  },
+  {
+    "from": "\t\tif (affectsTitleConfiguration || event.affectsConfiguration(WindowSettingNames.titleSeparator)) {\n\t\t\tthis.titleUpdater.schedule();\n\t\t}\n\t}",
+    "by": "\t\tif (affectsTitleConfiguration || event.affectsConfiguration(WindowSettingNames.titleSeparator)) {\n\t\t\tthis.titleUpdater.schedule();\n\t\t}\n\n\t\tif (event.affectsConfiguration(WindowSettingNames.header)) {\n\t\t\tthis.onDidChangeEmitter.fire();\n\t\t}\n\t}"
   }
 ]
diff --git a/.rebase/replace/code/src/vs/workbench/common/theme.ts.json b/.rebase/replace/code/src/vs/workbench/common/theme.ts.json
@@ -0,0 +1,6 @@
+[
+  {
+    "from": ");\nexport const COMMAND_CENTER_ACTIVEFOREGROUND = registerColor(\n\t'commandCenter.activeForeground',",
+    "by": ");\nexport const AGENT_STATUS_INDICATOR_LABEL_FOREGROUND = registerColor(\n\t'agentStatusIndicator.labelForeground',\n\ttransparent(COMMAND_CENTER_FOREGROUND, 0.6),\n\tlocalize('agentStatusIndicator-labelForeground', \"Foreground color of the agent status indicator label in the titlebar. Defaults to a muted version of the command center foreground.\"),\n\tfalse\n);\nexport const COMMAND_CENTER_ACTIVEFOREGROUND = registerColor(\n\t'commandCenter.activeForeground',"
+  }
+]
diff --git a/.rebase/replace/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts.json b/.rebase/replace/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts.json
@@ -0,0 +1,6 @@
+[
+  {
+    "from": "\t\tlet label = this._windowTitle.workspaceName;\n\t\tif (this._windowTitle.isCustomTitleFormat()) {",
+    "by": "\t\tlet label = this._windowTitle.workspaceName;\n\t\tconst header = this._windowTitle.getHeader();\n\t\tif (header) {\n\t\t\tlabel = header;\n\t\t} else if (this._windowTitle.isCustomTitleFormat()) {"
+  }
+]
diff --git a/.rebase/replace/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css.json b/.rebase/replace/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css.json
@@ -0,0 +1,6 @@
+[
+  {
+    "from": "/* Label - styled as placeholder text */\n.agent-status-label {\n\tflex: 1;\n\ttext-align: center;\n\twhite-space: nowrap;\n\toverflow: hidden;\n\ttext-overflow: ellipsis;\n\topacity: 0.6;\n}",
+    "by": "/* Label - styled as placeholder text */\n.agent-status-label {\n\tflex: 1;\n\ttext-align: center;\n\twhite-space: nowrap;\n\toverflow: hidden;\n\ttext-overflow: ellipsis;\n\tcolor: var(--vscode-agentStatusIndicator-labelForeground);\n}"
+  }
+]
diff --git a/code/build/lib/stylelint/vscode-known-variables.json b/code/build/lib/stylelint/vscode-known-variables.json
@@ -26,6 +26,7 @@
 		"--vscode-agentSessionSelectedBadge-border",
 		"--vscode-agentSessionSelectedUnfocusedBadge-border",
 		"--vscode-agentStatusIndicator-background",
+		"--vscode-agentStatusIndicator-labelForeground",
 		"--vscode-badge-background",
 		"--vscode-badge-foreground",
 		"--vscode-banner-background",
diff --git a/code/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css b/code/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css
@@ -90,9 +90,9 @@
 	height: 32px;
 	min-height: 32px;
 	padding: 0 8px 0 10px;
-	color: var(--vscode-titleBar-activeForeground);
-	background-color: var(--vscode-titleBar-activeBackground);
-	border-bottom: 1px solid var(--vscode-titleBar-border, transparent);
+	color: var(--vscode-editorGroupHeader-tabsForeground, var(--vscode-foreground));
+	background-color: var(--vscode-editorGroupHeader-tabsBackground);
+	border-bottom: 1px solid var(--vscode-editorGroupHeader-tabsBorder, transparent);
 
 	/* Modal Editor Sidebar Toggle */
 	.modal-editor-sidebar-toggle {
@@ -107,7 +107,7 @@
 		grid-column: 2;
 		font-size: 12px;
 		font-weight: 500;
-		color: var(--vscode-titleBar-activeForeground);
+		color: inherit;
 		overflow: hidden;
 
 		.monaco-icon-label {
@@ -185,7 +185,7 @@
 			width: 1px;
 			height: 16px;
 			margin: 0 4px;
-			background-color: var(--vscode-titleBar-activeForeground);
+			background-color: currentColor;
 			opacity: 0.3;
 		}
 	}
diff --git a/code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts b/code/src/vs/workbench/browser/parts/titlebar/windowTitle.ts
@@ -140,6 +140,10 @@ export class WindowTitle extends Disposable {
 		if (affectsTitleConfiguration || event.affectsConfiguration(WindowSettingNames.titleSeparator)) {
 			this.titleUpdater.schedule();
 		}
+
+		if (event.affectsConfiguration(WindowSettingNames.header)) {
+			this.onDidChangeEmitter.fire();
+		}
 	}
 
 	private checkTitleVariables(): void {
@@ -409,8 +413,7 @@ export class WindowTitle extends Disposable {
 	}
 
 	getHeader(): string | undefined{
-		const header = this.configurationService.inspect<string>(WindowSettingNames.header);
-		return header.value;
+		return this.configurationService.getValue<string>(WindowSettingNames.header);
 	}
 
 	isCustomTitleFormat(): boolean {
diff --git a/code/src/vs/workbench/common/theme.ts b/code/src/vs/workbench/common/theme.ts
@@ -717,6 +717,12 @@ export const COMMAND_CENTER_FOREGROUND = registerColor(
 	localize('commandCenter-foreground', "Foreground color of the command center"),
 	false
 );
+export const AGENT_STATUS_INDICATOR_LABEL_FOREGROUND = registerColor(
+	'agentStatusIndicator.labelForeground',
+	transparent(COMMAND_CENTER_FOREGROUND, 0.6),
+	localize('agentStatusIndicator-labelForeground', "Foreground color of the agent status indicator label in the titlebar. Defaults to a muted version of the command center foreground."),
+	false
+);
 export const COMMAND_CENTER_ACTIVEFOREGROUND = registerColor(
 	'commandCenter.activeForeground',
 	MENUBAR_SELECTION_FOREGROUND,
diff --git a/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts b/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts
@@ -1388,7 +1388,10 @@ export class AgentTitleBarStatusWidget extends BaseActionViewItem {
 
 		// Base label: custom title, workspace name, or file name when tabs are hidden
 		let label = this._windowTitle.workspaceName;
-		if (this._windowTitle.isCustomTitleFormat()) {
+		const header = this._windowTitle.getHeader();
+		if (header) {
+			label = header;
+		} else if (this._windowTitle.isCustomTitleFormat()) {
 			label = this._windowTitle.getWindowTitle();
 		} else if (!label && this.editorGroupsService.partOptions.showTabs === 'none') {
 			label = this._windowTitle.fileName ?? '';
diff --git a/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css b/code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css
@@ -113,7 +113,7 @@
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	opacity: 0.6;
+	color: var(--vscode-agentStatusIndicator-labelForeground);
 }
 
 /* Compact mode: left-aligned label, no icon */
diff --git a/rebase.sh b/rebase.sh
@@ -438,6 +438,16 @@ resolve_conflicts() {
       apply_changes_multi_line "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/titlebar/commandCenterControl.ts" ]]; then
       apply_changes_multi_line "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/agentTitleBarStatusWidget.ts" ]]; then
+      apply_changes_multi_line "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/agentSessions/experiments/media/agenttitlebarstatuswidget.css" ]]; then
+      apply_changes_multi_line "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/common/theme.ts" ]]; then
+      apply_changes_multi_line "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/build/lib/stylelint/vscode-known-variables.json" ]]; then
+      apply_changes_multi_line "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css" ]]; then
+      apply_changes_multi_line "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts" ]]; then
       apply_code_vs_extensions_contribution_changes
     elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/node/extensionManagementService.ts" ]]; then

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +[
 +  {
 +    "from": "\t\t\"--vscode-agentStatusIndicator-background\",\n\t\t\"--vscode-badge-background\",",
 +    "by": "\t\t\"--vscode-agentStatusIndicator-background\",\n\t\t\"--vscode-agentStatusIndicator-labelForeground\",\n\t\t\"--vscode-badge-background\","
 +  }
 +]
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"from": "\tisCustomTitleFormat(): boolean {",`
`8`		`- "by": "\tgetHeader(): string \| undefined{\n\t\tconst header = this.configurationService.inspect<string>(WindowSettingNames.header);\n\t\treturn header.value;\n\t}\n\n\tisCustomTitleFormat(): boolean {"`
	`8`	`+ "by": "\tgetHeader(): string \| undefined{\n\t\treturn this.configurationService.getValue<string>(WindowSettingNames.header);\n\t}\n\n\tisCustomTitleFormat(): boolean {"`
	`9`	`+ },`
	`10`	`+ {`
	`11`	`+ "from": "\t\tif (affectsTitleConfiguration \|\| event.affectsConfiguration(WindowSettingNames.titleSeparator)) {\n\t\t\tthis.titleUpdater.schedule();\n\t\t}\n\t}",`
	`12`	`+ "by": "\t\tif (affectsTitleConfiguration \|\| event.affectsConfiguration(WindowSettingNames.titleSeparator)) {\n\t\t\tthis.titleUpdater.schedule();\n\t\t}\n\n\t\tif (event.affectsConfiguration(WindowSettingNames.header)) {\n\t\t\tthis.onDidChangeEmitter.fire();\n\t\t}\n\t}"`
`9`	`13`	`}`
`10`	`14`	`]`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,10 @@ export class WindowTitle extends Disposable {`
`140`	`140`	`if (affectsTitleConfiguration \|\| event.affectsConfiguration(WindowSettingNames.titleSeparator)) {`
`141`	`141`	`this.titleUpdater.schedule();`
`142`	`142`	`}`
	`143`	`+`
	`144`	`+ if (event.affectsConfiguration(WindowSettingNames.header)) {`
	`145`	`+ this.onDidChangeEmitter.fire();`
	`146`	`+ }`
`143`	`147`	`}`
`144`	`148`
`145`	`149`	`private checkTitleVariables(): void {`
`@@ -409,8 +413,7 @@ export class WindowTitle extends Disposable {`
`409`	`413`	`}`
`410`	`414`
`411`	`415`	`getHeader(): string \| undefined{`
`412`		`- const header = this.configurationService.inspect<string>(WindowSettingNames.header);`
`413`		`- return header.value;`
	`416`	`+ return this.configurationService.getValue<string>(WindowSettingNames.header);`
`414`	`417`	`}`
`415`	`418`
`416`	`419`	`isCustomTitleFormat(): boolean {`