@holokai/holo-provider-ollama 1.3.0 → 1.4.1

package/README.md

@@ -15,7 +15,7 @@ providing complete bidirectional translation between Ollama's native API and the
 
 ### Key Features
 
-- ✅ **Full Holo SDK Integration** - Uses `@holokai/sdk` types for strict type safety
+- ✅ **Full Holo SDK Integration** - Uses `@holokai/holo-sdk` types for strict type safety
 - ✅ **Bidirectional Translation** - Ollama ↔ Holo format with lossless core fields
 - ✅ **Dual Mode Support** - Both Chat and Generate endpoints
 - ✅ **Streaming Support** - Frame-based streaming with proper orchestration
@@ -36,7 +36,7 @@ npm install @holokai/holo-provider-ollama
 
 This plugin requires:
 
-- `@holokai/sdk` ^0.1.0 - Holo universal format types and plugin contracts
+- `@holokai/holo-sdk` ^0.1.0 - Holo universal format types and plugin contracts
 - `ollama` ^0.6.3 - Official Ollama JavaScript SDK
 
 ### Prerequisites
@@ -74,7 +74,7 @@ Add a provider configuration to your Holo deployment:
 ### Usage in Code
 
 ```typescript
-import {HoloRequest, HoloResponse} from '@holokai/sdk';
+import {HoloRequest, HoloResponse} from '@holokai/holo-sdk';
 
 const request: HoloRequest = {
     model: 'llama2',
@@ -132,7 +132,7 @@ src/providers/ollama/
 
 ### Breaking Changes
 
-- **Import paths changed**: Use `@holokai/sdk` for types instead of `../../types`
+- **Import paths changed**: Use `@holokai/holo-sdk` for types instead of `../../types`
 - **Configuration schema**: Now validated via plugin manifest
 - **Dependency injection**: Uses plugin container instead of core DI
 
@@ -518,7 +518,7 @@ The plugin translates Ollama frames to Holo streaming events:
 ### Streaming Example
 
 ```typescript
-import { HoloStreamChunk } from '@holokai/sdk';
+import { HoloStreamChunk } from '@holokai/holo-sdk';
 
 const stream = await ollamaProvider.streamChat(request);
 
@@ -623,7 +623,7 @@ import type {
   HoloMessage,
   HoloTool,
   HoloJsonSchema
-} from '@holokai/sdk';
+} from '@holokai/holo-sdk';
 
 // ❌ NO: Record<string, unknown>
 // ✅ YES: Proper SDK types
@@ -644,7 +644,7 @@ interface HoloTool {
 **After** (Plugin SDK):
 
 ```typescript
-import type {HoloTool, HoloJsonSchema} from '@holokai/sdk';
+import type {HoloTool, HoloJsonSchema} from '@holokai/holo-sdk';
 
 interface HoloTool {
     parameters?: HoloJsonSchema; // ✅ Strict JSON Schema Draft 7
@@ -653,7 +653,7 @@ interface HoloTool {
 
 ### Type Safety
 
-All interfaces use strict TypeScript types from `@holokai/sdk` for compile-time validation.
+All interfaces use strict TypeScript types from `@holokai/holo-sdk` for compile-time validation.
 
 ---
 
@@ -762,7 +762,7 @@ chunks in a session.
 
 ### SDK Documentation
 
-- [SDK README](../sdk/README.md) - Plugin development guide and templates
+- [SDK README](../holo-sdk/README.md) - Plugin development guide and templates
 
 ### Ollama Documentation
 
@@ -782,7 +782,7 @@ chunks in a session.
 
 ### Adding Features
 
-1. Update types in `@holokai/sdk` first (if needed)
+1. Update types in `@holokai/holo-sdk` first (if needed)
 2. Implement translator logic
 3. Write tests (unit + integration)
 4. Update this README

package/dist/manifest.d.ts

@@ -1,3 +1,3 @@
-import { PluginManifest } from "@holokai/types/plugin";
+import { PluginManifest } from "@holokai/holo-types/plugin";
 export declare const manifest: PluginManifest;
 //# sourceMappingURL=manifest.d.ts.map

package/dist/manifest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAa,MAAM,uBAAuB,CAAC;AAMjE,eAAO,MAAM,QAAQ,EAAE,cAOtB,CAAC"}
+{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAa,MAAM,4BAA4B,CAAC;AAMtE,eAAO,MAAM,QAAQ,EAAE,cAOtB,CAAC"}

package/dist/manifest.js

@@ -1,4 +1,4 @@
-import { PluginType } from "@holokai/types/plugin";
+import { PluginType } from "@holokai/holo-types/plugin";
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 const { version } = require('../package.json');

package/dist/manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AAErC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAmB;IACpC,IAAI,EAAE,0BAA0B;IAChC,OAAO;IACP,UAAU,EAAE,UAAU,CAAC,QAAQ;IAC/B,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,kCAAkC;CAClD,CAAC"}
+{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AAErC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,EAAC,OAAO,EAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAmB;IACpC,IAAI,EAAE,0BAA0B;IAChC,OAAO;IACP,UAAU,EAAE,UAAU,CAAC,QAAQ;IAC/B,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,kCAAkC;CAClD,CAAC"}

package/dist/ollama.auditor.d.ts

@@ -1,32 +1,16 @@
-import { BaseAuditor } from "@holokai/sdk/provider";
-import type { HoloWorkerRequest, WorkerResponseEnvelope } from "@holokai/types/worker";
-import type { ProviderEnvelope, ProviderEvent } from "@holokai/types/provider";
-import type { ProviderRequest } from "@holokai/types/entities";
-import { ChatRequest, GenerateRequest } from "ollama";
+import { BaseAuditor } from "@holokai/holo-sdk/provider";
+import type { HoloWorkerRequest, WorkerResponseEnvelope } from "@holokai/holo-types/worker";
+import type { ProviderDoneEvent, ProviderEvent } from "@holokai/holo-types/provider";
+import type { ProviderEnvelope, ProviderResponseMetrics } from "@holokai/holo-types/entities";
+import { FinishReason } from "@holokai/holo-types/entities";
+import type { HoloFinishReason, HoloUsage } from "@holokai/holo-types/holo";
 export declare class OllamaAuditor extends BaseAuditor {
     readonly provider = "ollama";
-    protected toHoloRequest(workerRequest: HoloWorkerRequest, llmRequest: Omit<ProviderRequest, 'id'>): void;
-    protected mapProviderPayload(workerRequest: HoloWorkerRequest, llmRequest: Omit<ProviderRequest, 'id'>): void;
-    protected mapResponseMetrics(providerEvent: Extract<ProviderEvent, {
-        type: 'done' | 'error';
-    }>, envelope: WorkerResponseEnvelope): Promise<Partial<{
-        usage_raw: any;
-        input_tokens: any;
-        output_tokens: any;
-        time_to_first_token: any;
-        total_processing_time: any;
-    }>>;
-    protected createProviderEnvelope(payload: GenerateRequest | ChatRequest): Promise<ProviderEnvelope>;
-    protected extractExtraTokens(_metrics: Record<string, any>, base: Record<string, number>): Record<string, number>;
-    private extractUserPromptFromMessages;
-    private extractSystemPromptFromMessages;
-    /**
-     * Calculate time to first token using Ollama's timing data
-     * Time to first token = load_duration + prompt_eval_duration
-     * This represents the time spent loading the model and evaluating the prompt before generating the first token
-     * @param payload - Ollama response payload with timing information
-     * @returns Time to first token in milliseconds, or undefined if timing data is unavailable
-     */
-    private calculateTimeToFirstToken;
+    protected extractRequestOptions(workerRequest: HoloWorkerRequest): Promise<Record<string, any>>;
+    mapFinishReason(nativeResponse: any, _protocolName?: string): HoloFinishReason;
+    mapUsage(nativeResponse: any, _protocolName?: string): HoloUsage;
+    protected mapProviderResponseMetrics(providerEvent: ProviderDoneEvent): Promise<Partial<ProviderResponseMetrics>>;
+    protected extractFinishReason(providerEvent: ProviderEvent, _envelope: WorkerResponseEnvelope): Promise<FinishReason | undefined>;
+    protected createProviderEnvelope(workerRequest: HoloWorkerRequest): Promise<ProviderEnvelope>;
 }
 //# sourceMappingURL=ollama.auditor.d.ts.map

package/dist/ollama.auditor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.auditor.d.ts","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAElD,OAAO,KAAK,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAgB,eAAe,EAAmB,MAAM,QAAQ,CAAC;AAGpF,qBACa,aAAc,SAAQ,WAAW;IAC1C,QAAQ,CAAC,QAAQ,YAAY;IAE7B,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,IAAI;IA0BxG,SAAS,CAAC,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,IAAI;cAO7F,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE;QACrE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KACzB,CAAC,EAAE,QAAQ,EAAE,sBAAsB;;;;;;;cAoBpB,sBAAsB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAMzG,SAAS,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIjH,OAAO,CAAC,6BAA6B;IAWrC,OAAO,CAAC,+BAA+B;IAOvC;;;;;;OAMG;IACH,OAAO,CAAC,yBAAyB;CAWpC"}
+{"version":3,"file":"ollama.auditor.d.ts","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAyD,MAAM,4BAA4B,CAAC;AAE/G,OAAO,KAAK,EAAC,iBAAiB,EAAE,sBAAsB,EAAC,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,EAAC,iBAAiB,EAAE,aAAa,EAAC,MAAM,8BAA8B,CAAC;AACnF,OAAO,KAAK,EAAC,gBAAgB,EAAE,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAC,YAAY,EAAC,MAAM,8BAA8B,CAAC;AAC1D,OAAO,KAAK,EAAC,gBAAgB,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAI1E,qBACa,aAAc,SAAQ,WAAW;IAC1C,QAAQ,CAAC,QAAQ,YAAY;cAEb,qBAAqB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAM5F,eAAe,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,gBAAgB;IAe9E,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS;cAkBzD,0BAA0B,CAAC,aAAa,EAAE,iBAAiB;cAwB3D,mBAAmB,CAAC,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;cAMvH,sBAAsB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAgCtG"}

package/dist/ollama.auditor.js

@@ -5,98 +5,101 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { injectable } from 'tsyringe';
-import { BaseAuditor } from "@holokai/sdk/provider";
-import { pickDefined } from "@holokai/sdk";
+import { BaseAuditor, extractPromptByRole, extractTextContent, normalizeText } from "@holokai/holo-sdk/provider";
+import { nsToMs, pickDefined } from "@holokai/holo-sdk";
+import { FinishReason } from "@holokai/holo-types/entities";
 import { OllamaProtocols } from "./plugin";
 let OllamaAuditor = class OllamaAuditor extends BaseAuditor {
     provider = 'ollama';
-    toHoloRequest(workerRequest, llmRequest) {
-        const payload = workerRequest.payload;
-        llmRequest.access_model = payload.model;
-        if (workerRequest.protocol.name === OllamaProtocols.CHAT) {
-            const chatPayload = payload;
-            const userPrompt = this.extractUserPromptFromMessages(chatPayload.messages);
-            const systemPrompt = this.extractSystemPromptFromMessages(chatPayload.messages);
-            if (userPrompt !== undefined) {
-                llmRequest.metadata.user_prompt = userPrompt;
-            }
-            if (systemPrompt !== undefined) {
-                llmRequest.metadata.system_prompt = systemPrompt;
-            }
-        }
-        else if (workerRequest.protocol.name === OllamaProtocols.GENERATE) {
-            const generatePayload = payload;
-            if (generatePayload.prompt !== undefined) {
-                llmRequest.metadata.user_prompt = generatePayload.prompt;
-            }
-            if (generatePayload.system !== undefined) {
-                llmRequest.metadata.system_prompt = generatePayload.system;
-            }
-        }
+    async extractRequestOptions(workerRequest) {
+        return {
+            ...workerRequest.payload.options
+        };
     }
-    mapProviderPayload(workerRequest, llmRequest) {
-        const payload = workerRequest.payload;
-        if (payload.options !== undefined) {
-            llmRequest.metadata.options = payload.options;
+    mapFinishReason(nativeResponse, _protocolName) {
+        if (!nativeResponse)
+            return 'stop';
+        const doneReason = nativeResponse.done_reason;
+        switch (doneReason) {
+            case 'stop':
+                return 'stop';
+            case 'load':
+                return 'error';
+            case 'length':
+                return 'length';
+            default:
+                return 'stop';
         }
     }
-    async mapResponseMetrics(providerEvent, envelope) {
-        const metrics = await super.mapResponseMetrics(providerEvent, envelope);
-        if (providerEvent.type === 'error') {
-            return metrics;
-        }
-        const payload = providerEvent.message;
-        const usage = {
-            input_tokens: payload.prompt_eval_count || metrics.input_tokens,
-            output_tokens: payload.eval_count || metrics.output_tokens,
-            time_to_first_token: this.calculateTimeToFirstToken(payload) || metrics.time_to_first_token,
-            total_processing_time: payload.total_duration ? Math.round(payload.total_duration / 1000000) : metrics.total_processing_time
-        };
-        return pickDefined({
-            usage_raw: usage,
-            ...usage
+    mapUsage(nativeResponse, _protocolName) {
+        if (!nativeResponse)
+            return {};
+        const { prompt_eval_count, eval_count, load_duration, prompt_eval_duration, total_duration } = nativeResponse;
+        const usage = pickDefined({
+            input_tokens: prompt_eval_count,
+            output_tokens: eval_count,
+            total_tokens: (eval_count ?? 0) + (prompt_eval_count ?? 0) || undefined,
         });
+        if (load_duration != null || total_duration != null) {
+            const timings = {};
+            if (total_duration != null)
+                timings.total = Math.round(nsToMs(total_duration));
+            if (load_duration != null)
+                timings.load = Math.round(nsToMs(load_duration));
+            if (prompt_eval_duration != null)
+                timings.prompt_eval = Math.round(nsToMs(prompt_eval_duration));
+            usage.timings = timings;
+        }
+        return usage;
     }
-    async createProviderEnvelope(payload) {
+    async mapProviderResponseMetrics(providerEvent) {
+        const payload = providerEvent.message;
+        const { load_duration, eval_count, prompt_eval_count, prompt_eval_duration, total_duration } = payload;
         return pickDefined({
-            access_model: payload.model
+            input_tokens: prompt_eval_count,
+            output_tokens: eval_count,
+            total_tokens: (eval_count ?? 0) + (prompt_eval_count ?? 0) || undefined,
+            time_to_first_token: load_duration != null && prompt_eval_duration != null ? Math.round(nsToMs(load_duration + prompt_eval_duration)) : undefined,
+            total_processing_time: total_duration != null ? Math.round(nsToMs(total_duration)) : undefined,
+            usage_raw: {
+                load_duration,
+                prompt_eval_duration,
+                total_duration,
+                eval_count,
+                prompt_eval_count
+            },
+            metadata: {
+                load_duration,
+                prompt_eval_duration
+            }
         });
     }
-    extractExtraTokens(_metrics, base) {
-        return base;
-    }
-    extractUserPromptFromMessages(messages) {
-        if (!messages || !Array.isArray(messages))
-            return undefined;
-        const userMessages = messages.filter(msg => msg.role === 'user');
-        if (userMessages.length === 0)
-            return undefined;
-        // Return the last user message content
-        const lastUserMessage = userMessages[userMessages.length - 1];
-        return typeof lastUserMessage.content === 'string' ? lastUserMessage.content : undefined;
-    }
-    extractSystemPromptFromMessages(messages) {
-        if (!messages || !Array.isArray(messages))
+    async extractFinishReason(providerEvent, _envelope) {
+        if (providerEvent.type === 'error')
+            return FinishReason.ERROR;
+        if (providerEvent.type !== 'done')
             return undefined;
-        const systemMessage = messages.find(msg => msg.role === 'system');
-        return systemMessage && typeof systemMessage.content === 'string' ? systemMessage.content : undefined;
+        return this.mapFinishReason(providerEvent.message);
     }
-    /**
-     * Calculate time to first token using Ollama's timing data
-     * Time to first token = load_duration + prompt_eval_duration
-     * This represents the time spent loading the model and evaluating the prompt before generating the first token
-     * @param payload - Ollama response payload with timing information
-     * @returns Time to first token in milliseconds, or undefined if timing data is unavailable
-     */
-    calculateTimeToFirstToken(payload) {
-        const loadDuration = payload.load_duration;
-        const promptEvalDuration = payload.prompt_eval_duration;
-        if (loadDuration !== undefined && promptEvalDuration !== undefined) {
-            // Convert nanoseconds to milliseconds and sum the durations
-            const timeToFirstTokenNs = loadDuration + promptEvalDuration;
-            return Math.round(timeToFirstTokenNs / 1000000);
+    async createProviderEnvelope(workerRequest) {
+        const payload = workerRequest.payload;
+        let last_user_prompt;
+        let system_prompt;
+        if (workerRequest.protocol.name === OllamaProtocols.GENERATE) {
+            const generatePayload = payload;
+            last_user_prompt = normalizeText(generatePayload.prompt);
+            system_prompt = generatePayload.system ? normalizeText(generatePayload.system) : generatePayload.system;
         }
-        return undefined;
+        else {
+            const chatPayload = payload;
+            last_user_prompt = extractPromptByRole(chatPayload.messages, "user", "last", (msg) => extractTextContent(msg.content));
+            system_prompt = extractPromptByRole(chatPayload.messages, "system", "first", (msg) => extractTextContent(msg.content));
+        }
+        return pickDefined({
+            access_model: payload.model,
+            last_user_prompt,
+            system_prompt
+        });
     }
 };
 OllamaAuditor = __decorate([

package/dist/ollama.auditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.auditor.js","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama.auditor.js","sourceRoot":"","sources":["../src/ollama.auditor.ts"],"names":[],"mappings":"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"}

package/dist/ollama.provider.d.ts

@@ -1,19 +1,21 @@
 import { ChatRequest, EmbedRequest, ErrorResponse, GenerateRequest, ListResponse, Ollama } from 'ollama';
-import { BaseProvider } from '@holokai/sdk/provider';
-import type { IAuditor, IProviderTranslator, IResponseFactory, ProviderContext, RunHandle } from '@holokai/types/provider';
-export declare class OllamaProvider extends BaseProvider<Ollama, GenerateRequest | ChatRequest> {
-    getModelNameFromRequest(payload: GenerateRequest | ChatRequest): Promise<string>;
+import { BaseProvider } from '@holokai/holo-sdk/provider';
+import type { DiscoveredModel, IAuditor, IProviderTranslator, IResponseFactory, ProviderContext, RunHandle } from '@holokai/holo-types/provider';
+export declare class OllamaProvider extends BaseProvider<Ollama, EmbedRequest | GenerateRequest | ChatRequest> {
+    getModelNameFromRequest(payload: EmbedRequest | GenerateRequest | ChatRequest): Promise<string>;
+    discoverModels(): Promise<DiscoveredModel[]>;
     getModels(allowedModels: string[] | true): Promise<ListResponse>;
-    ollamaEmbed(payload: EmbedRequest, _ctx: ProviderContext): Promise<{
-        final: () => Promise<import("ollama").EmbedResponse>;
+    ollamaEmbed(payload: EmbedRequest): Promise<{
+        start: () => Promise<import("ollama").EmbedResponse>;
     }>;
     protected createAuditor(): IAuditor;
     protected createClient(): Ollama;
     protected createTranslator(): IProviderTranslator;
     protected createResponseFactory(): IResponseFactory;
     protected handleError(error: Error): Promise<ErrorResponse>;
-    protected handleRequest(payload: GenerateRequest | ChatRequest | EmbedRequest, ctx: ProviderContext): Promise<RunHandle<any>>;
+    protected createRequestRunner(payload: GenerateRequest | ChatRequest | EmbedRequest, ctx: ProviderContext): Promise<RunHandle<any>>;
     private ollamaGenerate;
+    private emitOllamaToolCalls;
     private ollamaChat;
 }
 //# sourceMappingURL=ollama.provider.d.ts.map

package/dist/ollama.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,QAAQ,CAAC;AACvG,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EACR,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EACZ,MAAM,yBAAyB,CAAC;AAMjC,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,WAAW,CAAC;IAE7E,uBAAuB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAIhF,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;IAchE,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,eAAe;;;IAa9D,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;cAInC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAIjD,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAYrH,cAAc;YAkCd,UAAU;CAkC3B"}
+{"version":3,"file":"ollama.provider.d.ts","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAC,MAAM,QAAQ,CAAC;AACvG,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,KAAK,EACR,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,SAAS,EACZ,MAAM,8BAA8B,CAAC;AAMtC,qBAAa,cAAe,SAAQ,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,eAAe,GAAG,WAAW,CAAC;IAE5F,uBAAuB,CAAC,OAAO,EAAE,YAAY,GAAG,eAAe,GAAG,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/F,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAoB5C,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC;IAchE,WAAW,CAAC,OAAO,EAAE,YAAY;;;IAQvC,SAAS,CAAC,aAAa,IAAI,QAAQ;IAInC,SAAS,CAAC,YAAY,IAAI,MAAM;IAIhC,SAAS,CAAC,gBAAgB,IAAI,mBAAmB;IAIjD,SAAS,CAAC,qBAAqB,IAAI,gBAAgB;cAInC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;cAIjD,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,WAAW,GAAG,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAY3H,cAAc;IA4B5B,OAAO,CAAC,mBAAmB;YAUb,UAAU;CA0C3B"}

package/dist/ollama.provider.js

@@ -1,5 +1,5 @@
 import { Ollama } from 'ollama';
-import { BaseProvider } from '@holokai/sdk/provider';
+import { BaseProvider } from '@holokai/holo-sdk/provider';
 import { OllamaAuditor } from './ollama.auditor';
 import { OllamaTranslator } from './ollama.translator';
 import { OllamaResponseFactory } from './ollama.response.factory';
@@ -8,6 +8,25 @@ export class OllamaProvider extends BaseProvider {
     async getModelNameFromRequest(payload) {
         return payload.model;
     }
+    async discoverModels() {
+        const response = await this.client.list();
+        return response.models.map(m => {
+            const name = m.name;
+            const modelName = name.split(':')[0];
+            return {
+                name,
+                accessModel: name,
+                description: `${modelName} (Model ID: ${name})`,
+                version: name.match(/-(\d+\.\d+(?:\.\d+)?)/)?.[1] ?? '1.0',
+                metadata: {
+                    name: m.name,
+                    size: m.size,
+                    digest: m.digest,
+                    details: m.details,
+                },
+            };
+        });
+    }
     async getModels(allowedModels) {
         const response = await this.client.list();
         if (allowedModels === true) {
@@ -19,16 +38,10 @@ export class OllamaProvider extends BaseProvider {
             models
         };
     }
-    async ollamaEmbed(payload, _ctx) {
+    async ollamaEmbed(payload) {
         return {
-            final: async () => {
-                try {
-                    return await this.client.embed(payload);
-                }
-                catch (error) {
-                    this.log.error(`Ollama embed error: ${error instanceof Error ? error.message : String(error)}`);
-                    throw error;
-                }
+            start: async () => {
+                return await this.client.embed(payload);
             }
         };
     }
@@ -47,36 +60,29 @@ export class OllamaProvider extends BaseProvider {
     async handleError(error) {
         return { error: error.message };
     }
-    async handleRequest(payload, ctx) {
+    async createRequestRunner(payload, ctx) {
         switch (ctx.protocol.name) {
             case OllamaProtocols.GENERATE:
                 return this.ollamaGenerate(payload, ctx);
             case OllamaProtocols.CHAT:
                 return this.ollamaChat(payload, ctx);
             case OllamaProtocols.EMBED:
-                return this.ollamaEmbed(payload, ctx);
+                return this.ollamaEmbed(payload);
         }
         throw new Error(`Unsupported requestType: ${JSON.stringify(ctx)}`);
     }
     async ollamaGenerate(request, ctx) {
         if (!request.stream) {
             return {
-                final: async () => {
-                    try {
-                        return await this.client.generate({ ...request, stream: false /* ensure */ });
-                    }
-                    catch (error) {
-                        this.log.error(`Ollama generate error: ${error instanceof Error ? error.message : String(error)}`, {
-                            config: JSON.stringify(this._config),
-                            request: JSON.stringify(request)
-                        });
-                        throw error;
-                    }
+                start: async () => {
+                    const result = await this.client.generate({ ...request, stream: false /* ensure */ });
+                    ctx.emitTextDelta(result.response);
+                    return result;
                 },
             };
         }
         return {
-            final: async () => {
+            start: async () => {
                 const streamResp = await this.client.generate({ ...request, stream: true });
                 for await (const chunk of streamResp) {
                     if (chunk.done)
@@ -90,30 +96,46 @@ export class OllamaProvider extends BaseProvider {
             }
         };
     }
+    emitOllamaToolCalls(toolCalls, ctx) {
+        for (let i = 0; i < toolCalls.length; i++) {
+            const fn = toolCalls[i].function;
+            if (!fn)
+                continue;
+            const argsStr = typeof fn.arguments === 'string' ? fn.arguments : JSON.stringify(fn.arguments);
+            ctx.emitToolCallDelta(i, { name: fn.name });
+            ctx.emitToolCallDelta(i, { arguments_delta: argsStr });
+        }
+    }
     async ollamaChat(request, ctx) {
         if (!request.stream) {
             return {
-                final: async () => {
-                    try {
-                        return await this.client.chat({ ...request, stream: false });
-                    }
-                    catch (error) {
-                        this.log.error(`Ollama chat error: ${error instanceof Error ? error.message : String(error)}`, {
-                            config: JSON.stringify(this._config),
-                            request: JSON.stringify(request)
-                        });
-                        throw error;
+                start: async () => {
+                    const result = await this.client.chat({ ...request, stream: false });
+                    ctx.emitTextDelta(result.message.content);
+                    if (result.message.tool_calls?.length) {
+                        this.emitOllamaToolCalls(result.message.tool_calls, ctx);
                     }
+                    return result;
                 },
             };
         }
         return {
-            final: async () => {
+            start: async () => {
                 const streamResp = await this.client.chat({ ...request, stream: true });
                 for await (const chunk of streamResp) {
-                    if (chunk.done)
+                    if (chunk.done) {
+                        const finalToken = chunk.message?.content ?? '';
+                        if (finalToken)
+                            ctx.emitTextDelta(finalToken);
+                        if (chunk.message?.tool_calls?.length) {
+                            this.emitOllamaToolCalls(chunk.message.tool_calls, ctx);
+                        }
                         return chunk;
+                    }
                     ctx.emitStreamEvent(chunk);
+                    if (chunk.message?.tool_calls?.length) {
+                        this.emitOllamaToolCalls(chunk.message.tool_calls, ctx);
+                    }
                     const token = chunk.message.content ?? '';
                     if (token)
                         ctx.emitTextDelta(token);

package/dist/ollama.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama.provider.js","sourceRoot":"","sources":["../src/ollama.provider.ts"],"names":[],"mappings":"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"}

package/dist/ollama.response.factory.d.ts

@@ -1,4 +1,4 @@
-import type { IResponseFactory } from "@holokai/types/provider";
+import type { IResponseFactory } from "@holokai/holo-types/provider";
 import { ErrorResponse } from "ollama";
 export declare class OllamaResponseFactory implements IResponseFactory {
     static instance(): OllamaResponseFactory;

package/dist/ollama.response.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.response.factory.d.ts","sourceRoot":"","sources":["../src/ollama.response.factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AAErC,qBAAa,qBAAsB,YAAW,gBAAgB;IAC1D,MAAM,CAAC,QAAQ,IAAI,qBAAqB;IAIxC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;CAG9C"}
+{"version":3,"file":"ollama.response.factory.d.ts","sourceRoot":"","sources":["../src/ollama.response.factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;AAErC,qBAAa,qBAAsB,YAAW,gBAAgB;IAC1D,MAAM,CAAC,QAAQ,IAAI,qBAAqB;IAIxC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa;CAG9C"}