merge: resolve conflicts after upstream merge

2025-12-20 04:11:10 -05:00 · 2025-01-08 23:47:26 +03:00
parent 58bc329481 f12c342cf4
commit d5fd2bbb82
34 changed files with 2418 additions and 175 deletions
--- a/src/shared/api.ts
+++ b/src/shared/api.ts
@@ -486,6 +486,14 @@ export type OpenAiNativeModelId = keyof typeof openAiNativeModels
 export const openAiNativeDefaultModelId: OpenAiNativeModelId = "gpt-4o"
 export const openAiNativeModels = {
 	// don't support tool use yet
+	"o1": {
+		maxTokens: 100_000,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 15,
+		outputPrice: 60,
+	},
 	"o1-preview": {
 		maxTokens: 32_768,
 		contextWindow: 128_000,