@flue/sdk 0.3.3 → 0.3.4

package/dist/index.mjs

@@ -396,12 +396,10 @@ var CloudflarePlugin = class {
 }`;
 		}).join("\n\n");
 		const { config: userConfig } = await this.getUserConfig(ctx.outputDir);
-		const sandboxClassNames = detectSandboxBindings(userConfig);
-		const sandboxReExports = sandboxClassNames.map((name) => `export { Sandbox as ${name} } from '@cloudflare/sandbox';`).join("\n");
-		const sandboxClassImport = sandboxClassNames.length > 0 ? `import { Sandbox as __FlueCfSandbox } from '@cloudflare/sandbox';` : "";
 		return `
 // Auto-generated by @flue/sdk build (cloudflare)
 import { Agent, routeAgentRequest } from 'agents';
+import { DurableObject } from 'cloudflare:workers';
 import { Bash, InMemoryFs } from 'just-bash';
 import {
   createFlueContext,
@@ -410,7 +408,7 @@ import {
   resolveModel,
 } from '@flue/sdk/internal';
 import { runWithCloudflareContext, cfSandboxToSessionEnv } from '@flue/sdk/cloudflare';
-${sandboxClassImport ? "\n" + sandboxClassImport : ""}
+
 ${agentImports}
 
 // ─── Config ─────────────────────────────────────────────────────────────────
@@ -454,19 +452,30 @@ async function createLocalEnv() {
 
 /**
  * Detect and wrap external sandbox instances (e.g. from @cloudflare/sandbox's
- * getSandbox()). Returns SessionEnv if the value is a @cloudflare/sandbox
+ * getSandbox()). Returns SessionEnv if the value looks like a Durable Object
  * RPC stub, null otherwise.
  *
- * NOTE: We must use \`instanceof\` here, not structural duck-typing. The value
- * returned by \`getSandbox()\` is a workerd RPC Proxy that returns \`true\` for
- * any \`in\` check and \`'function'\` for \`typeof <anything>\`, so structural
- * checks (positive or negative) are unreliable against it. \`instanceof\` walks
- * the prototype chain via the runtime, which the proxy can't fake.
+ * NOTE on detection: The value returned by \`getSandbox()\` is a workerd RPC
+ * Proxy. \`in\` and \`typeof\` against it return \`true\`/\`'function'\` for any
+ * property name, so structural duck-typing is unreliable.
+ *
+ * \`instanceof <UserSandboxClass>\` ALSO does not work: the RPC stub's
+ * prototype chain is workerd's internal \`DurableObject\` runtime class, not
+ * the user-defined \`Sandbox\` class (the user's class only exists on the
+ * in-DO side; the caller side gets a generic stub). Empirically:
+ *   typeof stub === 'object'
+ *   Object.getPrototypeOf(stub).constructor.name === 'DurableObject'
+ *
+ * \`instanceof DurableObject\` (imported from \`cloudflare:workers\`) is the
+ * one signal that holds: it walks the prototype chain via the runtime and
+ * matches any DO RPC stub. We treat any DO stub passed to \`init({ sandbox })\`
+ * as intended for \`@cloudflare/sandbox\`, since that's the only documented
+ * use case for that argument shape on the Cloudflare target.
  */
 function resolveSandbox(sandbox) {
-  ${sandboxClassNames.length > 0 ? `if (sandbox instanceof __FlueCfSandbox) {
+  if (sandbox instanceof DurableObject) {
     return cfSandboxToSessionEnv(sandbox);
-  }` : "/* no @cloudflare/sandbox bindings declared in wrangler config */"}
+  }
   return null;
 }
 
@@ -696,7 +705,7 @@ ${agentClasses}
 // \`@cloudflare/sandbox\` so each user-chosen class_name resolves at the
 // bundle's top level. The binding + container image configuration is owned
 // by the user's wrangler.jsonc.
-${sandboxReExports}
+${detectSandboxBindings(userConfig).map((name) => `export { Sandbox as ${name} } from '@cloudflare/sandbox';`).join("\n")}
 
 // ─── Worker Fetch Handler ───────────────────────────────────────────────────
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flue/sdk",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "type": "module",
   "license": "Apache-2.0",
   "exports": {