Make custom tools sources first-class integrations

Author: RhysSullivan

apps/host-selfhost/scripts/custom-tools-demo.ts

@@ -7,6 +7,7 @@ const HOST = "127.0.0.1";
 const BASE_URL = `http://${HOST}:${PORT}`;
 const ORIGIN = "http://custom-tools-demo.local";
 const DEMO_REPO = "RhysSullivan/executor-custom-tools-demo";
+const DEMO_APP = "demo-tools";
 const ADMIN_EMAIL = "admin@custom-tools-demo.local";
 const ADMIN_PASSWORD = "admin-pass-123456";
 const USER_EMAIL = "rhys@custom-tools-demo.local";
@@ -232,7 +233,7 @@ const htmlEscape = (value: string): string =>
     .replaceAll('"', """);
 
 const toolInvokeCode = (toolName: string, args: unknown): string => `
-const found = await tools.search({ namespace: "apps", query: ${JSON.stringify(toolName)}, limit: 20 });
+const found = await tools.search({ namespace: ${JSON.stringify(DEMO_APP)}, query: ${JSON.stringify(toolName)}, limit: 20 });
 const item = found.items.find((candidate) => candidate.path.endsWith(${JSON.stringify(toolName)}));
 if (!item) return { ok: false, missing: ${JSON.stringify(toolName)}, found };
 let fn = tools;
@@ -251,10 +252,11 @@ const buildBanner = (input: {
   readonly consoleUi: string;
 }): string => {
   const sync = curlJson("/api/apps/sources/github/sync", {
+    name: DEMO_APP,
     url: input.repoUrl,
     token: input.githubToken,
   });
-  const list = `curl -sS '${BASE_URL}/api/tools?integration=apps' | jq`;
+  const list = `curl -sS '${BASE_URL}/api/tools?integration=${DEMO_APP}' | jq`;
   const repoSummary = curlJson("/api/executions", {
     code: toolInvokeCode("repo-summary", {
       github: input.connectionAddress,
@@ -290,6 +292,9 @@ Auth:
 GitHub invocation connection:
   ${input.connectionAddress}
 
+Custom tools app:
+  ${DEMO_APP}
+
 Sync the repo:
   ${sync}
 

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

@@ -8,7 +8,7 @@ import {
   makeScopedExecutor,
   type Principal,
 } from "@executor-js/api/server";
-import { ToolAddress } from "@executor-js/sdk";
+import { IntegrationSlug, ToolAddress } from "@executor-js/sdk";
 
 import { SelfHostScopedExecutorSeams } from "./execution";
 import { SelfHostDb, type SelfHostDbHandle } from "./db/self-host-db";
@@ -43,6 +43,21 @@ const buildExecutor = (principal: Principal, request: Request) => {
     : withOrigin;
 };
 
+const sourceSlugFromRoute = () =>
+  HttpRouter.params.pipe(
+    Effect.map((params) => params.slug ?? ""),
+    Effect.flatMap((slug) =>
+      slug.length > 0
+        ? Effect.succeed(slug)
+        : Effect.fail(
+            new AppsSyncRouteError({
+              status: 400,
+              message: "Missing custom tools source slug",
+            }),
+          ),
+    ),
+  );
+
 export interface SelfHostAppsSyncRouteDeps {
   readonly identity: Layer.Layer<IdentityProvider>;
   readonly db: SelfHostDbHandle;
@@ -118,5 +133,34 @@ export const makeSelfHostAppsSyncRoute = ({ identity, db }: SelfHostAppsSyncRout
         }),
       ),
     ),
+    HttpRouter.add(
+      "GET",
+      "/api/apps/sources/github/:slug",
+      routeHandler((request) =>
+        Effect.gen(function* () {
+          const identityProvider = yield* IdentityProvider;
+          const principal = yield* identityProvider.authenticate(request);
+          const slug = yield* sourceSlugFromRoute();
+          const executor = yield* buildExecutor(principal, request);
+          return yield* executor.execute(ToolAddress.make("executor.apps.get_github_source"), {
+            slug,
+          });
+        }),
+      ),
+    ),
+    HttpRouter.add(
+      "DELETE",
+      "/api/apps/sources/github/:slug",
+      routeHandler((request) =>
+        Effect.gen(function* () {
+          const identityProvider = yield* IdentityProvider;
+          const principal = yield* identityProvider.authenticate(request);
+          const slug = yield* sourceSlugFromRoute();
+          const executor = yield* buildExecutor(principal, request);
+          yield* executor.integrations.remove(IntegrationSlug.make(slug));
+          return { removed: true };
+        }),
+      ),
+    ),
   ).pipe(HttpRouter.provideRequest(services));
 };