lockToCodingAgent earlier (microsoft#258706)

* lockToCodingAgent earlier

* remove unneeded chatInputState

Author: joshspicer

src/vs/workbench/contrib/chat/browser/chat.ts

@@ -227,7 +227,7 @@ export interface IChatWidget {
 	waitForReady(): Promise<void>;
 	getViewState(): IChatViewState;
 	togglePaused(): void;
-	lockToCodingAgent(name: string): void;
+	lockToCodingAgent(name: string, displayName: string): void;
 
 	delegateScrollFromMouseWheelEvent(event: IMouseWheelEvent): void;
 }

src/vs/workbench/contrib/chat/browser/chatEditor.ts

@@ -121,32 +121,33 @@ export class ChatEditor extends EditorPane {
 	override async setInput(input: ChatEditorInput, options: IChatEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		super.setInput(input, options, context, token);
 
-		const editorModel = await input.resolve();
-		if (!editorModel) {
-			throw new Error(`Failed to get model for chat editor. id: ${input.sessionId}`);
-		}
-
 		if (!this.widget) {
 			throw new Error('ChatEditor lifecycle issue: no editor widget');
 		}
 
-		const viewState = options?.viewState ?? input.options.viewState;
-		this.updateModel(editorModel.model, viewState);
-		const isAlreadyLocked = !!(viewState as IChatViewState | undefined)?.inputState?.lockedToCodingAgent;
-
-		// Only apply specific locking for dedicated coding agent sessions if not already locked
-		if (!isAlreadyLocked && input.resource.scheme === Schemas.vscodeChatSession) {
+		if (input.resource.scheme === Schemas.vscodeChatSession) {
 			const identifier = ChatSessionUri.parse(input.resource);
 			if (identifier) {
 				const contributions = this.chatSessionsService.getChatSessionContributions();
 				const contribution = contributions.find(c => c.type === identifier.chatSessionType);
 				if (contribution) {
-					this.widget.lockToCodingAgent(contribution.name);
+					this.widget.lockToCodingAgent(contribution.name, contribution.displayName);
+				} else {
+					this.widget.unlockFromCodingAgent();
 				}
+			} else {
+				this.widget.unlockFromCodingAgent();
 			}
 		} else {
 			this.widget.unlockFromCodingAgent();
 		}
+
+		const editorModel = await input.resolve();
+		if (!editorModel) {
+			throw new Error(`Failed to get model for chat editor. id: ${input.sessionId}`);
+		}
+		const viewState = options?.viewState ?? input.options.viewState;
+		this.updateModel(editorModel.model, viewState);
 	}
 
 	private updateModel(model: IChatModel, viewState?: IChatViewState): void {

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -1506,8 +1506,11 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		this.container.setAttribute('data-session-id', model.sessionId);
 		this.viewModel = this.instantiationService.createInstance(ChatViewModel, model, this._codeBlockModelCollection);
 
-		// Apply any placeholder from the view model immediately
-		if (this.viewModel.inputPlaceholder) {
+		if (this._lockedToCodingAgent) {
+			const placeholder = localize('chat.input.placeholder.lockedToAgent', "Follow up with {0}", this._lockedToCodingAgent);
+			this.viewModel.setInputPlaceholder(placeholder);
+			this.inputEditor.updateOptions({ placeholder });
+		} else if (this.viewModel.inputPlaceholder) {
 			this.inputEditor.updateOptions({ placeholder: this.viewModel.inputPlaceholder });
 		}
 
@@ -1610,22 +1613,12 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	}
 
 	// Coding agent locking methods
-	public lockToCodingAgent(name: string): void {
-		this._lockedToCodingAgent = name;
+	public lockToCodingAgent(name: string, displayName: string): void {
+		this._lockedToCodingAgent = displayName;
 		this._codingAgentPrefix = `@${name} `;
 		this._lockedToCodingAgentContextKey.set(true);
 		this.renderWelcomeViewContentIfNeeded();
 		this.input.setChatMode(ChatModeKind.Ask);
-
-		// Update the placeholder to show that we're locked to this agent
-		const localized = localize('chat.input.placeholder.lockedToAgent', "Chat with @{0}", name);
-		if (this.viewModel) {
-			this.viewModel.setInputPlaceholder(localized);
-		}
-		this.inputEditor.updateOptions({ placeholder: localized });
-
-		this.renderer.updateOptions({ restorable: false, editable: false });
-		this.tree.rerender();
 	}
 
 	public unlockFromCodingAgent(): void {
@@ -1641,8 +1634,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		if (this.viewModel) {
 			this.viewModel.resetInputPlaceholder();
 		}
-
-		// Also clear the editor's placeholder immediately for immediate visual feedback
 		this.inputEditor.updateOptions({ placeholder: undefined });
 		this.renderer.updateOptions({ restorable: true, editable: true });
 		this.tree.rerender();
@@ -1687,11 +1678,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 			}
 		});
 
-		// Save the locked coding agent state
-		if (this._lockedToCodingAgent) {
-			inputState.lockedToCodingAgent = this._lockedToCodingAgent;
-		}
-
 		return inputState;
 	}
 
@@ -2100,12 +2086,6 @@ export class ChatWidget extends Disposable implements IChatWidget {
 	getViewState(): IChatViewState {
 		// Get the input state which includes our locked agent (if any)
 		const inputState = this.input.getViewState();
-
-		// Ensure the locked agent state is included
-		if (this._lockedToCodingAgent && inputState && !inputState.lockedToCodingAgent) {
-			inputState.lockedToCodingAgent = this._lockedToCodingAgent;
-		}
-
 		return {
 			inputValue: this.getInput(),
 			inputState: inputState

src/vs/workbench/contrib/chat/common/chatWidgetHistoryService.ts

@@ -29,11 +29,6 @@ export interface IChatInputState {
 	 * { id: string } is the old IChatMode. This is deprecated but may still be in persisted data.
 	 */
 	chatMode?: ChatModeKind | string | { id: string };
-
-	/**
-	 * The name of the coding agent that the chat is locked to, if any.
-	 */
-	lockedToCodingAgent?: string;
 }
 
 export const IChatWidgetHistoryService = createDecorator<IChatWidgetHistoryService>('IChatWidgetHistoryService');