hook up claude 3-7

Author: dlants

README.md

@@ -84,7 +84,7 @@ require('magenta').setup({
     model = "gpt-4o"
   },
   anthropic = {
-    model = "claude-3-5-sonnet-latest"
+    model = "claude-3-7-sonnet-latest"
   },
   bedrock = {
     model = "anthropic.claude-3-5-sonnet-20241022-v2:0",

lua/magenta/actions.lua

@@ -60,10 +60,11 @@ end
 
 M.pick_provider = function()
   local items = {
+    'anthropic claude-3-7-sonnet-latest',
+    'anthropic claude-3-5-sonnet-latest',
     'openai gpt-4o',
     'openai o1',
-    'openai o1-mini',
-    'anthropic claude-3-5-sonnet-latest'
+    'openai o1-mini'
   }
   vim.ui.select(items, { prompt = "Select Model", }, function (choice)
     if choice ~= nil then

lua/magenta/options.lua

@@ -6,7 +6,7 @@ local defaults = {
     model = "gpt-4o"
   },
   anthropic = {
-    model = "claude-3-5-sonnet-latest"
+    model = "claude-3-7-sonnet-latest"
   },
   bedrock = {
     model = "anthropic.claude-3-5-sonnet-20241022-v2:0",

node/chat/chat.ts

@@ -112,7 +112,7 @@ export function init({ nvim, lsp }: { nvim: Nvim; lsp: Lsp }) {
       lastUserMessageId: counter.last() as Message.MessageId,
       providerSetting: {
         provider: "anthropic",
-        model: "claude-3-5-sonnet-latest",
+        model: "claude-3-7-sonnet-latest",
       },
       conversation: {
         state: "stopped",

node/magenta.spec.ts

@@ -83,15 +83,15 @@ Awaiting response ⠁`);
 
         expect(state.model.providerSetting).toEqual({
           provider: "anthropic",
-          model: "claude-3-5-sonnet-latest",
+          model: "claude-3-7-sonnet-latest",
         });
       }
       await driver.showSidebar();
       const displayState = driver.getVisibleState();
       {
         const winbar = await displayState.inputWindow.getOption("winbar");
         expect(winbar).toBe(
-          `Magenta Input (anthropic claude-3-5-sonnet-latest)`,
+          `Magenta Input (anthropic claude-3-7-sonnet-latest)`,
         );
       }
       await driver.nvim.call("nvim_command", ["Magenta provider openai"]);

node/magenta.ts

@@ -57,7 +57,7 @@ export class Magenta {
     }
     this.sidebar = new Sidebar(this.nvim, {
       provider: "anthropic",
-      model: "claude-3-5-sonnet-latest",
+      model: "claude-3-7-sonnet-latest",
     });
 
     this.chatModel = Chat.init({ nvim, lsp });

node/options.ts

@@ -11,13 +11,13 @@ export type MagentaOptions = {
 export const DEFAULT_OPTIONS: MagentaOptions = {
   provider: "anthropic",
   anthropic: {
-    model: "claude-3-5-sonnet-latest",
+    model: "claude-3-7-sonnet-latest",
   },
   openai: {
     model: "gpt-4o",
   },
   bedrock: {
-    model: "anthropic.claude-3-5-sonnet-20241022-v2:0",
+    model: "anthropic.claude-3-7-sonnet-20241022-v2:0",
     promptCaching: false,
   },
   sidebarPosition: "left",

node/providers/anthropic.spec.ts

@@ -1,6 +1,10 @@
 import { describe, it, expect } from "vitest";
 import { placeCacheBreakpoints } from "./anthropic.ts";
 import type { MessageParam } from "./anthropic.ts";
+import type {
+  TextBlockParam,
+  ToolUseBlockParam,
+} from "@anthropic-ai/sdk/resources/index.mjs";
 
 describe("anthropic.ts", () => {
   it("placeCacheBreakpoints should add cache markers at appropriate positions", () => {
@@ -26,11 +30,17 @@ describe("anthropic.ts", () => {
 
     placeCacheBreakpoints(messages);
 
-    expect(messages[0].content[0].cache_control).toBeUndefined();
+    expect(
+      (messages[0].content[0] as TextBlockParam).cache_control,
+    ).toBeUndefined();
 
-    expect(messages[0].content[1].cache_control).toEqual({ type: "ephemeral" });
+    expect((messages[0].content[1] as TextBlockParam).cache_control).toEqual({
+      type: "ephemeral",
+    });
 
-    expect(messages[0].content[2].cache_control).toEqual({ type: "ephemeral" });
+    expect((messages[0].content[2] as TextBlockParam).cache_control).toEqual({
+      type: "ephemeral",
+    });
   });
 
   it("placeCacheBreakpoints should handle mixed content types", () => {
@@ -54,8 +64,12 @@ describe("anthropic.ts", () => {
 
     placeCacheBreakpoints(messages);
 
-    expect(messages[0].content[0].cache_control).toBeUndefined();
-    expect(messages[0].content[1].cache_control).toEqual({ type: "ephemeral" });
+    expect(
+      (messages[0].content[0] as TextBlockParam).cache_control,
+    ).toBeUndefined();
+    expect((messages[0].content[1] as ToolUseBlockParam).cache_control).toEqual(
+      { type: "ephemeral" },
+    );
   });
 
   it("placeCacheBreakpoints should not add cache markers for small content", () => {
@@ -73,6 +87,8 @@ describe("anthropic.ts", () => {
 
     placeCacheBreakpoints(messages);
 
-    expect(messages[0].content[0].cache_control).toBeUndefined();
+    expect(
+      (messages[0].content[0] as TextBlockParam).cache_control,
+    ).toBeUndefined();
   });
 });

node/providers/anthropic.ts

@@ -45,7 +45,7 @@ export class AnthropicProvider implements Provider {
     apiKeyRequired = true,
   ) {
     const apiKey = process.env.ANTHROPIC_API_KEY;
-    this.model = "claude-3-5-sonnet-latest";
+    this.model = "claude-3-7-sonnet-latest";
 
     if (apiKeyRequired && !apiKey) {
       throw new Error("Anthropic API key not found in config or environment");
@@ -127,12 +127,12 @@ export class AnthropicProvider implements Provider {
       },
     );
 
+    this.nvim.logger?.error(`anthropic model: ${this.model}`);
     return {
       messages: anthropicMessages,
       model: this.model,
       max_tokens: 4096,
       system: [
-        // @ts-expect-error setting cache_control to undefined
         {
           type: "text",
           text: DEFAULT_SYSTEM_PROMPT,
@@ -145,7 +145,7 @@ export class AnthropicProvider implements Provider {
             ? cacheControlItemsPlaced < 4
               ? { type: "ephemeral" }
               : null
-            : undefined,
+            : null,
         },
       ],
       tool_choice: {
@@ -639,7 +639,11 @@ export function placeCacheBreakpoints(messages: MessageParam[]): number {
     const targetLength = power * STR_CHARS_PER_TOKEN; // power is in tokens, but we want string chars instead
     // find the first block where we are past the target power
     const blockEntry = blocks.find((b) => b.acc > targetLength);
-    if (blockEntry) {
+    if (
+      blockEntry &&
+      blockEntry.block.type !== "thinking" &&
+      blockEntry.block.type !== "redacted_thinking"
+    ) {
       blockEntry.block.cache_control = { type: "ephemeral" };
     }
   }

package-lock.json

@@ -8,8 +8,8 @@
     "vitest": "^2.1.8"
   },
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.36.2",
     "@anthropic-ai/bedrock-sdk": "^0.12.4",
+    "@anthropic-ai/sdk": "^0.37.0",
     "eslint": "^9.17.0",
     "ignore": "^7.0.0",
     "nvim-node": "0.0.2",