@kubb/agent 4.31.6 → 4.32.1

package/.output/server/chunks/nitro/nitro.mjs

@@ -4478,52 +4478,6 @@ const _a2VEEUGb5K4b1gyM9hOmO1Xz0hUJSFuGyIT3cHsvE = defineNitroPlugin((nitro) =>
   });
 });
 
-function getStorage() {
-  return useStorage("kubb");
-}
-function isSessionValid(session) {
-  try {
-    const expiresAt = new Date(session.expiresAt);
-    const now = /* @__PURE__ */ new Date();
-    return now.getTime() < expiresAt.getTime() - 6e4;
-  } catch {
-    return false;
-  }
-}
-function getSessionKey(token) {
-  return `sessions:${createHash("sha512").update(token).digest("hex")}`;
-}
-async function getCachedSession(sessionKey) {
-  const storage = getStorage();
-  const agentSession = await storage.getItem(sessionKey);
-  if (!agentSession) {
-    return null;
-  }
-  if (!isSessionValid(agentSession)) {
-    return null;
-  }
-  return agentSession;
-}
-async function cacheSession({ sessionKey, session }) {
-  const storage = getStorage();
-  await storage.setItem(sessionKey, { ...session, storedAt: (/* @__PURE__ */ new Date()).toISOString(), configs: [] });
-}
-async function removeCachedSession(sessionKey) {
-  const storage = getStorage();
-  const maskedSessionKey = maskedString(sessionKey.replace("sessions:", ""));
-  logger.info(`[${maskedSessionKey}] Removing expired agent session from cache...`);
-  await storage.removeItem(sessionKey);
-  logger.success(`[${maskedSessionKey}] Removed expired agent session from cache`);
-}
-async function saveStudioConfigToStorage({ sessionKey, config }) {
-  const storage = getStorage();
-  const agentSession = await getCachedSession(sessionKey);
-  if (!agentSession) {
-    throw new Error("No valid session found for retrieving previous configs");
-  }
-  await storage.setItem(sessionKey, { ...agentSession, configs: [...agentSession.configs, { config, storedAt: (/* @__PURE__ */ new Date()).toISOString() }] });
-}
-
 function generateToken() {
   return randomBytes(32).toString("hex");
 }
@@ -4536,22 +4490,11 @@ function getMachineToken() {
   return hashToken((_a = process.env.KUBB_AGENT_SECRET) != null ? _a : _fallbackSecret);
 }
 
-async function createAgentSession({ token, studioUrl, noCache, cacheKey }) {
-  const sessionKey = cacheKey != null ? cacheKey : getSessionKey(token);
-  const maskedSessionKey = maskedString(sessionKey.replace("sessions:", ""));
-  const connectUrl = `${studioUrl}/api/agent/session/create`;
-  const canCache = !noCache;
-  if (canCache) {
-    const cachedSession = await getCachedSession(sessionKey);
-    if (cachedSession) {
-      logger.success(`[${maskedSessionKey}] Using cached agent session`);
-      return cachedSession;
-    }
-    await removeCachedSession(sessionKey);
-  }
+async function createAgentSession({ token, studioUrl }) {
+  const url = `${studioUrl}/api/agent/session/create`;
   try {
-    logger.info(`[${maskedSessionKey}] Creating agent session with Studio...`);
-    const data = await $fetch(connectUrl, {
+    logger.info("Creating agent session with Studio...");
+    const data = await $fetch(url, {
       method: "POST",
       headers: { Authorization: `Bearer ${token}` },
       body: { machineToken: getMachineToken() }
@@ -4559,11 +4502,7 @@ async function createAgentSession({ token, studioUrl, noCache, cacheKey }) {
     if (!data) {
       throw new Error("No data available for agent session");
     }
-    if (canCache) {
-      await cacheSession({ sessionKey, session: { ...data, storedAt: (/* @__PURE__ */ new Date()).toISOString(), configs: [] } });
-      logger.success(`[${maskedSessionKey}] Saved agent session to cache`);
-    }
-    logger.info(`[${maskedSessionKey}] Created agent session with Studio`);
+    logger.info("Created agent session with Studio");
     return data;
   } catch (error) {
     throw new Error("Failed to get agent session from Kubb Studio", { cause: error });
@@ -4571,10 +4510,10 @@ async function createAgentSession({ token, studioUrl, noCache, cacheKey }) {
 }
 async function registerAgent({ token, studioUrl, poolSize }) {
   var _a, _b;
-  const registerUrl = `${studioUrl}/api/agent/register`;
+  const url = `${studioUrl}/api/agent/connect`;
   try {
     logger.info("Registering agent with Studio...");
-    await $fetch(registerUrl, {
+    await $fetch(url, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`
@@ -4587,11 +4526,11 @@ async function registerAgent({ token, studioUrl, poolSize }) {
   }
 }
 async function disconnect({ sessionId, token, studioUrl }) {
-  const disconnectUrl = `${studioUrl}/api/agent/session/${sessionId}/disconnect`;
+  const url = `${studioUrl}/api/agent/session/${sessionId}/disconnect`;
   const maskedSessionKey = maskedString(sessionId);
   try {
     logger.info(`[${maskedSessionKey}] Disconnecting from Studio...`);
-    await $fetch(disconnectUrl, {
+    await $fetch(url, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`
@@ -4884,6 +4823,26 @@ function toRegExpString(text, func = "RegExp") {
   if (func === null) return `/${source}/${flags}`;
   return `new ${func}(${JSON.stringify(source)}${flags ? `, ${JSON.stringify(flags)}` : ""})`;
 }
+var transformers_default = {
+  combineCodes,
+  escape,
+  jsStringEscape,
+  createIndent,
+  transformReservedWord,
+  isValidVarName,
+  nameSorter,
+  searchAndReplace,
+  stringify,
+  stringifyObject,
+  toRegExpString,
+  trim,
+  trimQuotes,
+  JSDoc: { createJSDocBlockText },
+  camelCase,
+  pascalCase,
+  snakeCase,
+  screamingSnakeCase
+};
 
 var __defProp$9 = Object.defineProperty;
 var __typeError$5 = (msg) => {
@@ -6076,7 +6035,7 @@ function tokenize(command) {
   return args;
 }
 
-var version = "4.31.6";
+var version = "4.32.1";
 
 function isCommandMessage(msg) {
   return msg.type === "command";
@@ -6091,6 +6050,24 @@ function isPublishCommandMessage(msg) {
   return msg.type === "command" && msg.command === "publish";
 }
 
+function getStorage() {
+  return useStorage("kubb");
+}
+async function saveStudioConfigToStorage({ sessionId, config }) {
+  var _a;
+  const storage = getStorage();
+  const key = `configs:${sessionId}`;
+  const existing = (_a = await storage.getItem(key)) != null ? _a : [];
+  await storage.setItem(key, [...existing, { config, storedAt: (/* @__PURE__ */ new Date()).toISOString() }]);
+}
+async function getLatestStudioConfigFromStorage({ sessionId }) {
+  const storage = getStorage();
+  const key = `configs:${sessionId}`;
+  const existing = await storage.getItem(key);
+  if (!(existing == null ? void 0 : existing.length)) return null;
+  return existing[existing.length - 1].config;
+}
+
 var __typeError$3 = (msg) => {
   throw TypeError(msg);
 };
@@ -6124,7 +6101,7 @@ var BaseGenerator = (_a$3 = class {
 function isInputPath(config) {
   return typeof (config == null ? void 0 : config.input) === "object" && config.input !== null && "path" in config.input;
 }
-var version$1 = "4.31.6";
+var version$1 = "4.32.1";
 function getDiagnosticInfo() {
   return {
     nodeVersion: version$2,
@@ -6670,27 +6647,6 @@ function isKeyword(meta, keyword) {
   return meta.keyword === keyword;
 }
 
-var transformers_default = {
-  combineCodes,
-  escape,
-  jsStringEscape,
-  createIndent,
-  transformReservedWord,
-  isValidVarName,
-  nameSorter,
-  searchAndReplace,
-  stringify,
-  stringifyObject,
-  toRegExpString,
-  trim,
-  trimQuotes,
-  JSDoc: { createJSDocBlockText },
-  camelCase,
-  pascalCase,
-  snakeCase,
-  screamingSnakeCase
-};
-
 var __create = Object.create;
 var __defProp$7 = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -6701,28 +6657,20 @@ var __esmMin = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __exportAll = (all, no_symbols) => {
   let target = {};
-  for (var name in all) {
-    __defProp$7(target, name, {
-      get: all[name],
-      enumerable: true
-    });
-  }
-  {
-    __defProp$7(target, Symbol.toStringTag, { value: "Module" });
-  }
+  for (var name in all) __defProp$7(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+  __defProp$7(target, Symbol.toStringTag, { value: "Module" });
   return target;
 };
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-      key = keys[i];
-      if (!__hasOwnProp.call(to, key) && key !== except) {
-        __defProp$7(to, key, {
-          get: ((k) => from[k]).bind(null, key),
-          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-        });
-      }
-    }
+  if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+    key = keys[i];
+    if (!__hasOwnProp.call(to, key) && key !== except) __defProp$7(to, key, {
+      get: ((k) => from[k]).bind(null, key),
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
   }
   return to;
 };
@@ -7631,8 +7579,7 @@ var require_schema = /* @__PURE__ */ __commonJSMin(((exports$1) => {
   };
 }));
 var require_str = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  const type_1 = require_type();
-  module.exports = new type_1.Type("tag:yaml.org,2002:str", {
+  module.exports = new (require_type()).Type("tag:yaml.org,2002:str", {
     kind: "scalar",
     construct: function(data) {
       return null !== data ? data : "";
@@ -7640,8 +7587,7 @@ var require_str = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   });
 }));
 var require_seq = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  const type_1 = require_type();
-  module.exports = new type_1.Type("tag:yaml.org,2002:seq", {
+  module.exports = new (require_type()).Type("tag:yaml.org,2002:seq", {
     kind: "sequence",
     construct: function(data) {
       return null !== data ? data : [];
@@ -7649,8 +7595,7 @@ var require_seq = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   });
 }));
 var require_map = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  const type_1 = require_type();
-  module.exports = new type_1.Type("tag:yaml.org,2002:map", {
+  module.exports = new (require_type()).Type("tag:yaml.org,2002:map", {
     kind: "mapping",
     construct: function(data) {
       return null !== data ? data : {};
@@ -7658,8 +7603,7 @@ var require_map = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   });
 }));
 var require_failsafe = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  const schema_1 = require_schema();
-  module.exports = new schema_1.Schema({ explicit: [
+  module.exports = new (require_schema()).Schema({ explicit: [
     require_str(),
     require_seq(),
     require_map()
@@ -7866,7 +7810,7 @@ var require_int = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
 var require_float = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   const common = require_common();
   const type_1 = require_type();
-  var YAML_FLOAT_PATTERN = new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");
+  var YAML_FLOAT_PATTERN = /* @__PURE__ */ new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");
   function resolveYamlFloat(data) {
     if (null === data) return false;
     if (!YAML_FLOAT_PATTERN.test(data)) return false;
@@ -7935,8 +7879,7 @@ var require_float = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   });
 }));
 var require_json = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  const schema_1 = require_schema();
-  module.exports = new schema_1.Schema({
+  module.exports = new (require_schema()).Schema({
     include: [require_failsafe()],
     implicit: [
       require_null(),
@@ -7947,12 +7890,11 @@ var require_json = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   });
 }));
 var require_core = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  const schema_1 = require_schema();
-  module.exports = new schema_1.Schema({ include: [require_json()] });
+  module.exports = new (require_schema()).Schema({ include: [require_json()] });
 }));
 var require_timestamp = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   const type_1 = require_type();
-  var YAML_TIMESTAMP_REGEXP = new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?)?$");
+  var YAML_TIMESTAMP_REGEXP = /* @__PURE__ */ new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?)?$");
   function resolveYamlTimestamp(data) {
     if (null === data) return false;
     if (null === YAML_TIMESTAMP_REGEXP.exec(data)) return false;
@@ -8209,7 +8151,7 @@ var require_set = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   });
 }));
 var require_default_safe = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
-  var schema = new (require_schema()).Schema({
+  module.exports = new (require_schema()).Schema({
     include: [require_core()],
     implicit: [require_timestamp(), require_merge()],
     explicit: [
@@ -8219,7 +8161,6 @@ var require_default_safe = /* @__PURE__ */ __commonJSMin(((exports$1, module) =>
       require_set()
     ]
   });
-  module.exports = schema;
 }));
 var require_undefined = /* @__PURE__ */ __commonJSMin(((exports$1, module) => {
   const type_1 = require_type();
@@ -10860,7 +10801,7 @@ var require_trapAccess = /* @__PURE__ */ __commonJSMin(((exports$1) => {
   } };
   exports$1.trapAccess = (target) => new Proxy(target, traps);
 }));
-var require_yaml = /* @__PURE__ */ __commonJSMin(((exports$1) => {
+var import_yaml = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports$1) => {
   Object.defineProperty(exports$1, "__esModule", { value: true });
   const tslib_1 = (init_tslib_es6(), __toCommonJS(tslib_es6_exports));
   tslib_1.__exportStar(require_buildJsonPath(), exports$1);
@@ -10868,15 +10809,12 @@ var require_yaml = /* @__PURE__ */ __commonJSMin(((exports$1) => {
   tslib_1.__exportStar(require_getJsonPathForPosition(), exports$1);
   tslib_1.__exportStar(require_getLocationForJsonPath(), exports$1);
   tslib_1.__exportStar(require_lineForPosition(), exports$1);
-  var parse_1 = require_parse();
-  exports$1.parse = parse_1.parse;
-  var parseWithPointers_1 = require_parseWithPointers();
-  exports$1.parseWithPointers = parseWithPointers_1.parseWithPointers;
+  exports$1.parse = require_parse().parse;
+  exports$1.parseWithPointers = require_parseWithPointers().parseWithPointers;
   tslib_1.__exportStar(require_safeStringify(), exports$1);
   tslib_1.__exportStar(require_types(), exports$1);
   tslib_1.__exportStar(require_trapAccess(), exports$1);
-}));
-var import_yaml = /* @__PURE__ */ __toESM(require_yaml());
+})))());
 const STRUCTURAL_KEYS = /* @__PURE__ */ new Set([
   "properties",
   "items",
@@ -12658,6 +12596,18 @@ function withRequiredRequestBodySchema(operationSchema) {
     }
   };
 }
+function resolveServerUrl(server, overrides) {
+  var _a2, _b2;
+  if (!server.variables) return server.url;
+  let url = server.url;
+  for (const [key, variable] of Object.entries(server.variables)) {
+    const value = (_a2 = overrides == null ? void 0 : overrides[key]) != null ? _a2 : variable.default != null ? String(variable.default) : void 0;
+    if (value === void 0) continue;
+    if (((_b2 = variable.enum) == null ? void 0 : _b2.length) && !variable.enum.some((e) => String(e) === value)) throw new Error(`Invalid server variable value '${value}' for '${key}' when resolving ${server.url}. Valid values are: ${variable.enum.join(", ")}.`);
+    url = url.replaceAll(`{${key}}`, value);
+  }
+  return url;
+}
 
 function getDefaultBanner({ title, description, version, config }) {
   try {
@@ -12844,7 +12794,7 @@ function Url({ name, isExportable = true, isIndexable = true, typeSchemas, baseU
       export: isExportable,
       params: params.toConstructor(),
       children: [
-        pathParamsMapping && Object.entries(pathParamsMapping).map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`).join("\n"),
+        pathParamsMapping && Object.entries(pathParamsMapping).filter(([originalName, camelCaseName]) => originalName !== camelCaseName && isValidVarName(originalName)).map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`).join("\n"),
         pathParamsMapping && /* @__PURE__ */ jsx("br", {}),
         /* @__PURE__ */ jsx(Const, {
           name: "res",
@@ -12979,7 +12929,7 @@ function Client({ name, isExportable = true, isIndexable = true, returnType, typ
         isConfigurable ? "const { client: request = fetch, ...requestConfig } = config" : "",
         /* @__PURE__ */ jsx("br", {}),
         /* @__PURE__ */ jsx("br", {}),
-        pathParamsMapping && Object.entries(pathParamsMapping).map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`).join("\n"),
+        pathParamsMapping && Object.entries(pathParamsMapping).filter(([originalName, camelCaseName]) => originalName !== camelCaseName && isValidVarName(originalName)).map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`).join("\n"),
         pathParamsMapping && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("br", {}), /* @__PURE__ */ jsx("br", {})] }),
         queryParamsMapping && ((_f = typeSchemas.queryParams) == null ? void 0 : _f.name) && /* @__PURE__ */ jsxs(Fragment, { children: [
           `const mappedParams = params ? { ${Object.entries(queryParamsMapping).map(([originalName, camelCaseName]) => `"${originalName}": params.${camelCaseName}`).join(", ")} } : undefined`,
@@ -13578,7 +13528,7 @@ var OperationGenerator = (_a = class extends BaseGenerator {
 }, _a);
 const pluginOasName = "plugin-oas";
 const pluginOas = definePlugin((options) => {
-  const { output = { path: "schemas" }, group, validate = true, generators = [jsonGenerator], serverIndex, contentType, oasClass, discriminator = "strict", collisionDetection = false } = options;
+  const { output = { path: "schemas" }, group, validate = true, generators = [jsonGenerator], serverIndex, serverVariables, contentType, oasClass, discriminator = "strict", collisionDetection = false } = options;
   const getOas = async ({ validate: validate2, config, events }) => {
     const oas = await parseFromConfig(config, oasClass);
     oas.setOptions({
@@ -13622,13 +13572,16 @@ const pluginOas = definePlugin((options) => {
           return oas;
         },
         async getBaseURL() {
-          var _a2, _b;
+          var _a2;
           const oas2 = await getOas({
             config,
             events,
             validate: false
           });
-          if (serverIndex !== void 0) return (_b = (_a2 = oas2.api.servers) == null ? void 0 : _a2.at(serverIndex)) == null ? void 0 : _b.url;
+          if (serverIndex === void 0) return;
+          const server = (_a2 = oas2.api.servers) == null ? void 0 : _a2.at(serverIndex);
+          if (!(server == null ? void 0 : server.url)) return;
+          return resolveServerUrl(server, serverVariables);
         }
       };
     },
@@ -14339,12 +14292,11 @@ function Zod({ name, typeName, tree, schema, inferTypeName, mapper, coercion, ke
   });
   const baseSchemas = mini ? filterMiniModifiers(schemas) : schemas;
   const output = baseSchemas.map((schemaKeyword, index) => {
-    const siblings = baseSchemas.filter((_, i) => i !== index);
     return parse$2({
       schema,
       parent: void 0,
       current: schemaKeyword,
-      siblings,
+      siblings: baseSchemas.filter((_, i) => i !== index),
       name
     }, {
       mapper,
@@ -212689,14 +212641,13 @@ const parse$1 = createParser({
         if (isNullable) type = createUnionDeclaration({ nodes: [type, keywordTypeNodes.null] });
         if (isNullish && ["undefined", "questionTokenAndUndefined"].includes(options.optionalType)) type = createUnionDeclaration({ nodes: [type, keywordTypeNodes.undefined] });
         if (isOptional && ["undefined", "questionTokenAndUndefined"].includes(options.optionalType)) type = createUnionDeclaration({ nodes: [type, keywordTypeNodes.undefined] });
-        const propertyNode = createPropertySignature({
-          questionToken: isOptional || isNullish ? ["questionToken", "questionTokenAndUndefined"].includes(options.optionalType) : false,
-          name: mappedName,
-          type,
-          readOnly: isReadonly
-        });
         return appendJSDocToNode({
-          node: propertyNode,
+          node: createPropertySignature({
+            questionToken: isOptional || isNullish ? ["questionToken", "questionTokenAndUndefined"].includes(options.optionalType) : false,
+            name: mappedName,
+            type,
+            readOnly: isReadonly
+          }),
           comments: [
             describeSchema ? `@description ${transformers_default.jsStringEscape(describeSchema.args)}` : void 0,
             deprecatedSchema ? "@deprecated" : void 0,
@@ -212719,8 +212670,7 @@ const parse$1 = createParser({
           siblings: []
         }, options)).filter(Boolean).at(0);
         if ((_d = current.args) == null ? void 0 : _d.additionalProperties.some((schema2) => isKeyword(schema2, schemaKeywords.nullable))) additionalPropertiesType = createUnionDeclaration({ nodes: [additionalPropertiesType, keywordTypeNodes.null] });
-        const indexSignatureType = properties.length > 0 ? keywordTypeNodes.unknown : additionalPropertiesType;
-        additionalProperties = createIndexSignature(indexSignatureType);
+        additionalProperties = createIndexSignature(properties.length > 0 ? keywordTypeNodes.unknown : additionalPropertiesType);
       }
       let patternProperties;
       if ((_e = current.args) == null ? void 0 : _e.patternProperties) {
@@ -212777,8 +212727,7 @@ function Type({ name, typedName, tree, keysToOmit, schema, optionalType, arrayTy
     const isDirectEnum = schema.type === "array" && schema.items !== void 0;
     const isEnumOnly = "enum" in schema && schema.enum;
     if (isDirectEnum || isEnumOnly) {
-      const typeNameWithKey = `${enumSchemas[0].args.typeName}Key`;
-      type = createTypeReferenceNode(typeNameWithKey);
+      type = createTypeReferenceNode(`${enumSchemas[0].args.typeName}Key`);
       if (schema.type === "array") if (arrayType === "generic") type = createTypeReferenceNode(createIdentifier("Array"), [type]);
       else type = createArrayTypeNode(type);
     }
@@ -213045,52 +212994,38 @@ function useSchemaManager() {
 function printCombinedSchema({ name, schemas, pluginManager }) {
   const properties = {};
   if (schemas.response) properties["response"] = createUnionDeclaration({ nodes: schemas.responses.map((res) => {
-    const identifier = pluginManager.resolveName({
+    return createTypeReferenceNode(createIdentifier(pluginManager.resolveName({
       name: res.name,
       pluginKey: [pluginTsName],
       type: "function"
-    });
-    return createTypeReferenceNode(createIdentifier(identifier), void 0);
+    })), void 0);
   }) });
-  if (schemas.request) {
-    const identifier = pluginManager.resolveName({
-      name: schemas.request.name,
-      pluginKey: [pluginTsName],
-      type: "function"
-    });
-    properties["request"] = createTypeReferenceNode(createIdentifier(identifier), void 0);
-  }
-  if (schemas.pathParams) {
-    const identifier = pluginManager.resolveName({
-      name: schemas.pathParams.name,
-      pluginKey: [pluginTsName],
-      type: "function"
-    });
-    properties["pathParams"] = createTypeReferenceNode(createIdentifier(identifier), void 0);
-  }
-  if (schemas.queryParams) {
-    const identifier = pluginManager.resolveName({
-      name: schemas.queryParams.name,
-      pluginKey: [pluginTsName],
-      type: "function"
-    });
-    properties["queryParams"] = createTypeReferenceNode(createIdentifier(identifier), void 0);
-  }
-  if (schemas.headerParams) {
-    const identifier = pluginManager.resolveName({
-      name: schemas.headerParams.name,
-      pluginKey: [pluginTsName],
-      type: "function"
-    });
-    properties["headerParams"] = createTypeReferenceNode(createIdentifier(identifier), void 0);
-  }
+  if (schemas.request) properties["request"] = createTypeReferenceNode(createIdentifier(pluginManager.resolveName({
+    name: schemas.request.name,
+    pluginKey: [pluginTsName],
+    type: "function"
+  })), void 0);
+  if (schemas.pathParams) properties["pathParams"] = createTypeReferenceNode(createIdentifier(pluginManager.resolveName({
+    name: schemas.pathParams.name,
+    pluginKey: [pluginTsName],
+    type: "function"
+  })), void 0);
+  if (schemas.queryParams) properties["queryParams"] = createTypeReferenceNode(createIdentifier(pluginManager.resolveName({
+    name: schemas.queryParams.name,
+    pluginKey: [pluginTsName],
+    type: "function"
+  })), void 0);
+  if (schemas.headerParams) properties["headerParams"] = createTypeReferenceNode(createIdentifier(pluginManager.resolveName({
+    name: schemas.headerParams.name,
+    pluginKey: [pluginTsName],
+    type: "function"
+  })), void 0);
   if (schemas.errors) properties["errors"] = createUnionDeclaration({ nodes: schemas.errors.map((error) => {
-    const identifier = pluginManager.resolveName({
+    return createTypeReferenceNode(createIdentifier(pluginManager.resolveName({
       name: error.name,
       pluginKey: [pluginTsName],
       type: "function"
-    });
-    return createTypeReferenceNode(createIdentifier(identifier), void 0);
+    })), void 0);
   }) });
   return safePrint(createTypeAliasDeclaration({
     name,
@@ -223928,12 +223863,20 @@ function mergePlugins(diskPlugins, studioPlugins) {
   if (!studioPlugins) return diskPlugins;
   const resolvedStudio = resolvePlugins(studioPlugins);
   if (!diskPlugins) return resolvedStudio;
-  const studioByName = new Map(resolvedStudio.map((p) => [p.name, p]));
+  const studioEntryByResolvedName = /* @__PURE__ */ new Map();
+  resolvedStudio.forEach((resolved, i) => {
+    const entry = studioPlugins[i];
+    if (entry) {
+      studioEntryByResolvedName.set(resolved.name, entry);
+    }
+  });
   const diskNames = new Set(diskPlugins.map((p) => p.name));
   const mergedDisk = diskPlugins.map((diskPlugin) => {
-    const studioPlugin = studioByName.get(diskPlugin.name);
-    if (!studioPlugin) return diskPlugin;
-    return { ...diskPlugin, options: mergeDeep(diskPlugin.options, studioPlugin.options) };
+    var _a;
+    const studioEntry = studioEntryByResolvedName.get(diskPlugin.name);
+    if (!studioEntry) return diskPlugin;
+    const mergedOptions = mergeDeep(diskPlugin.options, studioEntry.options);
+    return (_a = resolvePlugins([{ name: studioEntry.name, options: mergedOptions }])[0]) != null ? _a : diskPlugin;
   });
   const studioOnly = resolvedStudio.filter((p) => !diskNames.has(p.name));
   return [...mergedDisk, ...studioOnly];
@@ -224134,7 +224077,6 @@ async function connectToStudio(options) {
     studioUrl,
     configPath,
     resolvedConfigPath,
-    noCache,
     allowAll,
     allowWrite,
     allowPublish,
@@ -224142,27 +224084,20 @@ async function connectToStudio(options) {
     retryInterval,
     heartbeatInterval = 3e4,
     initialSession,
-    sessionKey,
     nitro
   } = options;
   const events = new AsyncEventEmitter();
   let currentSource;
-  const maskedSessionKey = maskedString(sessionKey.replace("sessions:", ""));
-  async function removeSession() {
-    if (!noCache) {
-      await removeCachedSession(sessionKey);
-    }
-  }
   async function reconnect() {
-    logger.info(`[${maskedSessionKey}] Retrying connection in ${formatMs(retryInterval)} to Kubb Studio ...`);
-    await removeSession();
+    logger.info(`Retrying connection in ${formatMs(retryInterval)} to Kubb Studio ...`);
     setTimeout(() => connectToStudio({ ...options, initialSession: void 0 }), retryInterval);
   }
   try {
     setupHookListener(events, root);
-    const { sessionId, wsUrl, isSandbox } = initialSession != null ? initialSession : await createAgentSession({ noCache, token, studioUrl, cacheKey: sessionKey });
+    const { sessionId, wsUrl, isSandbox } = initialSession != null ? initialSession : await createAgentSession({ token, studioUrl });
     const ws = createWebsocket(wsUrl, { headers: { Authorization: `Bearer ${token}` } });
     const maskedWsUrl = maskedString(wsUrl);
+    const maskedSessionId = maskedString(sessionId);
     const effectiveAllowAll = isSandbox ? false : allowAll;
     const effectiveWrite = isSandbox ? false : allowWrite;
     const effectivePublish = isSandbox ? false : allowPublish;
@@ -224181,7 +224116,7 @@ async function connectToStudio(options) {
       }
     }
     const onOpen = () => {
-      logger.success(`[${maskedSessionKey}] Connected to Kubb Studio on "${maskedWsUrl}"`);
+      logger.success(`[${maskedSessionId}] Connected to Kubb Studio on "${maskedWsUrl}"`);
     };
     const onClose = async () => {
       if (serverDisconnected) {
@@ -224194,8 +224129,10 @@ async function connectToStudio(options) {
       await reconnect();
     };
     const onError = async () => {
-      logger.error(`[${maskedSessionKey}] Failed to connect to Kubb Studio on "${maskedWsUrl}"`);
+      logger.error(`[${maskedSessionId}] Failed to connect to Kubb Studio on "${maskedWsUrl}"`);
       await cleanup();
+      await disconnect({ sessionId, studioUrl, token }).catch(() => {
+      });
       await reconnect();
     };
     ws.addEventListener("open", onOpen);
@@ -224209,18 +224146,17 @@ async function connectToStudio(options) {
     heartbeatTimer = setInterval(() => sendAgentMessage(ws, { type: "ping" }), heartbeatInterval);
     setupEventsStream(ws, events, () => currentSource);
     ws.addEventListener("message", async (message) => {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b, _c, _d, _e, _f, _g;
       try {
         const data = JSON.parse(message.data);
-        logger.info(`[${maskedSessionKey}] Received "${data.type}" from Studio`);
+        logger.info(`[${maskedSessionId}] Received "${data.type}" from Studio`);
         if (isPongMessage(data)) {
           return;
         }
         if (isDisconnectMessage(data)) {
-          logger.warn(`[${maskedSessionKey}] Agent session disconnected by Studio with reason: ${data.reason}`);
+          logger.warn(`[${maskedSessionId}] Agent session disconnected by Studio with reason: ${data.reason}`);
           if (data.reason === "revoked") {
             await cleanup(`session_${data.reason}`);
-            await removeSession();
             return;
           }
           if (data.reason === "expired") {
@@ -224234,18 +224170,19 @@ async function connectToStudio(options) {
           if (data.command === "generate") {
             currentSource = "generate";
             const config = await loadConfig(resolvedConfigPath);
-            const patch = data.payload;
+            const storedConfig = data.payload ? null : await getLatestStudioConfigFromStorage({ sessionId }).catch(() => null);
+            const patch = (_b = (_a2 = data.payload) != null ? _a2 : storedConfig) != null ? _b : void 0;
             const plugins = mergePlugins(config.plugins, patch == null ? void 0 : patch.plugins);
-            const inputOverride = isSandbox ? { data: (_a2 = patch == null ? void 0 : patch.input) != null ? _a2 : "" } : void 0;
+            const inputOverride = isSandbox ? { data: (_c = patch == null ? void 0 : patch.input) != null ? _c : "" } : void 0;
             if (allowWrite && isSandbox) {
-              logger.warn(`[${maskedSessionKey}] Agent is running in a sandbox environment, write will be disabled`);
+              logger.warn(`[${maskedSessionId}] Agent is running in a sandbox environment, write will be disabled`);
             }
             if ((patch == null ? void 0 : patch.input) && !isSandbox) {
-              logger.warn(`[${maskedSessionKey}] Input override via payload is only supported in sandbox mode and will be ignored`);
+              logger.warn(`[${maskedSessionId}] Input override via payload is only supported in sandbox mode and will be ignored`);
             }
             if (data.payload && effectiveWrite) {
-              await saveStudioConfigToStorage({ sessionKey, config: data.payload }).catch((err) => {
-                logger.warn(`[${maskedSessionKey}] Failed to save studio config: ${err == null ? void 0 : err.message}`);
+              await saveStudioConfigToStorage({ sessionId, config: data.payload }).catch((err) => {
+                logger.warn(`[${maskedSessionId}] Failed to save studio config: ${err == null ? void 0 : err.message}`);
               });
             }
             await generate({
@@ -224258,7 +224195,7 @@ async function connectToStudio(options) {
               },
               events
             });
-            logger.success(`[${maskedSessionKey}] Completed "${data.type}" from Studio`);
+            logger.success(`[${maskedSessionId}] Completed "${data.type}" from Studio`);
             currentSource = void 0;
             return;
           }
@@ -224271,38 +224208,38 @@ async function connectToStudio(options) {
                 configPath,
                 permissions: { allowAll: effectiveAllowAll, allowWrite: effectiveWrite, allowPublish: effectivePublish },
                 config: {
-                  plugins: (_b = config.plugins) == null ? void 0 : _b.map((plugin) => ({
+                  plugins: (_d = config.plugins) == null ? void 0 : _d.map((plugin) => ({
                     name: `@kubb/${plugin.name}`,
                     options: serializePluginOptions(plugin.options)
                   }))
                 }
               }
             });
-            logger.success(`[${maskedSessionKey}] Completed "${data.type}" from Studio`);
+            logger.success(`[${maskedSessionId}] Completed "${data.type}" from Studio`);
             return;
           }
           if (isPublishCommandMessage(data)) {
             if (!effectivePublish) {
-              logger.warn(`[${maskedSessionKey}] Publish command rejected \u2014 KUBB_AGENT_ALLOW_PUBLISH is not enabled`);
+              logger.warn(`[${maskedSessionId}] Publish command rejected \u2014 KUBB_AGENT_ALLOW_PUBLISH is not enabled`);
               return;
             }
             currentSource = "publish";
             const config = await loadConfig(resolvedConfigPath);
-            const resolvedCommand = (_d = (_c = data.payload.command) != null ? _c : process.env.KUBB_AGENT_PUBLISH_COMMAND) != null ? _d : "npm publish";
+            const resolvedCommand = (_f = (_e = data.payload.command) != null ? _e : process.env.KUBB_AGENT_PUBLISH_COMMAND) != null ? _f : "npm publish";
             await publish({
               command: resolvedCommand,
               outputPath: config.output.path,
               root,
               events
             });
-            logger.success(`[${maskedSessionKey}] Completed "${data.command}" from Studio`);
+            logger.success(`[${maskedSessionId}] Completed "${data.command}" from Studio`);
             currentSource = void 0;
             return;
           }
         }
-        logger.warn(`[${maskedSessionKey}] Unknown message type from Kubb Studio: ${message.data}`);
+        logger.warn(`[${maskedSessionId}] Unknown message type from Kubb Studio: ${message.data}`);
       } catch (error) {
-        logger.error(`[${maskedSessionKey}] [unhandledRejection] ${(_e = error == null ? void 0 : error.message) != null ? _e : error}`);
+        logger.error(`[${maskedSessionId}] [unhandledRejection] ${(_g = error == null ? void 0 : error.message) != null ? _g : error}`);
       }
     });
   } catch (error) {
@@ -224314,7 +224251,6 @@ const _zcw7I4pYH8OiCfaDcjy_x7I6IH1tLDQR3W_yRZgP6E = defineNitroPlugin(async (nit
   const studioUrl = process$1.env.KUBB_STUDIO_URL || "https://studio.kubb.dev";
   const token = process$1.env.KUBB_AGENT_TOKEN;
   const configPath = process$1.env.KUBB_AGENT_CONFIG || "kubb.config.ts";
-  const noCache = process$1.env.KUBB_AGENT_NO_CACHE === "true";
   const retryInterval = process$1.env.KUBB_AGENT_RETRY_TIMEOUT ? Number.parseInt(process$1.env.KUBB_AGENT_RETRY_TIMEOUT, 10) : 3e4;
   const heartbeatInterval = process$1.env.KUBB_AGENT_HEARTBEAT_INTERVAL ? Number.parseInt(process$1.env.KUBB_AGENT_HEARTBEAT_INTERVAL, 10) : 3e4;
   const root = process$1.env.KUBB_AGENT_ROOT || process$1.cwd();
@@ -224330,9 +224266,7 @@ const _zcw7I4pYH8OiCfaDcjy_x7I6IH1tLDQR3W_yRZgP6E = defineNitroPlugin(async (nit
     logger.warn("KUBB_AGENT_SECRET not set", "secret should be set");
   }
   const resolvedConfigPath = path$2.isAbsolute(configPath) ? configPath : path$2.resolve(root, configPath);
-  const storage = useStorage("kubb");
-  const sessionKey = getSessionKey(token);
-  const maskedSessionKey = maskedString(sessionKey.replace("sessions:", ""));
+  const maskedToken = maskedString(token);
   try {
     await registerAgent({ token, studioUrl, poolSize });
     const baseOptions = {
@@ -224340,38 +224274,31 @@ const _zcw7I4pYH8OiCfaDcjy_x7I6IH1tLDQR3W_yRZgP6E = defineNitroPlugin(async (nit
       studioUrl,
       configPath,
       resolvedConfigPath,
-      noCache,
       allowAll,
       allowWrite,
       allowPublish,
       root,
       retryInterval,
       heartbeatInterval,
-      storage,
-      sessionKey,
       nitro
     };
-    logger.info(`[${maskedSessionKey}] Starting session pool of ${poolSize} connection(s)`);
+    logger.info(`[${maskedToken}] Starting session pool of ${poolSize} connection(s)`);
     const sessions = /* @__PURE__ */ new Map();
-    for (const index2 of Array.from({ length: poolSize }, (_, i) => i)) {
-      const cacheKey = `${sessionKey}-${index2}`;
-      const maskedSessionKey2 = maskedString(cacheKey);
-      const session = await createAgentSession({ noCache, token, studioUrl, cacheKey }).catch((err) => {
-        logger.warn(`[${maskedSessionKey2}] Failed to pre-create pool session:`, err == null ? void 0 : err.message);
+    for (const index of Array.from({ length: poolSize }, (_, i) => i)) {
+      const session = await createAgentSession({ token, studioUrl }).catch((err) => {
+        logger.warn(`[${maskedToken}] Failed to pre-create pool session ${index}:`, err == null ? void 0 : err.message);
         return null;
       });
-      sessions.set(cacheKey, session);
+      sessions.set(index, session);
     }
-    let index = 0;
-    for (const [cacheKey, session] of sessions) {
-      index++;
+    for (const [index, session] of sessions.entries()) {
       if (!session) {
         continue;
       }
-      const maskedSessionKey2 = maskedString(session.sessionId);
-      logger.info(`[${maskedSessionKey2}] Connecting session ${index}/${sessions.size}`);
-      await connectToStudio({ ...baseOptions, initialSession: session, sessionKey: cacheKey }).catch((err) => {
-        logger.warn(`[${maskedSessionKey2}] Session ${index} failed to connect:`, err == null ? void 0 : err.message);
+      const maskedSessionId = maskedString(session.sessionId);
+      logger.info(`[${maskedSessionId}] Connecting session ${index + 1}/${sessions.size}`);
+      await connectToStudio({ ...baseOptions, initialSession: session }).catch((err) => {
+        logger.warn(`[${maskedSessionId}] Session ${index + 1} failed to connect:`, err == null ? void 0 : err.message);
       });
     }
   } catch (error) {