@flue/sdk 0.3.3 → 0.3.5

package/dist/index.mjs

@@ -396,9 +396,6 @@ 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';
@@ -410,7 +407,7 @@ import {
   resolveModel,
 } from '@flue/sdk/internal';
 import { runWithCloudflareContext, cfSandboxToSessionEnv } from '@flue/sdk/cloudflare';
-${sandboxClassImport ? "\n" + sandboxClassImport : ""}
+
 ${agentImports}
 
 // ─── Config ─────────────────────────────────────────────────────────────────
@@ -454,19 +451,40 @@ 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. None of the obvious detection strategies work:
+ *
+ *   - Structural duck-typing (\`'X' in stub\`, \`typeof stub.X === 'function'\`):
+ *     the proxy lies positively for any property name, so any check returns
+ *     \`true\` regardless of what's actually on the remote.
+ *   - \`instanceof <UserSandboxClass>\` (e.g. \`Sandbox\` from
+ *     \`@cloudflare/sandbox\`): the user's class only exists on the in-DO
+ *     side; over RPC the caller gets a generic stub.
+ *   - \`instanceof DurableObject\` (imported from \`cloudflare:workers\`): the
+ *     stub's prototype chain has a class *named* \`DurableObject\`, but it's a
+ *     workerd-internal class with a different identity than the importable
+ *     one. \`instanceof\` checks identity, not name, so it returns \`false\`.
+ *
+ * The one signal that does work — verified by runtime probe — is the string
+ * name of the prototype's constructor. Workerd's internal RPC stub class is
+ * named \`DurableObject\`, and \`Object.getPrototypeOf(stub).constructor.name\`
+ * returns that string. This is a heuristic (it relies on a workerd-internal
+ * naming convention, not a contractual API), but it's empirically correct
+ * today and will misroute only if a user passes some other DO stub to
+ * \`init({ sandbox })\` — in which case \`cfSandboxToSessionEnv\` will fail
+ * loudly on first method call.
  */
 function resolveSandbox(sandbox) {
-  ${sandboxClassNames.length > 0 ? `if (sandbox instanceof __FlueCfSandbox) {
+  if (
+    sandbox &&
+    typeof sandbox === 'object' &&
+    Object.getPrototypeOf(sandbox)?.constructor?.name === 'DurableObject'
+  ) {
     return cfSandboxToSessionEnv(sandbox);
-  }` : "/* no @cloudflare/sandbox bindings declared in wrangler config */"}
+  }
   return null;
 }
 
@@ -696,7 +714,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.5",
   "type": "module",
   "license": "Apache-2.0",
   "exports": {