@frockbot/plugin-provider-ollama-cloud 0.1.3 → 0.2.0

package/README.md

@@ -38,10 +38,10 @@ kernel.
 | Effect class   | read-only, `idempotent: true`                                                       |
 | Turn types     | all four (manifest v4 `admission`)                                                  |
 
-**Authority.** The tool mounts only for an enabled Assignment of
-`ollama-cloud-web-search` bound to a ready Connection. There is no
-unauthenticated fallback: a Bot without the Assignment is never offered the
-tool. The key is leased per durable `effectId`, opened inside this Package, used
+**Authority.** The tool mounts only while `ollama-cloud-web-search` is enabled
+account-wide and resolves a ready Connection. There is no unauthenticated
+fallback: without that capability the Bot is never offered the tool. The key
+is leased per durable `effectId`, opened inside this Package, used
 and settled, so it never reaches a tool argument, a tool result, or the event
 log.
 

package/frockbot.json

@@ -5,10 +5,12 @@
   "version": "0.0.1",
   "compatibility": { "frockbot": ">=0.0.1" },
   "dependencies": {
+    "custom-models": ">=0.0.1",
     "credentials": ">=0.0.1",
     "settings": ">=0.0.1",
     "web": ">=0.0.1"
   },
+  "defaultEnablement": "disabled",
   "contributions": {
     "backend": [{ "entry": "./user", "host": "user" }],
     "runtime": { "entry": "./runtime" }

package/package.json

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

package/src/user.test.ts

@@ -12,7 +12,6 @@ import {
 import { OllamaCloudClient, type OllamaFetch } from "./client.js";
 import {
   createOllamaCloudUserBackendContribution,
-  selectAutomaticOllamaModelV1,
   type OllamaUserBackendHost,
 } from "./user.js";
 
@@ -254,84 +253,14 @@ describe("Ollama Cloud User Contribution", () => {
         models: [{ providerModelId: "glm-5.3-flash:cloud" }],
       },
     });
-    expect(await settings.read("account-1")).toMatchObject({
-      newBotModelTemplate: {
-        connectionId: result.connectionId,
-        providerModelId: "glm-5.3-flash:cloud",
-      },
-      newBotModelTemplateSource: "auto",
-    });
+    expect(
+      Object.hasOwn(await settings.read("account-1"), "platformModel"),
+    ).toBe(false);
     expect(JSON.stringify([...storage.values.values()])).not.toContain(
       "ollama-secret",
     );
   });
 
-  test("never replaces a User-chosen default when a Connection succeeds", async () => {
-    const { settings, ollama } = await fixture();
-    const before = await settings.read("account-1");
-    await settings.executeConfiguration({
-      schemaVersion: 1,
-      userId: "account-1",
-      command: {
-        schemaVersion: 1,
-        type: "user/set-new-bot-model",
-        commandId: "choose-model",
-        expectedRevision: before.revision,
-        model: {
-          connectionId: "chosen-connection",
-          providerModelId: "chosen-model",
-        },
-        source: "user",
-      },
-    });
-
-    await ollama.executeConnection("account-1", {
-      schemaVersion: 1,
-      type: "connection/create-api-key",
-      commandId: "connect-after-choice",
-      packageId: "provider-ollama-cloud",
-      connectionTypeId: "ollama-cloud-account",
-      label: "Work",
-      apiKey: "ollama-secret",
-    });
-
-    expect(await settings.read("account-1")).toMatchObject({
-      newBotModelTemplate: {
-        connectionId: "chosen-connection",
-        providerModelId: "chosen-model",
-      },
-      newBotModelTemplateSource: "user",
-    });
-  });
-
-  test("prefers gpt-oss, then GLM, then the first catalog model", () => {
-    const model = (providerModelId: string) => ({
-      providerModelId,
-      displayName: providerModelId,
-      capabilities: { tools: true, vision: false, reasoning: true },
-      source: "discovered" as const,
-    });
-    const catalog = (ids: string[]) => ({
-      schemaVersion: 1 as const,
-      generation: "catalog-1",
-      state: "fresh" as const,
-      models: ids.map(model),
-    });
-    expect(
-      selectAutomaticOllamaModelV1(
-        catalog(["other", "glm-5.3-flash:cloud", "gpt-oss:20b"]),
-      )?.providerModelId,
-    ).toBe("gpt-oss:20b");
-    expect(
-      selectAutomaticOllamaModelV1(catalog(["other", "glm-5.3-flash:cloud"]))
-        ?.providerModelId,
-    ).toBe("glm-5.3-flash:cloud");
-    expect(
-      selectAutomaticOllamaModelV1(catalog(["other", "second"]))
-        ?.providerModelId,
-    ).toBe("other");
-  });
-
   test("atomically admits the command, Connection, and encrypted credential", async () => {
     const { storage, settings, ollama } = await fixture();
     storage.failNextEntriesContaining =
@@ -891,7 +820,7 @@ describe("Ollama Cloud User Contribution", () => {
     );
   });
 
-  test("rejects disconnect while a Bot assignment depends on the Connection", async () => {
+  test("disconnects without a retired per-Bot dependency lock", async () => {
     const { settings, ollama } = await fixture();
     const created = await ollama.executeConnection("account-1", {
       schemaVersion: 1,
@@ -902,20 +831,6 @@ describe("Ollama Cloud User Contribution", () => {
       label: "Work",
       apiKey: "key",
     });
-    await settings.claimConnectionDependency(
-      "account-1",
-      created.connectionId,
-      "bot-1",
-      "assignment-1",
-      {
-        schemaVersion: 1,
-        packageId: "provider-ollama-cloud",
-        packageVersion: "0.0.1",
-        capabilityId: "ollama-cloud-models",
-        connectionTypeIds: ["ollama-cloud-account"],
-      },
-    );
-
     await expect(
       ollama.executeConnection("account-1", {
         schemaVersion: 1,
@@ -924,10 +839,10 @@ describe("Ollama Cloud User Contribution", () => {
         connectionId: created.connectionId,
         revokeUpstream: false,
       }),
-    ).resolves.toMatchObject({ status: "failed" });
+    ).resolves.toMatchObject({ status: "applied" });
     expect(
       await settings.getConnection("account-1", created.connectionId),
-    ).toMatchObject({ state: "ready" });
+    ).toMatchObject({ state: "revoked" });
   });
 
   test("does not downgrade concurrent upstream revocation reconciliation", async () => {

package/src/user.ts

@@ -44,23 +44,6 @@ const MAX_CATALOG_REFRESHES_PER_ALARM = 1;
 const ACCOUNT_KEY = "ollama-connection-account";
 const AUTOMATIC_REFRESH_RECEIPT_PREFIX = "ollama-refresh-receipt:";
 
-const AUTOMATIC_DEFAULT_MODEL_PREFERENCES = [
-  "gpt-oss:20b",
-  "glm-5.3-flash:cloud",
-] as const;
-
-/** Choose the safest useful default from the catalog a new Connection proved. */
-export function selectAutomaticOllamaModelV1(
-  catalog: ConnectionModelCatalogV1,
-): ConnectionModelV1 | undefined {
-  for (const providerModelId of AUTOMATIC_DEFAULT_MODEL_PREFERENCES) {
-    const preferred = catalog.models.find(
-      (model) => model.providerModelId === providerModelId,
-    );
-    if (preferred) return preferred;
-  }
-  return catalog.models[0];
-}
 const MUTATION_SEQUENCE_PREFIX = "ollama-mutation-sequence:";
 const MODEL_RESOLUTION_PREFIX = "ollama-model-resolution:";
 const REFRESH_INTERVAL_MS = 60 * 60 * 1_000;
@@ -1402,35 +1385,6 @@ export class OllamaCloudUserBackendContribution {
             },
             storage,
           );
-          if (
-            record.operation === "connection/create-api-key" &&
-            outcome.validationCatalog
-          ) {
-            const user = await this.host.settings.read(
-              record.accountId,
-              storage,
-            );
-            const selected = selectAutomaticOllamaModelV1(
-              outcome.validationCatalog,
-            );
-            if (selected && user.newBotModelTemplateSource !== "user") {
-              await this.host.settings.executeConfigurationCommand(
-                record.accountId,
-                {
-                  schemaVersion: 1,
-                  type: "user/set-new-bot-model",
-                  commandId: record.commandId,
-                  expectedRevision: user.revision,
-                  model: {
-                    connectionId: record.connectionId,
-                    providerModelId: selected.providerModelId,
-                  },
-                  source: "auto",
-                },
-                storage,
-              );
-            }
-          }
         },
       );
     } catch (error) {
@@ -1858,12 +1812,6 @@ export class OllamaCloudUserBackendContribution {
         if (current.state === "reconciliation-required") {
           return "reconciliation-required";
         }
-        if (
-          Array.isArray(current.safeMetadata.dependentAssignments) &&
-          current.safeMetadata.dependentAssignments.length > 0
-        ) {
-          return "dependent";
-        }
         await this.cancelPendingCredentialMutations(record, storage);
         if (current.state !== "revoking") {
           await this.host.settings.replaceConnection(
@@ -1877,7 +1825,7 @@ export class OllamaCloudUserBackendContribution {
         return "revoking";
       },
     );
-    if (transition === "stale" || transition === "dependent") {
+    if (transition === "stale") {
       return this.finishRecord(record, "failed");
     }
     if (transition === "revoked") return this.finishRecord(record, "applied");

package/src/web-search.test.ts

@@ -13,11 +13,10 @@ const CONNECTION_ID = "connection-1";
 const GENERATION = "generation-1";
 const API_KEY = "ollama-test-key";
 
-const ASSIGNMENT = {
+const CAPABILITY = {
   packageId: "provider-ollama-cloud",
   capabilityId: "ollama-cloud-web-search",
   connectionId: CONNECTION_ID,
-  state: "enabled",
 } as const;
 
 interface Recorded {
@@ -86,7 +85,7 @@ async function mount(options: {
   await root.plugin(ToolRegistry);
   await root.plugin(FakeCredentialLease);
   const plugin = createConfiguredOllamaWebSearchRuntimeContribution({
-    assignment: ASSIGNMENT,
+    capability: CAPABILITY,
     accountId: "user-1",
     connectionId: CONNECTION_ID,
     connectionGeneration: GENERATION,
@@ -336,7 +335,7 @@ describe("the Ollama Cloud web_search Capability", () => {
     await root.fiber.dispose();
   });
 
-  test("mounts nothing without an enabled Assignment bound to the Connection", () => {
+  test("mounts only for the enabled Capability bound to the Connection", () => {
     const base = {
       accountId: "user-1",
       connectionId: CONNECTION_ID,
@@ -347,19 +346,13 @@ describe("the Ollama Cloud web_search Capability", () => {
     expect(
       createConfiguredOllamaWebSearchRuntimeContribution({
         ...base,
-        assignment: { ...ASSIGNMENT, state: "disabled" },
+        capability: { ...CAPABILITY, capabilityId: "ollama-cloud-models" },
       }),
     ).toBeUndefined();
     expect(
       createConfiguredOllamaWebSearchRuntimeContribution({
         ...base,
-        assignment: { ...ASSIGNMENT, capabilityId: "ollama-cloud-models" },
-      }),
-    ).toBeUndefined();
-    expect(
-      createConfiguredOllamaWebSearchRuntimeContribution({
-        ...base,
-        assignment: { ...ASSIGNMENT, connectionId: "other" },
+        capability: { ...CAPABILITY, connectionId: "other" },
       }),
     ).toBeUndefined();
   });

package/src/web-search.ts

@@ -12,7 +12,7 @@
 // `@frockbot/plugin-web/contract`, and a second provider satisfies it with no
 // change here and none in the kernel.
 //
-// AUTHORITY. `web_search` needs an enabled Assignment of the
+// AUTHORITY. `web_search` needs the enabled
 // `ollama-cloud-web-search` Capability bound to a ready `ollama-cloud-account`
 // Connection. Without one this module mounts nothing and the tool is simply
 // absent from the catalog, which is what "fail visibly" means for a tool: the
@@ -249,16 +249,15 @@ export function createOllamaWebSearchRuntimePlugin(
 }
 
 /**
- * The Assignment fence (D3): `web_search` exists for a Bot only through an
- * enabled Assignment of `ollama-cloud-web-search` bound to a Connection. There
+ * The enablement fence (D3): `web_search` exists for a Bot only through an
+ * enabled `ollama-cloud-web-search` Capability bound to a Connection. There
  * is no unauthenticated fallback provider.
  */
 export function createConfiguredOllamaWebSearchRuntimeContribution(config: {
-  assignment: {
+  capability: {
     packageId: string;
     capabilityId: string;
     connectionId?: string;
-    state: string;
   };
   accountId: string;
   connectionId: string;
@@ -274,10 +273,9 @@ export function createConfiguredOllamaWebSearchRuntimeContribution(config: {
   fetch?: OllamaFetch;
 }): Plugin.Function | undefined {
   if (
-    config.assignment.packageId !== "provider-ollama-cloud" ||
-    config.assignment.capabilityId !== "ollama-cloud-web-search" ||
-    config.assignment.state !== "enabled" ||
-    config.assignment.connectionId !== config.connectionId
+    config.capability.packageId !== "provider-ollama-cloud" ||
+    config.capability.capabilityId !== "ollama-cloud-web-search" ||
+    config.capability.connectionId !== config.connectionId
   ) {
     return undefined;
   }