Allow trusted plugin keyed state (#83775)

bek91 · web-flow · commit 10b313d628df · 2026-05-18T22:38:54.000-04:00
diff --git a/src/plugin-state/plugin-state-store.runtime.test.ts b/src/plugin-state/plugin-state-store.runtime.test.ts
@@ -6,12 +6,17 @@ import type { PluginRuntime } from "../plugins/runtime/types.js";
 import { withOpenClawTestState } from "../test-utils/openclaw-test-state.js";
 import { resetPluginStateStoreForTests } from "./plugin-state-store.js";
 
-function createPluginRecord(id: string, origin: PluginRecord["origin"] = "bundled"): PluginRecord {
+function createPluginRecord(
+  id: string,
+  origin: PluginRecord["origin"] = "bundled",
+  opts: { trustedOfficialInstall?: boolean } = {},
+): PluginRecord {
   return {
     id,
     name: id,
     source: `/plugins/${id}/index.ts`,
     origin,
+    trustedOfficialInstall: opts.trustedOfficialInstall,
     enabled: true,
     status: "loaded",
     toolNames: [],
@@ -87,6 +92,22 @@ describe("plugin runtime state proxy", () => {
     });
   });
 
+  it("allows trusted official global plugins to use keyed state", async () => {
+    await withOpenClawTestState({ label: "plugin-state-trusted-global" }, async () => {
+      const registry = createTestPluginRegistry();
+      const record = createPluginRecord("slack", "global", { trustedOfficialInstall: true });
+      registry.registry.plugins.push(record);
+      const api = registry.createApi(record, { config: {} });
+
+      const store = api.runtime.state.openKeyedStore<{ plugin: string }>({
+        namespace: "runtime",
+        maxEntries: 10,
+      });
+      await expect(store.register("thread", { plugin: "slack" })).resolves.toBeUndefined();
+      await expect(store.lookup("thread")).resolves.toEqual({ plugin: "slack" });
+    });
+  });
+
   it("rejects external plugins in this release", () => {
     const registry = createTestPluginRegistry();
     const record = createPluginRecord("external-plugin", "workspace");
@@ -95,6 +116,17 @@ describe("plugin runtime state proxy", () => {
 
     expect(() =>
       api.runtime.state.openKeyedStore({ namespace: "runtime", maxEntries: 10 }),
-    ).toThrow("openKeyedStore is only available for bundled plugins");
+    ).toThrow("openKeyedStore is only available for trusted plugins");
+  });
+
+  it("rejects untrusted global plugins", () => {
+    const registry = createTestPluginRegistry();
+    const record = createPluginRecord("external-plugin", "global");
+    registry.registry.plugins.push(record);
+    const api = registry.createApi(record, { config: {} });
+
+    expect(() =>
+      api.runtime.state.openKeyedStore({ namespace: "runtime", maxEntries: 10 }),
+    ).toThrow("openKeyedStore is only available for trusted plugins");
   });
 });
diff --git a/src/plugins/registry.ts b/src/plugins/registry.ts
@@ -51,7 +51,6 @@ import {
 import { buildPluginApi } from "./api-builder.js";
 import { normalizeRegisteredChannelPlugin } from "./channel-validation.js";
 import { CODEX_APP_SERVER_EXTENSION_RUNTIME_ID } from "./codex-app-server-extension-factory.js";
-import { getPluginCompatRecord } from "./compat/registry.js";
 import type { CodexAppServerExtensionFactory } from "./codex-app-server-extension-types.js";
 import {
   isReservedCommandName,
@@ -63,6 +62,7 @@ import {
   getRegisteredCompactionProvider,
   registerCompactionProvider,
 } from "./compaction-provider.js";
+import { getPluginCompatRecord } from "./compat/registry.js";
 import { sendPluginSessionAttachment } from "./host-hook-attachments.js";
 import {
   clearPluginRunContext,
@@ -2421,9 +2421,9 @@ export function createPluginRegistry(registryParams: PluginRegistryParams) {
               const record =
                 pluginRuntimeRecordById.get(pluginId) ??
                 registry.plugins.find((entry) => entry.id === pluginId);
-              if (record?.origin !== "bundled") {
+              if (record?.origin !== "bundled" && record?.trustedOfficialInstall !== true) {
                 throw new Error(
-                  "openKeyedStore is only available for bundled plugins in this release.",
+                  "openKeyedStore is only available for trusted plugins in this release.",
                 );
               }
               return createPluginStateKeyedStore<T>(pluginId, options);
