modelmix 5.0.2 → 5.0.3

package/effort.js

@@ -70,6 +70,7 @@ const MINIMAX_BANDS = [
 
 /** Exact model → supported Gemini thinkingLevel values */
 const GEMINI_MODEL_LEVELS = {
+    'gemini-3.7-flash': ['low', 'medium', 'high'],
     'gemini-3-pro-preview': ['low', 'high'],
     'gemini-3.1-pro-preview': ['low', 'medium', 'high'],
     'gemini-2.5-pro': ['low', 'medium', 'high'],
@@ -290,6 +291,7 @@ function mapAdaptiveEffort(providerFamily, modelKey) {
         return { thinking: { type: 'adaptive' } };
     }
     if (providerFamily === 'google') {
+        if (modelKey === 'gemini-3.7-flash') return null;
         // Gemini dynamic thinking: thinkingBudget -1 (2.5 official; accepted on 3.x as dynamic)
         return { thinkingConfig: { thinkingBudget: -1 } };
     }

package/index.d.ts

@@ -161,6 +161,8 @@ export interface TokenCostBreakdown {
 export interface TokenUsage {
   input: number;
   output: number;
+  /** Internal reasoning tokens billed at the output rate when reported separately. */
+  thinking: number;
   total: number;
   cached: number;
   cacheWrite: number;
@@ -187,9 +189,59 @@ export interface ModelMixResult {
   tokens?: TokenUsage;
   response?: unknown;
   assistantMessage?: ChatMessage;
+  execution?: PluginExecutionMetadata;
   [key: string]: unknown;
 }
 
+export type ModelMixOutputMode = 'message' | 'json' | 'block' | 'raw' | 'stream';
+
+export interface PluginExecutionMetadata {
+  executionId: string;
+  parentExecutionId: string | null;
+  depth: number;
+}
+
+export type PluginInheritancePolicy =
+  | 'inherit'
+  | 'none'
+  | { include: string[] }
+  | { exclude: string[] };
+
+export interface ChildInvocation {
+  system?: string;
+  systemFile?: string;
+  assign?: Record<string, unknown>;
+  messages: ChatMessage[];
+  tools?: ToolWithCallback[];
+  options?: ModelMixOptions;
+  config?: ModelMixConfig;
+  mix?: ModelMixMixFlags;
+  model?: ModelMix;
+  plugins?: PluginInheritancePolicy;
+  history?: false;
+  outputMode?: ModelMixOutputMode;
+}
+
+export interface PluginExecutionContext {
+  request: {
+    system: string;
+    messages: ChatMessage[];
+    options: ModelMixOptions;
+    config: ModelMixConfig;
+    outputMode: ModelMixOutputMode;
+  };
+  execution: Readonly<PluginExecutionMetadata>;
+  invoke(input: ChildInvocation): Promise<ModelMixResult>;
+}
+
+export interface ModelMixPlugin {
+  name: string;
+  execute(
+    context: PluginExecutionContext,
+    next: () => Promise<ModelMixResult>
+  ): Promise<ModelMixResult>;
+}
+
 export interface StreamChunk {
   response: unknown;
   message: string;
@@ -263,6 +315,7 @@ export interface ProviderConstructorArgs {
 export interface CreateArgs {
   config?: ModelMixConfig;
   options?: ModelMixOptions;
+  outputMode?: ModelMixOutputMode;
 }
 
 export type ProviderFamily =
@@ -279,6 +332,7 @@ export declare class ModelMix {
   tools: Record<string, ToolDefinition[]>;
   toolClient: Record<string, unknown>;
   mcp: Record<string, unknown>;
+  plugins: ModelMixPlugin[];
   options: ModelMixOptions;
   config: ModelMixConfig;
   mix: ModelMixMixFlags;
@@ -288,6 +342,7 @@ export declare class ModelMix {
   constructor(setup?: ModelMixSetup);
 
   static new(setup?: ModelMixSetup): ModelMix;
+  use(plugin: ModelMixPlugin): this;
   static formatJSON(obj: unknown): string;
   static formatMessage(message: unknown): unknown;
   static truncate(str: string, maxLen?: number): string;
@@ -296,6 +351,7 @@ export declare class ModelMix {
     tokens: {
       input: number;
       output: number;
+      thinking?: number;
       total?: number;
       cached?: number;
       cacheWrite?: number;
@@ -308,6 +364,7 @@ export declare class ModelMix {
     tokens: {
       input: number;
       output: number;
+      thinking?: number;
       total?: number;
       cached?: number;
       cacheWrite?: number;
@@ -320,6 +377,7 @@ export declare class ModelMix {
     tokens: {
       input: number;
       output: number;
+      thinking?: number;
       total?: number;
       cached?: number;
       cacheWrite?: number;
@@ -330,6 +388,7 @@ export declare class ModelMix {
   static normalizeTokenUsage(tokens?: {
     input?: number;
     output?: number;
+    thinking?: number;
     total?: number;
     cached?: number;
     cacheWrite?: number;
@@ -395,6 +454,7 @@ export declare class ModelMix {
   gemini31pro(args?: ModelAttachArgs): this;
   gemini3pro(args?: ModelAttachArgs): this;
   gemini3flash(args?: ModelAttachArgs): this;
+  gemini37flash(args?: ModelAttachArgs): this;
   gemini36flash(args?: ModelAttachArgs): this;
   gemini35flash(args?: ModelAttachArgs): this;
   gemini35flashLite(args?: ModelAttachArgs): this;
@@ -455,7 +515,7 @@ export declare class ModelMix {
 
   assignKeyFromFile(key: string, filePath: string): this;
   groupByRoles(messages: ChatMessage[]): ChatMessage[];
-  prepareMessages(): Promise<void>;
+  prepareMessages(): Promise<ChatMessage[]>;
   readFile(filePath: string, options?: { encoding?: BufferEncoding | null }): string | Buffer;
   execute(args?: CreateArgs): Promise<ModelMixResult>;
   processToolCalls(toolCalls: ToolCall[]): Promise<