Remove unusable models; minor fixes

src/ClaudeDev.ts

@@ -353,7 +353,7 @@ export class ClaudeDev {
 		let totalInputTokens = 0
 		let totalOutputTokens = 0
 
-		while (this.requestCount < this.maxRequestsPerTask) {
+		while (!this.abort) {
 			const { didEndLoop, inputTokens, outputTokens } = await this.recursivelyMakeClaudeRequests([
 				textBlock,
 				...imageBlocks,
@@ -366,7 +366,7 @@ export class ClaudeDev {
 
 			//const totalCost = this.calculateApiCost(totalInputTokens, totalOutputTokens)
 			if (didEndLoop) {
-				// for now this never happens
+				// For now a task never 'completes'. This will only happen if the user hits max requests and denies resetting the count.
 				//this.say("task_completed", `Task completed. Total API usage cost: ${totalCost}`)
 				break
 			} else {

src/shared/api.ts

@@ -133,24 +133,25 @@ export const openRouterModels = {
 		inputPrice: 10,
 		outputPrice: 30,
 	},
-	"meta-llama/llama-3.1-405b-instruct": {
-		maxTokens: 2048,
-		supportsImages: false,
-		inputPrice: 2.7,
-		outputPrice: 2.7,
-	},
-	"meta-llama/llama-3.1-70b-instruct": {
-		maxTokens: 2048,
-		supportsImages: false,
-		inputPrice: 0.52,
-		outputPrice: 0.75,
-	},
-	"meta-llama/llama-3.1-8b-instruct": {
-		maxTokens: 2048,
-		supportsImages: false,
-		inputPrice: 0.06,
-		outputPrice: 0.06,
-	},
+	// llama 3.1 models cannot use tools yet
+	// "meta-llama/llama-3.1-405b-instruct": {
+	// 	maxTokens: 2048,
+	// 	supportsImages: false,
+	// 	inputPrice: 2.7,
+	// 	outputPrice: 2.7,
+	// },
+	// "meta-llama/llama-3.1-70b-instruct": {
+	// 	maxTokens: 2048,
+	// 	supportsImages: false,
+	// 	inputPrice: 0.52,
+	// 	outputPrice: 0.75,
+	// },
+	// "meta-llama/llama-3.1-8b-instruct": {
+	// 	maxTokens: 2048,
+	// 	supportsImages: false,
+	// 	inputPrice: 0.06,
+	// 	outputPrice: 0.06,
+	// },
 	"google/gemini-pro-1.5": {
 		maxTokens: 8192,
 		supportsImages: true,
@@ -163,46 +164,38 @@ export const openRouterModels = {
 		inputPrice: 0.25,
 		outputPrice: 0.75,
 	},
+	// while deepseek coder can use tools, it may sometimes send tool invocation as a text block
 	"deepseek/deepseek-coder": {
 		maxTokens: 4096,
 		supportsImages: false,
 		inputPrice: 0.14,
 		outputPrice: 0.28,
 	},
+	// mistral models can use tools but aren't great at going step-by-step and proceeding to the next step
 	"mistralai/mistral-large": {
 		maxTokens: 8192,
 		supportsImages: false,
 		inputPrice: 3,
 		outputPrice: 9,
 	},
-	"mistralai/mistral-medium": {
-		maxTokens: 4096,
-		supportsImages: false,
-		inputPrice: 2.7,
-		outputPrice: 8.1,
-	},
-	"mistralai/mistral-small": {
-		maxTokens: 4096,
-		supportsImages: false,
-		inputPrice: 2,
-		outputPrice: 6,
-	},
-	"mistralai/mistral-7b-instruct-v0.1": {
-		maxTokens: 4096,
-		supportsImages: false,
-		inputPrice: 0.06,
-		outputPrice: 0.06,
-	},
-	"cohere/command-r-plus": {
-		maxTokens: 4000,
-		supportsImages: false,
-		inputPrice: 3,
-		outputPrice: 15,
-	},
-	"cohere/command-r": {
-		maxTokens: 4000,
-		supportsImages: false,
-		inputPrice: 0.5,
-		outputPrice: 1.5,
-	},
+	// This model is not capable of complex system/tool prompts
+	// "mistralai/mistral-7b-instruct-v0.1": {
+	// 	maxTokens: 4096,
+	// 	supportsImages: false,
+	// 	inputPrice: 0.06,
+	// 	outputPrice: 0.06,
+	// },
+	// cohere models are not capable of complex system/tool prompts
+	// "cohere/command-r-plus": {
+	// 	maxTokens: 4000,
+	// 	supportsImages: false,
+	// 	inputPrice: 3,
+	// 	outputPrice: 15,
+	// },
+	// "cohere/command-r": {
+	// 	maxTokens: 4000,
+	// 	supportsImages: false,
+	// 	inputPrice: 0.5,
+	// 	outputPrice: 1.5,
+	// },
 } as const satisfies Record<string, ModelInfo>