Consolidate custom tools plugin wiring

Author: RhysSullivan

apps/host-selfhost/executor.config.ts

@@ -6,9 +6,10 @@ import { mcpHttpPlugin } from "@executor-js/plugin-mcp/api";
 import { graphqlHttpPlugin } from "@executor-js/plugin-graphql/api";
 import { encryptedSecretsPlugin } from "@executor-js/plugin-encrypted-secrets";
 import { toolkitsPlugin } from "@executor-js/plugin-toolkits/server";
+import { appsPlugin } from "@executor-js/plugin-apps/api";
 
 import { resolveSecretKey } from "./src/config";
-import { getSelfHostAppsSubsystem } from "./src/apps";
+import { getSelfHostAppsBackings } from "./src/apps-backings";
 
 // ---------------------------------------------------------------------------
 // Single source of truth for the self-hosted app's plugin list.
@@ -37,7 +38,7 @@ export default defineExecutorConfig({
       mcpHttpPlugin({ dangerouslyAllowStdioMCP: false }),
       graphqlHttpPlugin(),
       toolkitsPlugin({ activeToolkitSlug }),
-      getSelfHostAppsSubsystem().plugin,
+      appsPlugin({ backings: getSelfHostAppsBackings() }),
       // First writable secret provider -> the default for `secrets.set`.
       encryptedSecretsPlugin({ key: resolveSecretKey() }),
     ] as const,

apps/host-selfhost/src/app.ts

@@ -22,8 +22,7 @@ import { makeSelfHostMcpSeams } from "./mcp";
 import { selfHostPlugins } from "./plugins";
 import { ErrorCaptureLive } from "./observability";
 import { oauthCallbackSignInRedirectLocation } from "./auth/oauth-callback-login";
-import { closeSelfHostAppsSubsystem } from "./apps";
-import { makeSelfHostAppsSyncRoute } from "./apps-route";
+import { closeSelfHostAppsBackings } from "./apps-backings";
 
 // ===========================================================================
 // The self-hosted Executor app, as ONE `ExecutorApp.make` call.
@@ -121,7 +120,6 @@ export const makeSelfHostApp = async (options: MakeSelfHostAppOptions = {}) => {
         makeSelfHostAdminApiLayer({ betterAuth, db: dbHandle, mountPrefix: "/api" }),
         // Public system API: /api/health + /api/setup-status (unauthenticated).
         makeSelfHostSystemApiLayer({ betterAuth, db: dbHandle, mountPrefix: "/api" }),
-        makeSelfHostAppsSyncRoute({ identity: identityLayer, db: dbHandle }),
         // Swagger UI at /docs, over the /api-prefixed spec (matches the served paths).
         HttpApiSwagger.layer(composePluginApi(selfHostPlugins).prefix("/api"), { path: "/docs" }),
       ],
@@ -142,7 +140,7 @@ export const makeSelfHostApp = async (options: MakeSelfHostAppOptions = {}) => {
     toWebHandler,
     betterAuth,
     closeDb: async () => {
-      await closeSelfHostAppsSubsystem();
+      await closeSelfHostAppsBackings();
       await mcp.close();
       await dbHandle.close();
     },

apps/host-selfhost/src/apps-backings.ts

@@ -0,0 +1,52 @@
+import { join } from "node:path";
+
+import { Effect } from "effect";
+
+import {
+  makeGitArtifactStore,
+  makeLibsqlScopeDb,
+  makeQuickjsToolSandbox,
+  makeSqliteAppsStore,
+  type AppsBackings,
+} from "@executor-js/plugin-apps/api";
+
+import { resolveDataDir } from "./config";
+
+interface SelfHostAppsBackings {
+  readonly backings: AppsBackings;
+  readonly close: () => Promise<void>;
+}
+
+const createBackings = (dataDir: string): SelfHostAppsBackings => {
+  const appsDir = join(dataDir, "apps");
+  const scopeDb = makeLibsqlScopeDb({
+    root: join(appsDir, "scope-db"),
+  });
+  return {
+    backings: {
+      artifactStore: makeGitArtifactStore({ root: join(appsDir, "artifacts") }),
+      scopeDb,
+      sandbox: makeQuickjsToolSandbox(),
+      store: makeSqliteAppsStore({ path: join(appsDir, "store.sqlite") }),
+    },
+    close: async () => {
+      await Effect.runPromise(scopeDb.close().pipe(Effect.orElseSucceed(() => undefined)));
+    },
+  };
+};
+
+let current: { readonly dataDir: string; readonly value: SelfHostAppsBackings } | undefined;
+
+export const getSelfHostAppsBackings = (): AppsBackings => {
+  const dataDir = resolveDataDir();
+  if (current && current.dataDir === dataDir) return current.value.backings;
+  const value = createBackings(dataDir);
+  current = { dataDir, value };
+  return value.backings;
+};
+
+export const closeSelfHostAppsBackings = async (): Promise<void> => {
+  const value = current?.value;
+  current = undefined;
+  await value?.close();
+};

apps/host-selfhost/src/apps-route.ts

@@ -30,8 +30,7 @@ import {
 } from "../mcp/session-store";
 import { selfHostPlugins } from "../plugins";
 import { ErrorCaptureLive } from "../observability";
-import { closeSelfHostAppsSubsystem } from "../apps";
-import { makeSelfHostAppsSyncRoute } from "../apps-route";
+import { closeSelfHostAppsBackings } from "../apps-backings";
 
 // ===========================================================================
 // Self-host TEST harness — the throwaway composition tests use to exercise the
@@ -204,7 +203,6 @@ export const makeSelfHostTestApp = async (
     },
     extensions: {
       routes: [
-        makeSelfHostAppsSyncRoute({ identity: options.identity, db: dbHandle }),
         HttpApiSwagger.layer(composePluginApi(selfHostPlugins).prefix("/api"), { path: "/docs" }),
       ],
     },
@@ -220,7 +218,7 @@ export const makeSelfHostTestApp = async (
     handler: web.handler,
     dispose: async () => {
       await web.dispose();
-      await closeSelfHostAppsSubsystem();
+      await closeSelfHostAppsBackings();
       await sessionStore.close();
       await dbHandle.close();
     },