@malloy-publisher/server 0.0.192 → 0.0.193

package/dist/server.mjs

@@ -150546,7 +150546,7 @@ var require_src113 = __commonJS((exports) => {
   var fs2 = __require("fs");
   var gaxios_1 = require_src53();
   var jws = require_jws();
-  var path2 = __require("path");
+  var path3 = __require("path");
   var util_1 = __require("util");
   var readFile = fs2.readFile ? (0, util_1.promisify)(fs2.readFile) : async () => {
     throw new ErrorWithCode("use key rather than keyFile.", "MISSING_CREDENTIALS");
@@ -150616,7 +150616,7 @@ var require_src113 = __commonJS((exports) => {
       return __classPrivateFieldGet(this, _GoogleToken_instances, "m", _GoogleToken_getTokenAsync).call(this, opts);
     }
     async getCredentials(keyFile) {
-      const ext = path2.extname(keyFile);
+      const ext = path3.extname(keyFile);
       switch (ext) {
         case ".json": {
           const key = await readFile(keyFile, "utf8");
@@ -152721,7 +152721,7 @@ var require_googleauth = __commonJS((exports) => {
   var fs2 = __require("fs");
   var gcpMetadata = require_src55();
   var os2 = __require("os");
-  var path2 = __require("path");
+  var path3 = __require("path");
   var crypto_1 = require_crypto3();
   var transporters_1 = require_transporters();
   var computeclient_1 = require_computeclient();
@@ -152917,11 +152917,11 @@ var require_googleauth = __commonJS((exports) => {
       } else {
         const home = process.env["HOME"];
         if (home) {
-          location = path2.join(home, ".config");
+          location = path3.join(home, ".config");
         }
       }
       if (location) {
-        location = path2.join(location, "gcloud", "application_default_credentials.json");
+        location = path3.join(location, "gcloud", "application_default_credentials.json");
         if (!fs2.existsSync(location)) {
           location = null;
         }
@@ -153238,7 +153238,7 @@ var require_googleauth = __commonJS((exports) => {
     if (this.jsonContent) {
       return this._cacheClientFromJSON(this.jsonContent, this.clientOptions);
     } else if (this.keyFilename) {
-      const filePath = path2.resolve(this.keyFilename);
+      const filePath = path3.resolve(this.keyFilename);
       const stream4 = fs2.createReadStream(filePath);
       return await this.fromStreamAsync(stream4, this.clientOptions);
     } else if (this.apiKey) {
@@ -153729,19 +153729,19 @@ var require_rng2 = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
-  exports.default = rng2;
+  exports.default = rng;
   var _crypto = _interopRequireDefault(__require("crypto"));
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
   }
-  var rnds8Pool2 = new Uint8Array(256);
-  var poolPtr2 = rnds8Pool2.length;
-  function rng2() {
-    if (poolPtr2 > rnds8Pool2.length - 16) {
-      _crypto.default.randomFillSync(rnds8Pool2);
-      poolPtr2 = 0;
+  var rnds8Pool = new Uint8Array(256);
+  var poolPtr = rnds8Pool.length;
+  function rng() {
+    if (poolPtr > rnds8Pool.length - 16) {
+      _crypto.default.randomFillSync(rnds8Pool);
+      poolPtr = 0;
     }
-    return rnds8Pool2.slice(poolPtr2, poolPtr2 += 16);
+    return rnds8Pool.slice(poolPtr, poolPtr += 16);
   }
 });
 
@@ -153778,20 +153778,20 @@ var require_stringify5 = __commonJS((exports) => {
     value: true
   });
   exports.default = undefined;
-  exports.unsafeStringify = unsafeStringify2;
+  exports.unsafeStringify = unsafeStringify;
   var _validate = _interopRequireDefault(require_validate2());
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
   }
-  var byteToHex2 = [];
+  var byteToHex = [];
   for (let i = 0;i < 256; ++i) {
-    byteToHex2.push((i + 256).toString(16).slice(1));
+    byteToHex.push((i + 256).toString(16).slice(1));
   }
-  function unsafeStringify2(arr, offset = 0) {
-    return byteToHex2[arr[offset + 0]] + byteToHex2[arr[offset + 1]] + byteToHex2[arr[offset + 2]] + byteToHex2[arr[offset + 3]] + "-" + byteToHex2[arr[offset + 4]] + byteToHex2[arr[offset + 5]] + "-" + byteToHex2[arr[offset + 6]] + byteToHex2[arr[offset + 7]] + "-" + byteToHex2[arr[offset + 8]] + byteToHex2[arr[offset + 9]] + "-" + byteToHex2[arr[offset + 10]] + byteToHex2[arr[offset + 11]] + byteToHex2[arr[offset + 12]] + byteToHex2[arr[offset + 13]] + byteToHex2[arr[offset + 14]] + byteToHex2[arr[offset + 15]];
+  function unsafeStringify(arr, offset = 0) {
+    return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
   }
   function stringify(arr, offset = 0) {
-    const uuid = unsafeStringify2(arr, offset);
+    const uuid = unsafeStringify(arr, offset);
     if (!(0, _validate.default)(uuid)) {
       throw TypeError("Stringified UUID is invalid");
     }
@@ -154032,7 +154032,7 @@ var require_v42 = __commonJS((exports) => {
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
   }
-  function v42(options, buf, offset) {
+  function v4(options, buf, offset) {
     if (_native.default.randomUUID && !buf && !options) {
       return _native.default.randomUUID();
     }
@@ -154049,7 +154049,7 @@ var require_v42 = __commonJS((exports) => {
     }
     return (0, _stringify.unsafeStringify)(rnds);
   }
-  var _default = v42;
+  var _default = v4;
   exports.default = _default;
 });
 
@@ -160310,19 +160310,19 @@ var require_rng3 = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", {
     value: true
   });
-  exports.default = rng2;
+  exports.default = rng;
   var _crypto = _interopRequireDefault(__require("crypto"));
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
   }
-  var rnds8Pool2 = new Uint8Array(256);
-  var poolPtr2 = rnds8Pool2.length;
-  function rng2() {
-    if (poolPtr2 > rnds8Pool2.length - 16) {
-      _crypto.default.randomFillSync(rnds8Pool2);
-      poolPtr2 = 0;
+  var rnds8Pool = new Uint8Array(256);
+  var poolPtr = rnds8Pool.length;
+  function rng() {
+    if (poolPtr > rnds8Pool.length - 16) {
+      _crypto.default.randomFillSync(rnds8Pool);
+      poolPtr = 0;
     }
-    return rnds8Pool2.slice(poolPtr2, poolPtr2 += 16);
+    return rnds8Pool.slice(poolPtr, poolPtr += 16);
   }
 });
 
@@ -160359,20 +160359,20 @@ var require_stringify6 = __commonJS((exports) => {
     value: true
   });
   exports.default = undefined;
-  exports.unsafeStringify = unsafeStringify2;
+  exports.unsafeStringify = unsafeStringify;
   var _validate = _interopRequireDefault(require_validate3());
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
   }
-  var byteToHex2 = [];
+  var byteToHex = [];
   for (let i = 0;i < 256; ++i) {
-    byteToHex2.push((i + 256).toString(16).slice(1));
+    byteToHex.push((i + 256).toString(16).slice(1));
   }
-  function unsafeStringify2(arr, offset = 0) {
-    return byteToHex2[arr[offset + 0]] + byteToHex2[arr[offset + 1]] + byteToHex2[arr[offset + 2]] + byteToHex2[arr[offset + 3]] + "-" + byteToHex2[arr[offset + 4]] + byteToHex2[arr[offset + 5]] + "-" + byteToHex2[arr[offset + 6]] + byteToHex2[arr[offset + 7]] + "-" + byteToHex2[arr[offset + 8]] + byteToHex2[arr[offset + 9]] + "-" + byteToHex2[arr[offset + 10]] + byteToHex2[arr[offset + 11]] + byteToHex2[arr[offset + 12]] + byteToHex2[arr[offset + 13]] + byteToHex2[arr[offset + 14]] + byteToHex2[arr[offset + 15]];
+  function unsafeStringify(arr, offset = 0) {
+    return byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]];
   }
   function stringify(arr, offset = 0) {
-    const uuid = unsafeStringify2(arr, offset);
+    const uuid = unsafeStringify(arr, offset);
     if (!(0, _validate.default)(uuid)) {
       throw TypeError("Stringified UUID is invalid");
     }
@@ -160613,7 +160613,7 @@ var require_v43 = __commonJS((exports) => {
   function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : { default: obj };
   }
-  function v42(options, buf, offset) {
+  function v4(options, buf, offset) {
     if (_native.default.randomUUID && !buf && !options) {
       return _native.default.randomUUID();
     }
@@ -160630,7 +160630,7 @@ var require_v43 = __commonJS((exports) => {
     }
     return (0, _stringify.unsafeStringify)(rnds);
   }
-  var _default = v42;
+  var _default = v4;
   exports.default = _default;
 });
 
@@ -160995,7 +160995,7 @@ var require_table = __commonJS((exports) => {
   var events_1 = __require("events");
   var fs2 = __require("fs");
   var is = require_is();
-  var path2 = __require("path");
+  var path3 = __require("path");
   var streamEvents = require_stream_events();
   var uuid = require_dist9();
   var _1 = require_src121();
@@ -161241,7 +161241,7 @@ var require_table = __commonJS((exports) => {
           if (!common_1.util.isCustomType(dest, "storage/file")) {
             throw new Error("Destination must be a File object.");
           }
-          const format = path2.extname(dest.name).substr(1).toLowerCase();
+          const format = path3.extname(dest.name).substr(1).toLowerCase();
           if (!options.destinationFormat && !options.format && FORMATS[format]) {
             options.destinationFormat = FORMATS[format];
           }
@@ -161299,7 +161299,7 @@ var require_table = __commonJS((exports) => {
         metadata.location = this.location;
       }
       if (typeof source === "string") {
-        const detectedFormat = FORMATS[path2.extname(source).substr(1).toLowerCase()];
+        const detectedFormat = FORMATS[path3.extname(source).substr(1).toLowerCase()];
         if (!metadata.sourceFormat && detectedFormat) {
           metadata.sourceFormat = detectedFormat;
         }
@@ -161335,7 +161335,7 @@ var require_table = __commonJS((exports) => {
           if (!common_1.util.isCustomType(src, "storage/file")) {
             throw new Error("Source must be a File object.");
           }
-          const format = FORMATS[path2.extname(src.name).substr(1).toLowerCase()];
+          const format = FORMATS[path3.extname(src.name).substr(1).toLowerCase()];
           if (!metadata.sourceFormat && format) {
             body.configuration.load.sourceFormat = format;
           }
@@ -164969,12 +164969,12 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
           const password = request.password ?? "";
           auth = `${username}:${password}`;
         }
-        let path2 = request.path;
+        let path3 = request.path;
         if (queryString) {
-          path2 += `?${queryString}`;
+          path3 += `?${queryString}`;
         }
         if (request.fragment) {
-          path2 += `#${request.fragment}`;
+          path3 += `#${request.fragment}`;
         }
         let hostname = request.hostname ?? "";
         if (hostname[0] === "[" && hostname.endsWith("]")) {
@@ -164986,7 +164986,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
           headers: request.headers,
           host: hostname,
           method: request.method,
-          path: path2,
+          path: path3,
           port: request.port,
           agent,
           auth
@@ -165244,16 +165244,16 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
           reject(err);
         };
         const queryString = querystringBuilder.buildQueryString(query || {});
-        let path2 = request.path;
+        let path3 = request.path;
         if (queryString) {
-          path2 += `?${queryString}`;
+          path3 += `?${queryString}`;
         }
         if (request.fragment) {
-          path2 += `#${request.fragment}`;
+          path3 += `#${request.fragment}`;
         }
         const req = session.request({
           ...request.headers,
-          [http22.constants.HTTP2_HEADER_PATH]: path2,
+          [http22.constants.HTTP2_HEADER_PATH]: path3,
           [http22.constants.HTTP2_HEADER_METHOD]: method
         });
         session.ref();
@@ -165440,13 +165440,13 @@ var require_dist_cjs13 = __commonJS((exports) => {
         abortError.name = "AbortError";
         return Promise.reject(abortError);
       }
-      let path2 = request.path;
+      let path3 = request.path;
       const queryString = querystringBuilder.buildQueryString(request.query || {});
       if (queryString) {
-        path2 += `?${queryString}`;
+        path3 += `?${queryString}`;
       }
       if (request.fragment) {
-        path2 += `#${request.fragment}`;
+        path3 += `#${request.fragment}`;
       }
       let auth = "";
       if (request.username != null || request.password != null) {
@@ -165455,7 +165455,7 @@ var require_dist_cjs13 = __commonJS((exports) => {
         auth = `${username}:${password}@`;
       }
       const { port, method } = request;
-      const url2 = `${request.protocol}//${auth}${request.hostname}${port ? `:${port}` : ""}${path2}`;
+      const url2 = `${request.protocol}//${auth}${request.hostname}${port ? `:${port}` : ""}${path3}`;
       const body = method === "GET" || method === "HEAD" ? undefined : request.body;
       const requestOptions = {
         body,
@@ -167049,13 +167049,13 @@ var require_tslib = __commonJS((exports, module) => {
       }
       return next();
     };
-    __rewriteRelativeImportExtension = function(path2, preserveJsx) {
-      if (typeof path2 === "string" && /^\.\.?\//.test(path2)) {
-        return path2.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
+    __rewriteRelativeImportExtension = function(path3, preserveJsx) {
+      if (typeof path3 === "string" && /^\.\.?\//.test(path3)) {
+        return path3.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
           return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
         });
       }
-      return path2;
+      return path3;
     };
     exporter("__extends", __extends);
     exporter("__assign", __assign);
@@ -167103,11 +167103,11 @@ var require_randomUUID = __commonJS((exports) => {
 
 // ../../node_modules/@smithy/uuid/dist-cjs/index.js
 var require_dist_cjs16 = __commonJS((exports) => {
-  var randomUUID3 = require_randomUUID();
+  var randomUUID2 = require_randomUUID();
   var decimalToHex = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, "0"));
-  var v42 = () => {
-    if (randomUUID3.randomUUID) {
-      return randomUUID3.randomUUID();
+  var v4 = () => {
+    if (randomUUID2.randomUUID) {
+      return randomUUID2.randomUUID();
     }
     const rnds = new Uint8Array(16);
     crypto.getRandomValues(rnds);
@@ -167115,7 +167115,7 @@ var require_dist_cjs16 = __commonJS((exports) => {
     rnds[8] = rnds[8] & 63 | 128;
     return decimalToHex[rnds[0]] + decimalToHex[rnds[1]] + decimalToHex[rnds[2]] + decimalToHex[rnds[3]] + "-" + decimalToHex[rnds[4]] + decimalToHex[rnds[5]] + "-" + decimalToHex[rnds[6]] + decimalToHex[rnds[7]] + "-" + decimalToHex[rnds[8]] + decimalToHex[rnds[9]] + "-" + decimalToHex[rnds[10]] + decimalToHex[rnds[11]] + decimalToHex[rnds[12]] + decimalToHex[rnds[13]] + decimalToHex[rnds[14]] + decimalToHex[rnds[15]];
   };
-  exports.v4 = v42;
+  exports.v4 = v4;
 });
 
 // ../../node_modules/@smithy/core/dist-cjs/submodules/serde/index.js
@@ -168203,11 +168203,11 @@ var require_protocols = __commonJS((exports) => {
         const opTraits = schema.translateTraits(operationSchema.traits);
         if (opTraits.http) {
           request.method = opTraits.http[0];
-          const [path2, search] = opTraits.http[1].split("?");
+          const [path3, search] = opTraits.http[1].split("?");
           if (request.path == "/") {
-            request.path = path2;
+            request.path = path3;
           } else {
-            request.path += path2;
+            request.path += path3;
           }
           const traitSearchParams = new URLSearchParams(search ?? "");
           Object.assign(query, Object.fromEntries(traitSearchParams));
@@ -168559,8 +168559,8 @@ var require_protocols = __commonJS((exports) => {
       return this;
     }
     p(memberName, labelValueProvider, uriLabel, isGreedyLabel) {
-      this.resolvePathStack.push((path2) => {
-        this.path = resolvedPath(path2, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
+      this.resolvePathStack.push((path3) => {
+        this.path = resolvedPath(path3, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
       });
       return this;
     }
@@ -168995,9 +168995,9 @@ var require_dist_cjs17 = __commonJS((exports) => {
       return;
     };
   }
-  var get = (fromObject, path2) => {
+  var get = (fromObject, path3) => {
     let cursor = fromObject;
-    const pathComponents = path2.split(".");
+    const pathComponents = path3.split(".");
     for (const step of pathComponents) {
       if (!cursor || typeof cursor !== "object") {
         return;
@@ -169641,10 +169641,10 @@ ${longDate}
 ${credentialScope}
 ${utilHexEncoding.toHex(hashedRequest)}`;
     }
-    getCanonicalPath({ path: path2 }) {
+    getCanonicalPath({ path: path3 }) {
       if (this.uriEscapePath) {
         const normalizedPathSegments = [];
-        for (const pathSegment of path2.split("/")) {
+        for (const pathSegment of path3.split("/")) {
           if (pathSegment?.length === 0)
             continue;
           if (pathSegment === ".")
@@ -169655,11 +169655,11 @@ ${utilHexEncoding.toHex(hashedRequest)}`;
             normalizedPathSegments.push(pathSegment);
           }
         }
-        const normalizedPath = `${path2?.startsWith("/") ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && path2?.endsWith("/") ? "/" : ""}`;
+        const normalizedPath = `${path3?.startsWith("/") ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && path3?.endsWith("/") ? "/" : ""}`;
         const doubleEncoded = utilUriEscape.escapeUri(normalizedPath);
         return doubleEncoded.replace(/%2F/g, "/");
       }
-      return path2;
+      return path3;
     }
     validateResolvedCredentials(credentials) {
       if (typeof credentials !== "object" || typeof credentials.accessKeyId !== "string" || typeof credentials.secretAccessKey !== "string") {
@@ -170571,14 +170571,14 @@ var require_cbor = __commonJS((exports) => {
       throw new Error("Malformed RPCv2 CBOR response, status: " + response.statusCode);
     }
   };
-  var buildHttpRpcRequest = async (context, headers, path2, resolvedHostname, body) => {
+  var buildHttpRpcRequest = async (context, headers, path3, resolvedHostname, body) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const contents = {
       protocol,
       hostname,
       port,
       method: "POST",
-      path: basePath.endsWith("/") ? basePath.slice(0, -1) + path2 : basePath + path2,
+      path: basePath.endsWith("/") ? basePath.slice(0, -1) + path3 : basePath + path3,
       headers: {
         ...headers
       }
@@ -170806,11 +170806,11 @@ var require_cbor = __commonJS((exports) => {
         } catch (e) {}
       }
       const { service, operation } = utilMiddleware.getSmithyContext(context);
-      const path2 = `/service/${service}/operation/${operation}`;
+      const path3 = `/service/${service}/operation/${operation}`;
       if (request.path.endsWith("/")) {
-        request.path += path2.slice(1);
+        request.path += path3.slice(1);
       } else {
-        request.path += path2;
+        request.path += path3;
       }
       return request;
     }
@@ -177273,18 +177273,18 @@ var require_dist_cjs36 = __commonJS((exports) => {
     }
   }
   var booleanEquals = (value1, value2) => value1 === value2;
-  var getAttrPathList = (path2) => {
-    const parts = path2.split(".");
+  var getAttrPathList = (path3) => {
+    const parts = path3.split(".");
     const pathList = [];
     for (const part of parts) {
       const squareBracketIndex = part.indexOf("[");
       if (squareBracketIndex !== -1) {
         if (part.indexOf("]") !== part.length - 1) {
-          throw new EndpointError(`Path: '${path2}' does not end with ']'`);
+          throw new EndpointError(`Path: '${path3}' does not end with ']'`);
         }
         const arrayIndex = part.slice(squareBracketIndex + 1, -1);
         if (Number.isNaN(parseInt(arrayIndex))) {
-          throw new EndpointError(`Invalid array index: '${arrayIndex}' in path: '${path2}'`);
+          throw new EndpointError(`Invalid array index: '${arrayIndex}' in path: '${path3}'`);
         }
         if (squareBracketIndex !== 0) {
           pathList.push(part.slice(0, squareBracketIndex));
@@ -177296,9 +177296,9 @@ var require_dist_cjs36 = __commonJS((exports) => {
     }
     return pathList;
   };
-  var getAttr = (value, path2) => getAttrPathList(path2).reduce((acc, index) => {
+  var getAttr = (value, path3) => getAttrPathList(path3).reduce((acc, index) => {
     if (typeof acc !== "object") {
-      throw new EndpointError(`Index '${index}' in '${path2}' not found in '${JSON.stringify(value)}'`);
+      throw new EndpointError(`Index '${index}' in '${path3}' not found in '${JSON.stringify(value)}'`);
     } else if (Array.isArray(acc)) {
       return acc[parseInt(index)];
     }
@@ -177317,8 +177317,8 @@ var require_dist_cjs36 = __commonJS((exports) => {
           return value;
         }
         if (typeof value === "object" && "hostname" in value) {
-          const { hostname: hostname2, port, protocol: protocol2 = "", path: path2 = "", query = {} } = value;
-          const url2 = new URL(`${protocol2}//${hostname2}${port ? `:${port}` : ""}${path2}`);
+          const { hostname: hostname2, port, protocol: protocol2 = "", path: path3 = "", query = {} } = value;
+          const url2 = new URL(`${protocol2}//${hostname2}${port ? `:${port}` : ""}${path3}`);
           url2.search = Object.entries(query).map(([k, v]) => `${k}=${v}`).join("&");
           return url2;
         }
@@ -178526,14 +178526,14 @@ var require_readFile = __commonJS((exports) => {
   var promises_1 = __require("node:fs/promises");
   exports.filePromises = {};
   exports.fileIntercept = {};
-  var readFile = (path2, options) => {
-    if (exports.fileIntercept[path2] !== undefined) {
-      return exports.fileIntercept[path2];
+  var readFile = (path3, options) => {
+    if (exports.fileIntercept[path3] !== undefined) {
+      return exports.fileIntercept[path3];
     }
-    if (!exports.filePromises[path2] || options?.ignoreCache) {
-      exports.filePromises[path2] = (0, promises_1.readFile)(path2, "utf8");
+    if (!exports.filePromises[path3] || options?.ignoreCache) {
+      exports.filePromises[path3] = (0, promises_1.readFile)(path3, "utf8");
     }
-    return exports.filePromises[path2];
+    return exports.filePromises[path3];
   };
   exports.readFile = readFile;
 });
@@ -178543,7 +178543,7 @@ var require_dist_cjs44 = __commonJS((exports) => {
   var getHomeDir = require_getHomeDir();
   var getSSOTokenFilepath = require_getSSOTokenFilepath();
   var getSSOTokenFromFile = require_getSSOTokenFromFile();
-  var path2 = __require("path");
+  var path3 = __require("path");
   var types2 = require_dist_cjs();
   var readFile = require_readFile();
   var ENV_PROFILE = "AWS_PROFILE";
@@ -178565,9 +178565,9 @@ var require_dist_cjs44 = __commonJS((exports) => {
     ...data.default && { default: data.default }
   });
   var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-  var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || path2.join(getHomeDir.getHomeDir(), ".aws", "config");
+  var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || path3.join(getHomeDir.getHomeDir(), ".aws", "config");
   var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-  var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || path2.join(getHomeDir.getHomeDir(), ".aws", "credentials");
+  var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || path3.join(getHomeDir.getHomeDir(), ".aws", "credentials");
   var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
   var profileNameBlockList = ["__proto__", "profile __proto__"];
   var parseIni = (iniData) => {
@@ -178622,11 +178622,11 @@ var require_dist_cjs44 = __commonJS((exports) => {
     const relativeHomeDirPrefix = "~/";
     let resolvedFilepath = filepath;
     if (filepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedFilepath = path2.join(homeDir, filepath.slice(2));
+      resolvedFilepath = path3.join(homeDir, filepath.slice(2));
     }
     let resolvedConfigFilepath = configFilepath;
     if (configFilepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedConfigFilepath = path2.join(homeDir, configFilepath.slice(2));
+      resolvedConfigFilepath = path3.join(homeDir, configFilepath.slice(2));
     }
     const parsedFiles = await Promise.all([
       readFile.readFile(resolvedConfigFilepath, {
@@ -178665,8 +178665,8 @@ var require_dist_cjs44 = __commonJS((exports) => {
     getFileRecord() {
       return readFile.fileIntercept;
     },
-    interceptFile(path3, contents) {
-      readFile.fileIntercept[path3] = Promise.resolve(contents);
+    interceptFile(path4, contents) {
+      readFile.fileIntercept[path4] = Promise.resolve(contents);
     },
     getTokenRecord() {
       return getSSOTokenFromFile.tokenIntercept;
@@ -178894,8 +178894,8 @@ var require_dist_cjs46 = __commonJS((exports) => {
             return endpoint.url.href;
           }
           if ("hostname" in endpoint) {
-            const { protocol, hostname, port, path: path2 } = endpoint;
-            return `${protocol}//${hostname}${port ? ":" + port : ""}${path2}`;
+            const { protocol, hostname, port, path: path3 } = endpoint;
+            return `${protocol}//${hostname}${port ? ":" + port : ""}${path3}`;
           }
         }
         return endpoint;
@@ -196989,26 +196989,26 @@ var require_utils74 = __commonJS((exports, module) => {
     }
     mkdirSync(folder);
   };
-  Utils.prototype.writeFileTo = function(path3, content, overwrite, attr) {
+  Utils.prototype.writeFileTo = function(path4, content, overwrite, attr) {
     const self2 = this;
-    if (self2.fs.existsSync(path3)) {
+    if (self2.fs.existsSync(path4)) {
       if (!overwrite)
         return false;
-      var stat4 = self2.fs.statSync(path3);
+      var stat4 = self2.fs.statSync(path4);
       if (stat4.isDirectory()) {
         return false;
       }
     }
-    var folder = pth.dirname(path3);
+    var folder = pth.dirname(path4);
     if (!self2.fs.existsSync(folder)) {
       self2.makeDir(folder);
     }
     var fd;
     try {
-      fd = self2.fs.openSync(path3, "w", 438);
+      fd = self2.fs.openSync(path4, "w", 438);
     } catch (e) {
-      self2.fs.chmodSync(path3, 438);
-      fd = self2.fs.openSync(path3, "w", 438);
+      self2.fs.chmodSync(path4, 438);
+      fd = self2.fs.openSync(path4, "w", 438);
     }
     if (fd) {
       try {
@@ -197017,33 +197017,33 @@ var require_utils74 = __commonJS((exports, module) => {
         self2.fs.closeSync(fd);
       }
     }
-    self2.fs.chmodSync(path3, attr || 438);
+    self2.fs.chmodSync(path4, attr || 438);
     return true;
   };
-  Utils.prototype.writeFileToAsync = function(path3, content, overwrite, attr, callback) {
+  Utils.prototype.writeFileToAsync = function(path4, content, overwrite, attr, callback) {
     if (typeof attr === "function") {
       callback = attr;
       attr = undefined;
     }
     const self2 = this;
-    self2.fs.exists(path3, function(exist) {
+    self2.fs.exists(path4, function(exist) {
       if (exist && !overwrite)
         return callback(false);
-      self2.fs.stat(path3, function(err, stat4) {
+      self2.fs.stat(path4, function(err, stat4) {
         if (exist && stat4.isDirectory()) {
           return callback(false);
         }
-        var folder = pth.dirname(path3);
+        var folder = pth.dirname(path4);
         self2.fs.exists(folder, function(exists) {
           if (!exists)
             self2.makeDir(folder);
-          self2.fs.open(path3, "w", 438, function(err2, fd) {
+          self2.fs.open(path4, "w", 438, function(err2, fd) {
             if (err2) {
-              self2.fs.chmod(path3, 438, function() {
-                self2.fs.open(path3, "w", 438, function(err3, fd2) {
+              self2.fs.chmod(path4, 438, function() {
+                self2.fs.open(path4, "w", 438, function(err3, fd2) {
                   self2.fs.write(fd2, content, 0, content.length, 0, function() {
                     self2.fs.close(fd2, function() {
-                      self2.fs.chmod(path3, attr || 438, function() {
+                      self2.fs.chmod(path4, attr || 438, function() {
                         callback(true);
                       });
                     });
@@ -197053,13 +197053,13 @@ var require_utils74 = __commonJS((exports, module) => {
             } else if (fd) {
               self2.fs.write(fd, content, 0, content.length, 0, function() {
                 self2.fs.close(fd, function() {
-                  self2.fs.chmod(path3, attr || 438, function() {
+                  self2.fs.chmod(path4, attr || 438, function() {
                     callback(true);
                   });
                 });
               });
             } else {
-              self2.fs.chmod(path3, attr || 438, function() {
+              self2.fs.chmod(path4, attr || 438, function() {
                 callback(true);
               });
             }
@@ -197068,7 +197068,7 @@ var require_utils74 = __commonJS((exports, module) => {
       });
     });
   };
-  Utils.prototype.findFiles = function(path3) {
+  Utils.prototype.findFiles = function(path4) {
     const self2 = this;
     function findSync(dir, pattern, recursive) {
       if (typeof pattern === "boolean") {
@@ -197077,17 +197077,17 @@ var require_utils74 = __commonJS((exports, module) => {
       }
       let files = [];
       self2.fs.readdirSync(dir).forEach(function(file) {
-        const path4 = pth.join(dir, file);
-        const stat4 = self2.fs.statSync(path4);
-        if (!pattern || pattern.test(path4)) {
-          files.push(pth.normalize(path4) + (stat4.isDirectory() ? self2.sep : ""));
+        const path5 = pth.join(dir, file);
+        const stat4 = self2.fs.statSync(path5);
+        if (!pattern || pattern.test(path5)) {
+          files.push(pth.normalize(path5) + (stat4.isDirectory() ? self2.sep : ""));
         }
         if (stat4.isDirectory() && recursive)
-          files = files.concat(findSync(path4, pattern, recursive));
+          files = files.concat(findSync(path5, pattern, recursive));
       });
       return files;
     }
-    return findSync(path3, undefined, true);
+    return findSync(path4, undefined, true);
   };
   Utils.prototype.findFilesAsync = function(dir, cb) {
     const self2 = this;
@@ -197147,16 +197147,16 @@ var require_utils74 = __commonJS((exports, module) => {
         return "UNSUPPORTED (" + method + ")";
     }
   };
-  Utils.canonical = function(path3) {
-    if (!path3)
+  Utils.canonical = function(path4) {
+    if (!path4)
       return "";
-    const safeSuffix = pth.posix.normalize("/" + path3.split("\\").join("/"));
+    const safeSuffix = pth.posix.normalize("/" + path4.split("\\").join("/"));
     return pth.join(".", safeSuffix);
   };
-  Utils.zipnamefix = function(path3) {
-    if (!path3)
+  Utils.zipnamefix = function(path4) {
+    if (!path4)
       return "";
-    const safeSuffix = pth.posix.normalize("/" + path3.split("\\").join("/"));
+    const safeSuffix = pth.posix.normalize("/" + path4.split("\\").join("/"));
     return pth.posix.join(".", safeSuffix);
   };
   Utils.findLast = function(arr, callback) {
@@ -197174,9 +197174,9 @@ var require_utils74 = __commonJS((exports, module) => {
     prefix = pth.resolve(pth.normalize(prefix));
     var parts = name.split("/");
     for (var i = 0, l = parts.length;i < l; i++) {
-      var path3 = pth.normalize(pth.join(prefix, parts.slice(i, l).join(pth.sep)));
-      if (path3.indexOf(prefix) === 0) {
-        return path3;
+      var path4 = pth.normalize(pth.join(prefix, parts.slice(i, l).join(pth.sep)));
+      if (path4.indexOf(prefix) === 0) {
+        return path4;
       }
     }
     return pth.normalize(pth.join(prefix, pth.basename(name)));
@@ -197214,8 +197214,8 @@ var require_utils74 = __commonJS((exports, module) => {
 // ../../node_modules/adm-zip/util/fattr.js
 var require_fattr = __commonJS((exports, module) => {
   var pth = __require("path");
-  module.exports = function(path3, { fs: fs2 }) {
-    var _path = path3 || "", _obj = newAttr(), _stat = null;
+  module.exports = function(path4, { fs: fs2 }) {
+    var _path = path4 || "", _obj = newAttr(), _stat = null;
     function newAttr() {
       return {
         directory: false,
@@ -197722,7 +197722,7 @@ var require_inflater = __commonJS((exports, module) => {
 
 // ../../node_modules/adm-zip/methods/zipcrypto.js
 var require_zipcrypto = __commonJS((exports, module) => {
-  var { randomFillSync: randomFillSync2 } = __require("crypto");
+  var { randomFillSync } = __require("crypto");
   var Errors = require_errors6();
   var crctable = new Uint32Array(256).map((t, crc) => {
     for (let j = 0;j < 8; j++) {
@@ -197739,8 +197739,8 @@ var require_zipcrypto = __commonJS((exports, module) => {
     return crctable[(pCrc32 ^ bval) & 255] ^ pCrc32 >>> 8;
   };
   var genSalt = () => {
-    if (typeof randomFillSync2 === "function") {
-      return randomFillSync2(Buffer.alloc(12));
+    if (typeof randomFillSync === "function") {
+      return randomFillSync(Buffer.alloc(12));
     } else {
       return genSalt.node();
     }
@@ -199074,10 +199074,10 @@ var require_src122 = __commonJS((exports) => {
   var fs_1 = __require("fs");
   var debug_1 = __importDefault(require_src5());
   var log = debug_1.default("@kwsites/file-exists");
-  function check(path3, isFile2, isDirectory) {
-    log(`checking %s`, path3);
+  function check(path4, isFile2, isDirectory) {
+    log(`checking %s`, path4);
     try {
-      const stat4 = fs_1.statSync(path3);
+      const stat4 = fs_1.statSync(path4);
       if (stat4.isFile() && isFile2) {
         log(`[OK] path represents a file`);
         return true;
@@ -199097,8 +199097,8 @@ var require_src122 = __commonJS((exports) => {
       throw e;
     }
   }
-  function exists(path3, type = exports.READABLE) {
-    return check(path3, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
+  function exists(path4, type = exports.READABLE) {
+    return check(path4, (type & exports.FILE) > 0, (type & exports.FOLDER) > 0);
   }
   exports.exists = exists;
   exports.FILE = 1;
@@ -199378,14 +199378,14 @@ var require_brace_expansion = __commonJS((exports, module) => {
 var require_minimatch = __commonJS((exports, module) => {
   module.exports = minimatch;
   minimatch.Minimatch = Minimatch;
-  var path5 = function() {
+  var path6 = function() {
     try {
       return __require("path");
     } catch (e) {}
   }() || {
     sep: "/"
   };
-  minimatch.sep = path5.sep;
+  minimatch.sep = path6.sep;
   var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
   var expand = require_brace_expansion();
   var plTypes = {
@@ -199476,8 +199476,8 @@ var require_minimatch = __commonJS((exports, module) => {
     if (!options)
       options = {};
     pattern = pattern.trim();
-    if (!options.allowWindowsEscape && path5.sep !== "/") {
-      pattern = pattern.split(path5.sep).join("/");
+    if (!options.allowWindowsEscape && path6.sep !== "/") {
+      pattern = pattern.split(path6.sep).join("/");
     }
     this.options = options;
     this.set = [];
@@ -199854,8 +199854,8 @@ var require_minimatch = __commonJS((exports, module) => {
     if (f === "/" && partial)
       return true;
     var options = this.options;
-    if (path5.sep !== "/") {
-      f = f.split(path5.sep).join("/");
+    if (path6.sep !== "/") {
+      f = f.split(path6.sep).join("/");
     }
     f = f.split(slashSplit);
     this.debug(this.pattern, "split", f);
@@ -199966,9 +199966,9 @@ var require_recursive_readdir = __commonJS((exports, module) => {
   var p = __require("path");
   var minimatch = require_minimatch();
   function patternMatcher(pattern) {
-    return function(path5, stats) {
+    return function(path6, stats) {
       var minimatcher = new minimatch.Minimatch(pattern, { matchBase: true });
-      return (!minimatcher.negate || stats.isFile()) && minimatcher.match(path5);
+      return (!minimatcher.negate || stats.isFile()) && minimatcher.match(path6);
     };
   }
   function toMatcherFunction(ignoreEntry) {
@@ -199978,14 +199978,14 @@ var require_recursive_readdir = __commonJS((exports, module) => {
       return patternMatcher(ignoreEntry);
     }
   }
-  function readdir3(path5, ignores, callback) {
+  function readdir3(path6, ignores, callback) {
     if (typeof ignores == "function") {
       callback = ignores;
       ignores = [];
     }
     if (!callback) {
       return new Promise(function(resolve3, reject) {
-        readdir3(path5, ignores || [], function(err, data) {
+        readdir3(path6, ignores || [], function(err, data) {
           if (err) {
             reject(err);
           } else {
@@ -199996,7 +199996,7 @@ var require_recursive_readdir = __commonJS((exports, module) => {
     }
     ignores = ignores.map(toMatcherFunction);
     var list = [];
-    fs4.readdir(path5, function(err, files) {
+    fs4.readdir(path6, function(err, files) {
       if (err) {
         return callback(err);
       }
@@ -200005,7 +200005,7 @@ var require_recursive_readdir = __commonJS((exports, module) => {
         return callback(null, list);
       }
       files.forEach(function(file) {
-        var filePath = p.join(path5, file);
+        var filePath = p.join(path6, file);
         fs4.stat(filePath, function(_err, stats) {
           if (_err) {
             return callback(_err);
@@ -200851,8 +200851,8 @@ var require_uri_all = __commonJS((exports, module) => {
           wsComponents.secure = undefined;
         }
         if (wsComponents.resourceName) {
-          var _wsComponents$resourc = wsComponents.resourceName.split("?"), _wsComponents$resourc2 = slicedToArray(_wsComponents$resourc, 2), path10 = _wsComponents$resourc2[0], query = _wsComponents$resourc2[1];
-          wsComponents.path = path10 && path10 !== "/" ? path10 : undefined;
+          var _wsComponents$resourc = wsComponents.resourceName.split("?"), _wsComponents$resourc2 = slicedToArray(_wsComponents$resourc, 2), path11 = _wsComponents$resourc2[0], query = _wsComponents$resourc2[1];
+          wsComponents.path = path11 && path11 !== "/" ? path11 : undefined;
           wsComponents.query = query;
           wsComponents.resourceName = undefined;
         }
@@ -201245,12 +201245,12 @@ var require_util13 = __commonJS((exports, module) => {
     return "'" + escapeQuotes(str) + "'";
   }
   function getPathExpr(currentPath, expr, jsonPointers, isNumber2) {
-    var path10 = jsonPointers ? "'/' + " + expr + (isNumber2 ? "" : ".replace(/~/g, '~0').replace(/\\//g, '~1')") : isNumber2 ? "'[' + " + expr + " + ']'" : "'[\\'' + " + expr + " + '\\']'";
-    return joinPaths(currentPath, path10);
+    var path11 = jsonPointers ? "'/' + " + expr + (isNumber2 ? "" : ".replace(/~/g, '~0').replace(/\\//g, '~1')") : isNumber2 ? "'[' + " + expr + " + ']'" : "'[\\'' + " + expr + " + '\\']'";
+    return joinPaths(currentPath, path11);
   }
   function getPath(currentPath, prop, jsonPointers) {
-    var path10 = jsonPointers ? toQuotedString("/" + escapeJsonPointer(prop)) : toQuotedString(getProperty(prop));
-    return joinPaths(currentPath, path10);
+    var path11 = jsonPointers ? toQuotedString("/" + escapeJsonPointer(prop)) : toQuotedString(getProperty(prop));
+    return joinPaths(currentPath, path11);
   }
   var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
   var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
@@ -207304,11 +207304,11 @@ var require_ast = __commonJS((exports, module) => {
       helperExpression: function helperExpression(node) {
         return node.type === "SubExpression" || (node.type === "MustacheStatement" || node.type === "BlockStatement") && !!(node.params && node.params.length || node.hash);
       },
-      scopedId: function scopedId(path10) {
-        return /^\.|this\b/.test(path10.original);
+      scopedId: function scopedId(path11) {
+        return /^\.|this\b/.test(path11.original);
       },
-      simpleId: function simpleId(path10) {
-        return path10.parts.length === 1 && !AST.helpers.scopedId(path10) && !path10.depth;
+      simpleId: function simpleId(path11) {
+        return path11.parts.length === 1 && !AST.helpers.scopedId(path11) && !path11.depth;
       }
     }
   };
@@ -208368,12 +208368,12 @@ var require_helpers3 = __commonJS((exports) => {
       loc
     };
   }
-  function prepareMustache(path10, params, hash, open2, strip, locInfo) {
+  function prepareMustache(path11, params, hash, open2, strip, locInfo) {
     var escapeFlag = open2.charAt(3) || open2.charAt(2), escaped = escapeFlag !== "{" && escapeFlag !== "&";
     var decorator = /\*/.test(open2);
     return {
       type: decorator ? "Decorator" : "MustacheStatement",
-      path: path10,
+      path: path11,
       params,
       hash,
       escaped,
@@ -208637,9 +208637,9 @@ var require_compiler = __commonJS((exports) => {
     },
     DecoratorBlock: function DecoratorBlock(decorator) {
       var program = decorator.program && this.compileProgram(decorator.program);
-      var params = this.setupFullMustacheParams(decorator, program, undefined), path10 = decorator.path;
+      var params = this.setupFullMustacheParams(decorator, program, undefined), path11 = decorator.path;
       this.useDecorators = true;
-      this.opcode("registerDecorator", params.length, path10.original);
+      this.opcode("registerDecorator", params.length, path11.original);
     },
     PartialStatement: function PartialStatement(partial) {
       this.usePartial = true;
@@ -208702,46 +208702,46 @@ var require_compiler = __commonJS((exports) => {
       }
     },
     ambiguousSexpr: function ambiguousSexpr(sexpr, program, inverse) {
-      var path10 = sexpr.path, name = path10.parts[0], isBlock = program != null || inverse != null;
-      this.opcode("getContext", path10.depth);
+      var path11 = sexpr.path, name = path11.parts[0], isBlock = program != null || inverse != null;
+      this.opcode("getContext", path11.depth);
       this.opcode("pushProgram", program);
       this.opcode("pushProgram", inverse);
-      path10.strict = true;
-      this.accept(path10);
+      path11.strict = true;
+      this.accept(path11);
       this.opcode("invokeAmbiguous", name, isBlock);
     },
     simpleSexpr: function simpleSexpr(sexpr) {
-      var path10 = sexpr.path;
-      path10.strict = true;
-      this.accept(path10);
+      var path11 = sexpr.path;
+      path11.strict = true;
+      this.accept(path11);
       this.opcode("resolvePossibleLambda");
     },
     helperSexpr: function helperSexpr(sexpr, program, inverse) {
-      var params = this.setupFullMustacheParams(sexpr, program, inverse), path10 = sexpr.path, name = path10.parts[0];
+      var params = this.setupFullMustacheParams(sexpr, program, inverse), path11 = sexpr.path, name = path11.parts[0];
       if (this.options.knownHelpers[name]) {
         this.opcode("invokeKnownHelper", params.length, name);
       } else if (this.options.knownHelpersOnly) {
         throw new _exception2["default"]("You specified knownHelpersOnly, but used the unknown helper " + name, sexpr);
       } else {
-        path10.strict = true;
-        path10.falsy = true;
-        this.accept(path10);
-        this.opcode("invokeHelper", params.length, path10.original, _ast2["default"].helpers.simpleId(path10));
+        path11.strict = true;
+        path11.falsy = true;
+        this.accept(path11);
+        this.opcode("invokeHelper", params.length, path11.original, _ast2["default"].helpers.simpleId(path11));
       }
     },
-    PathExpression: function PathExpression(path10) {
-      this.addDepth(path10.depth);
-      this.opcode("getContext", path10.depth);
-      var name = path10.parts[0], scoped = _ast2["default"].helpers.scopedId(path10), blockParamId = !path10.depth && !scoped && this.blockParamIndex(name);
+    PathExpression: function PathExpression(path11) {
+      this.addDepth(path11.depth);
+      this.opcode("getContext", path11.depth);
+      var name = path11.parts[0], scoped = _ast2["default"].helpers.scopedId(path11), blockParamId = !path11.depth && !scoped && this.blockParamIndex(name);
       if (blockParamId) {
-        this.opcode("lookupBlockParam", blockParamId, path10.parts);
+        this.opcode("lookupBlockParam", blockParamId, path11.parts);
       } else if (!name) {
         this.opcode("pushContext");
-      } else if (path10.data) {
+      } else if (path11.data) {
         this.options.data = true;
-        this.opcode("lookupData", path10.depth, path10.parts, path10.strict);
+        this.opcode("lookupData", path11.depth, path11.parts, path11.strict);
       } else {
-        this.opcode("lookupOnContext", path10.parts, path10.falsy, path10.strict, scoped);
+        this.opcode("lookupOnContext", path11.parts, path11.falsy, path11.strict, scoped);
       }
     },
     StringLiteral: function StringLiteral(string2) {
@@ -209085,16 +209085,16 @@ var require_util14 = __commonJS((exports) => {
   }
   exports.urlGenerate = urlGenerate;
   function normalize2(aPath) {
-    var path10 = aPath;
+    var path11 = aPath;
     var url2 = urlParse(aPath);
     if (url2) {
       if (!url2.path) {
         return aPath;
       }
-      path10 = url2.path;
+      path11 = url2.path;
     }
-    var isAbsolute3 = exports.isAbsolute(path10);
-    var parts = path10.split(/\/+/);
+    var isAbsolute3 = exports.isAbsolute(path11);
+    var parts = path11.split(/\/+/);
     for (var part, up = 0, i = parts.length - 1;i >= 0; i--) {
       part = parts[i];
       if (part === ".") {
@@ -209111,15 +209111,15 @@ var require_util14 = __commonJS((exports) => {
         }
       }
     }
-    path10 = parts.join("/");
-    if (path10 === "") {
-      path10 = isAbsolute3 ? "/" : ".";
+    path11 = parts.join("/");
+    if (path11 === "") {
+      path11 = isAbsolute3 ? "/" : ".";
     }
     if (url2) {
-      url2.path = path10;
+      url2.path = path11;
       return urlGenerate(url2);
     }
-    return path10;
+    return path11;
   }
   exports.normalize = normalize2;
   function join9(aRoot, aPath) {
@@ -211676,8 +211676,8 @@ var require_printer = __commonJS((exports) => {
     return this.accept(sexpr.path) + " " + params + hash;
   };
   PrintVisitor.prototype.PathExpression = function(id) {
-    var path10 = id.parts.join("/");
-    return (id.data ? "@" : "") + "PATH:" + path10;
+    var path11 = id.parts.join("/");
+    return (id.data ? "@" : "") + "PATH:" + path11;
   };
   PrintVisitor.prototype.StringLiteral = function(string2) {
     return '"' + string2.value + '"';
@@ -216946,8 +216946,8 @@ var import_cors = __toESM(require_lib7(), 1);
 var import_express = __toESM(require_express(), 1);
 var import_http_proxy_middleware = __toESM(require_dist4(), 1);
 import * as http2 from "http";
-import * as path10 from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import * as path11 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/controller/compile.controller.ts
 class CompileController {
@@ -217095,12 +217095,20 @@ class InvalidStateTransitionError extends Error {
 }
 
 // src/service/connection.ts
-import { BigQueryConnection } from "@malloydata/db-bigquery";
+import"@malloydata/db-bigquery";
 import { DuckDBConnection } from "@malloydata/db-duckdb";
-import { MySQLConnection } from "@malloydata/db-mysql";
-import { PostgresConnection } from "@malloydata/db-postgres";
-import { SnowflakeConnection } from "@malloydata/db-snowflake";
-import { TrinoConnection } from "@malloydata/db-trino";
+import"@malloydata/db-duckdb/native";
+import"@malloydata/db-mysql";
+import"@malloydata/db-postgres";
+import {
+  buildPoolOptions,
+  SnowflakeConnection
+} from "@malloydata/db-snowflake";
+import"@malloydata/db-trino";
+import {
+  contextOverlay,
+  MalloyConfig
+} from "@malloydata/malloy";
 
 // ../../node_modules/axios/lib/helpers/bind.js
 function bind(fn, thisArg) {
@@ -220369,90 +220377,354 @@ var {
 
 // src/service/connection.ts
 import fs from "fs/promises";
-import path from "path";
-// ../../node_modules/uuid/dist/esm/native.js
-import { randomUUID as randomUUID2 } from "crypto";
-var native_default = { randomUUID: randomUUID2 };
+import path2 from "path";
 
-// ../../node_modules/uuid/dist/esm/rng.js
-import { randomFillSync } from "crypto";
-var rnds8Pool = new Uint8Array(256);
-var poolPtr = rnds8Pool.length;
-function rng() {
-  if (poolPtr > rnds8Pool.length - 16) {
-    randomFillSync(rnds8Pool);
-    poolPtr = 0;
+// src/service/connection_config.ts
+import path from "path";
+var PUBLISHER_DUCKDB_API_FIELDS = new Set(["attachedDatabases"]);
+function normalizeSnowflakePrivateKey(privateKey) {
+  let privateKeyContent = privateKey.trim();
+  if (!privateKeyContent.includes(`
+`)) {
+    const keyPatterns = [
+      {
+        beginRegex: /-----BEGIN\s+ENCRYPTED\s+PRIVATE\s+KEY-----/i,
+        endRegex: /-----END\s+ENCRYPTED\s+PRIVATE\s+KEY-----/i,
+        beginMarker: "-----BEGIN ENCRYPTED PRIVATE KEY-----",
+        endMarker: "-----END ENCRYPTED PRIVATE KEY-----"
+      },
+      {
+        beginRegex: /-----BEGIN\s+PRIVATE\s+KEY-----/i,
+        endRegex: /-----END\s+PRIVATE\s+KEY-----/i,
+        beginMarker: "-----BEGIN PRIVATE KEY-----",
+        endMarker: "-----END PRIVATE KEY-----"
+      }
+    ];
+    for (const pattern of keyPatterns) {
+      const beginMatch = privateKeyContent.match(pattern.beginRegex);
+      const endMatch = privateKeyContent.match(pattern.endRegex);
+      if (beginMatch && endMatch) {
+        const beginPos = beginMatch.index + beginMatch[0].length;
+        const endPos = endMatch.index;
+        const keyData = privateKeyContent.substring(beginPos, endPos).replace(/\s+/g, "");
+        const lines = [];
+        for (let i = 0;i < keyData.length; i += 64) {
+          lines.push(keyData.slice(i, i + 64));
+        }
+        privateKeyContent = `${pattern.beginMarker}
+${lines.join(`
+`)}
+${pattern.endMarker}
+`;
+        break;
+      }
+    }
+  } else if (!privateKeyContent.endsWith(`
+`)) {
+    privateKeyContent += `
+`;
   }
-  return rnds8Pool.slice(poolPtr, poolPtr += 16);
+  return privateKeyContent;
 }
-
-// ../../node_modules/uuid/dist/esm/stringify.js
-var byteToHex = [];
-for (let i = 0;i < 256; ++i) {
-  byteToHex.push((i + 256).toString(16).slice(1));
+function validateDuckdbApiSurface(connection) {
+  if (connection.type !== "duckdb" || !connection.duckdbConnection)
+    return;
+  const unsupportedFields = Object.keys(connection.duckdbConnection).filter((field) => !PUBLISHER_DUCKDB_API_FIELDS.has(field) && connection.duckdbConnection[field] !== undefined);
+  if (unsupportedFields.length > 0) {
+    throw new Error(`Unsupported DuckDB connection field(s): ${unsupportedFields.join(", ")}. Publisher only supports attachedDatabases for project-authored DuckDB connections.`);
+  }
 }
-function unsafeStringify(arr, offset = 0) {
-  return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+function cloneApiConnection(connection) {
+  return { ...connection };
 }
-
-// ../../node_modules/uuid/dist/esm/v4.js
-function v4(options, buf, offset) {
-  if (native_default.randomUUID && !buf && !options) {
-    return native_default.randomUUID();
+function getStaticConnectionAttributes(type) {
+  switch (type) {
+    case "postgres":
+      return {
+        dialectName: "postgres",
+        isPool: false,
+        canPersist: true,
+        canStream: true
+      };
+    case "bigquery":
+      return {
+        dialectName: "standardsql",
+        isPool: false,
+        canPersist: true,
+        canStream: true
+      };
+    case "snowflake":
+      return {
+        dialectName: "snowflake",
+        isPool: true,
+        canPersist: true,
+        canStream: true
+      };
+    case "trino":
+      return {
+        dialectName: "trino",
+        isPool: false,
+        canPersist: true,
+        canStream: false
+      };
+    case "mysql":
+      return {
+        dialectName: "mysql",
+        isPool: false,
+        canPersist: true,
+        canStream: false
+      };
+    case "duckdb":
+    case "motherduck":
+    case "ducklake":
+      return {
+        dialectName: "duckdb",
+        isPool: false,
+        canPersist: true,
+        canStream: true
+      };
+    default:
+      return;
   }
-  options = options || {};
-  const rnds = options.random ?? options.rng?.() ?? rng();
-  if (rnds.length < 16) {
-    throw new Error("Random bytes length must be >= 16");
+}
+function parseServiceAccountKey(json) {
+  if (!json)
+    return;
+  const keyData = JSON.parse(json);
+  const requiredFields = ["type", "project_id", "private_key", "client_email"];
+  for (const field of requiredFields) {
+    if (!keyData[field]) {
+      throw new Error(`Invalid service account key: missing "${field}" field`);
+    }
+  }
+  if (keyData.type !== "service_account") {
+    throw new Error('Invalid service account key: incorrect "type" field');
+  }
+  return keyData;
+}
+function buildPostgresConnectionString(config) {
+  if (config.connectionString || !process.env.PGSSLMODE) {
+    return config.connectionString;
   }
-  rnds[6] = rnds[6] & 15 | 64;
-  rnds[8] = rnds[8] & 63 | 128;
-  if (buf) {
-    offset = offset || 0;
-    if (offset < 0 || offset + 16 > buf.length) {
-      throw new RangeError(`UUID byte range ${offset}:${offset + 15} is out of buffer bounds`);
+  const params = new URLSearchParams;
+  params.set("sslmode", process.env.PGSSLMODE);
+  const auth = config.userName && config.password ? `${encodeURIComponent(config.userName)}:${encodeURIComponent(config.password)}@` : config.userName ? `${encodeURIComponent(config.userName)}@` : "";
+  const host = config.host ?? "localhost";
+  const port = config.port ? `:${config.port}` : "";
+  const database = config.databaseName ? `/${encodeURIComponent(config.databaseName)}` : "";
+  return `postgresql://${auth}${host}${port}${database}?${params.toString()}`;
+}
+function buildDuckdbEntry(name, projectPath, databaseFilename = `${name}.duckdb`) {
+  return {
+    is: "duckdb",
+    databasePath: path.join(projectPath, databaseFilename)
+  };
+}
+function validateConnectionShape(connection) {
+  switch (connection.type) {
+    case "postgres":
+    case "mysql":
+    case "bigquery":
+      break;
+    case "duckdb":
+      if (!connection.duckdbConnection) {
+        throw new Error("DuckDB connection configuration is missing.");
+      }
+      break;
+    case "motherduck":
+      if (!connection.motherduckConnection) {
+        throw new Error("MotherDuck connection configuration is missing.");
+      }
+      if (!connection.motherduckConnection.accessToken) {
+        throw new Error("MotherDuck access token is required.");
+      }
+      break;
+    case "trino":
+      if (!connection.trinoConnection) {
+        throw new Error("Trino connection configuration is missing.");
+      }
+      break;
+    case "snowflake": {
+      const snowflakeConnection = connection.snowflakeConnection;
+      if (!snowflakeConnection) {
+        throw new Error("Snowflake connection configuration is missing.");
+      }
+      if (!snowflakeConnection.account) {
+        throw new Error("Snowflake account is required.");
+      }
+      if (!snowflakeConnection.username) {
+        throw new Error("Snowflake username is required.");
+      }
+      if (!snowflakeConnection.password && !snowflakeConnection.privateKey) {
+        throw new Error("Snowflake password or private key or private key path is required.");
+      }
+      if (!snowflakeConnection.warehouse) {
+        throw new Error("Snowflake warehouse is required.");
+      }
+      break;
     }
-    for (let i = 0;i < 16; ++i) {
-      buf[offset + i] = rnds[i];
+  }
+}
+function assembleProjectConnections(connections = [], projectPath = "") {
+  const pojo = { connections: {} };
+  const metadata = new Map;
+  const apiConnections = [];
+  const processedConnections = new Set;
+  for (const connection of connections) {
+    if (!connection.name) {
+      throw new Error("Invalid connection configuration. No name.");
     }
-    return buf;
+    if (processedConnections.has(connection.name)) {
+      continue;
+    }
+    if (connection.name === "duckdb") {
+      throw new Error("DuckDB connection name cannot be 'duckdb'; it is reserved for Publisher package sandboxes.");
+    }
+    processedConnections.add(connection.name);
+    validateDuckdbApiSurface(connection);
+    validateConnectionShape(connection);
+    const apiConnection = cloneApiConnection(connection);
+    apiConnection.attributes = getStaticConnectionAttributes(connection.type);
+    const attachedDatabases = connection.duckdbConnection?.attachedDatabases ?? [];
+    const isDuckLake = connection.type === "ducklake";
+    const isDuckdb = connection.type === "duckdb";
+    const databasePath = isDuckLake ? path.join(projectPath, `${connection.name}_ducklake.duckdb`) : isDuckdb ? path.join(projectPath, `${connection.name}.duckdb`) : undefined;
+    metadata.set(connection.name, {
+      apiConnection,
+      attachedDatabases,
+      hasAzureAttachment: attachedDatabases.some((database) => database.type === "azure"),
+      hasSnowflakePrivateKey: connection.type === "snowflake" && !!connection.snowflakeConnection?.privateKey,
+      isDuckLake,
+      databasePath,
+      workingDirectory: projectPath
+    });
+    switch (connection.type) {
+      case "postgres": {
+        const postgresConnection = connection.postgresConnection;
+        pojo.connections[connection.name] = {
+          is: "postgres",
+          host: postgresConnection?.host,
+          port: postgresConnection?.port,
+          username: postgresConnection?.userName,
+          password: postgresConnection?.password,
+          databaseName: postgresConnection?.databaseName,
+          connectionString: postgresConnection ? buildPostgresConnectionString(postgresConnection) : undefined
+        };
+        break;
+      }
+      case "mysql": {
+        pojo.connections[connection.name] = {
+          is: "mysql",
+          host: connection.mysqlConnection?.host,
+          port: connection.mysqlConnection?.port,
+          user: connection.mysqlConnection?.user,
+          password: connection.mysqlConnection?.password,
+          database: connection.mysqlConnection?.database
+        };
+        break;
+      }
+      case "bigquery": {
+        const serviceAccountKey = parseServiceAccountKey(connection.bigqueryConnection?.serviceAccountKeyJson);
+        pojo.connections[connection.name] = {
+          is: "bigquery",
+          projectId: connection.bigqueryConnection?.defaultProjectId ?? serviceAccountKey?.project_id,
+          serviceAccountKey,
+          location: connection.bigqueryConnection?.location,
+          maximumBytesBilled: connection.bigqueryConnection?.maximumBytesBilled,
+          timeoutMs: connection.bigqueryConnection?.queryTimeoutMilliseconds,
+          billingProjectId: connection.bigqueryConnection?.billingProjectId
+        };
+        break;
+      }
+      case "snowflake": {
+        pojo.connections[connection.name] = {
+          is: "snowflake",
+          account: connection.snowflakeConnection?.account,
+          username: connection.snowflakeConnection?.username,
+          password: connection.snowflakeConnection?.password,
+          privateKey: connection.snowflakeConnection?.privateKey ? normalizeSnowflakePrivateKey(connection.snowflakeConnection.privateKey) : undefined,
+          privateKeyPass: connection.snowflakeConnection?.privateKeyPass,
+          warehouse: connection.snowflakeConnection?.warehouse,
+          database: connection.snowflakeConnection?.database,
+          schema: connection.snowflakeConnection?.schema,
+          role: connection.snowflakeConnection?.role,
+          timeoutMs: connection.snowflakeConnection?.responseTimeoutMilliseconds,
+          poolMin: 1,
+          poolMax: 20
+        };
+        break;
+      }
+      case "trino": {
+        pojo.connections[connection.name] = {
+          is: "trino",
+          ...validateAndBuildTrinoCoreConfig(connection.trinoConnection)
+        };
+        break;
+      }
+      case "duckdb": {
+        if (attachedDatabases.some((database) => database.name === connection.name)) {
+          throw new Error(`DuckDB attached database names cannot conflict with connection name ${connection.name}`);
+        }
+        pojo.connections[connection.name] = buildDuckdbEntry(connection.name, projectPath, `${connection.name}.duckdb`);
+        break;
+      }
+      case "motherduck": {
+        if (!connection.motherduckConnection?.accessToken) {
+          throw new Error("MotherDuck access token is required.");
+        }
+        pojo.connections[connection.name] = {
+          is: "duckdb",
+          databasePath: connection.motherduckConnection.database ? `md:${connection.motherduckConnection.database}?attach_mode=single` : "md:",
+          motherDuckToken: connection.motherduckConnection.accessToken
+        };
+        break;
+      }
+      case "ducklake": {
+        if (!connection.ducklakeConnection) {
+          throw new Error("DuckLake connection configuration is missing.");
+        }
+        if (!connection.ducklakeConnection.catalog?.postgresConnection) {
+          throw new Error(`PostgreSQL connection configuration is required for DuckLake catalog: ${connection.name}`);
+        }
+        pojo.connections[connection.name] = buildDuckdbEntry(connection.name, projectPath, `${connection.name}_ducklake.duckdb`);
+        break;
+      }
+      default: {
+        throw new Error(`Unsupported connection type: ${connection.type}`);
+      }
+    }
+    apiConnections.push(apiConnection);
   }
-  return unsafeStringify(rnds);
+  return { pojo, metadata, apiConnections };
 }
-var v4_default = v4;
-// src/service/connection.ts
-function validateAndBuildTrinoConfig(trinoConfig) {
-  if (!trinoConfig.server?.includes(trinoConfig.port?.toString() || "")) {
-    trinoConfig.server = `${trinoConfig.server}:${trinoConfig.port}`;
+function validateAndBuildTrinoCoreConfig(trinoConfig) {
+  if (!trinoConfig) {
+    return {};
   }
+  const server = trinoConfig.server && trinoConfig.port ? trinoConfig.server.includes(trinoConfig.port.toString()) ? trinoConfig.server : `${trinoConfig.server}:${trinoConfig.port}` : trinoConfig.server;
   const baseConfig = {
-    server: trinoConfig.server,
+    server,
     port: trinoConfig.port,
     catalog: trinoConfig.catalog,
     schema: trinoConfig.schema,
     user: trinoConfig.user
   };
   if (trinoConfig.peakaKey) {
-    baseConfig.extraConfig = {
-      extraCredential: {
-        peakaKey: trinoConfig.peakaKey
-      }
+    baseConfig.extraCredential = {
+      peakaKey: trinoConfig.peakaKey
     };
-    delete baseConfig.password;
-    delete baseConfig.catalog;
-    delete baseConfig.schema;
-  } else if (trinoConfig.server?.startsWith("https://") && trinoConfig.password) {
+    return baseConfig;
+  }
+  if (server?.startsWith("https://") && trinoConfig.password) {
     baseConfig.password = trinoConfig.password;
   }
-  if (trinoConfig.server?.startsWith("http://")) {
-    delete baseConfig.password;
-    return baseConfig;
-  } else if (trinoConfig.server?.startsWith("https://")) {
+  if (server?.startsWith("http://") || server?.startsWith("https://")) {
     return baseConfig;
-  } else {
-    throw new Error(`Invalid Trino connection: expected "http://server:port" or "https://server:port".`);
   }
+  throw new Error(`Invalid Trino connection: expected "http://server:port" or "https://server:port".`);
 }
+
+// src/service/connection.ts
 async function installAndLoadExtension(connection, extensionName, fromCommunity = false) {
   try {
     const installCommand = fromCommunity ? `FORCE INSTALL '${extensionName}' FROM community;` : `INSTALL ${extensionName};`;
@@ -220488,52 +220760,6 @@ function handleAlreadyAttachedError(error, dbName) {
     throw error;
   }
 }
-function normalizePrivateKey(privateKey) {
-  let privateKeyContent = privateKey.trim();
-  if (!privateKeyContent.includes(`
-`)) {
-    const keyPatterns = [
-      {
-        beginRegex: /-----BEGIN\s+ENCRYPTED\s+PRIVATE\s+KEY-----/i,
-        endRegex: /-----END\s+ENCRYPTED\s+PRIVATE\s+KEY-----/i,
-        beginMarker: "-----BEGIN ENCRYPTED PRIVATE KEY-----",
-        endMarker: "-----END ENCRYPTED PRIVATE KEY-----"
-      },
-      {
-        beginRegex: /-----BEGIN\s+PRIVATE\s+KEY-----/i,
-        endRegex: /-----END\s+PRIVATE\s+KEY-----/i,
-        beginMarker: "-----BEGIN PRIVATE KEY-----",
-        endMarker: "-----END PRIVATE KEY-----"
-      }
-    ];
-    for (const pattern of keyPatterns) {
-      const beginMatch = privateKeyContent.match(pattern.beginRegex);
-      const endMatch = privateKeyContent.match(pattern.endRegex);
-      if (beginMatch && endMatch) {
-        const beginPos = beginMatch.index + beginMatch[0].length;
-        const endPos = endMatch.index;
-        const keyData = privateKeyContent.substring(beginPos, endPos).replace(/\s+/g, "");
-        const lines = [];
-        for (let i = 0;i < keyData.length; i += 64) {
-          lines.push(keyData.slice(i, i + 64));
-        }
-        privateKeyContent = `${pattern.beginMarker}
-${lines.join(`
-`)}
-${pattern.endMarker}
-`;
-        break;
-      }
-    }
-  } else {
-    if (!privateKeyContent.endsWith(`
-`)) {
-      privateKeyContent += `
-`;
-    }
-  }
-  return privateKeyContent;
-}
 async function attachBigQuery(connection, attachedDb) {
   if (!attachedDb.bigqueryConnection) {
     throw new Error(`BigQuery connection configuration missing for: ${attachedDb.name}`);
@@ -220926,8 +221152,8 @@ function buildAzureFileUrl(azureConn, blobName) {
 
 class AzureDuckDBConnection extends DuckDBConnection {
   azureDatabases;
-  constructor(connectionName, databasePath, workingDirectory, azureDatabases) {
-    super(connectionName, databasePath, workingDirectory);
+  constructor(options, azureDatabases) {
+    super(options);
     this.azureDatabases = azureDatabases;
   }
   async fetchTableSchema(tableKey, tablePath) {
@@ -220959,12 +221185,12 @@ class AzureDuckDBConnection extends DuckDBConnection {
 
 class DuckLakeConnection extends DuckDBConnection {
   connectionName;
-  constructor(connectionName, databasePath, workingDirectory) {
-    super(connectionName, databasePath, workingDirectory);
-    if (!databasePath.endsWith("_ducklake.duckdb")) {
-      throw new Error(`DuckLakeConnection should only be used for DuckLake connections. ` + `Expected database path ending with '_ducklake.duckdb', got: ${databasePath}`);
+  constructor(options) {
+    super(options);
+    if (!options.databasePath?.endsWith("_ducklake.duckdb")) {
+      throw new Error(`DuckLakeConnection should only be used for DuckLake connections. ` + `Expected database path ending with '_ducklake.duckdb', got: ${options.databasePath}`);
     }
-    this.connectionName = connectionName;
+    this.connectionName = options.name;
   }
   async fetchTableSchema(tableKey, tablePath) {
     const parts = tablePath.split(".");
@@ -220989,7 +221215,7 @@ class DuckLakeConnection extends DuckDBConnection {
   }
 }
 async function deleteDuckLakeConnectionFile(connectionName, projectPath) {
-  const ducklakePath = path.join(projectPath, `${connectionName}_ducklake.duckdb`);
+  const ducklakePath = path2.join(projectPath, `${connectionName}_ducklake.duckdb`);
   try {
     await fs.access(ducklakePath);
     await fs.rm(ducklakePath);
@@ -221002,215 +221228,153 @@ async function deleteDuckLakeConnectionFile(connectionName, projectPath) {
     }
   }
 }
-async function createProjectConnections(connections = [], projectPath = "", isUpdateConnectionRequest = false) {
-  const connectionMap = new Map;
-  const processedConnections = new Set;
-  const apiConnections = [];
-  for (const connection of connections) {
-    if (connection.name && processedConnections.has(connection.name)) {
-      continue;
-    }
-    logger.info(`Adding connection ${connection.name}`, {
-      connection
-    });
-    if (!connection.name) {
-      throw "Invalid connection configuration.  No name.";
+function entryToDuckDBOptions(name, entry, workingDirectory) {
+  const { is: _is, ...rest } = entry;
+  if (workingDirectory !== undefined) {
+    rest.workingDirectory = workingDirectory;
+  }
+  return { ...removeUndefined(rest), name };
+}
+function removeUndefined(value) {
+  return Object.fromEntries(Object.entries(value).filter(([, fieldValue]) => fieldValue !== undefined));
+}
+function buildSnowflakePrivateKeyConnection(metadata) {
+  const name = metadata.apiConnection.name;
+  const snowflake = metadata.apiConnection.snowflakeConnection;
+  if (!snowflake?.privateKey) {
+    throw new Error(`Snowflake private key is required for connection ${name}`);
+  }
+  if (!snowflake.account) {
+    throw new Error(`Snowflake account is required for connection ${name}`);
+  }
+  if (!snowflake.username) {
+    throw new Error(`Snowflake username is required for connection ${name}`);
+  }
+  if (!snowflake.warehouse) {
+    throw new Error(`Snowflake warehouse is required for connection ${name}`);
+  }
+  return new SnowflakeConnection(name, {
+    connOptions: {
+      account: snowflake.account,
+      username: snowflake.username,
+      privateKey: normalizeSnowflakePrivateKey(snowflake.privateKey),
+      authenticator: "SNOWFLAKE_JWT",
+      warehouse: snowflake.warehouse,
+      ...removeUndefined({
+        password: snowflake.password,
+        privateKeyPass: snowflake.privateKeyPass,
+        database: snowflake.database,
+        schema: snowflake.schema,
+        role: snowflake.role
+      })
+    },
+    timeoutMs: snowflake.responseTimeoutMilliseconds,
+    poolOptions: buildPoolOptions({ poolMin: 1, poolMax: 20 })
+  });
+}
+function buildDuckLakeConnection(metadata, entry) {
+  return new DuckLakeConnection(entryToDuckDBOptions(metadata.apiConnection.name, entry, metadata.workingDirectory));
+}
+function buildAzureDuckDBConnection(metadata, entry) {
+  return new AzureDuckDBConnection(entryToDuckDBOptions(metadata.apiConnection.name, entry, metadata.workingDirectory), metadata.attachedDatabases);
+}
+function getMetadataForLookup(metadata, name) {
+  return name ? metadata.get(name) : undefined;
+}
+function isDuckDBConnection(connection) {
+  return connection instanceof DuckDBConnection;
+}
+function buildProjectMalloyConfig(connections = [], projectPath = "", isUpdateConnectionRequest = false) {
+  const assembled = assembleProjectConnections(connections, projectPath);
+  const duckLakeCache = new Map;
+  const snowflakeJwtCache = new Map;
+  const azureDuckDBCache = new Map;
+  const attachPromises = new WeakMap;
+  const malloyConfig = new MalloyConfig(assembled.pojo, {
+    config: contextOverlay({ rootDirectory: projectPath })
+  });
+  async function attachOnce(connection, metadata) {
+    if (metadata.attachedDatabases.length === 0 || !isDuckDBConnection(connection)) {
+      return;
     }
-    processedConnections.add(connection.name);
-    switch (connection.type) {
-      case "postgres": {
-        const configReader = async () => {
-          if (!connection.postgresConnection) {
-            throw "Invalid connection configuration.  No postgres connection.";
-          }
-          return {
-            host: connection.postgresConnection.host,
-            port: connection.postgresConnection.port,
-            username: connection.postgresConnection.userName,
-            password: connection.postgresConnection.password,
-            databaseName: connection.postgresConnection.databaseName,
-            connectionString: connection.postgresConnection.connectionString
-          };
-        };
-        const postgresConnection = new PostgresConnection(connection.name, () => ({}), configReader);
-        connectionMap.set(connection.name, postgresConnection);
-        connection.attributes = getConnectionAttributes(postgresConnection);
-        break;
-      }
-      case "mysql": {
-        if (!connection.mysqlConnection) {
-          throw "Invalid connection configuration.  No mysql connection.";
-        }
-        const config = {
-          host: connection.mysqlConnection.host,
-          port: connection.mysqlConnection.port,
-          user: connection.mysqlConnection.user,
-          password: connection.mysqlConnection.password,
-          database: connection.mysqlConnection.database
-        };
-        const mysqlConnection = new MySQLConnection(connection.name, config);
-        connectionMap.set(connection.name, mysqlConnection);
-        connection.attributes = getConnectionAttributes(mysqlConnection);
-        break;
-      }
-      case "bigquery": {
-        if (!connection.bigqueryConnection) {
-          throw "Invalid connection configuration.  No bigquery connection.";
-        }
-        let serviceAccountKeyPath = undefined;
-        if (connection.bigqueryConnection.serviceAccountKeyJson) {
-          serviceAccountKeyPath = path.join(TEMP_DIR_PATH, `${connection.name}-${v4_default()}-service-account-key.json`);
-          await fs.writeFile(serviceAccountKeyPath, connection.bigqueryConnection.serviceAccountKeyJson);
-        }
-        const bigqueryConnectionOptions = {
-          projectId: connection.bigqueryConnection.defaultProjectId,
-          serviceAccountKeyPath,
-          location: connection.bigqueryConnection.location,
-          maximumBytesBilled: connection.bigqueryConnection.maximumBytesBilled,
-          timeoutMs: connection.bigqueryConnection.queryTimeoutMilliseconds,
-          billingProjectId: connection.bigqueryConnection.billingProjectId
-        };
-        const bigqueryConnection = new BigQueryConnection(connection.name, () => ({}), bigqueryConnectionOptions);
-        connectionMap.set(connection.name, bigqueryConnection);
-        connection.attributes = getConnectionAttributes(bigqueryConnection);
-        break;
-      }
-      case "snowflake": {
-        if (!connection.snowflakeConnection) {
-          throw new Error("Snowflake connection configuration is missing.");
-        }
-        if (!connection.snowflakeConnection.account) {
-          throw new Error("Snowflake account is required.");
-        }
-        if (!connection.snowflakeConnection.username) {
-          throw new Error("Snowflake username is required.");
-        }
-        if (!connection.snowflakeConnection.password && !connection.snowflakeConnection.privateKey) {
-          throw new Error("Snowflake password or private key or private key path is required.");
-        }
-        if (!connection.snowflakeConnection.warehouse) {
-          throw new Error("Snowflake warehouse is required.");
-        }
-        let privateKeyPath = undefined;
-        if (connection.snowflakeConnection.privateKey) {
-          privateKeyPath = path.join(TEMP_DIR_PATH, `${connection.name}-${v4_default()}-private-key.pem`);
-          const normalizedKey = normalizePrivateKey(connection.snowflakeConnection.privateKey);
-          await fs.writeFile(privateKeyPath, normalizedKey);
-        }
-        const snowflakeConnectionOptions = {
-          connOptions: {
-            account: connection.snowflakeConnection.account,
-            username: connection.snowflakeConnection.username,
-            warehouse: connection.snowflakeConnection.warehouse,
-            database: connection.snowflakeConnection.database,
-            schema: connection.snowflakeConnection.schema,
-            role: connection.snowflakeConnection.role,
-            ...connection.snowflakeConnection.privateKey ? {
-              privateKeyPath,
-              authenticator: "SNOWFLAKE_JWT",
-              privateKeyPass: connection.snowflakeConnection.privateKeyPass || undefined
-            } : {
-              password: connection.snowflakeConnection.password || undefined
-            },
-            timeout: connection.snowflakeConnection.responseTimeoutMilliseconds
-          },
-          poolOptions: {
-            min: 1,
-            max: 20
-          }
-        };
-        const snowflakeConnection = new SnowflakeConnection(connection.name, snowflakeConnectionOptions);
-        connectionMap.set(connection.name, snowflakeConnection);
-        connection.attributes = getConnectionAttributes(snowflakeConnection);
-        break;
-      }
-      case "trino": {
-        if (!connection.trinoConnection) {
-          throw new Error("Trino connection configuration is missing.");
-        }
-        const trinoConnectionOptions = validateAndBuildTrinoConfig(connection.trinoConnection);
-        const trinoConnection = new TrinoConnection(connection.name, {}, trinoConnectionOptions);
-        connectionMap.set(connection.name, trinoConnection);
-        connection.attributes = getConnectionAttributes(trinoConnection);
-        break;
-      }
-      case "duckdb": {
-        if (!connection.duckdbConnection) {
-          throw new Error("DuckDB connection configuration is missing.");
-        }
-        if (connection.duckdbConnection.attachedDatabases?.some((database) => database.name === connection.name)) {
-          throw new Error(`DuckDB attached databases names cannot conflict with connection name ${connection.name}`);
-        }
-        if (connection.name === "duckdb") {
-          throw new Error("DuckDB connection name cannot be 'duckdb'");
-        }
-        if (connection.duckdbConnection?.attachedDatabases?.length == 0) {
-          throw new Error("DuckDB connection must have at least one attached database");
-        }
-        const attachedDatabases = connection.duckdbConnection.attachedDatabases ?? [];
-        const hasAzureAttached = attachedDatabases.some((db) => db.type === "azure");
-        const duckdbConnection = hasAzureAttached ? new AzureDuckDBConnection(connection.name, path.join(projectPath, `${connection.name}.duckdb`), projectPath, attachedDatabases) : new DuckDBConnection(connection.name, path.join(projectPath, `${connection.name}.duckdb`), projectPath);
-        if (attachedDatabases.length > 0) {
-          await attachDatabasesToDuckDB(duckdbConnection, attachedDatabases);
-        }
-        connectionMap.set(connection.name, duckdbConnection);
-        connection.attributes = getConnectionAttributes(duckdbConnection);
-        break;
+    let attachPromise = attachPromises.get(connection);
+    if (!attachPromise) {
+      attachPromise = attachDatabasesToDuckDB(connection, metadata.attachedDatabases);
+      attachPromises.set(connection, attachPromise);
+    }
+    await attachPromise;
+  }
+  malloyConfig.wrapConnections((base) => ({
+    lookupConnection: async (name) => {
+      const metadata = getMetadataForLookup(assembled.metadata, name);
+      if (metadata?.isDuckLake) {
+        let connectionPromise = duckLakeCache.get(name);
+        if (!connectionPromise) {
+          const entry = assembled.pojo.connections[name];
+          connectionPromise = Promise.resolve(buildDuckLakeConnection(metadata, entry));
+          duckLakeCache.set(name, connectionPromise);
+        }
+        const connection2 = await connectionPromise;
+        if (isUpdateConnectionRequest || !await isDatabaseAttached(connection2, name)) {
+          await attachDuckLake(connection2, name, metadata.apiConnection.ducklakeConnection);
+        }
+        return connection2;
+      }
+      if (metadata?.hasSnowflakePrivateKey) {
+        let connectionPromise = snowflakeJwtCache.get(name);
+        if (!connectionPromise) {
+          connectionPromise = Promise.resolve(buildSnowflakePrivateKeyConnection(metadata));
+          snowflakeJwtCache.set(name, connectionPromise);
+        }
+        return connectionPromise;
+      }
+      if (metadata?.hasAzureAttachment) {
+        let connectionPromise = azureDuckDBCache.get(name);
+        if (!connectionPromise) {
+          const entry = assembled.pojo.connections[name];
+          connectionPromise = Promise.resolve(buildAzureDuckDBConnection(metadata, entry));
+          azureDuckDBCache.set(name, connectionPromise);
+        }
+        const connection2 = await connectionPromise;
+        await attachOnce(connection2, metadata);
+        return connection2;
+      }
+      const connection = await base.lookupConnection(name);
+      if (metadata) {
+        await attachOnce(connection, metadata);
       }
-      case "motherduck": {
-        if (!connection.motherduckConnection) {
-          throw new Error("MotherDuck connection configuration is missing.");
-        }
-        if (!connection.motherduckConnection.accessToken) {
-          throw new Error("MotherDuck access token is required.");
-        }
-        let databasePath = `md:`;
-        if (connection.motherduckConnection.database) {
-          databasePath = `md:${connection.motherduckConnection.database}?attach_mode=single`;
-        }
-        const motherduckConnection = new DuckDBConnection({
-          name: connection.name,
-          databasePath,
-          motherDuckToken: connection.motherduckConnection.accessToken,
-          workingDirectory: projectPath
+      return connection;
+    }
+  }));
+  return {
+    malloyConfig,
+    apiConnections: assembled.apiConnections,
+    releaseConnections: async () => {
+      const wrapperPromises = [
+        ...duckLakeCache.values(),
+        ...snowflakeJwtCache.values(),
+        ...azureDuckDBCache.values()
+      ];
+      const closeResults = await Promise.allSettled([
+        malloyConfig.releaseConnections(),
+        ...wrapperPromises.map(async (promise) => {
+          const connection = await promise;
+          await connection.close();
+        })
+      ]);
+      duckLakeCache.clear();
+      snowflakeJwtCache.clear();
+      azureDuckDBCache.clear();
+      const failures = closeResults.filter((result) => result.status === "rejected");
+      for (const failure of failures) {
+        logger.error("Failed to release project connection", {
+          error: failure.reason
         });
-        connectionMap.set(connection.name, motherduckConnection);
-        connection.attributes = getConnectionAttributes(motherduckConnection);
-        break;
-      }
-      case "ducklake": {
-        if (!connection.ducklakeConnection) {
-          throw new Error("DuckLake connection configuration is missing.");
-        }
-        const ducklakeDuckdbConnection = new DuckLakeConnection(connection.name, path.join(projectPath, `${connection.name}_ducklake.duckdb`), projectPath);
-        if (isUpdateConnectionRequest || !await isDatabaseAttached(ducklakeDuckdbConnection, connection.name)) {
-          await attachDuckLake(ducklakeDuckdbConnection, connection.name, connection.ducklakeConnection);
-        }
-        connectionMap.set(connection.name, ducklakeDuckdbConnection);
-        connection.attributes = getConnectionAttributes(ducklakeDuckdbConnection);
-        break;
       }
-      default: {
-        throw new Error(`Unsupported connection type: ${connection.type}`);
+      if (failures.length > 0) {
+        throw new AggregateError(failures.map((failure) => failure.reason), "Failed to release one or more project connections");
       }
     }
-    apiConnections.push(connection);
-  }
-  return {
-    malloyConnections: connectionMap,
-    apiConnections
-  };
-}
-function getConnectionAttributes(connection) {
-  let canStream = false;
-  try {
-    canStream = connection.canStream();
-  } catch {}
-  return {
-    dialectName: connection.dialectName,
-    isPool: connection.isPool(),
-    canPersist: connection.canPersist(),
-    canStream
   };
 }
 async function testDuckDBConnection(duckdbConnection, connectionConfig) {
@@ -221286,17 +221450,13 @@ ${failedAttachments.join(`
   }
 }
 async function testConnectionConfig(connectionConfig) {
-  let malloyConnections = null;
+  let projectConfig = null;
   try {
     if (!connectionConfig.name) {
       throw new Error("Connection name is required");
     }
-    const result = await createProjectConnections([connectionConfig]);
-    malloyConnections = result.malloyConnections;
-    const connection = malloyConnections.get(connectionConfig.name);
-    if (!connection) {
-      throw new Error(`Failed to create connection: ${connectionConfig.name}`);
-    }
+    projectConfig = buildProjectMalloyConfig([connectionConfig]);
+    const connection = await projectConfig.malloyConfig.connections.lookupConnection(connectionConfig.name);
     if (connectionConfig.type === "duckdb") {
       await testDuckDBConnection(connection, connectionConfig);
     } else if (connectionConfig.type === "ducklake") {
@@ -221325,25 +221485,41 @@ async function testConnectionConfig(connectionConfig) {
       errorMessage: error.message
     };
   } finally {
-    if (malloyConnections) {
-      for (const [connName, conn] of malloyConnections) {
-        try {
-          if (conn && typeof conn.close === "function") {
-            await conn.close();
-          }
-        } catch (closeError) {
-          logger.warn(`Error closing connection ${connName} during test cleanup`, { error: closeError });
-        } finally {
-          if (connectionConfig.type === "ducklake") {
-            await deleteDuckLakeConnectionFile(connName, process.cwd());
-          }
-        }
+    if (projectConfig) {
+      try {
+        await projectConfig.releaseConnections();
+      } catch (closeError) {
+        logger.warn("Error releasing temporary connection test config", {
+          error: closeError
+        });
       }
     }
+    if (connectionConfig.type === "ducklake" && connectionConfig.name) {
+      await deleteDuckLakeConnectionFile(connectionConfig.name, process.cwd());
+    }
   }
 }
 
 // src/service/connection_service.ts
+async function runProjectConnectionUpdate(project, fn) {
+  if (project.runConnectionUpdateExclusive) {
+    return project.runConnectionUpdateExclusive(fn);
+  }
+  return fn();
+}
+function updateProjectConnections(project, nextMalloyConfig, afterPreviousRelease) {
+  project.updateConnections?.(nextMalloyConfig, nextMalloyConfig.apiConnections, afterPreviousRelease);
+}
+function buildDeletedConnectionCleanup(project, deletedConnection, connectionName) {
+  if (deletedConnection.type === "duckdb" && typeof project.deleteDuckDBConnection === "function") {
+    return () => project.deleteDuckDBConnection(connectionName);
+  }
+  if (deletedConnection.type === "ducklake" && typeof project.deleteDuckLakeConnection === "function") {
+    return () => project.deleteDuckLakeConnection(connectionName);
+  }
+  return;
+}
+
 class ConnectionService {
   projectStore;
   constructor(projectStore) {
@@ -221378,10 +221554,12 @@ class ConnectionService {
       throw new Error(`Connection "${connectionName}" already exists in project "${projectName}".`);
     }
     const project = await this.projectStore.getProject(projectName, false);
-    const existingConnections = project.listApiConnections();
-    const { malloyConnections, apiConnections } = await createProjectConnections([...existingConnections, connection], project.metadata.location || "");
-    project.updateConnections(malloyConnections, apiConnections);
-    await this.projectStore.addConnection(connection, dbProject.id, repository);
+    await runProjectConnectionUpdate(project, async () => {
+      const existingConnections = project.listApiConnections();
+      const nextMalloyConfig = buildProjectMalloyConfig([...existingConnections, connection], project.metadata.location || "");
+      await this.projectStore.addConnection(connection, dbProject.id, repository);
+      updateProjectConnections(project, nextMalloyConfig);
+    });
     logger.info(`Successfully added connection "${connection.name}" to project "${projectName}"`);
   }
   async updateConnection(projectName, connectionName, connection) {
@@ -221392,16 +221570,18 @@ class ConnectionService {
     logger.info(`Updating connection "${connectionName}" in project "${projectName}"`);
     const { dbProject, dbConnection, repository } = await this.getConnection(projectName, connectionName);
     const project = await this.projectStore.getProject(projectName, false);
-    const existingConnections = project.listApiConnections();
-    const updatedConnection = {
-      ...dbConnection.config,
-      ...connection,
-      name: connectionName
-    };
-    const updatedConnections = existingConnections.map((conn) => conn.name === connectionName ? updatedConnection : conn);
-    const { malloyConnections, apiConnections } = await createProjectConnections(updatedConnections, project.metadata.location || "");
-    project.updateConnections(malloyConnections, apiConnections);
-    await this.projectStore.updateConnection(updatedConnection, dbProject.id, repository);
+    await runProjectConnectionUpdate(project, async () => {
+      const existingConnections = project.listApiConnections();
+      const updatedConnection = {
+        ...dbConnection.config,
+        ...connection,
+        name: connectionName
+      };
+      const updatedConnections = existingConnections.map((conn) => conn.name === connectionName ? updatedConnection : conn);
+      const nextMalloyConfig = buildProjectMalloyConfig(updatedConnections, project.metadata.location || "", true);
+      await this.projectStore.updateConnection(updatedConnection, dbProject.id, repository);
+      updateProjectConnections(project, nextMalloyConfig);
+    });
     logger.info(`Successfully updated connection "${connectionName}" in project "${projectName}"`);
   }
   async deleteConnection(projectName, connectionName) {
@@ -221412,8 +221592,21 @@ class ConnectionService {
     logger.info(`Deleting connection "${connectionName}" from project "${projectName}"`);
     const { dbConnection, repository } = await this.getConnection(projectName, connectionName);
     const project = await this.projectStore.getProject(projectName, false);
-    await project.deleteConnection(connectionName);
-    await repository.deleteConnection(dbConnection.id);
+    await runProjectConnectionUpdate(project, async () => {
+      if (typeof project.listApiConnections !== "function") {
+        if (typeof project.deleteConnection === "function") {
+          await project.deleteConnection(connectionName);
+        }
+        await repository.deleteConnection(dbConnection.id);
+        return;
+      }
+      const deletedConnection = "getApiConnection" in project && typeof project.getApiConnection === "function" ? project.getApiConnection(connectionName) : dbConnection.config;
+      const updatedConnections = project.listApiConnections().filter((connection) => connection.name !== connectionName);
+      const nextMalloyConfig = buildProjectMalloyConfig(updatedConnections, project.metadata.location || "");
+      const deleteConnectionFilesAfterRelease = buildDeletedConnectionCleanup(project, deletedConnection, connectionName);
+      await repository.deleteConnection(dbConnection.id);
+      updateProjectConnections(project, nextMalloyConfig, deleteConnectionFilesAfterRelease);
+    });
     logger.info(`Successfully deleted connection "${connectionName}" from project "${projectName}"`);
   }
 }
@@ -222426,6 +222619,16 @@ function validateAzureAttachedDatabases(connectionConfig) {
     }
   }
 }
+function validateAdminAuthoredConnection(connectionName, connectionConfig) {
+  if (connectionName === "duckdb" || connectionConfig.name === "duckdb") {
+    throw new BadRequestError("DuckDB connection name cannot be 'duckdb'; it is reserved for Publisher package sandboxes.");
+  }
+  try {
+    validateDuckdbApiSurface(connectionConfig);
+  } catch (error) {
+    throw new BadRequestError(error.message);
+  }
+}
 
 class ConnectionController {
   projectStore;
@@ -222434,22 +222637,42 @@ class ConnectionController {
     this.projectStore = projectStore;
     this.connectionService = new ConnectionService(projectStore);
   }
-  async getMalloyConnection(projectName, connectionName) {
+  getApiConnectionForLookup(project, connectionName) {
+    if (connectionName === "duckdb") {
+      return {
+        name: "duckdb",
+        type: "duckdb",
+        duckdbConnection: { attachedDatabases: [] }
+      };
+    }
+    return project.getApiConnection(connectionName);
+  }
+  async getMalloyConnection(projectName, connectionName, packageName) {
     const project = await this.projectStore.getProject(projectName, false);
-    const connection = project.getApiConnection(connectionName);
-    if (connection.name === "duckdb" && connection.type === "duckdb") {
+    if (connectionName === "duckdb") {
       const packages = await project.listPackages();
       if (packages.length === 0) {
-        return project.getMalloyConnection(connectionName);
+        return await project.getMalloyConnection(connectionName);
+      }
+      if (packageName) {
+        const known = packages.some((p) => p.name === packageName);
+        if (!known) {
+          throw new BadRequestError(`Package "${packageName}" not found in project "${projectName}"`);
+        }
+        const pkg = await project.getPackage(packageName);
+        return await pkg.getMalloyConnection(connectionName);
       }
-      const packageName = packages[0].name;
-      if (!packageName) {
-        throw new ConnectionError("Package name is undefined");
+      if (packages.length === 1) {
+        const onlyPackage = packages[0].name;
+        if (!onlyPackage) {
+          throw new ConnectionError("Package name is undefined");
+        }
+        const pkg = await project.getPackage(onlyPackage);
+        return await pkg.getMalloyConnection(connectionName);
       }
-      const pkg = await project.getPackage(packageName);
-      return pkg.getMalloyConnection(connectionName);
+      throw new BadRequestError(`Ambiguous "duckdb" connection lookup: project "${projectName}" has multiple packages. ` + `Use /projects/${projectName}/packages/{packageName}/connections/duckdb/... to disambiguate.`);
     } else {
-      return project.getMalloyConnection(connectionName);
+      return await project.getMalloyConnection(connectionName);
     }
   }
   async fetchTable(malloyConnection, tableKey, tablePath) {
@@ -222490,20 +222713,20 @@ class ConnectionController {
     const project = await this.projectStore.getProject(projectName, false);
     return project.listApiConnections();
   }
-  async listSchemas(projectName, connectionName) {
+  async listSchemas(projectName, connectionName, packageName) {
     const project = await this.projectStore.getProject(projectName, false);
-    const connection = project.getApiConnection(connectionName);
-    const malloyConnection = await this.getMalloyConnection(projectName, connectionName);
+    const connection = this.getApiConnectionForLookup(project, connectionName);
+    const malloyConnection = await this.getMalloyConnection(projectName, connectionName, packageName);
     return getSchemasForConnection(connection, malloyConnection);
   }
-  async listTables(projectName, connectionName, schemaName, tableNames) {
+  async listTables(projectName, connectionName, schemaName, tableNames, packageName) {
     const project = await this.projectStore.getProject(projectName, false);
-    const connection = project.getApiConnection(connectionName);
-    const malloyConnection = await this.getMalloyConnection(projectName, connectionName);
+    const connection = this.getApiConnectionForLookup(project, connectionName);
+    const malloyConnection = await this.getMalloyConnection(projectName, connectionName, packageName);
     return listTablesForSchema(connection, schemaName, malloyConnection, tableNames);
   }
-  async getConnectionSqlSource(projectName, connectionName, sqlStatement) {
-    const malloyConnection = await this.getMalloyConnection(projectName, connectionName);
+  async getConnectionSqlSource(projectName, connectionName, sqlStatement, packageName) {
+    const malloyConnection = await this.getMalloyConnection(projectName, connectionName, packageName);
     try {
       const schema = await malloyConnection.fetchSelectSchema({
         connection: connectionName,
@@ -222519,10 +222742,10 @@ class ConnectionController {
       throw new ConnectionError(error.message);
     }
   }
-  async getTable(projectName, connectionName, schemaName, tablePath) {
-    const malloyConnection = await this.getMalloyConnection(projectName, connectionName);
+  async getTable(projectName, connectionName, schemaName, tablePath, packageName) {
+    const malloyConnection = await this.getMalloyConnection(projectName, connectionName, packageName);
     const project = await this.projectStore.getProject(projectName, false);
-    const connection = project.getApiConnection(connectionName);
+    const connection = this.getApiConnectionForLookup(project, connectionName);
     if (connection.type === "ducklake") {
       if (tablePath.split(".").length === 1) {
         tablePath = `${connectionName}.${schemaName}.${tablePath}`;
@@ -222554,8 +222777,8 @@ class ConnectionController {
     }
     return this.fetchTable(malloyConnection, tableKey, tablePath);
   }
-  async getConnectionQueryData(projectName, connectionName, sqlStatement, options) {
-    const malloyConnection = await this.getMalloyConnection(projectName, connectionName);
+  async getConnectionQueryData(projectName, connectionName, sqlStatement, options, packageName) {
+    const malloyConnection = await this.getMalloyConnection(projectName, connectionName, packageName);
     let runSQLOptions = {};
     if (options) {
       runSQLOptions = JSON.parse(options);
@@ -222572,8 +222795,8 @@ class ConnectionController {
       throw new ConnectionError(error.message);
     }
   }
-  async getConnectionTemporaryTable(projectName, connectionName, sqlStatement) {
-    const malloyConnection = await this.getMalloyConnection(projectName, connectionName);
+  async getConnectionTemporaryTable(projectName, connectionName, sqlStatement, packageName) {
+    const malloyConnection = await this.getMalloyConnection(projectName, connectionName, packageName);
     try {
       return {
         table: JSON.stringify(await malloyConnection.manifestTemporaryTable(sqlStatement))
@@ -222582,10 +222805,8 @@ class ConnectionController {
       throw new ConnectionError(error.message);
     }
   }
-  async testConnectionConfiguration(connectionConfig) {
-    if (connectionConfig && "config" in connectionConfig && typeof connectionConfig.config === "object") {
-      connectionConfig = connectionConfig.config;
-    }
+  async testConnectionConfiguration(input) {
+    const connectionConfig = input.config && typeof input.config === "object" ? input.config : input;
     if (!connectionConfig || typeof connectionConfig !== "object" || Object.keys(connectionConfig).length === 0) {
       throw new BadRequestError("Connection configuration is required and cannot be empty");
     }
@@ -222612,6 +222833,7 @@ class ConnectionController {
       throw new BadRequestError("Connection type is required");
     }
     validateAzureAttachedDatabases(connectionConfig);
+    validateAdminAuthoredConnection(connectionName, connectionConfig);
     logger.info(`Creating connection "${connectionName}" in project "${projectName}"`);
     await this.connectionService.addConnection(projectName, connectionName, connectionConfig);
     return {
@@ -222623,6 +222845,7 @@ class ConnectionController {
       throw new BadRequestError("Connection payload is required");
     }
     validateAzureAttachedDatabases(connection);
+    validateAdminAuthoredConnection(connectionName, connection);
     logger.info(`Updating connection "${connectionName}" in project "${projectName}"`);
     await this.connectionService.updateConnection(projectName, connectionName, connection);
     return {
@@ -222713,7 +222936,7 @@ class ModelController {
 }
 
 // src/controller/package.controller.ts
-import * as path2 from "path";
+import * as path3 from "path";
 class PackageController {
   projectStore;
   manifestService;
@@ -222797,7 +223020,7 @@ class PackageController {
     return result;
   }
   async downloadPackage(projectName, packageName, packageLocation) {
-    const absoluteTargetPath = path2.join(this.projectStore.serverRootPath, PUBLISHER_DATA_DIR, projectName, packageName);
+    const absoluteTargetPath = path3.join(this.projectStore.serverRootPath, PUBLISHER_DATA_DIR, projectName, packageName);
     const isCompressedFile = packageLocation.endsWith(".zip");
     if (packageLocation.startsWith("https://") || packageLocation.startsWith("git@")) {
       await this.projectStore.downloadGitHubDirectory(packageLocation, absoluteTargetPath);
@@ -222921,7 +223144,7 @@ class ReaddirpStream extends Readable2 {
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
     const statMethod = opts.lstat ? lstat : stat;
     if (wantBigintFsStats) {
-      this._stat = (path3) => statMethod(path3, { bigint: true });
+      this._stat = (path4) => statMethod(path4, { bigint: true });
     } else {
       this._stat = statMethod;
     }
@@ -222946,8 +223169,8 @@ class ReaddirpStream extends Readable2 {
         const par = this.parent;
         const fil = par && par.files;
         if (fil && fil.length > 0) {
-          const { path: path3, depth } = par;
-          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path3));
+          const { path: path4, depth } = par;
+          const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path4));
           const awaited = await Promise.all(slice);
           for (const entry of awaited) {
             if (!entry)
@@ -222987,20 +223210,20 @@ class ReaddirpStream extends Readable2 {
       this.reading = false;
     }
   }
-  async _exploreDir(path3, depth) {
+  async _exploreDir(path4, depth) {
     let files;
     try {
-      files = await readdir(path3, this._rdOptions);
+      files = await readdir(path4, this._rdOptions);
     } catch (error) {
       this._onError(error);
     }
-    return { files, depth, path: path3 };
+    return { files, depth, path: path4 };
   }
-  async _formatEntry(dirent, path3) {
+  async _formatEntry(dirent, path4) {
     let entry;
     const basename = this._isDirent ? dirent.name : dirent;
     try {
-      const fullPath = presolve(pjoin(path3, basename));
+      const fullPath = presolve(pjoin(path4, basename));
       entry = { path: prelative(this._root, fullPath), fullPath, basename };
       entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
     } catch (err) {
@@ -223399,16 +223622,16 @@ var delFromSet = (main, prop, item) => {
 };
 var isEmptySet = (val) => val instanceof Set ? val.size === 0 : !val;
 var FsWatchInstances = new Map;
-function createFsWatchInstance(path3, options, listener, errHandler, emitRaw) {
+function createFsWatchInstance(path4, options, listener, errHandler, emitRaw) {
   const handleEvent = (rawEvent, evPath) => {
-    listener(path3);
-    emitRaw(rawEvent, evPath, { watchedPath: path3 });
-    if (evPath && path3 !== evPath) {
-      fsWatchBroadcast(sysPath.resolve(path3, evPath), KEY_LISTENERS, sysPath.join(path3, evPath));
+    listener(path4);
+    emitRaw(rawEvent, evPath, { watchedPath: path4 });
+    if (evPath && path4 !== evPath) {
+      fsWatchBroadcast(sysPath.resolve(path4, evPath), KEY_LISTENERS, sysPath.join(path4, evPath));
     }
   };
   try {
-    return fs_watch(path3, {
+    return fs_watch(path4, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error) {
@@ -223424,12 +223647,12 @@ var fsWatchBroadcast = (fullPath, listenerType, val1, val2, val3) => {
     listener(val1, val2, val3);
   });
 };
-var setFsWatchListener = (path3, fullPath, options, handlers) => {
+var setFsWatchListener = (path4, fullPath, options, handlers) => {
   const { listener, errHandler, rawEmitter } = handlers;
   let cont = FsWatchInstances.get(fullPath);
   let watcher;
   if (!options.persistent) {
-    watcher = createFsWatchInstance(path3, options, listener, errHandler, rawEmitter);
+    watcher = createFsWatchInstance(path4, options, listener, errHandler, rawEmitter);
     if (!watcher)
       return;
     return watcher.close.bind(watcher);
@@ -223439,7 +223662,7 @@ var setFsWatchListener = (path3, fullPath, options, handlers) => {
     addAndConvert(cont, KEY_ERR, errHandler);
     addAndConvert(cont, KEY_RAW, rawEmitter);
   } else {
-    watcher = createFsWatchInstance(path3, options, fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS), errHandler, fsWatchBroadcast.bind(null, fullPath, KEY_RAW));
+    watcher = createFsWatchInstance(path4, options, fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS), errHandler, fsWatchBroadcast.bind(null, fullPath, KEY_RAW));
     if (!watcher)
       return;
     watcher.on(EV.ERROR, async (error) => {
@@ -223448,7 +223671,7 @@ var setFsWatchListener = (path3, fullPath, options, handlers) => {
         cont.watcherUnusable = true;
       if (isWindows && error.code === "EPERM") {
         try {
-          const fd = await open(path3, "r");
+          const fd = await open(path4, "r");
           await fd.close();
           broadcastErr(error);
         } catch (err) {}
@@ -223478,7 +223701,7 @@ var setFsWatchListener = (path3, fullPath, options, handlers) => {
   };
 };
 var FsWatchFileInstances = new Map;
-var setFsWatchFileListener = (path3, fullPath, options, handlers) => {
+var setFsWatchFileListener = (path4, fullPath, options, handlers) => {
   const { listener, rawEmitter } = handlers;
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
@@ -223500,7 +223723,7 @@ var setFsWatchFileListener = (path3, fullPath, options, handlers) => {
         });
         const currmtime = curr.mtimeMs;
         if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
-          foreach(cont.listeners, (listener2) => listener2(path3, curr));
+          foreach(cont.listeners, (listener2) => listener2(path4, curr));
         }
       })
     };
@@ -223523,13 +223746,13 @@ class NodeFsHandler {
     this.fsw = fsW;
     this._boundHandleError = (error) => fsW._handleError(error);
   }
-  _watchWithNodeFs(path3, listener) {
+  _watchWithNodeFs(path4, listener) {
     const opts = this.fsw.options;
-    const directory = sysPath.dirname(path3);
-    const basename2 = sysPath.basename(path3);
+    const directory = sysPath.dirname(path4);
+    const basename2 = sysPath.basename(path4);
     const parent = this.fsw._getWatchedDir(directory);
     parent.add(basename2);
-    const absolutePath = sysPath.resolve(path3);
+    const absolutePath = sysPath.resolve(path4);
     const options = {
       persistent: opts.persistent
     };
@@ -223539,12 +223762,12 @@ class NodeFsHandler {
     if (opts.usePolling) {
       const enableBin = opts.interval !== opts.binaryInterval;
       options.interval = enableBin && isBinaryPath(basename2) ? opts.binaryInterval : opts.interval;
-      closer = setFsWatchFileListener(path3, absolutePath, options, {
+      closer = setFsWatchFileListener(path4, absolutePath, options, {
         listener,
         rawEmitter: this.fsw._emitRaw
       });
     } else {
-      closer = setFsWatchListener(path3, absolutePath, options, {
+      closer = setFsWatchListener(path4, absolutePath, options, {
         listener,
         errHandler: this._boundHandleError,
         rawEmitter: this.fsw._emitRaw
@@ -223562,7 +223785,7 @@ class NodeFsHandler {
     let prevStats = stats;
     if (parent.has(basename2))
       return;
-    const listener = async (path3, newStats) => {
+    const listener = async (path4, newStats) => {
       if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
         return;
       if (!newStats || newStats.mtimeMs === 0) {
@@ -223576,11 +223799,11 @@ class NodeFsHandler {
             this.fsw._emit(EV.CHANGE, file, newStats2);
           }
           if ((isMacos || isLinux || isFreeBSD) && prevStats.ino !== newStats2.ino) {
-            this.fsw._closeFile(path3);
+            this.fsw._closeFile(path4);
             prevStats = newStats2;
             const closer2 = this._watchWithNodeFs(file, listener);
             if (closer2)
-              this.fsw._addPathCloser(path3, closer2);
+              this.fsw._addPathCloser(path4, closer2);
           } else {
             prevStats = newStats2;
           }
@@ -223604,7 +223827,7 @@ class NodeFsHandler {
     }
     return closer;
   }
-  async _handleSymlink(entry, directory, path3, item) {
+  async _handleSymlink(entry, directory, path4, item) {
     if (this.fsw.closed) {
       return;
     }
@@ -223614,7 +223837,7 @@ class NodeFsHandler {
       this.fsw._incrReadyCount();
       let linkPath;
       try {
-        linkPath = await fsrealpath(path3);
+        linkPath = await fsrealpath(path4);
       } catch (e) {
         this.fsw._emitReady();
         return true;
@@ -223624,12 +223847,12 @@ class NodeFsHandler {
       if (dir.has(item)) {
         if (this.fsw._symlinkPaths.get(full) !== linkPath) {
           this.fsw._symlinkPaths.set(full, linkPath);
-          this.fsw._emit(EV.CHANGE, path3, entry.stats);
+          this.fsw._emit(EV.CHANGE, path4, entry.stats);
         }
       } else {
         dir.add(item);
         this.fsw._symlinkPaths.set(full, linkPath);
-        this.fsw._emit(EV.ADD, path3, entry.stats);
+        this.fsw._emit(EV.ADD, path4, entry.stats);
       }
       this.fsw._emitReady();
       return true;
@@ -223658,9 +223881,9 @@ class NodeFsHandler {
         return;
       }
       const item = entry.path;
-      let path3 = sysPath.join(directory, item);
+      let path4 = sysPath.join(directory, item);
       current.add(item);
-      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path3, item)) {
+      if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path4, item)) {
         return;
       }
       if (this.fsw.closed) {
@@ -223669,8 +223892,8 @@ class NodeFsHandler {
       }
       if (item === target || !target && !previous.has(item)) {
         this.fsw._incrReadyCount();
-        path3 = sysPath.join(dir, sysPath.relative(dir, path3));
-        this._addToNodeFs(path3, initialAdd, wh, depth + 1);
+        path4 = sysPath.join(dir, sysPath.relative(dir, path4));
+        this._addToNodeFs(path4, initialAdd, wh, depth + 1);
       }
     }).on(EV.ERROR, this._boundHandleError);
     return new Promise((resolve2, reject) => {
@@ -223719,13 +223942,13 @@ class NodeFsHandler {
     }
     return closer;
   }
-  async _addToNodeFs(path3, initialAdd, priorWh, depth, target) {
+  async _addToNodeFs(path4, initialAdd, priorWh, depth, target) {
     const ready = this.fsw._emitReady;
-    if (this.fsw._isIgnored(path3) || this.fsw.closed) {
+    if (this.fsw._isIgnored(path4) || this.fsw.closed) {
       ready();
       return false;
     }
-    const wh = this.fsw._getWatchHelpers(path3);
+    const wh = this.fsw._getWatchHelpers(path4);
     if (priorWh) {
       wh.filterPath = (entry) => priorWh.filterPath(entry);
       wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -223741,8 +223964,8 @@ class NodeFsHandler {
       const follow = this.fsw.options.followSymlinks;
       let closer;
       if (stats.isDirectory()) {
-        const absPath = sysPath.resolve(path3);
-        const targetPath = follow ? await fsrealpath(path3) : path3;
+        const absPath = sysPath.resolve(path4);
+        const targetPath = follow ? await fsrealpath(path4) : path4;
         if (this.fsw.closed)
           return;
         closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -223752,29 +223975,29 @@ class NodeFsHandler {
           this.fsw._symlinkPaths.set(absPath, targetPath);
         }
       } else if (stats.isSymbolicLink()) {
-        const targetPath = follow ? await fsrealpath(path3) : path3;
+        const targetPath = follow ? await fsrealpath(path4) : path4;
         if (this.fsw.closed)
           return;
         const parent = sysPath.dirname(wh.watchPath);
         this.fsw._getWatchedDir(parent).add(wh.watchPath);
         this.fsw._emit(EV.ADD, wh.watchPath, stats);
-        closer = await this._handleDir(parent, stats, initialAdd, depth, path3, wh, targetPath);
+        closer = await this._handleDir(parent, stats, initialAdd, depth, path4, wh, targetPath);
         if (this.fsw.closed)
           return;
         if (targetPath !== undefined) {
-          this.fsw._symlinkPaths.set(sysPath.resolve(path3), targetPath);
+          this.fsw._symlinkPaths.set(sysPath.resolve(path4), targetPath);
         }
       } else {
         closer = this._handleFile(wh.watchPath, stats, initialAdd);
       }
       ready();
       if (closer)
-        this.fsw._addPathCloser(path3, closer);
+        this.fsw._addPathCloser(path4, closer);
       return false;
     } catch (error) {
       if (this.fsw._handleError(error)) {
         ready();
-        return path3;
+        return path4;
       }
     }
   }
@@ -223818,26 +224041,26 @@ function createPattern(matcher) {
   }
   return () => false;
 }
-function normalizePath(path3) {
-  if (typeof path3 !== "string")
+function normalizePath(path4) {
+  if (typeof path4 !== "string")
     throw new Error("string expected");
-  path3 = sysPath2.normalize(path3);
-  path3 = path3.replace(/\\/g, "/");
+  path4 = sysPath2.normalize(path4);
+  path4 = path4.replace(/\\/g, "/");
   let prepend = false;
-  if (path3.startsWith("//"))
+  if (path4.startsWith("//"))
     prepend = true;
   const DOUBLE_SLASH_RE2 = /\/\//;
-  while (path3.match(DOUBLE_SLASH_RE2))
-    path3 = path3.replace(DOUBLE_SLASH_RE2, "/");
+  while (path4.match(DOUBLE_SLASH_RE2))
+    path4 = path4.replace(DOUBLE_SLASH_RE2, "/");
   if (prepend)
-    path3 = "/" + path3;
-  return path3;
+    path4 = "/" + path4;
+  return path4;
 }
 function matchPatterns(patterns, testString, stats) {
-  const path3 = normalizePath(testString);
+  const path4 = normalizePath(testString);
   for (let index = 0;index < patterns.length; index++) {
     const pattern = patterns[index];
-    if (pattern(path3, stats)) {
+    if (pattern(path4, stats)) {
       return true;
     }
   }
@@ -223877,19 +224100,19 @@ var toUnix = (string) => {
   }
   return str;
 };
-var normalizePathToUnix = (path3) => toUnix(sysPath2.normalize(toUnix(path3)));
-var normalizeIgnored = (cwd = "") => (path3) => {
-  if (typeof path3 === "string") {
-    return normalizePathToUnix(sysPath2.isAbsolute(path3) ? path3 : sysPath2.join(cwd, path3));
+var normalizePathToUnix = (path4) => toUnix(sysPath2.normalize(toUnix(path4)));
+var normalizeIgnored = (cwd = "") => (path4) => {
+  if (typeof path4 === "string") {
+    return normalizePathToUnix(sysPath2.isAbsolute(path4) ? path4 : sysPath2.join(cwd, path4));
   } else {
-    return path3;
+    return path4;
   }
 };
-var getAbsolutePath = (path3, cwd) => {
-  if (sysPath2.isAbsolute(path3)) {
-    return path3;
+var getAbsolutePath = (path4, cwd) => {
+  if (sysPath2.isAbsolute(path4)) {
+    return path4;
   }
-  return sysPath2.join(cwd, path3);
+  return sysPath2.join(cwd, path4);
 };
 var EMPTY_SET = Object.freeze(new Set);
 
@@ -223946,10 +224169,10 @@ var STAT_METHOD_F = "stat";
 var STAT_METHOD_L = "lstat";
 
 class WatchHelper {
-  constructor(path3, follow, fsw) {
+  constructor(path4, follow, fsw) {
     this.fsw = fsw;
-    const watchPath = path3;
-    this.path = path3 = path3.replace(REPLACER_RE, "");
+    const watchPath = path4;
+    this.path = path4 = path4.replace(REPLACER_RE, "");
     this.watchPath = watchPath;
     this.fullWatchPath = sysPath2.resolve(watchPath);
     this.dirParts = [];
@@ -224062,20 +224285,20 @@ class FSWatcher extends EventEmitter2 {
     this._closePromise = undefined;
     let paths = unifyPaths(paths_);
     if (cwd) {
-      paths = paths.map((path3) => {
-        const absPath = getAbsolutePath(path3, cwd);
+      paths = paths.map((path4) => {
+        const absPath = getAbsolutePath(path4, cwd);
         return absPath;
       });
     }
-    paths.forEach((path3) => {
-      this._removeIgnoredPath(path3);
+    paths.forEach((path4) => {
+      this._removeIgnoredPath(path4);
     });
     this._userIgnored = undefined;
     if (!this._readyCount)
       this._readyCount = 0;
     this._readyCount += paths.length;
-    Promise.all(paths.map(async (path3) => {
-      const res = await this._nodeFsHandler._addToNodeFs(path3, !_internal, undefined, 0, _origAdd);
+    Promise.all(paths.map(async (path4) => {
+      const res = await this._nodeFsHandler._addToNodeFs(path4, !_internal, undefined, 0, _origAdd);
       if (res)
         this._emitReady();
       return res;
@@ -224094,17 +224317,17 @@ class FSWatcher extends EventEmitter2 {
       return this;
     const paths = unifyPaths(paths_);
     const { cwd } = this.options;
-    paths.forEach((path3) => {
-      if (!sysPath2.isAbsolute(path3) && !this._closers.has(path3)) {
+    paths.forEach((path4) => {
+      if (!sysPath2.isAbsolute(path4) && !this._closers.has(path4)) {
         if (cwd)
-          path3 = sysPath2.join(cwd, path3);
-        path3 = sysPath2.resolve(path3);
+          path4 = sysPath2.join(cwd, path4);
+        path4 = sysPath2.resolve(path4);
       }
-      this._closePath(path3);
-      this._addIgnoredPath(path3);
-      if (this._watched.has(path3)) {
+      this._closePath(path4);
+      this._addIgnoredPath(path4);
+      if (this._watched.has(path4)) {
         this._addIgnoredPath({
-          path: path3,
+          path: path4,
           recursive: true
         });
       }
@@ -224153,38 +224376,38 @@ class FSWatcher extends EventEmitter2 {
     if (event !== EVENTS.ERROR)
       this.emit(EVENTS.ALL, event, ...args);
   }
-  async _emit(event, path3, stats) {
+  async _emit(event, path4, stats) {
     if (this.closed)
       return;
     const opts = this.options;
     if (isWindows)
-      path3 = sysPath2.normalize(path3);
+      path4 = sysPath2.normalize(path4);
     if (opts.cwd)
-      path3 = sysPath2.relative(opts.cwd, path3);
-    const args = [path3];
+      path4 = sysPath2.relative(opts.cwd, path4);
+    const args = [path4];
     if (stats != null)
       args.push(stats);
     const awf = opts.awaitWriteFinish;
     let pw;
-    if (awf && (pw = this._pendingWrites.get(path3))) {
+    if (awf && (pw = this._pendingWrites.get(path4))) {
       pw.lastChange = new Date;
       return this;
     }
     if (opts.atomic) {
       if (event === EVENTS.UNLINK) {
-        this._pendingUnlinks.set(path3, [event, ...args]);
+        this._pendingUnlinks.set(path4, [event, ...args]);
         setTimeout(() => {
-          this._pendingUnlinks.forEach((entry, path4) => {
+          this._pendingUnlinks.forEach((entry, path5) => {
             this.emit(...entry);
             this.emit(EVENTS.ALL, ...entry);
-            this._pendingUnlinks.delete(path4);
+            this._pendingUnlinks.delete(path5);
           });
         }, typeof opts.atomic === "number" ? opts.atomic : 100);
         return this;
       }
-      if (event === EVENTS.ADD && this._pendingUnlinks.has(path3)) {
+      if (event === EVENTS.ADD && this._pendingUnlinks.has(path4)) {
         event = EVENTS.CHANGE;
-        this._pendingUnlinks.delete(path3);
+        this._pendingUnlinks.delete(path4);
       }
     }
     if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -224202,16 +224425,16 @@ class FSWatcher extends EventEmitter2 {
           this.emitWithAll(event, args);
         }
       };
-      this._awaitWriteFinish(path3, awf.stabilityThreshold, event, awfEmit);
+      this._awaitWriteFinish(path4, awf.stabilityThreshold, event, awfEmit);
       return this;
     }
     if (event === EVENTS.CHANGE) {
-      const isThrottled = !this._throttle(EVENTS.CHANGE, path3, 50);
+      const isThrottled = !this._throttle(EVENTS.CHANGE, path4, 50);
       if (isThrottled)
         return this;
     }
     if (opts.alwaysStat && stats === undefined && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
-      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path3) : path3;
+      const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path4) : path4;
       let stats2;
       try {
         stats2 = await stat3(fullPath);
@@ -224230,23 +224453,23 @@ class FSWatcher extends EventEmitter2 {
     }
     return error || this.closed;
   }
-  _throttle(actionType, path3, timeout) {
+  _throttle(actionType, path4, timeout) {
     if (!this._throttled.has(actionType)) {
       this._throttled.set(actionType, new Map);
     }
     const action = this._throttled.get(actionType);
     if (!action)
       throw new Error("invalid throttle");
-    const actionPath = action.get(path3);
+    const actionPath = action.get(path4);
     if (actionPath) {
       actionPath.count++;
       return false;
     }
     let timeoutObject;
     const clear = () => {
-      const item = action.get(path3);
+      const item = action.get(path4);
       const count = item ? item.count : 0;
-      action.delete(path3);
+      action.delete(path4);
       clearTimeout(timeoutObject);
       if (item)
         clearTimeout(item.timeoutObject);
@@ -224254,50 +224477,50 @@ class FSWatcher extends EventEmitter2 {
     };
     timeoutObject = setTimeout(clear, timeout);
     const thr = { timeoutObject, clear, count: 0 };
-    action.set(path3, thr);
+    action.set(path4, thr);
     return thr;
   }
   _incrReadyCount() {
     return this._readyCount++;
   }
-  _awaitWriteFinish(path3, threshold, event, awfEmit) {
+  _awaitWriteFinish(path4, threshold, event, awfEmit) {
     const awf = this.options.awaitWriteFinish;
     if (typeof awf !== "object")
       return;
     const pollInterval = awf.pollInterval;
     let timeoutHandler;
-    let fullPath = path3;
-    if (this.options.cwd && !sysPath2.isAbsolute(path3)) {
-      fullPath = sysPath2.join(this.options.cwd, path3);
+    let fullPath = path4;
+    if (this.options.cwd && !sysPath2.isAbsolute(path4)) {
+      fullPath = sysPath2.join(this.options.cwd, path4);
     }
     const now = new Date;
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
       statcb(fullPath, (err, curStat) => {
-        if (err || !writes.has(path3)) {
+        if (err || !writes.has(path4)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
           return;
         }
         const now2 = Number(new Date);
         if (prevStat && curStat.size !== prevStat.size) {
-          writes.get(path3).lastChange = now2;
+          writes.get(path4).lastChange = now2;
         }
-        const pw = writes.get(path3);
+        const pw = writes.get(path4);
         const df = now2 - pw.lastChange;
         if (df >= threshold) {
-          writes.delete(path3);
+          writes.delete(path4);
           awfEmit(undefined, curStat);
         } else {
           timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
         }
       });
     }
-    if (!writes.has(path3)) {
-      writes.set(path3, {
+    if (!writes.has(path4)) {
+      writes.set(path4, {
         lastChange: now,
         cancelWait: () => {
-          writes.delete(path3);
+          writes.delete(path4);
           clearTimeout(timeoutHandler);
           return event;
         }
@@ -224305,8 +224528,8 @@ class FSWatcher extends EventEmitter2 {
       timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval);
     }
   }
-  _isIgnored(path3, stats) {
-    if (this.options.atomic && DOT_RE.test(path3))
+  _isIgnored(path4, stats) {
+    if (this.options.atomic && DOT_RE.test(path4))
       return true;
     if (!this._userIgnored) {
       const { cwd } = this.options;
@@ -224316,13 +224539,13 @@ class FSWatcher extends EventEmitter2 {
       const list = [...ignoredPaths.map(normalizeIgnored(cwd)), ...ignored];
       this._userIgnored = anymatch(list, undefined);
     }
-    return this._userIgnored(path3, stats);
+    return this._userIgnored(path4, stats);
   }
-  _isntIgnored(path3, stat4) {
-    return !this._isIgnored(path3, stat4);
+  _isntIgnored(path4, stat4) {
+    return !this._isIgnored(path4, stat4);
   }
-  _getWatchHelpers(path3) {
-    return new WatchHelper(path3, this.options.followSymlinks, this);
+  _getWatchHelpers(path4) {
+    return new WatchHelper(path4, this.options.followSymlinks, this);
   }
   _getWatchedDir(directory) {
     const dir = sysPath2.resolve(directory);
@@ -224336,57 +224559,57 @@ class FSWatcher extends EventEmitter2 {
     return Boolean(Number(stats.mode) & 256);
   }
   _remove(directory, item, isDirectory) {
-    const path3 = sysPath2.join(directory, item);
-    const fullPath = sysPath2.resolve(path3);
-    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path3) || this._watched.has(fullPath);
-    if (!this._throttle("remove", path3, 100))
+    const path4 = sysPath2.join(directory, item);
+    const fullPath = sysPath2.resolve(path4);
+    isDirectory = isDirectory != null ? isDirectory : this._watched.has(path4) || this._watched.has(fullPath);
+    if (!this._throttle("remove", path4, 100))
       return;
     if (!isDirectory && this._watched.size === 1) {
       this.add(directory, item, true);
     }
-    const wp = this._getWatchedDir(path3);
+    const wp = this._getWatchedDir(path4);
     const nestedDirectoryChildren = wp.getChildren();
-    nestedDirectoryChildren.forEach((nested) => this._remove(path3, nested));
+    nestedDirectoryChildren.forEach((nested) => this._remove(path4, nested));
     const parent = this._getWatchedDir(directory);
     const wasTracked = parent.has(item);
     parent.remove(item);
     if (this._symlinkPaths.has(fullPath)) {
       this._symlinkPaths.delete(fullPath);
     }
-    let relPath = path3;
+    let relPath = path4;
     if (this.options.cwd)
-      relPath = sysPath2.relative(this.options.cwd, path3);
+      relPath = sysPath2.relative(this.options.cwd, path4);
     if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
       const event = this._pendingWrites.get(relPath).cancelWait();
       if (event === EVENTS.ADD)
         return;
     }
-    this._watched.delete(path3);
+    this._watched.delete(path4);
     this._watched.delete(fullPath);
     const eventName = isDirectory ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
-    if (wasTracked && !this._isIgnored(path3))
-      this._emit(eventName, path3);
-    this._closePath(path3);
+    if (wasTracked && !this._isIgnored(path4))
+      this._emit(eventName, path4);
+    this._closePath(path4);
   }
-  _closePath(path3) {
-    this._closeFile(path3);
-    const dir = sysPath2.dirname(path3);
-    this._getWatchedDir(dir).remove(sysPath2.basename(path3));
+  _closePath(path4) {
+    this._closeFile(path4);
+    const dir = sysPath2.dirname(path4);
+    this._getWatchedDir(dir).remove(sysPath2.basename(path4));
   }
-  _closeFile(path3) {
-    const closers = this._closers.get(path3);
+  _closeFile(path4) {
+    const closers = this._closers.get(path4);
     if (!closers)
       return;
     closers.forEach((closer) => closer());
-    this._closers.delete(path3);
+    this._closers.delete(path4);
   }
-  _addPathCloser(path3, closer) {
+  _addPathCloser(path4, closer) {
     if (!closer)
       return;
-    let list = this._closers.get(path3);
+    let list = this._closers.get(path4);
     if (!list) {
       list = [];
-      this._closers.set(path3, list);
+      this._closers.set(path4, list);
     }
     list.push(closer);
   }
@@ -224416,7 +224639,7 @@ function watch(paths, options = {}) {
 var esm_default = { watch, FSWatcher };
 
 // src/controller/watch-mode.controller.ts
-import path9 from "path";
+import path10 from "path";
 
 // src/service/project_store.ts
 var import_client_s32 = __toESM(require_dist_cjs75(), 1);
@@ -224634,7 +224857,7 @@ class Mutex {
 // src/service/project_store.ts
 import crypto3 from "crypto";
 import * as fs7 from "fs";
-import * as path8 from "path";
+import * as path9 from "path";
 
 // ../../node_modules/simple-git/dist/esm/index.js
 var import_file_exists = __toESM(require_dist11(), 1);
@@ -224672,8 +224895,8 @@ function pathspec(...paths) {
   cache.set(key, paths);
   return key;
 }
-function isPathSpec(path3) {
-  return path3 instanceof String && cache.has(path3);
+function isPathSpec(path4) {
+  return path4 instanceof String && cache.has(path4);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -224759,8 +224982,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = `
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path3) {
-  return import_file_exists.exists(path3, import_file_exists.FOLDER);
+function folderExists(path4) {
+  return import_file_exists.exists(path4, import_file_exists.FOLDER);
 }
 function append2(target, item) {
   if (Array.isArray(target)) {
@@ -225141,8 +225364,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path3) {
-      return /^\.(git)?$/.test(path3.trim());
+    parser(path4) {
+      return /^\.(git)?$/.test(path4.trim());
     }
   };
 }
@@ -225553,11 +225776,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set;
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path3, line, preview] = input.split(NULL);
-    paths.add(path3);
-    (results[path3] = results[path3] || []).push({
+    const [path4, line, preview] = input.split(NULL);
+    paths.add(path4);
+    (results[path4] = results[path4] || []).push({
       line: asNumber(line),
-      path: path3,
+      path: path4,
       preview
     });
   });
@@ -226219,14 +226442,14 @@ var init_hash_object = __esm({
     init_task();
   }
 });
-function parseInit(bare, path3, text) {
+function parseInit(bare, path4, text) {
   const response = String(text).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path3, false, result[1]);
+    return new InitSummary(bare, path4, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path3, true, result[1]);
+    return new InitSummary(bare, path4, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -226237,7 +226460,7 @@ function parseInit(bare, path3, text) {
       break;
     }
   }
-  return new InitSummary(bare, path3, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path4, /^re/i.test(response), gitDir);
 }
 var InitSummary;
 var initResponseRegex;
@@ -226245,9 +226468,9 @@ var reInitResponseRegex;
 var init_InitSummary = __esm({
   "src/lib/responses/InitSummary.ts"() {
     InitSummary = class {
-      constructor(bare, path3, existing, gitDir) {
+      constructor(bare, path4, existing, gitDir) {
         this.bare = bare;
-        this.path = path3;
+        this.path = path4;
         this.existing = existing;
         this.gitDir = gitDir;
       }
@@ -226259,7 +226482,7 @@ var init_InitSummary = __esm({
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path3, customArgs) {
+function initTask(bare = false, path4, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -226268,7 +226491,7 @@ function initTask(bare = false, path3, customArgs) {
     commands,
     format: "utf-8",
     parser(text) {
-      return parseInit(commands.includes("--bare"), path3, text);
+      return parseInit(commands.includes("--bare"), path4, text);
     }
   };
 }
@@ -226983,12 +227206,12 @@ var init_FileStatusSummary = __esm({
   "src/lib/responses/FileStatusSummary.ts"() {
     fromPathRegex = /^(.+)\0(.+)$/;
     FileStatusSummary = class {
-      constructor(path3, index, working_dir) {
-        this.path = path3;
+      constructor(path4, index, working_dir) {
+        this.path = path4;
         this.index = index;
         this.working_dir = working_dir;
         if (index === "R" || working_dir === "R") {
-          const detail = fromPathRegex.exec(path3) || [null, path3, path3];
+          const detail = fromPathRegex.exec(path4) || [null, path4, path4];
           this.from = detail[2] || "";
           this.path = detail[1] || "";
         }
@@ -227019,14 +227242,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path3) {
+  function data(index, workingDir, path4) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path3);
+      handler(result, path4);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path3, index, workingDir));
+      result.files.push(new FileStatusSummary(path4, index, workingDir));
     }
   }
 }
@@ -227257,8 +227480,8 @@ var init_simple_git_api = __esm({
         }
         return this._runTask(configurationErrorTask("Git.cwd: workingDirectory must be supplied as a string"), next);
       }
-      hashObject(path3, write) {
-        return this._runTask(hashObjectTask(path3, write === true), trailingFunctionArgument(arguments));
+      hashObject(path4, write) {
+        return this._runTask(hashObjectTask(path4, write === true), trailingFunctionArgument(arguments));
       }
       init(bare) {
         return this._runTask(initTask(bare === true, this._executor.cwd, getTrailingOptions(arguments)), trailingFunctionArgument(arguments));
@@ -227835,8 +228058,8 @@ __export2(sub_module_exports, {
   subModuleTask: () => subModuleTask,
   updateSubModuleTask: () => updateSubModuleTask
 });
-function addSubModuleTask(repo, path3) {
-  return subModuleTask(["add", repo, path3]);
+function addSubModuleTask(repo, path4) {
+  return subModuleTask(["add", repo, path4]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -228104,8 +228327,8 @@ var require_git = __commonJS2({
       }
       return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
     };
-    Git2.prototype.submoduleAdd = function(repo, path3, then) {
-      return this._runTask(addSubModuleTask2(repo, path3), trailingFunctionArgument2(arguments));
+    Git2.prototype.submoduleAdd = function(repo, path4, then) {
+      return this._runTask(addSubModuleTask2(repo, path4), trailingFunctionArgument2(arguments));
     };
     Git2.prototype.submoduleUpdate = function(args, then) {
       return this._runTask(updateSubModuleTask2(getTrailingOptions2(arguments, true)), trailingFunctionArgument2(arguments));
@@ -228621,7 +228844,7 @@ import { Writable } from "stream";
 
 // src/config.ts
 import fs2 from "fs";
-import path3 from "path";
+import path4 from "path";
 function substituteEnvVars(value) {
   const envVarPattern = /\$\{([A-Z_][A-Z0-9_]*)\}/g;
   return value.replace(envVarPattern, (_match, varName) => {
@@ -228649,7 +228872,7 @@ function processConfigValue(value) {
   return value;
 }
 var getPublisherConfig = (serverRoot) => {
-  const publisherConfigPath = path3.join(serverRoot, PUBLISHER_CONFIG_NAME);
+  const publisherConfigPath = path4.join(serverRoot, PUBLISHER_CONFIG_NAME);
   if (!fs2.existsSync(publisherConfigPath)) {
     return {
       frozenConfig: false,
@@ -228871,7 +229094,7 @@ function registerHealthEndpoints(app) {
 
 // src/storage/duckdb/DuckDBConnection.ts
 import duckdb from "duckdb";
-import * as path4 from "path";
+import * as path5 from "path";
 
 class DuckDBConnection2 {
   db = null;
@@ -228879,7 +229102,7 @@ class DuckDBConnection2 {
   dbPath;
   mutex = new Mutex;
   constructor(dbPath) {
-    this.dbPath = dbPath || path4.join(process.cwd(), "publisher.db");
+    this.dbPath = dbPath || path5.join(process.cwd(), "publisher.db");
   }
   async initialize() {
     return new Promise((resolve3, reject) => {
@@ -229970,20 +230193,20 @@ class StorageManager {
 }
 
 // src/service/project.ts
-import { FixedConnectionMap as FixedConnectionMap2, MalloyError as MalloyError3, Runtime as Runtime2 } from "@malloydata/malloy";
+import { MalloyError as MalloyError3, Runtime as Runtime2 } from "@malloydata/malloy";
 import * as fs6 from "fs";
-import * as path7 from "path";
+import * as path8 from "path";
 
 // src/utils.ts
 import * as fs3 from "fs";
 import { fileURLToPath } from "url";
 var URL_READER = {
   readURL: (url2) => {
-    let path5 = url2.toString();
+    let path6 = url2.toString();
     if (url2.protocol == "file:") {
-      path5 = fileURLToPath(url2);
+      path6 = fileURLToPath(url2);
     }
-    return fs3.promises.readFile(path5, "utf8");
+    return fs3.promises.readFile(path6, "utf8");
   }
 };
 
@@ -229991,11 +230214,15 @@ var URL_READER = {
 var import_api3 = __toESM(require_src(), 1);
 var import_recursive_readdir = __toESM(require_recursive_readdir(), 1);
 import * as fs5 from "fs/promises";
-import * as path6 from "path";
+import * as path7 from "path";
 import { DuckDBConnection as DuckDBConnection3 } from "@malloydata/db-duckdb";
+import"@malloydata/db-duckdb/native";
 import {
   ConnectionRuntime,
-  EmptyURLReader
+  EmptyURLReader,
+  FixedConnectionMap as FixedConnectionMap2,
+  contextOverlay as contextOverlay2,
+  MalloyConfig as MalloyConfig3
 } from "@malloydata/malloy";
 
 // src/service/model.ts
@@ -230004,6 +230231,7 @@ import {
   API,
   FixedConnectionMap,
   isSourceDef,
+  MalloyConfig as MalloyConfig2,
   MalloyError as MalloyError2,
   modelDefToModelInfo,
   Runtime
@@ -230014,8 +230242,7 @@ import {
 } from "@malloydata/malloy-sql";
 import { createRequire as createRequire2 } from "module";
 import * as fs4 from "fs/promises";
-import * as path5 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import * as path6 from "path";
 
 // src/data_styles.ts
 function compileDataStyles(styles) {
@@ -230301,8 +230528,8 @@ class Model {
     const arrowMatch = query.match(/^\s*(\w+)\s*->/m);
     return runMatch?.[1] ?? arrowMatch?.[1];
   }
-  static async create(packageName, packagePath, modelPath, connections, options) {
-    const { runtime, modelURL, importBaseURL, dataStyles, modelType } = await Model.getModelRuntime(packagePath, modelPath, connections, options);
+  static async create(packageName, packagePath, modelPath, malloyConfig, options) {
+    const { runtime, modelURL, importBaseURL, dataStyles, modelType } = await Model.getModelRuntime(packagePath, modelPath, malloyConfig, options);
     try {
       const { modelMaterializer, runnableNotebookCells } = await Model.getModelMaterializer(runtime, importBaseURL, modelURL, modelPath);
       let modelDef = undefined;
@@ -230625,8 +230852,8 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
       newSources: cell.newSources?.map((source) => JSON.stringify(source))
     };
   }
-  static async getModelRuntime(packagePath, modelPath, connections, options) {
-    const fullModelPath = path5.join(packagePath, modelPath);
+  static async getModelRuntime(packagePath, modelPath, malloyConfig, options) {
+    const fullModelPath = path6.join(packagePath, modelPath);
     try {
       if (!(await fs4.stat(fullModelPath)).isFile()) {
         throw new ModelNotFoundError(`${modelPath} is not a file.`);
@@ -230644,26 +230871,24 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
     }
     const modelURL = new URL(`file://${fullModelPath}`);
     const baseUrl = new URL(".", modelURL);
-    const fileUrl = new URL(baseUrl.pathname, "file:");
-    const workingDirectory = fileURLToPath2(fileUrl);
     const importBaseURL = new URL(baseUrl.pathname + "/", "file:");
     const urlReader = new HackyDataStylesAccumulator(URL_READER);
-    const duckdbConnection = connections.get("duckdb");
-    await duckdbConnection.runSQL(`SET FILE_SEARCH_PATH='${workingDirectory}';`);
-    const runtimeOptions = {
+    const runtime = new Runtime({
       urlReader,
-      connections: new FixedConnectionMap(connections, "duckdb")
-    };
-    if (options?.buildManifest) {
-      runtimeOptions.buildManifest = {
-        entries: options.buildManifest,
-        strict: false
-      };
-    }
-    const runtime = new Runtime(runtimeOptions);
+      config: Model.toMalloyConfig(malloyConfig),
+      buildManifest: options?.buildManifest ? { entries: options.buildManifest, strict: false } : undefined
+    });
     const dataStyles = urlReader.getHackyAccumulatedDataStyles();
     return { runtime, modelURL, importBaseURL, dataStyles, modelType };
   }
+  static toMalloyConfig(input) {
+    if (input instanceof MalloyConfig2) {
+      return input;
+    }
+    const malloyConfig = new MalloyConfig2({ connections: {} });
+    malloyConfig.wrapConnections(() => new FixedConnectionMap(input, "duckdb"));
+    return malloyConfig;
+  }
   static getQueries(modelPath, modelDef) {
     const isNamedQuery = (object) => object.type === "query";
     return Object.values(modelDef.contents).filter(isNamedQuery).map((queryObj) => ({
@@ -230841,7 +231066,7 @@ run: ${sourceName ? sourceName + "->" : ""}${queryName}`;
     return this.modelType;
   }
   async getFileText(packagePath) {
-    const fullPath = path5.join(packagePath, this.modelPath);
+    const fullPath = path6.join(packagePath, this.modelPath);
     try {
       return await fs4.readFile(fullPath, "utf8");
     } catch {
@@ -230860,22 +231085,22 @@ class Package {
   databases;
   models = new Map;
   packagePath;
-  connections = new Map;
+  malloyConfig;
   static meter = import_api3.metrics.getMeter("publisher");
   static packageLoadHistogram = this.meter.createHistogram("malloy_package_load_duration", {
     description: "Time taken to load a Malloy package",
     unit: "ms"
   });
-  constructor(projectName, packageName, packagePath, packageMetadata, databases, models, connections = new Map) {
+  constructor(projectName, packageName, packagePath, packageMetadata, databases, models, malloyConfig = new MalloyConfig3({ connections: {} })) {
     this.projectName = projectName;
     this.packageName = packageName;
     this.packagePath = packagePath;
     this.packageMetadata = packageMetadata;
     this.databases = databases;
     this.models = models;
-    this.connections = connections;
+    this.malloyConfig = malloyConfig;
   }
-  static async create(projectName, packageName, packagePath, projectConnections) {
+  static async create(projectName, packageName, packagePath, projectMalloyConfig) {
     const startTime = performance.now();
     await Package.validatePackageManifestExistsOrThrowError(packagePath);
     const manifestValidationTime = performance.now();
@@ -230898,10 +231123,8 @@ class Package {
         databaseCount: databases.length,
         duration: formatDuration(databasesTime - packageConfigTime)
       });
-      const connections = new Map(projectConnections);
-      const duckdbConnection = new DuckDBConnection3("duckdb", ":memory:", packagePath);
-      connections.set("duckdb", duckdbConnection);
-      const models = await Package.loadModels(packageName, packagePath, connections);
+      const malloyConfig = Package.buildPackageMalloyConfig(packagePath, typeof projectMalloyConfig === "function" ? projectMalloyConfig : () => Package.toMalloyConfig(projectMalloyConfig));
+      const models = await Package.loadModels(packageName, packagePath, malloyConfig);
       const modelsTime = performance.now();
       logger.info("Models loaded", {
         packageName,
@@ -230935,7 +231158,7 @@ class Package {
         packageName,
         duration: formatDuration(executionTime)
       });
-      return new Package(projectName, packageName, packagePath, packageConfig, databases, models, connections);
+      return new Package(projectName, packageName, packagePath, packageConfig, databases, models, malloyConfig);
     } catch (error) {
       logger.error(`Error loading package ${packageName}`, { error });
       console.error(error);
@@ -230962,9 +231185,6 @@ class Package {
   getPackageName() {
     return this.packageName;
   }
-  getPackagePath() {
-    return this.packagePath;
-  }
   getPackageMetadata() {
     return this.packageMetadata;
   }
@@ -230974,6 +231194,15 @@ class Package {
   getModel(modelPath) {
     return this.models.get(modelPath);
   }
+  async getMalloyConnection(connectionName) {
+    return this.malloyConfig.connections.lookupConnection(connectionName);
+  }
+  getMalloyConfig() {
+    return this.malloyConfig;
+  }
+  getPackagePath() {
+    return this.packagePath;
+  }
   getModelPaths() {
     return Array.from(this.models.keys());
   }
@@ -230984,23 +231213,13 @@ class Package {
       modelCount: modelPaths.length,
       manifestEntryCount: Object.keys(buildManifest).length
     });
-    const reloaded = await Promise.all(modelPaths.map((modelPath) => Model.create(this.packageName, this.packagePath, modelPath, this.connections, { buildManifest })));
+    const reloaded = await Promise.all(modelPaths.map((modelPath) => Model.create(this.packageName, this.packagePath, modelPath, this.malloyConfig, { buildManifest })));
     const nextModels = new Map;
     for (const model of reloaded) {
       nextModels.set(model.getPath(), model);
     }
     this.models = nextModels;
   }
-  getConnections() {
-    return this.connections;
-  }
-  getMalloyConnection(connectionName) {
-    const connection = this.connections.get(connectionName);
-    if (!connection) {
-      throw new Error(`Connection ${connectionName} not found in package ${this.packageName}`);
-    }
-    return connection;
-  }
   async getModelFileText(modelPath) {
     const model = this.getModel(modelPath);
     if (!model) {
@@ -231045,11 +231264,40 @@ class Package {
       };
     }));
   }
-  static async loadModels(packageName, packagePath, connections) {
+  static async loadModels(packageName, packagePath, malloyConfig) {
     const modelPaths = await Package.getModelPaths(packagePath);
-    const models = await Promise.all(modelPaths.map((modelPath) => Model.create(packageName, packagePath, modelPath, connections)));
+    const models = await Promise.all(modelPaths.map((modelPath) => Model.create(packageName, packagePath, modelPath, malloyConfig)));
     return new Map(models.map((model) => [model.getPath(), model]));
   }
+  static buildPackageMalloyConfig(packagePath, getProjectMalloyConfig) {
+    const malloyConfig = new MalloyConfig3({
+      connections: {
+        duckdb: {
+          is: "duckdb",
+          databasePath: ":memory:"
+        }
+      }
+    }, {
+      config: contextOverlay2({ rootDirectory: packagePath })
+    });
+    malloyConfig.wrapConnections((base) => ({
+      lookupConnection: async (name) => {
+        if (!name || name === "duckdb") {
+          return base.lookupConnection(name);
+        }
+        return getProjectMalloyConfig().connections.lookupConnection(name);
+      }
+    }));
+    return malloyConfig;
+  }
+  static toMalloyConfig(input) {
+    if (input instanceof MalloyConfig3) {
+      return input;
+    }
+    const malloyConfig = new MalloyConfig3({ connections: {} });
+    malloyConfig.wrapConnections(() => new FixedConnectionMap2(input, "duckdb"));
+    return malloyConfig;
+  }
   static async getModelPaths(packagePath) {
     let files = undefined;
     try {
@@ -231059,11 +231307,11 @@ class Package {
       throw new PackageNotFoundError(`Package config for ${packagePath} does not exist.`);
     }
     return files.map((fullPath) => {
-      return path6.relative(packagePath, fullPath).replace(/\\/g, "/");
+      return path7.relative(packagePath, fullPath).replace(/\\/g, "/");
     }).filter((modelPath) => modelPath.endsWith(MODEL_FILE_SUFFIX) || modelPath.endsWith(NOTEBOOK_FILE_SUFFIX));
   }
   static async validatePackageManifestExistsOrThrowError(packagePath) {
-    const packageConfigPath = path6.join(packagePath, PACKAGE_MANIFEST_NAME);
+    const packageConfigPath = path7.join(packagePath, PACKAGE_MANIFEST_NAME);
     try {
       await fs5.stat(packageConfigPath);
     } catch {
@@ -231072,7 +231320,7 @@ class Package {
     }
   }
   static async readPackageConfig(packagePath) {
-    const packageConfigPath = path6.join(packagePath, PACKAGE_MANIFEST_NAME);
+    const packageConfigPath = path7.join(packagePath, PACKAGE_MANIFEST_NAME);
     const packageConfigContents = await fs5.readFile(packageConfigPath);
     const packageManifest = JSON.parse(packageConfigContents.toString());
     return {
@@ -231094,11 +231342,11 @@ class Package {
     let files = undefined;
     files = await import_recursive_readdir.default(packagePath);
     return files.map((fullPath) => {
-      return path6.relative(packagePath, fullPath).replace(/\\/g, "/");
+      return path7.relative(packagePath, fullPath).replace(/\\/g, "/");
     }).filter((modelPath) => modelPath.endsWith(".parquet") || modelPath.endsWith(".csv"));
   }
   static async getDatabaseInfo(packagePath, databasePath) {
-    const fullPath = path6.join(packagePath, databasePath);
+    const fullPath = path7.join(packagePath, databasePath);
     const runtime = new ConnectionRuntime({
       urlReader: new EmptyURLReader,
       connections: [new DuckDBConnection3("duckdb")]
@@ -231127,19 +231375,23 @@ class Package {
 }
 
 // src/service/project.ts
+var RETIRED_CONNECTION_DRAIN_MS = 30000;
+
 class Project {
   packages = new Map;
   packageMutexes = new Map;
   packageStatuses = new Map;
-  malloyConnections;
+  malloyConfig;
+  connectionMutex = new Mutex;
+  retiredConnectionGenerations = new Set;
   apiConnections;
   projectPath;
   projectName;
   metadata;
-  constructor(projectName, projectPath, malloyConnections, apiConnections) {
+  constructor(projectName, projectPath, malloyConfig, apiConnections) {
     this.projectName = projectName;
     this.projectPath = projectPath;
-    this.malloyConnections = malloyConnections;
+    this.malloyConfig = malloyConfig;
     this.apiConnections = apiConnections;
     this.metadata = {
       resource: `${API_PREFIX}/projects/${this.projectName}`,
@@ -231151,7 +231403,7 @@ class Project {
   async writeProjectReadme(readme) {
     if (readme === undefined)
       return;
-    const readmePath = path7.join(this.projectPath, "README.md");
+    const readmePath = path8.join(this.projectPath, "README.md");
     try {
       await fs6.promises.writeFile(readmePath, readme, "utf-8");
       logger.info(`Updated README.md for project ${this.projectName}`);
@@ -231166,15 +231418,16 @@ class Project {
       await this.writeProjectReadme(payload.readme);
     }
     if (payload.connections) {
-      logger.info(`Updating ${payload.connections.length} connections for project ${this.projectName}`);
-      const isUpdateConnectionRequest = true;
-      const { malloyConnections, apiConnections } = await createProjectConnections(payload.connections, this.projectPath, isUpdateConnectionRequest);
-      this.malloyConnections = malloyConnections;
-      this.apiConnections = apiConnections;
-      logger.info(`Successfully updated connections for project ${this.projectName}`, {
-        malloyConnections: malloyConnections.size,
-        apiConnections: apiConnections.length,
-        internalConnections: apiConnections.length
+      const payloadConnections = payload.connections;
+      await this.runConnectionUpdateExclusive(async () => {
+        logger.info(`Updating ${payloadConnections.length} connections for project ${this.projectName}`);
+        const isUpdateConnectionRequest = true;
+        const nextMalloyConfig = buildProjectMalloyConfig(payloadConnections, this.projectPath, isUpdateConnectionRequest);
+        this.updateConnections(nextMalloyConfig);
+        logger.info(`Successfully updated connections for project ${this.projectName}`, {
+          apiConnections: this.apiConnections.length,
+          internalConnections: this.apiConnections.length
+        });
       });
     }
     return this;
@@ -231184,18 +231437,17 @@ class Project {
       throw new ProjectNotFoundError(`Project path ${projectPath} not found`);
     }
     logger.info(`Creating project with connection configuration`);
-    const { malloyConnections, apiConnections } = await createProjectConnections(connections, projectPath);
-    logger.info(`Loaded ${malloyConnections.size + apiConnections.length} connections for project ${projectName}`, {
-      malloyConnections,
-      apiConnections
+    const malloyConfig = buildProjectMalloyConfig(connections, projectPath);
+    logger.info(`Loaded ${malloyConfig.apiConnections.length} connections for project ${projectName}`, {
+      apiConnections: malloyConfig.apiConnections
     });
-    const project = new Project(projectName, projectPath, malloyConnections, apiConnections);
+    const project = new Project(projectName, projectPath, malloyConfig, malloyConfig.apiConnections);
     return project;
   }
   async reloadProjectMetadata() {
     let readme = "";
     try {
-      readme = (await fs6.promises.readFile(path7.join(this.projectPath, README_NAME))).toString();
+      readme = (await fs6.promises.readFile(path8.join(this.projectPath, README_NAME))).toString();
     } catch {}
     this.metadata = {
       ...this.metadata,
@@ -231206,10 +231458,10 @@ class Project {
     return this.metadata;
   }
   async compileSource(packageName, modelName, source, includeSql = false) {
-    const modelDir = path7.dirname(path7.join(this.projectPath, packageName, modelName));
-    const virtualUri = `file://${path7.join(modelDir, "__compile_check.malloy")}`;
+    const modelDir = path8.dirname(path8.join(this.projectPath, packageName, modelName));
+    const virtualUri = `file://${path8.join(modelDir, "__compile_check.malloy")}`;
     const virtualUrl = new URL(virtualUri);
-    const modelPath = path7.join(this.projectPath, packageName, modelName);
+    const modelPath = path8.join(this.projectPath, packageName, modelName);
     let modelContent = "";
     try {
       modelContent = await fs6.promises.readFile(modelPath, "utf8");
@@ -231224,9 +231476,10 @@ ${source}` : source;
         return URL_READER.readURL(url2);
       }
     };
+    const pkg = await this.getPackage(packageName);
     const runtime = new Runtime2({
       urlReader: interceptingReader,
-      connections: new FixedConnectionMap2(this.malloyConnections, "duckdb")
+      config: pkg.getMalloyConfig()
     });
     try {
       const modelMaterializer = runtime.loadModel(virtualUrl);
@@ -231256,12 +231509,40 @@ ${source}` : source;
     }
     return connection;
   }
-  getMalloyConnection(connectionName) {
-    const connection = this.malloyConnections.get(connectionName);
-    if (!connection) {
-      throw new ConnectionNotFoundError(`Connection ${connectionName} not found`);
+  async getMalloyConnection(connectionName) {
+    return this.malloyConfig.malloyConfig.connections.lookupConnection(connectionName);
+  }
+  getProjectMalloyConfig() {
+    return this.malloyConfig.malloyConfig;
+  }
+  async runConnectionUpdateExclusive(fn) {
+    return this.connectionMutex.runExclusive(fn);
+  }
+  retireConnectionGeneration(label, releaseConnections) {
+    const generation = {
+      label,
+      releaseConnections
+    };
+    generation.timer = setTimeout(() => {
+      this.releaseRetiredConnectionGeneration(generation);
+    }, RETIRED_CONNECTION_DRAIN_MS);
+    generation.timer.unref?.();
+    this.retiredConnectionGenerations.add(generation);
+  }
+  async releaseRetiredConnectionGeneration(generation) {
+    if (!this.retiredConnectionGenerations.delete(generation))
+      return;
+    if (generation.timer) {
+      clearTimeout(generation.timer);
     }
-    return connection;
+    try {
+      await generation.releaseConnections();
+    } catch (error) {
+      logger.error(`Error releasing retired connection generation ${generation.label}`, { error });
+    }
+  }
+  async releaseAllRetiredConnectionGenerations() {
+    await Promise.all([...this.retiredConnectionGenerations].map((generation) => this.releaseRetiredConnectionGeneration(generation)));
   }
   async listPackages() {
     logger.debug("Listing packages", { projectPath: this.projectPath });
@@ -231316,8 +231597,11 @@ ${source}` : source;
       this.setPackageStatus(packageName, "loading" /* LOADING */);
       try {
         logger.debug(`Loading package ${packageName}...`);
-        const packagePath = path7.join(this.projectPath, packageName);
-        const _package2 = await Package.create(this.projectName, packageName, packagePath, this.malloyConnections);
+        const packagePath = path8.join(this.projectPath, packageName);
+        const _package2 = await Package.create(this.projectName, packageName, packagePath, () => this.malloyConfig.malloyConfig);
+        if (existingPackage !== undefined && reload) {
+          this.retireConnectionGeneration(`package ${packageName}`, () => existingPackage.getMalloyConfig().releaseConnections());
+        }
         this.packages.set(packageName, _package2);
         this.setPackageStatus(packageName, "serving" /* SERVING */);
         logger.debug(`Successfully loaded package ${packageName}`);
@@ -231331,17 +231615,17 @@ ${source}` : source;
     });
   }
   async addPackage(packageName) {
-    const packagePath = path7.join(this.projectPath, packageName);
+    const packagePath = path8.join(this.projectPath, packageName);
     if (!await fs6.promises.access(packagePath).then(() => true).catch(() => false) || !(await fs6.promises.stat(packagePath))?.isDirectory()) {
       throw new PackageNotFoundError(`Package ${packageName} not found`);
     }
     logger.info(`Adding package ${packageName} to project ${this.projectName}`, {
       packagePath,
-      malloyConnections: this.malloyConnections
+      malloyConfig: this.malloyConfig.malloyConfig
     });
     this.setPackageStatus(packageName, "loading" /* LOADING */);
     try {
-      this.packages.set(packageName, await Package.create(this.projectName, packageName, packagePath, this.malloyConnections));
+      this.packages.set(packageName, await Package.create(this.projectName, packageName, packagePath, () => this.malloyConfig.malloyConfig));
     } catch (error) {
       logger.error("Error adding package", { error });
       this.deletePackageStatus(packageName);
@@ -231351,8 +231635,8 @@ ${source}` : source;
     return this.packages.get(packageName);
   }
   async writePackageManifest(packageName, metadata) {
-    const packagePath = path7.join(this.projectPath, packageName);
-    const manifestPath = path7.join(packagePath, "publisher.json");
+    const packagePath = path8.join(this.projectPath, packageName);
+    const manifestPath = path8.join(packagePath, "publisher.json");
     try {
       let existingManifest = {};
       try {
@@ -231422,8 +231706,9 @@ ${source}` : source;
     } else if (packageStatus?.status === "serving" /* SERVING */) {
       this.setPackageStatus(packageName, "unloading" /* UNLOADING */);
     }
+    await _package.getMalloyConfig().releaseConnections();
     try {
-      await fs6.promises.rm(path7.join(this.projectPath, packageName), {
+      await fs6.promises.rm(path8.join(this.projectPath, packageName), {
         recursive: true,
         force: true
       });
@@ -231433,39 +231718,45 @@ ${source}` : source;
     this.packages.delete(packageName);
     this.packageStatuses.delete(packageName);
   }
-  updateConnections(malloyConnections, apiConnections) {
-    this.malloyConnections = malloyConnections;
-    this.apiConnections = apiConnections;
+  updateConnections(malloyConfig, _apiConnections, afterPreviousRelease) {
+    const previousMalloyConfig = this.malloyConfig;
+    this.malloyConfig = malloyConfig;
+    this.apiConnections = malloyConfig.apiConnections;
+    if (previousMalloyConfig !== malloyConfig) {
+      this.retireConnectionGeneration(`project ${this.projectName}`, async () => {
+        await previousMalloyConfig.releaseConnections();
+        await afterPreviousRelease?.();
+      });
+    } else {
+      afterPreviousRelease?.();
+    }
   }
   async deleteConnection(connectionName) {
-    this.malloyConnections.get(connectionName)?.close();
-    const isDeleted = this.malloyConnections.delete(connectionName);
     const index = this.apiConnections.findIndex((conn) => conn.name === connectionName);
-    const connectionType = this.apiConnections[index]?.type;
-    if (connectionType === "duckdb") {
-      await this.deleteDuckDBConnection(connectionName);
-    } else if (connectionType === "ducklake") {
-      await this.deleteDuckLakeConnection(connectionName);
-    }
     if (index !== -1) {
       this.apiConnections.splice(index, 1);
     }
-    if (isDeleted || index !== -1) {
+    if (index !== -1) {
       logger.info(`Removed connection ${connectionName} from project ${this.projectName}`);
     } else {
       logger.warn(`Connection ${connectionName} not found in project ${this.projectName}`);
     }
   }
-  closeAllConnections() {
-    for (const [connectionName, connection] of this.malloyConnections) {
-      try {
-        connection.close();
-        logger.info(`Closed connection ${connectionName} for project ${this.projectName}`);
-      } catch (error) {
-        logger.error(`Error closing connection ${connectionName} for project ${this.projectName}`, { error });
+  async closeAllConnections() {
+    const packageReleases = await Promise.allSettled(Array.from(this.packages.values(), (pkg) => pkg.getMalloyConfig().releaseConnections()));
+    for (const result of packageReleases) {
+      if (result.status === "rejected") {
+        logger.error(`Error closing package connections for project ${this.projectName}`, { error: result.reason });
       }
     }
-    this.malloyConnections.clear();
+    this.packages.clear();
+    this.packageStatuses.clear();
+    try {
+      await this.malloyConfig.releaseConnections();
+    } catch (error) {
+      logger.error(`Error closing connections for project ${this.projectName}`, { error });
+    }
+    await this.releaseAllRetiredConnectionGenerations();
     this.apiConnections = [];
     logger.info(`Closed all connections for project ${this.projectName}`);
   }
@@ -231477,16 +231768,13 @@ ${source}` : source;
     };
   }
   async deleteDuckDBConnection(connectionName) {
-    const duckdbPath = path7.join(this.projectPath, `${connectionName}.duckdb`);
-    fs6.promises.access(duckdbPath).then(() => {
-      fs6.promises.rm(duckdbPath).then(() => {
-        logger.info(`Removed DuckDB connection file ${connectionName} from project ${this.projectName}`);
-      }).catch((error) => {
-        logger.error(`Failed to remove DuckDB connection file ${connectionName} from project ${this.projectName}`, { error });
-      });
-    }).catch((error) => {
+    const duckdbPath = path8.join(this.projectPath, `${connectionName}.duckdb`);
+    try {
+      await fs6.promises.rm(duckdbPath, { force: true });
+      logger.info(`Removed DuckDB connection file ${connectionName} from project ${this.projectName}`);
+    } catch (error) {
       logger.error(`Failed to remove DuckDB connection file ${connectionName} from project ${this.projectName}`, { error });
-    });
+    }
   }
   async deleteDuckLakeConnection(connectionName) {
     await deleteDuckLakeConnectionFile(connectionName, this.projectPath);
@@ -231560,12 +231848,28 @@ class ProjectStore {
     const storageConfig = {
       type: "duckdb",
       duckdb: {
-        path: path8.join(serverRootPath, "publisher.db")
+        path: path9.join(serverRootPath, "publisher.db")
       }
     };
     this.storageManager = new StorageManager(storageConfig);
     this.finishedInitialization = this.initialize();
   }
+  async addConfiguredProject(project) {
+    try {
+      await this.addProject({
+        name: project.name,
+        resource: `${API_PREFIX}/projects/${project.name}`,
+        connections: project.connections,
+        packages: project.packages
+      }, true);
+    } catch (error) {
+      this.logProjectInitializationError(project.name, error);
+    }
+  }
+  logProjectInitializationError(projectName, error) {
+    const label = projectName ? ` "${projectName}"` : "";
+    logger.error(`Error initializing project${label}; skipping project`, this.extractErrorDataFromError(error));
+  }
   async initialize() {
     const reInit = process.env.INITIALIZE_STORAGE === "true";
     const initialTime = performance.now();
@@ -231577,58 +231881,52 @@ class ProjectStore {
       const repository = this.storageManager.getRepository();
       if (reInit) {
         await Promise.all(projectManifest.projects.map(async (project) => {
-          await this.addProject({
-            name: project.name,
-            resource: `${API_PREFIX}/projects/${project.name}`,
-            connections: project.connections,
-            packages: project.packages
-          }, true);
+          await this.addConfiguredProject(project);
         }));
       } else {
         const existingProjects = await repository.listProjects();
         if (existingProjects.length > 0) {
           await Promise.all(existingProjects.map(async (dbProject) => {
-            const projectExists = await fs7.promises.access(dbProject.path).then(() => true).catch(() => false);
-            if (!projectExists) {
-              const projectConfig = projectManifest.projects.find((p) => p.name === dbProject.name);
-              if (projectConfig) {
-                const projectInstance2 = await this.addProject({
-                  name: projectConfig.name,
-                  resource: `${API_PREFIX}/projects/${projectConfig.name}`,
-                  connections: projectConfig.connections,
-                  packages: projectConfig.packages
-                }, true);
-                await repository.updateProject(dbProject.id, {
-                  path: projectInstance2.metadata.location
-                });
-                return projectInstance2.listPackages();
-              } else {
-                logger.error(`Project "${dbProject.name}" not found in config and files missing`);
-                return;
+            try {
+              const projectExists = await fs7.promises.access(dbProject.path).then(() => true).catch(() => false);
+              if (!projectExists) {
+                const projectConfig = projectManifest.projects.find((p) => p.name === dbProject.name);
+                if (projectConfig) {
+                  const projectInstance2 = await this.addProject({
+                    name: projectConfig.name,
+                    resource: `${API_PREFIX}/projects/${projectConfig.name}`,
+                    connections: projectConfig.connections,
+                    packages: projectConfig.packages
+                  }, true);
+                  await repository.updateProject(dbProject.id, {
+                    path: projectInstance2.metadata.location
+                  });
+                  return projectInstance2.listPackages();
+                } else {
+                  logger.error(`Project "${dbProject.name}" not found in config and files missing`);
+                  return;
+                }
               }
+              const connections = await repository.listConnections(dbProject.id);
+              const projectInstance = await Project.create(dbProject.name, dbProject.path, connections.map((conn) => ({
+                name: conn.name,
+                type: conn.type,
+                resource: `${API_PREFIX}/connections/${conn.name}`,
+                ...conn.config
+              })));
+              const packages = await repository.listPackages(dbProject.id);
+              packages.forEach((pkg) => {
+                projectInstance.setPackageStatus(pkg.name, "serving" /* SERVING */);
+              });
+              this.projects.set(dbProject.name, projectInstance);
+              return projectInstance.listPackages();
+            } catch (error) {
+              this.logProjectInitializationError(dbProject.name, error);
             }
-            const connections = await repository.listConnections(dbProject.id);
-            const projectInstance = await Project.create(dbProject.name, dbProject.path, connections.map((conn) => ({
-              name: conn.name,
-              type: conn.type,
-              resource: `${API_PREFIX}/connections/${conn.name}`,
-              ...conn.config
-            })));
-            this.projects.set(dbProject.name, projectInstance);
-            const packages = await repository.listPackages(dbProject.id);
-            packages.forEach((pkg) => {
-              projectInstance.setPackageStatus(pkg.name, "serving" /* SERVING */);
-            });
-            return projectInstance.listPackages();
           }));
         } else {
           await Promise.all(projectManifest.projects.map(async (project) => {
-            await this.addProject({
-              name: project.name,
-              resource: `${API_PREFIX}/projects/${project.name}`,
-              connections: project.connections,
-              packages: project.packages
-            }, true);
+            await this.addConfiguredProject(project);
           }));
         }
       }
@@ -231640,7 +231938,6 @@ class ProjectStore {
       markNotReady();
       const errorData = this.extractErrorDataFromError(error);
       logger.error("Error initializing project store", errorData);
-      process.exit(1);
     }
   }
   async addProjectToDatabase(project) {
@@ -231838,7 +232135,7 @@ class ProjectStore {
     const reInit = process.env.INITIALIZE_STORAGE === "true";
     await fs7.promises.mkdir(this.serverRootPath, { recursive: true });
     if (reInit) {
-      const uploadDocsPath2 = path8.join(this.serverRootPath, PUBLISHER_DATA_DIR);
+      const uploadDocsPath2 = path9.join(this.serverRootPath, PUBLISHER_DATA_DIR);
       logger.info(`Reinitialization mode: Cleaning up upload documents path ${uploadDocsPath2}`);
       try {
         await fs7.promises.rm(uploadDocsPath2, {
@@ -231855,7 +232152,7 @@ class ProjectStore {
     } else {
       logger.info(`Using existing publisher path`);
     }
-    const uploadDocsPath = path8.join(this.serverRootPath, PUBLISHER_DATA_DIR);
+    const uploadDocsPath = path9.join(this.serverRootPath, PUBLISHER_DATA_DIR);
     await fs7.promises.mkdir(uploadDocsPath, { recursive: true });
   }
   async listProjects(skipInitializationCheck = false) {
@@ -232021,7 +232318,7 @@ class ProjectStore {
       return;
     }
     const projectPath = project.metadata?.location;
-    project.closeAllConnections();
+    await project.closeAllConnections();
     this.projects.delete(projectName);
     await this.deleteProjectFromDatabase(projectName);
     if (projectPath) {
@@ -232079,12 +232376,12 @@ class ProjectStore {
     const absoluteProjectPath = `${this.serverRootPath}/${PUBLISHER_DATA_DIR}/${projectName}`;
     await fs7.promises.mkdir(absoluteProjectPath, { recursive: true });
     if (project.readme) {
-      await fs7.promises.writeFile(path8.join(absoluteProjectPath, "README.md"), project.readme);
+      await fs7.promises.writeFile(path9.join(absoluteProjectPath, "README.md"), project.readme);
     }
     return absoluteProjectPath;
   }
   isLocalPath(location) {
-    return location.startsWith("./") || location.startsWith("../") || location.startsWith("~/") || location.startsWith("/") || path8.isAbsolute(location);
+    return location.startsWith("./") || location.startsWith("../") || location.startsWith("~/") || location.startsWith("/") || path9.isAbsolute(location);
   }
   isGitHubURL(location) {
     return location.startsWith("https://github.com/") || location.startsWith("git@github.com:");
@@ -232140,7 +232437,7 @@ class ProjectStore {
             if (githubInfo && githubInfo.packagePath) {
               const subPathMatch = _package.location.match(/\/tree\/[^/]+\/(.+)$/);
               if (subPathMatch) {
-                sourcePath = path8.join(tempDownloadPath, subPathMatch[1]);
+                sourcePath = path9.join(tempDownloadPath, subPathMatch[1]);
               } else {
                 sourcePath = tempDownloadPath;
               }
@@ -232151,7 +232448,7 @@ class ProjectStore {
             if (this.isLocalPath(_package.location)) {
               sourcePath = _package.location;
             } else {
-              sourcePath = path8.join(tempDownloadPath, groupedLocation);
+              sourcePath = path9.join(tempDownloadPath, groupedLocation);
             }
           }
           const sourceExists = await fs7.promises.access(sourcePath).then(() => true).catch(() => false);
@@ -232227,7 +232524,7 @@ class ProjectStore {
       }
     }
     if (this.isLocalPath(location)) {
-      const packagePath = path8.isAbsolute(location) ? location : path8.join(this.serverRootPath, location);
+      const packagePath = path9.isAbsolute(location) ? location : path9.join(this.serverRootPath, location);
       try {
         logger.info(`Mounting local directory at "${packagePath}" to "${targetPath}"`);
         await this.mountLocalDirectory(packagePath, targetPath, projectName, packageName);
@@ -232281,11 +232578,11 @@ class ProjectStore {
     }
     await Promise.all(files.map(async (file) => {
       const relativeFilePath = file.name.replace(prefix, "");
-      const absoluteFilePath = isCompressedFile ? absoluteDirPath : path8.join(absoluteDirPath, relativeFilePath);
+      const absoluteFilePath = isCompressedFile ? absoluteDirPath : path9.join(absoluteDirPath, relativeFilePath);
       if (file.name.endsWith("/")) {
         return;
       }
-      await fs7.promises.mkdir(path8.dirname(absoluteFilePath), {
+      await fs7.promises.mkdir(path9.dirname(absoluteFilePath), {
         recursive: true
       });
       return fs7.promises.writeFile(absoluteFilePath, await file.download());
@@ -232301,7 +232598,7 @@ class ProjectStore {
     const prefix = prefixParts.join("/");
     if (isCompressedFile) {
       const zipFilePath = `${absoluteDirPath}.zip`;
-      await fs7.promises.mkdir(path8.dirname(zipFilePath), {
+      await fs7.promises.mkdir(path9.dirname(zipFilePath), {
         recursive: true
       });
       const command = new import_client_s32.GetObjectCommand({
@@ -232340,8 +232637,8 @@ class ProjectStore {
       if (!relativeFilePath || relativeFilePath.endsWith("/")) {
         return;
       }
-      const absoluteFilePath = path8.join(absoluteDirPath, relativeFilePath);
-      await fs7.promises.mkdir(path8.dirname(absoluteFilePath), {
+      const absoluteFilePath = path9.join(absoluteDirPath, relativeFilePath);
+      await fs7.promises.mkdir(path9.dirname(absoluteFilePath), {
         recursive: true
       });
       const command = new import_client_s32.GetObjectCommand({
@@ -232403,7 +232700,7 @@ class ProjectStore {
       logger.info(`Successfully cloned entire repository to: ${absoluteDirPath}`);
       return;
     }
-    const packageFullPath = path8.join(absoluteDirPath, cleanPackagePath);
+    const packageFullPath = path9.join(absoluteDirPath, cleanPackagePath);
     const packageExists = await fs7.promises.access(packageFullPath).then(() => true).catch(() => false);
     if (!packageExists) {
       throw new Error(`Package path "${cleanPackagePath}" does not exist in the cloned repository.`);
@@ -232411,7 +232708,7 @@ class ProjectStore {
     const dirContents = await fs7.promises.readdir(absoluteDirPath);
     for (const entry of dirContents) {
       if (entry !== cleanPackagePath.replace(/^\/+/, "").split("/")[0]) {
-        await fs7.promises.rm(path8.join(absoluteDirPath, entry), {
+        await fs7.promises.rm(path9.join(absoluteDirPath, entry), {
           recursive: true,
           force: true
         });
@@ -232419,7 +232716,7 @@ class ProjectStore {
     }
     const packageContents = await fs7.promises.readdir(packageFullPath);
     for (const entry of packageContents) {
-      await fs7.promises.rename(path8.join(packageFullPath, entry), path8.join(absoluteDirPath, entry));
+      await fs7.promises.rename(path9.join(packageFullPath, entry), path9.join(absoluteDirPath, entry));
     }
     await fs7.promises.rm(packageFullPath, { recursive: true, force: true });
   }
@@ -232466,9 +232763,9 @@ class WatchModeController {
       });
       return;
     }
-    this.watchingPath = path9.join(this.projectStore.serverRootPath, req.body.projectName);
+    this.watchingPath = path10.join(this.projectStore.serverRootPath, req.body.projectName);
     this.watcher = esm_default.watch(this.watchingPath, {
-      ignored: (path10, stats) => !!stats?.isFile() && !path10.endsWith(".malloy") && !path10.endsWith(".md"),
+      ignored: (path11, stats) => !!stats?.isFile() && !path11.endsWith(".malloy") && !path11.endsWith(".md"),
       ignoreInitial: true
     });
     const reloadProject = async () => {
@@ -232476,16 +232773,16 @@ class WatchModeController {
       await this.projectStore.addProject(project2.metadata);
       logger.info(`Reloaded ${req.body.projectName}`);
     };
-    this.watcher.on("add", async (path10) => {
-      logger.info(`Detected new file ${path10}, reloading ${req.body.projectName}`);
+    this.watcher.on("add", async (path11) => {
+      logger.info(`Detected new file ${path11}, reloading ${req.body.projectName}`);
       await reloadProject();
     });
-    this.watcher.on("unlink", async (path10) => {
-      logger.info(`Detected deletion of ${path10}, reloading ${req.body.projectName}`);
+    this.watcher.on("unlink", async (path11) => {
+      logger.info(`Detected deletion of ${path11}, reloading ${req.body.projectName}`);
       await reloadProject();
     });
-    this.watcher.on("change", async (path10) => {
-      logger.info(`Detected change on ${path10}, reloading ${req.body.projectName}`);
+    this.watcher.on("change", async (path11) => {
+      logger.info(`Detected change on ${path11}, reloading ${req.body.projectName}`);
       await reloadProject();
     });
     res.json();
@@ -235576,25 +235873,25 @@ async function getModelForQuery(projectStore, projectName, packageName, modelPat
   }
 }
 function buildMalloyUri(components, fragment) {
-  let path10 = "/project/";
+  let path11 = "/project/";
   if (components.project) {
-    path10 += encodeURIComponent(components.project);
+    path11 += encodeURIComponent(components.project);
   } else {
-    path10 += "home";
+    path11 += "home";
   }
   if (components.package) {
-    path10 += "/package/" + encodeURIComponent(components.package);
+    path11 += "/package/" + encodeURIComponent(components.package);
   }
   if (components.resourceType) {
-    path10 += "/" + components.resourceType;
+    path11 += "/" + components.resourceType;
     if (components.resourceName) {
-      path10 += "/" + encodeURIComponent(components.resourceName);
+      path11 += "/" + encodeURIComponent(components.resourceName);
       if (components.subResourceType && components.subResourceName) {
-        path10 += "/" + components.subResourceType + "/" + encodeURIComponent(components.subResourceName);
+        path11 += "/" + components.subResourceType + "/" + encodeURIComponent(components.subResourceName);
       }
     }
   }
-  let uriString = "malloy:/" + path10;
+  let uriString = "malloy:/" + path11;
   if (fragment) {
     uriString += "#" + fragment;
   }
@@ -236530,8 +236827,8 @@ import {
 } from "@malloydata/malloy";
 
 // src/service/quoting.ts
-function quoteTablePath(path10, dialect) {
-  return path10.split(".").map((seg) => dialect.quoteTablePath(seg)).join(".");
+function quoteTablePath(path11, dialect) {
+  return path11.split(".").map((seg) => dialect.quoteTablePath(seg)).join(".");
 }
 function splitTablePath(tableName) {
   const lastDot = tableName.lastIndexOf(".");
@@ -236695,6 +236992,23 @@ var STAGING_BUILD_ID_LEN = 12;
 function stagingSuffix(buildId) {
   return `_${buildId.substring(0, STAGING_BUILD_ID_LEN)}`;
 }
+async function resolvePackageConnections(pkg, names) {
+  const map2 = new Map;
+  const seen = new Set;
+  for (const name of names) {
+    if (!name || seen.has(name))
+      continue;
+    seen.add(name);
+    try {
+      map2.set(name, await pkg.getMalloyConnection(name));
+    } catch (err) {
+      logger.warn(`Failed to resolve connection ${name}`, {
+        error: err instanceof Error ? err.message : String(err)
+      });
+    }
+  }
+  return map2;
+}
 function manifestTableKey(connectionName, tableName) {
   return `${connectionName}::${tableName}`;
 }
@@ -236875,8 +237189,8 @@ class MaterializationService {
     }
     const project = await this.projectStore.getProject(projectName, false);
     const pkg = await project.getPackage(packageName, false);
-    const connections = pkg.getConnections();
     const entries = await this.manifestService.listEntries(projectId, packageName);
+    const connections = await resolvePackageConnections(pkg, entries.map((e) => e.connectionName));
     return dropManifestEntries(entries, {
       connections,
       manifestService: this.manifestService,
@@ -236897,12 +237211,11 @@ class MaterializationService {
     manifest.loadText(JSON.stringify(existingManifest));
     const existingEntries = await this.manifestService.listEntries(projectId, packageName);
     const knownMaterializedTables = new Set(existingEntries.map((e) => manifestTableKey(e.connectionName, e.tableName)));
-    const { graphs, sources, connectionDigests } = await this.compilePackageBuildPlan(pkg, signal);
+    const { graphs, sources, connectionDigests, connections } = await this.compilePackageBuildPlan(pkg, signal);
     if (graphs.length === 0) {
       logger.info("No persist sources to build");
       return { sourcesBuilt: 0, sourcesSkipped: 0 };
     }
-    const connections = pkg.getConnections();
     let sourcesBuilt = 0;
     let sourcesSkipped = 0;
     const sourceResults = [];
@@ -236951,7 +237264,7 @@ class MaterializationService {
     for (const modelPath of modelPaths) {
       if (signal.aborted)
         throw new Error("Build cancelled");
-      const { runtime, modelURL, importBaseURL } = await Model.getModelRuntime(pkg.getPackagePath(), modelPath, pkg.getConnections());
+      const { runtime, modelURL, importBaseURL } = await Model.getModelRuntime(pkg.getPackagePath(), modelPath, pkg.getMalloyConfig());
       const modelMaterializer = runtime.loadModel(modelURL, {
         importBaseURL
       });
@@ -236994,7 +237307,7 @@ class MaterializationService {
       }
       tableOwners.set(key, sourceID);
     }
-    const connections = pkg.getConnections();
+    const connections = await resolvePackageConnections(pkg, allGraphs.map((g) => g.connectionName));
     const connectionDigests = {};
     for (const graph of allGraphs) {
       const conn = connections.get(graph.connectionName);
@@ -237002,7 +237315,12 @@ class MaterializationService {
         connectionDigests[graph.connectionName] = await conn.getDigest();
       }
     }
-    return { graphs: allGraphs, sources: allSources, connectionDigests };
+    return {
+      graphs: allGraphs,
+      sources: allSources,
+      connectionDigests,
+      connections
+    };
   }
   async buildOneSource(persistSource, manifest, connection, connectionDigests, forceRefresh, projectId, packageName, knownMaterializedTables) {
     const buildIdSQL = persistSource.getSQL();
@@ -237155,9 +237473,9 @@ var MCP_PORT = Number(process.env.MCP_PORT || 4040);
 var MCP_ENDPOINT = "/mcp";
 var SHUTDOWN_DRAIN_DURATION_SECONDS = Number(process.env.SHUTDOWN_DRAIN_DURATION_SECONDS || 0);
 var SHUTDOWN_GRACEFUL_CLOSE_TIMEOUT_SECONDS = Number(process.env.SHUTDOWN_GRACEFUL_CLOSE_TIMEOUT_SECONDS || 0);
-var __filename_esm = fileURLToPath3(import.meta.url);
-var ROOT = path10.join(path10.dirname(__filename_esm), "app");
-var SERVER_ROOT = path10.resolve(process.cwd(), process.env.SERVER_ROOT || ".");
+var __filename_esm = fileURLToPath2(import.meta.url);
+var ROOT = path11.join(path11.dirname(__filename_esm), "app");
+var SERVER_ROOT = path11.resolve(process.cwd(), process.env.SERVER_ROOT || ".");
 var API_PREFIX2 = "/api/v0";
 var isDevelopment = process.env["NODE_ENV"] === "development";
 var app = import_express.default();
@@ -237238,14 +237556,14 @@ mcpApp.all(MCP_ENDPOINT, async (req, res) => {
 });
 if (!isDevelopment) {
   app.use("/", import_express.default.static(ROOT));
-  app.use("/api-doc.html", import_express.default.static(path10.join(ROOT, "api-doc.html")));
+  app.use("/api-doc.html", import_express.default.static(path11.join(ROOT, "api-doc.html")));
 } else {
   app.use(`${API_PREFIX2}`, loggerMiddleware);
   app.use(import_http_proxy_middleware.createProxyMiddleware({
     target: "http://localhost:5173",
     changeOrigin: true,
     ws: true,
-    pathFilter: (path11) => !path11.startsWith("/api/") && !path11.startsWith("/metrics") && !path11.startsWith("/health")
+    pathFilter: (path12) => !path12.startsWith("/api/") && !path12.startsWith("/metrics") && !path12.startsWith("/health")
   }));
 }
 var setVersionIdError = (res) => {
@@ -237418,6 +237736,33 @@ app.get(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/schema
     res.status(status).json(json);
   }
 });
+app.get(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/schemas`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.listSchemas(req.params.projectName, req.params.connectionName, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
+app.get(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/schemas/:schemaName/tables`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.listTables(req.params.projectName, req.params.connectionName, req.params.schemaName, normalizeQueryArray(req.query.tableNames), req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
+app.get(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/schemas/:schemaName/tables/:tablePath`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.getTable(req.params.projectName, req.params.connectionName, req.params.schemaName, req.params.tablePath, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
 app.get(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/sqlSource`, async (req, res) => {
   try {
     res.status(200).json(await connectionController.getConnectionSqlSource(req.params.projectName, req.params.connectionName, req.query.sqlStatement));
@@ -237436,6 +237781,24 @@ app.post(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/sqlSo
     res.status(status).json(json);
   }
 });
+app.get(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlSource`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.getConnectionSqlSource(req.params.projectName, req.params.connectionName, req.query.sqlStatement, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
+app.post(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlSource`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.getConnectionSqlSource(req.params.projectName, req.params.connectionName, req.body.sqlStatement, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
 app.get(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/queryData`, async (req, res) => {
   try {
     res.status(200).json(await connectionController.getConnectionQueryData(req.params.projectName, req.params.connectionName, req.query.sqlStatement, req.query.options));
@@ -237445,6 +237808,15 @@ app.get(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/queryD
     res.status(status).json(json);
   }
 });
+app.get(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/queryData`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.getConnectionQueryData(req.params.projectName, req.params.connectionName, req.query.sqlStatement, req.query.options, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
 app.post(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/sqlQuery`, async (req, res) => {
   try {
     let options;
@@ -237460,6 +237832,21 @@ app.post(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/sqlQu
     res.status(status).json(json);
   }
 });
+app.post(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlQuery`, async (req, res) => {
+  try {
+    let options;
+    if (req.body?.options) {
+      options = req.body.options;
+    } else {
+      options = req.query.options;
+    }
+    res.status(200).json(await connectionController.getConnectionQueryData(req.params.projectName, req.params.connectionName, req.body.sqlStatement, options, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
 app.get(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/temporaryTable`, async (req, res) => {
   try {
     res.status(200).json(await connectionController.getConnectionTemporaryTable(req.params.projectName, req.params.connectionName, req.query.sqlStatement));
@@ -237469,6 +237856,15 @@ app.get(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/tempor
     res.status(status).json(json);
   }
 });
+app.get(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/temporaryTable`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.getConnectionTemporaryTable(req.params.projectName, req.params.connectionName, req.query.sqlStatement, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
 app.post(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/sqlTemporaryTable`, async (req, res) => {
   try {
     res.status(200).json(await connectionController.getConnectionTemporaryTable(req.params.projectName, req.params.connectionName, req.body.sqlStatement));
@@ -237478,6 +237874,15 @@ app.post(`${API_PREFIX2}/projects/:projectName/connections/:connectionName/sqlTe
     res.status(status).json(json);
   }
 });
+app.post(`${API_PREFIX2}/projects/:projectName/packages/:packageName/connections/:connectionName/sqlTemporaryTable`, async (req, res) => {
+  try {
+    res.status(200).json(await connectionController.getConnectionTemporaryTable(req.params.projectName, req.params.connectionName, req.body.sqlStatement, req.params.packageName));
+  } catch (error) {
+    logger.error(error);
+    const { json, status } = internalErrorToHttpError(error);
+    res.status(status).json(json);
+  }
+});
 app.get(`${API_PREFIX2}/projects/:projectName/packages`, async (req, res) => {
   if (req.query.versionId) {
     setVersionIdError(res);
@@ -237747,7 +238152,7 @@ app.post(`${API_PREFIX2}/projects/:projectName/packages/:packageName/manifest`,
   }
 });
 if (!isDevelopment) {
-  app.get("*", (_req, res) => res.sendFile(path10.resolve(ROOT, "index.html")));
+  app.get("*", (_req, res) => res.sendFile(path11.resolve(ROOT, "index.html")));
 }
 app.use((err, _req, res, _next) => {
   logger.error("Unhandled error:", err);