Merge branch 'main' into adil/add_archgw

Author: adilhafeez

packages/types/src/__tests__/provider-settings.test.ts

@@ -12,6 +12,12 @@ describe("getApiProtocol", () => {
 			expect(getApiProtocol("claude-code")).toBe("anthropic")
 			expect(getApiProtocol("claude-code", "some-model")).toBe("anthropic")
 		})
+
+		it("should return 'anthropic' for bedrock provider", () => {
+			expect(getApiProtocol("bedrock")).toBe("anthropic")
+			expect(getApiProtocol("bedrock", "gpt-4")).toBe("anthropic")
+			expect(getApiProtocol("bedrock", "claude-3-opus")).toBe("anthropic")
+		})
 	})
 
 	describe("Vertex provider with Claude models", () => {
@@ -27,25 +33,14 @@ describe("getApiProtocol", () => {
 			expect(getApiProtocol("vertex", "gemini-pro")).toBe("openai")
 			expect(getApiProtocol("vertex", "llama-2")).toBe("openai")
 		})
-	})
-
-	describe("Bedrock provider with Claude models", () => {
-		it("should return 'anthropic' for bedrock provider with claude models", () => {
-			expect(getApiProtocol("bedrock", "claude-3-opus")).toBe("anthropic")
-			expect(getApiProtocol("bedrock", "Claude-3-Sonnet")).toBe("anthropic")
-			expect(getApiProtocol("bedrock", "CLAUDE-instant")).toBe("anthropic")
-			expect(getApiProtocol("bedrock", "anthropic.claude-v2")).toBe("anthropic")
-		})
 
-		it("should return 'openai' for bedrock provider with non-claude models", () => {
-			expect(getApiProtocol("bedrock", "gpt-4")).toBe("openai")
-			expect(getApiProtocol("bedrock", "titan-text")).toBe("openai")
-			expect(getApiProtocol("bedrock", "llama-2")).toBe("openai")
+		it("should return 'openai' for vertex provider without model", () => {
+			expect(getApiProtocol("vertex")).toBe("openai")
 		})
 	})
 
-	describe("Other providers with Claude models", () => {
-		it("should return 'openai' for non-vertex/bedrock providers with claude models", () => {
+	describe("Other providers", () => {
+		it("should return 'openai' for non-anthropic providers regardless of model", () => {
 			expect(getApiProtocol("openrouter", "claude-3-opus")).toBe("openai")
 			expect(getApiProtocol("openai", "claude-3-sonnet")).toBe("openai")
 			expect(getApiProtocol("litellm", "claude-instant")).toBe("openai")
@@ -59,20 +54,13 @@ describe("getApiProtocol", () => {
 			expect(getApiProtocol(undefined, "claude-3-opus")).toBe("openai")
 		})
 
-		it("should return 'openai' when model is undefined", () => {
-			expect(getApiProtocol("openai")).toBe("openai")
-			expect(getApiProtocol("vertex")).toBe("openai")
-			expect(getApiProtocol("bedrock")).toBe("openai")
-		})
-
 		it("should handle empty strings", () => {
 			expect(getApiProtocol("vertex", "")).toBe("openai")
-			expect(getApiProtocol("bedrock", "")).toBe("openai")
 		})
 
 		it("should be case-insensitive for claude detection", () => {
 			expect(getApiProtocol("vertex", "CLAUDE-3-OPUS")).toBe("anthropic")
-			expect(getApiProtocol("bedrock", "claude-3-opus")).toBe("anthropic")
+			expect(getApiProtocol("vertex", "claude-3-opus")).toBe("anthropic")
 			expect(getApiProtocol("vertex", "ClAuDe-InStAnT")).toBe("anthropic")
 		})
 	})

packages/types/src/global-settings.ts

@@ -159,6 +159,7 @@ export const SECRET_STATE_KEYS = [
 	"geminiApiKey",
 	"openAiNativeApiKey",
 	"deepSeekApiKey",
+	"moonshotApiKey",
 	"mistralApiKey",
 	"unboundApiKey",
 	"requestyApiKey",

packages/types/src/provider-settings.ts

@@ -22,6 +22,7 @@ export const providerNames = [
 	"gemini-cli",
 	"openai-native",
 	"mistral",
+	"moonshot",
 	"deepseek",
 	"archgw",
 	"unbound",
@@ -62,6 +63,7 @@ export const DEFAULT_CONSECUTIVE_MISTAKE_LIMIT = 3
 const baseProviderSettingsSchema = z.object({
 	includeMaxTokens: z.boolean().optional(),
 	diffEnabled: z.boolean().optional(),
+	todoListEnabled: z.boolean().optional(),
 	fuzzyMatchThreshold: z.number().optional(),
 	modelTemperature: z.number().nullish(),
 	rateLimitSeconds: z.number().optional(),
@@ -187,6 +189,13 @@ const deepSeekSchema = apiModelIdProviderModelSchema.extend({
 	deepSeekApiKey: z.string().optional(),
 })
 
+const moonshotSchema = apiModelIdProviderModelSchema.extend({
+	moonshotBaseUrl: z
+		.union([z.literal("https://api.moonshot.ai/v1"), z.literal("https://api.moonshot.cn/v1")])
+		.optional(),
+	moonshotApiKey: z.string().optional(),
+})
+
 const archgwSchema = apiModelIdProviderModelSchema.extend({
 	archgwBaseUrl: z.string().optional(),
 	archgwApiKey: z.string().optional(),
@@ -249,6 +258,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	openAiNativeSchema.merge(z.object({ apiProvider: z.literal("openai-native") })),
 	mistralSchema.merge(z.object({ apiProvider: z.literal("mistral") })),
 	deepSeekSchema.merge(z.object({ apiProvider: z.literal("deepseek") })),
+	moonshotSchema.merge(z.object({ apiProvider: z.literal("moonshot") })),
 	archgwSchema.merge(z.object({ apiProvider: z.literal("archgw") })),
 	unboundSchema.merge(z.object({ apiProvider: z.literal("unbound") })),
 	requestySchema.merge(z.object({ apiProvider: z.literal("requesty") })),
@@ -278,6 +288,7 @@ export const providerSettingsSchema = z.object({
 	...openAiNativeSchema.shape,
 	...mistralSchema.shape,
 	...deepSeekSchema.shape,
+	...moonshotSchema.shape,
 	...archgwSchema.shape,
 	...unboundSchema.shape,
 	...requestySchema.shape,
@@ -313,7 +324,7 @@ export const getModelId = (settings: ProviderSettings): string | undefined => {
 }
 
 // Providers that use Anthropic-style API protocol
-export const ANTHROPIC_STYLE_PROVIDERS: ProviderName[] = ["anthropic", "claude-code"]
+export const ANTHROPIC_STYLE_PROVIDERS: ProviderName[] = ["anthropic", "claude-code", "bedrock"]
 
 // Helper function to determine API protocol for a provider and model
 export const getApiProtocol = (provider: ProviderName | undefined, modelId?: string): "anthropic" | "openai" => {
@@ -322,13 +333,8 @@ export const getApiProtocol = (provider: ProviderName | undefined, modelId?: str
 		return "anthropic"
 	}
 
-	// For vertex and bedrock providers, check if the model ID contains "claude" (case-insensitive)
-	if (
-		provider &&
-		(provider === "vertex" || provider === "bedrock") &&
-		modelId &&
-		modelId.toLowerCase().includes("claude")
-	) {
+	// For vertex provider, check if the model ID contains "claude" (case-insensitive)
+	if (provider && provider === "vertex" && modelId && modelId.toLowerCase().includes("claude")) {
 		return "anthropic"
 	}
 

packages/types/src/providers/index.ts

@@ -9,6 +9,7 @@ export * from "./groq.js"
 export * from "./lite-llm.js"
 export * from "./lm-studio.js"
 export * from "./mistral.js"
+export * from "./moonshot.js"
 export * from "./ollama.js"
 export * from "./openai.js"
 export * from "./openrouter.js"

packages/types/src/providers/moonshot.ts

@@ -0,0 +1,22 @@
+import type { ModelInfo } from "../model.js"
+
+// https://platform.moonshot.ai/
+export type MoonshotModelId = keyof typeof moonshotModels
+
+export const moonshotDefaultModelId: MoonshotModelId = "kimi-k2-0711-preview"
+
+export const moonshotModels = {
+	"kimi-k2-0711-preview": {
+		maxTokens: 32_000,
+		contextWindow: 131_072,
+		supportsImages: false,
+		supportsPromptCache: true,
+		inputPrice: 0.6, // $0.60 per million tokens (cache miss)
+		outputPrice: 2.5, // $2.50 per million tokens
+		cacheWritesPrice: 0, // $0 per million tokens (cache miss)
+		cacheReadsPrice: 0.15, // $0.15 per million tokens (cache hit)
+		description: `Kimi K2 is a state-of-the-art mixture-of-experts (MoE) language model with 32 billion activated parameters and 1 trillion total parameters.`,
+	},
+} as const satisfies Record<string, ModelInfo>
+
+export const MOONSHOT_DEFAULT_TEMPERATURE = 0.6

src/api/index.ts

@@ -17,6 +17,7 @@ import {
 	GeminiHandler,
 	OpenAiNativeHandler,
 	DeepSeekHandler,
+	MoonshotHandler,
 	MistralHandler,
 	VsCodeLmHandler,
 	UnboundHandler,
@@ -90,6 +91,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new OpenAiNativeHandler(options)
 		case "deepseek":
 			return new DeepSeekHandler(options)
+		case "moonshot":
+			return new MoonshotHandler(options)
 		case "archgw":
 			return new ArchGwHandler(options)
 		case "vscode-lm":
@@ -113,6 +116,7 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 		case "litellm":
 			return new LiteLLMHandler(options)
 		default:
+			apiProvider satisfies "gemini-cli" | undefined
 			return new AnthropicHandler(options)
 	}
 }