@frockbot/plugin-provider-ollama-cloud 0.3.14 → 0.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-provider-ollama-cloud",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "private": false,
   "type": "module",
   "exports": {
@@ -20,19 +20,19 @@
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/configuration-core": "0.3.14",
-    "@frockbot/connection-core": "0.3.14",
-    "@frockbot/kernel-agent-loop": "0.3.14",
-    "@frockbot/kernel-contracts": "0.3.14",
-    "@frockbot/plugin-credentials": "0.3.14",
-    "@frockbot/plugin-models": "0.3.14",
-    "@frockbot/plugin-settings": "0.3.14",
-    "@frockbot/plugin-web": "0.3.14",
-    "@frockbot/provider-openai-compatible": "0.3.14",
+    "@frockbot/configuration-core": "0.3.15",
+    "@frockbot/connection-core": "0.3.15",
+    "@frockbot/kernel-agent-loop": "0.3.15",
+    "@frockbot/kernel-contracts": "0.3.15",
+    "@frockbot/plugin-credentials": "0.3.15",
+    "@frockbot/plugin-models": "0.3.15",
+    "@frockbot/plugin-settings": "0.3.15",
+    "@frockbot/plugin-web": "0.3.15",
+    "@frockbot/provider-openai-compatible": "0.3.15",
     "cordis": "4.0.0-rc.8"
   },
   "devDependencies": {
-    "@frockbot/plugin-tools": "0.3.14",
+    "@frockbot/plugin-tools": "0.3.15",
     "@types/bun": "1.3.6",
     "typescript": "^7.0.2"
   },

package/src/runtime.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import {
-  LlmEffectNotStartedError,
+  ModelProviderFailureError,
   MODEL_FIRST_BYTE_DEADLINE_MS_V1,
   MODEL_FIRST_BYTE_DEADLINE_REASON_V1,
   MODEL_IDLE_DEADLINE_MS_V1,
@@ -247,7 +247,7 @@ describe("Ollama Cloud runtime Contribution", () => {
         failure = error;
       }
 
-      expect(failure).toBeInstanceOf(LlmEffectNotStartedError);
+      expect(failure).toBeInstanceOf(ModelProviderFailureError);
       expect(openCount).toBe(0);
       expect(settled).toEqual(["effect-1"]);
       await root.fiber.dispose();
@@ -361,7 +361,7 @@ describe("Ollama Cloud runtime Contribution", () => {
       failure = error;
     }
 
-    expect(failure).toBeInstanceOf(LlmEffectNotStartedError);
+    expect(failure).toBeInstanceOf(ModelProviderFailureError);
     expect(leaseCount).toBe(0);
     await root.fiber.dispose();
   });
@@ -449,7 +449,10 @@ describe("Ollama Cloud runtime Contribution", () => {
       } catch (error) {
         failure = error;
       }
-      expect(failure).toBeInstanceOf(LlmEffectNotStartedError);
+      expect(failure).toBeInstanceOf(ModelProviderFailureError);
+      expect((failure as ModelProviderFailureError).classification).toBe(
+        "permanent",
+      );
       expect(settled).toEqual([]);
       await root.serial(
         "agent/model-outcome-committed",
@@ -516,7 +519,10 @@ describe("Ollama Cloud runtime Contribution", () => {
         failure = error;
       }
 
-      expect(failure).toBeInstanceOf(LlmEffectNotStartedError);
+      expect(failure).toBeInstanceOf(ModelProviderFailureError);
+      expect((failure as ModelProviderFailureError).classification).toBe(
+        "transient",
+      );
       expect(settled).toEqual([]);
       await root.fiber.dispose();
     },
@@ -730,7 +736,7 @@ describe("Ollama Cloud deadlines", () => {
     // before the first event as definitive. That matters more than the class
     // name — a deadline reported as uncertain would park the run on a
     // retrieval nobody can perform. The reason still reaches the person.
-    expect(failure).toBeInstanceOf(LlmEffectNotStartedError);
+    expect(failure).toBeInstanceOf(ModelProviderFailureError);
     expect((failure as Error).message).toBe(
       MODEL_FIRST_BYTE_DEADLINE_REASON_V1,
     );

package/src/runtime.ts

@@ -1,7 +1,7 @@
 import {
-  LlmEffectNotStartedError,
   type LlmProvider,
   type LlmReconciliationCapability,
+  ModelProviderFailureError,
   type NormalizedModelRequest,
 } from "@frockbot/kernel-contracts";
 import { type Agent } from "@frockbot/kernel-agent-loop/agent";
@@ -94,16 +94,18 @@ class OllamaCloudProvider implements LlmProvider {
       !expectedGeneration ||
       binding.connectionId !== this.config.connectionId
     ) {
-      throw new LlmEffectNotStartedError(
-        "Ollama Cloud request has invalid Connection authority",
-      );
+      throw new ModelProviderFailureError({
+        classification: "permanent",
+        reason: "Ollama Cloud request has invalid Connection authority",
+      });
     }
     const existing = this.authorized.get(request.requestId);
     if (existing) {
       if (existing.lease.credentialGeneration !== expectedGeneration) {
-        throw new LlmEffectNotStartedError(
-          "Ollama Cloud request generation changed",
-        );
+        throw new ModelProviderFailureError({
+          classification: "permanent",
+          reason: "Ollama Cloud request generation changed",
+        });
       }
       return;
     }
@@ -135,11 +137,13 @@ class OllamaCloudProvider implements LlmProvider {
           .settleCredential(request.requestId)
           .catch(() => undefined);
       }
-      throw new LlmEffectNotStartedError(
-        error instanceof Error
-          ? error.message
-          : "Ollama Cloud credential is unavailable",
-      );
+      throw new ModelProviderFailureError({
+        classification: "unknown",
+        reason:
+          error instanceof Error
+            ? error.message
+            : "Ollama Cloud credential is unavailable",
+      });
     }
   }
 
@@ -168,9 +172,10 @@ class OllamaCloudProvider implements LlmProvider {
     await this.authorize(request);
     const authorization = this.authorized.get(request.requestId);
     if (!authorization) {
-      throw new LlmEffectNotStartedError(
-        "Ollama Cloud request authorization is unavailable",
-      );
+      throw new ModelProviderFailureError({
+        classification: "permanent",
+        reason: "Ollama Cloud request authorization is unavailable",
+      });
     }
     const provider = new OpenAICompatibleProvider({
       baseUrl: this.config.chatBaseUrl ?? ollamaChatBaseUrl(),
@@ -197,11 +202,14 @@ class OllamaCloudProvider implements LlmProvider {
       }
     } catch (error) {
       if (started || signal.aborted) throw error;
-      throw new LlmEffectNotStartedError(
-        error instanceof OpenAICompatibleHttpError || error instanceof Error
-          ? error.message
-          : "Ollama Cloud request did not reach the provider",
-      );
+      if (error instanceof ModelProviderFailureError) throw error;
+      throw new ModelProviderFailureError({
+        classification: "unknown",
+        reason:
+          error instanceof OpenAICompatibleHttpError || error instanceof Error
+            ? error.message
+            : "Ollama Cloud request did not reach the provider",
+      });
     }
   }
 }