lsd-pi 1.1.2 → 1.1.3

package/packages/pi-coding-agent/src/core/settings-manager.ts

@@ -115,6 +115,7 @@ export interface Settings {
 	defaultProvider?: string;
 	defaultModel?: string;
 	budgetSubagentModel?: string;
+	planModeReasoningModel?: string;
 	permissionMode?: "danger-full-access" | "accept-on-edit" | "auto" | "plan";
 	classifierModel?: string;
 	defaultThinkingLevel?: "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
@@ -122,6 +123,7 @@ export interface Settings {
 	steeringMode?: "all" | "one-at-a-time";
 	followUpMode?: "all" | "one-at-a-time";
 	theme?: string;
+	themeAccent?: string;
 	compaction?: CompactionSettings;
 	branchSummary?: BranchSummarySettings;
 	retry?: RetrySettings;
@@ -164,6 +166,14 @@ export interface Settings {
 	rtk?: boolean; // default: false — enable RTK shell-command compression (requires restart)
 }
 
+function isQualifiedProviderModelRef(value: unknown): value is string {
+	if (typeof value !== "string") return false;
+	const trimmed = value.trim();
+	if (!trimmed) return false;
+	const parts = trimmed.split("/");
+	return parts.length === 2 && parts.every((part) => part.trim().length > 0);
+}
+
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
 function deepMergeSettings(base: Settings, overrides: Settings): Settings {
 	const result: Settings = { ...base };
@@ -415,6 +425,14 @@ export class SettingsManager {
 			}
 		}
 
+		if (
+			"planModeReasoningModel" in settings &&
+			settings.planModeReasoningModel !== undefined &&
+			!isQualifiedProviderModelRef(settings.planModeReasoningModel)
+		) {
+			delete settings.planModeReasoningModel;
+		}
+
 		return settings as Settings;
 	}
 
@@ -670,6 +688,12 @@ export class SettingsManager {
 		return this.settings.budgetSubagentModel;
 	}
 
+	getPlanModeReasoningModel(): string | undefined {
+		return isQualifiedProviderModelRef(this.settings.planModeReasoningModel)
+			? this.settings.planModeReasoningModel.trim()
+			: undefined;
+	}
+
 	getPermissionMode(): "danger-full-access" | "accept-on-edit" | "auto" | "plan" {
 		return this.settings.permissionMode ?? "accept-on-edit";
 	}
@@ -696,6 +720,19 @@ export class SettingsManager {
 		this.setGlobalSetting("budgetSubagentModel", modelRef);
 	}
 
+	setPlanModeReasoningModel(modelRef: string | undefined): void {
+		if (modelRef === undefined) {
+			delete this.globalSettings.planModeReasoningModel;
+			this.markModified("planModeReasoningModel");
+			this.save();
+			return;
+		}
+		if (!isQualifiedProviderModelRef(modelRef)) {
+			throw new Error(`planModeReasoningModel must be in provider/id format. Received: ${modelRef}`);
+		}
+		this.setGlobalSetting("planModeReasoningModel", modelRef.trim());
+	}
+
 	setPermissionMode(mode: "danger-full-access" | "accept-on-edit" | "auto" | "plan"): void {
 		this.setGlobalSetting("permissionMode", mode);
 	}
@@ -750,6 +787,20 @@ export class SettingsManager {
 		this.setGlobalSetting("theme", theme);
 	}
 
+	getThemeAccent(): string | undefined {
+		return this.settings.themeAccent;
+	}
+
+	setThemeAccent(accent: string | undefined): void {
+		if (accent === undefined) {
+			delete this.globalSettings.themeAccent;
+			this.markModified("themeAccent");
+			this.save();
+			return;
+		}
+		this.setGlobalSetting("themeAccent", accent);
+	}
+
 	getDefaultThinkingLevel(): "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | undefined {
 		return this.settings.defaultThinkingLevel;
 	}
@@ -828,7 +879,7 @@ export class SettingsManager {
 	}
 
 	getHideThinkingBlock(): boolean {
-		return this.settings.hideThinkingBlock ?? false;
+		return this.settings.hideThinkingBlock ?? true;
 	}
 
 	setHideThinkingBlock(hide: boolean): void {

package/packages/pi-coding-agent/src/core/skill-tool.test.ts

@@ -97,7 +97,7 @@ describe("Skill tool", () => {
 		assert.match(message, /swift-testing/);
 	});
 
-	it("supports direct slash aliases for user-invocable skills", async () => {
+	it("expands explicit /skill:name invocations", async () => {
 		writeSkill(
 			testDir,
 			"teams-plan",
@@ -106,16 +106,29 @@ describe("Skill tool", () => {
 			"user-invocable: true",
 		);
 		const session = await createSession();
-		const loadedSkill = session.resourceLoader.getSkills().skills.find((skill) => skill.name === "teams-plan");
-		assert.equal(loadedSkill?.userInvocable, true);
 		const expanded = (session as unknown as { _expandSkillCommand: (text: string) => string })._expandSkillCommand(
-			"/teams-plan build auth",
+			"/skill:teams-plan build auth",
 		);
 		assert.match(expanded, /<skill name="teams-plan"/);
 		assert.match(expanded, /build auth/);
 	});
 
-	it("does not treat non-invocable skills as direct slash aliases", async () => {
+	it("does not expand bare /name aliases even when user-invocable is set", async () => {
+		writeSkill(
+			testDir,
+			"teams-plan",
+			"Plan and build a feature.",
+			"# Teams Plan\nUse this skill.\n",
+			"user-invocable: true",
+		);
+		const session = await createSession();
+		const expanded = (session as unknown as { _expandSkillCommand: (text: string) => string })._expandSkillCommand(
+			"/teams-plan build auth",
+		);
+		assert.equal(expanded, "/teams-plan build auth");
+	});
+
+	it("does not treat bare /name skill invocations as commands when no skill: prefix is used", async () => {
 		writeSkill(testDir, "internal-skill", "Internal only.", "# Internal\n");
 		const session = await createSession();
 		const expanded = (session as unknown as { _expandSkillCommand: (text: string) => string })._expandSkillCommand(

package/packages/pi-coding-agent/src/core/skills.ts

@@ -425,10 +425,11 @@ export function loadSkills(options: LoadSkillsOptions = {}): LoadSkillsResult {
 	}
 
 	if (includeDefaults) {
-		// Primary global location for LSD.
-		addSkills(loadSkillsFromDirInternal(ECOSYSTEM_SKILLS_DIR, "user", true));
 		// Preferred project-local location for LSD repos.
+		// Load this first so project skills shadow user/global skills with the same name.
 		addSkills(loadSkillsFromDirInternal(resolve(cwd, ECOSYSTEM_PROJECT_SKILLS_DIR, "skills"), "project", true));
+		// Primary global location for LSD.
+		addSkills(loadSkillsFromDirInternal(ECOSYSTEM_SKILLS_DIR, "user", true));
 		// Compatibility fallback: shared Agent Skills ecosystem directory.
 		if (COMPAT_ECOSYSTEM_SKILLS_DIR !== ECOSYSTEM_SKILLS_DIR) {
 			addSkills(loadSkillsFromDirInternal(COMPAT_ECOSYSTEM_SKILLS_DIR, "user", true));

package/packages/pi-coding-agent/src/index.ts

@@ -1,7 +1,7 @@
 // Core session management
 
 // Config paths
-export { getAgentDir, VERSION } from "./config.js";
+export { CONFIG_DIR_NAME, getAgentDir, VERSION } from "./config.js";
 export { resetStdinForTui } from "./utils/reset-stdin.js";
 export {
 	AgentSession,

package/packages/pi-coding-agent/src/main.ts

@@ -523,7 +523,7 @@ export async function main(args: string[]) {
 	const { initialMessage, initialImages } = await prepareInitialMessage(parsed, settingsManager.getImageAutoResize());
 	const isInteractive = !parsed.print && parsed.mode === undefined;
 	const mode = parsed.mode || "text";
-	initTheme(settingsManager.getTheme(), isInteractive);
+	initTheme(settingsManager.getTheme(), isInteractive, settingsManager.getThemeAccent());
 
 	// Show deprecation warnings in interactive mode
 	if (isInteractive && deprecationWarnings.length > 0) {

package/packages/pi-coding-agent/src/modes/interactive/components/bash-execution.ts

@@ -95,8 +95,8 @@ export class BashExecutionComponent extends Container {
 		let text = theme.fg(this.colorKey, theme.bold(`$ ${this.command}`));
 		if (this.rtkActive) {
 			const badge = this.rtkFlashOn
-				? theme.fg("accent", "⚡ RTK")
-				: theme.fg("dim", "⚡ RTK");
+				? theme.fg("accent", "$ RTK")
+				: theme.fg("dim", "$ RTK");
 			text = `${text}  ${badge}`;
 		}
 		return text;

package/packages/pi-coding-agent/src/modes/interactive/components/footer.ts

@@ -169,13 +169,10 @@ export class FooterComponent implements Component {
 
 		// Colorize context percentage based on usage
 		let contextPercentStr: string;
-		const autoIndicator = this.autoCompactEnabled ? " (auto)" : "";
 		const contextPercentDisplay =
 			contextPercent === "?"
-				? `?/${formatTokens(contextWindow)}${autoIndicator}`
-				: contextTokens !== null
-					? `${formatTokens(contextTokens)} ${contextPercent}%/${formatTokens(contextWindow)}${autoIndicator}`
-					: `${contextPercent}%/${formatTokens(contextWindow)}${autoIndicator}`;
+				? `?/${formatTokens(contextWindow)}`
+				: `${contextPercent}%/${formatTokens(contextWindow)}`;
 		if (contextPercentValue > 90) {
 			contextPercentStr = theme.fg("error", contextPercentDisplay);
 		} else if (contextPercentValue > 70) {
@@ -186,14 +183,16 @@ export class FooterComponent implements Component {
 		statsParts.push(contextPercentStr);
 
 		const currentPermissionMode = getPermissionMode();
-		const permissionModeLabel =
-			currentPermissionMode === "danger-full-access"
-				? "⚡ full-access"
-				: currentPermissionMode === "accept-on-edit"
-					? "✓ accept-edit"
-					: currentPermissionMode === "auto"
-						? "🤖 auto"
-						: "📝 plan";
+		let permissionModeLabel: string;
+		if (currentPermissionMode === "danger-full-access") {
+			permissionModeLabel = theme.fg("error", "⚡ full-access");
+		} else if (currentPermissionMode === "accept-on-edit") {
+			permissionModeLabel = theme.fg("success", "✓ accept-edit");
+		} else if (currentPermissionMode === "auto") {
+			permissionModeLabel = theme.fg("warning", "🤖 auto");
+		} else {
+			permissionModeLabel = theme.fg("violet", "📝 plan");
+		}
 		statsParts.push(permissionModeLabel);
 
 		let statsLeft = statsParts.join(" ");

package/packages/pi-coding-agent/src/modes/interactive/components/settings-selector.ts

@@ -11,7 +11,7 @@ import {
 	Spacer,
 	Text,
 } from "@gsd/pi-tui";
-import { getSelectListTheme, getSettingsListTheme, theme } from "../theme/theme.js";
+import { getSelectListTheme, getSettingsListTheme, getThemeAccentInfo, getThemeAccentLabel, theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
 
 export const THINKING_DESCRIPTIONS: Record<ThinkingLevel, string> = {
@@ -28,6 +28,7 @@ export interface SettingsConfig {
 	autoCompactThresholdPercent: number;
 	classifierModel: string;
 	budgetSubagentModel: string;
+	planModeReasoningModel: string;
 	showImages: boolean;
 	autoResizeImages: boolean;
 	blockImages: boolean;
@@ -41,6 +42,8 @@ export interface SettingsConfig {
 	availableThinkingLevels: ThinkingLevel[];
 	currentTheme: string;
 	availableThemes: string[];
+	currentThemeAccent: string;
+	availableThemeAccents: string[];
 	hideThinkingBlock: boolean;
 	collapseChangelog: boolean;
 	doubleEscapeAction: "fork" | "tree" | "none";
@@ -56,6 +59,7 @@ export interface SettingsConfig {
 	rtk: boolean;
 	classifierModelSubmenu?: (currentValue: string, done: (selectedValue?: string) => void) => Component;
 	budgetSubagentModelSubmenu?: (currentValue: string, done: (selectedValue?: string) => void) => Component;
+	planModeReasoningModelSubmenu?: (currentValue: string, done: (selectedValue?: string) => void) => Component;
 }
 
 export interface SettingsCallbacks {
@@ -63,6 +67,7 @@ export interface SettingsCallbacks {
 	onAutoCompactThresholdPercentChange: (percent: number) => void;
 	onClassifierModelChange: (modelRef: string) => void;
 	onBudgetSubagentModelChange: (modelRef: string) => void;
+	onPlanModeReasoningModelChange: (modelRef: string) => void;
 	onShowImagesChange: (enabled: boolean) => void;
 	onAutoResizeImagesChange: (enabled: boolean) => void;
 	onBlockImagesChange: (blocked: boolean) => void;
@@ -75,6 +80,7 @@ export interface SettingsCallbacks {
 	onThinkingLevelChange: (level: ThinkingLevel) => void;
 	onThemeChange: (theme: string) => void;
 	onThemePreview?: (theme: string) => void;
+	onThemeAccentChange: (accent: string) => void;
 	onHideThinkingBlockChange: (hidden: boolean) => void;
 	onCollapseChangelogChange: (collapsed: boolean) => void;
 	onDoubleEscapeActionChange: (action: "fork" | "tree" | "none") => void;
@@ -193,6 +199,13 @@ export class SettingsSelectorComponent extends Container {
 				currentValue: config.budgetSubagentModel,
 				submenu: config.budgetSubagentModelSubmenu,
 			},
+			{
+				id: "plan-mode-reasoning-model",
+				label: "Plan reasoning model",
+				description: "Optional provider/id model to switch to after plan approval",
+				currentValue: config.planModeReasoningModel,
+				submenu: config.planModeReasoningModelSubmenu,
+			},
 			{
 				id: "steering-mode",
 				label: "Steering mode",
@@ -309,6 +322,28 @@ export class SettingsSelectorComponent extends Container {
 						},
 					),
 			},
+			{
+				id: "theme-accent",
+				label: "Main accent",
+				description: "Primary accent color used by the interface",
+				currentValue: config.currentThemeAccent,
+				submenu: (currentValue, done) =>
+					new SelectSubmenu(
+						"Main Accent",
+						"Select the primary accent color",
+						config.availableThemeAccents.map((accent) => ({
+							value: accent,
+							label: getThemeAccentLabel(accent as Parameters<typeof getThemeAccentInfo>[0]),
+							description: getThemeAccentInfo(accent as Parameters<typeof getThemeAccentInfo>[0]).description,
+						})),
+						currentValue,
+						(value) => {
+							callbacks.onThemeAccentChange(value);
+							done(value);
+						},
+						() => done(),
+					),
+			},
 		];
 
 		// Only show image toggle if terminal supports it
@@ -463,6 +498,9 @@ export class SettingsSelectorComponent extends Container {
 					case "budget-subagent-model":
 						callbacks.onBudgetSubagentModelChange(newValue);
 						break;
+					case "plan-mode-reasoning-model":
+						callbacks.onPlanModeReasoningModelChange(newValue);
+						break;
 					case "show-images":
 						callbacks.onShowImagesChange(newValue === "true");
 						break;

package/packages/pi-coding-agent/src/modes/interactive/components/tool-execution.ts

@@ -562,7 +562,7 @@ export class ToolExecutionComponent extends Container {
 		const commandDisplay =
 			command === null ? theme.fg("error", "[invalid arg]") : command ? command : theme.fg("toolOutput", "...");
 		const rtkBadge = rtkActive
-			? "  " + (this.rtkFlashOn ? theme.fg("accent", "⚡ RTK") : theme.fg("dim", "⚡ RTK"))
+			? "  " + (this.rtkFlashOn ? theme.fg("accent", "$ RTK") : theme.fg("dim", "$ RTK"))
 			: "";
 		this.contentBox.addChild(
 			new Text(theme.fg("toolTitle", theme.bold(`$ ${commandDisplay}`)) + timeoutSuffix + rtkBadge, 0, 0),

package/packages/pi-coding-agent/src/modes/interactive/controllers/chat-controller.ts

@@ -78,6 +78,14 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				host.defaultWorkingMessage,
 			);
 			host.statusContainer.addChild(host.loadingAnimation);
+			// Show steer/queue hint in editor bottom border while agent is running
+			{
+				const enterKey = theme.fg("dim", "↵");
+				const followUpKey = theme.fg("dim", appKey(host.keybindings, "followUp"));
+				const steerLabel = theme.fg("muted", " steer");
+				const queueLabel = theme.fg("muted", " queue");
+				host.defaultEditor.bottomHint = `${enterKey}${steerLabel}  ${followUpKey}${queueLabel}`;
+			}
 			if (host.pendingWorkingMessage !== undefined) {
 				if (host.pendingWorkingMessage) {
 					host.loadingAnimation.setMessage(host.pendingWorkingMessage);
@@ -254,6 +262,8 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				host.streamingMessage = undefined;
 			}
 			host.pendingTools.clear();
+			// Clear the steer/queue hint when agent finishes
+			host.defaultEditor.bottomHint = "";
 			await host.checkShutdownRequested();
 			host.ui.requestRender();
 			break;

package/packages/pi-coding-agent/src/modes/interactive/controllers/extension-ui-controller.ts

@@ -43,7 +43,7 @@ export function createExtensionUIContext(host: any): ExtensionUIContext {
 				host.ui.requestRender();
 				return { success: true };
 			}
-			const result = setTheme(themeOrName, true);
+			const result = setTheme(themeOrName, true, host.settingsManager.getThemeAccent());
 			if (result.success) {
 				if (host.settingsManager.getTheme() !== themeOrName) {
 					host.settingsManager.setTheme(themeOrName);

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts

@@ -109,6 +109,7 @@ import {
 	updateAvailableProviderCount as updateAvailableProviderCountController,
 } from "./controllers/model-controller.js";
 import {
+	getAvailableThemeAccents,
 	getAvailableThemes,
 	getAvailableThemesWithPaths,
 	getEditorTheme,
@@ -311,7 +312,7 @@ export class InteractiveMode {
 
 		// Register themes from resource loader and initialize
 		setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-		initTheme(this.settingsManager.getTheme(), true);
+		initTheme(this.settingsManager.getTheme(), true, this.settingsManager.getThemeAccent());
 	}
 
 	private setupAutocomplete(): void {
@@ -389,23 +390,10 @@ export class InteractiveMode {
 		this.skillCommands.clear();
 		const skillCommandList: SlashCommand[] = [];
 		if (this.settingsManager.getEnableSkillCommands()) {
-			const reservedSkillNames = new Set<string>([
-				...slashCommands.map((command) => command.name),
-				...templateCommands.map((command) => command.name),
-				...extensionCommands.map((command) => command.name),
-			]);
 			for (const skill of this.session.resourceLoader.getSkills().skills) {
 				const commandName = `skill:${skill.name}`;
 				this.skillCommands.set(commandName, skill.filePath);
-				if (skill.userInvocable && !reservedSkillNames.has(skill.name)) {
-					// Register short name in the map and show only the short name in autocomplete
-					// to avoid showing both "teams-plan" and "skill:teams-plan" as duplicates
-					this.skillCommands.set(skill.name, skill.filePath);
-					skillCommandList.push({ name: skill.name, description: skill.description });
-				} else {
-					// Not user-invocable or name is reserved — show only the skill: prefixed version
-					skillCommandList.push({ name: commandName, description: skill.description });
-				}
+				skillCommandList.push({ name: commandName, description: skill.description });
 			}
 		}
 
@@ -475,7 +463,7 @@ export class InteractiveMode {
 
 			// Add changelog if provided
 			if (this.changelogMarkdown) {
-				this.headerContainer.addChild(new DynamicBorder());
+				this.headerContainer.addChild(new DynamicBorder((text) => theme.fg("borderAccent", text)));
 				if (this.settingsManager.getCollapseChangelog()) {
 					const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
 					const latestVersion = versionMatch ? versionMatch[1] : this.version;
@@ -489,7 +477,7 @@ export class InteractiveMode {
 					);
 					this.headerContainer.addChild(new Spacer(1));
 				}
-				this.headerContainer.addChild(new DynamicBorder());
+				this.headerContainer.addChild(new DynamicBorder((text) => theme.fg("borderAccent", text)));
 			}
 		} else {
 			// Minimal header when silenced
@@ -2961,6 +2949,7 @@ export class InteractiveMode {
 					autoCompactThresholdPercent: this.settingsManager.getCompactionThresholdPercent(),
 					classifierModel: this.settingsManager.getClassifierModel() ?? "default",
 					budgetSubagentModel: this.settingsManager.getBudgetSubagentModel() ?? "default",
+					planModeReasoningModel: this.settingsManager.getPlanModeReasoningModel() ?? "default",
 					showImages: this.settingsManager.getShowImages(),
 					autoResizeImages: this.settingsManager.getImageAutoResize(),
 					blockImages: this.settingsManager.getBlockImages(),
@@ -2973,7 +2962,9 @@ export class InteractiveMode {
 					thinkingLevel: this.session.thinkingLevel,
 					availableThinkingLevels: this.session.getAvailableThinkingLevels(),
 					currentTheme: this.settingsManager.getTheme() || "dark",
+					currentThemeAccent: this.settingsManager.getThemeAccent() || "default",
 					availableThemes: getAvailableThemes(),
+					availableThemeAccents: getAvailableThemeAccents(),
 					hideThinkingBlock: this.hideThinkingBlock,
 					collapseChangelog: this.settingsManager.getCollapseChangelog(),
 					doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
@@ -3007,6 +2998,16 @@ export class InteractiveMode {
 							(model) => submenuDone(`${model.provider}/${model.id}`),
 							() => submenuDone(),
 						),
+					planModeReasoningModelSubmenu: (_currentValue, submenuDone) =>
+						new ModelSelectorComponent(
+							this.ui,
+							undefined,
+							this.settingsManager,
+							this.session.modelRegistry,
+							[],
+							(model) => submenuDone(`${model.provider}/${model.id}`),
+							() => submenuDone(),
+						),
 				},
 				{
 					onAutoCompactChange: (enabled) => {
@@ -3027,6 +3028,12 @@ export class InteractiveMode {
 							`Budget subagent model: ${modelRef === "default" ? "use current/default model" : modelRef}`,
 						);
 					},
+					onPlanModeReasoningModelChange: (modelRef) => {
+						this.settingsManager.setPlanModeReasoningModel(modelRef === "default" ? undefined : modelRef);
+						this.showStatus(
+							`Plan reasoning model: ${modelRef === "default" ? "use current model" : modelRef}`,
+						);
+					},
 					onShowImagesChange: (enabled) => {
 						this.settingsManager.setShowImages(enabled);
 						for (const child of this.chatContainer.children) {
@@ -3073,16 +3080,32 @@ export class InteractiveMode {
 						this.updateEditorBorderColor();
 					},
 					onThemeChange: (themeName) => {
-						const result = setTheme(themeName, true);
+						const result = setTheme(themeName, true, this.settingsManager.getThemeAccent());
 						this.settingsManager.setTheme(themeName);
+						this.updateEditorBorderColor();
 						this.ui.invalidate();
 						if (!result.success) {
 							this.showError(`Failed to load theme "${themeName}": ${result.error}\nFell back to dark theme.`);
 						}
 					},
+					onThemeAccentChange: (accent) => {
+						this.settingsManager.setThemeAccent(accent === "default" ? undefined : accent);
+						const result = setTheme(
+							this.settingsManager.getTheme() || "dark",
+							true,
+							this.settingsManager.getThemeAccent(),
+						);
+						this.updateEditorBorderColor();
+						this.ui.invalidate();
+						this.ui.requestRender();
+						if (!result.success) {
+							this.showError(`Failed to apply theme accent "${accent}": ${result.error}`);
+						}
+					},
 					onThemePreview: (themeName) => {
-						const result = setTheme(themeName, true);
+						const result = setTheme(themeName, true, this.settingsManager.getThemeAccent());
 						if (result.success) {
+							this.updateEditorBorderColor();
 							this.ui.invalidate();
 							this.ui.requestRender();
 						}
@@ -3785,7 +3808,10 @@ export class InteractiveMode {
 			setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
 			this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
 			const themeName = this.settingsManager.getTheme();
-			const themeResult = themeName ? setTheme(themeName, true) : { success: true };
+			const themeResult = themeName
+				? setTheme(themeName, true, this.settingsManager.getThemeAccent())
+				: { success: true };
+			this.updateEditorBorderColor();
 			if (!themeResult.success) {
 				this.showError(`Failed to load theme "${themeName}": ${themeResult.error}\nFell back to dark theme.`);
 			}