@hasna/instructions 0.4.35 → 0.4.36

package/dist/server/index.js

@@ -16,7 +16,7 @@ var __export = (target, all) => {
 };
 var __require = import.meta.require;
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/compose.js
+// node_modules/hono/dist/compose.js
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
     let index = -1;
@@ -60,42 +60,21 @@ var compose = (middleware, onError, onNotFound) => {
   };
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/request/constants.js
+// node_modules/hono/dist/request/constants.js
 var GET_MATCH_RESULT = /* @__PURE__ */ Symbol();
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/utils/buffer.js
-var bufferToFormData = (arrayBuffer, contentType) => {
-  const response = new Response(arrayBuffer, {
-    headers: {
-      "Content-Type": contentType.replace(/^[^;]+/, (mediaType) => mediaType.toLowerCase())
-    }
-  });
-  return response.formData();
-};
-
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/utils/body.js
-var isRawRequest = (request) => ("headers" in request);
+// node_modules/hono/dist/utils/body.js
 var parseBody = async (request, options = /* @__PURE__ */ Object.create(null)) => {
   const { all = false, dot = false } = options;
-  const headers = isRawRequest(request) ? request.headers : request.raw.headers;
+  const headers = request instanceof HonoRequest ? request.raw.headers : request.headers;
   const contentType = headers.get("Content-Type");
-  const mediaType = contentType?.split(";")[0].trim().toLowerCase();
-  if (mediaType === "multipart/form-data" || mediaType === "application/x-www-form-urlencoded") {
+  if (contentType?.startsWith("multipart/form-data") || contentType?.startsWith("application/x-www-form-urlencoded")) {
     return parseFormData(request, { all, dot });
   }
   return {};
 };
 async function parseFormData(request, options) {
-  if (!isRawRequest(request) && request.bodyCache.formData) {
-    return convertFormDataToBodyData(await request.bodyCache.formData, options);
-  }
-  const headers = isRawRequest(request) ? request.headers : request.raw.headers;
-  const arrayBuffer = await request.arrayBuffer();
-  const formDataPromise = bufferToFormData(arrayBuffer, headers.get("Content-Type") || "");
-  if (!isRawRequest(request)) {
-    request.bodyCache.formData = formDataPromise;
-  }
-  const formData = await formDataPromise;
+  const formData = await request.formData();
   if (formData) {
     return convertFormDataToBodyData(formData, options);
   }
@@ -155,7 +134,7 @@ var handleParsingNestedValues = (form, key, value) => {
   });
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/utils/url.js
+// node_modules/hono/dist/utils/url.js
 var splitPath = (path) => {
   const paths = path.split("/");
   if (paths[0] === "") {
@@ -277,16 +256,18 @@ var checkOptionalParameter = (path) => {
   });
   return results.filter((v, i, a) => a.indexOf(v) === i);
 };
-var tryDecodeURIComponent = (str) => str.indexOf("%") !== -1 ? tryDecode(str, decodeURIComponent_) : str;
 var _decodeURI = (value) => {
+  if (!/[%+]/.test(value)) {
+    return value;
+  }
   if (value.indexOf("+") !== -1) {
     value = value.replace(/\+/g, " ");
   }
-  return tryDecodeURIComponent(value);
+  return value.indexOf("%") !== -1 ? tryDecode(value, decodeURIComponent_) : value;
 };
 var _getQueryParam = (url, key, multiple) => {
   let encoded;
-  if (!multiple && key && key.indexOf("%") === -1 && key.indexOf("+") === -1) {
+  if (!multiple && key && !/[%+]/.test(key)) {
     let keyIndex2 = url.indexOf("?", 8);
     if (keyIndex2 === -1) {
       return;
@@ -310,7 +291,7 @@ var _getQueryParam = (url, key, multiple) => {
       return;
     }
   }
-  const results = /* @__PURE__ */ Object.create(null);
+  const results = {};
   encoded ??= /[%+]/.test(url);
   let keyIndex = url.indexOf("?", 8);
   while (keyIndex !== -1) {
@@ -353,7 +334,8 @@ var getQueryParams = (url, key) => {
 };
 var decodeURIComponent_ = decodeURIComponent;
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/request.js
+// node_modules/hono/dist/request.js
+var tryDecodeURIComponent = (str) => tryDecode(str, decodeURIComponent_);
 var HonoRequest = class {
   raw;
   #validatedData;
@@ -365,6 +347,7 @@ var HonoRequest = class {
     this.raw = request;
     this.path = path;
     this.#matchResult = matchResult;
+    this.#validatedData = {};
   }
   param(key) {
     return key ? this.#getDecodedParam(key) : this.#getAllDecodedParams();
@@ -372,7 +355,7 @@ var HonoRequest = class {
   #getDecodedParam(key) {
     const paramKey = this.#matchResult[0][this.routeIndex][1][key];
     const param = this.#getParamValue(paramKey);
-    return param && tryDecodeURIComponent(param);
+    return param && /\%/.test(param) ? tryDecodeURIComponent(param) : param;
   }
   #getAllDecodedParams() {
     const decoded = {};
@@ -380,7 +363,7 @@ var HonoRequest = class {
     for (const key of keys) {
       const value = this.#getParamValue(this.#matchResult[0][this.routeIndex][1][key]);
       if (value !== undefined) {
-        decoded[key] = tryDecodeURIComponent(value);
+        decoded[key] = /\%/.test(value) ? tryDecodeURIComponent(value) : value;
       }
     }
     return decoded;
@@ -398,7 +381,7 @@ var HonoRequest = class {
     if (name) {
       return this.raw.headers.get(name) ?? undefined;
     }
-    const headerData = /* @__PURE__ */ Object.create(null);
+    const headerData = {};
     this.raw.headers.forEach((value, key) => {
       headerData[key] = value;
     });
@@ -413,7 +396,8 @@ var HonoRequest = class {
     if (cachedBody) {
       return cachedBody;
     }
-    for (const anyCachedKey in bodyCache) {
+    const anyCachedKey = Object.keys(bodyCache)[0];
+    if (anyCachedKey) {
       return bodyCache[anyCachedKey].then((body) => {
         if (anyCachedKey === "json") {
           body = JSON.stringify(body);
@@ -432,9 +416,6 @@ var HonoRequest = class {
   arrayBuffer() {
     return this.#cachedBody("arrayBuffer");
   }
-  bytes() {
-    return this.#cachedBody("arrayBuffer").then((buffer) => new Uint8Array(buffer));
-  }
   blob() {
     return this.#cachedBody("blob");
   }
@@ -442,10 +423,10 @@ var HonoRequest = class {
     return this.#cachedBody("formData");
   }
   addValidatedData(target, data) {
-    (this.#validatedData ??= {})[target] = data;
+    this.#validatedData[target] = data;
   }
   valid(target) {
-    return this.#validatedData?.[target];
+    return this.#validatedData[target];
   }
   get url() {
     return this.raw.url;
@@ -464,7 +445,7 @@ var HonoRequest = class {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/utils/html.js
+// node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1,
   BeforeStream: 2,
@@ -502,7 +483,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/context.js
+// node_modules/hono/dist/context.js
 var TEXT_PLAIN = "text/plain; charset=UTF-8";
 var setDefaultContentType = (contentType, headers) => {
   return {
@@ -620,11 +601,11 @@ var Context = class {
     return Object.fromEntries(this.#var);
   }
   #newResponse(data, arg, headers) {
-    let responseHeaders = this.#res ? new Headers(this.#res.headers) : this.#preparedHeaders;
-    if (typeof arg === "object" && arg.headers) {
-      responseHeaders ??= new Headers;
-      for (const [key, value] of new Headers(arg.headers)) {
-        if (key === "set-cookie") {
+    const responseHeaders = this.#res ? new Headers(this.#res.headers) : this.#preparedHeaders ?? new Headers;
+    if (typeof arg === "object" && "headers" in arg) {
+      const argHeaders = arg.headers instanceof Headers ? arg.headers : new Headers(arg.headers);
+      for (const [key, value] of argHeaders) {
+        if (key.toLowerCase() === "set-cookie") {
           responseHeaders.append(key, value);
         } else {
           responseHeaders.set(key, value);
@@ -632,34 +613,19 @@ var Context = class {
       }
     }
     if (headers) {
-      if (!responseHeaders) {
-        let count = 0;
-        for (const k in headers) {
-          if (++count > 1 || typeof headers[k] !== "string") {
-            responseHeaders = new Headers;
-            break;
-          }
-        }
-      }
-      if (responseHeaders) {
-        for (const k in headers) {
-          const v = headers[k];
-          if (typeof v === "string") {
-            responseHeaders.set(k, v);
-          } else {
-            responseHeaders.delete(k);
-            for (const v2 of v) {
-              responseHeaders.append(k, v2);
-            }
+      for (const [k, v] of Object.entries(headers)) {
+        if (typeof v === "string") {
+          responseHeaders.set(k, v);
+        } else {
+          responseHeaders.delete(k);
+          for (const v2 of v) {
+            responseHeaders.append(k, v2);
           }
         }
       }
     }
     const status = typeof arg === "number" ? arg : arg?.status ?? this.#status;
-    return createResponseInstance(data, {
-      status,
-      headers: responseHeaders ?? headers
-    });
+    return createResponseInstance(data, { status, headers: responseHeaders });
   }
   newResponse = (...args) => this.#newResponse(...args);
   body = (data, arg, headers) => this.#newResponse(data, arg, headers);
@@ -684,18 +650,18 @@ var Context = class {
   };
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router.js
+// node_modules/hono/dist/router.js
 var METHOD_NAME_ALL = "ALL";
 var METHOD_NAME_ALL_LOWERCASE = "all";
-var METHODS = ["get", "post", "put", "delete", "options", "patch", "query"];
+var METHODS = ["get", "post", "put", "delete", "options", "patch"];
 var MESSAGE_MATCHER_IS_ALREADY_BUILT = "Can not add a route since the matcher is already built.";
 var UnsupportedPathError = class extends Error {
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/utils/constants.js
+// node_modules/hono/dist/utils/constants.js
 var COMPOSED_HANDLER = "__COMPOSED_HANDLER";
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/hono-base.js
+// node_modules/hono/dist/hono-base.js
 var notFoundHandler = (c) => {
   return c.text("404 Not Found", 404);
 };
@@ -714,7 +680,6 @@ var Hono = class _Hono {
   delete;
   options;
   patch;
-  query;
   all;
   on;
   use;
@@ -787,7 +752,7 @@ var Hono = class _Hono {
         handler = async (c, next) => (await compose([], app.errorHandler)(c, () => r.handler(c, next))).res;
         handler[COMPOSED_HANDLER] = r.handler;
       }
-      subApp.#addRoute(r.method, r.path, handler, r.basePath);
+      subApp.#addRoute(r.method, r.path, handler);
     });
     return this;
   }
@@ -834,7 +799,7 @@ var Hono = class _Hono {
       const pathPrefixLength = mergedPath === "/" ? 0 : mergedPath.length;
       return (request) => {
         const url = new URL(request.url);
-        url.pathname = this.getPath(request).slice(pathPrefixLength) || "/";
+        url.pathname = url.pathname.slice(pathPrefixLength) || "/";
         return new Request(url, request);
       };
     })();
@@ -848,15 +813,10 @@ var Hono = class _Hono {
     this.#addRoute(METHOD_NAME_ALL, mergePath(path, "*"), handler);
     return this;
   }
-  #addRoute(method, path, handler, baseRoutePath) {
+  #addRoute(method, path, handler) {
     method = method.toUpperCase();
     path = mergePath(this._basePath, path);
-    const r = {
-      basePath: baseRoutePath !== undefined ? mergePath(this._basePath, baseRoutePath) : this._basePath,
-      path,
-      method,
-      handler
-    };
+    const r = { basePath: this._basePath, path, method, handler };
     this.router.add(method, path, [handler, r]);
     this.routes.push(r);
   }
@@ -920,7 +880,7 @@ var Hono = class _Hono {
   };
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/reg-exp-router/matcher.js
+// node_modules/hono/dist/router/reg-exp-router/matcher.js
 var emptyParam = [];
 function match(method, path) {
   const matchers = this.buildAllMatchers();
@@ -941,7 +901,7 @@ function match(method, path) {
   return match2(method, path);
 }
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/reg-exp-router/node.js
+// node_modules/hono/dist/router/reg-exp-router/node.js
 var LABEL_REG_EXP_STR = "[^/]+";
 var ONLY_WILDCARD_REG_EXP_STR = ".*";
 var TAIL_WILDCARD_REG_EXP_STR = "(?:|/.*)";
@@ -955,7 +915,7 @@ function compareKey(a, b) {
     return 1;
   }
   if (a === ONLY_WILDCARD_REG_EXP_STR || a === TAIL_WILDCARD_REG_EXP_STR) {
-    return b === TAIL_WILDCARD_REG_EXP_STR ? -1 : 1;
+    return 1;
   } else if (b === ONLY_WILDCARD_REG_EXP_STR || b === TAIL_WILDCARD_REG_EXP_STR) {
     return -1;
   }
@@ -970,68 +930,69 @@ var Node = class _Node {
   #index;
   #varIndex;
   #children = /* @__PURE__ */ Object.create(null);
-  insert(tokens, index, paramMap, context, isStatic) {
-    let node = this;
-    for (let i = 0, len = tokens.length;i < len; i++) {
-      const token = tokens[i];
-      const pattern = token.length === 1 ? token === "*" ? i === len - 1 ? ["", "", ONLY_WILDCARD_REG_EXP_STR] : ["", "", LABEL_REG_EXP_STR] : null : token === "/*" ? ["", "", TAIL_WILDCARD_REG_EXP_STR] : token.match(/^\:([^\{\}]+)(?:\{(.+)\})?$/);
-      let nextNode;
-      if (pattern) {
-        const name = pattern[1];
-        let regexpStr = pattern[2] || LABEL_REG_EXP_STR;
-        if (name && pattern[2]) {
-          if (regexpStr === ".*") {
-            throw PATH_ERROR;
-          }
-          regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
-          if (/\((?!\?:)/.test(regexpStr)) {
-            throw PATH_ERROR;
-          }
-          if (regexpStr.length === 1 && regExpMetaChars.has(regexpStr)) {
-            throw PATH_ERROR;
-          }
+  insert(tokens, index, paramMap, context, pathErrorCheckOnly) {
+    if (tokens.length === 0) {
+      if (this.#index !== undefined) {
+        throw PATH_ERROR;
+      }
+      if (pathErrorCheckOnly) {
+        return;
+      }
+      this.#index = index;
+      return;
+    }
+    const [token, ...restTokens] = tokens;
+    const pattern = token === "*" ? restTokens.length === 0 ? ["", "", ONLY_WILDCARD_REG_EXP_STR] : ["", "", LABEL_REG_EXP_STR] : token === "/*" ? ["", "", TAIL_WILDCARD_REG_EXP_STR] : token.match(/^\:([^\{\}]+)(?:\{(.+)\})?$/);
+    let node;
+    if (pattern) {
+      const name = pattern[1];
+      let regexpStr = pattern[2] || LABEL_REG_EXP_STR;
+      if (name && pattern[2]) {
+        if (regexpStr === ".*") {
+          throw PATH_ERROR;
         }
-        nextNode = node.#children[regexpStr];
-        if (!nextNode) {
-          if (regexpStr !== ONLY_WILDCARD_REG_EXP_STR && regexpStr !== TAIL_WILDCARD_REG_EXP_STR) {
-            for (const k in node.#children) {
-              if ((regexpStr.length > 1 || k.length > 1) && k !== ONLY_WILDCARD_REG_EXP_STR && k !== TAIL_WILDCARD_REG_EXP_STR) {
-                throw PATH_ERROR;
-              }
-            }
-          }
-          nextNode = node.#children[regexpStr] = new _Node;
+        regexpStr = regexpStr.replace(/^\((?!\?:)(?=[^)]+\)$)/, "(?:");
+        if (/\((?!\?:)/.test(regexpStr)) {
+          throw PATH_ERROR;
         }
+      }
+      node = this.#children[regexpStr];
+      if (!node) {
+        if (Object.keys(this.#children).some((k) => k !== ONLY_WILDCARD_REG_EXP_STR && k !== TAIL_WILDCARD_REG_EXP_STR)) {
+          throw PATH_ERROR;
+        }
+        if (pathErrorCheckOnly) {
+          return;
+        }
+        node = this.#children[regexpStr] = new _Node;
         if (name !== "") {
-          nextNode.#varIndex ??= context.varIndex++;
-          paramMap.push([name, nextNode.#varIndex]);
+          node.#varIndex = context.varIndex++;
         }
-      } else {
-        nextNode = node.#children[token];
-        if (!nextNode) {
-          for (const k in node.#children) {
-            if (k.length > 1 && k !== ONLY_WILDCARD_REG_EXP_STR && k !== TAIL_WILDCARD_REG_EXP_STR) {
-              throw PATH_ERROR;
-            }
-          }
-          nextNode = node.#children[token] = new _Node;
+      }
+      if (!pathErrorCheckOnly && name !== "") {
+        paramMap.push([name, node.#varIndex]);
+      }
+    } else {
+      node = this.#children[token];
+      if (!node) {
+        if (Object.keys(this.#children).some((k) => k.length > 1 && k !== ONLY_WILDCARD_REG_EXP_STR && k !== TAIL_WILDCARD_REG_EXP_STR)) {
+          throw PATH_ERROR;
+        }
+        if (pathErrorCheckOnly) {
+          return;
         }
+        node = this.#children[token] = new _Node;
       }
-      node = nextNode;
     }
-    if (node.#index !== undefined) {
-      throw PATH_ERROR;
-    }
-    node.#index = isStatic ? -1 : index;
+    node.insert(restTokens, index, paramMap, context, pathErrorCheckOnly);
   }
   buildRegExpStr() {
     const childKeys = Object.keys(this.#children).sort(compareKey);
     const strList = childKeys.map((k) => {
       const c = this.#children[k];
-      const childStr = c.buildRegExpStr();
-      return childStr === "" ? "" : (typeof c.#varIndex === "number" ? `(${k})@${c.#varIndex}` : regExpMetaChars.has(k) ? `\\${k}` : k) + childStr;
-    }).filter(Boolean);
-    if (typeof this.#index === "number" && this.#index !== -1) {
+      return (typeof c.#varIndex === "number" ? `(${k})@${c.#varIndex}` : regExpMetaChars.has(k) ? `\\${k}` : k) + c.buildRegExpStr();
+    });
+    if (typeof this.#index === "number") {
       strList.unshift(`#${this.#index}`);
     }
     if (strList.length === 0) {
@@ -1044,23 +1005,16 @@ var Node = class _Node {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/reg-exp-router/trie.js
+// node_modules/hono/dist/router/reg-exp-router/trie.js
 var Trie = class {
   #context = { varIndex: 0 };
   #root = new Node;
-  #index = 0;
-  paths = /* @__PURE__ */ Object.create(null);
-  insert(path, isStatic) {
-    if (isStatic) {
-      this.#root.insert(path.split(""), 0, [], this.#context, true);
-      return;
-    }
+  insert(path, index, pathErrorCheckOnly) {
     const paramAssoc = [];
     const groups = [];
-    let markedPath = path;
     for (let i = 0;; ) {
       let replaced = false;
-      markedPath = markedPath.replace(/\{[^}]+\}/g, (m) => {
+      path = path.replace(/\{[^}]+\}/g, (m) => {
         const mark = `@\\${i}`;
         groups[i] = [mark, m];
         i++;
@@ -1071,7 +1025,7 @@ var Trie = class {
         break;
       }
     }
-    const tokens = markedPath.match(/(?::[^\/]+)|(?:\/\*$)|./g) || [];
+    const tokens = path.match(/(?::[^\/]+)|(?:\/\*$)|./g) || [];
     for (let i = groups.length - 1;i >= 0; i--) {
       const [mark] = groups[i];
       for (let j = tokens.length - 1;j >= 0; j--) {
@@ -1081,8 +1035,8 @@ var Trie = class {
         }
       }
     }
-    this.#root.insert(tokens, this.#index, paramAssoc, this.#context, false);
-    this.paths[path] = [this.#index++, paramAssoc];
+    this.#root.insert(tokens, index, paramAssoc, this.#context, pathErrorCheckOnly);
+    return paramAssoc;
   }
   buildRegExp() {
     let regexp = this.#root.buildRegExpStr();
@@ -1107,7 +1061,8 @@ var Trie = class {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/reg-exp-router/router.js
+// node_modules/hono/dist/router/reg-exp-router/router.js
+var nullMatcher = [/^$/, [], /* @__PURE__ */ Object.create(null)];
 var wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 function buildWildcardRegExp(path) {
   return wildcardRegExpCache[path] ??= new RegExp(path === "*" ? "" : `^${path.replace(/\/\*$|([.\\+*[^\]$()])/g, (_, metaChar) => metaChar ? `\\${metaChar}` : "(?:|/.*)")}$`);
@@ -1115,6 +1070,59 @@ function buildWildcardRegExp(path) {
 function clearWildcardRegExpCache() {
   wildcardRegExpCache = /* @__PURE__ */ Object.create(null);
 }
+function buildMatcherFromPreprocessedRoutes(routes) {
+  const trie = new Trie;
+  const handlerData = [];
+  if (routes.length === 0) {
+    return nullMatcher;
+  }
+  const routesWithStaticPathFlag = routes.map((route) => [!/\*|\/:/.test(route[0]), ...route]).sort(([isStaticA, pathA], [isStaticB, pathB]) => isStaticA ? 1 : isStaticB ? -1 : pathA.length - pathB.length);
+  const staticMap = /* @__PURE__ */ Object.create(null);
+  for (let i = 0, j = -1, len = routesWithStaticPathFlag.length;i < len; i++) {
+    const [pathErrorCheckOnly, path, handlers] = routesWithStaticPathFlag[i];
+    if (pathErrorCheckOnly) {
+      staticMap[path] = [handlers.map(([h]) => [h, /* @__PURE__ */ Object.create(null)]), emptyParam];
+    } else {
+      j++;
+    }
+    let paramAssoc;
+    try {
+      paramAssoc = trie.insert(path, j, pathErrorCheckOnly);
+    } catch (e) {
+      throw e === PATH_ERROR ? new UnsupportedPathError(path) : e;
+    }
+    if (pathErrorCheckOnly) {
+      continue;
+    }
+    handlerData[j] = handlers.map(([h, paramCount]) => {
+      const paramIndexMap = /* @__PURE__ */ Object.create(null);
+      paramCount -= 1;
+      for (;paramCount >= 0; paramCount--) {
+        const [key, value] = paramAssoc[paramCount];
+        paramIndexMap[key] = value;
+      }
+      return [h, paramIndexMap];
+    });
+  }
+  const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
+  for (let i = 0, len = handlerData.length;i < len; i++) {
+    for (let j = 0, len2 = handlerData[i].length;j < len2; j++) {
+      const map = handlerData[i][j]?.[1];
+      if (!map) {
+        continue;
+      }
+      const keys = Object.keys(map);
+      for (let k = 0, len3 = keys.length;k < len3; k++) {
+        map[keys[k]] = paramReplacementMap[map[keys[k]]];
+      }
+    }
+  }
+  const handlerMap = [];
+  for (const i in indexReplacementMap) {
+    handlerMap[i] = handlerData[indexReplacementMap[i]];
+  }
+  return [regexp, handlerMap, staticMap];
+}
 function findMiddleware(middleware, path) {
   if (!middleware) {
     return;
@@ -1130,18 +1138,9 @@ var RegExpRouter = class {
   name = "RegExpRouter";
   #middleware;
   #routes;
-  #tries;
   constructor() {
     this.#middleware = { [METHOD_NAME_ALL]: /* @__PURE__ */ Object.create(null) };
     this.#routes = { [METHOD_NAME_ALL]: /* @__PURE__ */ Object.create(null) };
-    this.#tries = { [METHOD_NAME_ALL]: new Trie };
-  }
-  #insertPath(method, path) {
-    try {
-      this.#tries[method].insert(path, !/\*|\/:/.test(path));
-    } catch (e) {
-      throw e === PATH_ERROR ? new UnsupportedPathError(path) : e;
-    }
   }
   add(method, path, handler) {
     const middleware = this.#middleware;
@@ -1150,12 +1149,10 @@ var RegExpRouter = class {
       throw new Error(MESSAGE_MATCHER_IS_ALREADY_BUILT);
     }
     if (!middleware[method]) {
-      this.#tries[method] = new Trie;
       [middleware, routes].forEach((handlerMap) => {
         handlerMap[method] = /* @__PURE__ */ Object.create(null);
         Object.keys(handlerMap[METHOD_NAME_ALL]).forEach((p) => {
           handlerMap[method][p] = [...handlerMap[METHOD_NAME_ALL][p]];
-          this.#insertPath(method, p);
         });
       });
     }
@@ -1165,12 +1162,13 @@ var RegExpRouter = class {
     const paramCount = (path.match(/\/:/g) || []).length;
     if (/\*$/.test(path)) {
       const re = buildWildcardRegExp(path);
-      Object.keys(middleware).forEach((m) => {
-        if ((method === METHOD_NAME_ALL || method === m) && !middleware[m][path]) {
-          this.#insertPath(m, path);
-          middleware[m][path] = findMiddleware(middleware[m], path) || findMiddleware(middleware[METHOD_NAME_ALL], path) || [];
-        }
-      });
+      if (method === METHOD_NAME_ALL) {
+        Object.keys(middleware).forEach((m) => {
+          middleware[m][path] ||= findMiddleware(middleware[m], path) || findMiddleware(middleware[METHOD_NAME_ALL], path) || [];
+        });
+      } else {
+        middleware[method][path] ||= findMiddleware(middleware[method], path) || findMiddleware(middleware[METHOD_NAME_ALL], path) || [];
+      }
       Object.keys(middleware).forEach((m) => {
         if (method === METHOD_NAME_ALL || method === m) {
           Object.keys(middleware[m]).forEach((p) => {
@@ -1190,12 +1188,9 @@ var RegExpRouter = class {
       const path2 = paths[i];
       Object.keys(routes).forEach((m) => {
         if (method === METHOD_NAME_ALL || method === m) {
-          if (!routes[m][path2]) {
-            this.#insertPath(m, path2);
-            routes[m][path2] = [
-              ...findMiddleware(middleware[m], path2) || findMiddleware(middleware[METHOD_NAME_ALL], path2) || []
-            ];
-          }
+          routes[m][path2] ||= [
+            ...findMiddleware(middleware[m], path2) || findMiddleware(middleware[METHOD_NAME_ALL], path2) || []
+          ];
           routes[m][path2].push([handler, paramCount - len + i + 1]);
         }
       });
@@ -1207,58 +1202,31 @@ var RegExpRouter = class {
     Object.keys(this.#routes).concat(Object.keys(this.#middleware)).forEach((method) => {
       matchers[method] ||= this.#buildMatcher(method);
     });
-    this.#middleware = this.#routes = this.#tries = undefined;
+    this.#middleware = this.#routes = undefined;
     clearWildcardRegExpCache();
     return matchers;
   }
   #buildMatcher(method) {
-    const middleware = this.#middleware[method];
-    const routes = this.#routes[method];
-    const trie = this.#tries[method];
-    const staticMap = /* @__PURE__ */ Object.create(null);
-    const handlerData = [];
-    [middleware, routes].forEach((r) => {
-      for (const path in r) {
-        const handlers = r[path];
-        const pathData = trie.paths[path];
-        if (!pathData) {
-          staticMap[path] = [handlers.map(([h]) => [h, /* @__PURE__ */ Object.create(null)]), emptyParam];
-          continue;
-        }
-        const paramAssoc = pathData[1];
-        handlerData[pathData[0]] = handlers.map(([h, paramCount]) => {
-          const paramIndexMap = /* @__PURE__ */ Object.create(null);
-          paramCount -= 1;
-          for (;paramCount >= 0; paramCount--) {
-            const [key, value] = paramAssoc[paramCount];
-            paramIndexMap[key] = value;
-          }
-          return [h, paramIndexMap];
-        });
+    const routes = [];
+    let hasOwnRoute = method === METHOD_NAME_ALL;
+    [this.#middleware, this.#routes].forEach((r) => {
+      const ownRoute = r[method] ? Object.keys(r[method]).map((path) => [path, r[method][path]]) : [];
+      if (ownRoute.length !== 0) {
+        hasOwnRoute ||= true;
+        routes.push(...ownRoute);
+      } else if (method !== METHOD_NAME_ALL) {
+        routes.push(...Object.keys(r[METHOD_NAME_ALL]).map((path) => [path, r[METHOD_NAME_ALL][path]]));
       }
     });
-    const [regexp, indexReplacementMap, paramReplacementMap] = trie.buildRegExp();
-    for (let i = 0, len = handlerData.length;i < len; i++) {
-      for (let j = 0, len2 = handlerData[i].length;j < len2; j++) {
-        const map = handlerData[i][j]?.[1];
-        if (!map) {
-          continue;
-        }
-        const keys = Object.keys(map);
-        for (let k = 0, len3 = keys.length;k < len3; k++) {
-          map[keys[k]] = paramReplacementMap[map[keys[k]]];
-        }
-      }
-    }
-    const handlerMap = [];
-    for (const i in indexReplacementMap) {
-      handlerMap[i] = handlerData[indexReplacementMap[i]];
+    if (!hasOwnRoute) {
+      return null;
+    } else {
+      return buildMatcherFromPreprocessedRoutes(routes);
     }
-    return [regexp, handlerMap, staticMap];
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/reg-exp-router/prepared-router.js
+// node_modules/hono/dist/router/reg-exp-router/prepared-router.js
 var PreparedRegExpRouter = class {
   name = "PreparedRegExpRouter";
   #matchers;
@@ -1330,7 +1298,7 @@ var PreparedRegExpRouter = class {
   match = match;
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/smart-router/router.js
+// node_modules/hono/dist/router/smart-router/router.js
 var SmartRouter = class {
   name = "SmartRouter";
   #routers = [];
@@ -1385,7 +1353,7 @@ var SmartRouter = class {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/trie-router/node.js
+// node_modules/hono/dist/router/trie-router/node.js
 var emptyParams = /* @__PURE__ */ Object.create(null);
 var hasChildren = (children) => {
   for (const _ in children) {
@@ -1519,12 +1487,9 @@ var Node2 = class _Node2 {
             if (m) {
               params[name] = m[0];
               this.#pushHandlerSets(handlerSets, child, method, node.#params, params);
-              if (m[0].length === restPathString.length && child.#children["*"]) {
-                this.#pushHandlerSets(handlerSets, child.#children["*"], method, node.#params, params);
-              }
               if (hasChildren(child.#children)) {
                 child.#params = params;
-                const componentCount = m[0].match(/\//g)?.length ?? 0;
+                const componentCount = m[0].match(/\//)?.length ?? 0;
                 const targetCurNodes = curNodesQueue[componentCount] ||= [];
                 targetCurNodes.push(child);
               }
@@ -1557,7 +1522,7 @@ var Node2 = class _Node2 {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/router/trie-router/router.js
+// node_modules/hono/dist/router/trie-router/router.js
 var TrieRouter = class {
   name = "TrieRouter";
   #node;
@@ -1579,7 +1544,7 @@ var TrieRouter = class {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/hono.js
+// node_modules/hono/dist/hono.js
 var Hono2 = class extends Hono {
   constructor(options = {}) {
     super(options);
@@ -1589,18 +1554,24 @@ var Hono2 = class extends Hono {
   }
 };
 
-// ../../node_modules/.bun/hono@4.13.1/node_modules/hono/dist/middleware/cors/index.js
+// node_modules/hono/dist/middleware/cors/index.js
 var cors = (options) => {
-  const opts = {
+  const defaults = {
     origin: "*",
-    allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH", "QUERY"],
+    allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"],
     allowHeaders: [],
-    exposeHeaders: [],
+    exposeHeaders: []
+  };
+  const opts = {
+    ...defaults,
     ...options
   };
   const findAllowOrigin = ((optsOrigin) => {
     if (typeof optsOrigin === "string") {
       if (optsOrigin === "*") {
+        if (opts.credentials) {
+          return (origin) => origin || null;
+        }
         return () => optsOrigin;
       } else {
         return (origin) => optsOrigin === origin ? origin : null;
@@ -1635,7 +1606,7 @@ var cors = (options) => {
       set("Access-Control-Expose-Headers", opts.exposeHeaders.join(","));
     }
     if (c.req.method === "OPTIONS") {
-      if (opts.origin !== "*") {
+      if (opts.origin !== "*" || opts.credentials) {
         set("Vary", "Origin");
       }
       if (opts.maxAge != null) {
@@ -1649,7 +1620,7 @@ var cors = (options) => {
       if (!headers?.length) {
         const requestHeaders = c.req.header("Access-Control-Request-Headers");
         if (requestHeaders) {
-          headers = requestHeaders.split(",").map((h) => h.trim());
+          headers = requestHeaders.split(/\s*,\s*/);
         }
       }
       if (headers?.length) {
@@ -1665,7 +1636,7 @@ var cors = (options) => {
       });
     }
     await next();
-    if (opts.origin !== "*") {
+    if (opts.origin !== "*" || opts.credentials) {
       c.header("Vary", "Origin", { append: true });
     }
   };
@@ -1744,7 +1715,7 @@ class ProfileNotFoundError extends Error {
   }
 }
 
-// ../../node_modules/.bun/@hasna+contracts@0.4.2/node_modules/@hasna/contracts/dist/auth/index.js
+// node_modules/@hasna/contracts/dist/auth/index.js
 import { createHash, createHmac, randomBytes, timingSafeEqual } from "crypto";
 var API_KEY_TOKEN_VERSION = 1;
 var API_KEY_NAMESPACE = "hasna";
@@ -2111,152 +2082,53 @@ function honoApiKey(options) {
     return c.json({ error: decision.message, reason: decision.reason }, decision.status);
   };
 }
-
-// src/generated/storage-kit/own.ts
-function ownProp(source, key) {
-  if (source === null || source === undefined)
-    return;
-  const kind = typeof source;
-  if (kind !== "object" && kind !== "function")
-    return;
-  if (!Object.hasOwn(source, key))
-    return;
-  return source[key];
-}
-function ownString(source, key) {
-  const value = ownProp(source, key);
-  return typeof value === "string" ? value : undefined;
-}
 // src/generated/storage-kit/tls.ts
 import { readFileSync as readFileSync2 } from "fs";
-var PG_TLS_QUERY_PARAMETERS = new Set([
-  "ssl",
-  "sslmode",
-  "sslrootcert",
-  "sslcert",
-  "sslkey",
-  "sslpassword",
-  "sslnegotiation",
-  "uselibpqcompat"
-]);
-var EXPLICIT_SSL_ON_VALUES = new Set(["1", "true", "yes", "on", "require"]);
-var EXPLICIT_SSL_OFF_VALUES = new Set(["0", "false", "no", "off", "disable"]);
-var SSLMODE_VALUES = new Map([
-  ["disable", "disable"],
-  ["allow", "prefer"],
-  ["prefer", "prefer"],
-  ["require", "require"],
-  ["verify-ca", "verify-ca"],
-  ["verify-full", "verify-full"]
-]);
-function connectionStringParts(connectionString) {
-  const queryStart = connectionString.indexOf("?");
-  if (queryStart === -1) {
-    return { base: connectionString, fragment: "", params: new URLSearchParams };
-  }
-  const base = connectionString.slice(0, queryStart);
-  const queryAndFragment = connectionString.slice(queryStart + 1);
-  const fragmentStart = queryAndFragment.indexOf("#");
-  const query = fragmentStart === -1 ? queryAndFragment : queryAndFragment.slice(0, fragmentStart);
-  const fragment = fragmentStart === -1 ? "" : queryAndFragment.slice(fragmentStart);
-  return { base, fragment, params: new URLSearchParams(query) };
-}
-function tlsQueryValues(connectionString) {
-  const values = new Map;
-  for (const [key, value] of connectionStringParts(connectionString).params) {
-    const normalized = key.toLowerCase();
-    if (PG_TLS_QUERY_PARAMETERS.has(normalized))
-      values.set(normalized, value);
-  }
-  return values;
-}
-function connectionStringWithoutTlsParameters(connectionString) {
-  const { base, fragment, params } = connectionStringParts(connectionString);
-  for (const key of [...params.keys()]) {
-    if (PG_TLS_QUERY_PARAMETERS.has(key.toLowerCase()))
-      params.delete(key);
-  }
-  const query = params.toString();
-  return `${base}${query ? `?${query}` : ""}${fragment}`;
-}
-function rawSslMode(values) {
-  const raw2 = values.get("sslmode");
-  return raw2 === undefined ? undefined : raw2.trim().toLowerCase();
-}
-function sslNegotiationFromConnectionString(connectionString) {
-  const value = tlsQueryValues(connectionString).get("sslnegotiation")?.trim().toLowerCase();
-  if (!value)
-    return;
-  if (value === "postgres" || value === "direct")
-    return value;
-  throw new Error(`Unknown sslnegotiation '${value}' in connection string; expected postgres or direct.`);
-}
 function sslModeFromConnectionString(connectionString) {
-  const values = tlsQueryValues(connectionString);
-  const sslmode = rawSslMode(values);
-  if (sslmode !== undefined) {
-    const resolved = SSLMODE_VALUES.get(sslmode);
-    if (resolved)
-      return resolved;
-    throw new Error(`Unknown sslmode '${sslmode}' in connection string; expected one of ` + `${[...SSLMODE_VALUES.keys()].join(", ")}. Remove the parameter entirely to defer to ` + `PGSSLMODE \u2014 an empty value is not how that is spelled.`);
-  }
-  if (values.has("ssl")) {
-    const ssl = values.get("ssl")?.trim().toLowerCase() ?? "";
-    if (EXPLICIT_SSL_ON_VALUES.has(ssl))
-      return "require";
-    if (!EXPLICIT_SSL_OFF_VALUES.has(ssl)) {
-      throw new Error(`Unknown ssl value '${ssl}' in connection string.`);
-    }
-    return "disable";
-  }
-  const sslnegotiation = values.get("sslnegotiation")?.trim().toLowerCase();
-  if (sslnegotiation === "direct")
+  const queryStart = connectionString.indexOf("?");
+  const params = new URLSearchParams(queryStart === -1 ? "" : connectionString.slice(queryStart + 1));
+  const sslmode = params.get("sslmode")?.trim().toLowerCase();
+  if (sslmode) {
+    switch (sslmode) {
+      case "disable":
+      case "prefer":
+      case "require":
+      case "verify-ca":
+      case "verify-full":
+        return sslmode;
+      case "allow":
+        return "prefer";
+      default:
+        throw new Error(`Unknown sslmode '${sslmode}' in connection string.`);
+    }
+  }
+  const ssl = params.get("ssl")?.trim().toLowerCase();
+  if (ssl && ["1", "true", "yes", "on", "require"].includes(ssl))
     return "require";
   return "disable";
 }
-function loadCaBundle(connectionString, options) {
-  const env = ownProp(options, "env") ?? process.env;
-  const ca = ownString(options, "ca");
-  if (ca && ca.trim())
-    return ca;
-  const sslRootCert = tlsQueryValues(connectionString).get("sslrootcert")?.trim();
-  const path = ownString(options, "caCertPath") ?? (sslRootCert ? sslRootCert : undefined) ?? ownString(env, "PGSSLROOTCERT") ?? ownString(env, "NODE_EXTRA_CA_CERTS");
+function loadCaBundle(options) {
+  const env = options.env ?? process.env;
+  if (options.ca && options.ca.trim())
+    return options.ca;
+  const path = options.caCertPath ?? env.PGSSLROOTCERT ?? env.NODE_EXTRA_CA_CERTS;
   if (path && path.trim())
     return readFileSync2(path.trim(), "utf8");
   return null;
 }
-function loadClientCertificate(connectionString) {
-  const values = tlsQueryValues(connectionString);
-  const material = {};
-  const certPath = values.get("sslcert")?.trim();
-  if (certPath)
-    material.cert = readFileSync2(certPath, "utf8");
-  const keyPath = values.get("sslkey")?.trim();
-  if (keyPath)
-    material.key = readFileSync2(keyPath, "utf8");
-  const passphrase = values.get("sslpassword");
-  if (passphrase)
-    material.passphrase = passphrase;
-  return material;
-}
 function resolveTlsConfig(connectionString, options = {}) {
   const mode = sslModeFromConnectionString(connectionString);
-  if (mode === "disable") {
-    const values = tlsQueryValues(connectionString);
-    const sslmode = rawSslMode(values);
-    const ssl = values.get("ssl")?.trim().toLowerCase();
-    const explicitlyOff = sslmode === "disable" || ssl !== undefined && EXPLICIT_SSL_OFF_VALUES.has(ssl);
-    return explicitlyOff ? false : undefined;
-  }
-  const ca = loadCaBundle(connectionString, options);
-  const clientCertificate = loadClientCertificate(connectionString);
-  if (mode === "prefer" || mode === "require") {
-    return { rejectUnauthorized: true, ...ca ? { ca } : {}, ...clientCertificate };
+  if (mode === "disable" || mode === "prefer") {
+    return;
+  }
+  const ca = loadCaBundle(options);
+  if (mode === "require") {
+    return ca ? { rejectUnauthorized: false, ca } : { rejectUnauthorized: false };
   }
   if (!ca) {
     throw new Error(`sslmode=${mode} requires a CA bundle. Set PGSSLROOTCERT (or pass caCertPath/ca) to the ` + `Amazon RDS global bundle: https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem`);
   }
-  return { rejectUnauthorized: true, ca, ...clientCertificate };
+  return { rejectUnauthorized: true, ca };
 }
 // src/generated/storage-kit/query.ts
 function wrapExecutor(executor) {
@@ -2313,58 +2185,23 @@ function createQueryClient(pool) {
 }
 // src/generated/storage-kit/pool.ts
 import pg from "pg";
-function ownPoolOptions(options) {
-  const own = Object.create(null);
-  const ca = ownString(options, "ca");
-  if (ca !== undefined)
-    own.ca = ca;
-  const caCertPath = ownString(options, "caCertPath");
-  if (caCertPath !== undefined)
-    own.caCertPath = caCertPath;
-  const env = ownProp(options, "env");
-  if (env !== undefined)
-    own.env = env;
-  const max = ownProp(options, "max");
-  if (max !== undefined)
-    own.max = max;
-  const idleTimeoutMillis = ownProp(options, "idleTimeoutMillis");
-  if (idleTimeoutMillis !== undefined)
-    own.idleTimeoutMillis = idleTimeoutMillis;
-  const connectionTimeoutMillis = ownProp(options, "connectionTimeoutMillis");
-  if (connectionTimeoutMillis !== undefined)
-    own.connectionTimeoutMillis = connectionTimeoutMillis;
-  const applicationName = ownString(options, "applicationName");
-  if (applicationName !== undefined)
-    own.applicationName = applicationName;
-  return own;
-}
 function createPgPool(options) {
-  const connectionString = ownString(options, "connectionString");
-  if (!connectionString || !connectionString.trim()) {
-    throw new Error("createPgPool requires an own `connectionString` on the options object.");
-  }
-  const own = ownPoolOptions(options);
-  const ssl = resolveTlsConfig(connectionString, {
-    ...own.ca !== undefined ? { ca: own.ca } : {},
-    ...own.caCertPath !== undefined ? { caCertPath: own.caCertPath } : {},
-    ...own.env !== undefined ? { env: own.env } : {}
+  const ssl = resolveTlsConfig(options.connectionString, {
+    ...options.ca !== undefined ? { ca: options.ca } : {},
+    ...options.caCertPath !== undefined ? { caCertPath: options.caCertPath } : {},
+    ...options.env !== undefined ? { env: options.env } : {}
   });
-  const config = {
-    connectionString: connectionStringWithoutTlsParameters(connectionString)
-  };
+  const config = { connectionString: options.connectionString };
   if (ssl !== undefined)
     config.ssl = ssl;
-  const sslnegotiation = sslNegotiationFromConnectionString(connectionString);
-  if (sslnegotiation !== undefined)
-    config.sslnegotiation = sslnegotiation;
-  if (own.max !== undefined)
-    config.max = own.max;
-  if (own.idleTimeoutMillis !== undefined)
-    config.idleTimeoutMillis = own.idleTimeoutMillis;
-  if (own.connectionTimeoutMillis !== undefined)
-    config.connectionTimeoutMillis = own.connectionTimeoutMillis;
-  if (own.applicationName !== undefined)
-    config.application_name = own.applicationName;
+  if (options.max !== undefined)
+    config.max = options.max;
+  if (options.idleTimeoutMillis !== undefined)
+    config.idleTimeoutMillis = options.idleTimeoutMillis;
+  if (options.connectionTimeoutMillis !== undefined)
+    config.connectionTimeoutMillis = options.connectionTimeoutMillis;
+  if (options.applicationName !== undefined)
+    config.application_name = options.applicationName;
   return new pg.Pool(config);
 }
 // src/storage/schema.ts
@@ -2445,37 +2282,15 @@ function instructionsSchemaSql() {
   ];
 }
 
-// src/lib/retired-storage-mode.ts
-var LEGACY_STORAGE_MODE_KEYS = [
-  "HASNA_INSTRUCTIONS_STORAGE_MODE",
-  "HASNA_INSTRUCTIONS_MODE",
-  "INSTRUCTIONS_STORAGE_MODE",
-  "INSTRUCTIONS_MODE"
-];
-function firstDefinedEnvKey(env, keys) {
-  for (const key of keys) {
-    if (Object.hasOwn(env, key) && env[key] !== undefined)
-      return key;
-  }
-  return null;
-}
-function assertNoLegacyStorageMode(env = process.env) {
-  const legacyKey = firstDefinedEnvKey(env, LEGACY_STORAGE_MODE_KEYS);
-  if (!legacyKey)
-    return;
-  throw new Error(`${legacyKey} was removed. Deployment modes no longer exist: delete the storage-mode variable. ` + `The client uses the local SQLite store, or the HTTP API selected by ` + `HASNA_INSTRUCTIONS_API_URL + HASNA_INSTRUCTIONS_API_KEY. ` + `On the server, set HASNA_INSTRUCTIONS_DATABASE_URL to select the postgresql backend, ` + `or leave it unset for sqlite.`);
-}
-
 // src/server/cloud.ts
 var INSTRUCTIONS_APP_SLUG = "instructions";
 function resolveCloudDatabaseUrl(env = process.env) {
-  assertNoLegacyStorageMode(env);
   return env.HASNA_INSTRUCTIONS_DATABASE_URL || env.INSTRUCTIONS_DATABASE_URL || env.DATABASE_URL || undefined;
 }
 function resolveSigningSecret(env = process.env) {
   return env.HASNA_INSTRUCTIONS_API_SIGNING_KEY || env.HASNA_API_SIGNING_KEY || env.API_KEY_SIGNING_SECRET || undefined;
 }
-function isPostgresBackendEnabled(env = process.env) {
+function isCloudModeEnabled(env = process.env) {
   return Boolean(resolveCloudDatabaseUrl(env));
 }
 var cachedClient = null;
@@ -2933,7 +2748,7 @@ Policy reference: \`${CODEWITH_SHARED_TODOS_STORAGE_POLICY_REFERENCE}\`
 // src/lib/project-context.ts
 import { basename, dirname as dirname2, isAbsolute, join as join2, parse, relative, resolve } from "path";
 
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/external.js
+// node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
   void: () => voidType,
@@ -3045,7 +2860,7 @@ __export(exports_external, {
   BRAND: () => BRAND
 });
 
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/util.js
+// node_modules/zod/v3/helpers/util.js
 var util;
 (function(util2) {
   util2.assertEqual = (_) => {};
@@ -3176,7 +2991,7 @@ var getParsedType = (data) => {
   }
 };
 
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/ZodError.js
+// node_modules/zod/v3/ZodError.js
 var ZodIssueCode = util.arrayToEnum([
   "invalid_type",
   "invalid_literal",
@@ -3295,7 +3110,7 @@ ZodError.create = (issues) => {
   return error;
 };
 
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/locales/en.js
+// node_modules/zod/v3/locales/en.js
 var errorMap = (issue, _ctx) => {
   let message;
   switch (issue.code) {
@@ -3398,7 +3213,7 @@ var errorMap = (issue, _ctx) => {
 };
 var en_default = errorMap;
 
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/errors.js
+// node_modules/zod/v3/errors.js
 var overrideErrorMap = en_default;
 function setErrorMap(map) {
   overrideErrorMap = map;
@@ -3406,7 +3221,7 @@ function setErrorMap(map) {
 function getErrorMap() {
   return overrideErrorMap;
 }
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
+// node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
   const { data, path, errorMaps, issueData } = params;
   const fullPath = [...path, ...issueData.path || []];
@@ -3512,14 +3327,14 @@ var isAborted = (x) => x.status === "aborted";
 var isDirty = (x) => x.status === "dirty";
 var isValid = (x) => x.status === "valid";
 var isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/errorUtil.js
+// node_modules/zod/v3/helpers/errorUtil.js
 var errorUtil;
 (function(errorUtil2) {
   errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {};
   errorUtil2.toString = (message) => typeof message === "string" ? message : message?.message;
 })(errorUtil || (errorUtil = {}));
 
-// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/types.js
+// node_modules/zod/v3/types.js
 class ParseInputLazyPath {
   constructor(parent, value, path, key) {
     this._cachedPath = [];
@@ -7442,15 +7257,15 @@ function normalizeActivation(value) {
   if (!INSTRUCTION_ACTIVATION_MODES.includes(record["mode"])) {
     throw new Error(`Invalid instruction activation mode: ${String(record["mode"])}`);
   }
-  const mode = record["mode"];
+  const mode2 = record["mode"];
   const globs = stringArray(record["globs"], "activation.globs");
   const models = stringArray(record["models"], "activation.models");
-  if (mode === "glob" && (!globs || globs.length === 0))
+  if (mode2 === "glob" && (!globs || globs.length === 0))
     throw new Error("Glob activation requires at least one glob.");
-  if (mode === "model" && (!models || models.length === 0))
+  if (mode2 === "model" && (!models || models.length === 0))
     throw new Error("Model activation requires at least one model.");
   return {
-    mode,
+    mode: mode2,
     ...globs ? { globs } : {},
     ...models ? { models } : {},
     ...optionalString(record["description"], "activation.description") ? { description: record["description"] } : {},
@@ -8840,22 +8655,22 @@ if (process.argv.includes("--version") || process.argv.includes("-V")) {
 var PORT = Number(process.env["PORT"] ?? process.env["INSTRUCTIONS_PORT"] ?? 3457);
 var app = new Hono2;
 app.use("*", cors());
-function serviceBackend() {
-  return isPostgresBackendEnabled() ? "postgresql" : "sqlite";
+function serviceMode() {
+  return isCloudModeEnabled() ? "cloud" : "local";
 }
-app.get("/health", (c) => c.json({ status: "ok", version: getPackageVersion(), backend: serviceBackend(), name: "instructions" }));
-app.get("/version", (c) => c.json({ status: "ok", version: getPackageVersion(), backend: serviceBackend(), name: "instructions" }));
+app.get("/health", (c) => c.json({ status: "ok", version: getPackageVersion(), mode: serviceMode(), name: "instructions" }));
+app.get("/version", (c) => c.json({ status: "ok", version: getPackageVersion(), mode: serviceMode(), name: "instructions" }));
 app.get("/ready", async (c) => {
   const version = getPackageVersion();
-  const backend2 = serviceBackend();
-  if (backend2 === "postgresql") {
+  const mode2 = serviceMode();
+  if (mode2 === "cloud") {
     try {
       await pingCloud();
     } catch (e) {
-      return c.json({ status: "unavailable", version, backend: backend2, error: e.message }, 503);
+      return c.json({ status: "unavailable", version, mode: mode2, error: e.message }, 503);
     }
   }
-  return c.json({ status: "ready", version, backend: backend2 });
+  return c.json({ status: "ready", version, mode: mode2 });
 });
 app.get("/openapi.json", (c) => c.json(buildV1OpenApiDocument()));
 app.get("/v1/openapi.json", (c) => c.json(buildV1OpenApiDocument()));
@@ -8907,7 +8722,7 @@ if (dashDir) {
   });
 }
 var HOST = process.env["HOST"] ?? process.env["INSTRUCTIONS_HOST"] ?? "localhost";
-console.log(`instructions-serve listening on http://${HOST}:${PORT} (backend: ${serviceBackend()})${dashDir ? " (dashboard: /)" : " (no dashboard)"}`);
+console.log(`instructions-serve listening on http://${HOST}:${PORT} (mode: ${serviceMode()})${dashDir ? " (dashboard: /)" : " (no dashboard)"}`);
 var server_default = { port: PORT, hostname: HOST, fetch: app.fetch };
 export {
   server_default as default