Send toolkits' storage row ids when forwarding to v2

Author: RhysSullivan

apps/cloud/src/mcp/toolkit-lookup.ts

@@ -1,25 +1,20 @@
 // ---------------------------------------------------------------------------
-// Resolving a toolkit URL's slug to the toolkit's row id, for forwarding.
+// Resolving a toolkit URL's slug to the toolkit's storage row id, for forwarding.
 //
 // Toolkits live in plugin storage (`@executor-js/plugin-toolkits`), owned by the
-// org or by a single user. This reads them the way the v1 session does: through
-// an executor scoped to the caller and org, so the caller sees the org's
-// toolkits plus their own personal ones and nobody else's. The executor is
-// built with the toolkits plugin alone, because a forwarded request has no use
-// for the rest of the catalog. Among the rows with the slug the org's toolkit
-// wins over the caller's own, as in the plugin's own slug resolution
-// (`getBySlugEntry`).
+// org or by a single user. v2 imported each toolkit under its `plugin_storage`
+// row id (not the toolkit's own `id`, which is the row's `key`), and derives the
+// toolkit's v2 connection from that row id, so this reads the row id itself.
+// The plugin's API hides it, hence the direct read. Visibility matches the v1
+// session: the org's toolkits plus the caller's own personal ones, nobody
+// else's. Among rows with the slug the org's toolkit wins over the caller's own,
+// as in the plugin's slug resolution (`getBySlugEntry`).
 // ---------------------------------------------------------------------------
 
-import { Effect, Layer } from "effect";
+import { sql } from "drizzle-orm";
+import { Effect } from "effect";
 
-import { PluginsProvider, makeScopedExecutor } from "@executor-js/api/server";
-import { toolkitsPlugin } from "@executor-js/plugin-toolkits/server";
-
-import { CloudDbProvider, CloudHostConfig } from "../engine/execution-stack";
-import { makeDbLayer } from "../db/db";
-
-const toolkitsOnly = Layer.succeed(PluginsProvider)({ plugins: () => [toolkitsPlugin()] });
+import { DbService, makeDbLayer } from "../db/db";
 
 export const resolveToolkitRowId = (
   organizationId: string,
@@ -28,17 +23,17 @@ export const resolveToolkitRowId = (
 ): Promise<string | null> =>
   Effect.runPromise(
     Effect.gen(function* () {
-      const executor = yield* makeScopedExecutor<readonly [ReturnType<typeof toolkitsPlugin>]>(
-        accountId,
-        organizationId,
-        "",
+      const { db } = yield* DbService;
+      const result = yield* Effect.promise(() =>
+        db.execute<{ row_id: string }>(sql`
+          select row_id from plugin_storage
+          where tenant = ${organizationId} and plugin_id = 'toolkits' and collection = 'toolkits'
+            and (owner = 'org' or (owner = 'user' and subject = ${accountId}))
+            and (data::jsonb)->>'slug' = ${slug}
+          order by case when owner = 'org' then 0 else 1 end, key
+          limit 1
+        `),
       );
-      const toolkits = yield* executor.toolkits.list();
-      const matches = toolkits.filter((toolkit) => toolkit.slug === slug);
-      return (matches.find((toolkit) => toolkit.owner === "org") ?? matches[0])?.id ?? null;
-    }).pipe(
-      Effect.provide(Layer.mergeAll(CloudDbProvider, toolkitsOnly, CloudHostConfig)),
-      Effect.provide(makeDbLayer()),
-      Effect.scoped,
-    ),
+      return [...result][0]?.row_id ?? null;
+    }).pipe(Effect.provide(makeDbLayer()), Effect.scoped),
   );

apps/cloud/src/mcp/v2-moved-flag.node.test.ts

@@ -12,6 +12,7 @@
 // ---------------------------------------------------------------------------
 
 import { describe, expect, it } from "@effect/vitest";
+import { sql } from "drizzle-orm";
 import { Effect, Layer } from "effect";
 
 import { UserStoreService, makeUserStoreLayer } from "../auth/context";
@@ -107,7 +108,19 @@ describe("toolkit slug lookup", () => {
         "",
       );
       const created = yield* executor.toolkits.create({ owner, name: slug, slug });
-      return created.id;
+      // v2 keys an imported toolkit by its storage row id, which is not the toolkit's id.
+      const { db } = yield* DbService;
+      const rows = yield* Effect.promise(() =>
+        db.execute<{ row_id: string }>(sql`
+          select row_id from plugin_storage
+          where tenant = ${organizationId} and plugin_id = 'toolkits'
+            and collection = 'toolkits' and key = ${created.id}
+        `),
+      );
+      const rowId = [...rows][0]?.row_id;
+      expect(rowId).toBeDefined();
+      expect(rowId).not.toBe(created.id);
+      return rowId;
     }).pipe(
       Effect.provide(Layer.mergeAll(CloudDbProvider, toolkitsOnly, CloudHostConfig)),
       Effect.provide(makeDbLayer()),