modelmix 4.4.6 → 4.4.8

package/README.md

@@ -47,7 +47,7 @@ import { ModelMix } from 'modelmix';
 
 // Get structured JSON responses
 const model = ModelMix.new()
-    .sonnet45() // Anthropic claude-sonnet-4-20250514
+    .sonnet46() // Anthropic claude-sonnet-4-6
     .addText("Name and capital of 3 South American countries.");
 
 const outputExample = { countries: [{ name: "", capital: "" }] };
@@ -65,7 +65,7 @@ const setup = {
 };
 
 const model = await ModelMix.new(setup)
-    .sonnet45() // (main model) Anthropic claude-sonnet-4-5-20250929
+    .sonnet46() // (main model) Anthropic claude-sonnet-4-5-20250929
     .gpt5mini() // (fallback 2) OpenAI gpt-5-mini
     .gemini3flash({ config: { temperature: 0 } }) // (fallback 3) Google gemini-3-flash
     .grok3mini() // (fallback 4) Grok grok-3-mini
@@ -146,9 +146,8 @@ Here's a comprehensive list of available methods:
 | `gptOss()`         | Together   | gpt-oss-120B                   | [\$0.15 / \$0.60][7]       |
 | `opus46[think]()`  | Anthropic  | claude-opus-4-6                | [\$5.00 / \$25.00][2]      |
 | `opus45[think]()`  | Anthropic  | claude-opus-4-5-20251101       | [\$5.00 / \$25.00][2]      |
-| `opus41[think]()`  | Anthropic  | claude-opus-4-1-20250805       | [\$15.00 / \$75.00][2]     |
+| `sonnet46[think]()`| Anthropic  | claude-sonnet-4-6              | [\$3.00 / \$15.00][2]      |
 | `sonnet45[think]()`| Anthropic  | claude-sonnet-4-5-20250929     | [\$3.00 / \$15.00][2]      |
-| `sonnet4[think]()` | Anthropic  | claude-sonnet-4-20250514       | [\$3.00 / \$15.00][2]      |
 | `haiku35()`        | Anthropic  | claude-3-5-haiku-20241022      | [\$0.80 / \$4.00][2]       |
 | `haiku45[think]()` | Anthropic  | claude-haiku-4-5-20251001      | [\$1.00 / \$5.00][2]       |
 | `gemini3pro()`     | Google     | gemini-3-pro-preview           | [\$2.00 / \$12.00][3]      |
@@ -208,7 +207,7 @@ ModelMix includes a simple but powerful templating system. You can write your sy
 ### Basic example with `replace`
 
 ```javascript
-const gpt = ModelMix.new().gpt5mini();
+const gpt = ModelMix.new().gpt52();
 
 gpt.addText('Write a short story about a {animal} that lives in {place}.');
 gpt.replace({ '{animal}': 'cat', '{place}': 'a haunted castle' });
@@ -325,19 +324,14 @@ console.log(result);
 
 ### Adding field descriptions
 
-The second argument lets you describe each field so the model understands exactly what you expect:
+The second argument lets you describe each field so the model understands exactly what you expect. Descriptions can be **strings** (simple) or **descriptor objects** (with metadata):
 
 ```javascript
-const model = ModelMix.new()
-    .gpt5mini()
-    .addText('Name and capital of 3 South American countries.');
-
 const result = await model.json(
     { countries: [{ name: "Argentina", capital: "BUENOS AIRES" }] },
     { countries: [{ name: "name of the country", capital: "capital of the country in uppercase" }] },
     { addNote: true }
 );
-console.log(result);
 // { countries: [
 //   { name: "Brazil", capital: "BRASILIA" },
 //   { name: "Colombia", capital: "BOGOTA" },
@@ -345,7 +339,40 @@ console.log(result);
 // ]}
 ```
 
-The example values (like `"Argentina"` and `"BUENOS AIRES"`) show the model the expected format, while the descriptions clarify what each field should contain.
+### Enhanced descriptors
+
+Descriptions support **descriptor objects** with `description`, `required`, `enum`, and `default`:
+
+```javascript
+const result = await model.json(
+    { name: 'martin', age: 22, sex: 'm' },
+    {
+        name: { description: 'Name of the actor', required: false },
+        age: 'Age of the actor',                                     // string still works
+        sex: { description: 'Gender', enum: ['m', 'f', null], default: 'm' }
+    }
+);
+```
+
+| Property | Type | Default | Description |
+| --- | --- | --- | --- |
+| `description` | `string` | — | Field description for the model |
+| `required` | `boolean` | `true` | If `false`, field is removed from `required` and type becomes nullable |
+| `enum` | `array` | — | Allowed values. If includes `null`, type auto-becomes nullable |
+| `default` | `any` | — | Default value for the field |
+
+You can mix strings and descriptor objects freely in the same descriptions parameter.
+
+### Array auto-wrap
+
+When you pass a top-level array as the example, ModelMix automatically wraps it for better LLM compatibility and unwraps the result transparently:
+
+```javascript
+const result = await model.json([{ name: 'martin' }]);
+// result is an array: [{ name: "Martin" }, { name: "Carlos" }, ...]
+```
+
+Internally, the array is wrapped as `{ out: [...] }` so the model receives a proper object schema, then `result.out` is returned automatically.
 
 ### Options
 
@@ -491,15 +518,16 @@ new ModelMix(args = { options: {}, config: {} })
   - `tokens`: Object with `input`, `output`, and `total` token counts
   - `response`: The raw API response
 - `stream(callback)`: Sends the message and streams the response, invoking the callback with each streamed part.
-- `json(schemaExample, descriptions = {})`: Forces the model to return a response in a specific JSON format.
-  - `schemaExample`: Optional example of the JSON structure to be returned.
-  - `descriptions`: Optional descriptions for each field in the JSON structure
+- `json(schemaExample, descriptions = {}, options = {})`: Forces the model to return a response in a specific JSON format.
+  - `schemaExample`: Example of the JSON structure to be returned. Top-level arrays are auto-wrapped for better LLM compatibility.
+  - `descriptions`: Descriptions for each field — can be strings or descriptor objects with `{ description, required, enum, default }`.
+  - `options`: `{ addSchema: true, addExample: false, addNote: false }`
   - Returns a Promise that resolves to the structured JSON response
   - Example:
     ```javascript
     const response = await handler.json(
       { time: '24:00:00', message: 'Hello' },
-      { time: 'Time in format HH:MM:SS' }
+      { time: 'Time in format HH:MM:SS', message: { description: 'Greeting', required: false } }
     );
     ```
 - `block({ addText = true })`: Forces the model to return a response in a specific block format.

package/demo/json.js

@@ -2,7 +2,7 @@ process.loadEnvFile();
 import { ModelMix } from '../index.js';
 
 const model = await ModelMix.new({ options: { max_tokens: 10000 }, config: { debug: 3 } })
-    .gemini3flash()
+    .sonnet46()
     // .gptOss()
     // .scout({ config: { temperature: 0 } })    
     // .o4mini()

package/index.js

@@ -31,6 +31,7 @@ const MODEL_PRICING = {
     'claude-opus-4-6': [5.00, 25.00],
     'claude-opus-4-5-20251101': [5.00, 25.00],
     'claude-opus-4-1-20250805': [15.00, 75.00],
+    'claude-sonnet-4-6': [3.00, 15.00],
     'claude-sonnet-4-5-20250929': [3.00, 15.00],
     'claude-sonnet-4-20250514': [3.00, 15.00],
     'claude-3-5-haiku-20241022': [0.80, 4.00],
@@ -305,6 +306,14 @@ class ModelMix {
         options = { ...MixAnthropic.thinkingOptions, ...options };
         return this.attach('claude-sonnet-4-20250514', new MixAnthropic({ options, config }));
     }
+    sonnet46({ options = {}, config = {} } = {}) {
+        return this.attach('claude-sonnet-4-6', new MixAnthropic({ options, config }));
+    }
+    sonnet46think({ options = {}, config = {} } = {}) {
+        options = { ...MixAnthropic.thinkingOptions, ...options };
+        return this.attach('claude-sonnet-4-6', new MixAnthropic({ options, config }));
+    }
+
     sonnet45({ options = {}, config = {} } = {}) {
         return this.attach('claude-sonnet-4-5-20250929', new MixAnthropic({ options, config }));
     }
@@ -775,16 +784,13 @@ class ModelMix {
         if (this.config.max_history > 0) {
             let sliceStart = Math.max(0, this.messages.length - this.config.max_history);
 
-            // If we're slicing and there's a tool message at the start, 
-            // ensure we include the preceding assistant message with tool_calls
-            while (sliceStart > 0 &&
-                sliceStart < this.messages.length &&
-                this.messages[sliceStart].role === 'tool') {
-                sliceStart--;
-                // Also need to include the assistant message with tool_calls
-                if (sliceStart > 0 &&
-                    this.messages[sliceStart].role === 'assistant' &&
-                    this.messages[sliceStart].tool_calls) {
+            // If we're slicing into the middle of a tool interaction,
+            // backtrack to include the full sequence (user → assistant/tool_calls → tool results)
+            while (sliceStart > 0 && sliceStart < this.messages.length) {
+                const msg = this.messages[sliceStart];
+                if (msg.role === 'tool' || (msg.role === 'assistant' && msg.tool_calls)) {
+                    sliceStart--;
+                } else {
                     break;
                 }
             }
@@ -913,11 +919,12 @@ class ModelMix {
                             this.messages.push({
                                 role: 'tool',
                                 tool_call_id: toolResult.tool_call_id,
+                                name: toolResult.name,
                                 content: toolResult.content
                             });
                         }
 
-                        return this.execute();
+                        return this.execute({ options, config });
                     }
 
                     // debug level 1: Just success indicator
@@ -1567,6 +1574,18 @@ class MixAnthropic extends MixCustom {
 
         return filteredMessages.map(message => {
             if (message.role === 'tool') {
+                // Handle new format: tool_call_id directly on message
+                if (message.tool_call_id) {
+                    return {
+                        role: "user",
+                        content: [{
+                            type: "tool_result",
+                            tool_use_id: message.tool_call_id,
+                            content: message.content
+                        }]
+                    }
+                }
+                // Handle old format: content is an array
                 return {
                     role: "user",
                     content: message.content.map(content => ({
@@ -1997,13 +2016,33 @@ class MixGoogle extends MixCustom {
             if (message.role === 'assistant' && message.tool_calls) {
                 return {
                     role: 'model',
-                    parts: message.tool_calls.map(toolCall => ({
-                        functionCall: {
-                            name: toolCall.function.name,
-                            args: JSON.parse(toolCall.function.arguments)
-                        },
-                        thought_signature: toolCall.thought_signature || ""
-                    }))
+                    parts: message.tool_calls.map(toolCall => {
+                        const part = {
+                            functionCall: {
+                                name: toolCall.function.name,
+                                args: JSON.parse(toolCall.function.arguments)
+                            }
+                        };
+                        if (toolCall.thought_signature) {
+                            part.thoughtSignature = toolCall.thought_signature;
+                        }
+                        return part;
+                    })
+                }
+            }
+
+            // Handle new tool result format: tool_call_id and name directly on message
+            if (message.role === 'tool' && message.name) {
+                return {
+                    role: 'user',
+                    parts: [{
+                        functionResponse: {
+                            name: message.name,
+                            response: {
+                                output: message.content,
+                            },
+                        }
+                    }]
                 }
             }
 
@@ -2011,6 +2050,7 @@ class MixGoogle extends MixCustom {
             const role = (message.role === 'assistant' || message.role === 'tool') ? 'model' : 'user'
 
             if (message.role === 'tool') {
+                // Handle old format: content is an array of {name, content}
                 return {
                     role,
                     parts: message.content.map(content => ({
@@ -2053,6 +2093,22 @@ class MixGoogle extends MixCustom {
                 })
             }
         });
+
+        // Merge consecutive user messages containing only functionResponse parts
+        // Google requires all function responses for a turn in a single message
+        return converted.reduce((acc, msg) => {
+            if (acc.length > 0) {
+                const prev = acc[acc.length - 1];
+                if (prev.role === 'user' && msg.role === 'user' &&
+                    prev.parts.every(p => p.functionResponse) &&
+                    msg.parts.every(p => p.functionResponse)) {
+                    prev.parts.push(...msg.parts);
+                    return acc;
+                }
+            }
+            acc.push(msg);
+            return acc;
+        }, []);
     }
 
     async create({ config = {}, options = {} } = {}) {
@@ -2078,7 +2134,13 @@ class MixGoogle extends MixCustom {
             generationConfig.topP = options.top_p;
         }
 
-        generationConfig.responseMimeType = "text/plain";
+        // Gemini does not support responseMimeType when function calling is used
+        const hasTools = options.tools && options.tools.length > 0 &&
+            options.tools.some(t => t.functionDeclarations && t.functionDeclarations.length > 0);
+
+        if (!hasTools) {
+            generationConfig.responseMimeType = "text/plain";
+        }
 
         const payload = {
             generationConfig,
@@ -2160,6 +2222,21 @@ class MixGoogle extends MixCustom {
         };
     }
 
+    static stripUnsupportedSchemaProps(schema) {
+        if (!schema || typeof schema !== 'object') return schema;
+        const cleaned = { ...schema };
+        delete cleaned.default;
+        if (cleaned.properties) {
+            cleaned.properties = Object.fromEntries(
+                Object.entries(cleaned.properties).map(([key, value]) => [key, MixGoogle.stripUnsupportedSchemaProps(value)])
+            );
+        }
+        if (cleaned.items) {
+            cleaned.items = MixGoogle.stripUnsupportedSchemaProps(cleaned.items);
+        }
+        return cleaned;
+    }
+
     static getOptionsTools(tools) {
         const functionDeclarations = [];
         for (const tool in tools) {
@@ -2167,7 +2244,7 @@ class MixGoogle extends MixCustom {
                 functionDeclarations.push({
                     name: item.name,
                     description: item.description,
-                    parameters: item.inputSchema
+                    parameters: MixGoogle.stripUnsupportedSchemaProps(item.inputSchema)
                 });
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelmix",
-  "version": "4.4.6",
+  "version": "4.4.8",
   "description": "🧬 Reliable interface with automatic fallback for AI LLMs.",
   "main": "index.js",
   "repository": {
@@ -48,7 +48,7 @@
   "homepage": "https://github.com/clasen/ModelMix#readme",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "axios": "^1.12.2",
+    "axios": "^1.13.5",
     "bottleneck": "^2.19.5",
     "file-type": "^16.5.4",
     "form-data": "^4.0.4",
@@ -73,4 +73,4 @@
     "test:live.mcp": "mocha test/live.mcp.js --timeout 60000 --require dotenv/config --require test/setup.js",
     "test:tokens": "mocha test/tokens.test.js --timeout 10000 --require dotenv/config --require test/setup.js"
   }
-}
+}

package/schema.js

@@ -1,4 +1,4 @@
-const META_KEYS = new Set(['description', 'required', 'enum', 'default']);
+const META_KEYS = new Set(['description', 'required', 'enum', 'default', 'nullable']);
 
 function isDescriptor(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value)) return false;
@@ -105,6 +105,9 @@ function generateJsonSchema(example, descriptions = {}) {
                     isRequired = false;
                     makeNullable(fieldSchema);
                 }
+                if (desc.nullable === true) {
+                    makeNullable(fieldSchema);
+                }
                 if (desc.enum && desc.enum.includes(null)) {
                     makeNullable(fieldSchema);
                 }

package/skills/modelmix/SKILL.md

@@ -75,8 +75,8 @@ Chain shorthand methods to attach providers. First model is primary; others are
 
 ```javascript
 const model = ModelMix.new()
-    .sonnet45()        // primary
-    .gpt5mini()        // fallback 1
+    .sonnet46()        // primary
+    .gpt52()        // fallback 1
     .gemini3flash()    // fallback 2
     .addText("Hello!")
 ```
@@ -86,7 +86,7 @@ If `sonnet45` fails, it automatically tries `gpt5mini`, then `gemini3flash`.
 ## Available Model Shorthands
 
 - **OpenAI**: `gpt52` `gpt51` `gpt5` `gpt5mini` `gpt5nano` `gpt41` `gpt41mini` `gpt41nano`
-- **Anthropic**: `opus46` `opus45` `sonnet45` `sonnet4` `haiku45` `haiku35` (thinking variants: add `think` suffix)
+- **Anthropic**: `opus46` `opus45` `sonnet46` `sonnet45` `haiku45` `haiku35` (thinking variants: add `think` suffix)
 - **Google**: `gemini3pro` `gemini3flash` `gemini25pro` `gemini25flash`
 - **Grok**: `grok4` `grok41` (thinking variant available)
 - **Perplexity**: `sonar` `sonarPro`
@@ -125,6 +125,36 @@ const result = await ModelMix.new()
 
 `json()` signature: `json(schemaExample, schemaDescription?, { addSchema, addExample, addNote }?)`
 
+#### Enhanced descriptors
+
+Descriptions can be **strings** or **descriptor objects** with metadata:
+
+```javascript
+const result = await model.json(
+    { name: 'martin', age: 22, sex: 'Male' },
+    {
+        name: { description: 'Name of the actor', required: false },
+        age: 'Age of the actor',                                     // string still works
+        sex: { description: 'Gender', enum: ['Male', 'Female', null] }
+    }
+);
+```
+
+Descriptor properties:
+- `description` (string) — field description
+- `required` (boolean, default `true`) — if `false`: removed from required array, type becomes nullable
+- `enum` (array) — allowed values; if includes `null`, type auto-becomes nullable
+- `default` (any) — default value
+
+#### Array auto-wrap
+
+Top-level arrays are auto-wrapped as `{ out: [...] }` for better LLM compatibility, and unwrapped on return:
+
+```javascript
+const result = await model.json([{ name: 'martin' }]);
+// result is an array: [{ name: "Martin" }, { name: "Carlos" }, ...]
+```
+
 ### Stream a response
 
 ```javascript
@@ -282,7 +312,7 @@ const reply = await chat.message();  // "Martin"
 - Store API keys in `.env` and load with `dotenv/config` or `process.loadEnvFile()`. Never hardcode keys.
 - Chain models for resilience: primary model first, fallbacks after.
 - When using MCP tools or `addTool()`, set `max_history` to at least 3.
-- Use `.json()` for structured output instead of parsing text manually.
+- Use `.json()` for structured output instead of parsing text manually. Use descriptor objects `{ description, required, enum, default }` in descriptions for richer schema control.
 - Use `.message()` for simple text, `.raw()` when you need tokens/thinking/toolCalls.
 - For thinking models, append `think` to the method name (e.g. `sonnet45think()`).
 - Template placeholders use `{key}` syntax in both system prompts and user messages.
@@ -302,7 +332,7 @@ const reply = await chat.message();  // "Martin"
 | `.replace({})` | `this` | Set placeholder replacements |
 | `.replaceKeyFromFile(key, path)` | `this` | Replace placeholder with file content |
 | `.message()` | `Promise<string>` | Get text response |
-| `.json(example, desc?, opts?)` | `Promise<object>` | Get structured JSON |
+| `.json(example, desc?, opts?)` | `Promise<object\|array>` | Get structured JSON. Descriptions support descriptor objects `{ description, required, enum, default }`. Top-level arrays auto-wrapped |
 | `.raw()` | `Promise<{message, think, toolCalls, tokens, response}>` | Full response |
 | `.lastRaw` | `object \| null` | Full response from last `message()`/`json()`/`block()`/`stream()` call |
 | `.stream(callback)` | `Promise` | Stream response |

package/test/bottleneck.test.js

@@ -72,7 +72,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
         it('should enforce minimum time between requests', async () => {
             const startTimes = [];
             
-            model.gpt41();
+            model.gpt51();
             
             // Mock API responses
             nock('https://api.openai.com')
@@ -123,7 +123,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
                 }
             });
             
-            model.gpt41();
+            model.gpt51();
             
             // Mock API with delay to simulate concurrent requests
             nock('https://api.openai.com')
@@ -185,7 +185,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
         it('should apply rate limiting to OpenAI requests', async () => {
             const requestTimes = [];
             
-            model.gpt41();
+            model.gpt51();
             
             nock('https://api.openai.com')
                 .post('/v1/chat/completions')
@@ -216,7 +216,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
         it('should apply rate limiting to Anthropic requests', async () => {
             const requestTimes = [];
             
-            model.sonnet4();
+            model.sonnet46();
             
             nock('https://api.anthropic.com')
                 .post('/v1/messages')
@@ -268,7 +268,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
         });
 
         it('should handle rate limiting with API errors', async () => {
-            model.gpt41();
+            model.gpt51();
             
             nock('https://api.openai.com')
                 .post('/v1/chat/completions')
@@ -290,7 +290,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
         it('should continue rate limiting after errors', async () => {
             const requestTimes = [];
             
-            model.gpt41();
+            model.gpt51();
             
             // First request fails
             nock('https://api.openai.com')
@@ -347,7 +347,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
                 }
             });
             
-            model.gpt41();
+            model.gpt51();
             
             let requestCount = 0;
             
@@ -395,7 +395,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
                 }
             });
             
-            model.gpt41();
+            model.gpt51();
             
             const results = [];
             
@@ -444,7 +444,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
                 }
             });
             
-            model.gpt41();
+            model.gpt51();
             
             nock('https://api.openai.com')
                 .post('/v1/chat/completions')
@@ -493,7 +493,7 @@ describe('Rate Limiting with Bottleneck Tests', () => {
                 done();
             });
             
-            model.gpt41();
+            model.gpt51();
             
             nock('https://api.openai.com')
                 .post('/v1/chat/completions')

package/test/fallback.test.js

@@ -25,7 +25,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should use primary provider when available', async () => {
-            model.gpt5mini().sonnet4().addText('Hello');
+            model.gpt5mini().sonnet46().addText('Hello');
 
             // Mock successful OpenAI response
             nock('https://api.openai.com')
@@ -45,7 +45,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should fallback to secondary provider when primary fails', async () => {
-            model.gpt5mini().sonnet4().addText('Hello');
+            model.gpt5mini().sonnet46().addText('Hello');
 
             // Mock failed OpenAI response (GPT-5 mini)
             nock('https://api.openai.com')
@@ -68,7 +68,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should cascade through multiple fallbacks', async () => {
-            model.gpt5mini().sonnet4().gemini25flash().addText('Hello');
+            model.gpt5mini().sonnet46().gemini3flash().addText('Hello');
 
             // Mock failed OpenAI response
             nock('https://api.openai.com')
@@ -99,7 +99,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should throw error when all providers fail', async () => {
-            model.gpt5mini().sonnet4().addText('Hello');
+            model.gpt5mini().sonnet46().addText('Hello');
 
             // Mock all providers failing
             nock('https://api.openai.com')
@@ -129,7 +129,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should fallback from OpenAI to Anthropic', async () => {
-            model.gpt5mini().sonnet4().addText('Test message');
+            model.gpt5mini().sonnet46().addText('Test message');
 
             // Mock OpenAI failure
             nock('https://api.openai.com')
@@ -152,7 +152,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should fallback from Anthropic to Google', async () => {
-            model.sonnet4().gemini25flash().addText('Test message');
+            model.sonnet46().gemini3flash().addText('Test message');
 
             // Mock Anthropic failure
             nock('https://api.anthropic.com')
@@ -178,7 +178,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should handle network timeout fallback', async () => {
-            model.gpt5mini().sonnet4().addText('Hello');
+            model.gpt5mini().sonnet46().addText('Hello');
 
             // Mock timeout error on first provider (using 408 Request Timeout)
             nock('https://api.openai.com')
@@ -212,7 +212,7 @@ describe('Provider Fallback Chain Tests', () => {
 
         it('should handle JSON fallback correctly', async () => {
             const schema = { name: 'Alice', age: 30 };
-            model.gpt5mini().sonnet4().addText('Generate user data');
+            model.gpt5mini().sonnet46().addText('Generate user data');
 
             // Mock OpenAI failure
             nock('https://api.openai.com')
@@ -238,7 +238,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should preserve message history through fallbacks', async () => {
-            model.gpt5mini().sonnet4()
+            model.gpt5mini().sonnet46()
                 .addText('First message')
                 .addText('Second message');
 
@@ -272,7 +272,7 @@ describe('Provider Fallback Chain Tests', () => {
 
             // Configure with custom temperature for fallback
             model.gpt5mini({ options: { temperature: 0.6 } })
-                 .sonnet4({ options: { temperature: 0.7 } })
+                 .sonnet46({ options: { temperature: 0.7 } })
                  .addText('Creative response');
 
             // Mock first provider failure
@@ -305,7 +305,7 @@ describe('Provider Fallback Chain Tests', () => {
             });
 
             model.gpt5mini({ options: { max_tokens: 100 } })
-                .sonnet4({ options: { max_tokens: 200 } })
+                .sonnet46({ options: { max_tokens: 200 } })
                 .addText('Generate text');
 
             // Mock OpenAI failure
@@ -342,7 +342,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should provide detailed error information when all fallbacks fail', async () => {
-            model.gpt5mini().sonnet4().gemini25flash().addText('Test');
+            model.gpt5mini().sonnet46().gemini3flash().addText('Test');
 
             // Mock all providers failing with different errors
             nock('https://api.openai.com')
@@ -367,7 +367,7 @@ describe('Provider Fallback Chain Tests', () => {
         });
 
         it('should handle malformed responses in fallback', async () => {
-            model.gpt5mini().sonnet4().addText('Test');
+            model.gpt5mini().sonnet46().addText('Test');
 
             // Mock malformed response from first provider
             nock('https://api.openai.com')

package/test/history.test.js

@@ -47,7 +47,7 @@ describe('Conversation History Tests', () => {
         });
 
         it('should add assistant response to message history after raw()', async () => {
-            model.sonnet4().addText('Hello');
+            model.sonnet46().addText('Hello');
 
             nock('https://api.anthropic.com')
                 .post('/v1/messages')
@@ -128,7 +128,7 @@ describe('Conversation History Tests', () => {
             const model = ModelMix.new({
                 config: { debug: false, max_history: 10 }
             });
-            model.sonnet4();
+            model.sonnet46();
 
             // First turn
             model.addText('Capital of France?');
@@ -426,7 +426,7 @@ describe('Conversation History Tests', () => {
             const model = ModelMix.new({
                 config: { debug: false, max_history: 10 }
             });
-            model.haiku35();
+            model.haiku45();
 
             model.addText('Hello');
             nock('https://api.anthropic.com')
@@ -460,7 +460,7 @@ describe('Conversation History Tests', () => {
             const model = ModelMix.new({
                 config: { debug: false, max_history: 10 }
             });
-            model.gemini25flash();
+            model.gemini3flash();
 
             model.addText('Hello');
             nock('https://generativelanguage.googleapis.com')

package/test/images.test.js

@@ -25,7 +25,7 @@ describe('Image Processing and Multimodal Support Tests', () => {
         it('should handle base64 image data correctly', async () => {
             const base64Image = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mP8z8BQz0AEYBxVSF+FABJADveWkH6oAAAAAElFTkSuQmCC';
 
-            model.gpt41()
+            model.gpt52()
                 .addText('What do you see in this image?')
                 .addImageFromUrl(base64Image);
 
@@ -50,10 +50,10 @@ describe('Image Processing and Multimodal Support Tests', () => {
             expect(response).to.include('I can see a small test image');
         });
 
-        it('should support multimodal with sonnet4()', async () => {
+        it('should support multimodal with sonnet46()', async () => {
             const base64Image = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mP8z8BQz0AEYBxVSF+FABJADveWkH6oAAAAAElFTkSuQmCC';
 
-            model.sonnet4()
+            model.sonnet46()
                 .addText('Describe this image')
                 .addImageFromUrl(base64Image);
 

package/test/json.test.js

@@ -355,7 +355,7 @@ describe('JSON Schema and Structured Output Tests', () => {
                 }]
             };
             
-            model.gpt41().addText('List 3 countries');
+            model.gpt52().addText('List 3 countries');
             
             // Mock the API response
             nock('https://api.openai.com')
@@ -406,7 +406,7 @@ describe('JSON Schema and Structured Output Tests', () => {
                 }
             };
 
-            model.sonnet4().addText('Generate user data');
+            model.sonnet46().addText('Generate user data');
             
             // Mock the API response
             nock('https://api.anthropic.com')
@@ -427,7 +427,7 @@ describe('JSON Schema and Structured Output Tests', () => {
         });
 
         it('should handle JSON parsing errors gracefully', async () => {
-            model.gpt41().addText('Generate invalid JSON');
+            model.gpt52().addText('Generate invalid JSON');
             
             // Mock invalid JSON response
             nock('https://api.openai.com')
@@ -450,7 +450,7 @@ describe('JSON Schema and Structured Output Tests', () => {
         });
 
         it('should auto-wrap top-level array and unwrap on return', async () => {
-            model.gpt41().addText('List 3 countries');
+            model.gpt52().addText('List 3 countries');
 
             nock('https://api.openai.com')
                 .post('/v1/chat/completions')

package/test/live.mcp.js

@@ -31,8 +31,8 @@ describe('Live MCP Integration Tests', function () {
 
     describe('Basic MCP Tool Integration', function () {
 
-        it('should use custom MCP tools with GPT-4.1', async function () {
-            const model = ModelMix.new(setup).gpt41();
+        it('should use custom MCP tools with GPT-5.2', async function () {
+            const model = ModelMix.new(setup).gpt52();
 
             // Add custom calculator tool
             model.addTool({
@@ -68,8 +68,8 @@ describe('Live MCP Integration Tests', function () {
             expect(response).to.include('345');
         });
 
-        it('should use custom MCP tools with Claude Sonnet 4', async function () {
-            const model = ModelMix.new(setup).sonnet4();
+        it('should use custom MCP tools with Claude Sonnet 4.6', async function () {
+            const model = ModelMix.new(setup).sonnet46();
 
             // Add time tool
             model.addTool({
@@ -505,7 +505,7 @@ describe('Live MCP Integration Tests', function () {
             const models = [
                 { name: 'GPT-5 Mini', model: ModelMix.new(setup).gpt5mini() },
                 { name: 'GPT-5 Nano', model: ModelMix.new(setup).gpt5nano() },
-                { name: 'GPT-4.1', model: ModelMix.new(setup).gpt41() }
+                { name: 'GPT-5.2', model: ModelMix.new(setup).gpt52() }
             ];
 
             const results = [];
@@ -528,8 +528,8 @@ describe('Live MCP Integration Tests', function () {
 
         it('should work with same MCP tools across different Anthropic models', async function () {
             const models = [
-                { name: 'Sonnet 4', model: ModelMix.new(setup).sonnet4() },
-                { name: 'Sonnet 4.5', model: ModelMix.new(setup).sonnet45() },
+                { name: 'Sonnet 4', model: ModelMix.new(setup).sonnet46() },
+                { name: 'Sonnet 4.6', model: ModelMix.new(setup).sonnet46() },
                 { name: 'Haiku 4.5', model: ModelMix.new(setup).haiku45() }
             ];
 

package/test/live.test.js

@@ -41,14 +41,14 @@ describe('Live Integration Tests', function () {
 
             const response = await model.message();
 
-            console.log(`OpenAI GPT-4o response: ${response}`);
+            console.log(`OpenAI GPT-5.2 response: ${response}`);
 
             expect(response).to.be.a('string');
             expect(response.toLowerCase()).to.include('blue');
         });
 
-        it('should process images with Anthropic Claude', async function () {
-            const model = ModelMix.new(setup).sonnet45();
+        it('should process images with Anthropic Sonnet 4.6', async function () {
+            const model = ModelMix.new(setup).sonnet46();
 
             model.addImageFromUrl(blueSquareBase64)
                 .addText('What color is this image? Answer in one word only.');
@@ -61,7 +61,7 @@ describe('Live Integration Tests', function () {
         });
 
         it('should process images with Google Gemini', async function () {
-            const model = ModelMix.new(setup).gemini25flash();
+            const model = ModelMix.new(setup).gemini3flash();
 
             model.addImageFromUrl(blueSquareBase64)
                 .addText('What color is this image? Answer in one word only.');
@@ -99,8 +99,8 @@ describe('Live Integration Tests', function () {
             expect(result.skills).to.be.an('array');
         });
 
-        it('should return structured JSON with Sonnet 4.5 thinking', async function () {
-            const model = ModelMix.new(setup).sonnet45think();
+        it('should return structured JSON with Sonnet 4.6 thinking', async function () {
+            const model = ModelMix.new(setup).sonnet46think();
 
             model.addText('Generate information about a fictional city.');
 
@@ -122,7 +122,7 @@ describe('Live Integration Tests', function () {
         });
 
         it('should return structured JSON with Google Gemini', async function () {
-            const model = ModelMix.new(setup).gemini25flash();
+            const model = ModelMix.new(setup).gemini3flash();
 
             model.addText('Generate information about a fictional city.');
 
@@ -152,7 +152,7 @@ describe('Live Integration Tests', function () {
             // Create a model chain: non-existent model -> Claude
             const model = ModelMix.new(setup)
                 .attach('non-existent-model', new MixOpenAI())
-                .sonnet4();
+                .sonnet46();
 
             model.addText('Say "fallback test successful" and nothing else.');
 

package/test/templates.test.js

@@ -27,7 +27,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should replace simple template variables', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replace({
                     '{{name}}': 'Alice',
                     '{{age}}': '30',
@@ -56,7 +56,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should handle multiple template replacements', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replace({ '{{greeting}}': 'Hello' })
                 .replace({ '{{name}}': 'Bob' })
                 .replace({ '{{action}}': 'welcome' })
@@ -82,7 +82,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should handle nested template objects', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replace({
                     '{{user_name}}': 'Charlie',
                     '{{user_role}}': 'admin',
@@ -111,7 +111,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should preserve unreplaced templates', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replace({ '{{name}}': 'David' })
                 .addText('Hello {{name}}, your ID is {{user_id}} and status is {{status}}');
 
@@ -135,7 +135,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should handle empty and special character replacements', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replace({
                     '{{empty}}': '',
                     '{{special}}': 'Hello & "World" <test>',
@@ -175,7 +175,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should load and replace from template file', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{template}}', path.join(fixturesPath, 'template.txt'))
                 .replace({
                     '{{name}}': 'Eve',
@@ -214,7 +214,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should load and process JSON data file', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{data}}', path.join(fixturesPath, 'data.json'))
                 .addText('Process this data: {{data}}');
 
@@ -246,7 +246,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should handle file loading errors gracefully', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{missing}}', path.join(fixturesPath, 'nonexistent.txt'))
                 .addText('This should contain: {{missing}}');
 
@@ -271,7 +271,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should handle multiple file replacements', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{template}}', path.join(fixturesPath, 'template.txt'))
                 .replaceKeyFromFile('{{data}}', path.join(fixturesPath, 'data.json'))
                 .replace({
@@ -315,7 +315,7 @@ describe('Template and File Operations Tests', () => {
         it('should handle relative and absolute paths', async () => {
             const absolutePath = path.resolve(fixturesPath, 'template.txt');
 
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{absolute}}', absolutePath)
                 .replace({
                     '{{name}}': 'Grace',
@@ -362,7 +362,7 @@ describe('Template and File Operations Tests', () => {
         });
 
         it('should combine file loading with template replacement in complex scenarios', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{user_data}}', path.join(fixturesPath, 'data.json'))
                 .replace({
                     '{{action}}': 'analyze',
@@ -402,7 +402,7 @@ describe('Template and File Operations Tests', () => {
                 roles: ['admin', 'user']
             };
 
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{data}}', path.join(fixturesPath, 'data.json'))
                 .replace({ '{{instruction}}': 'Count active users by role' })
                 .addText('{{instruction}} from this data: {{data}}');
@@ -447,16 +447,16 @@ describe('Template and File Operations Tests', () => {
 
         it('should handle template replacement errors gracefully', () => {
             expect(() => {
-                model.gpt41().replace(null);
+                model.gpt51().replace(null);
             }).to.not.throw();
 
             expect(() => {
-                model.gpt41().replace(undefined);
+                model.gpt51().replace(undefined);
             }).to.not.throw();
         });
 
         it('should handle file reading errors without crashing', async () => {
-            model.gpt41()
+            model.gpt51()
                 .replaceKeyFromFile('{{bad_file}}', '/path/that/does/not/exist.txt')
                 .addText('Content: {{bad_file}}');
 

package/test/tokens.test.js

@@ -1,8 +1,23 @@
 import { expect } from 'chai';
 import { ModelMix } from '../index.js';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const nock = require('nock');
 
 describe('Token Usage Tracking', () => {
 
+    // Ensure nock doesn't interfere with live requests via MockHttpSocket
+    before(function() {
+        nock.cleanAll();
+        nock.restore();
+    });
+
+    after(function() {
+        // Re-activate nock for any subsequent test suites
+        nock.activate();
+    });
+
     it('should track tokens in OpenAI response', async function () {
         this.timeout(30000);
 
@@ -30,7 +45,7 @@ describe('Token Usage Tracking', () => {
         this.timeout(30000);
 
         const model = ModelMix.new()
-            .haiku35()
+            .haiku45()
             .addText('Say hi');
 
         const result = await model.raw();
@@ -49,7 +64,7 @@ describe('Token Usage Tracking', () => {
         this.timeout(30000);
 
         const model = ModelMix.new()
-            .gemini25flash()
+            .gemini3flash()
             .addText('Say hi');
 
         const result = await model.raw();
@@ -110,8 +125,8 @@ describe('Token Usage Tracking', () => {
 
         const providers = [
             { name: 'OpenAI', create: (m) => m.gpt5nano() },
-            { name: 'Anthropic', create: (m) => m.haiku35() },
-            { name: 'Google', create: (m) => m.gemini25flash() }
+            { name: 'Anthropic', create: (m) => m.haiku45() },
+            { name: 'Google', create: (m) => m.gemini3flash() }
         ];
 
         for (const provider of providers) {