update model family checks (#556)

* fix: update model family checks

* fix: simplify model family checks

Author: bhavyaus

src/extension/prompts/node/agent/agentInstructions.tsx

@@ -61,7 +61,7 @@ interface DefaultAgentPromptProps extends BasePromptElementProps {
 export class DefaultAgentPrompt extends PromptElement<DefaultAgentPromptProps> {
 	async render(state: void, sizing: PromptSizing) {
 		const tools = detectToolCapabilities(this.props.availableTools);
-		const isGpt5 = this.props.modelFamily === 'gpt-5';
+		const isGpt5 = this.props.modelFamily?.startsWith('gpt-5') === true;
 
 		return <InstructionMessage>
 			<Tag name='instructions'>
@@ -213,7 +213,7 @@ export class DefaultAgentPrompt extends PromptElement<DefaultAgentPromptProps> {
 export class AlternateGPTPrompt extends PromptElement<DefaultAgentPromptProps> {
 	async render(state: void, sizing: PromptSizing) {
 		const tools = detectToolCapabilities(this.props.availableTools);
-		const isGpt5 = this.props.modelFamily === 'gpt-5';
+		const isGpt5 = this.props.modelFamily?.startsWith('gpt-5') === true;
 
 		return <InstructionMessage>
 			<Tag name='gpt41AgentInstructions'>
@@ -620,7 +620,7 @@ export class ApplyPatchFormatInstructions extends PromptElement {
 
 class ApplyPatchInstructions extends PromptElement<DefaultAgentPromptProps> {
 	async render(state: void, sizing: PromptSizing) {
-		const isGpt5 = this.props.modelFamily === 'gpt-5';
+		const isGpt5 = this.props.modelFamily?.startsWith('gpt-5') === true;
 		return <Tag name='applyPatchInstructions'>
 			To edit files in the workspace, use the {ToolName.ApplyPatch} tool. If you have issues with it, you should first try to fix your patch and continue using {ToolName.ApplyPatch}. If you are stuck, you can fall back on the {ToolName.EditFile} tool. But {ToolName.ApplyPatch} is much faster and is the preferred tool.<br />
 			{isGpt5 && <>Prefer the smallest set of changes needed to satisfy the task. Avoid reformatting unrelated code; preserve existing style and public APIs unless the task requires changes. When practical, complete all edits for a file within a single message.<br /></>}

src/extension/prompts/node/agent/agentPrompt.tsx

@@ -288,7 +288,7 @@ export class AgentUserMessage extends PromptElement<AgentUserMessageProps> {
 		const hasEditFileTool = !!this.props.availableTools?.find(tool => tool.name === ToolName.EditFile);
 		const hasEditNotebookTool = !!this.props.availableTools?.find(tool => tool.name === ToolName.EditNotebook);
 		const hasTerminalTool = !!this.props.availableTools?.find(tool => tool.name === ToolName.CoreRunInTerminal);
-		const attachmentHint = (this.props.endpoint.family === 'gpt-4.1' || this.props.endpoint.family === 'gpt-5') && this.props.chatVariables.hasVariables() ?
+		const attachmentHint = (this.props.endpoint.family === 'gpt-4.1' || this.props.endpoint.family.startsWith('gpt-5')) && this.props.chatVariables.hasVariables() ?
 			' (See <attachments> above for file contents. You may not need to search or read the file again.)'
 			: '';
 		const hasToolsToEditNotebook = hasCreateFileTool || hasEditNotebookTool || hasReplaceStringTool || hasApplyPatchTool || hasEditFileTool;
@@ -360,7 +360,7 @@ class ToolReferencesHint extends PromptElement<ToolReferencesHintProps> {
 			<Tag name='toolReferences'>
 				The user attached the following tools to this message. The userRequest may refer to them using the tool name with "#". These tools are likely relevant to the user's query:<br />
 				{this.props.toolReferences.map(tool => `- ${tool.name}`).join('\n')} <br />
-				{this.props.modelFamily === 'gpt-5' && <>
+				{this.props.modelFamily?.startsWith('gpt-5') === true && <>
 					Start by using the most relevant tool attached to this message—the user expects you to act with it first.<br />
 				</>}
 			</Tag>
@@ -661,7 +661,7 @@ export class KeepGoingReminder extends PromptElement<IKeepGoingReminderProps> {
 	}
 
 	async render(state: void, sizing: PromptSizing) {
-		if (this.props.modelFamily === 'gpt-4.1' || this.props.modelFamily === 'gpt-5') {
+		if (this.props.modelFamily === 'gpt-4.1' || (this.props.modelFamily?.startsWith('gpt-5') === true)) {
 			if (this.configurationService.getExperimentBasedConfig(ConfigKey.EnableAlternateGptPrompt, this.experimentationService)) {
 				// Extended reminder
 				return <>
@@ -674,7 +674,7 @@ export class KeepGoingReminder extends PromptElement<IKeepGoingReminderProps> {
 					You MUST plan extensively before each function call, and reflect extensively on the outcomes of the previous function calls. DO NOT do this entire process by making function calls only, as this can impair your ability to solve the problem and think insightfully.<br />
 					You are a highly capable and autonomous agent, and you can definitely solve this problem without needing to ask the user for further input.<br />
 				</>;
-			} else if (this.props.modelFamily === 'gpt-5') {
+			} else if (this.props.modelFamily?.startsWith('gpt-5') === true) {
 				return <>
 					You are an agent—keep going until the user's query is completely resolved before ending your turn. ONLY stop if solved or genuinely blocked.<br />
 					Take action when possible; the user expects you to do useful work without unnecessary questions.<br />
@@ -696,7 +696,7 @@ export class KeepGoingReminder extends PromptElement<IKeepGoingReminderProps> {
 }
 
 function getExplanationReminder(modelFamily: string | undefined, hasTodoTool?: boolean) {
-	return modelFamily === 'gpt-5' ?
+	return modelFamily?.startsWith('gpt-5') === true ?
 		<>
 			Skip filler acknowledgements like “Sounds good” or “Okay, I will…”. Open with a purposeful one-liner about what you're doing next.<br />
 			When sharing setup or run steps, present terminal commands in fenced code blocks with the correct language tag. Keep commands copyable and on separate lines.<br />

src/platform/endpoint/common/chatModelCapabilities.ts

@@ -36,7 +36,7 @@ export function modelPrefersInstructionsAfterHistory(modelFamily: string) {
  * Model supports apply_patch as an edit tool.
  */
 export async function modelSupportsApplyPatch(model: LanguageModelChat | IChatEndpoint): Promise<boolean> {
-	if (model.family === 'gpt-4.1' || model.family === 'o4-mini' || model.family === 'gpt-5') {
+	if (model.family === 'gpt-4.1' || model.family === 'o4-mini' || model.family.startsWith('gpt-5')) {
 		return true;
 	}
 	return await getSha256Hash(model.family) === 'a99dd17dfee04155d863268596b7f6dd36d0a6531cd326348dbe7416142a21a3';
@@ -46,7 +46,7 @@ export async function modelSupportsApplyPatch(model: LanguageModelChat | IChatEn
  * Model prefers JSON notebook representation.
  */
 export function modelPrefersJsonNotebookRepresentation(model: LanguageModelChat | IChatEndpoint): boolean {
-	return model.family === 'gpt-4.1' || model.family === 'o4-mini' || model.family === 'gpt-5';
+	return model.family === 'gpt-4.1' || model.family === 'o4-mini' || model.family.startsWith('gpt-5');
 }
 
 /**