@frockbot/plugin-settings 0.1.4 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-settings",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "private": false,
   "type": "module",
   "exports": {
@@ -21,14 +21,14 @@
     "typecheck": "vue-tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/catalog-core": "0.1.4",
-    "@frockbot/client-core": "0.1.4",
-    "@frockbot/client-ui": "0.1.4",
-    "@frockbot/configuration-core": "0.1.4",
-    "@frockbot/connection-core": "0.1.4",
-    "@frockbot/kernel-composition": "0.1.4",
-    "@frockbot/plugin-auth": "0.1.4",
-    "@frockbot/plugin-shell": "0.1.4",
+    "@frockbot/catalog-core": "0.2.1",
+    "@frockbot/client-core": "0.2.1",
+    "@frockbot/client-ui": "0.2.1",
+    "@frockbot/configuration-core": "0.2.1",
+    "@frockbot/connection-core": "0.2.1",
+    "@frockbot/kernel-composition": "0.2.1",
+    "@frockbot/plugin-auth": "0.2.1",
+    "@frockbot/plugin-shell": "0.2.1",
     "cordis": "4.0.0-rc.8",
     "vue": "3.5.41"
   },

package/src/user.test.ts

@@ -82,6 +82,75 @@ async function installOllama(
 }
 
 describe("User settings backend Contribution", () => {
+  test("reads old settings purely and writes the migrated shape on the next command", async () => {
+    const storage = new MemoryStorage();
+    // Literal durable shape from eb0283edcce5daea976a21a9f6a6414bedc6e2bc,
+    // the first parent of PR #134's merge commit.
+    const historical = {
+      schemaVersion: 1,
+      revision: 7,
+      profile: { name: "Existing User" },
+      packages: [],
+      connections: [
+        {
+          connectionId: "ollama-1",
+          packageId: "provider-ollama-cloud",
+          connectionTypeId: "ollama-cloud-account",
+          displayName: "Work",
+          state: "ready",
+          safeMetadata: {
+            dependentAssignments: [
+              {
+                botId: "primary",
+                generation: "assignment-1",
+                packageId: "provider-ollama-cloud",
+                capabilityId: "ollama-cloud-models",
+                claimOrder: 0,
+                status: "acknowledged",
+              },
+            ],
+          },
+        },
+      ],
+      newBotModelTemplate: {
+        connectionId: "ollama-1",
+        providerModelId: "glm-5.3-flash:cloud",
+      },
+      newBotModelTemplateSource: "user",
+    };
+    storage.values.set("user-configuration", structuredClone(historical));
+    const settings = contribution(storage);
+
+    await expect(settings.readSnapshot()).resolves.toMatchObject({
+      revision: 7,
+      connections: [{ safeMetadata: {} }],
+    });
+    expect(await storage.get<unknown>("user-configuration")).toEqual(
+      historical,
+    );
+
+    await settings.executeConfiguration({
+      schemaVersion: 1,
+      userId: "user-1",
+      command: {
+        schemaVersion: 1,
+        type: "user/update-profile",
+        commandId: "migrate-user-settings",
+        expectedRevision: 7,
+        profile: { name: "Migrated User" },
+      },
+    });
+    const written =
+      await storage.get<Record<string, unknown>>("user-configuration");
+    expect(written).toMatchObject({
+      revision: 8,
+      profile: { name: "Migrated User" },
+      connections: [{ safeMetadata: {} }],
+    });
+    expect(written).not.toHaveProperty("newBotModelTemplate");
+    expect(written).not.toHaveProperty("newBotModelTemplateSource");
+  });
+
   test("bootstraps first-party Packages once and preserves a later uninstall", async () => {
     const storage = new MemoryStorage();
     const settings = createUserSettingsBackendContribution({
@@ -657,6 +726,9 @@ class FakeCatalog implements UserPackageCatalogHost {
           version: entry.version,
           manifestHash: entry.manifestHash,
           kind: entry.kind,
+          ...(entry.bundle === undefined
+            ? {}
+            : { contentHash: entry.bundle.contentHash }),
         })),
       },
     });
@@ -752,6 +824,89 @@ describe("remote Package Catalog", () => {
     });
   });
 
+  test("admits only the exact hash of a code-carrying Catalog entry", async () => {
+    const contentHash = "b".repeat(64);
+    const catalog = new FakeCatalog();
+    catalog.entries = [
+      catalogEntry({
+        packageId: "parcel-tracking",
+        catalogId: "parcel-tracking",
+        displayName: "Parcel tracking",
+        manifestHash: "e".repeat(64),
+        bundle: {
+          contentHash,
+          size: 512,
+          mediaType: "application/javascript",
+          bundlerVersion: "catalog-test@1",
+          manifest: {
+            schemaVersion: 3,
+            id: "parcel-tracking",
+            displayName: "Parcel tracking",
+            version: "0.0.1",
+            compatibility: { frockbot: "*" },
+            dependencies: {},
+            contributions: {
+              runtime: { entry: "./package.js", host: "bot-isolate" },
+            },
+            tools: [],
+            permissions: [],
+          },
+        },
+      }),
+    ];
+    const { settings, storage } = catalogContribution(
+      new MemoryStorage(),
+      catalog,
+    );
+    await settings.readConfiguration({ schemaVersion: 1, userId: "user-1" });
+
+    await expect(
+      settings.executeConfiguration({
+        schemaVersion: 1,
+        userId: "user-1",
+        command: {
+          schemaVersion: 1,
+          type: "user/install-package",
+          commandId: "install-parcel",
+          expectedRevision: 0,
+          packageId: "parcel-tracking",
+          version: "0.0.1",
+          catalogId: "parcel-tracking",
+          catalogGeneration: "gen-one",
+          contentHash,
+        },
+      }),
+    ).resolves.toMatchObject({ status: "applied" });
+    expect(
+      (await storage.get<UserSettingsViewV1>("user-configuration"))?.packages,
+    ).toEqual([
+      expect.objectContaining({ packageId: "parcel-tracking", contentHash }),
+    ]);
+
+    const mismatch = catalogContribution(new MemoryStorage(), catalog);
+    await mismatch.settings.readConfiguration({
+      schemaVersion: 1,
+      userId: "user-1",
+    });
+    await expect(
+      mismatch.settings.executeConfiguration({
+        schemaVersion: 1,
+        userId: "user-1",
+        command: {
+          schemaVersion: 1,
+          type: "user/install-package",
+          commandId: "install-wrong-hash",
+          expectedRevision: 0,
+          packageId: "parcel-tracking",
+          version: "0.0.1",
+          catalogId: "parcel-tracking",
+          catalogGeneration: "gen-one",
+          contentHash: "c".repeat(64),
+        },
+      }),
+    ).rejects.toThrow('requires bundle hash "bbbb');
+  });
+
   test("refuses an install off the pinned generation", async () => {
     const { catalog, settings } = catalogContribution();
     await settings.readConfiguration({ schemaVersion: 1, userId: "user-1" });

package/src/user.ts

@@ -9,6 +9,7 @@ import {
   decodeUserConfigurationExecuteRpcV1,
   decodeUserConfigurationReadRpcV1,
   decodeUserSettingsViewV1,
+  migrateStoredUserSettingsV1,
   MAX_USER_CONNECTIONS_V1,
   USER_PROFILE_PLACEHOLDER_NAME_V1,
   type ConnectionView,
@@ -302,6 +303,9 @@ function applyUserCommand(
               : {
                   catalogId: command.catalogId,
                   catalogGeneration: command.catalogGeneration,
+                  ...(command.contentHash === undefined
+                    ? {}
+                    : { contentHash: command.contentHash }),
                   provenance: "catalog" as const,
                 }),
             ...(Object.keys(values).length === 0 ? {} : { values }),
@@ -615,6 +619,7 @@ export class UserSettingsBackendContribution {
     version: string;
     catalogId: string;
     catalogGeneration: string;
+    contentHash?: string;
   }): Promise<CatalogEntryV1> {
     const catalog = this.host.catalog;
     if (!catalog) {
@@ -639,6 +644,17 @@ export class UserSettingsBackendContribution {
         `Catalog entry "${command.catalogId}" does not offer Package "${command.packageId}" at version "${command.version}"`,
       );
     }
+    if (entry.bundle) {
+      if (command.contentHash !== entry.bundle.contentHash) {
+        throw new Error(
+          `Catalog entry "${command.catalogId}" requires bundle hash "${entry.bundle.contentHash}"`,
+        );
+      }
+    } else if (command.contentHash !== undefined) {
+      throw new Error(
+        `Catalog entry "${command.catalogId}" does not carry a Package bundle`,
+      );
+    }
     return entry;
   }
 
@@ -656,6 +672,9 @@ export class UserSettingsBackendContribution {
             version: command.version,
             catalogId: command.catalogId,
             catalogGeneration: command.catalogGeneration,
+            ...(command.contentHash === undefined
+              ? {}
+              : { contentHash: command.contentHash }),
           })
         : undefined;
     return this.host.storage.transaction((storage) =>
@@ -731,7 +750,7 @@ export class UserSettingsBackendContribution {
     const current =
       storedSettings === undefined
         ? initialState()
-        : decodeUserSettingsViewV1(storedSettings);
+        : decodeUserSettingsViewV1(migrateStoredUserSettingsV1(storedSettings));
     if (command.type === "user/set-package-enabled" && command.enabled) {
       const installed = current.packages.find(
         (pkg) => pkg.packageId === command.packageId,
@@ -800,7 +819,7 @@ export class UserSettingsBackendContribution {
     const stored = await storage.get<unknown>(STATE_KEY);
     return stored === undefined
       ? initialState()
-      : decodeUserSettingsViewV1(stored);
+      : decodeUserSettingsViewV1(migrateStoredUserSettingsV1(stored));
   }
 
   async read(