Run deferred tool syncs off the request on local, self-host and cloudflare

Rhys Sullivan committed 3 months ago

Commit 936f95e1 parent d5459f43 files · +20 −2Browse files

Unified · Split

3 files

 } from "@executor-js/api/server";
 import { makeDynamicWorkerExecutor } from "@executor-js/runtime-dynamic-worker";
 import { makeQuickJsExecutor } from "@executor-js/runtime-quickjs";
-import { env } from "cloudflare:workers";
+import { env, waitUntil } from "cloudflare:workers";
 import type { CloudflareConfig } from "./config";
 import { makeCloudflarePlugins } from "./plugins";
     allowLocalNetwork: config.allowLocalNetwork,
     webBaseUrl: config.webBaseUrl,
     oauthCallbackPath: "/api/oauth/callback",
+    // A Worker, so a tools read's speculative catalog refresh needs `waitUntil`
+    // to survive the response at all. Unlike cloud's Hyperdrive plane there is
+    // nothing to drain it before: the storage here is a D1 binding read
+    // straight off `env`, with no pool and no close finalizer, so a detached
+    // batch still has everything it needs after the response is written.
+    deferToolSync: (task) => Effect.sync(() => waitUntil(Effect.runPromise(task))),
   });
 /**

-import { Layer } from "effect";
+import { Effect, Layer } from "effect";
 import {
   CodeExecutorProvider,
         event.kind === "added" ? "integration_added" : "integration_removed",
         { plugin_key: event.pluginKey },
       ),
+    // Self-host is one long-lived process over one long-lived libSQL handle, so
+    // a speculative catalog refresh just goes to a detached fiber: the handle
+    // it needs outlives every request, and there is no isolate to keep alive.
+    // Detached, not `forkScoped` — the request scope this is called from closes
+    // as soon as the response is written, which is precisely what the work has
+    // to outlive. The task is total by contract, so nothing escapes the fork.
+    deferToolSync: (task) => Effect.asVoid(Effect.forkDetach(task)),
   };
 });

             event.kind === "added" ? "integration_added" : "integration_removed",
             { plugin_key: event.pluginKey },
           ),
+        // The daemon owns its sqlite handle for its whole lifetime, so a tools
+        // read's speculative catalog refresh goes to a detached fiber and the
+        // read answers without waiting on an MCP server's handshake. The task
+        // is total by contract, so nothing escapes the fork.
+        deferToolSync: (task) => Effect.asVoid(Effect.forkDetach(task)),
         onElicitation: "accept-all",
         oauthEndpointUrlPolicy: { allowHttp: true },
         // EXPLICIT OAuth callback — the daemon serves the v2 `/api/oauth/callback`

Keyboard shortcuts