@frockbot/plugin-settings 0.3.9 → 0.3.11

package/package.json

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

package/src/client/BotSettingsSurface.vue

@@ -59,6 +59,13 @@ const label = ref("");
 const description = ref("");
 const title = ref("");
 const hiddenFromSidebar = ref(false);
+/*
+ * Pinning is durable as the instant it happened, so the sidebar can order
+ * pinned Bots by pin time. The panel edits the intent; the original instant is
+ * kept across an unrelated save so re-saving never reshuffles the tiles.
+ */
+const pinned = ref(false);
+const pinnedAt = ref("");
 const notifications = ref(false);
 const pendingApprovals = computed(() =>
   web.value.approvals.filter((approval) => approval.decision === "pending"),
@@ -98,6 +105,8 @@ watch(
     description.value = settings.profile.description ?? "";
     title.value = settings.profile.title ?? "";
     hiddenFromSidebar.value = settings.profile.hiddenFromSidebar === true;
+    pinnedAt.value = settings.profile.pinnedAt ?? "";
+    pinned.value = pinnedAt.value !== "";
     notifications.value = settings.notifications.enabled;
   },
   { immediate: true },
@@ -116,6 +125,10 @@ async function save(): Promise<void> {
       description: description.value,
       title: title.value,
       hiddenFromSidebar: hiddenFromSidebar.value,
+      pinnedAt: pinned.value
+        ? pinnedAt.value || new Date().toISOString()
+        : // The empty string unpins, the same way it clears an optional text field.
+          "",
     });
     await web.value.saveBotNotifications({ enabled: notifications.value });
     surfaces.close();
@@ -162,6 +175,23 @@ async function save(): Promise<void> {
         />
       </UiField>
     </UiAnchor>
+    <UiAnchor
+      anchor="bot-pinned"
+      label="Pinned"
+      :href="link('bot-pinned')"
+      class="settings-row"
+    >
+      <label class="notification-setting">
+        <span>
+          <strong>Pinned</strong>
+          <small>
+            Pin this Bot to the top of the sidebar. Unpin it to put it back in
+            the list.
+          </small>
+        </span>
+        <input v-model="pinned" type="checkbox" />
+      </label>
+    </UiAnchor>
     <UiAnchor
       anchor="bot-description"
       label="Description"

package/src/user.test.ts

@@ -746,6 +746,51 @@ describe("User settings backend Contribution", () => {
         },
       }),
     ).resolves.toMatchObject({ status: "applied", revision: 4 });
+
+    // The mirror of the rule above, read the other way round. Disabling the
+    // dependency is allowed — refusing it would make a Package the User never
+    // chose able to pin one they did — and carries its dependents with it, so
+    // the account never lands in the state the enable path refuses:
+    // `custom-models=disabled provider-ollama-cloud=installed`.
+    await expect(
+      settings.executeConfiguration({
+        schemaVersion: 1,
+        userId: "user-1",
+        command: {
+          schemaVersion: 1,
+          type: "user/set-package-enabled",
+          commandId: "disable-custom-models",
+          expectedRevision: 4,
+          packageId: "custom-models",
+          enabled: false,
+        },
+      }),
+    ).resolves.toMatchObject({ status: "applied", revision: 5 });
+    const cascaded = await settings.read("user-1");
+    expect(cascaded.packages[0]).toMatchObject({
+      packageId: "custom-models",
+      state: "disabled",
+    });
+    expect(cascaded.packages[1]).toMatchObject({
+      packageId: "provider-ollama-cloud",
+      state: "disabled",
+    });
+
+    // The cascade is not automatic re-enablement: turning the dependency back
+    // on leaves the dependent off until the User asks for it.
+    await settings.executeConfiguration({
+      schemaVersion: 1,
+      userId: "user-1",
+      command: {
+        schemaVersion: 1,
+        type: "user/set-package-enabled",
+        commandId: "re-enable-custom-models",
+        expectedRevision: 5,
+        packageId: "custom-models",
+        enabled: true,
+      },
+    });
+    expect((await settings.read("user-1")).packages[1]?.state).toBe("disabled");
   });
 
   test("applies the platform model through the backend Contribution", async () => {

package/src/user.ts

@@ -731,6 +731,54 @@ export class UserSettingsBackendContribution {
     return undefined;
   }
 
+  /**
+   * The mirror of `packageDependencyFailure`, read the other way round.
+   *
+   * Enabling B before A is refused, so leaving B enabled once A is switched
+   * off would put the account in exactly the configuration the enable path
+   * will not create. Refusing the disable is not the answer either: a Package
+   * the User never chose — `provider-ollama-cloud` depends on `web` — would
+   * make `web` undisableable. So the disable is allowed and carries its
+   * dependents with it, transitively. Model binding degrades to the platform
+   * default rather than failing, so a cascade that reaches the Package a Bot's
+   * model is bound to costs that Bot its choice, not its next reply.
+   *
+   * Platform-owned Packages are never cascaded: they cannot be disabled by any
+   * other path, and in this application they depend only on each other.
+   */
+  private cascadeDisabledDependents(
+    settings: UserSettingsViewV1,
+  ): UserSettingsViewV1 {
+    let packages = settings.packages;
+    for (;;) {
+      const enabled = new Set(
+        packages
+          .filter((pkg) => pkg.state === "installed")
+          .map((pkg) => pkg.packageId),
+      );
+      const cascaded = packages.map((pkg) => {
+        if (pkg.state !== "installed") return pkg;
+        if (this.platformOwnedPackageIds.has(pkg.packageId)) return pkg;
+        const dependencies = this.packageDependencies.get(
+          `${pkg.packageId}\u0000${pkg.version}`,
+        );
+        if (!dependencies) return pkg;
+        const missing = Object.keys(dependencies).some(
+          (dependencyId) => !enabled.has(dependencyId),
+        );
+        return missing
+          ? { ...pkg, state: "disabled" as const, failure: undefined }
+          : pkg;
+      });
+      if (cascaded.every((pkg, index) => pkg === packages[index])) {
+        return packages === settings.packages
+          ? settings
+          : { ...settings, packages };
+      }
+      packages = cascaded;
+    }
+  }
+
   async readConfiguration(input: unknown): Promise<UserSettingsViewV1> {
     const request = decodeUserConfigurationReadRpcV1(input);
     // Settings owns the stored-record migration and platform-row repair. Run
@@ -1001,9 +1049,16 @@ export class UserSettingsBackendContribution {
       await storage.put(receiptKey, { commandFingerprint, receipt });
       return receipt;
     }
-    const next = applyUserCommand(current, command, (packageId, version) =>
+    const applied = applyUserCommand(current, command, (packageId, version) =>
       this.settingDefinitions(packageId, version),
     );
+    // One command, one revision: the cascade is part of the disable the User
+    // asked for, not a second write they have to reconcile against.
+    const next =
+      command.type === "user/uninstall-package" ||
+      (command.type === "user/set-package-enabled" && !command.enabled)
+        ? this.cascadeDisabledDependents(applied)
+        : applied;
     const receipt: OperationReceiptV1 = {
       schemaVersion: 1,
       commandId: command.commandId,