@malloy-publisher/server 0.0.235 → 0.0.237

package/dist/server.mjs

@@ -120280,8 +120280,8 @@ var require_node42 = __commonJS((exports, module) => {
         }
         break;
       case "FILE":
-        var fs = __require("fs");
-        stream2 = new fs.SyncWriteStream(fd2, { autoClose: false });
+        var fs2 = __require("fs");
+        stream2 = new fs2.SyncWriteStream(fd2, { autoClose: false });
         stream2._type = "fs";
         break;
       case "PIPE":
@@ -136347,8 +136347,8 @@ var require_node43 = __commonJS((exports, module) => {
         }
         break;
       case "FILE":
-        var fs = __require("fs");
-        stream2 = new fs.SyncWriteStream(fd2, { autoClose: false });
+        var fs2 = __require("fs");
+        stream2 = new fs2.SyncWriteStream(fd2, { autoClose: false });
         stream2._type = "fs";
         break;
       case "PIPE":
@@ -137073,8 +137073,8 @@ var require_node44 = __commonJS((exports, module) => {
         }
         break;
       case "FILE":
-        var fs = __require("fs");
-        stream2 = new fs.SyncWriteStream(fd2, { autoClose: false });
+        var fs2 = __require("fs");
+        stream2 = new fs2.SyncWriteStream(fd2, { autoClose: false });
         stream2._type = "fs";
         break;
       case "PIPE":
@@ -137986,7 +137986,7 @@ var require_view = __commonJS((exports, module) => {
    */
   var debug = require_src109()("express:view");
   var path = __require("path");
-  var fs = __require("fs");
+  var fs2 = __require("fs");
   var dirname = path.dirname;
   var basename = path.basename;
   var extname = path.extname;
@@ -138052,7 +138052,7 @@ var require_view = __commonJS((exports, module) => {
   function tryStat(path2) {
     debug('stat "%s"', path2);
     try {
-      return fs.statSync(path2);
+      return fs2.statSync(path2);
     } catch (e) {
       return;
     }
@@ -138595,8 +138595,8 @@ var require_node45 = __commonJS((exports, module) => {
         }
         break;
       case "FILE":
-        var fs = __require("fs");
-        stream2 = new fs.SyncWriteStream(fd2, { autoClose: false });
+        var fs2 = __require("fs");
+        stream2 = new fs2.SyncWriteStream(fd2, { autoClose: false });
         stream2._type = "fs";
         break;
       case "PIPE":
@@ -138784,7 +138784,7 @@ var require_types45 = __commonJS((exports, module) => {
 // ../../node_modules/send/node_modules/mime/mime.js
 var require_mime = __commonJS((exports, module) => {
   var path = __require("path");
-  var fs = __require("fs");
+  var fs2 = __require("fs");
   function Mime() {
     this.types = Object.create(null);
     this.extensions = Object.create(null);
@@ -138805,7 +138805,7 @@ var require_mime = __commonJS((exports, module) => {
   };
   Mime.prototype.load = function(file) {
     this._loading = file;
-    var map = {}, content = fs.readFileSync(file, "ascii"), lines = content.split(/[\r\n]+/);
+    var map = {}, content = fs2.readFileSync(file, "ascii"), lines = content.split(/[\r\n]+/);
     lines.forEach(function(line) {
       var fields = line.replace(/\s*#.*|^\s*|\s*$/g, "").split(/\s+/);
       map[fields.shift()] = fields;
@@ -138933,7 +138933,7 @@ var require_send = __commonJS((exports, module) => {
   var escapeHtml = require_escape_html();
   var etag = require_etag();
   var fresh = require_fresh();
-  var fs = __require("fs");
+  var fs2 = __require("fs");
   var mime = require_mime();
   var ms = require_ms();
   var onFinished = require_on_finished();
@@ -139261,7 +139261,7 @@ var require_send = __commonJS((exports, module) => {
     var i = 0;
     var self2 = this;
     debug('stat "%s"', path2);
-    fs.stat(path2, function onstat(err, stat) {
+    fs2.stat(path2, function onstat(err, stat) {
       if (err && err.code === "ENOENT" && !extname(path2) && path2[path2.length - 1] !== sep) {
         return next(err);
       }
@@ -139278,7 +139278,7 @@ var require_send = __commonJS((exports, module) => {
       }
       var p = path2 + "." + self2._extensions[i++];
       debug('stat "%s"', p);
-      fs.stat(p, function(err2, stat) {
+      fs2.stat(p, function(err2, stat) {
         if (err2)
           return next(err2);
         if (stat.isDirectory())
@@ -139299,7 +139299,7 @@ var require_send = __commonJS((exports, module) => {
       }
       var p = join(path2, self2._index[i]);
       debug('stat "%s"', p);
-      fs.stat(p, function(err2, stat) {
+      fs2.stat(p, function(err2, stat) {
         if (err2)
           return next(err2);
         if (stat.isDirectory())
@@ -139313,7 +139313,7 @@ var require_send = __commonJS((exports, module) => {
   SendStream.prototype.stream = function stream(path2, options) {
     var self2 = this;
     var res = this.res;
-    var stream2 = fs.createReadStream(path2, options);
+    var stream2 = fs2.createReadStream(path2, options);
     this.emit("stream", stream2);
     stream2.pipe(res);
     function cleanup() {
@@ -156020,6 +156020,8 @@ function internalErrorToHttpError(error) {
     return httpError(400, error.message);
   } else if (error instanceof ConnectionNotFoundError) {
     return httpError(404, error.message);
+  } else if (error instanceof DestinationNotFoundError) {
+    return httpError(422, error.message);
   } else if (error instanceof ConnectionAuthError) {
     return httpError(422, error.message);
   } else if (error instanceof UnsupportedCatalogFormatError) {
@@ -156055,7 +156057,7 @@ function httpError(code, message) {
     }
   };
 }
-var NotImplementedError, BadRequestError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, ConnectionNotFoundError, ConnectionError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, QueryTimeoutError;
+var NotImplementedError, BadRequestError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, ConnectionNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
 var init_errors = __esm(() => {
   init_constants();
   NotImplementedError = class NotImplementedError extends Error {
@@ -156093,6 +156095,11 @@ var init_errors = __esm(() => {
       super(message);
     }
   };
+  DestinationNotFoundError = class DestinationNotFoundError extends Error {
+    constructor(message) {
+      super(message);
+    }
+  };
   ConnectionAuthError = class ConnectionAuthError extends Error {
     constructor(message) {
       super(message);
@@ -156154,6 +156161,13 @@ var init_errors = __esm(() => {
   PayloadTooLargeError = class PayloadTooLargeError extends Error {
     constructor(message) {
       super(message);
+      this.name = "PayloadTooLargeError";
+    }
+  };
+  ResponseUnserializableError = class ResponseUnserializableError extends PayloadTooLargeError {
+    constructor(message) {
+      super(message);
+      this.name = "ResponseUnserializableError";
     }
   };
   QueryTimeoutError = class QueryTimeoutError extends Error {
@@ -165281,7 +165295,7 @@ var require_form_data = __commonJS((exports, module) => {
   var http = __require("http");
   var https = __require("https");
   var parseUrl = __require("url").parse;
-  var fs2 = __require("fs");
+  var fs3 = __require("fs");
   var Stream = __require("stream").Stream;
   var crypto2 = __require("crypto");
   var mime = require_mime_types3();
@@ -165349,7 +165363,7 @@ var require_form_data = __commonJS((exports, module) => {
       if (value.end != null && value.end != Infinity && value.start != null) {
         callback(null, value.end + 1 - (value.start ? value.start : 0));
       } else {
-        fs2.stat(value.path, function(err, stat) {
+        fs3.stat(value.path, function(err, stat) {
           if (err) {
             callback(err);
             return;
@@ -183150,8 +183164,8 @@ ${suffix}`;
 // ../../node_modules/ssh2/lib/protocol/SFTP.js
 var require_SFTP = __commonJS((exports, module) => {
   var EventEmitter2 = __require("events");
-  var fs2 = __require("fs");
-  var { constants } = fs2;
+  var fs3 = __require("fs");
+  var { constants } = fs3;
   var {
     Readable: ReadableStream3,
     Writable: WritableStream
@@ -183550,12 +183564,12 @@ var require_SFTP = __commonJS((exports, module) => {
     fastGet(remotePath, localPath, opts, cb) {
       if (this.server)
         throw new Error("Client-only method called in server mode");
-      fastXfer(this, fs2, remotePath, localPath, opts, cb);
+      fastXfer(this, fs3, remotePath, localPath, opts, cb);
     }
     fastPut(localPath, remotePath, opts, cb) {
       if (this.server)
         throw new Error("Client-only method called in server mode");
-      fastXfer(fs2, this, localPath, remotePath, opts, cb);
+      fastXfer(fs3, this, localPath, remotePath, opts, cb);
     }
     readFile(path3, options, callback_) {
       if (this.server)
@@ -184764,13 +184778,13 @@ var require_SFTP = __commonJS((exports, module) => {
           if (--left === 0)
             cb(err);
         };
-        if (srcHandle && (src === fs2 || src.outgoing.state === "open"))
+        if (srcHandle && (src === fs3 || src.outgoing.state === "open"))
           ++left;
-        if (dstHandle && (dst === fs2 || dst.outgoing.state === "open"))
+        if (dstHandle && (dst === fs3 || dst.outgoing.state === "open"))
           ++left;
-        if (srcHandle && (src === fs2 || src.outgoing.state === "open"))
+        if (srcHandle && (src === fs3 || src.outgoing.state === "open"))
           src.close(srcHandle, cbfinal);
-        if (dstHandle && (dst === fs2 || dst.outgoing.state === "open"))
+        if (dstHandle && (dst === fs3 || dst.outgoing.state === "open"))
           dst.close(dstHandle, cbfinal);
       } else {
         cb(err);
@@ -184786,7 +184800,7 @@ var require_SFTP = __commonJS((exports, module) => {
         tryStat(null, { size: fileSize });
       function tryStat(err2, attrs) {
         if (err2) {
-          if (src !== fs2) {
+          if (src !== fs3) {
             src.stat(srcPath, (err_, attrs_) => {
               if (err_)
                 return onerror(err2);
@@ -190358,23 +190372,23 @@ var require_crypto2 = __commonJS((exports) => {
 var require_crypto3 = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.NodeCrypto = undefined;
-  var crypto3 = __require("crypto");
+  var crypto4 = __require("crypto");
 
   class NodeCrypto {
     async sha256DigestBase64(str) {
-      return crypto3.createHash("sha256").update(str).digest("base64");
+      return crypto4.createHash("sha256").update(str).digest("base64");
     }
     randomBytesBase64(count) {
-      return crypto3.randomBytes(count).toString("base64");
+      return crypto4.randomBytes(count).toString("base64");
     }
     async verify(pubkey, data, signature) {
-      const verifier = crypto3.createVerify("RSA-SHA256");
+      const verifier = crypto4.createVerify("RSA-SHA256");
       verifier.update(data);
       verifier.end();
       return verifier.verify(pubkey, signature, "base64");
     }
     async sign(privateKey, data) {
-      const signer = crypto3.createSign("RSA-SHA256");
+      const signer = crypto4.createSign("RSA-SHA256");
       signer.update(data);
       signer.end();
       return signer.sign(privateKey, "base64");
@@ -190386,11 +190400,11 @@ var require_crypto3 = __commonJS((exports) => {
       return Buffer.from(text, "utf-8").toString("base64");
     }
     async sha256DigestHex(str) {
-      return crypto3.createHash("sha256").update(str).digest("hex");
+      return crypto4.createHash("sha256").update(str).digest("hex");
     }
     async signWithHmacSha256(key, msg) {
       const cryptoKey = typeof key === "string" ? key : toBuffer(key);
-      return toArrayBuffer(crypto3.createHmac("sha256", cryptoKey).update(msg).digest());
+      return toArrayBuffer(crypto4.createHmac("sha256", cryptoKey).update(msg).digest());
     }
   }
   exports.NodeCrypto = NodeCrypto;
@@ -191006,10 +191020,10 @@ var require_oauth2client = __commonJS((exports) => {
       throw new Error("generateCodeVerifier is removed, please use generateCodeVerifierAsync instead.");
     }
     async generateCodeVerifierAsync() {
-      const crypto3 = (0, crypto_1.createCrypto)();
-      const randomString = crypto3.randomBytesBase64(96);
+      const crypto4 = (0, crypto_1.createCrypto)();
+      const randomString = crypto4.randomBytesBase64(96);
       const codeVerifier = randomString.replace(/\+/g, "~").replace(/=/g, "_").replace(/\//g, "-");
-      const unencodedCodeChallenge = await crypto3.sha256DigestBase64(codeVerifier);
+      const unencodedCodeChallenge = await crypto4.sha256DigestBase64(codeVerifier);
       const codeChallenge = unencodedCodeChallenge.split("=")[0].replace(/\+/g, "-").replace(/\//g, "_");
       return { codeVerifier, codeChallenge };
     }
@@ -191411,7 +191425,7 @@ var require_oauth2client = __commonJS((exports) => {
       throw new Error("verifySignedJwtWithCerts is removed, please use verifySignedJwtWithCertsAsync instead.");
     }
     async verifySignedJwtWithCertsAsync(jwt, certs, requiredAudience, issuers, maxExpiry) {
-      const crypto3 = (0, crypto_1.createCrypto)();
+      const crypto4 = (0, crypto_1.createCrypto)();
       if (!maxExpiry) {
         maxExpiry = OAuth2Client.DEFAULT_MAX_TOKEN_LIFETIME_SECS_;
       }
@@ -191424,7 +191438,7 @@ var require_oauth2client = __commonJS((exports) => {
       let envelope;
       let payload;
       try {
-        envelope = JSON.parse(crypto3.decodeBase64StringUtf8(segments[0]));
+        envelope = JSON.parse(crypto4.decodeBase64StringUtf8(segments[0]));
       } catch (err) {
         if (err instanceof Error) {
           err.message = `Can't parse token envelope: ${segments[0]}': ${err.message}`;
@@ -191435,7 +191449,7 @@ var require_oauth2client = __commonJS((exports) => {
         throw new Error("Can't parse token envelope: " + segments[0]);
       }
       try {
-        payload = JSON.parse(crypto3.decodeBase64StringUtf8(segments[1]));
+        payload = JSON.parse(crypto4.decodeBase64StringUtf8(segments[1]));
       } catch (err) {
         if (err instanceof Error) {
           err.message = `Can't parse token payload '${segments[0]}`;
@@ -191452,7 +191466,7 @@ var require_oauth2client = __commonJS((exports) => {
       if (envelope.alg === "ES256") {
         signature = formatEcdsa.joseToDer(signature, "ES256").toString("base64");
       }
-      const verified = await crypto3.verify(cert, signed, signature);
+      const verified = await crypto4.verify(cert, signed, signature);
       if (!verified) {
         throw new Error("Invalid token signature: " + jwt);
       }
@@ -191776,7 +191790,7 @@ var require_buffer_equal_constant_time = __commonJS((exports, module) => {
 // ../../node_modules/jwa/index.js
 var require_jwa = __commonJS((exports, module) => {
   var Buffer2 = require_safe_buffer().Buffer;
-  var crypto3 = __require("crypto");
+  var crypto4 = __require("crypto");
   var formatEcdsa = require_ecdsa_sig_formatter();
   var util5 = __require("util");
   var MSG_INVALID_ALGORITHM = `"%s" is not a valid algorithm.
@@ -191785,7 +191799,7 @@ var require_jwa = __commonJS((exports, module) => {
   var MSG_INVALID_SECRET = "secret must be a string or buffer";
   var MSG_INVALID_VERIFIER_KEY = "key must be a string or a buffer";
   var MSG_INVALID_SIGNER_KEY = "key must be a string, a buffer or an object";
-  var supportsKeyObjects = typeof crypto3.createPublicKey === "function";
+  var supportsKeyObjects = typeof crypto4.createPublicKey === "function";
   if (supportsKeyObjects) {
     MSG_INVALID_VERIFIER_KEY += " or a KeyObject";
     MSG_INVALID_SECRET += "or a KeyObject";
@@ -191875,17 +191889,17 @@ var require_jwa = __commonJS((exports, module) => {
     return function sign(thing, secret) {
       checkIsSecretKey(secret);
       thing = normalizeInput(thing);
-      var hmac = crypto3.createHmac("sha" + bits, secret);
+      var hmac = crypto4.createHmac("sha" + bits, secret);
       var sig = (hmac.update(thing), hmac.digest("base64"));
       return fromBase64(sig);
     };
   }
   var bufferEqual;
-  var timingSafeEqual = "timingSafeEqual" in crypto3 ? function timingSafeEqual2(a, b) {
+  var timingSafeEqual = "timingSafeEqual" in crypto4 ? function timingSafeEqual2(a, b) {
     if (a.byteLength !== b.byteLength) {
       return false;
     }
-    return crypto3.timingSafeEqual(a, b);
+    return crypto4.timingSafeEqual(a, b);
   } : function timingSafeEqual2(a, b) {
     if (!bufferEqual) {
       bufferEqual = require_buffer_equal_constant_time();
@@ -191902,7 +191916,7 @@ var require_jwa = __commonJS((exports, module) => {
     return function sign(thing, privateKey) {
       checkIsPrivateKey(privateKey);
       thing = normalizeInput(thing);
-      var signer = crypto3.createSign("RSA-SHA" + bits);
+      var signer = crypto4.createSign("RSA-SHA" + bits);
       var sig = (signer.update(thing), signer.sign(privateKey, "base64"));
       return fromBase64(sig);
     };
@@ -191912,7 +191926,7 @@ var require_jwa = __commonJS((exports, module) => {
       checkIsPublicKey(publicKey);
       thing = normalizeInput(thing);
       signature = toBase64(signature);
-      var verifier = crypto3.createVerify("RSA-SHA" + bits);
+      var verifier = crypto4.createVerify("RSA-SHA" + bits);
       verifier.update(thing);
       return verifier.verify(publicKey, signature, "base64");
     };
@@ -191921,11 +191935,11 @@ var require_jwa = __commonJS((exports, module) => {
     return function sign(thing, privateKey) {
       checkIsPrivateKey(privateKey);
       thing = normalizeInput(thing);
-      var signer = crypto3.createSign("RSA-SHA" + bits);
+      var signer = crypto4.createSign("RSA-SHA" + bits);
       var sig = (signer.update(thing), signer.sign({
         key: privateKey,
-        padding: crypto3.constants.RSA_PKCS1_PSS_PADDING,
-        saltLength: crypto3.constants.RSA_PSS_SALTLEN_DIGEST
+        padding: crypto4.constants.RSA_PKCS1_PSS_PADDING,
+        saltLength: crypto4.constants.RSA_PSS_SALTLEN_DIGEST
       }, "base64"));
       return fromBase64(sig);
     };
@@ -191935,12 +191949,12 @@ var require_jwa = __commonJS((exports, module) => {
       checkIsPublicKey(publicKey);
       thing = normalizeInput(thing);
       signature = toBase64(signature);
-      var verifier = crypto3.createVerify("RSA-SHA" + bits);
+      var verifier = crypto4.createVerify("RSA-SHA" + bits);
       verifier.update(thing);
       return verifier.verify({
         key: publicKey,
-        padding: crypto3.constants.RSA_PKCS1_PSS_PADDING,
-        saltLength: crypto3.constants.RSA_PSS_SALTLEN_DIGEST
+        padding: crypto4.constants.RSA_PKCS1_PSS_PADDING,
+        saltLength: crypto4.constants.RSA_PSS_SALTLEN_DIGEST
       }, signature, "base64");
     };
   }
@@ -192244,12 +192258,12 @@ var require_src113 = __commonJS((exports) => {
   var _GoogleToken_requestToken;
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.GoogleToken = undefined;
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var gaxios_1 = require_src53();
   var jws = require_jws();
   var path4 = __require("path");
   var util_1 = __require("util");
-  var readFile = fs3.readFile ? (0, util_1.promisify)(fs3.readFile) : async () => {
+  var readFile = fs4.readFile ? (0, util_1.promisify)(fs4.readFile) : async () => {
     throw new ErrorWithCode("use key rather than keyFile.", "MISSING_CREDENTIALS");
   };
   var GOOGLE_TOKEN_URL = "https://www.googleapis.com/oauth2/v4/token";
@@ -193462,10 +193476,10 @@ var require_filesubjecttokensupplier = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.FileSubjectTokenSupplier = undefined;
   var util_1 = __require("util");
-  var fs3 = __require("fs");
-  var readFile = (0, util_1.promisify)((_a = fs3.readFile) !== null && _a !== undefined ? _a : () => {});
-  var realpath = (0, util_1.promisify)((_b = fs3.realpath) !== null && _b !== undefined ? _b : () => {});
-  var lstat = (0, util_1.promisify)((_c = fs3.lstat) !== null && _c !== undefined ? _c : () => {});
+  var fs4 = __require("fs");
+  var readFile = (0, util_1.promisify)((_a = fs4.readFile) !== null && _a !== undefined ? _a : () => {});
+  var realpath = (0, util_1.promisify)((_b = fs4.realpath) !== null && _b !== undefined ? _b : () => {});
+  var lstat = (0, util_1.promisify)((_c = fs4.lstat) !== null && _c !== undefined ? _c : () => {});
 
   class FileSubjectTokenSupplier {
     constructor(opts) {
@@ -193666,14 +193680,14 @@ var require_awsrequestsigner = __commonJS((exports) => {
     }
   }
   exports.AwsRequestSigner = AwsRequestSigner;
-  async function sign(crypto3, key, msg) {
-    return await crypto3.signWithHmacSha256(key, msg);
-  }
-  async function getSigningKey(crypto3, key, dateStamp, region, serviceName) {
-    const kDate = await sign(crypto3, `AWS4${key}`, dateStamp);
-    const kRegion = await sign(crypto3, kDate, region);
-    const kService = await sign(crypto3, kRegion, serviceName);
-    const kSigning = await sign(crypto3, kService, "aws4_request");
+  async function sign(crypto4, key, msg) {
+    return await crypto4.signWithHmacSha256(key, msg);
+  }
+  async function getSigningKey(crypto4, key, dateStamp, region, serviceName) {
+    const kDate = await sign(crypto4, `AWS4${key}`, dateStamp);
+    const kRegion = await sign(crypto4, kDate, region);
+    const kService = await sign(crypto4, kRegion, serviceName);
+    const kSigning = await sign(crypto4, kService, "aws4_request");
     return kSigning;
   }
   async function generateAuthenticationHeaderMap(options) {
@@ -194029,7 +194043,7 @@ var require_pluggable_auth_handler = __commonJS((exports) => {
   var pluggable_auth_client_1 = require_pluggable_auth_client();
   var executable_response_1 = require_executable_response();
   var childProcess = __require("child_process");
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
 
   class PluggableAuthHandler {
     constructor(options) {
@@ -194085,14 +194099,14 @@ var require_pluggable_auth_handler = __commonJS((exports) => {
       }
       let filePath;
       try {
-        filePath = await fs3.promises.realpath(this.outputFile);
+        filePath = await fs4.promises.realpath(this.outputFile);
       } catch (_a) {
         return;
       }
-      if (!(await fs3.promises.lstat(filePath)).isFile()) {
+      if (!(await fs4.promises.lstat(filePath)).isFile()) {
         return;
       }
-      const responseString = await fs3.promises.readFile(filePath, {
+      const responseString = await fs4.promises.readFile(filePath, {
         encoding: "utf8"
       });
       if (responseString === "") {
@@ -194419,7 +194433,7 @@ var require_googleauth = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.GoogleAuth = exports.GoogleAuthExceptionMessages = exports.CLOUD_SDK_CLIENT_ID = undefined;
   var child_process_1 = __require("child_process");
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var gcpMetadata = require_src55();
   var os2 = __require("os");
   var path4 = __require("path");
@@ -194623,7 +194637,7 @@ var require_googleauth = __commonJS((exports) => {
       }
       if (location) {
         location = path4.join(location, "gcloud", "application_default_credentials.json");
-        if (!fs3.existsSync(location)) {
+        if (!fs4.existsSync(location)) {
           location = null;
         }
       }
@@ -194638,8 +194652,8 @@ var require_googleauth = __commonJS((exports) => {
         throw new Error("The file path is invalid.");
       }
       try {
-        filePath = fs3.realpathSync(filePath);
-        if (!fs3.lstatSync(filePath).isFile()) {
+        filePath = fs4.realpathSync(filePath);
+        if (!fs4.lstatSync(filePath).isFile()) {
           throw new Error;
         }
       } catch (err) {
@@ -194648,7 +194662,7 @@ var require_googleauth = __commonJS((exports) => {
         }
         throw err;
       }
-      const readStream2 = fs3.createReadStream(filePath);
+      const readStream2 = fs4.createReadStream(filePath);
       return this.fromStream(readStream2, options);
     }
     fromImpersonatedJSON(json) {
@@ -194900,24 +194914,24 @@ var require_googleauth = __commonJS((exports) => {
         const signed = await client.sign(data);
         return signed.signedBlob;
       }
-      const crypto3 = (0, crypto_1.createCrypto)();
+      const crypto4 = (0, crypto_1.createCrypto)();
       if (client instanceof jwtclient_1.JWT && client.key) {
-        const sign = await crypto3.sign(client.key, data);
+        const sign = await crypto4.sign(client.key, data);
         return sign;
       }
       const creds = await this.getCredentials();
       if (!creds.client_email) {
         throw new Error("Cannot sign data without `client_email`.");
       }
-      return this.signBlob(crypto3, creds.client_email, data, endpoint);
+      return this.signBlob(crypto4, creds.client_email, data, endpoint);
     }
-    async signBlob(crypto3, emailOrUniqueId, data, endpoint) {
+    async signBlob(crypto4, emailOrUniqueId, data, endpoint) {
       const url2 = new URL(endpoint + `${emailOrUniqueId}:signBlob`);
       const res = await this.request({
         method: "POST",
         url: url2.href,
         data: {
-          payload: crypto3.encodeBase64StringUtf8(data)
+          payload: crypto4.encodeBase64StringUtf8(data)
         },
         retry: true,
         retryConfig: {
@@ -194940,7 +194954,7 @@ var require_googleauth = __commonJS((exports) => {
       return this._cacheClientFromJSON(this.jsonContent, this.clientOptions);
     } else if (this.keyFilename) {
       const filePath = path4.resolve(this.keyFilename);
-      const stream4 = fs3.createReadStream(filePath);
+      const stream4 = fs4.createReadStream(filePath);
       return await this.fromStreamAsync(stream4, this.clientOptions);
     } else if (this.apiKey) {
       const client = await this.fromAPIKey(this.apiKey, this.clientOptions);
@@ -202694,7 +202708,7 @@ var require_table = __commonJS((exports) => {
   var Big = require_big();
   var extend2 = require_extend();
   var events_1 = __require("events");
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var is = require_is();
   var path4 = __require("path");
   var streamEvents = require_stream_events();
@@ -203004,7 +203018,7 @@ var require_table = __commonJS((exports) => {
         if (!metadata.sourceFormat && detectedFormat) {
           metadata.sourceFormat = detectedFormat;
         }
-        const jobWritable = fs3.createReadStream(source).pipe(this.createWriteStream_(metadata));
+        const jobWritable = fs4.createReadStream(source).pipe(this.createWriteStream_(metadata));
         const [jobResponse] = await (0, events_1.once)(jobWritable, "job");
         return [jobResponse, jobResponse.metadata];
       }
@@ -208804,11 +208818,11 @@ var require_randomUUID = __commonJS((exports) => {
 
 // ../../node_modules/@smithy/uuid/dist-cjs/index.js
 var require_dist_cjs16 = __commonJS((exports) => {
-  var randomUUID2 = require_randomUUID();
+  var randomUUID3 = require_randomUUID();
   var decimalToHex = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, "0"));
   var v4 = () => {
-    if (randomUUID2.randomUUID) {
-      return randomUUID2.randomUUID();
+    if (randomUUID3.randomUUID) {
+      return randomUUID3.randomUUID();
     }
     const rnds = new Uint8Array(16);
     crypto.getRandomValues(rnds);
@@ -223129,7 +223143,7 @@ var require_dist_cjs55 = __commonJS((exports) => {
   var utilBufferFrom = require_dist_cjs7();
   var utilUtf8 = require_dist_cjs8();
   var buffer = __require("buffer");
-  var crypto3 = __require("crypto");
+  var crypto4 = __require("crypto");
 
   class Hash {
     algorithmIdentifier;
@@ -223147,7 +223161,7 @@ var require_dist_cjs55 = __commonJS((exports) => {
       return Promise.resolve(this.hash.digest());
     }
     reset() {
-      this.hash = this.secret ? crypto3.createHmac(this.algorithmIdentifier, castSourceData(this.secret)) : crypto3.createHash(this.algorithmIdentifier);
+      this.hash = this.secret ? crypto4.createHmac(this.algorithmIdentifier, castSourceData(this.secret)) : crypto4.createHash(this.algorithmIdentifier);
     }
   }
   function castSourceData(toCast, encoding) {
@@ -225787,7 +225801,7 @@ var require_dist_cjs59 = __commonJS((exports) => {
   var httpAuthSchemes = require_httpAuthSchemes();
   var propertyProvider = require_dist_cjs18();
   var sharedIniFileLoader = require_dist_cjs44();
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var fromEnvSigningName = ({ logger: logger2, signingName } = {}) => async () => {
     logger2?.debug?.("@aws-sdk/token-providers - fromEnvSigningName");
     if (!signingName) {
@@ -225833,7 +225847,7 @@ var require_dist_cjs59 = __commonJS((exports) => {
       throw new propertyProvider.TokenProviderError(`Value not present for '${key}' in SSO Token${forRefresh ? ". Cannot refresh" : ""}. ${REFRESH_MESSAGE}`, false);
     }
   };
-  var { writeFile } = fs3.promises;
+  var { writeFile } = fs4.promises;
   var writeSSOTokenToFile = (id, ssoToken) => {
     const tokenFilepath = sharedIniFileLoader.getSSOTokenFilepath(id);
     const tokenString = JSON.stringify(ssoToken, null, 2);
@@ -230045,7 +230059,7 @@ var require_dist_cjs70 = __commonJS((exports) => {
 
 // ../../node_modules/@smithy/hash-stream-node/dist-cjs/index.js
 var require_dist_cjs71 = __commonJS((exports) => {
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var utilUtf8 = require_dist_cjs8();
   var stream4 = __require("stream");
 
@@ -230069,7 +230083,7 @@ var require_dist_cjs71 = __commonJS((exports) => {
       reject(new Error("Unable to calculate hash for non-file streams."));
       return;
     }
-    const fileStreamTee = fs3.createReadStream(fileStream.path, {
+    const fileStreamTee = fs4.createReadStream(fileStream.path, {
       start: fileStream.start,
       end: fileStream.end
     });
@@ -238478,9 +238492,9 @@ var require_dist11 = __commonJS((exports) => {
 var require_pump = __commonJS((exports, module) => {
   var once = require_once2();
   var eos = require_end_of_stream4();
-  var fs3;
+  var fs4;
   try {
-    fs3 = __require("fs");
+    fs4 = __require("fs");
   } catch (e) {}
   var noop2 = function() {};
   var ancient = typeof process === "undefined" ? false : /^v?\.0/.test(process.version);
@@ -238490,9 +238504,9 @@ var require_pump = __commonJS((exports, module) => {
   var isFS = function(stream4) {
     if (!ancient)
       return false;
-    if (!fs3)
+    if (!fs4)
       return false;
-    return (stream4 instanceof (fs3.ReadStream || noop2) || stream4 instanceof (fs3.WriteStream || noop2)) && isFn(stream4.close);
+    return (stream4 instanceof (fs4.ReadStream || noop2) || stream4 instanceof (fs4.WriteStream || noop2)) && isFn(stream4.close);
   };
   var isRequest2 = function(stream4) {
     return stream4.setHeader && isFn(stream4.abort);
@@ -238707,7 +238721,7 @@ var require_pend = __commonJS((exports, module) => {
 
 // ../../node_modules/fd-slicer/index.js
 var require_fd_slicer = __commonJS((exports) => {
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var util5 = __require("util");
   var stream4 = __require("stream");
   var Readable3 = stream4.Readable;
@@ -238732,7 +238746,7 @@ var require_fd_slicer = __commonJS((exports) => {
   FdSlicer.prototype.read = function(buffer, offset, length, position, callback) {
     var self2 = this;
     self2.pend.go(function(cb) {
-      fs3.read(self2.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
+      fs4.read(self2.fd, buffer, offset, length, position, function(err, bytesRead, buffer2) {
         cb();
         callback(err, bytesRead, buffer2);
       });
@@ -238741,7 +238755,7 @@ var require_fd_slicer = __commonJS((exports) => {
   FdSlicer.prototype.write = function(buffer, offset, length, position, callback) {
     var self2 = this;
     self2.pend.go(function(cb) {
-      fs3.write(self2.fd, buffer, offset, length, position, function(err, written, buffer2) {
+      fs4.write(self2.fd, buffer, offset, length, position, function(err, written, buffer2) {
         cb();
         callback(err, written, buffer2);
       });
@@ -238764,7 +238778,7 @@ var require_fd_slicer = __commonJS((exports) => {
     if (self2.refCount < 0)
       throw new Error("invalid unref");
     if (self2.autoClose) {
-      fs3.close(self2.fd, onCloseDone);
+      fs4.close(self2.fd, onCloseDone);
     }
     function onCloseDone(err) {
       if (err) {
@@ -238803,7 +238817,7 @@ var require_fd_slicer = __commonJS((exports) => {
       if (self2.destroyed)
         return cb();
       var buffer = new Buffer(toRead);
-      fs3.read(self2.context.fd, buffer, 0, toRead, self2.pos, function(err, bytesRead) {
+      fs4.read(self2.context.fd, buffer, 0, toRead, self2.pos, function(err, bytesRead) {
         if (err) {
           self2.destroy(err);
         } else if (bytesRead === 0) {
@@ -238853,7 +238867,7 @@ var require_fd_slicer = __commonJS((exports) => {
     self2.context.pend.go(function(cb) {
       if (self2.destroyed)
         return cb();
-      fs3.write(self2.context.fd, buffer, 0, buffer.length, self2.pos, function(err2, bytes) {
+      fs4.write(self2.context.fd, buffer, 0, buffer.length, self2.pos, function(err2, bytes) {
         if (err2) {
           self2.destroy();
           cb();
@@ -239278,7 +239292,7 @@ var require_buffer_crc32 = __commonJS((exports, module) => {
 
 // ../../node_modules/yauzl/index.js
 var require_yauzl = __commonJS((exports) => {
-  var fs3 = __require("fs");
+  var fs4 = __require("fs");
   var zlib2 = __require("zlib");
   var fd_slicer = require_fd_slicer();
   var crc32 = require_buffer_crc32();
@@ -239315,12 +239329,12 @@ var require_yauzl = __commonJS((exports) => {
       options.strictFileNames = false;
     if (callback == null)
       callback = defaultCallback;
-    fs3.open(path4, "r", function(err, fd) {
+    fs4.open(path4, "r", function(err, fd) {
       if (err)
         return callback(err);
       fromFd(fd, options, function(err2, zipfile) {
         if (err2)
-          fs3.close(fd, defaultCallback);
+          fs4.close(fd, defaultCallback);
         callback(err2, zipfile);
       });
     });
@@ -239344,7 +239358,7 @@ var require_yauzl = __commonJS((exports) => {
       options.strictFileNames = false;
     if (callback == null)
       callback = defaultCallback;
-    fs3.fstat(fd, function(err, stats) {
+    fs4.fstat(fd, function(err, stats) {
       if (err)
         return callback(err);
       var reader = fd_slicer.createFromFd(fd, { autoClose: true });
@@ -239977,7 +239991,7 @@ var require_yauzl = __commonJS((exports) => {
 // ../../node_modules/extract-zip/index.js
 var require_extract_zip = __commonJS((exports, module) => {
   var debug = require_src5()("extract-zip");
-  var { createWriteStream, promises: fs3 } = __require("fs");
+  var { createWriteStream, promises: fs4 } = __require("fs");
   var getStream = require_get_stream();
   var path4 = __require("path");
   var { promisify } = __require("util");
@@ -240019,8 +240033,8 @@ var require_extract_zip = __commonJS((exports, module) => {
           }
           const destDir = path4.dirname(path4.join(this.opts.dir, entry.fileName));
           try {
-            await fs3.mkdir(destDir, { recursive: true });
-            const canonicalDestDir = await fs3.realpath(destDir);
+            await fs4.mkdir(destDir, { recursive: true });
+            const canonicalDestDir = await fs4.realpath(destDir);
             const relativeDestDir = path4.relative(this.opts.dir, canonicalDestDir);
             if (relativeDestDir.split(path4.sep).includes("..")) {
               throw new Error(`Out of bound path "${canonicalDestDir}" found while processing file ${entry.fileName}`);
@@ -240065,7 +240079,7 @@ var require_extract_zip = __commonJS((exports, module) => {
         mkdirOptions.mode = procMode;
       }
       debug("mkdir", { dir: destDir, ...mkdirOptions });
-      await fs3.mkdir(destDir, mkdirOptions);
+      await fs4.mkdir(destDir, mkdirOptions);
       if (isDir)
         return;
       debug("opening read stream", dest);
@@ -240073,7 +240087,7 @@ var require_extract_zip = __commonJS((exports, module) => {
       if (symlink) {
         const link = await getStream(readStream2);
         debug("creating symlink", link, dest);
-        await fs3.symlink(link, dest);
+        await fs4.symlink(link, dest);
       } else {
         await pipeline(readStream2, createWriteStream(dest, { mode: procMode }));
       }
@@ -240105,8 +240119,8 @@ var require_extract_zip = __commonJS((exports, module) => {
     if (!path4.isAbsolute(opts.dir)) {
       throw new Error("Target directory is expected to be absolute");
     }
-    await fs3.mkdir(opts.dir, { recursive: true });
-    opts.dir = await fs3.realpath(opts.dir);
+    await fs4.mkdir(opts.dir, { recursive: true });
+    opts.dir = await fs4.realpath(opts.dir);
     return new Extractor(zipPath, opts).extract();
   };
 });
@@ -240690,10 +240704,10 @@ var init_package_load_pool = __esm(() => {
   })();
   defaultUrlReader = {
     readURL: async (url2) => {
-      const { promises: fs3 } = await import("fs");
+      const { promises: fs4 } = await import("fs");
       const { fileURLToPath: fileURLToPath3 } = await import("url");
       const filePath = url2.protocol === "file:" ? fileURLToPath3(url2) : url2.toString();
-      return fs3.readFile(filePath, "utf8");
+      return fs4.readFile(filePath, "utf8");
     }
   };
 });
@@ -241504,7 +241518,7 @@ globstar while`, file, fr, pattern, pr, swallowee);
 
 // ../../node_modules/recursive-readdir/index.js
 var require_recursive_readdir = __commonJS((exports, module) => {
-  var fs5 = __require("fs");
+  var fs6 = __require("fs");
   var p = __require("path");
   var minimatch = require_minimatch();
   function patternMatcher(pattern) {
@@ -241538,7 +241552,7 @@ var require_recursive_readdir = __commonJS((exports, module) => {
     }
     ignores = ignores.map(toMatcherFunction);
     var list = [];
-    fs5.readdir(path6, function(err, files) {
+    fs6.readdir(path6, function(err, files) {
       if (err) {
         return callback(err);
       }
@@ -241548,7 +241562,7 @@ var require_recursive_readdir = __commonJS((exports, module) => {
       }
       files.forEach(function(file) {
         var filePath = p.join(path6, file);
-        fs5.stat(filePath, function(_err, stats) {
+        fs6.stat(filePath, function(_err, stats) {
           if (_err) {
             return callback(_err);
           }
@@ -256134,6 +256148,68 @@ function httpMetricsMiddleware(req, res, next) {
   next();
 }
 
+// src/node_version_check.ts
+import * as fs from "node:fs";
+var MIN_NODE_MAJOR = 20;
+var REQUIRED_NODE_RANGE = `>=${MIN_NODE_MAJOR}`;
+var UNSUPPORTED_NODE_TOKEN = "PUBLISHER_UNSUPPORTED_NODE";
+function evaluateRuntime(versions) {
+  if (versions.bunVersion) {
+    return { supported: true };
+  }
+  const major = parseMajor(versions.nodeVersion);
+  if (major === undefined || major >= MIN_NODE_MAJOR) {
+    return { supported: true };
+  }
+  return {
+    supported: false,
+    message: unsupportedMessage(versions.nodeVersion)
+  };
+}
+function parseMajor(version) {
+  const match = /^v?(\d+)\./.exec(version.trim());
+  if (!match) {
+    return;
+  }
+  const major = Number(match[1]);
+  return Number.isFinite(major) ? major : undefined;
+}
+function unsupportedMessage(nodeVersion) {
+  return [
+    `${UNSUPPORTED_NODE_TOKEN} required=${REQUIRED_NODE_RANGE} detected=${nodeVersion}`,
+    `Malloy Publisher supports Node.js ${MIN_NODE_MAJOR} and newer, but this process is running Node.js ${nodeVersion}.`,
+    `Publisher and every Malloy library it depends on declare Node ${REQUIRED_NODE_RANGE}, so this`,
+    `runtime is untested and has failed in ways that never mention Node.`,
+    `Upgrade Node, then run the command again: https://nodejs.org`,
+    `  nvm:  nvm install ${MIN_NODE_MAJOR} && nvm use ${MIN_NODE_MAJOR}`,
+    `  mise: mise use -g node@${MIN_NODE_MAJOR}   then open a new shell before running the command`,
+    ""
+  ].join(`
+`);
+}
+function assertSupportedNodeVersion(options = {}) {
+  const verdict = evaluateRuntime({
+    nodeVersion: "nodeVersion" in options && options.nodeVersion !== undefined ? options.nodeVersion : process.version,
+    bunVersion: "bunVersion" in options ? options.bunVersion : process.versions.bun
+  });
+  if (verdict.supported) {
+    return;
+  }
+  const write = options.write ?? writeToStderr;
+  const exit = options.exit ?? ((code) => process.exit(code));
+  try {
+    write(verdict.message ?? "");
+  } catch {}
+  exit(1);
+}
+function writeToStderr(text) {
+  try {
+    fs.writeSync(2, text);
+  } catch {
+    process.stderr.write(text);
+  }
+}
+
 // ../../node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -261175,23 +261251,23 @@ class CompileController {
 // src/config.ts
 init_constants();
 init_logger();
-import fs from "fs";
+import fs2 from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 var BUNDLED_DEFAULT_CONFIG_PATH = path.join(path.dirname(fileURLToPath(import.meta.url)), "default-publisher.config.json");
 function resolvePublisherConfigPath(serverRoot) {
   const explicitPath = process.env.PUBLISHER_CONFIG_PATH;
   if (explicitPath && explicitPath.length > 0) {
-    if (!fs.existsSync(explicitPath)) {
+    if (!fs2.existsSync(explicitPath)) {
       return null;
     }
     return { path: explicitPath, isBundledDefault: false };
   }
   const serverRootPath = path.join(serverRoot, PUBLISHER_CONFIG_NAME);
-  if (fs.existsSync(serverRootPath)) {
+  if (fs2.existsSync(serverRootPath)) {
     return { path: serverRootPath, isBundledDefault: false };
   }
-  if (process.env.PUBLISHER_USE_BUNDLED_DEFAULT === "true" && fs.existsSync(BUNDLED_DEFAULT_CONFIG_PATH)) {
+  if (process.env.PUBLISHER_USE_BUNDLED_DEFAULT === "true" && fs2.existsSync(BUNDLED_DEFAULT_CONFIG_PATH)) {
     return { path: BUNDLED_DEFAULT_CONFIG_PATH, isBundledDefault: true };
   }
   return null;
@@ -261423,7 +261499,7 @@ var getPublisherConfigDir = (serverRoot) => {
     return null;
   }
   try {
-    if (!fs.statSync(resolved.path).isFile()) {
+    if (!fs2.statSync(resolved.path).isFile()) {
       return null;
     }
   } catch {
@@ -261448,7 +261524,7 @@ var getPublisherConfig = (serverRoot) => {
   }
   let rawConfig;
   try {
-    const fileContent = fs.readFileSync(publisherConfigPath, "utf8");
+    const fileContent = fs2.readFileSync(publisherConfigPath, "utf8");
     rawConfig = JSON.parse(fileContent);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -261655,6 +261731,7 @@ var getProcessedPublisherConfig = (serverRoot) => {
       name: environment.name,
       packages: validPackages,
       connections: convertConnectionsToApiConnections(environment.connections || []),
+      storageDestinations: Array.isArray(environment.storageDestinations) ? environment.storageDestinations : [],
       ...resolvedTheme ? { theme: resolvedTheme } : {}
     });
   }
@@ -265064,7 +265141,7 @@ var {
 } = axios_default;
 
 // src/service/connection.ts
-import fs2 from "fs/promises";
+import fs3 from "fs/promises";
 
 // src/ducklake_version.ts
 var MIN_CATALOG_FORMAT = "1.0";
@@ -265185,6 +265262,7 @@ function safeJoinUnderRoot(root, ...segments) {
 }
 
 // src/service/connection_config.ts
+init_errors();
 init_logger();
 import { createPrivateKey } from "crypto";
 import { existsSync } from "fs";
@@ -265317,6 +265395,9 @@ function openSshProxy(ssh, target) {
   });
 }
 
+// src/service/query_metadata.ts
+import * as crypto3 from "node:crypto";
+
 // src/query_metadata_metrics.ts
 var resetHooks = [];
 function lazyCounter(name, description) {
@@ -265399,7 +265480,7 @@ function queryMetadataBudgetWarning(declared) {
   return `queryMetadata declares ${declared} properties; the server adds up to ` + `${RESERVED_CONTEXT_PROPERTIES} of its own to every statement, so a bag over ` + `${authorBudget} loses its least specific properties at query time`;
 }
 function mintCorrelationId() {
-  return crypto.randomUUID();
+  return crypto3.randomUUID();
 }
 var CONTEXT_SHED_ORDER = [
   "version",
@@ -265865,6 +265946,106 @@ function validateConnectionShape(connection) {
     }
   }
 }
+var DECLARABLE_STORAGE_DESTINATION_TYPES = new Set(["ducklake"]);
+var STORAGE_DESTINATIONS_DIR = ".storage-destinations";
+function storageDestinationRoot(environmentPath) {
+  return path3.join(environmentPath, STORAGE_DESTINATIONS_DIR);
+}
+function validateStorageDestinations(destinations = []) {
+  const accepted = [];
+  const rejected = [];
+  if (!Array.isArray(destinations)) {
+    return {
+      accepted,
+      rejected: [{ reason: "the value is not a list of destinations." }]
+    };
+  }
+  const seen = new Set;
+  for (const destination of destinations) {
+    if (!destination || typeof destination !== "object") {
+      rejected.push({ reason: "the entry is not an object." });
+      continue;
+    }
+    const { name, type } = destination;
+    if (!name || typeof name !== "string") {
+      rejected.push({
+        reason: `the "name" field is missing or not a string.`
+      });
+      continue;
+    }
+    if (!type || !DECLARABLE_STORAGE_DESTINATION_TYPES.has(type)) {
+      rejected.push({
+        name,
+        reason: `the type "${type}" is not a supported destination type ` + `(supported: ${[...DECLARABLE_STORAGE_DESTINATION_TYPES].join(", ")}).`
+      });
+      continue;
+    }
+    if (name === "duckdb") {
+      rejected.push({
+        name,
+        reason: `the name "duckdb" is reserved for per-package sandboxes.`
+      });
+      continue;
+    }
+    if (seen.has(name)) {
+      rejected.push({
+        name,
+        reason: "an earlier entry already uses this name."
+      });
+      continue;
+    }
+    try {
+      validateConnectionShape(destination);
+    } catch (error) {
+      rejected.push({ name, reason: error.message });
+      continue;
+    }
+    seen.add(name);
+    const { resource: _resource, ...body } = destination;
+    accepted.push(body);
+  }
+  return { accepted, rejected };
+}
+function describeRejection(rejection) {
+  return rejection.name ? `storage destination "${rejection.name}": ${rejection.reason}` : `storage destination: ${rejection.reason}`;
+}
+function processStorageDestinations(destinations = []) {
+  const { accepted, rejected } = validateStorageDestinations(destinations);
+  for (const rejection of rejected) {
+    logger.warn(`Invalid ${describeRejection(rejection)} Skipping.`);
+  }
+  return accepted;
+}
+function processStorageDestinationsOrThrow(destinations = []) {
+  const { accepted, rejected } = validateStorageDestinations(destinations);
+  if (rejected.length > 0) {
+    throw new BadRequestError(`storageDestinations was not accepted — ${rejected.map(describeRejection).join(" ")}`);
+  }
+  return accepted;
+}
+function storageDestinationsEqual(left, right) {
+  if (left.length !== right.length) {
+    return false;
+  }
+  return canonicalDestinationList(left) === canonicalDestinationList(right);
+}
+function canonicalDestinationList(destinations) {
+  return JSON.stringify([...destinations].sort((left, right) => (left.name ?? "") < (right.name ?? "") ? -1 : 1).map(canonicalizeJsonValue));
+}
+function canonicalizeJsonValue(value) {
+  if (Array.isArray(value)) {
+    return value.map(canonicalizeJsonValue);
+  }
+  if (value === null || typeof value !== "object") {
+    return value;
+  }
+  const entries = value;
+  const sorted = {};
+  for (const key of Object.keys(entries).sort()) {
+    sorted[key] = canonicalizeJsonValue(entries[key]);
+  }
+  return sorted;
+}
 function assembleEnvironmentConnections(connections = [], environmentPath = "") {
   const pojo = { connections: {} };
   const metadata = new Map;
@@ -266787,8 +266968,8 @@ async function deleteDuckLakeConnectionFile(connectionName, environmentPath) {
   assertSafeEnvironmentPath(environmentPath);
   const ducklakePath = safeJoinUnderRoot(environmentPath, `${connectionName}_ducklake.duckdb`);
   try {
-    await fs2.access(ducklakePath);
-    await fs2.rm(ducklakePath);
+    await fs3.access(ducklakePath);
+    await fs3.rm(ducklakePath);
     logger.info(`Removed DuckLake connection file ${connectionName}_ducklake.duckdb from ${environmentPath}`);
   } catch (error) {
     if (error.code === "ENOENT") {
@@ -266798,6 +266979,18 @@ async function deleteDuckLakeConnectionFile(connectionName, environmentPath) {
     }
   }
 }
+function restrictMalloyConfigToConnections(base, allowed) {
+  const restricted = new MalloyConfig({ connections: {} });
+  restricted.wrapConnections(() => ({
+    lookupConnection: async (name) => {
+      if (!name || !allowed.has(name)) {
+        throw new ConnectionNotFoundError(`Connection ${name ?? "(default)"} is not available to a materialization serve shape`);
+      }
+      return base.connections.lookupConnection(name);
+    }
+  }));
+  return restricted;
+}
 function entryToDuckDBOptions(name, entry, workingDirectory) {
   const { is: _is, ...rest } = entry;
   if (workingDirectory !== undefined) {
@@ -269082,6 +269275,7 @@ class QueryController {
     } else {
       const {
         result,
+        serializedResult,
         compactResult,
         rowLimit,
         rowLimitSource,
@@ -269107,7 +269301,7 @@ class QueryController {
       }), getQueryTimeoutMs());
       const renderLogs = import_render_validator.validateRenderTags(result);
       return {
-        result: compactJson ? JSON.stringify(compactResult, bigIntReplacer) : JSON.stringify(result),
+        result: compactJson ? JSON.stringify(compactResult, bigIntReplacer) : serializedResult,
         resource: `${API_PREFIX}/environments/${environmentName}/packages/${packageName}/models/${modelPath}/query`,
         renderLogs: renderLogs.length > 0 ? renderLogs : undefined,
         queryRowLimit: rowLimit,
@@ -271027,8 +271221,8 @@ function tryAcquire(sync, alreadyAcquiredError = E_ALREADY_LOCKED) {
 
 // src/service/environment_store.ts
 var import_extract_zip = __toESM(require_extract_zip(), 1);
-import crypto4 from "crypto";
-import * as fs8 from "fs";
+import crypto5 from "crypto";
+import * as fs9 from "fs";
 import * as os2 from "os";
 import * as path9 from "path";
 
@@ -275885,6 +276079,66 @@ class EnvironmentRepository {
   }
 }
 
+// src/storage/duckdb/StorageDestinationRepository.ts
+class StorageDestinationRepository {
+  db;
+  constructor(db) {
+    this.db = db;
+  }
+  generateId() {
+    return `${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
+  }
+  async list(environmentId) {
+    const rows = await this.db.all("SELECT * FROM storage_destinations WHERE environment_id = ? ORDER BY name", [environmentId]);
+    return rows.map(this.mapToDestination);
+  }
+  async getByName(environmentId, name) {
+    const row = await this.db.get("SELECT * FROM storage_destinations WHERE environment_id = ? AND name = ?", [environmentId, name]);
+    return row ? this.mapToDestination(row) : null;
+  }
+  async upsert(destination) {
+    const existing = await this.getByName(destination.environmentId, destination.name);
+    const now = new Date;
+    const configJson = JSON.stringify(destination.config);
+    if (existing) {
+      await this.db.run(`UPDATE storage_destinations
+                SET type = ?, config = ?, updated_at = ?
+              WHERE id = ?`, [destination.type, configJson, now.toISOString(), existing.id]);
+      return { ...existing, ...destination, updatedAt: now };
+    }
+    const id = this.generateId();
+    await this.db.run(`INSERT INTO storage_destinations
+             (id, environment_id, name, type, config, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?, ?, ?)`, [
+      id,
+      destination.environmentId,
+      destination.name,
+      destination.type,
+      configJson,
+      now.toISOString(),
+      now.toISOString()
+    ]);
+    return { id, ...destination, createdAt: now, updatedAt: now };
+  }
+  async deleteById(id) {
+    await this.db.run("DELETE FROM storage_destinations WHERE id = ?", [id]);
+  }
+  async deleteByEnvironmentId(environmentId) {
+    await this.db.run("DELETE FROM storage_destinations WHERE environment_id = ?", [environmentId]);
+  }
+  mapToDestination(row) {
+    return {
+      id: row.id,
+      environmentId: row.environment_id,
+      name: row.name,
+      type: row.type,
+      config: JSON.parse(row.config),
+      createdAt: new Date(row.created_at),
+      updatedAt: new Date(row.updated_at)
+    };
+  }
+}
+
 // src/storage/duckdb/MaterializationRepository.ts
 var TERMINAL_STATUSES = new Set([
   "MANIFEST_FILE_READY",
@@ -276173,12 +276427,14 @@ class DuckDBRepository {
   environmentRepo;
   packageRepo;
   connectionRepo;
+  destinationRepo;
   materializationRepo;
   constructor(db) {
     this.db = db;
     this.environmentRepo = new EnvironmentRepository(db);
     this.packageRepo = new PackageRepository(db);
     this.connectionRepo = new ConnectionRepository(db);
+    this.destinationRepo = new StorageDestinationRepository(db);
     this.materializationRepo = new MaterializationRepository(db);
   }
   async listEnvironments() {
@@ -276199,6 +276455,7 @@ class DuckDBRepository {
   async deleteEnvironment(id) {
     await this.materializationRepo.deleteByEnvironmentId(id);
     await this.connectionRepo.deleteConnectionsByEnvironmentId(id);
+    await this.destinationRepo.deleteByEnvironmentId(id);
     await this.packageRepo.deletePackagesByEnvironmentId(id);
     await this.environmentRepo.deleteEnvironment(id);
   }
@@ -276248,6 +276505,21 @@ class DuckDBRepository {
   async deleteConnectionsByEnvironmentId(id) {
     return this.connectionRepo.deleteConnectionsByEnvironmentId(id);
   }
+  async listStorageDestinations(environmentId) {
+    return this.destinationRepo.list(environmentId);
+  }
+  async getStorageDestinationByName(environmentId, name) {
+    return this.destinationRepo.getByName(environmentId, name);
+  }
+  async upsertStorageDestination(destination) {
+    return this.destinationRepo.upsert(destination);
+  }
+  async deleteStorageDestination(id) {
+    return this.destinationRepo.deleteById(id);
+  }
+  async deleteStorageDestinationsByEnvironmentId(id) {
+    return this.destinationRepo.deleteByEnvironmentId(id);
+  }
   async listMaterializations(environmentId, packageName, options) {
     return this.materializationRepo.list(environmentId, packageName, options);
   }
@@ -276323,6 +276595,19 @@ async function initializeSchema(db, force = false) {
       UNIQUE (environment_id, name)
     )
   `);
+  await db.run(`
+    CREATE TABLE IF NOT EXISTS storage_destinations (
+      id VARCHAR PRIMARY KEY,
+      environment_id VARCHAR NOT NULL,
+      name VARCHAR NOT NULL,
+      type VARCHAR NOT NULL,
+      config JSON NOT NULL,
+      created_at TIMESTAMP NOT NULL,
+      updated_at TIMESTAMP NOT NULL,
+      FOREIGN KEY (environment_id) REFERENCES environments(id),
+      UNIQUE (environment_id, name)
+    )
+  `);
   await db.run(`
     CREATE TABLE IF NOT EXISTS materializations (
       id VARCHAR PRIMARY KEY,
@@ -276351,6 +276636,7 @@ async function initializeSchema(db, force = false) {
   await createEntityEmbeddingsTable(db);
   await db.run("CREATE INDEX IF NOT EXISTS idx_packages_environment_id ON packages(environment_id)");
   await db.run("CREATE INDEX IF NOT EXISTS idx_connections_environment_id ON connections(environment_id)");
+  await db.run("CREATE INDEX IF NOT EXISTS idx_storage_destinations_environment_id ON storage_destinations(environment_id)");
   await db.run("CREATE INDEX IF NOT EXISTS idx_materializations_environment_package ON materializations(environment_id, package_name)");
   await db.run("CREATE UNIQUE INDEX IF NOT EXISTS idx_materializations_active_key ON materializations(active_key)");
 }
@@ -276399,6 +276685,7 @@ async function dropAllTables(db) {
     "materializations",
     "packages",
     "connections",
+    "storage_destinations",
     "environments",
     "themes",
     "entity_embeddings"
@@ -276478,10 +276765,221 @@ class StorageManager {
 import { MalloyError as MalloyError4, Runtime as Runtime3 } from "@malloydata/malloy";
 init_constants();
 init_errors();
-import crypto3 from "crypto";
-import * as fs7 from "fs";
+import crypto4 from "crypto";
+import * as fs8 from "fs";
 import * as path8 from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
+
+// src/service/authorize.ts
+init_errors();
+var AUTHORIZE_TAG = String.raw`##?\(\s*authorize\s*\)`;
+var AUTHORIZE_ANNOTATION_ANYWHERE = new RegExp(AUTHORIZE_TAG);
+var AUTHORIZE_ANNOTATION_PREFIX = new RegExp(`^${AUTHORIZE_TAG}`);
+function assertNoCallerAuthorizeAnnotation(callerText) {
+  if (!AUTHORIZE_ANNOTATION_ANYWHERE.test(callerText))
+    return;
+  throw new BadRequestError("An `authorize` annotation is not permitted in caller-submitted Malloy " + "text. Access gates are declared by the model author on the source; a " + "request cannot introduce, replace, or relax one. To validate a gate " + "you are authoring, save it to the package's model file and reload the " + "package — model load validates every `#(authorize)` annotation it " + "declares.");
+}
+function buildAuthorizeProbe(exprs, givenDecls = []) {
+  const selects = exprs.map((expr, i) => `__auth_${i} is (${expr})`).join(`
+      `);
+  const givenBlock = givenDecls.length > 0 ? `given:
+${givenDecls.map((g) => `  ${g.name} :: ${g.type}`).join(`
+`)}
+
+` : "";
+  return `${givenBlock}run: duckdb.sql("SELECT 1 AS __authorize_probe_row") -> {
+    select:
+      ${selects}
+    limit: 1
+  }`;
+}
+var GIVEN_REF_PATTERN = /\$([A-Za-z_][A-Za-z0-9_]*)/g;
+var STRING_LITERAL_PATTERN = /'(?:\\.|[^'\\])*'/g;
+function referencedGivenNames(expr) {
+  const scanned = expr.replace(STRING_LITERAL_PATTERN, "''");
+  const names = [];
+  const seen = new Set;
+  for (const match of scanned.matchAll(GIVEN_REF_PATTERN)) {
+    const name = match[1];
+    if (!seen.has(name)) {
+      seen.add(name);
+      names.push(name);
+    }
+  }
+  return names;
+}
+function inferGivenType(value) {
+  if (typeof value === "string")
+    return "string";
+  if (typeof value === "number" || typeof value === "bigint")
+    return "number";
+  if (typeof value === "boolean")
+    return "boolean";
+  if (value instanceof Date)
+    return "timestamp";
+  if (Array.isArray(value)) {
+    if (value.length === 0)
+      return null;
+    const elementType = inferGivenType(value[0]);
+    return elementType ? `${elementType}[]` : null;
+  }
+  return null;
+}
+function bindProbeGivens(expr, givens, declaredTypes) {
+  const decls = [];
+  const bound = {};
+  for (const name of referencedGivenNames(expr)) {
+    if (!(name in givens))
+      continue;
+    const value = givens[name];
+    const type = declaredTypes?.get(name) ?? inferGivenType(value);
+    if (!type)
+      continue;
+    decls.push({ name, type });
+    bound[name] = value;
+  }
+  return { decls, bound };
+}
+function isProbeTrue(cell) {
+  return cell === true || cell === 1 || cell === "true";
+}
+async function runProbe(executor, probeText, givens) {
+  const result = await executor.loadQuery(probeText).run({ rowLimit: 1, givens });
+  const row = result?.data?.value?.[0];
+  return !!(row && isProbeTrue(row.__auth_0));
+}
+async function evaluateAuthorize(executor, exprs, givens, declaredTypes, options) {
+  const selfContainedFirst = options?.selfContainedFirst ?? false;
+  const ambientPrefix = options?.ambientPrefix ?? 0;
+  for (const [index, expr] of exprs.entries()) {
+    if (selfContainedFirst && index >= ambientPrefix) {
+      if (await evaluateSelfContainedFirst(executor, expr, givens, declaredTypes)) {
+        return true;
+      }
+      continue;
+    }
+    try {
+      if (await runProbe(executor, buildAuthorizeProbe([expr]), givens)) {
+        return true;
+      }
+      continue;
+    } catch {}
+    try {
+      const { decls, bound } = bindProbeGivens(expr, givens, declaredTypes);
+      if (decls.length === 0)
+        continue;
+      if (await runProbe(executor, buildAuthorizeProbe([expr], decls), bound)) {
+        return true;
+      }
+    } catch {
+      continue;
+    }
+  }
+  return false;
+}
+async function evaluateSelfContainedFirst(executor, expr, givens, declaredTypes) {
+  const referenced = referencedGivenNames(expr);
+  if (referenced.length === 0) {
+    try {
+      return await runProbe(executor, buildAuthorizeProbe([expr]), {});
+    } catch {
+      return false;
+    }
+  }
+  const { decls, bound } = bindProbeGivens(expr, givens, declaredTypes);
+  if (decls.length !== referenced.length) {
+    return false;
+  }
+  try {
+    return await runProbe(executor, buildAuthorizeProbe([expr], decls), bound);
+  } catch {
+    try {
+      return await runProbe(executor, buildAuthorizeProbe([expr]), givens);
+    } catch {
+      return false;
+    }
+  }
+}
+async function validateAuthorizeProbes(compiler, sources) {
+  for (const source of sources) {
+    const exprs = source.authorize;
+    if (!exprs || exprs.length === 0)
+      continue;
+    try {
+      await compiler.loadQuery(buildAuthorizeProbe(exprs)).getPreparedQuery();
+    } catch (err) {
+      const detail = err instanceof Error ? err.message : String(err);
+      throw new ModelCompilationError({
+        message: `Invalid #(authorize) annotation on source "${source.name ?? "(unnamed)"}" [${exprs.join(" | ")}]: ${detail}`
+      });
+    }
+  }
+}
+function parseAuthorizeAnnotation(annotation) {
+  const trimmed2 = annotation.trim();
+  const prefix = AUTHORIZE_ANNOTATION_PREFIX.exec(trimmed2);
+  if (!prefix)
+    return null;
+  return unwrapQuotedExpression(trimmed2.slice(prefix[0].length).trim());
+}
+function collectAuthorizeExprs(annotations) {
+  const exprs = [];
+  for (const annotation of annotations) {
+    const expr = parseAuthorizeAnnotation(annotation);
+    if (expr !== null) {
+      exprs.push(expr);
+    }
+  }
+  return exprs;
+}
+function unwrapQuotedExpression(body) {
+  if (body.length < 2 || body[0] !== '"') {
+    throw new Error(`authorize annotation expression must be a double-quoted string, got: ${body || "(empty)"}`);
+  }
+  let expr = "";
+  let i = 1;
+  let closed = false;
+  for (;i < body.length; i++) {
+    const ch = body[i];
+    if (ch === "\\" && i + 1 < body.length) {
+      const next = body[i + 1];
+      if (next === '"' || next === "\\") {
+        expr += next;
+        i++;
+        continue;
+      }
+    }
+    if (ch === '"') {
+      closed = true;
+      i++;
+      break;
+    }
+    expr += ch;
+  }
+  if (!closed) {
+    throw new Error(`authorize annotation has mismatched quotes: ${body}`);
+  }
+  const rest = body.slice(i).trim();
+  if (rest.length > 0) {
+    throw new Error(`authorize annotation has unexpected content after the expression: ${rest}`);
+  }
+  if (expr.trim().length === 0) {
+    throw new Error("authorize annotation has an empty expression body");
+  }
+  return expr;
+}
+
+// src/authorize_metrics.ts
+var guardRejectionCounter = null;
+function recordAuthorizeGuardRejection(field) {
+  guardRejectionCounter ??= publisherMeter().createCounter("publisher_authorize_guard_rejected_total", {
+    description: "Requests rejected with 400 for declaring an `#(authorize)` annotation in caller-submitted Malloy text. Label: field ('query'|'source_name'|'query_name'|'compile_source')."
+  });
+  guardRejectionCounter.add(1, { field });
+}
+
+// src/service/environment.ts
 init_logger();
 
 // src/materialization_metrics.ts
@@ -276569,7 +277067,7 @@ function recordChainedStorageBuild(outcome) {
 }
 
 // src/utils.ts
-import * as fs3 from "fs";
+import * as fs4 from "fs";
 import * as path5 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var URL_READER = {
@@ -276578,7 +277076,7 @@ var URL_READER = {
     if (url2.protocol == "file:") {
       path6 = fileURLToPath3(url2);
     }
-    return fs3.promises.readFile(path6, "utf8");
+    return fs4.promises.readFile(path6, "utf8");
   }
 };
 function ignoreDotfiles(file) {
@@ -276592,7 +277090,7 @@ function errMessage(err) {
 init_logger();
 var import_client_s32 = __toESM(require_dist_cjs75(), 1);
 import { Storage } from "@google-cloud/storage";
-import * as fs4 from "fs/promises";
+import * as fs5 from "fs/promises";
 import { fileURLToPath as fileURLToPath4 } from "url";
 var gcsClient;
 var s3Client;
@@ -276621,9 +277119,9 @@ async function readManifestBytes(uri) {
     return res.Body.transformToString();
   }
   if (uri.startsWith("file://")) {
-    return fs4.readFile(fileURLToPath4(uri), "utf8");
+    return fs5.readFile(fileURLToPath4(uri), "utf8");
   }
-  return fs4.readFile(uri, "utf8");
+  return fs5.readFile(uri, "utf8");
 }
 async function fetchManifestEntries(uri) {
   const raw = await readManifestBytes(uri);
@@ -276647,7 +277145,7 @@ function splitManifestEntries(entries, source) {
       });
       continue;
     }
-    if (entry.storageConnectionName) {
+    if (entry.storageDestinationName) {
       storageEntries[sourceEntityId] = entry;
       continue;
     }
@@ -276663,7 +277161,7 @@ function splitManifestEntries(entries, source) {
 }
 
 // src/service/package.ts
-import * as fs6 from "fs/promises";
+import * as fs7 from "fs/promises";
 import * as path7 from "path";
 import"@malloydata/db-duckdb/native";
 import { DuckDBConnection as DuckDBConnection3 } from "@malloydata/db-duckdb";
@@ -276741,7 +277239,7 @@ import {
 function deriveServeBindings(entries) {
   const bindings = [];
   for (const entry of Object.values(entries)) {
-    if (!entry.sourceName || !entry.storageConnectionName || !entry.physicalTableName) {
+    if (!entry.sourceName || !entry.storageDestinationName || !entry.physicalTableName) {
       continue;
     }
     const schema = (entry.schema ?? []).filter((c) => c.name && c.type).map((c) => ({ name: c.name, type: c.type }));
@@ -276749,9 +277247,9 @@ function deriveServeBindings(entries) {
       continue;
     bindings.push({
       sourceName: entry.sourceName,
-      connectionName: entry.storageConnectionName,
+      destinationName: entry.storageDestinationName,
       virtualHandle: entry.sourceEntityId,
-      tablePath: `${entry.storageConnectionName}.${entry.physicalTableName}`,
+      tablePath: `${entry.storageDestinationName}.${entry.physicalTableName}`,
       schema,
       freshAsOf: entry.dataAsOf,
       freshnessWindowSeconds: entry.freshnessWindowSeconds,
@@ -276830,7 +277328,7 @@ function buildServeShapeModel(sourceName, binding) {
 type: ${shapeTypeName} is {
 ${fields}
 }
-source: ${sourceName} is ${binding.connectionName}.virtual('${binding.virtualHandle}')::${shapeTypeName}
+source: ${sourceName} is ${binding.destinationName}.virtual('${binding.virtualHandle}')::${shapeTypeName}
 `;
   return { modelText, shapeTypeName };
 }
@@ -276838,7 +277336,7 @@ function serveShapeFragment(binding) {
   const shapeTypeName = `${binding.sourceName}__shape`;
   const fields = binding.schema.map((c) => `   ${emitFieldName(c.name)}::${duckdbTypeToMalloy(c.type)}`).join(`,
 `);
-  let source = `source: ${binding.sourceName} is ` + `${binding.connectionName}.virtual('${binding.virtualHandle}')::${shapeTypeName}`;
+  let source = `source: ${binding.sourceName} is ` + `${binding.destinationName}.virtual('${binding.virtualHandle}')::${shapeTypeName}`;
   const refinements = binding.refinements ?? [];
   const lines = [];
   for (const r of refinements) {
@@ -277023,10 +277521,10 @@ function extractViews(fields, liftText) {
 function buildVirtualMap(bindings) {
   const map = new Map;
   for (const b of bindings) {
-    let inner = map.get(b.connectionName);
+    let inner = map.get(b.destinationName);
     if (!inner) {
       inner = new Map;
-      map.set(b.connectionName, inner);
+      map.set(b.destinationName, inner);
     }
     inner.set(b.virtualHandle, quoteManifestTablePath(b.tablePath, "duckdb"));
   }
@@ -277057,206 +277555,6 @@ import { Annotations as Annotations3 } from "@malloydata/malloy";
 
 // src/service/materialization_eligibility.ts
 init_errors();
-
-// src/service/authorize.ts
-init_errors();
-var SOURCE_PREFIX = "#(authorize)";
-var FILE_PREFIX = "##(authorize)";
-function buildAuthorizeProbe(exprs, givenDecls = []) {
-  const selects = exprs.map((expr, i) => `__auth_${i} is (${expr})`).join(`
-      `);
-  const givenBlock = givenDecls.length > 0 ? `given:
-${givenDecls.map((g) => `  ${g.name} :: ${g.type}`).join(`
-`)}
-
-` : "";
-  return `${givenBlock}run: duckdb.sql("SELECT 1 AS __authorize_probe_row") -> {
-    select:
-      ${selects}
-    limit: 1
-  }`;
-}
-var GIVEN_REF_PATTERN = /\$([A-Za-z_][A-Za-z0-9_]*)/g;
-var STRING_LITERAL_PATTERN = /'(?:\\.|[^'\\])*'/g;
-function referencedGivenNames(expr) {
-  const scanned = expr.replace(STRING_LITERAL_PATTERN, "''");
-  const names = [];
-  const seen = new Set;
-  for (const match of scanned.matchAll(GIVEN_REF_PATTERN)) {
-    const name = match[1];
-    if (!seen.has(name)) {
-      seen.add(name);
-      names.push(name);
-    }
-  }
-  return names;
-}
-function inferGivenType(value) {
-  if (typeof value === "string")
-    return "string";
-  if (typeof value === "number" || typeof value === "bigint")
-    return "number";
-  if (typeof value === "boolean")
-    return "boolean";
-  if (value instanceof Date)
-    return "timestamp";
-  if (Array.isArray(value)) {
-    if (value.length === 0)
-      return null;
-    const elementType = inferGivenType(value[0]);
-    return elementType ? `${elementType}[]` : null;
-  }
-  return null;
-}
-function bindProbeGivens(expr, givens, declaredTypes) {
-  const decls = [];
-  const bound = {};
-  for (const name of referencedGivenNames(expr)) {
-    if (!(name in givens))
-      continue;
-    const value = givens[name];
-    const type = declaredTypes?.get(name) ?? inferGivenType(value);
-    if (!type)
-      continue;
-    decls.push({ name, type });
-    bound[name] = value;
-  }
-  return { decls, bound };
-}
-function isProbeTrue(cell) {
-  return cell === true || cell === 1 || cell === "true";
-}
-async function runProbe(executor, probeText, givens) {
-  const result = await executor.loadQuery(probeText).run({ rowLimit: 1, givens });
-  const row = result?.data?.value?.[0];
-  return !!(row && isProbeTrue(row.__auth_0));
-}
-async function evaluateAuthorize(executor, exprs, givens, declaredTypes, options) {
-  const selfContainedFirst = options?.selfContainedFirst ?? false;
-  for (const expr of exprs) {
-    if (selfContainedFirst) {
-      if (await evaluateSelfContainedFirst(executor, expr, givens, declaredTypes)) {
-        return true;
-      }
-      continue;
-    }
-    try {
-      if (await runProbe(executor, buildAuthorizeProbe([expr]), givens)) {
-        return true;
-      }
-      continue;
-    } catch {}
-    try {
-      const { decls, bound } = bindProbeGivens(expr, givens, declaredTypes);
-      if (decls.length === 0)
-        continue;
-      if (await runProbe(executor, buildAuthorizeProbe([expr], decls), bound)) {
-        return true;
-      }
-    } catch {
-      continue;
-    }
-  }
-  return false;
-}
-async function evaluateSelfContainedFirst(executor, expr, givens, declaredTypes) {
-  const referenced = referencedGivenNames(expr);
-  if (referenced.length === 0) {
-    try {
-      return await runProbe(executor, buildAuthorizeProbe([expr]), {});
-    } catch {
-      return false;
-    }
-  }
-  const { decls, bound } = bindProbeGivens(expr, givens, declaredTypes);
-  if (decls.length !== referenced.length) {
-    return false;
-  }
-  try {
-    return await runProbe(executor, buildAuthorizeProbe([expr], decls), bound);
-  } catch {
-    try {
-      return await runProbe(executor, buildAuthorizeProbe([expr]), givens);
-    } catch {
-      return false;
-    }
-  }
-}
-async function validateAuthorizeProbes(compiler, sources) {
-  for (const source of sources) {
-    const exprs = source.authorize;
-    if (!exprs || exprs.length === 0)
-      continue;
-    try {
-      await compiler.loadQuery(buildAuthorizeProbe(exprs)).getPreparedQuery();
-    } catch (err) {
-      const detail = err instanceof Error ? err.message : String(err);
-      throw new ModelCompilationError({
-        message: `Invalid #(authorize) annotation on source "${source.name ?? "(unnamed)"}" [${exprs.join(" | ")}]: ${detail}`
-      });
-    }
-  }
-}
-function parseAuthorizeAnnotation(annotation) {
-  const trimmed2 = annotation.trim();
-  let body;
-  if (trimmed2.startsWith(FILE_PREFIX)) {
-    body = trimmed2.slice(FILE_PREFIX.length).trim();
-  } else if (trimmed2.startsWith(SOURCE_PREFIX)) {
-    body = trimmed2.slice(SOURCE_PREFIX.length).trim();
-  } else {
-    return null;
-  }
-  return unwrapQuotedExpression(body);
-}
-function collectAuthorizeExprs(annotations) {
-  const exprs = [];
-  for (const annotation of annotations) {
-    const expr = parseAuthorizeAnnotation(annotation);
-    if (expr !== null) {
-      exprs.push(expr);
-    }
-  }
-  return exprs;
-}
-function unwrapQuotedExpression(body) {
-  if (body.length < 2 || body[0] !== '"') {
-    throw new Error(`authorize annotation expression must be a double-quoted string, got: ${body || "(empty)"}`);
-  }
-  let expr = "";
-  let i = 1;
-  let closed = false;
-  for (;i < body.length; i++) {
-    const ch = body[i];
-    if (ch === "\\" && i + 1 < body.length) {
-      const next = body[i + 1];
-      if (next === '"' || next === "\\") {
-        expr += next;
-        i++;
-        continue;
-      }
-    }
-    if (ch === '"') {
-      closed = true;
-      i++;
-      break;
-    }
-    expr += ch;
-  }
-  if (!closed) {
-    throw new Error(`authorize annotation has mismatched quotes: ${body}`);
-  }
-  const rest = body.slice(i).trim();
-  if (rest.length > 0) {
-    throw new Error(`authorize annotation has unexpected content after the expression: ${rest}`);
-  }
-  if (expr.trim().length === 0) {
-    throw new Error("authorize annotation has an empty expression body");
-  }
-  return expr;
-}
-
-// src/service/materialization_eligibility.ts
 function assertMaterializationEligible(persistSource) {
   const sourceName = persistSource.name;
   let unbound;
@@ -277402,9 +277700,6 @@ import {
   API,
   FixedConnectionMap,
   InMemoryURLReader as InMemoryURLReader2,
-  isBasicArray,
-  isJoined,
-  isRepeatedRecord,
   isSourceDef as isSourceDef2,
   MalloyConfig as MalloyConfig2,
   MalloyError as MalloyError2,
@@ -277415,7 +277710,7 @@ import {
   MalloySQLParser,
   MalloySQLStatementType
 } from "@malloydata/malloy-sql";
-import * as fs5 from "fs/promises";
+import * as fs6 from "fs/promises";
 import { readFileSync } from "fs";
 import { createRequire as createRequire2 } from "module";
 import * as path6 from "path";
@@ -277780,12 +278075,23 @@ function assertWithinModelResponseLimits(rowCount, serializedBytes, { maxRows, m
     throw new PayloadTooLargeError(`Query response exceeded ${maxBytes} bytes (was ${serializedBytes}). Project fewer columns, add a LIMIT, or raise PUBLISHER_MAX_RESPONSE_BYTES.`);
   }
 }
+function stringifyQueryResponse(response, rowCount, maxBytes, source) {
+  try {
+    return JSON.stringify(response);
+  } catch (error) {
+    if (!(error instanceof RangeError) || /call stack/i.test(error.message)) {
+      throw error;
+    }
+    recordQueryCapExceeded("unserializable", source);
+    throw new ResponseUnserializableError(`Query response could not be serialized: the ${rowCount}-row result is too large to turn into JSON${maxBytes > 0 ? ` (byte cap: ${maxBytes})` : ""}. Project fewer columns, add a LIMIT, or filter wide values.`);
+  }
+}
 
 // src/service/query_text.ts
 function extractRunTargetSourceName(query) {
   if (!query)
     return;
-  const runMatch = query.match(/run\s*:\s*(?:`([^`]+)`|(\w+))\s*->/);
+  const runMatch = query.match(/run\s*:\s*(?:`([^`]+)`|(\w+))/);
   const arrowMatch = query.match(/^\s*(?:`([^`]+)`|(\w+))\s*->/m);
   return runMatch?.[1] ?? runMatch?.[2] ?? arrowMatch?.[1] ?? arrowMatch?.[2];
 }
@@ -277806,6 +278112,7 @@ import {
 function extractSourcesFromModelDef(modelDef, givens, onParseError) {
   const filterMap = new Map;
   const authorizeMap = new Map;
+  const ownAuthorizeSources = [];
   const fileLevelAuthorize = collectAuthorizeExprs((modelAnnotations(modelDef).notes ?? []).map((note) => note.text));
   const sources = Object.values(modelDef.contents).filter((obj) => isSourceDef(obj)).map((sourceObj) => {
     const struct = sourceObj;
@@ -277844,15 +278151,33 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
       }
     }
     const ownNotes = (struct.annotations?.blockNotes ?? []).map((note) => note.text);
+    const ownGates = collectAuthorizeExprs(ownNotes);
+    let inheritedGates = [];
+    if (ownGates.length === 0) {
+      for (let cur2 = struct.annotations?.inherits;cur2; cur2 = cur2.inherits) {
+        const exprs = collectAuthorizeExprs((cur2.blockNotes ?? []).map((note) => note.text));
+        if (exprs.length > 0) {
+          inheritedGates = exprs;
+          break;
+        }
+      }
+    }
     const effective = [
       ...fileLevelAuthorize,
-      ...collectAuthorizeExprs(ownNotes)
+      ...ownGates.length > 0 ? ownGates : inheritedGates
     ];
     let authorize;
     if (effective.length > 0) {
       authorizeMap.set(sourceName, effective);
       authorize = effective;
     }
+    const ownEffective = [...fileLevelAuthorize, ...ownGates];
+    if (ownEffective.length > 0) {
+      ownAuthorizeSources.push({
+        name: sourceName,
+        authorize: ownEffective
+      });
+    }
     const views = struct.fields.filter((field) => field.type === "turtle").filter((turtle) => turtle.pipeline.map((stage) => stage.type).every((type) => type === "reduce")).map((turtle) => ({
       name: turtle.as || turtle.name,
       annotations: annotationTexts(turtle.annotations)
@@ -277866,7 +278191,7 @@ function extractSourcesFromModelDef(modelDef, givens, onParseError) {
       authorize
     };
   });
-  return { sources, filterMap, authorizeMap };
+  return { sources, filterMap, authorizeMap, ownAuthorizeSources };
 }
 function extractQueriesFromModelDef(modelDef) {
   const isNamedQuery = (obj) => obj.type === "query";
@@ -277879,9 +278204,7 @@ function extractQueriesFromModelDef(modelDef) {
 
 // src/service/model.ts
 var MALLOY_VERSION = createRequire2(import.meta.url)("@malloydata/malloy/package.json").version;
-function isRecordOrArrayField(field) {
-  return field.type === "record" || isBasicArray(field) || isRepeatedRecord(field);
-}
+var ANCESTOR_WALK_MAX_DEPTH = 32;
 function quoteMalloyIdentifier(name) {
   return "`" + (name ?? "").replace(/\\/g, "\\\\").replace(/`/g, "\\`") + "`";
 }
@@ -277894,7 +278217,7 @@ class Model {
   modelMaterializer;
   modelDef;
   modelInfo;
-  serveMalloyConfig;
+  serveDestinationConfig;
   serveBindings = [];
   serveShapeCache;
   sources;
@@ -277909,6 +278232,7 @@ class Model {
   discoveryCurationEnabled = false;
   queryBoundary = { mode: "all", exploresDeclared: false, isQueryEntryPoint: true };
   freshnessResolver;
+  entryPointGatesBySource = new Map;
   meter = publisherMeter();
   queryExecutionHistogram = this.meter.createHistogram("malloy_model_query_duration", {
     description: "How long it takes to execute a Malloy model query",
@@ -277933,6 +278257,18 @@ class Model {
     } catch {
       this.fileLevelAuthorize = [];
     }
+    try {
+      this.entryPointGatesBySource = this.computeEntryPointGatesBySource();
+    } catch {
+      this.entryPointGatesBySource = new Map;
+    }
+    for (const source of this.sources ?? []) {
+      if (!source.name)
+        continue;
+      const exprs = this.entryPointGatesBySource.get(source.name)?.flatMap((g) => g.exprs);
+      if (exprs && exprs.length > 0)
+        source.authorize = exprs;
+    }
     try {
       this.authorizeReferencedGivenNames = this.computeAuthorizeReferencedGivenNames();
     } catch {
@@ -277977,17 +278313,24 @@ class Model {
       }
     };
     addExprs(this.fileLevelAuthorize);
+    for (const gates of this.entryPointGatesBySource.values()) {
+      for (const { exprs } of gates)
+        addExprs(exprs);
+    }
+    return names;
+  }
+  computeEntryPointGatesBySource() {
+    const byName = new Map;
     const modelDef = this.modelDef;
     if (!modelDef)
-      return names;
+      return byName;
     for (const entry of Object.values(modelDef.contents)) {
       if (!isSourceDef2(entry))
         continue;
-      for (const { exprs } of this.collectAllReachableGates(entry, modelDef, new Set)) {
-        addExprs(exprs);
-      }
+      const name = entry.as ?? entry.name;
+      byName.set(name, this.collectEntryPointGates(entry, modelDef, new Set, true));
     }
-    return names;
+    return byName;
   }
   hasAuthorize() {
     return this.fileLevelAuthorize.length > 0 || (this.sources?.some((s) => (s.authorize?.length ?? 0) > 0) ?? false);
@@ -277999,9 +278342,16 @@ class Model {
     return this.fileLevelAuthorize;
   }
   async assertAuthorized(sourceName, givens) {
+    const gates = sourceName ? this.entryPointGatesBySource.get(sourceName) : undefined;
+    if (gates) {
+      for (const { label, exprs, selfContained, ambientPrefix } of gates) {
+        await this.assertAuthorizedExprs(label, exprs, givens, selfContained, ambientPrefix);
+      }
+      return;
+    }
     await this.assertAuthorizedExprs(sourceName ?? "(query)", this.effectiveAuthorizeFor(sourceName), givens);
   }
-  async assertAuthorizedExprs(label, exprs, givens, selfContainedFirst = false) {
+  async assertAuthorizedExprs(label, exprs, givens, selfContainedFirst = false, ambientPrefix = 0) {
     if (exprs.length === 0)
       return;
     const deny = () => {
@@ -278011,7 +278361,7 @@ class Model {
       deny();
     let passed = false;
     try {
-      passed = await evaluateAuthorize(this.modelMaterializer, exprs, givens, this.givenDeclaredTypes(), { selfContainedFirst });
+      passed = await evaluateAuthorize(this.modelMaterializer, exprs, givens, this.givenDeclaredTypes(), { selfContainedFirst, ambientPrefix });
     } catch (err) {
       logger.debug("Authorize probe failed; denying", {
         sourceName: label,
@@ -278026,27 +278376,19 @@ class Model {
   async assertAuthorizedForAllSources(runnable, givens) {
     const ownSourceName = await this.resolveAuthorizeSourceFromRunnable(runnable);
     await this.assertAuthorized(ownSourceName, givens);
-    const { struct, modelDef, compositeResolvedSourceDef, extendSources } = await this.resolveRunTargetStruct(runnable);
+    const { struct, modelDef, compositeResolvedSourceDef } = await this.resolveRunTargetStruct(runnable);
     const seen = new Set;
-    const joinedGates = this.collectAllReachableGates(struct, modelDef, seen, true);
-    if (modelDef) {
-      const runTargetLabel = ownSourceName ?? "(run target)";
-      for (const field of extendSources) {
-        const { resolved, denyGate } = this.classifyJoinedField(field, runTargetLabel);
-        if (denyGate) {
-          joinedGates.push(denyGate);
-          continue;
-        }
-        if (!resolved)
-          continue;
-        joinedGates.push(...this.collectAllReachableGates(resolved, modelDef, seen));
-      }
-    }
+    const entryPointGates = this.collectEntryPointGates(struct, modelDef, seen, true);
     if (compositeResolvedSourceDef && modelDef) {
-      joinedGates.push(...this.collectAllReachableGates(compositeResolvedSourceDef, modelDef, seen, true));
+      entryPointGates.push(...this.collectEntryPointGates(compositeResolvedSourceDef, modelDef, seen, true));
     }
-    for (const { label, exprs, selfContained } of joinedGates) {
-      await this.assertAuthorizedExprs(label, exprs, givens, selfContained);
+    for (const {
+      label,
+      exprs,
+      selfContained,
+      ambientPrefix
+    } of entryPointGates) {
+      await this.assertAuthorizedExprs(label, exprs, givens, selfContained, ambientPrefix);
     }
   }
   async resolveRunTargetStruct(runnable) {
@@ -278057,112 +278399,120 @@ class Model {
         return {
           struct: undefined,
           modelDef: undefined,
-          compositeResolvedSourceDef: undefined,
-          extendSources: []
+          compositeResolvedSourceDef: undefined
         };
       const structRef = prepared._query?.structRef;
       const struct = typeof structRef === "string" ? modelDef.contents[structRef] : structRef;
-      const extendSources = (prepared._query?.pipeline ?? []).flatMap((segment) => segment.extendSource ?? []);
       return {
         struct: struct && typeof struct === "object" ? struct : undefined,
         modelDef,
-        compositeResolvedSourceDef: prepared._query?.compositeResolvedSourceDef,
-        extendSources
+        compositeResolvedSourceDef: prepared._query?.compositeResolvedSourceDef
       };
     } catch {
       return {
         struct: undefined,
         modelDef: undefined,
-        compositeResolvedSourceDef: undefined,
-        extendSources: []
+        compositeResolvedSourceDef: undefined
       };
     }
   }
-  gateExprsForOwnAnnotations(struct) {
+  gateExprsForOwnAnnotations(struct, modelDef) {
     const ownNotes = (struct.annotations?.blockNotes ?? []).map((note) => note.text);
     try {
-      return [
-        ...this.fileLevelAuthorize,
-        ...collectAuthorizeExprs(ownNotes)
-      ];
+      const own = collectAuthorizeExprs(ownNotes);
+      if (own.length > 0) {
+        return {
+          exprs: [...this.fileLevelAuthorize, ...own],
+          fromAncestor: false,
+          ambientPrefix: this.fileLevelAuthorize.length
+        };
+      }
+      const ancestor = this.ancestorGateExprs(struct, modelDef);
+      return {
+        exprs: [...this.fileLevelAuthorize, ...ancestor],
+        fromAncestor: ancestor.length > 0,
+        ambientPrefix: this.fileLevelAuthorize.length
+      };
     } catch {
-      return ["false"];
+      return { exprs: ["false"], fromAncestor: false, ambientPrefix: 0 };
     }
   }
-  classifyJoinedField(field, parentLabel) {
-    if (!isJoined(field))
-      return {};
-    if (isRecordOrArrayField(field))
-      return {};
-    if (!isSourceDef2(field)) {
-      logger.error("authorize: joined field failed to resolve to a walkable SourceDef; denying rather than silently skipping its gate (possible Malloy struct-shape drift)", {
-        modelPath: this.modelPath,
-        parentSource: parentLabel,
-        fieldName: field.name,
-        fieldType: field.type
-      });
-      return {
-        denyGate: {
-          label: `${parentLabel} (unresolvable joined source)`,
-          exprs: ["false"],
-          selfContained: false
-        }
-      };
+  ancestorGateExprs(struct, modelDef, seen = new Set) {
+    let inherited = struct.annotations?.inherits;
+    for (let depth = 0;inherited && depth < ANCESTOR_WALK_MAX_DEPTH; depth++) {
+      const exprs2 = collectAuthorizeExprs((inherited.blockNotes ?? []).map((note) => note.text));
+      if (exprs2.length > 0)
+        return exprs2;
+      inherited = inherited.inherits;
+    }
+    if (inherited)
+      return ["false"];
+    seen.add(struct);
+    if (seen.size > ANCESTOR_WALK_MAX_DEPTH)
+      return ["false"];
+    const declared = this.resolveDeclaredSource(struct, modelDef);
+    if (declared.kind === "unresolvable")
+      return ["false"];
+    if (declared.kind === "none" || seen.has(declared.source))
+      return [];
+    const exprs = collectAuthorizeExprs((declared.source.annotations?.blockNotes ?? []).map((note) => note.text));
+    return exprs.length > 0 ? exprs : this.ancestorGateExprs(declared.source, modelDef, seen);
+  }
+  resolveDeclaredSource(struct, modelDef) {
+    if (!modelDef)
+      return { kind: "none" };
+    let sawBrokenEntry = false;
+    for (const id of [struct.referenceID, struct.sourceID]) {
+      const entry = id ? modelDef.sourceRegistry?.[id]?.entry : undefined;
+      if (!entry)
+        continue;
+      const declared = entry.type === "source_registry_reference" ? modelDef.contents[entry.name] : entry;
+      if (declared === struct)
+        continue;
+      if (!declared || !isSourceDef2(declared)) {
+        sawBrokenEntry = true;
+        continue;
+      }
+      return { kind: "resolved", source: declared };
     }
-    return { resolved: field };
+    return sawBrokenEntry ? { kind: "unresolvable" } : { kind: "none" };
   }
-  collectAllReachableGates(struct, modelDef, seen = new Set, treatAsOwnGate = false) {
+  collectEntryPointGates(struct, modelDef, seen = new Set, treatAsOwnGate = false) {
     if (!struct || !modelDef || seen.has(struct))
       return [];
     seen.add(struct);
     const results = [];
     const label = struct.as ?? struct.name;
-    const ownExprs = this.gateExprsForOwnAnnotations(struct);
+    const {
+      exprs: ownExprs,
+      fromAncestor,
+      ambientPrefix
+    } = this.gateExprsForOwnAnnotations(struct, modelDef);
     if (ownExprs.length > 0) {
       results.push({
         label,
         exprs: ownExprs,
-        selfContained: !treatAsOwnGate
+        selfContained: fromAncestor || !treatAsOwnGate,
+        ambientPrefix
       });
     }
-    for (const field of struct.fields) {
-      const { resolved, denyGate } = this.classifyJoinedField(field, label);
-      if (denyGate) {
-        results.push(denyGate);
-        continue;
-      }
-      if (!resolved)
-        continue;
-      const joinedSource = resolved;
-      results.push(...this.collectAllReachableGates(joinedSource, modelDef, seen));
-      if (joinedSource.type === "composite") {
-        const members = joinedSource.sources;
-        for (const member of members) {
-          results.push(...this.collectAllReachableGates(member, modelDef, seen));
-        }
-      }
-    }
     const duck = struct;
     if (duck.type === "query_source") {
       const ref = duck.query?.structRef;
       const base = typeof ref === "string" ? modelDef.contents[ref] : ref;
       if (base && isSourceDef2(base)) {
-        results.push(...this.collectAllReachableGates(base, modelDef, seen));
+        results.push(...this.collectEntryPointGates(base, modelDef, seen));
+      } else {
+        results.push({
+          label,
+          exprs: ["false"],
+          selfContained: true,
+          ambientPrefix: 0
+        });
       }
       const resolved = duck.query?.compositeResolvedSourceDef;
       if (resolved) {
-        results.push(...this.collectAllReachableGates(resolved, modelDef, seen));
-      }
-      const innerJoins = (duck.query?.pipeline ?? []).flatMap((segment) => segment.extendSource ?? []);
-      for (const field of innerJoins) {
-        const { resolved: innerJoinSource, denyGate: innerJoinDenyGate } = this.classifyJoinedField(field, label);
-        if (innerJoinDenyGate) {
-          results.push(innerJoinDenyGate);
-          continue;
-        }
-        if (!innerJoinSource)
-          continue;
-        results.push(...this.collectAllReachableGates(innerJoinSource, modelDef, seen));
+        results.push(...this.collectEntryPointGates(resolved, modelDef, seen));
       }
     }
     return results;
@@ -278220,7 +278570,7 @@ class Model {
         sources = sourceResult.sources;
         filterMap = sourceResult.filterMap;
         queries = Model.getQueries(modelDef);
-        await validateAuthorizeProbes(modelMaterializer, sources ?? []);
+        await validateAuthorizeProbes(modelMaterializer, sourceResult.ownAuthorizeSources);
         const imports = modelDef.imports || [];
         const importedSourceNames = new Set;
         for (const importLocation of imports) {
@@ -278282,7 +278632,6 @@ class Model {
     const modelMaterializer = runtime._loadModelFromModelDef(modelDef);
     const runnableNotebookCells = data.modelType === "notebook" ? hydrateNotebookCells(runtime, data.notebookCells) : undefined;
     const model = new Model(packageName, data.modelPath, dataStyles, data.modelType, modelMaterializer, modelDef, sources, queries, sourceInfos, runnableNotebookCells, undefined, filterMap, givens, modelInfo);
-    model.setServeMalloyConfig(malloyConfig);
     return model;
   }
   static fromCompilationError(packageName, modelPath, modelType, error) {
@@ -278481,8 +278830,12 @@ class Model {
       throw new ModelNotFoundError(`${this.modelPath} is not a valid notebook name.  Notebook files must end in .malloynb.`);
     }
   }
-  setServeMalloyConfig(config) {
-    this.serveMalloyConfig = config;
+  setServeDestinationConfig(provider) {
+    this.serveDestinationConfig = provider;
+    this.invalidateServeShapeCache();
+  }
+  invalidateServeShapeCache() {
+    this.serveShapeCache = undefined;
   }
   setServeBindings(bindings) {
     this.serveBindings = bindings;
@@ -278502,7 +278855,7 @@ class Model {
     if (freshBindings.length === 0) {
       throw new Error("no fresh storage serve bindings for this query");
     }
-    const key = freshBindings.map((b) => `${b.sourceName}@${b.connectionName}/${b.virtualHandle}`).sort().join("|");
+    const key = freshBindings.map((b) => `${b.sourceName}@${b.destinationName}/${b.virtualHandle}`).sort().join("|");
     if (!this.serveShapeCache || this.serveShapeCache.key !== key) {
       this.serveShapeCache = {
         key,
@@ -278553,7 +278906,7 @@ class Model {
     const url2 = `${root}shape.malloy`;
     const runtime = new Runtime2({
       urlReader: new InMemoryURLReader2(new Map([[url2, modelText]])),
-      config: Model.toMalloyConfig(this.serveMalloyConfig)
+      config: restrictMalloyConfigToConnections(this.serveDestinationConfig(), new Set(bindings.map((binding) => binding.destinationName)))
     });
     return runtime.loadModel(new URL(url2), {
       importBaseURL: new URL(root)
@@ -278613,18 +278966,33 @@ class Model {
     if (!this.modelMaterializer || !this.modelDef || !this.modelInfo)
       throw new BadRequestError("Model has no queryable entities.");
     const boundary = this.assertQueryBoundaryEarly(sourceName, queryName, query);
-    const earlySource = sourceName || (queryName ? this.queries?.find((q) => q.name === queryName)?.sourceName : undefined) || extractRunTargetSourceName(query);
+    const surfaceName = extractRunTargetSourceName(query);
+    const earlySource = sourceName || (queryName ? this.queries?.find((q) => q.name === queryName)?.sourceName : undefined) || (surfaceName && !this.sources?.some((s) => s.name === surfaceName) ? this.queries?.find((q) => q.name === surfaceName)?.sourceName : undefined) || surfaceName;
     if (earlySource) {
       await this.assertAuthorized(earlySource, givens ?? {});
     }
     try {
+      for (const [field, callerText] of [
+        ["query", query],
+        ["source_name", sourceName],
+        ["query_name", queryName]
+      ]) {
+        if (!callerText)
+          continue;
+        try {
+          assertNoCallerAuthorizeAnnotation(callerText);
+        } catch (err) {
+          recordAuthorizeGuardRejection(field);
+          throw err;
+        }
+      }
       let queryString;
       if (!sourceName && !queryName && query) {
         queryString = `
 ` + query;
       } else if (queryName && !query) {
         queryString = `
-run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
+run: ${sourceName ? `${quoteMalloyIdentifier(sourceName)} -> ` : ""}${quoteMalloyIdentifier(queryName)}`;
       } else {
         const endTime = performance.now();
         const executionTime2 = endTime - startTime;
@@ -278650,7 +279018,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
       }
       runnable = this.modelMaterializer.loadRestrictedQuery(queryString);
       liveRunnable = runnable;
-      if (getPersistStorageMode() === "on" && this.serveBindings.length > 0 && this.serveMalloyConfig) {
+      if (getPersistStorageMode() === "on" && this.serveBindings.length > 0 && this.serveDestinationConfig) {
         try {
           const shaped = await this.loadServeShapeQuery(queryString);
           runnable = shaped.runnable;
@@ -278800,7 +279168,8 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
       executionTime = performance.now() - startTime;
     }
     const wrappedResult = API.util.wrapResult(queryResults);
-    const serializedBytes = maxBytes > 0 ? Buffer.byteLength(JSON.stringify(wrappedResult), "utf8") : 0;
+    const serializedResult = stringifyQueryResponse(wrappedResult, queryResults.totalRows, maxBytes, "model_query");
+    const serializedBytes = maxBytes > 0 ? Buffer.byteLength(serializedResult, "utf8") : 0;
     assertWithinModelResponseLimits(queryResults.totalRows, serializedBytes, { maxRows, maxBytes }, "model_query");
     this.queryExecutionHistogram.record(executionTime, {
       "malloy.model.path": this.modelPath,
@@ -278815,6 +279184,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
     });
     return {
       result: wrappedResult,
+      serializedResult,
       compactResult: queryResults.data.value,
       modelInfo: this.modelInfo,
       dataStyles: this.dataStyles,
@@ -278952,7 +279322,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
         });
         const query = (await runnableToExecute.getPreparedQuery())._query;
         queryName = query.as || query.name;
-        queryResult = result?._queryResult && this.modelInfo && JSON.stringify(API.util.wrapResult(result));
+        queryResult = result?._queryResult && this.modelInfo && stringifyQueryResponse(API.util.wrapResult(result), result.totalRows, cellMaxBytes, "notebook_cell");
         if (result?._queryResult && queryResult) {
           assertWithinModelResponseLimits(result.totalRows, Buffer.byteLength(queryResult, "utf8"), { maxRows: cellMaxRows, maxBytes: cellMaxBytes }, "notebook_cell");
         }
@@ -278998,7 +279368,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
   static async getModelRuntime(packagePath, modelPath, malloyConfig, options) {
     const fullModelPath = path6.join(packagePath, modelPath);
     try {
-      if (!(await fs5.stat(fullModelPath)).isFile()) {
+      if (!(await fs6.stat(fullModelPath)).isFile()) {
         throw new ModelNotFoundError(`${modelPath} is not a file.`);
       }
     } catch {
@@ -279036,8 +279406,12 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
     return extractQueriesFromModelDef(modelDef);
   }
   static getSources(modelDef, givens) {
-    const { sources, filterMap } = extractSourcesFromModelDef(modelDef, givens, (sourceName, err) => logger.warn(`Failed to parse filter annotations on source "${sourceName}"`, { error: err }));
-    return { sources, filterMap };
+    const { sources, filterMap, ownAuthorizeSources } = extractSourcesFromModelDef(modelDef, givens, (sourceName, err) => logger.warn(`Failed to parse filter annotations on source "${sourceName}"`, { error: err }));
+    return {
+      sources,
+      filterMap,
+      ownAuthorizeSources
+    };
   }
   static async getModelMaterializer(runtime, importBaseURL, modelURL, modelPath) {
     if (modelPath.endsWith(MODEL_FILE_SUFFIX)) {
@@ -279067,7 +279441,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
     let fileContents = undefined;
     let parse = undefined;
     try {
-      fileContents = await fs5.readFile(modelURL, "utf8");
+      fileContents = await fs6.readFile(modelURL, "utf8");
     } catch {
       throw new ModelNotFoundError("Model not found: " + modelPath);
     }
@@ -279160,7 +279534,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
   async getFileText(packagePath) {
     const fullPath = path6.join(packagePath, this.modelPath);
     try {
-      return await fs5.readFile(fullPath, "utf8");
+      return await fs6.readFile(fullPath, "utf8");
     } catch {
       throw new ModelNotFoundError(`Model file not found: ${this.modelPath}`);
     }
@@ -279681,6 +280055,7 @@ class Package {
   models = new Map;
   packagePath;
   malloyConfig;
+  serveDestinationConfig;
   buildManifestEntries;
   freshnessEntries;
   storageServeBindings = [];
@@ -279761,11 +280136,11 @@ class Package {
         if (!cleanupDirectoryOnFailure) {
           logger.info(`Preserving existing package directory after failed load: ${packagePath}`);
         } else {
-          const stat6 = await fs6.lstat(packagePath).catch(() => null);
+          const stat6 = await fs7.lstat(packagePath).catch(() => null);
           if (stat6?.isSymbolicLink()) {
             logger.info(`Skipping cleanup of symlinked package path on failure: ${packagePath}`);
           } else {
-            await fs6.rm(packagePath, { recursive: true, force: true });
+            await fs7.rm(packagePath, { recursive: true, force: true });
             logger.info(`Cleaned up failed package directory: ${packagePath}`);
           }
         }
@@ -279839,7 +280214,7 @@ class Package {
           renderTagWarnings.push({ model: sm.modelPath, ...w });
         }
         if (sm.modelPath.endsWith(MODEL_FILE_SUFFIX)) {
-          const modelSource = await fs6.readFile(path7.join(packagePath, sm.modelPath), "utf-8");
+          const modelSource = await fs7.readFile(path7.join(packagePath, sm.modelPath), "utf-8");
           assertPersistNamesQuoted(modelSource, sm.modelPath);
         }
         models.set(sm.modelPath, model);
@@ -279940,7 +280315,7 @@ class Package {
     if (this.storageServeBindings.length > 0) {
       metadata.storageServeBindings = this.storageServeBindings.map((b) => ({
         sourceName: b.sourceName,
-        storageConnectionName: b.connectionName,
+        storageDestinationName: b.destinationName,
         tablePath: b.tablePath
       }));
     }
@@ -280016,6 +280391,22 @@ class Package {
       model.setServeBindings(this.storageServeBindings);
     }
   }
+  setServeDestinationConfig(provider) {
+    this.serveDestinationConfig = provider;
+    this.pushServeDestinationConfigToModels();
+  }
+  pushServeDestinationConfigToModels() {
+    if (!this.serveDestinationConfig)
+      return;
+    for (const model of this.models.values()) {
+      model.setServeDestinationConfig(this.serveDestinationConfig);
+    }
+  }
+  invalidateServeShapes() {
+    for (const model of this.models.values()) {
+      model.invalidateServeShapeCache();
+    }
+  }
   getInvalidExplores(exploresOverride) {
     const declared = exploresOverride ?? this.packageMetadata.explores;
     if (!declared || declared.length === 0)
@@ -280258,6 +280649,7 @@ class Package {
     }
     this.models = nextModels;
     this.pushStorageServeBindingsToModels();
+    this.pushServeDestinationConfigToModels();
     this.renderTagWarnings = renderTagWarnings;
     this.manifestWarnings = outcome.packageMetadata.manifestWarnings ?? [];
     this.packageMetadata.explores = outcome.packageMetadata.explores;
@@ -280354,7 +280746,7 @@ class Package {
   static async validatePackageManifestExistsOrThrowError(packagePath) {
     const packageConfigPath = safeJoinUnderRoot(packagePath, PACKAGE_MANIFEST_NAME);
     try {
-      await fs6.stat(packageConfigPath);
+      await fs7.stat(packageConfigPath);
     } catch {
       logger.error(`Can't find ${packageConfigPath}`);
       throw new PackageNotFoundError(`Package manifest for ${packagePath} does not exist.`);
@@ -280435,6 +280827,11 @@ var STAGING_DIR_NAME = ".staging";
 var RETIRED_DIR_NAME = ".retired";
 var MANIFEST_FETCH_TIMEOUT_MS = 15000;
 var RETIRED_CONNECTION_DRAIN_MS = 30000;
+var DESTINATION_READ_FIELDS = new Set([
+  "name",
+  "type",
+  "resource"
+]);
 var queryAdmissionRejectionsCounter = null;
 var packageAdmissionRejectionsCounter = null;
 function getQueryAdmissionRejectionsCounter() {
@@ -280464,6 +280861,9 @@ class Environment {
   connectionMutex = new Mutex;
   retiredConnectionGenerations = new Set;
   apiConnections;
+  destinations;
+  destinationMalloyConfig;
+  destinationsAuthoritative = true;
   environmentPath;
   environmentName;
   storageBindingResolver;
@@ -280475,12 +280875,14 @@ class Environment {
   getEnvironmentName() {
     return this.environmentName;
   }
-  constructor(environmentName, environmentPath, malloyConfig, apiConnections) {
+  constructor(environmentName, environmentPath, malloyConfig, apiConnections, storageDestinations = []) {
     assertSafeEnvironmentPath(environmentPath);
     this.environmentName = environmentName;
     this.environmentPath = environmentPath;
     this.malloyConfig = malloyConfig;
     this.apiConnections = apiConnections;
+    this.destinations = [];
+    this.setStorageDestinations(storageDestinations);
     this.metadata = {
       resource: `${API_PREFIX}/environments/${this.environmentName}`,
       name: this.environmentName,
@@ -280493,7 +280895,7 @@ class Environment {
       return;
     const readmePath = path8.join(this.environmentPath, "README.md");
     try {
-      await fs7.promises.writeFile(readmePath, readme, "utf-8");
+      await fs8.promises.writeFile(readmePath, readme, "utf-8");
       logger.info(`Updated README.md for environment ${this.environmentName}`);
     } catch (err) {
       logger.error(`Failed to write README.md`, { error: err });
@@ -280501,6 +280903,11 @@ class Environment {
     }
   }
   async update(payload) {
+    if (payload.storageDestinations !== undefined) {
+      this.setStorageDestinations(payload.storageDestinations, {
+        rejectInvalid: true
+      });
+    }
     if (payload.readme !== undefined) {
       this.metadata.readme = payload.readme;
       await this.writeEnvironmentReadme(payload.readme);
@@ -280520,9 +280927,9 @@ class Environment {
     }
     return this;
   }
-  static async create(environmentName, environmentPath, connections) {
+  static async create(environmentName, environmentPath, connections, storageDestinations = []) {
     assertSafeEnvironmentPath(environmentPath);
-    if (!(await fs7.promises.stat(environmentPath))?.isDirectory()) {
+    if (!(await fs8.promises.stat(environmentPath))?.isDirectory()) {
       throw new EnvironmentNotFoundError(`Environment path ${environmentPath} not found`);
     }
     logger.info(`Creating environment with connection configuration`);
@@ -280533,14 +280940,14 @@ class Environment {
         type: c.type
       }))
     });
-    const environment = new Environment(environmentName, environmentPath, malloyConfig, malloyConfig.apiConnections);
+    const environment = new Environment(environmentName, environmentPath, malloyConfig, malloyConfig.apiConnections, storageDestinations);
     await Environment.sweepStaleInstallDirs(environmentPath);
     return environment;
   }
   async reloadEnvironmentMetadata() {
     let readme = "";
     try {
-      readme = (await fs7.promises.readFile(safeJoinUnderRoot(this.environmentPath, README_NAME))).toString();
+      readme = (await fs8.promises.readFile(safeJoinUnderRoot(this.environmentPath, README_NAME))).toString();
     } catch {}
     this.metadata = {
       ...this.metadata,
@@ -280553,6 +280960,12 @@ class Environment {
   async compileSource(packageName, modelName, source, includeSql = false, givens) {
     assertSafePackageName(packageName);
     assertSafeRelativeModelPath(modelName);
+    try {
+      assertNoCallerAuthorizeAnnotation(source);
+    } catch (err) {
+      recordAuthorizeGuardRejection("compile_source");
+      throw err;
+    }
     if (modelName.endsWith(NOTEBOOK_FILE_SUFFIX)) {
       throw new BadRequestError(`Cannot compile against a notebook ("${modelName}"). ` + `/compile takes a .malloy model path for namespace context.`);
     }
@@ -280563,7 +280976,7 @@ class Environment {
       const virtualUri = virtualUrl.toString();
       let modelContent = "";
       try {
-        modelContent = await fs7.promises.readFile(modelPath, "utf8");
+        modelContent = await fs8.promises.readFile(modelPath, "utf8");
       } catch {}
       const fullSource = modelContent ? `${modelContent}
 ${source}` : source;
@@ -280633,6 +281046,76 @@ ${source}` : source;
     }
     return connection;
   }
+  setStorageDestinations(storageDestinations, { rejectInvalid = false } = {}) {
+    const previous = this.destinations;
+    const requested = Array.isArray(storageDestinations) ? storageDestinations.map((destination) => this.resolveDestinationReference(destination)) : storageDestinations;
+    this.destinations = rejectInvalid ? processStorageDestinationsOrThrow(requested) : processStorageDestinations(requested);
+    this.destinationsAuthoritative = true;
+    if (this.destinationMalloyConfig && storageDestinationsEqual(previous, this.destinations)) {
+      return;
+    }
+    this.rebuildDestinationMalloyConfig();
+    if (previous.length > 0 || this.destinations.length > 0) {
+      logger.info(`Environment ${this.environmentName} has ${this.destinations.length} storage destination(s)`, { destinations: this.destinations.map((d) => d.name) });
+    }
+  }
+  resolveDestinationReference(destination) {
+    if (!destination || typeof destination !== "object") {
+      return destination;
+    }
+    const carriesOnlyReportedFields = Object.keys(destination).every((field) => DESTINATION_READ_FIELDS.has(field));
+    if (!carriesOnlyReportedFields) {
+      return destination;
+    }
+    return this.destinations.find((stored) => stored.name === destination.name) ?? destination;
+  }
+  attachDestinationServeConfig(_package) {
+    _package.setServeDestinationConfig(() => this.getStorageDestinationMalloyConfig());
+  }
+  rebuildDestinationMalloyConfig() {
+    const previous = this.destinationMalloyConfig;
+    try {
+      const destinationRoot = storageDestinationRoot(this.environmentPath);
+      if (this.destinations.length > 0) {
+        fs8.mkdirSync(destinationRoot, { recursive: true });
+      }
+      this.destinationMalloyConfig = buildEnvironmentMalloyConfig(this.destinations, destinationRoot);
+    } catch (error) {
+      logger.error(`Failed to assemble storage destinations for environment ${this.environmentName}; serving without them`, { error });
+      this.destinationMalloyConfig = buildEnvironmentMalloyConfig([], storageDestinationRoot(this.environmentPath));
+    }
+    if (previous && previous !== this.destinationMalloyConfig) {
+      this.retireConnectionGeneration(`environment ${this.environmentName} destinations`, () => previous.releaseConnections());
+      this.invalidateServeShapes();
+    }
+  }
+  invalidateServeShapes() {
+    for (const _package of this.packages.values()) {
+      _package.invalidateServeShapes();
+    }
+  }
+  getStorageDestinationMalloyConfig() {
+    return this.destinationMalloyConfig.malloyConfig;
+  }
+  markStorageDestinationsUnknown() {
+    this.destinationsAuthoritative = false;
+  }
+  hasAuthoritativeStorageDestinations() {
+    return this.destinationsAuthoritative;
+  }
+  listStorageDestinations() {
+    return this.destinations;
+  }
+  hasStorageDestination(destinationName) {
+    return this.destinations.some((destination) => destination.name === destinationName);
+  }
+  getStorageDestination(destinationName) {
+    const destination = this.destinations.find((destination2) => destination2.name === destinationName);
+    if (!destination) {
+      throw new DestinationNotFoundError(`Storage destination ${destinationName} not found`);
+    }
+    return destination;
+  }
   async getMalloyConnection(connectionName) {
     return this.malloyConfig.malloyConfig.connections.lookupConnection(connectionName);
   }
@@ -280714,10 +281197,10 @@ ${source}` : source;
     return this.getOrCreatePackageMutex(packageName).runExclusive(fn);
   }
   allocateStagingPath(packageName) {
-    return safeJoinUnderRoot(this.environmentPath, STAGING_DIR_NAME, `${packageName}-${crypto3.randomUUID()}`);
+    return safeJoinUnderRoot(this.environmentPath, STAGING_DIR_NAME, `${packageName}-${crypto4.randomUUID()}`);
   }
   allocateRetiredPath(packageName) {
-    return safeJoinUnderRoot(this.environmentPath, RETIRED_DIR_NAME, `${packageName}-${crypto3.randomUUID()}`);
+    return safeJoinUnderRoot(this.environmentPath, RETIRED_DIR_NAME, `${packageName}-${crypto4.randomUUID()}`);
   }
   static async sweepStaleInstallDirs(environmentPath) {
     assertSafeEnvironmentPath(environmentPath);
@@ -280728,7 +281211,7 @@ ${source}` : source;
       if (path8.basename(dir) !== dirName)
         continue;
       try {
-        await fs7.promises.rm(dir, { recursive: true, force: true });
+        await fs8.promises.rm(dir, { recursive: true, force: true });
       } catch (err) {
         logger.warn(`Failed to sweep stale ${dirName} dir at ${dir}`, {
           error: err
@@ -280804,6 +281287,7 @@ ${source}` : source;
       logger.debug(`Loading package ${packageName}...`);
       const packagePath = safeJoinUnderRoot(this.environmentPath, packageName);
       const _package = await Package.create(this.environmentName, packageName, packagePath, () => this.malloyConfig.malloyConfig);
+      this.attachDestinationServeConfig(_package);
       await this.bindManifestIfConfigured(_package);
       await this.rebindServeBindingsFromLocalStore(_package);
       if (existingPackage !== undefined && reload) {
@@ -280828,7 +281312,7 @@ ${source}` : source;
   async addPackage(packageName, options = {}) {
     assertSafePackageName(packageName);
     const packagePath = safeJoinUnderRoot(this.environmentPath, packageName);
-    if (!await fs7.promises.access(packagePath).then(() => true).catch(() => false) || !(await fs7.promises.stat(packagePath))?.isDirectory()) {
+    if (!await fs8.promises.access(packagePath).then(() => true).catch(() => false) || !(await fs8.promises.stat(packagePath))?.isDirectory()) {
       throw new PackageNotFoundError(`Package ${packageName} not found`);
     }
     this.assertCanAdmitNewPackage(packageName, "add a new package", options.allowAdmission === true);
@@ -280845,7 +281329,9 @@ ${source}` : source;
     }
     this.setPackageStatus(packageName, "loading" /* LOADING */);
     try {
-      this.packages.set(packageName, await Package.create(this.environmentName, packageName, packagePath, () => this.malloyConfig.malloyConfig));
+      const addedPackage = await Package.create(this.environmentName, packageName, packagePath, () => this.malloyConfig.malloyConfig);
+      this.attachDestinationServeConfig(addedPackage);
+      this.packages.set(packageName, addedPackage);
     } catch (error) {
       logger.error("Error adding package", { error });
       this.deletePackageStatus(packageName);
@@ -280858,7 +281344,7 @@ ${source}` : source;
   async installPackage(packageName, downloader, validate) {
     assertSafePackageName(packageName);
     const stagingPath = this.allocateStagingPath(packageName);
-    await fs7.promises.mkdir(path8.dirname(stagingPath), { recursive: true });
+    await fs8.promises.mkdir(path8.dirname(stagingPath), { recursive: true });
     logger.debug("install.phase1.download.started", {
       environmentName: this.environmentName,
       packageName,
@@ -280868,7 +281354,7 @@ ${source}` : source;
     try {
       await downloader(stagingPath);
     } catch (err) {
-      await fs7.promises.rm(stagingPath, { recursive: true, force: true }).catch(() => {});
+      await fs8.promises.rm(stagingPath, { recursive: true, force: true }).catch(() => {});
       throw err;
     }
     logger.debug("install.phase1.download.completed", {
@@ -280884,13 +281370,13 @@ ${source}` : source;
       const canonicalPath = safeJoinUnderRoot(this.environmentPath, packageName);
       let retiredPath;
       const oldPackage = this.packages.get(packageName);
-      const oldExistsOnDisk = await fs7.promises.access(canonicalPath).then(() => true).catch(() => false);
+      const oldExistsOnDisk = await fs8.promises.access(canonicalPath).then(() => true).catch(() => false);
       if (oldExistsOnDisk) {
         retiredPath = this.allocateRetiredPath(packageName);
-        await fs7.promises.mkdir(path8.dirname(retiredPath), {
+        await fs8.promises.mkdir(path8.dirname(retiredPath), {
           recursive: true
         });
-        await fs7.promises.rename(canonicalPath, retiredPath);
+        await fs8.promises.rename(canonicalPath, retiredPath);
         logger.debug("install.phase2.retired_old", {
           environmentName: this.environmentName,
           packageName,
@@ -280899,9 +281385,10 @@ ${source}` : source;
       }
       let newPackage;
       try {
-        await fs7.promises.rename(stagingPath, canonicalPath);
+        await fs8.promises.rename(stagingPath, canonicalPath);
         this.setPackageStatus(packageName, "loading" /* LOADING */);
         newPackage = await Package.create(this.environmentName, packageName, canonicalPath, () => this.malloyConfig.malloyConfig, true);
+        this.attachDestinationServeConfig(newPackage);
         const validationMsg = validate?.(newPackage);
         if (validationMsg) {
           throw new BadRequestError(validationMsg);
@@ -280912,11 +281399,11 @@ ${source}` : source;
           canonicalPath
         });
       } catch (err) {
-        await fs7.promises.rm(canonicalPath, { recursive: true, force: true }).catch(() => {});
+        await fs8.promises.rm(canonicalPath, { recursive: true, force: true }).catch(() => {});
         let restored = false;
         if (retiredPath) {
           try {
-            await fs7.promises.rename(retiredPath, canonicalPath);
+            await fs8.promises.rename(retiredPath, canonicalPath);
             restored = true;
           } catch (restoreErr) {
             logger.error("Failed to restore retired package after install rollback", {
@@ -280926,7 +281413,7 @@ ${source}` : source;
             });
           }
         }
-        await fs7.promises.rm(stagingPath, { recursive: true, force: true }).catch(() => {});
+        await fs8.promises.rm(stagingPath, { recursive: true, force: true }).catch(() => {});
         if (oldPackage && restored) {
           this.setPackageStatus(packageName, "serving" /* SERVING */);
         } else {
@@ -280960,7 +281447,7 @@ ${source}` : source;
             packageName,
             retiredPath: pathToClean
           });
-          fs7.promises.rm(pathToClean, { recursive: true, force: true }).catch((err) => {
+          fs8.promises.rm(pathToClean, { recursive: true, force: true }).catch((err) => {
             logger.warn(`Failed to clean up retired package directory ${pathToClean}`, { error: err });
           });
         });
@@ -281093,7 +281580,7 @@ ${source}` : source;
     try {
       let existingManifest = {};
       try {
-        const content = await fs7.promises.readFile(manifestPath, "utf-8");
+        const content = await fs8.promises.readFile(manifestPath, "utf-8");
         existingManifest = JSON.parse(content);
       } catch (_err) {
         logger.warn(`Could not read manifest for ${packageName}`);
@@ -281113,7 +281600,7 @@ ${source}` : source;
         ...resolvedScope !== undefined ? { scope: resolvedScope } : {},
         ...materializationBlock !== undefined ? { materialization: materializationBlock } : {}
       };
-      await fs7.promises.writeFile(manifestPath, JSON.stringify(updatedManifest, null, 2), "utf-8");
+      await fs8.promises.writeFile(manifestPath, JSON.stringify(updatedManifest, null, 2), "utf-8");
       logger.info(`Updated publisher.json for ${packageName}`);
     } catch (error) {
       logger.error(`Failed to update publisher.json`, { error });
@@ -281236,10 +281723,10 @@ ${source}` : source;
       const retiredPath = this.allocateRetiredPath(packageName);
       let renamed = false;
       try {
-        await fs7.promises.mkdir(path8.dirname(retiredPath), {
+        await fs8.promises.mkdir(path8.dirname(retiredPath), {
           recursive: true
         });
-        await fs7.promises.rename(canonicalPath, retiredPath);
+        await fs8.promises.rename(canonicalPath, retiredPath);
         renamed = true;
       } catch (err) {
         logger.error("Error renaming package directory to retired during unload", {
@@ -281252,7 +281739,7 @@ ${source}` : source;
       this.packageStatuses.delete(packageName);
       if (renamed) {
         setImmediate(() => {
-          fs7.promises.rm(retiredPath, { recursive: true, force: true }).catch((err) => {
+          fs8.promises.rm(retiredPath, { recursive: true, force: true }).catch((err) => {
             logger.warn(`Failed to clean up retired package directory ${retiredPath}`, { error: err });
           });
         });
@@ -281312,6 +281799,13 @@ ${source}` : source;
     } catch (error) {
       logger.error(`Error closing connections for environment ${this.environmentName}`, { error });
     }
+    try {
+      await this.destinationMalloyConfig.releaseConnections();
+    } catch (error) {
+      logger.error(`Error closing storage destinations for environment ${this.environmentName}`, { error: error instanceof Error ? error.message : String(error) });
+    }
+    this.destinations = [];
+    this.destinationsAuthoritative = false;
     await this.releaseAllRetiredConnectionGenerations();
     this.apiConnections = [];
     logger.info(`Closed all connections for environment ${this.environmentName}`);
@@ -281320,13 +281814,17 @@ ${source}` : source;
     return {
       ...this.metadata,
       connections: this.listApiConnections(),
+      storageDestinations: this.destinations.map(({ name, type }) => ({
+        name,
+        type
+      })),
       packages: await this.listPackages()
     };
   }
   async deleteDuckDBConnection(connectionName) {
     const duckdbPath = path8.join(this.environmentPath, `${connectionName}.duckdb`);
     try {
-      await fs7.promises.rm(duckdbPath, { force: true });
+      await fs8.promises.rm(duckdbPath, { force: true });
       logger.info(`Removed DuckDB connection file ${connectionName} from environment ${this.environmentName}`);
     } catch (error) {
       logger.error(`Failed to remove DuckDB connection file ${connectionName} from environment ${this.environmentName}`, { error });
@@ -281387,11 +281885,11 @@ function validateEnvironmentAzureUrls(environment) {
 }
 async function clearMountTarget(targetPath) {
   try {
-    const stats = await fs8.promises.lstat(targetPath);
+    const stats = await fs9.promises.lstat(targetPath);
     if (stats.isDirectory() && !stats.isSymbolicLink()) {
-      await fs8.promises.rm(targetPath, { recursive: true, force: true });
+      await fs9.promises.rm(targetPath, { recursive: true, force: true });
     } else {
-      await fs8.promises.unlink(targetPath);
+      await fs9.promises.unlink(targetPath);
     }
   } catch {}
 }
@@ -281609,6 +282107,9 @@ class EnvironmentStore {
         name: environment.name,
         resource: `${API_PREFIX}/environments/${environment.name}`,
         connections: environment.connections,
+        ...environment.storageDestinations.length ? {
+          storageDestinations: environment.storageDestinations
+        } : {},
         packages: environment.packages
       }, true);
     } catch (error) {
@@ -281640,16 +282141,17 @@ class EnvironmentStore {
         if (existingEnvironments.length > 0) {
           await Promise.all(existingEnvironments.map(async (dbEnvironment) => {
             try {
-              const environmentExists = await fs8.promises.access(dbEnvironment.path).then(() => true).catch(() => false);
+              const environmentExists = await fs9.promises.access(dbEnvironment.path).then(() => true).catch(() => false);
+              const environmentConfig = environmentManifest.environments.find((p) => p.name === dbEnvironment.name);
               if (!environmentExists) {
-                const environmentConfig = environmentManifest.environments.find((p) => p.name === dbEnvironment.name);
                 if (environmentConfig) {
                   const environmentInstance2 = await this.addEnvironment({
                     name: environmentConfig.name,
                     resource: `${API_PREFIX}/environments/${environmentConfig.name}`,
                     connections: environmentConfig.connections,
+                    storageDestinations: environmentConfig.storageDestinations,
                     packages: environmentConfig.packages
-                  }, true);
+                  }, true, { storageDestinationsAreFallback: true });
                   await repository.updateEnvironment(dbEnvironment.id, {
                     path: environmentInstance2.metadata.location
                   });
@@ -281660,12 +282162,30 @@ class EnvironmentStore {
                 }
               }
               const connections = await repository.listConnections(dbEnvironment.id);
+              let destinations = environmentConfig?.storageDestinations;
+              let destinationsRead = true;
+              try {
+                const stored = await repository.listStorageDestinations(dbEnvironment.id);
+                if (stored.length) {
+                  destinations = stored.map((row) => ({
+                    name: row.name,
+                    type: row.type,
+                    ...row.config
+                  }));
+                }
+              } catch (error) {
+                destinationsRead = false;
+                logger.error(`Error reading storage destinations for "${dbEnvironment.name}"; continuing without the stored ones`, { error });
+              }
               const environmentInstance = await Environment.create(dbEnvironment.name, dbEnvironment.path, connections.map((conn) => ({
                 name: conn.name,
                 type: conn.type,
                 resource: `${API_PREFIX}/connections/${conn.name}`,
                 ...conn.config
-              })));
+              })), destinations);
+              if (!destinationsRead) {
+                environmentInstance.markStorageDestinationsUnknown();
+              }
               environmentInstance.setMemoryGovernor(this.memoryGovernor);
               const envId = dbEnvironment.id;
               environmentInstance.setStorageBindingResolver(async (packageName) => {
@@ -281732,6 +282252,7 @@ class EnvironmentStore {
     const repository = this.storageManager.getRepository();
     const dbEnvironment = await this.addEnvironmentMetadata(environment, repository);
     await this.addConnections(environment, dbEnvironment.id, repository);
+    await this.syncStorageDestinations(environment, dbEnvironment.id, repository);
     await this.addPackages(environment, dbEnvironment.id, repository);
     logger.info(`Synced environment "${environmentName}" to database`);
   }
@@ -281832,6 +282353,38 @@ class EnvironmentStore {
       logger.error(`Error syncing connections for "${environmentName}":`, error);
     }
   }
+  async syncStorageDestinations(environment, environmentId, repository) {
+    try {
+      const destinations = environment.listStorageDestinations();
+      const kept = new Set;
+      for (const destination of destinations) {
+        if (!destination.name || !destination.type) {
+          continue;
+        }
+        kept.add(destination.name);
+        await repository.upsertStorageDestination({
+          environmentId,
+          name: destination.name,
+          type: destination.type,
+          config: destination
+        });
+      }
+      if (!environment.hasAuthoritativeStorageDestinations()) {
+        logger.warn(`Not reconciling stored storage destinations for "${environment.metadata?.name}": this environment's destinations were never read, so the in-memory list is not the desired state`);
+        return;
+      }
+      const stored = await repository.listStorageDestinations(environmentId);
+      for (const row of stored) {
+        if (!kept.has(row.name)) {
+          await repository.deleteStorageDestination(row.id);
+          logger.info(`Removed storage destination ${row.name} from environment ${environment.metadata?.name}`);
+        }
+      }
+    } catch (err) {
+      const error = err;
+      logger.error(`Error syncing storage destinations for "${environment.metadata?.name}":`, error);
+    }
+  }
   async addConnection(conn, environmentId, repository) {
     if (!conn.name) {
       logger.warn("Skipping connection with undefined name");
@@ -281940,12 +282493,12 @@ class EnvironmentStore {
   }
   async cleanupAndCreatePublisherPath() {
     const reInit = process.env.INITIALIZE_STORAGE === "true";
-    await fs8.promises.mkdir(this.serverRootPath, { recursive: true });
+    await fs9.promises.mkdir(this.serverRootPath, { recursive: true });
     if (reInit) {
       const uploadDocsPath2 = path9.join(this.serverRootPath, PUBLISHER_DATA_DIR);
       logger.info(`Reinitialization mode: Cleaning up upload documents path ${uploadDocsPath2}`);
       try {
-        await fs8.promises.rm(uploadDocsPath2, {
+        await fs9.promises.rm(uploadDocsPath2, {
           recursive: true,
           force: true
         });
@@ -281960,7 +282513,7 @@ class EnvironmentStore {
       logger.info(`Using existing publisher path`);
     }
     const uploadDocsPath = path9.join(this.serverRootPath, PUBLISHER_DATA_DIR);
-    await fs8.promises.mkdir(uploadDocsPath, { recursive: true });
+    await fs9.promises.mkdir(uploadDocsPath, { recursive: true });
   }
   async listEnvironments(skipInitializationCheck = false) {
     if (!skipInitializationCheck) {
@@ -282055,11 +282608,14 @@ class EnvironmentStore {
       return await this.addEnvironment({
         name: environmentName,
         resource: `${API_PREFIX}/environments/${environmentName}`,
-        connections: environmentConfig?.connections || []
+        connections: environmentConfig?.connections || [],
+        ...environmentConfig?.storageDestinations?.length ? {
+          storageDestinations: environmentConfig.storageDestinations
+        } : {}
       });
     });
   }
-  async addEnvironment(environment, skipInitialization = false) {
+  async addEnvironment(environment, skipInitialization = false, { storageDestinationsAreFallback = false } = {}) {
     if (!skipInitialization) {
       await this.finishedInitialization;
     }
@@ -282075,6 +282631,9 @@ class EnvironmentStore {
     if (existingEnvironment) {
       const updatedEnvironment = await existingEnvironment.update(environment);
       this.environments.set(environmentName, updatedEnvironment);
+      if (storageDestinationsAreFallback) {
+        updatedEnvironment.markStorageDestinationsUnknown();
+      }
       await this.addEnvironmentToDatabase(updatedEnvironment);
       return updatedEnvironment;
     }
@@ -282094,7 +282653,7 @@ class EnvironmentStore {
     } else {
       absoluteEnvironmentPath = await this.scaffoldEnvironment(environment);
     }
-    const newEnvironment = await Environment.create(environmentName, absoluteEnvironmentPath, environment.connections || []);
+    const newEnvironment = await Environment.create(environmentName, absoluteEnvironmentPath, environment.connections || [], environment.storageDestinations || []);
     newEnvironment.setMemoryGovernor(this.memoryGovernor);
     if (!newEnvironment.metadata)
       newEnvironment.metadata = {};
@@ -282109,6 +282668,9 @@ class EnvironmentStore {
         newEnvironment.setPackageStatus(_package.name, "serving" /* SERVING */);
       }
     });
+    if (storageDestinationsAreFallback) {
+      newEnvironment.markStorageDestinationsUnknown();
+    }
     await this.addEnvironmentToDatabase(newEnvironment);
     return newEnvironment;
   }
@@ -282117,11 +282679,11 @@ class EnvironmentStore {
     const startedAt = Date.now();
     logger.info(`Detected zip file at "${absoluteEnvironmentPath}". Unzipping...`);
     const unzippedEnvironmentPath = absoluteEnvironmentPath.replace(".zip", "");
-    await fs8.promises.rm(unzippedEnvironmentPath, {
+    await fs9.promises.rm(unzippedEnvironmentPath, {
       recursive: true,
       force: true
     });
-    await fs8.promises.mkdir(unzippedEnvironmentPath, { recursive: true });
+    await fs9.promises.mkdir(unzippedEnvironmentPath, { recursive: true });
     let entryCount = 0;
     let totalUncompressedBytes = 0;
     await import_extract_zip.default(absoluteEnvironmentPath, {
@@ -282171,7 +282733,7 @@ class EnvironmentStore {
     await this.deleteEnvironmentFromDatabase(environmentName);
     if (environmentPath) {
       try {
-        await fs8.promises.rm(environmentPath, {
+        await fs9.promises.rm(environmentPath, {
           recursive: true,
           force: true
         });
@@ -282193,7 +282755,7 @@ class EnvironmentStore {
         return { frozenConfig: false, environments: [] };
       } else {
         try {
-          const entries = await fs8.promises.readdir(serverRootPath, {
+          const entries = await fs9.promises.readdir(serverRootPath, {
             withFileTypes: true
           });
           const environments = [];
@@ -282207,7 +282769,8 @@ class EnvironmentStore {
                     location: `./${entry.name}`
                   }
                 ],
-                connections: []
+                connections: [],
+                storageDestinations: []
               });
             }
           }
@@ -282225,9 +282788,9 @@ class EnvironmentStore {
     assertSafePackageName(environment.name);
     const environmentName = environment.name;
     const absoluteEnvironmentPath = safeJoinUnderRoot(this.serverRootPath, PUBLISHER_DATA_DIR, environmentName);
-    await fs8.promises.mkdir(absoluteEnvironmentPath, { recursive: true });
+    await fs9.promises.mkdir(absoluteEnvironmentPath, { recursive: true });
     if (environment.readme) {
-      await fs8.promises.writeFile(safeJoinUnderRoot(absoluteEnvironmentPath, "README.md"), environment.readme);
+      await fs9.promises.writeFile(safeJoinUnderRoot(absoluteEnvironmentPath, "README.md"), environment.readme);
     }
     return absoluteEnvironmentPath;
   }
@@ -282257,7 +282820,7 @@ class EnvironmentStore {
     assertSafePackageName(environmentName);
     const absoluteTargetPath = safeJoinUnderRoot(this.serverRootPath, PUBLISHER_DATA_DIR, environmentName);
     const mountErrors = new Map;
-    await fs8.promises.mkdir(absoluteTargetPath, { recursive: true });
+    await fs9.promises.mkdir(absoluteTargetPath, { recursive: true });
     if (!packages || packages.length === 0) {
       throw new PackageNotFoundError(`No packages found for environment ${environmentName}`);
     }
@@ -282287,9 +282850,9 @@ class EnvironmentStore {
     const totalPackages = packages.length;
     let mountedCount = 0;
     for (const [groupedLocation, packagesForLocation] of locationGroups) {
-      const locationHash = crypto4.createHash("sha256").update(groupedLocation).digest("hex").substring(0, 16);
+      const locationHash = crypto5.createHash("sha256").update(groupedLocation).digest("hex").substring(0, 16);
       const tempDownloadPath = safeJoinUnderRoot(absoluteTargetPath, `.temp_${locationHash}`);
-      await fs8.promises.mkdir(tempDownloadPath, { recursive: true });
+      await fs9.promises.mkdir(tempDownloadPath, { recursive: true });
       logger.info(`Created temporary directory: ${tempDownloadPath}`);
       let downloaded = true;
       try {
@@ -282324,7 +282887,7 @@ class EnvironmentStore {
               sourcePath = safeJoinUnderRoot(tempDownloadPath, groupedLocation);
             }
           }
-          const sourceExists = await fs8.promises.access(sourcePath).then(() => true).catch(() => false);
+          const sourceExists = await fs9.promises.access(sourcePath).then(() => true).catch(() => false);
           if (sourceExists) {
             const isInPlace = this.inPlaceEnvs.has(environmentName) && this.isLocalPath(_package.location);
             if (isInPlace) {
@@ -282332,16 +282895,16 @@ class EnvironmentStore {
               const absoluteSourcePath = path9.resolve(sourcePath);
               const linkType = process.platform === "win32" ? "junction" : "dir";
               try {
-                await fs8.promises.symlink(absoluteSourcePath, absolutePackagePath, linkType);
+                await fs9.promises.symlink(absoluteSourcePath, absolutePackagePath, linkType);
                 logger.info(`In-place mount (watch mode): linked package "${packageDir}" -> "${absoluteSourcePath}" (${++mountedCount}/${totalPackages})`);
               } catch (linkError) {
                 const code = linkError?.code ?? String(linkError);
                 logger.warn(`In-place mount failed for package "${packageDir}" (${code}); falling back to a copy. Source-edit live reload is disabled for this package.`);
                 await clearMountTarget(absolutePackagePath);
-                await fs8.promises.mkdir(absolutePackagePath, {
+                await fs9.promises.mkdir(absolutePackagePath, {
                   recursive: true
                 });
-                await fs8.promises.cp(sourcePath, absolutePackagePath, {
+                await fs9.promises.cp(sourcePath, absolutePackagePath, {
                   recursive: true
                 });
                 logger.info(`Copied package "${packageDir}" (${++mountedCount}/${totalPackages})`);
@@ -282351,20 +282914,20 @@ class EnvironmentStore {
                 logger.warn(`Watch mode: package "${packageDir}" has remote location "${_package.location}" — falling back to copy. Source-edit live reload won't work for this package; clone the source locally and use a local-dir location to enable it.`);
               }
               await clearMountTarget(absolutePackagePath);
-              await fs8.promises.mkdir(absolutePackagePath, {
+              await fs9.promises.mkdir(absolutePackagePath, {
                 recursive: true
               });
-              await fs8.promises.cp(sourcePath, absolutePackagePath, {
+              await fs9.promises.cp(sourcePath, absolutePackagePath, {
                 recursive: true
               });
               logger.info(`Extracted package "${packageDir}" from ${groupedLocation.startsWith("https://github.com/") && _package.location.includes("/tree/") ? "GitHub subdirectory" : "shared download"} (${++mountedCount}/${totalPackages})`);
             }
           } else {
             await clearMountTarget(absolutePackagePath);
-            await fs8.promises.mkdir(absolutePackagePath, {
+            await fs9.promises.mkdir(absolutePackagePath, {
               recursive: true
             });
-            await fs8.promises.cp(tempDownloadPath, absolutePackagePath, {
+            await fs9.promises.cp(tempDownloadPath, absolutePackagePath, {
               recursive: true
             });
             logger.info(`Copied entire download as package "${packageDir}" (${++mountedCount}/${totalPackages})`);
@@ -282377,7 +282940,7 @@ class EnvironmentStore {
         }
       }
       try {
-        await fs8.promises.rm(tempDownloadPath, {
+        await fs9.promises.rm(tempDownloadPath, {
           recursive: true,
           force: true
         });
@@ -282448,14 +283011,14 @@ class EnvironmentStore {
     if (environmentPath.endsWith(".zip")) {
       environmentPath = await this.unzipEnvironment(environmentPath);
     }
-    const environmentDirExists = (await fs8.promises.stat(environmentPath))?.isDirectory() ?? false;
+    const environmentDirExists = (await fs9.promises.stat(environmentPath))?.isDirectory() ?? false;
     if (environmentDirExists) {
-      await fs8.promises.rm(absoluteTargetPath, {
+      await fs9.promises.rm(absoluteTargetPath, {
         recursive: true,
         force: true
       });
-      await fs8.promises.mkdir(absoluteTargetPath, { recursive: true });
-      await fs8.promises.cp(environmentPath, absoluteTargetPath, {
+      await fs9.promises.mkdir(absoluteTargetPath, { recursive: true });
+      await fs9.promises.cp(environmentPath, absoluteTargetPath, {
         recursive: true
       });
     } else {
@@ -282474,11 +283037,11 @@ class EnvironmentStore {
       throw new EnvironmentNotFoundError(`Environment ${environmentName} not found in ${gcsPath}`);
     }
     if (!isCompressedFile) {
-      await fs8.promises.rm(absoluteDirPath, {
+      await fs9.promises.rm(absoluteDirPath, {
         recursive: true,
         force: true
       });
-      await fs8.promises.mkdir(absoluteDirPath, { recursive: true });
+      await fs9.promises.mkdir(absoluteDirPath, { recursive: true });
     } else {
       absoluteDirPath = `${absoluteDirPath}.zip`;
     }
@@ -282488,10 +283051,10 @@ class EnvironmentStore {
       if (file.name.endsWith("/")) {
         return;
       }
-      await fs8.promises.mkdir(path9.dirname(absoluteFilePath), {
+      await fs9.promises.mkdir(path9.dirname(absoluteFilePath), {
         recursive: true
       });
-      return fs8.promises.writeFile(absoluteFilePath, await file.download());
+      return fs9.promises.writeFile(absoluteFilePath, await file.download());
     }));
     if (isCompressedFile) {
       await this.unzipEnvironment(absoluteDirPath);
@@ -282505,7 +283068,7 @@ class EnvironmentStore {
     const prefix = prefixParts.join("/");
     if (isCompressedFile) {
       const zipFilePath = `${absoluteDirPath}.zip`;
-      await fs8.promises.mkdir(path9.dirname(zipFilePath), {
+      await fs9.promises.mkdir(path9.dirname(zipFilePath), {
         recursive: true
       });
       const command = new import_client_s33.GetObjectCommand({
@@ -282516,7 +283079,7 @@ class EnvironmentStore {
       if (!item.Body) {
         throw new EnvironmentNotFoundError(`Environment ${environmentName} not found in ${s3Path}`);
       }
-      const file = fs8.createWriteStream(zipFilePath);
+      const file = fs9.createWriteStream(zipFilePath);
       item.Body.transformToWebStream().pipeTo(Writable.toWeb(file));
       await new Promise((resolve5, reject) => {
         file.on("error", reject);
@@ -282530,8 +283093,8 @@ class EnvironmentStore {
       Bucket: bucketName,
       Prefix: prefix
     });
-    await fs8.promises.rm(absoluteDirPath, { recursive: true, force: true });
-    await fs8.promises.mkdir(absoluteDirPath, { recursive: true });
+    await fs9.promises.rm(absoluteDirPath, { recursive: true, force: true });
+    await fs9.promises.mkdir(absoluteDirPath, { recursive: true });
     if (!objects.Contents || objects.Contents.length === 0) {
       throw new EnvironmentNotFoundError(`Environment ${environmentName} not found in ${s3Path}`);
     }
@@ -282545,7 +283108,7 @@ class EnvironmentStore {
         return;
       }
       const absoluteFilePath = safeJoinUnderRoot(absoluteDirPath, relativeFilePath);
-      await fs8.promises.mkdir(path9.dirname(absoluteFilePath), {
+      await fs9.promises.mkdir(path9.dirname(absoluteFilePath), {
         recursive: true
       });
       const command = new import_client_s33.GetObjectCommand({
@@ -282556,7 +283119,7 @@ class EnvironmentStore {
       if (!item.Body) {
         return;
       }
-      const file = fs8.createWriteStream(absoluteFilePath);
+      const file = fs9.createWriteStream(absoluteFilePath);
       item.Body.transformToWebStream().pipeTo(Writable.toWeb(file));
       await new Promise((resolve5, reject) => {
         file.on("error", reject);
@@ -282573,11 +283136,11 @@ class EnvironmentStore {
     }
     const { owner, repoName, packagePath } = githubInfo;
     const cleanPackagePath = (packagePath?.replace("/tree/main", "") || "").replace(/^\/+/, "");
-    await fs8.promises.rm(absoluteDirPath, {
+    await fs9.promises.rm(absoluteDirPath, {
       recursive: true,
       force: true
     });
-    await fs8.promises.mkdir(absoluteDirPath, { recursive: true });
+    await fs9.promises.mkdir(absoluteDirPath, { recursive: true });
     const repoUrl = `https://github.com/${owner}/${repoName}`;
     const reporter = new CloneProgressReporter(cloneProgressLabel(`${owner}/${repoName}`, progressContext));
     await new Promise((resolve5, reject) => {
@@ -282603,24 +283166,24 @@ class EnvironmentStore {
       return;
     }
     const packageFullPath = safeJoinUnderRoot(absoluteDirPath, cleanPackagePath);
-    const packageExists = await fs8.promises.access(packageFullPath).then(() => true).catch(() => false);
+    const packageExists = await fs9.promises.access(packageFullPath).then(() => true).catch(() => false);
     if (!packageExists) {
       throw new Error(`Package path "${cleanPackagePath}" does not exist in the cloned repository.`);
     }
-    const dirContents = await fs8.promises.readdir(absoluteDirPath);
+    const dirContents = await fs9.promises.readdir(absoluteDirPath);
     for (const entry of dirContents) {
       if (entry !== cleanPackagePath.replace(/^\/+/, "").split("/")[0]) {
-        await fs8.promises.rm(safeJoinUnderRoot(absoluteDirPath, entry), {
+        await fs9.promises.rm(safeJoinUnderRoot(absoluteDirPath, entry), {
           recursive: true,
           force: true
         });
       }
     }
-    const packageContents = await fs8.promises.readdir(packageFullPath);
+    const packageContents = await fs9.promises.readdir(packageFullPath);
     for (const entry of packageContents) {
-      await fs8.promises.rename(safeJoinUnderRoot(packageFullPath, entry), safeJoinUnderRoot(absoluteDirPath, entry));
+      await fs9.promises.rename(safeJoinUnderRoot(packageFullPath, entry), safeJoinUnderRoot(absoluteDirPath, entry));
     }
-    await fs8.promises.rm(packageFullPath, { recursive: true, force: true });
+    await fs9.promises.rm(packageFullPath, { recursive: true, force: true });
   }
   extractErrorDataFromError(error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
@@ -285613,6 +286176,15 @@ function classifyToolError(operation, identifier, error) {
       suggestions: [...BACK_PRESSURE_SUGGESTIONS]
     };
   }
+  if (error instanceof ResponseUnserializableError) {
+    return {
+      message: error.message,
+      suggestions: [
+        "This is not transient. The same query will fail the same way, so change the query rather than retrying it.",
+        "Raising the byte cap will not help, because the response cannot be serialized at any cap. Shrink it instead: project fewer columns, add a LIMIT, or filter out the wide values."
+      ]
+    };
+  }
   if (error instanceof QueryTimeoutError || error instanceof PayloadTooLargeError) {
     return {
       message: error.message,
@@ -285739,7 +286311,7 @@ var COMPILE_DESCRIPTION = `Compile-check Malloy source against a model and retur
 
 ## Parameters
 - environmentName, packageName, modelPath (required): the model whose namespace the source compiles against. The source is appended to that model, so its imports, sources, and queries are in scope, and modelPath is real context, not a label.
-- source (required): the Malloy text to validate.
+- source (required): the Malloy text to validate. An \`#(authorize)\` annotation in it is rejected with a 400 — gates come only from package files; save and reload to validate one.
 - includeSql (optional): also return the generated SQL when the source ends in a runnable query. The query is still not executed and no data is scanned.
 
 ## Checking part of a source
@@ -285982,31 +286554,31 @@ var executeQueryShape = {
   packageName: exports_external.string().describe("Package containing the model. Call malloy_getContext with just environmentName to list its packages."),
   modelPath: exports_external.string().describe("Path to the .malloy model file"),
   query: exports_external.string().optional().describe("Ad-hoc Malloy query code"),
-  sourceName: exports_external.string().optional().describe("Source name for a view"),
-  queryName: exports_external.string().optional().describe("Named query or view"),
+  sourceName: exports_external.string().optional().describe("Source name for a view. A NAME, not Malloy code: one name exactly as malloy_getContext returned it, sent bare (the server quotes it, so a hyphen or a reserved word is fine — do not add backticks yourself). Anything richer, such as a parameterized source or an inline extension, goes in query."),
+  queryName: exports_external.string().optional().describe("Named query or view. A NAME, not Malloy code, on the same terms as sourceName: one view name as malloy_getContext returned it. A dotted path (carriers.by_name), a refinement (by_carrier + { limit: 10 }), or anything containing a newline goes in query instead."),
   filterParams: exports_external.record(exports_external.union([exports_external.string(), exports_external.array(exports_external.string())])).optional().describe("Filter parameter values keyed by filter name. Used with sources that declare #(filter) annotations."),
   givens: exports_external.record(exports_external.unknown()).optional().describe("Per-query given values that override model defaults. Keys are given names declared in the model's given: block.")
 };
 var EXECUTE_QUERY_DESCRIPTION = `Run a Malloy query against a model and return the rows. Takes either ad-hoc Malloy in query, or a named view/query via queryName (with sourceName for a view).
 
 ## Contract rules
-- Check _limit_hit before reporting any total, count, or "top N". True means the server's default row cap cut the result off and more rows exist, so the numbers in front of you are a partial set, not the answer. A query that set its own limit: or top: does not set it, and returning exactly that many rows is a complete answer to what was asked.
+- Check _limit_hit before reporting any total, count, or "top N". True means the server's default cap cut the result off and more rows exist, so what came back is a partial set, not the answer.
 - Never sum or count the returned rows to state a total when _limit_hit or _rows_truncated is set. Aggregate in the query instead.
 - _returned_rows: 0 with _rows_truncated set means one row was too large to send, NOT that nothing matched. Do not report it as an empty result.
-- Use source, view, and field names exactly as malloy_getContext returned them.
+- Use source, view, and field names exactly as malloy_getContext returned them. sourceName/queryName take one NAME each, never Malloy code — they are quoted for you, so send even a hyphenated name bare, and put anything richer (a dotted path, a refinement, a second statement) in query.
 
 ## Response
-A JSON object, the same shape Credible's execute_query returns, so a data app behaves the same authored locally and served in production:
-- rows: flat objects keyed by column name, the shape an in-package data app receives.
+A JSON object, the same shape Credible's execute_query and an in-package data app receive:
+- rows: flat objects keyed by column name.
 - _meta: the Malloy metadata flat rows drop (schema with field types and render tags, annotations, connection_name, query_timezone).
 - _query_row_limit: the cap pushed into the SQL, from the query's own limit: or the server default.
 - _limit_source: "query" when the cap came from the query's own limit:/top:, "server_default" otherwise.
-- _limit_hit: the row count equals that cap AND the cap was the server default.
+- _limit_hit: the row count equals that cap AND the cap was the server default, so a query carrying its own limit:/top: never sets it and exactly that many rows is a complete answer.
 - _rows_truncated / _total_rows / _returned_rows: present only when the payload cap dropped rows.
 - _query_id: this query's id in the warehouse's own query history. Present only where enabled.
 - warning, renderLogErrors: present only when they apply.
 
-A query with no limit: of its own gets the server default, so a result landing exactly on _query_row_limit is almost never the whole table. Values above 2^53 are returned as JSON strings so their digits survive.`;
+Values above 2^53 are returned as JSON strings so their digits survive.`;
 function registerExecuteQueryTool(mcpServer, environmentStore) {
   mcpServer.tool("malloy_executeQuery", EXECUTE_QUERY_DESCRIPTION, executeQueryShape, async (params) => {
     const {
@@ -288349,7 +288921,7 @@ source: orders is duckdb.table('orders.parquet') extend {
 \`\`\`
 
 - **Source-level** \`#(authorize) "<expr>"\` gates that one source. **File-level** \`##(authorize) "<expr>"\` applies to every source in the file. Multiple gates combine as an OR, access is granted if any one is true, so a permissive file-level gate is a **model-wide override**, not an added restriction.
-- **Not inherited, not joined.** The gate applies only to the source a query directly runs against. A source that \`extend\`s a locked base does **not** inherit the base's gate, and a gate on a source reached only via \`join_*\` never fires. Pair a locked base (\`#(authorize) "false"\`) with curated extension sources, using access modifiers (\`include { public: …, private: * }\`), so an extension re-exposes only a curated column surface instead of leaking the base's data through the join or extend.
+- **Entry point only: not joined, but inherited through \`extend\`.** The gate applies to the source a query enters through. A gate on a source reached only via \`join_*\` **never fires**, at any depth, so anything ungated that joins a locked base hands the base's rows to every caller. A source that \`extend\`s a locked base and declares no gate of its own **does** carry the base's gate; declaring its own replaces it. Pair a locked base (\`#(authorize) "false"\`) with curated extension sources, using access modifiers (\`include { public: …, private: * }\`), so an extension re-exposes only a curated column surface, and keep sensitive sources out of ungated joins.
 - The expression may reference only givens and literals, never a column of the gated source; the check runs against a synthetic probe row, not your data.
 
 > **Trust caveat.** Givens are **caller-asserted**, anyone who can reach the query API can claim a favorable given, e.g. \`{"ROLE":"admin"}\`. \`#(authorize)\` is only a real boundary when it sits behind a trusted tier that sets givens from its own verified context, never directly from an untrusted caller. It is not, on its own, end-user authentication.
@@ -289705,7 +290277,7 @@ function initializeMcpServer(environmentStore) {
 }
 
 // src/mcp_config.ts
-import * as fs9 from "fs";
+import * as fs10 from "fs";
 import * as os3 from "os";
 import * as path11 from "path";
 init_logger();
@@ -289734,7 +290306,7 @@ function mcpEndpoint(host, port) {
 function findGitWorkTreeRoot(dir) {
   let current = path11.resolve(dir);
   for (;; ) {
-    if (fs9.existsSync(path11.join(current, ".git")))
+    if (fs10.existsSync(path11.join(current, ".git")))
       return current;
     const parent = path11.dirname(current);
     if (parent === current)
@@ -289753,7 +290325,7 @@ function ensureMcpConfig(options) {
       try {
         return {
           path: file,
-          isSymlink: fs9.lstatSync(file).isSymbolicLink()
+          isSymlink: fs10.lstatSync(file).isSymbolicLink()
         };
       } catch {
         return;
@@ -289772,7 +290344,7 @@ function ensureMcpConfig(options) {
     }
     const realish = (p) => {
       try {
-        return fs9.realpathSync(p);
+        return fs10.realpathSync(p);
       } catch {
         return path11.resolve(p);
       }
@@ -289790,7 +290362,7 @@ function ensureMcpConfig(options) {
         action: "skipped-git",
         dir,
         gitRoot,
-        rootConfig: fs9.existsSync(rootCandidate) ? rootCandidate : undefined,
+        rootConfig: fs10.existsSync(rootCandidate) ? rootCandidate : undefined,
         endpoint,
         staleConfig
       };
@@ -289799,7 +290371,7 @@ function ensureMcpConfig(options) {
       return { action: "exists", file, endpoint };
     const body = JSON.stringify({ mcpServers: { malloy: malloyServer(endpoint) } }, null, 2) + `
 `;
-    fs9.writeFileSync(file, body, { encoding: "utf8", flag: "wx" });
+    fs10.writeFileSync(file, body, { encoding: "utf8", flag: "wx" });
     return { action: "created", file };
   } catch (error) {
     const code = error?.code;
@@ -289910,7 +290482,8 @@ function registerLegacyRoutes(app, controllers) {
   });
   app.post(`${LEGACY_API_PREFIX}/projects`, async (req, res) => {
     try {
-      logger.info("Adding project", { body: req.body });
+      logger.info("Adding project", { body: redactSensitive(req.body) });
+      processStorageDestinationsOrThrow(req.body?.storageDestinations ?? []);
       const environment = await environmentStore.addEnvironment(req.body);
       res.status(200).json(await environment.serialize());
     } catch (error) {
@@ -290523,7 +291096,7 @@ import {
   InMemoryURLReader as InMemoryURLReader3,
   Runtime as Runtime4
 } from "@malloydata/malloy";
-import { mkdtempSync, rmSync } from "node:fs";
+import { mkdirSync as mkdirSync2, mkdtempSync, rmSync } from "node:fs";
 import os4 from "node:os";
 import path12 from "node:path";
 var sharedGateSession;
@@ -290616,7 +291189,7 @@ async function buildSourceIntoStorage(params) {
     const target = quoteManifestTablePath(`${destinationName}.${physicalTableName}`, "duckdb");
     const passthrough = wrapPassthrough(sourceType, federated.handle, buildSQL);
     const schema = await createTableAndDescribe(session, target, passthrough);
-    return { storageConnectionName: destinationName, schema };
+    return { storageDestinationName: destinationName, schema };
   } finally {
     await dispose();
   }
@@ -290668,7 +291241,7 @@ async function buildDownstreamIntoStorage(params) {
     const sql = projectToPublicColumns(downstream, downstream.getSQL({ virtualMap }));
     const target = quoteManifestTablePath(`${destinationName}.${physicalTableName}`, "duckdb");
     const schema = await createTableAndDescribe(session, target, sql);
-    return { storageConnectionName: destinationName, schema };
+    return { storageDestinationName: destinationName, schema };
   } finally {
     await dispose();
   }
@@ -290677,7 +291250,7 @@ async function assertStorageServeShapeCompiles(params) {
   const { destinationName, sourceName, virtualHandle, physicalTableName } = params;
   const binding = {
     sourceName,
-    connectionName: destinationName,
+    destinationName,
     virtualHandle,
     tablePath: `${destinationName}.${physicalTableName}`,
     schema: params.schema.filter((c) => c.name && c.type).map((c) => ({ name: c.name, type: c.type }))
@@ -290713,7 +291286,9 @@ async function attachDestinationReadWrite(session, destinationName, destinationC
     await attachDuckLakeReadWrite(session, destinationName, cfg);
     return;
   }
-  const dbPath = path12.join(environmentPath, `${destinationName}.duckdb`);
+  const destinationRoot = storageDestinationRoot(environmentPath);
+  mkdirSync2(destinationRoot, { recursive: true });
+  const dbPath = path12.join(destinationRoot, `${destinationName}.duckdb`);
   await session.runSQL(`ATTACH '${escapeSQL(dbPath)}' AS ${quoteIdentifier(destinationName, "duckdb")}`);
 }
 function assertSupportedDestination(destinationName, destinationConnection) {
@@ -290802,7 +291377,7 @@ function manifestExcludingStorage(manifest, builtEntries) {
   reduced.strict = manifest.strict;
   const quoted = manifest.buildManifest.entries;
   for (const [id, entry] of Object.entries(builtEntries)) {
-    if (!entry.storageConnectionName && quoted[id]) {
+    if (!entry.storageDestinationName && quoted[id]) {
       reduced.update(id, { tableName: quoted[id].tableName });
     }
   }
@@ -291050,7 +291625,7 @@ class MaterializationService {
           continue;
         seen.add(sourceEntityId);
         const prior = priorEntries[sourceEntityId];
-        if (prior && prior.physicalTableName && (prior.storageConnectionName ?? undefined) === destination) {
+        if (prior && prior.physicalTableName && (prior.storageDestinationName ?? undefined) === destination) {
           carried[sourceEntityId] = prior;
           continue;
         }
@@ -291159,7 +291734,7 @@ class MaterializationService {
   async autoLoadManifest(environment, packageName, entries) {
     const manifestEntries = {};
     for (const [sourceEntityId, entry] of Object.entries(entries)) {
-      if (entry.physicalTableName && !entry.storageConnectionName) {
+      if (entry.physicalTableName && !entry.storageDestinationName) {
         manifestEntries[sourceEntityId] = {
           tableName: entry.physicalTableName,
           connectionName: entry.connectionName
@@ -291254,7 +291829,7 @@ class MaterializationService {
           }
           const entry = await this.buildOneSource(persistSource, instruction, connection, connectionDigests, manifest, environment, entries, buildMetadata);
           entries[sourceEntityId] = entry;
-          if (entry.storageConnectionName)
+          if (entry.storageDestinationName)
             builtThisRun.push(entry);
         }
       }
@@ -291266,6 +291841,14 @@ class MaterializationService {
     }
     return entries;
   }
+  destinationForCleanup(environment, destinationName) {
+    try {
+      return environment.getStorageDestination(destinationName);
+    } catch (error) {
+      logger.warn("Skipping a table drop: its storage destination is no longer configured", { destinationName, error: errMessage(error) });
+      return;
+    }
+  }
   async reclaimStorageTablesFromFailedRun(builtThisRun, environment, owner) {
     if (builtThisRun.length === 0)
       return;
@@ -291277,14 +291860,14 @@ class MaterializationService {
         if (other.status !== "MANIFEST_FILE_READY")
           continue;
         for (const e of Object.values(other.manifest?.entries ?? {})) {
-          const dest = e.storageConnectionName ?? e.connectionName;
+          const dest = e.storageDestinationName ?? e.connectionName;
           if (dest && e.physicalTableName) {
             stillReferenced.add(tableKey(dest, e.physicalTableName));
           }
         }
       }
       for (const entry of builtThisRun) {
-        const dest = entry.storageConnectionName;
+        const dest = entry.storageDestinationName;
         const table = entry.physicalTableName;
         if (!dest || !table)
           continue;
@@ -291292,10 +291875,13 @@ class MaterializationService {
           logger.info("Keeping a table from a failed run: a live manifest still serves it", { destinationName: dest, physicalTableName: table });
           continue;
         }
+        const destinationConnection = this.destinationForCleanup(environment, dest);
+        if (!destinationConnection)
+          continue;
         try {
           await dropStorageTable({
             destinationName: dest,
-            destinationConnection: environment.getApiConnection(dest),
+            destinationConnection,
             physicalTableName: table,
             environmentPath: environment.getEnvironmentPath()
           });
@@ -291309,7 +291895,7 @@ class MaterializationService {
           logger.warn("Failed to reclaim a table stranded by a failed build", {
             destinationName: dest,
             physicalTableName: table,
-            error: redactConnectionSecrets(errMessage(dropErr), environment.getApiConnection(dest))
+            error: redactConnectionSecrets(errMessage(dropErr), destinationConnection)
           });
         }
       }
@@ -291415,7 +292001,7 @@ class MaterializationService {
     const physicalTableName = instruction.physicalTableName;
     const destinationName = instruction.destination;
     const sourceConnection = environment.getApiConnection(persistSource.connectionName);
-    const destinationConnection = environment.getApiConnection(destinationName);
+    const destinationConnection = environment.getStorageDestination(destinationName);
     const startTime = performance.now();
     let result;
     if (dependsOnStorageUpstream) {
@@ -291494,7 +292080,7 @@ class MaterializationService {
     recordSourceBuildDuration(durationMs, "storage");
     logger.info(`Built materialized source ${persistSource.name} into storage`, {
       physicalTableName,
-      storageConnectionName: result.storageConnectionName,
+      storageDestinationName: result.storageDestinationName,
       columns: result.schema.length,
       durationMs
     });
@@ -291504,14 +292090,14 @@ class MaterializationService {
       materializedTableId: instruction.materializedTableId,
       physicalTableName,
       connectionName: persistSource.connectionName,
-      storageConnectionName: result.storageConnectionName,
+      storageDestinationName: result.storageDestinationName,
       schema: result.schema,
       realization: instruction.realization,
       rowCount: null
     };
   }
   async buildDownstreamViaParents(persistSource, destinationName, destinationConnection, builtEntries, environment, physicalTableName) {
-    const upstreams = deriveServeBindings(builtEntries).filter((b) => b.connectionName === destinationName);
+    const upstreams = deriveServeBindings(builtEntries).filter((b) => b.destinationName === destinationName);
     if (upstreams.length === 0) {
       throw new MaterializationEligibilityError({
         message: "no materialized upstream is available in this destination to build on"
@@ -291618,7 +292204,7 @@ class MaterializationService {
       if (other.status !== "MANIFEST_FILE_READY")
         continue;
       for (const e of Object.values(other.manifest?.entries ?? {})) {
-        const dest = e.storageConnectionName ?? e.connectionName;
+        const dest = e.storageDestinationName ?? e.connectionName;
         if (dest && e.physicalTableName) {
           stillReferenced.add(tableKey(dest, e.physicalTableName));
         }
@@ -291634,7 +292220,7 @@ class MaterializationService {
         });
         continue;
       }
-      const destForKey = entry.storageConnectionName ?? connectionName;
+      const destForKey = entry.storageDestinationName ?? connectionName;
       if (stillReferenced.has(tableKey(destForKey, physicalTableName))) {
         logger.info("Skipping drop: table still referenced by another materialization", {
           materializationId: m.id,
@@ -291643,11 +292229,13 @@ class MaterializationService {
         });
         continue;
       }
-      if (entry.storageConnectionName) {
-        const destinationConnection = environment.getApiConnection(entry.storageConnectionName);
+      if (entry.storageDestinationName) {
+        const destinationConnection = this.destinationForCleanup(environment, entry.storageDestinationName);
+        if (!destinationConnection)
+          continue;
         try {
           await dropStorageTable({
-            destinationName: entry.storageConnectionName,
+            destinationName: entry.storageDestinationName,
             destinationConnection,
             physicalTableName,
             environmentPath: environment.getEnvironmentPath()
@@ -291656,14 +292244,14 @@ class MaterializationService {
           logger.info("Dropped materialized storage table on delete", {
             materializationId: m.id,
             physicalTableName,
-            storageConnectionName: entry.storageConnectionName
+            storageDestinationName: entry.storageDestinationName
           });
         } catch (err) {
           recordDropTables("failure", "storage");
           logger.warn("Failed to drop a storage-materialized table", {
             materializationId: m.id,
             physicalTableName,
-            storageConnectionName: entry.storageConnectionName,
+            storageDestinationName: entry.storageDestinationName,
             error: redactConnectionSecrets(errMessage(err), destinationConnection)
           });
         }
@@ -291961,7 +292549,82 @@ function listSanitizerDrops(raw, sanitized) {
   return drops;
 }
 
+// src/spa_fallback.ts
+var ASSET_EXTENSIONS = new Set([
+  "avif",
+  "css",
+  "csv",
+  "gif",
+  "htm",
+  "html",
+  "ico",
+  "jpeg",
+  "jpg",
+  "js",
+  "json",
+  "map",
+  "mjs",
+  "parquet",
+  "pdf",
+  "png",
+  "svg",
+  "ttf",
+  "txt",
+  "webp",
+  "woff",
+  "woff2",
+  "xlsx"
+]);
+var SPA_OWNED_SEGMENTS = new Set(["pages", "workbook"]);
+function extensionOf(segment) {
+  const dot = segment.lastIndexOf(".");
+  if (dot <= 0 || dot === segment.length - 1)
+    return "";
+  return segment.slice(dot + 1).toLowerCase();
+}
+function classifySpaFallback(requestPath, apiPrefix) {
+  if (requestPath === apiPrefix || requestPath.startsWith(`${apiPrefix}/`)) {
+    return { kind: "apiNotFound", path: requestPath };
+  }
+  const segments = requestPath.split("/").filter((s) => s.length > 0);
+  const last2 = segments[segments.length - 1] ?? "";
+  if (!ASSET_EXTENSIONS.has(extensionOf(last2)))
+    return { kind: "spa" };
+  if (segments.length >= 3 && SPA_OWNED_SEGMENTS.has(segments[2])) {
+    return { kind: "spa" };
+  }
+  if (segments.length >= 3) {
+    const alreadyStaticForm = segments[0] === "environments" && segments[2] === "packages";
+    const traverses = segments.some((segment) => {
+      let decoded;
+      try {
+        decoded = decodeURIComponent(segment);
+      } catch {
+        return true;
+      }
+      return decoded === "." || decoded === ".." || decoded.includes("\\");
+    });
+    if (!alreadyStaticForm && !traverses) {
+      const [environmentName, packageName, ...rest] = segments;
+      if (rest[0] === "public" && rest.length > 1)
+        rest.shift();
+      return {
+        kind: "redirect",
+        location: `/environments/${environmentName}/packages/${packageName}/${rest.join("/")}`,
+        environmentName,
+        packageName
+      };
+    }
+  }
+  return {
+    kind: "assetNotFound",
+    path: requestPath,
+    appRouteCandidate: segments.length === 1 ? { environmentName: segments[0] } : segments.length === 2 ? { environmentName: segments[0], packageName: segments[1] } : null
+  };
+}
+
 // src/server.ts
+assertSupportedNodeVersion();
 function parseArgs() {
   const args = process.argv.slice(2);
   let sawServerRoot = false;
@@ -292151,6 +292814,17 @@ app.get("/sdk/publisher.js", (_req, res) => {
     }
   });
 });
+var PACKAGE_FILE_NOT_FOUND_HTML = `<!doctype html><meta charset="utf-8">
+<title>Not found</title>
+<style>body{font:14px/1.4 -apple-system,system-ui,sans-serif;margin:40px;max-width:720px;color:#222}code{background:#f4f4f5;padding:1px 4px;border-radius:3px}</style>
+<h1>Not found</h1>
+<p>This package does not serve that file. Only files inside the package's
+<code>public/</code> directory are web-served, at
+<code>/environments/&lt;env&gt;/packages/&lt;pkg&gt;/&lt;file&gt;</code>, where <code>&lt;file&gt;</code> is
+relative to <code>public/</code> and does not include it.</p>
+<p>Models and notebooks are not served here; they open in the web UI at
+<code>/&lt;env&gt;/&lt;pkg&gt;/&lt;file&gt;.malloy</code>. <a href="/">Publisher home</a> lists what
+this server has.</p>`;
 async function serveFromPackage(req, res) {
   const subPathRaw = req.params["0"] ?? "";
   try {
@@ -292170,7 +292844,7 @@ async function serveFromPackage(req, res) {
       realFullPath = await fsp.realpath(fullPath);
     } catch {
       if (!res.headersSent) {
-        res.status(404).end();
+        res.status(404).type("text/html").send(PACKAGE_FILE_NOT_FOUND_HTML);
       }
       return;
     }
@@ -292189,7 +292863,7 @@ async function serveFromPackage(req, res) {
     res.sendFile(realFullPath, (err) => {
       if (err) {
         if (!res.headersSent) {
-          res.status(404).end();
+          res.status(404).type("text/html").send(PACKAGE_FILE_NOT_FOUND_HTML);
         }
       }
     });
@@ -292200,21 +292874,17 @@ async function serveFromPackage(req, res) {
     }
   }
 }
+function withRequestQuery(req, target) {
+  const hash = req.originalUrl.indexOf("#");
+  const target_ = hash === -1 ? req.originalUrl : req.originalUrl.slice(0, hash);
+  const marker = target_.indexOf("?");
+  return marker === -1 ? target : target + target_.slice(marker);
+}
 app.get("/environments/:environmentName/packages/:packageName", (req, res, next) => {
   if (req.path.endsWith("/"))
     return next();
   const canonical = `/environments/${encodeURIComponent(req.params.environmentName)}/packages/${encodeURIComponent(req.params.packageName)}/`;
-  const query = new URLSearchParams;
-  for (const [key, value] of Object.entries(req.query)) {
-    if (Array.isArray(value)) {
-      for (const v of value)
-        query.append(key, String(v));
-    } else if (value !== undefined) {
-      query.append(key, String(value));
-    }
-  }
-  const qs = query.toString();
-  res.redirect(308, qs ? `${canonical}?${qs}` : canonical);
+  res.redirect(308, withRequestQuery(req, canonical));
 });
 app.get("/environments/:environmentName/packages/:packageName/*", serveFromPackage);
 var PAGES_DEPTH_CAP = 3;
@@ -292229,11 +292899,11 @@ function stripNonTagText(input) {
   return current;
 }
 async function listPackagePages(environmentName, packageName, publicRoot) {
-  const fs10 = await import("fs/promises");
+  const fs11 = await import("fs/promises");
   const out = [];
   let realPublicRoot;
   try {
-    realPublicRoot = await fs10.realpath(publicRoot);
+    realPublicRoot = await fs11.realpath(publicRoot);
   } catch {
     return out;
   }
@@ -292242,7 +292912,7 @@ async function listPackagePages(environmentName, packageName, publicRoot) {
       return;
     let entries;
     try {
-      entries = await fs10.readdir(dir, { withFileTypes: true });
+      entries = await fs11.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -292252,7 +292922,7 @@ async function listPackagePages(environmentName, packageName, publicRoot) {
       const full = path13.join(dir, entry.name);
       let realFull;
       try {
-        realFull = await fs10.realpath(full);
+        realFull = await fs11.realpath(full);
       } catch {
         continue;
       }
@@ -292266,7 +292936,7 @@ async function listPackagePages(environmentName, packageName, publicRoot) {
         let title = rel;
         let fit;
         try {
-          const fh = await fs10.open(full, "r");
+          const fh = await fs11.open(full, "r");
           try {
             const buf = Buffer.alloc(4096);
             const { bytesRead } = await fh.read(buf, 0, 4096, 0);
@@ -292461,7 +293131,8 @@ app.get(`${API_PREFIX2}/environments`, async (_req, res) => {
 });
 app.post(`${API_PREFIX2}/environments`, async (req, res) => {
   try {
-    logger.info("Adding environment", { body: req.body });
+    logger.info("Adding environment", { body: redactSensitive(req.body) });
+    processStorageDestinationsOrThrow(req.body?.storageDestinations ?? []);
     const environment = await environmentStore.addEnvironment(req.body);
     res.status(200).json(await environment.serialize());
   } catch (error) {
@@ -292954,7 +293625,62 @@ registerLegacyRoutes(app, {
 });
 if (!isDevelopment) {
   const SPA_INDEX = path13.resolve(ROOT, "index.html");
+  const escapeHtml = (value) => value.replace(/[<>&]/g, (c) => ({ "<": "&lt;", ">": "&gt;", "&": "&amp;" })[c] ?? c);
+  const decodeSegment = (segment) => {
+    if (segment === undefined)
+      return "";
+    try {
+      return decodeURIComponent(segment);
+    } catch {
+      return segment;
+    }
+  };
   app.get("*", (req, res) => {
+    let fallback = classifySpaFallback(req.path, API_PREFIX2);
+    const loadedEnvironment = (name) => environmentStore.getLoadedEnvironments().find((environment) => environment.getEnvironmentName() === name);
+    if (fallback.kind === "redirect") {
+      const environment = loadedEnvironment(decodeSegment(fallback.environmentName));
+      const packageName = decodeSegment(fallback.packageName);
+      const known = environment?.getLoadedPackages().some((pkg) => pkg.getPackageName() === packageName);
+      if (!known) {
+        fallback = {
+          kind: "assetNotFound",
+          path: req.path,
+          appRouteCandidate: null
+        };
+      }
+    }
+    if (fallback.kind === "assetNotFound" && fallback.appRouteCandidate) {
+      const { environmentName, packageName } = fallback.appRouteCandidate;
+      const environment = loadedEnvironment(decodeSegment(environmentName));
+      const isAppRoute = environment !== undefined && (packageName === undefined || environment.getLoadedPackages().some((pkg) => pkg.getPackageName() === decodeSegment(packageName)));
+      if (isAppRoute)
+        fallback = { kind: "spa" };
+    }
+    if (fallback.kind === "redirect") {
+      res.redirect(302, withRequestQuery(req, fallback.location));
+      return;
+    }
+    if (fallback.kind === "apiNotFound") {
+      res.status(404).json({
+        code: 404,
+        message: `Unknown API endpoint: ${fallback.path}. See /api-doc.yaml for the endpoints this server serves.`
+      });
+      return;
+    }
+    if (fallback.kind === "assetNotFound") {
+      res.status(404).type("text/html").send(`<!doctype html><meta charset="utf-8">
+<title>Not found</title>
+<style>body{font:14px/1.4 -apple-system,system-ui,sans-serif;margin:40px;max-width:720px;color:#222}code{background:#f4f4f5;padding:1px 4px;border-radius:3px}</style>
+<h1>Not found</h1>
+<p>Nothing is served at <code>${escapeHtml(fallback.path)}</code>.</p>
+<p>A file inside a package is served from that package's <code>public/</code> directory at
+<code>/environments/&lt;env&gt;/packages/&lt;pkg&gt;/&lt;file&gt;</code>, where <code>&lt;file&gt;</code> is relative to
+<code>public/</code> and does not include it. Models and notebooks open in the web UI at
+<code>/&lt;env&gt;/&lt;pkg&gt;/&lt;file&gt;.malloy</code> and <code>.malloynb</code>.</p>
+<p><a href="/">Publisher home</a> lists the environments and packages this server has.</p>`);
+      return;
+    }
     res.sendFile(SPA_INDEX, (err) => {
       if (!err)
         return;