Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3483,15 +3483,6 @@
],
"description": "%github.copilot.config.alternateGeminiModelFPrompt.enabled%"
},
"github.copilot.chat.alternateZaiPrompt.enabled": {
"type": "boolean",
"default": false,
"tags": [
"experimental",
"onExp"
],
"description": "%github.copilot.config.alternateZaiPrompt.enabled%"
},
"github.copilot.chat.anthropic.useMessagesApi": {
"type": "boolean",
"default": true,
Expand Down
1 change: 0 additions & 1 deletion package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
"github.copilot.config.virtualTools.threshold": "This setting defines the tool count over which virtual tools should be used. Virtual tools group similar sets of tools together and they allow the model to activate them on-demand. Certain tool groups will optimistically be pre-activated. We are actively developing this feature and you experience degraded tool calling once the threshold is hit.\n\nMay be set to `0` to disable virtual tools.",
"github.copilot.config.alternateGptPrompt.enabled": "Enables an experimental alternate prompt for GPT models instead of the default prompt.",
"github.copilot.config.alternateGeminiModelFPrompt.enabled": "Enables an experimental alternate prompt for Gemini Model F instead of the default prompt.",
"github.copilot.config.alternateZaiPrompt.enabled": "Enables an experimental alternate prompt for Zai models instead of the default prompt.",
"github.copilot.config.gpt5CodexAlternatePrompt": "Specifies an experimental alternate prompt to use for the GPT-5-Codex model.",
"github.copilot.command.fixTestFailure": "Fix Test Failure",
"copilot.description": "Ask or edit in context",
Expand Down
17 changes: 2 additions & 15 deletions src/extension/prompts/node/agent/zaiPrompts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
*--------------------------------------------------------------------------------------------*/

import { PromptElement, PromptSizing } from '@vscode/prompt-tsx';
import { ConfigKey, IConfigurationService } from '../../../../platform/configuration/common/configurationService';
import { IChatEndpoint } from '../../../../platform/networking/common/networking';
import { IExperimentationService } from '../../../../platform/telemetry/common/nullExperimentationService';
import { ToolName } from '../../../tools/common/toolNames';
import { InstructionMessage } from '../base/instructionMessage';
import { ResponseTranslationRules } from '../base/responseTranslationRules';
import { Tag } from '../base/tag';
import { EXISTING_CODE_MARKER } from '../panel/codeBlockFormattingRules';
import { MathIntegrationRules } from '../panel/editorIntegrationRules';
import { ApplyPatchInstructions, CodesearchModeInstructions, DefaultAgentPrompt, DefaultAgentPromptProps, DefaultReminderInstructions, detectToolCapabilities, GenericEditingTips, McpToolInstructions, NotebookInstructions } from './defaultAgentInstructions';
import { ApplyPatchInstructions, CodesearchModeInstructions, DefaultAgentPromptProps, DefaultReminderInstructions, detectToolCapabilities, GenericEditingTips, McpToolInstructions, NotebookInstructions } from './defaultAgentInstructions';
import { FileLinkificationInstructions } from './fileLinkificationInstructions';
import { IAgentPrompt, PromptRegistry, ReminderInstructionsConstructor, SystemPrompt } from './promptRegistry';

Expand Down Expand Up @@ -167,11 +165,6 @@ class DefaultZaiAgentPrompt extends PromptElement<DefaultAgentPromptProps> {
}

class ZaiPromptResolver implements IAgentPrompt {
constructor(
@IConfigurationService private readonly configurationService: IConfigurationService,
@IExperimentationService private readonly experimentationService: IExperimentationService
) { }

// No specific family prefixes for Zai models as it can be hosted under various names
static readonly familyPrefixes: string[] = [];

Expand All @@ -186,16 +179,10 @@ class ZaiPromptResolver implements IAgentPrompt {
}

resolveSystemPrompt(endpoint: IChatEndpoint): SystemPrompt | undefined {
// A/B testing: Use custom Zai prompt when experiment flag is enabled (treatment),
// otherwise use default agent prompt (control)
if (this.configurationService.getExperimentBasedConfig(ConfigKey.EnableAlternateZaiPrompt, this.experimentationService)) {
return DefaultZaiAgentPrompt;
}
return DefaultAgentPrompt;
return DefaultZaiAgentPrompt;
}

resolveReminderInstructions(endpoint: IChatEndpoint): ReminderInstructionsConstructor | undefined {
// Keep reminder instructions consistent across both experiment variants
return DefaultReminderInstructions;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/platform/configuration/common/configurationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,6 @@ export namespace ConfigKey {

export const EnableAlternateGptPrompt = defineSetting<boolean>('chat.alternateGptPrompt.enabled', ConfigType.ExperimentBased, false);
export const EnableAlternateGeminiModelFPrompt = defineSetting<boolean>('chat.alternateGeminiModelFPrompt.enabled', ConfigType.ExperimentBased, false);
export const EnableAlternateZaiPrompt = defineSetting<boolean>('chat.alternateZaiPrompt.enabled', ConfigType.ExperimentBased, false);

export const EnableOrganizationCustomAgents = defineSetting<boolean>('chat.organizationCustomAgents.enabled', ConfigType.Simple, true);
export const EnableOrganizationInstructions = defineSetting<boolean>('chat.organizationInstructions.enabled', ConfigType.Simple, true);
Expand Down
Loading