modality-ai 0.6.0 → 0.7.1

package/dist/types/__tests__/ollama-v2-adapter.test.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Unit tests for Ollama V2 Adapter
+ *
+ * Tests the pure functions exported from src/provider/ollama-v2-adapter.ts.
+ * All tests import from the real source — no re-implementations.
+ */
+export {};

package/dist/types/index.d.ts

@@ -2,5 +2,6 @@ export { createAIChat, mergeToolCallsAndResults, OllamaProvider, } from "./util_
 export { ModalityClient } from "./ModalityClient";
 export { setupStdioToHttpTools, createStdioClient, } from "./setupStdioToHttpTools";
 export type { ModalityClientInstance } from "./ModalityClient";
+export type { ModelMessage } from "ai";
 export type { StdioClientOptions } from "./setupStdioToHttpTools";
 export { CLIBrowserOAuthProvider } from "./mcp-oauth-provider";

package/dist/types/provider/ollama-v2-adapter.d.ts

@@ -1,12 +1,85 @@
 /**
- * Ollama V2 Adapter
+ * Ollama Provider (V4 spec, native for ai@7.x)
  *
- * Clean V2-only adapter for ollama-ai-provider that converts V1 models to V2 interfaces.
- * This adapter ensures compatibility with AI SDK 5.0 by providing V2-compliant models.
+ * Standalone provider for Ollama that talks to the Ollama REST API directly
+ * (no `ollama-ai-provider` dependency). Implements the LanguageModelV4 and
+ * EmbeddingModelV4 specifications — the native spec for ai@7.x.
+ *
+ * API reference: https://github.com/ollama/ollama/blob/main/docs/api.md
+ * (message conversion modeled after https://github.com/sgomez/ollama-ai-provider)
+ */
+import type { EmbeddingModelV4, LanguageModelV4, LanguageModelV4CallOptions, LanguageModelV4FinishReason, LanguageModelV4Prompt, LanguageModelV4Usage, SharedV4Warning } from "@ai-sdk/provider";
+/**
+ * Ollama REST API wire types (subset used by this provider)
+ */
+interface OllamaToolCall {
+    function: {
+        name: string;
+        arguments: unknown;
+    };
+}
+/** @internal exported for testing */
+export interface OllamaMessage {
+    role: "system" | "user" | "assistant" | "tool";
+    content: string;
+    images?: string[];
+    tool_calls?: OllamaToolCall[];
+}
+/** @internal exported for testing */
+export interface OllamaChatResponse {
+    model?: string;
+    created_at?: string;
+    message?: {
+        role?: string;
+        content?: string;
+        tool_calls?: OllamaToolCall[];
+    };
+    done?: boolean;
+    done_reason?: string;
+    prompt_eval_count?: number;
+    eval_count?: number;
+    error?: string;
+}
+/** @internal exported for testing */
+export interface OllamaEmbedResponse {
+    embeddings: number[][];
+    prompt_eval_count?: number;
+    error?: string;
+}
+/**
+ * Accept both `http://host:11434` and `http://host:11434/api` forms.
+ * @internal exported for testing
+ */
+export declare function normalizeBaseURL(baseURL?: string): string;
+/** @internal exported for testing */
+export declare function toBase64(data: Uint8Array | string | URL): string;
+/**
+ * Safely parse JSON — returns `fallback` on failure instead of throwing.
+ * @internal exported for testing
+ */
+export declare function safeParseJson(input: string, fallback?: unknown): unknown;
+/** @internal exported for testing */
+export declare function mapFinishReason(doneReason?: string): LanguageModelV4FinishReason;
+/** @internal exported for testing */
+export declare function mapUsage(response: OllamaChatResponse): LanguageModelV4Usage;
+/**
+ * Convert an AI SDK V4 prompt into Ollama chat messages.
+ * @internal exported for testing
+ */
+export declare function convertToOllamaMessages(prompt: LanguageModelV4Prompt): {
+    messages: OllamaMessage[];
+    warnings: SharedV4Warning[];
+};
+/**
+ * Convert AI SDK V4 call options into an Ollama /api/chat request body.
+ * @internal exported for testing
  */
-import type { LanguageModelV2, EmbeddingModelV2 } from '@ai-sdk/provider';
+export declare function buildChatRequest(modelId: string, options: LanguageModelV4CallOptions, stream: boolean): {
+    body: Record<string, unknown>;
+    warnings: SharedV4Warning[];
+};
 /**
- * V2-compliant Ollama Provider
+ * Ollama Provider (V4 spec, native for ai@7.x)
  */
 export interface OllamaV2ProviderOptions {
     baseURL?: string;
@@ -14,18 +87,19 @@ export interface OllamaV2ProviderOptions {
     fetch?: typeof fetch;
 }
 export declare class OllamaV2Provider {
-    private provider;
+    private context;
     constructor(options?: OllamaV2ProviderOptions);
     /**
-     * Get V2-compliant language model
+     * Get language model
      */
-    languageModel(modelId: string): LanguageModelV2;
+    languageModel(modelId: string): LanguageModelV4;
     /**
-     * Get V2-compliant embedding model
+     * Get embedding model
      */
-    embeddingModel<VALUE = string>(modelId: string): EmbeddingModelV2<VALUE>;
+    embeddingModel(modelId: string): EmbeddingModelV4;
 }
 /**
- * Create a V2-compliant Ollama provider
+ * Create an Ollama provider
  */
 export declare function createOllamaV2(options?: OllamaV2ProviderOptions): OllamaV2Provider;
+export {};

package/dist/types/schemas/schemas_modality.d.ts

@@ -3,9 +3,9 @@ export declare const DEFAULT_AI_PROVIDER = "gemini";
 export declare const OLLAMA_URL: string;
 export declare const chatMessageSchema: z.ZodObject<{
     role: z.ZodEnum<{
-        user: "user";
         assistant: "assistant";
         system: "system";
+        user: "user";
     }>;
     content: z.ZodString;
 }, z.core.$strip>;
@@ -38,9 +38,9 @@ declare const chatOptionsSchema: z.ZodObject<{
     maxOutputTokens: z.ZodOptional<z.ZodNumber>;
     topP: z.ZodOptional<z.ZodNumber>;
     toolChoice: z.ZodOptional<z.ZodEnum<{
-        required: "required";
         auto: "auto";
         none: "none";
+        required: "required";
     }>>;
     maxSteps: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
@@ -54,8 +54,8 @@ export declare const simpleModalityAnswerSchema: z.ZodObject<{
     useMemory: z.ZodDefault<z.ZodBoolean>;
 }, z.core.$strip>;
 declare const providerEnum: z.ZodOptional<z.ZodEnum<{
-    ollama: "ollama";
     gemini: "gemini";
+    ollama: "ollama";
     vscode: "vscode";
 }>>;
 export declare const modalityAnswerSchema: z.ZodObject<{
@@ -63,8 +63,8 @@ export declare const modalityAnswerSchema: z.ZodObject<{
     context: z.ZodOptional<z.ZodString>;
     useMemory: z.ZodDefault<z.ZodBoolean>;
     provider: z.ZodOptional<z.ZodEnum<{
-        ollama: "ollama";
         gemini: "gemini";
+        ollama: "ollama";
         vscode: "vscode";
     }>>;
     ollama: z.ZodDefault<z.ZodOptional<z.ZodObject<{
@@ -84,9 +84,9 @@ export declare const modalityAnswerSchema: z.ZodObject<{
         maxOutputTokens: z.ZodOptional<z.ZodNumber>;
         topP: z.ZodOptional<z.ZodNumber>;
         toolChoice: z.ZodOptional<z.ZodEnum<{
-            required: "required";
             auto: "auto";
             none: "none";
+            required: "required";
         }>>;
         maxSteps: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>>;

package/dist/types/util_tests/aiModelMocks.d.ts

@@ -28,12 +28,8 @@ export declare const createAiModelMockModule: () => {
     OllamaProvider: typeof MockOllamaProvider;
     GeminiProvider: typeof MockGeminiProvider;
     AIChat: typeof MockAIChat;
-    createOllamaChat: (_config: any) => {
-        chat: () => Promise<never>;
-    };
-    createGeminiChat: (_config: any) => {
-        chat: () => Promise<never>;
-    };
+    createOllamaChat: typeof createMockOllamaChat;
+    createGeminiChat: typeof createMockGeminiChat;
     AIConfig: any;
     ChatOptions: any;
     ChatResponse: any;

package/dist/types/util_tests/modalityClientMocks.d.ts

@@ -97,5 +97,5 @@ export declare const MOCK_SCENARIOS: {
     /**
      * Client with custom responses
      */
-    readonly CUSTOM_CLIENT: (responses: MockClientConfig["defaultResponses"]) => MockModalityClient;
+    readonly CUSTOM_CLIENT: (responses: MockClientConfig['defaultResponses']) => MockModalityClient;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0",
+  "version": "0.7.1",
   "name": "modality-ai",
   "repository": {
     "type": "git",
@@ -12,17 +12,16 @@
   "license": "ISC",
   "peerDependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "modality-mcp-kit": "^1.6.2"
+    "modality-mcp-kit": "^2.0.2"
   },
   "dependencies": {
-    "@ai-sdk/google": "^3.0.58",
-    "ai": "^6.0.146",
-    "ollama-ai-provider": "^1.2.0"
+    "@ai-sdk/google": "^4.0.10",
+    "ai": "^7.0.18"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.11",
-    "modality-bun-kit": "^0.0.4",
-    "typescript": "^6.0.2"
+    "@types/bun": "^1.3.14",
+    "modality-bun-kit": "^1.3.14",
+    "typescript": "^7.0.2"
   },
   "exports": {
     "types": "./dist/types/index.d.ts",