feat(core): add api provider filtering for modes and workflow features (#665)

Author: mini2s

packages/types/src/experiment.ts

@@ -8,6 +8,7 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js"
 
 export const experimentIds = [
 	"chatSearch",
+	"commitReview",
 	"alwaysIncludeFileDetails",
 	"powerSteering",
 	"multiFileApplyDiff",
@@ -27,6 +28,7 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>
 export const experimentsSchema = z.object({
 	chatSearch: z.boolean().optional(),
 	alwaysIncludeFileDetails: z.boolean().optional(),
+	commitReview: z.boolean().optional(),
 	powerSteering: z.boolean().optional(),
 	multiFileApplyDiff: z.boolean().optional(),
 	preventFocusDisruption: z.boolean().optional(),

packages/types/src/mode.ts

@@ -71,6 +71,7 @@ export const modeConfigSchema = z.object({
 	groups: groupEntryArraySchema,
 	source: z.enum(["global", "project"]).optional(),
 	workflow: z.boolean().optional(),
+	apiProvider: z.string().optional(),
 })
 
 export type ModeConfig = z.infer<typeof modeConfigSchema>
@@ -145,6 +146,7 @@ const WORKFLOW_MODES: readonly modelType[] = [
 		groups: [],
 		source: "project",
 		workflow: true,
+		apiProvider: "zgsm",
 	},
 	{
 		slug: "requirements",
@@ -160,6 +162,7 @@ const WORKFLOW_MODES: readonly modelType[] = [
 		groups: ["read", "edit"],
 		source: "project",
 		workflow: true,
+		apiProvider: "zgsm",
 	},
 	{
 		slug: "task",
@@ -175,6 +178,7 @@ const WORKFLOW_MODES: readonly modelType[] = [
 		groups: ["read", "edit"],
 		source: "project",
 		workflow: true,
+		apiProvider: "zgsm",
 	},
 	{
 		slug: "test",
@@ -189,6 +193,7 @@ const WORKFLOW_MODES: readonly modelType[] = [
 		groups: ["read", "edit", "command"],
 		source: "project",
 		workflow: true,
+		apiProvider: "zgsm",
 	},
 	{
 		slug: "testguide",
@@ -199,6 +204,7 @@ const WORKFLOW_MODES: readonly modelType[] = [
 		groups: ["read", "edit", "command"],
 		source: "project",
 		workflow: true,
+		apiProvider: "zgsm",
 	},
 	{
 		slug: "review",
@@ -211,6 +217,7 @@ const WORKFLOW_MODES: readonly modelType[] = [
 		groups: ["read", "mcp", "browser"],
 		source: "project",
 		workflow: false,
+		apiProvider: "zgsm",
 	},
 ]
 

src/api/providers/zgsm.ts

@@ -277,6 +277,7 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 			"zgsm-task-id": metadata?.taskId || "",
 			"zgsm-request-id": requestId,
 			"zgsm-client-id": clientId,
+			"zgsm-provider": metadata?.provider,
 			"zgsm-project-path": encodeURI(workspacePath),
 			"x-caller": metadata?.mode === "review" ? "review-checker" : "chat",
 		}
@@ -563,7 +564,7 @@ export class ZgsmAiHandler extends BaseProvider implements SingleCompletionHandl
 				Object.assign(isAzureAiInference ? { path: OPENAI_AZURE_AI_INFERENCE_PATH } : {}, {
 					headers: {
 						...this.buildHeaders(
-							{ language: metadata?.language, taskId: requestId },
+							{ language: metadata?.language, taskId: requestId, provider: metadata?.provider },
 							requestId,
 							cachedClientId,
 							cachedWorkspacePath,

src/core/costrict/code-review/gitCommitListener.ts

@@ -2,6 +2,7 @@ import * as vscode from "vscode"
 import { API as GitAPI, Repository, GitExtension } from "./git"
 import type { CodeReviewService } from "./codeReviewService"
 import { t } from "../../../i18n"
+import { EXPERIMENT_IDS, experiments as Experiments } from "../../../shared/experiments"
 
 export class GitCommitListener {
 	private lastSeenCommitHash: string | undefined
@@ -53,7 +54,15 @@ export class GitCommitListener {
 	}
 
 	private setupRepositoryListener(repo: Repository): void {
-		const disposable = repo.onDidCommit(() => {
+		const disposable = repo.onDidCommit(async () => {
+			const provider = this.reviewService.getProvider()
+
+			if (!provider) return
+
+			const { experiments = {} } = await provider.getState()
+
+			if (!Experiments.isEnabled(experiments ?? {}, EXPERIMENT_IDS.COMMIT_REVIEW)) return
+
 			this.handleNewCommit(repo)
 		})
 		this.disposables.push(disposable)

src/core/costrict/workflow/CoworkflowFileWatcher.ts

@@ -248,7 +248,7 @@ export class CoworkflowFileWatcher implements ICoworkflowFileWatcher {
 			this.config.watchPatterns.forEach((pattern) => {
 				try {
 					const filePath = path.join(coworkflowPath, pattern)
-					const fileUri = vscode.Uri.file(filePath)
+					// const fileUri = vscode.Uri.file(filePath)
 					const globPattern = new vscode.RelativePattern(coworkflowPath, pattern)
 
 					const watcher = vscode.workspace.createFileSystemWatcher(globPattern)

src/core/task/Task.ts

@@ -1956,7 +1956,6 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 				maxReadFileLine = -1,
 				maxReadCharacterLimit = 20000,
 				apiRequestBlockHide = true,
-				apiConfiguration,
 			} = (await this.providerRef.deref()?.getState()) ?? {}
 
 			await this.say(
@@ -1967,7 +1966,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 						: currentUserContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n") +
 							"\n\nLoading...",
 					apiProtocol,
-					originModelId: apiConfiguration?.zgsmModelId,
+					originModelId:
+						this.apiConfiguration?.apiProvider === "zgsm"
+							? this.apiConfiguration?.zgsmModelId
+							: this.apiConfiguration?.apiModelId,
 				}),
 			)
 
@@ -2010,7 +2012,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					? undefined
 					: finalUserContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n"),
 				apiProtocol,
-				originModelId: apiConfiguration?.zgsmModelId,
+				originModelId:
+					this.apiConfiguration?.apiProvider === "zgsm"
+						? this.apiConfiguration?.zgsmModelId
+						: this.apiConfiguration?.apiModelId,
 			} satisfies ClineApiReqInfo)
 
 			await this.saveClineMessages()
@@ -2067,6 +2072,10 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 						cost: totalCost ?? costResult.totalCost,
 						cancelReason,
 						streamingFailedMessage,
+						originModelId:
+							this.apiConfiguration?.apiProvider === "zgsm"
+								? this.apiConfiguration?.zgsmModelId
+								: this.apiConfiguration?.apiModelId,
 					} satisfies ClineApiReqInfo)
 				}
 
@@ -2195,7 +2204,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 							case "automodel": {
 								// Check if it is Selected LLM information (only in Auto model mode).
 								if (
-									this.apiConfiguration.apiProvider === "zgsm" &&
+									this.apiConfiguration?.apiProvider === "zgsm" &&
 									lastApiReqIndex >= 0 &&
 									this.clineMessages[lastApiReqIndex]
 								) {
@@ -3169,6 +3178,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		const metadata: ApiHandlerCreateMessageMetadata = {
 			mode: mode,
 			zgsmCodeMode,
+			provider: this.apiConfiguration.apiProvider,
 			zgsmWorkflowMode: this.zgsmWorkflowMode,
 			rooTaskMode: this?.rootTask?._taskMode,
 			parentTaskMode: this?.parentTask?._taskMode,
@@ -3199,7 +3209,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			yield firstChunk.value
 			this.isWaitingForFirstChunk = false
 		} catch (error) {
-			const isZgsm = apiConfiguration?.apiProvider === "zgsm"
+			const isZgsm = this.apiConfiguration?.apiProvider === "zgsm"
 			let errorMsg = ""
 			if (isZgsm) {
 				const errorCodeManager = ErrorCodeManager.getInstance()

src/core/webview/webviewMessageHandler.ts

@@ -442,6 +442,21 @@ export const webviewMessageHandler = async (
 	}
 
 	switch (message.type) {
+		case "zgsmProviderTip": {
+			const { tipType = "", msg = "" } = message.values || {}
+
+			if (!tipType || !msg) break
+
+			if (tipType === "info") {
+				vscode.window.showInformationMessage(msg)
+			} else if (tipType === "warning") {
+				vscode.window.showWarningMessage(msg)
+			} else if (tipType === "error") {
+				vscode.window.showErrorMessage(msg)
+			}
+
+			break
+		}
 		case "zgsmLogin": {
 			try {
 				TelemetryService.instance.captureEvent(TelemetryEventName.AUTHENTICATION_INITIATED)
@@ -666,7 +681,9 @@ export const webviewMessageHandler = async (
 						const mcpHub = provider.getMcpHub()
 
 						if (mcpHub) {
-							await Promise.race([mcpHub.handleMcpEnabledChange(newValue as boolean), delay(1500)])
+							await Promise.race([mcpHub.handleMcpEnabledChange(newValue as boolean), delay(500)]).catch(
+								() => {},
+							)
 						}
 					} else if (key === "experiments") {
 						if (!value) {

src/shared/WebviewMessage.ts

@@ -157,6 +157,7 @@ export interface WebviewMessage {
 		| "useZgsmCustomConfig"
 		| "showZgsmCodebaseDisableConfirmDialog"
 		| "fetchZgsmQuotaInfo"
+		| "zgsmProviderTip"
 		| "fetchZgsmInviteCode"
 		| "fixCodebase"
 		| "zgsmFollowupClearTimeout"

src/shared/__tests__/experiments.spec.ts

@@ -28,6 +28,7 @@ describe("experiments", () => {
 			const experiments: Record<ExperimentId, boolean> = {
 				powerSteering: false,
 				multiFileApplyDiff: false,
+				commitReview: false,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				chatSearch: false,
@@ -43,6 +44,7 @@ describe("experiments", () => {
 				multiFileApplyDiff: false,
 				chatSearch: false,
 				alwaysIncludeFileDetails: false,
+				commitReview: false,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,
@@ -56,6 +58,7 @@ describe("experiments", () => {
 				multiFileApplyDiff: false,
 				chatSearch: false,
 				alwaysIncludeFileDetails: false,
+				commitReview: false,
 				preventFocusDisruption: false,
 				imageGeneration: false,
 				runSlashCommand: false,

src/shared/experiments.ts

@@ -3,6 +3,7 @@ import type { AssertEqual, Equals, Keys, Values, ExperimentId, Experiments } fro
 export const EXPERIMENT_IDS = {
 	CHAT_SEARCH: "chatSearch",
 	ALWAYS_INCLUDE_FILE_DETAILS: "alwaysIncludeFileDetails",
+	COMMIT_REVIEW: "commitReview",
 	MULTI_FILE_APPLY_DIFF: "multiFileApplyDiff",
 	POWER_STEERING: "powerSteering",
 	PREVENT_FOCUS_DISRUPTION: "preventFocusDisruption",
@@ -21,6 +22,7 @@ interface ExperimentConfig {
 export const experimentConfigsMap: Record<ExperimentKey, ExperimentConfig> = {
 	CHAT_SEARCH: { enabled: false },
 	ALWAYS_INCLUDE_FILE_DETAILS: { enabled: undefined },
+	COMMIT_REVIEW: { enabled: undefined },
 	MULTI_FILE_APPLY_DIFF: { enabled: false },
 	POWER_STEERING: { enabled: false },
 	PREVENT_FOCUS_DISRUPTION: { enabled: false },