@uipath/solution-tool 1.203.0-preview.203 → 1.204.0-preview.206

package/dist/{packager-tool-bkwnetqn.js → packager-tool-83rzavkx.js}

@@ -8,23 +8,29 @@ import {
   FirstPartyServiceApi
 } from "./packager-tool-53w8skv5.js";
 import {
-  UsersApi,
-  createApiClient,
   getSolutionAuthContext
-} from "./packager-tool-2syrt51a.js";
+} from "./packager-tool-f5gq77m5.js";
+import {
+  UsersApi,
+  createApiClient
+} from "./packager-tool-3fv6zc86.js";
 import {
   findSolutionFileUpward,
-  getLoginStatusAsync,
   normalizeProjectType,
   toPortableRelativePath
-} from "./packager-tool-3jrq7smt.js";
+} from "./packager-tool-vmsxq1pc.js";
 import {
   catchError,
   extractErrorMessage,
-  getFileSystem,
   isGuid,
   logger
-} from "./packager-tool-0f0wt9vh.js";
+} from "./packager-tool-5fjp60dk.js";
+import {
+  getLoginStatusAsync
+} from "./packager-tool-gb35b4qs.js";
+import {
+  getFileSystem
+} from "./packager-tool-zf3929se.js";
 import {
   __commonJS,
   __require,
@@ -2489,7 +2495,6 @@ async function applyEntryPointEnhancementAsync(context, resource, spec) {
   await enhancer.enhanceSpecAsync(context, resource, new Map, specMap);
   return Object.fromEntries(specMap.entries());
 }
-
 // ../../node_modules/@uipath/resource-builder-sdk/dist/providers/file-storage-provider.js
 function isFileNotFoundError(error) {
   if (!error || typeof error != "object")
@@ -2541,7 +2546,6 @@ class InMemoryCacheProvider {
     this._defaultTtlMs = defaultTtlMs;
   }
 }
-
 // ../../node_modules/@uipath/resource-builder-sdk/dist/providers/ip-range-bypass-secret-provider.js
 class NullIpRangeBypassSecretProvider {
   async getIpRangeBypassSecretAsync(_cancellationToken) {
@@ -2562,6 +2566,183 @@ class NullSecretsProvider {
   }
 }
 
+// ../../node_modules/@uipath/resource-builder-sdk/dist/exceptions/timeout-exception.js
+class TimeoutException extends Error {
+  constructor(message, timeoutMs) {
+    super(message);
+    this.name = "TimeoutException";
+    this.timeoutMs = timeoutMs;
+    if (Error.captureStackTrace)
+      Error.captureStackTrace(this, TimeoutException);
+  }
+}
+
+// ../../node_modules/@uipath/resource-builder-sdk/dist/helpers/timeout.js
+function createTimeoutSignal(timeoutMs, description, linkedSignal) {
+  const controller = new AbortController;
+  let timeoutId;
+  const dispose = () => {
+    if (timeoutId !== undefined) {
+      clearTimeout(timeoutId);
+      timeoutId = undefined;
+    }
+    linkedSignal?.removeEventListener("abort", onLinkedAbort);
+  };
+  const onLinkedAbort = () => {
+    dispose();
+    controller.abort(linkedSignal?.reason);
+  };
+  if (linkedSignal?.aborted) {
+    controller.abort(linkedSignal.reason);
+    return {
+      signal: controller.signal,
+      dispose
+    };
+  }
+  timeoutId = setTimeout(() => {
+    dispose();
+    controller.abort(new TimeoutException(`${description} timed out after ${timeoutMs}ms`, timeoutMs));
+  }, timeoutMs);
+  linkedSignal?.addEventListener("abort", onLinkedAbort, {
+    once: true
+  });
+  return {
+    signal: controller.signal,
+    dispose
+  };
+}
+var MAX_TIMEOUT_MS = 2147483647;
+function isValidTimeoutMs(value) {
+  return typeof value == "number" && Number.isFinite(value) && value > 0 && value <= MAX_TIMEOUT_MS;
+}
+function readTimeoutOverrideMs(storageKey) {
+  try {
+    if ("u" < typeof localStorage)
+      return;
+    const raw = localStorage.getItem(storageKey);
+    if (raw === null || raw.trim() === "")
+      return;
+    const parsed = Number(raw);
+    return isValidTimeoutMs(parsed) ? parsed : undefined;
+  } catch {
+    return;
+  }
+}
+
+// ../../node_modules/@uipath/resource-builder-sdk/dist/exceptions/operation-cancelled-exception.js
+class OperationCancelledException extends Error {
+  constructor(message, operationName) {
+    super(message ?? "The operation was cancelled");
+    this.name = "OperationCancelledException";
+    this.operationName = operationName;
+    if (Error.captureStackTrace)
+      Error.captureStackTrace(this, OperationCancelledException);
+  }
+}
+
+// ../../node_modules/@uipath/resource-builder-sdk/dist/providers/timeout-file-storage-provider.js
+class TimeoutFileStorageProvider2 {
+  fileExistsAsync(path, cancellationToken) {
+    return this.guard(`fileExists(${path})`, cancellationToken, (signal) => this.inner.fileExistsAsync(path, signal));
+  }
+  async openFileAsync(path, cancellationToken) {
+    const stream = await this.guard(`openFile(${path})`, cancellationToken, (signal) => this.inner.openFileAsync(path, signal));
+    return this.bindReadsToTimeout(stream, `read(${path})`, cancellationToken);
+  }
+  bindReadsToTimeout(stream, description, cancellationToken) {
+    const reader = stream.getReader();
+    return new ReadableStream({
+      pull: async (controller) => {
+        let result;
+        try {
+          result = await this.guard(description, cancellationToken, () => reader.read());
+        } catch (error) {
+          reader.cancel(error).catch(() => {});
+          throw error;
+        }
+        if (result.done)
+          controller.close();
+        else
+          controller.enqueue(result.value);
+      },
+      cancel: (reason) => reader.cancel(reason)
+    });
+  }
+  readFileToEndAsync(path, cancellationToken) {
+    return this.guard(`readFileToEnd(${path})`, cancellationToken, (signal) => this.inner.readFileToEndAsync(path, signal));
+  }
+  writeFileAsync(path, content, cancellationToken) {
+    return this.guard(`writeFile(${path})`, cancellationToken, (signal) => this.inner.writeFileAsync(path, content, signal));
+  }
+  deleteFileAsync(path, cancellationToken) {
+    return this.guard(`deleteFile(${path})`, cancellationToken, (signal) => this.inner.deleteFileAsync(path, signal));
+  }
+  getFilesAsync(path, searchPattern, cancellationToken) {
+    return this.guard(`getFiles(${path ?? ""}, ${searchPattern ?? ""})`, cancellationToken, (signal) => this.inner.getFilesAsync(path, searchPattern, signal));
+  }
+  async guard(description, cancellationToken, operation) {
+    const timeout = createTimeoutSignal(this.timeoutMs, `File storage operation ${description}`, cancellationToken);
+    try {
+      return await Promise.race([
+        operation(timeout.signal),
+        rejectOnAbort(timeout.signal)
+      ]);
+    } catch (error) {
+      if (cancellationToken?.aborted)
+        throw cancellationToken.reason instanceof OperationCancelledException ? cancellationToken.reason : new OperationCancelledException(undefined, description);
+      if (timeout.signal.aborted && timeout.signal.reason instanceof TimeoutException)
+        throw timeout.signal.reason;
+      throw error;
+    } finally {
+      timeout.dispose();
+    }
+  }
+  constructor(inner, timeoutMs) {
+    this.inner = inner;
+    this.timeoutMs = timeoutMs;
+  }
+}
+function rejectOnAbort(signal) {
+  return new Promise((_, reject) => {
+    if (signal.aborted)
+      return void reject(signal.reason);
+    signal.addEventListener("abort", () => reject(signal.reason), {
+      once: true
+    });
+  });
+}
+function withFileOperationTimeout2(provider, timeoutMs) {
+  if (!isValidTimeoutMs(timeoutMs) || provider instanceof TimeoutFileStorageProvider2)
+    return provider;
+  return new TimeoutFileStorageProvider2(provider, timeoutMs);
+}
+
+// ../../node_modules/@uipath/resource-builder-sdk/dist/solution/solution-context-options.js
+var DEFAULT_SOLUTION_CONTEXT_OPTIONS = {
+  lockTimeoutMs: 30000,
+  fileOperationTimeoutMs: 30000
+};
+var SOLUTION_CONTEXT_TIMEOUT_STORAGE_KEY = "SOL_RB_SOLUTION_CONTEXT_TIMEOUT_MS";
+var FILE_OPERATION_TIMEOUT_STORAGE_KEY = "SOL_RB_FILE_OPERATION_TIMEOUT_MS";
+function resolveTimeoutMs(storageKey, configured, fallback) {
+  const override = readTimeoutOverrideMs(storageKey);
+  if (override !== undefined)
+    return override;
+  return isValidTimeoutMs(configured) ? configured : fallback;
+}
+function resolveLockTimeoutMs(options) {
+  return resolveTimeoutMs(SOLUTION_CONTEXT_TIMEOUT_STORAGE_KEY, options?.lockTimeoutMs, DEFAULT_SOLUTION_CONTEXT_OPTIONS.lockTimeoutMs);
+}
+function resolveFileOperationTimeoutMs(options) {
+  return resolveTimeoutMs(FILE_OPERATION_TIMEOUT_STORAGE_KEY, options?.fileOperationTimeoutMs, DEFAULT_SOLUTION_CONTEXT_OPTIONS.fileOperationTimeoutMs);
+}
+function mergeSolutionContextOptions(options) {
+  return {
+    lockTimeoutMs: isValidTimeoutMs(options?.lockTimeoutMs) ? options.lockTimeoutMs : DEFAULT_SOLUTION_CONTEXT_OPTIONS.lockTimeoutMs,
+    fileOperationTimeoutMs: isValidTimeoutMs(options?.fileOperationTimeoutMs) ? options.fileOperationTimeoutMs : DEFAULT_SOLUTION_CONTEXT_OPTIONS.fileOperationTimeoutMs
+  };
+}
+
 // ../../node_modules/@uipath/resource-builder-sdk/dist/solution/models.js
 var SolutionConstants = {
   RESOURCE_FILES_FOLDER_NAME: "resources",
@@ -2696,17 +2877,6 @@ class DisconnectedException extends Error {
   }
 }
 
-// ../../node_modules/@uipath/resource-builder-sdk/dist/exceptions/operation-cancelled-exception.js
-class OperationCancelledException extends Error {
-  constructor(message, operationName) {
-    super(message ?? "The operation was cancelled");
-    this.name = "OperationCancelledException";
-    this.operationName = operationName;
-    if (Error.captureStackTrace)
-      Error.captureStackTrace(this, OperationCancelledException);
-  }
-}
-
 // ../../node_modules/@uipath/resource-builder-sdk/dist/exceptions/invalid-operation-exception.js
 class InvalidOperationException extends Error {
   constructor(message) {
@@ -3371,10 +3541,14 @@ class MultiFileSolutionDefinitionProvider {
       this._jsonSerializer = this.jsonSerializerFactory.getByName(JsonSerializerNames.CamelCaseIndented);
     return this._jsonSerializer;
   }
+  async getFileStorageProviderAsync(context, cancellationToken) {
+    const provider = await this.fileStorageProviderFactory.getProviderAsync(context, cancellationToken);
+    return withFileOperationTimeout2(provider, resolveFileOperationTimeoutMs(this.options));
+  }
   async readAsync(context, cancellationToken) {
     this.logger.info("Reading multi-file solution definition for solution %s", context.path);
     const solutionKey = this.getSolutionKey(context);
-    const fileStorageProvider = await this.fileStorageProviderFactory.getProviderAsync(context, cancellationToken);
+    const fileStorageProvider = await this.getFileStorageProviderAsync(context, cancellationToken);
     const resources = [];
     const solutionFiles = [];
     let hashes;
@@ -3450,6 +3624,12 @@ class MultiFileSolutionDefinitionProvider {
           invalidFiles.push(resourceFile);
         }
       } catch (ex) {
+        if (ex instanceof OperationCancelledException || cancellationToken?.aborted) {
+          this.logger.warn("Operation cancelled while reading file %s for solution %s", resourceFile, context.path);
+          throw ex instanceof OperationCancelledException ? ex : new OperationCancelledException;
+        }
+        if (ex instanceof TimeoutException)
+          throw new TimeoutException(`Reading resource file ${resourceFile} for solution ${context.path} timed out: ${ex.message}`, ex.timeoutMs);
         if (isFileNotFoundError(ex)) {
           this.logger.warn("Resource file listed but missing in storage for solution %s: %s", resourceFile, context.path);
           missingFiles.push(resourceFile);
@@ -3502,7 +3682,7 @@ class MultiFileSolutionDefinitionProvider {
   async writeAsync(context, solution, cancellationToken) {
     if (context.isReadOnly)
       return;
-    const fileStorageProvider = await this.fileStorageProviderFactory.getProviderAsync(context, cancellationToken);
+    const fileStorageProvider = await this.getFileStorageProviderAsync(context, cancellationToken);
     const existingHashes = this.getHashes(context);
     const existingPaths = this.getPaths(context);
     const existingTree = this.getTree(context);
@@ -3577,7 +3757,7 @@ class MultiFileSolutionDefinitionProvider {
   async deleteFilesAsync(context, filesToDelete, cancellationToken) {
     if (!filesToDelete || filesToDelete.length === 0 || context.isReadOnly)
       return;
-    const fileStorageProvider = await this.fileStorageProviderFactory.getProviderAsync(context, cancellationToken);
+    const fileStorageProvider = await this.getFileStorageProviderAsync(context, cancellationToken);
     for (const file of filesToDelete)
       try {
         const outputPath = this.joinPath("resourceFiles", file.name);
@@ -3774,7 +3954,8 @@ class MultiFileSolutionDefinitionProvider {
     const hex = Math.abs(hash).toString(16).padStart(8, "0");
     return `${hex.slice(0, 8)}-${hex.slice(0, 4)}-4${hex.slice(1, 4)}-8${hex.slice(1, 4)}-${hex.slice(0, 12).padEnd(12, "0")}`;
   }
-  constructor(fileStorageProviderFactory, jsonSerializerFactory, loggerFactory) {
+  constructor(fileStorageProviderFactory, jsonSerializerFactory, loggerFactory, options) {
+    this.options = options;
     this._caseInsensitiveSerializer = null;
     this._jsonSerializer = null;
     this.fileStorageProviderFactory = fileStorageProviderFactory;
@@ -3787,12 +3968,13 @@ MultiFileSolutionDefinitionProvider.INVALID_FILE_NAME_CHARS = /[<>:"/\\|?*\x00-\
 // ../../node_modules/@uipath/resource-builder-sdk/dist/solution/multi-file-solution-definition-factory.js
 class MultiFileSolutionDefinitionFactory {
   async getProviderAsync(cancellationToken) {
-    return new MultiFileSolutionDefinitionProvider(this.fileStorageProviderFactory, this.jsonSerializerFactory, this.loggerFactory);
+    return new MultiFileSolutionDefinitionProvider(this.fileStorageProviderFactory, this.jsonSerializerFactory, this.loggerFactory, this.options);
   }
-  constructor(fileStorageProviderFactory, jsonSerializerFactory, loggerFactory) {
+  constructor(fileStorageProviderFactory, jsonSerializerFactory, loggerFactory, options) {
     this.fileStorageProviderFactory = fileStorageProviderFactory;
     this.jsonSerializerFactory = jsonSerializerFactory;
     this.loggerFactory = loggerFactory;
+    this.options = options;
     this.logger = loggerFactory.create("MultiFileSolutionDefinitionFactory");
   }
 }
@@ -3800,7 +3982,7 @@ class MultiFileSolutionDefinitionFactory {
 // ../../node_modules/@uipath/resource-builder-sdk/dist/embedded-files-default.js
 async function createDefaultEmbeddedFileReaderAsync() {
   const [{ EmbeddedFileReader }, { JsonSerializerFactory: JsonSerializerFactory2 }] = await Promise.all([
-    import("./embedded-file-reader-xxqe8vs8.js"),
+    import("./embedded-file-reader-rf2g1kfj.js"),
     import("./index-dqa169gp.js")
   ]);
   return new EmbeddedFileReader(new JsonSerializerFactory2);
@@ -3833,7 +4015,8 @@ var ServiceTokens = {
   JsonSerializerFactory: "IJsonSerializerFactory",
   SerializerProxy: "ISerializerProxy",
   StreamSerializer: "IStreamSerializer",
-  HttpReaderOptions: "HttpReaderOptions"
+  HttpReaderOptions: "HttpReaderOptions",
+  SolutionContextOptions: "SolutionContextOptions"
 };
 var Tokens = {
   IMediator: "IMediator",
@@ -4399,7 +4582,8 @@ class BindingOverwritesHandler {
           [BindingsKnownKeys.FolderKeyPropertyName]: resourceOverwrite.folderKey ?? ""
         };
       else {
-        const folderPath = bindingResource.isArtefactResource ? "" : resourceOverwrite.folderFullyQualifiedName ?? "";
+        const isBusinessRule = bindingResource.binding.resourceType === models_BindingsResourceType.BusinessRule;
+        const folderPath = bindingResource.isArtefactResource && !isBusinessRule ? "" : resourceOverwrite.folderFullyQualifiedName ?? "";
         overwrite = {
           [BindingsKnownKeys.FolderPathPropertyName]: folderPath,
           [BindingsKnownKeys.NamePropertyName]: resourceOverwrite.resourceName
@@ -4557,42 +4741,6 @@ class AsyncSemaphore {
     this._permits = permits;
   }
 }
-function createTimeoutSignal(timeoutMs, linkedSignal) {
-  const controller = new AbortController;
-  const timeoutId = setTimeout(() => {
-    controller.abort(new Error(`Operation timed out after ${timeoutMs}ms`));
-  }, timeoutMs);
-  if (linkedSignal)
-    if (linkedSignal.aborted) {
-      clearTimeout(timeoutId);
-      controller.abort(linkedSignal.reason);
-    } else
-      linkedSignal.addEventListener("abort", () => {
-        clearTimeout(timeoutId);
-        controller.abort(linkedSignal.reason);
-      }, {
-        signal: controller.signal
-      });
-  controller.signal.addEventListener("abort", () => {
-    clearTimeout(timeoutId);
-  });
-  return controller.signal;
-}
-var DEFAULT_TIMEOUT_MS = 5000;
-var SOLUTION_CONTEXT_TIMEOUT_STORAGE_KEY = "SOL_RB_SOLUTION_CONTEXT_TIMEOUT_MS";
-function getLockTimeoutMs() {
-  try {
-    if ("u" < typeof localStorage)
-      return DEFAULT_TIMEOUT_MS;
-    const raw = localStorage.getItem(SOLUTION_CONTEXT_TIMEOUT_STORAGE_KEY);
-    if (raw === null || raw.trim() === "")
-      return DEFAULT_TIMEOUT_MS;
-    const parsed = Number(raw);
-    return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_TIMEOUT_MS;
-  } catch {
-    return DEFAULT_TIMEOUT_MS;
-  }
-}
 
 class SolutionContext {
   get isLoaded() {
@@ -4720,30 +4868,42 @@ class SolutionContext {
       throw new FileDependencyNotFoundException(missingFileDependencies);
   }
   async doWithLockAsync(doWork, cancellationToken) {
-    const timeoutSignal = createTimeoutSignal(getLockTimeoutMs(), cancellationToken);
-    await this._semaphore.acquire(timeoutSignal);
+    const lockTimeoutMs = resolveLockTimeoutMs(this._options);
+    const lockTimeout = createTimeoutSignal(lockTimeoutMs, `Waiting for the lock on solution ${this.path}`, cancellationToken);
     try {
-      return await doWork(timeoutSignal);
+      await this._semaphore.acquire(lockTimeout.signal);
+    } catch (error) {
+      if (!cancellationToken?.aborted && lockTimeout.signal.reason instanceof TimeoutException)
+        throw lockTimeout.signal.reason;
+      throw error;
+    } finally {
+      lockTimeout.dispose();
+    }
+    try {
+      return await doWork(cancellationToken);
     } finally {
       this._semaphore.release();
     }
   }
-  constructor(path, isReadOnlyOrProvider, definitionProvider) {
+  constructor(path, isReadOnlyOrProvider, definitionProviderOrOptions, options) {
     this._definition = null;
     this._semaphore = new AsyncSemaphore(1);
     this._items = {};
     this._persistChanges = true;
     ArgumentException.throwIfNullOrEmpty(path, "path");
     if (typeof isReadOnlyOrProvider == "boolean") {
+      const definitionProvider = definitionProviderOrOptions;
       ArgumentException.throwIfNull(definitionProvider, "definitionProvider");
       this.path = path;
       this.isReadOnly = isReadOnlyOrProvider;
       this._definitionProvider = definitionProvider;
+      this._options = options;
     } else {
       ArgumentException.throwIfNull(isReadOnlyOrProvider, "definitionProvider");
       this.path = path;
       this.isReadOnly = false;
       this._definitionProvider = isReadOnlyOrProvider;
+      this._options = definitionProviderOrOptions;
     }
   }
 }
@@ -4754,7 +4914,8 @@ class SolutionContextFactory {
     ArgumentException.throwIfNullOrEmpty(path, "path");
     const solutionDefinitionFactory = this._container.resolve(Tokens.ISolutionDefinitionFactory);
     const solutionDefinitionProvider = await solutionDefinitionFactory.getProviderAsync(cancellationToken);
-    return new SolutionContext(path, isReadOnly, solutionDefinitionProvider);
+    const options = this._container.isRegistered(ServiceTokens.SolutionContextOptions, true) ? this._container.resolve(ServiceTokens.SolutionContextOptions) : undefined;
+    return new SolutionContext(path, isReadOnly, solutionDefinitionProvider, options);
   }
   constructor(_container) {
     this._container = _container;
@@ -5776,7 +5937,13 @@ var solutionsSubtypesMap = {
   Api: "api",
   Function: "function",
   McpServer: "mcpserver",
-  BusinessRule: "businessRule"
+  BusinessRule: "businessRule",
+  Native: "native",
+  Federated: "federated",
+  Case: "case",
+  CaseMain: "caseMain",
+  CaseComment: "caseComment",
+  CaseDocument: "caseDocument"
 };
 function mapResourceToSolutionSubtype(entitySubtype) {
   if (!entitySubtype)
@@ -14207,9 +14374,9 @@ class UnconfiguredEmbeddedFileReader {
 }
 
 // ../../node_modules/@uipath/resource-builder-sdk/dist/container.js
-function createContainer(accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, embeddedFileReader) {
+function createContainer(accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, embeddedFileReader, solutionContextOptions) {
   const childContainer = import_tsyringe6.container.createChildContainer();
-  registerProviders(childContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory);
+  registerProviders(childContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, solutionContextOptions);
   registerServices(childContainer, embeddedFileReader);
   registerHandlers(childContainer);
   childContainer.register(ServiceTokens.Mediator, {
@@ -14233,7 +14400,7 @@ function registerProvider(diContainer, token, provider) {
       break;
   }
 }
-function registerProviders(diContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory) {
+function registerProviders(diContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, solutionContextOptions) {
   registerProvider(diContainer, ServiceTokens.AccessProvider, accessProvider);
   registerProvider(diContainer, ServiceTokens.CacheProvider, cacheProvider);
   registerProvider(diContainer, ServiceTokens.SecretsProvider, secretsProvider);
@@ -14248,6 +14415,7 @@ function registerProviders(diContainer, accessProvider, cacheProvider, secretsPr
     ...httpReaderOptions
   };
   diContainer.registerInstance(ServiceTokens.HttpReaderOptions, mergedOptions);
+  diContainer.registerInstance(ServiceTokens.SolutionContextOptions, mergeSolutionContextOptions(solutionContextOptions));
 }
 function registerServices(diContainer, embeddedFileReader) {
   diContainer.register(ServiceTokens.AutomationSolutionsClientProxy, {
@@ -14982,6 +15150,10 @@ class ResourceBuilderConfiguration {
     this._httpReaderOptions = options;
     return this;
   }
+  addSolutionContextOptions(options) {
+    this._solutionContextOptions = options;
+    return this;
+  }
   addLoggerFactory(factoryProvider, lifetime = service_tokens_ServiceLifetime.Singleton) {
     this._loggerFactoryProvider = factoryProvider;
     this._loggerFactoryLifetime = lifetime;
@@ -15046,7 +15218,7 @@ class ResourceBuilderConfiguration {
       };
     } else if (!solutionDefinitionProvider && fileStorageProviderFactory)
       solutionDefinitionFactory = {
-        instance: new MultiFileSolutionDefinitionFactory(fileStorageProviderFactory.instance, new JsonSerializerFactory, loggerFactoryInstance),
+        instance: new MultiFileSolutionDefinitionFactory(fileStorageProviderFactory.instance, new JsonSerializerFactory, loggerFactoryInstance, this._solutionContextOptions),
         lifetime: service_tokens_ServiceLifetime.Scoped
       };
     const artifactResourceSpecEnhancerInstance = this._artifactResourceSpecEnhancerProvider ? await this.resolveGenericProvider(this._artifactResourceSpecEnhancerProvider) : new DefaultArtifactResourceSpecEnhancer;
@@ -15055,7 +15227,7 @@ class ResourceBuilderConfiguration {
       lifetime: this._artifactResourceSpecEnhancerLifetime
     };
     const embeddedFileReader = await createDefaultEmbeddedFileReaderAsync();
-    const container3 = createContainer(accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, this._httpReaderOptions, loggerFactory, embeddedFileReader);
+    const container3 = createContainer(accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, this._httpReaderOptions, loggerFactory, embeddedFileReader, this._solutionContextOptions);
     return new ResourceBuilderServices(container3);
   }
   async buildServices() {
@@ -15076,7 +15248,6 @@ class ResourceBuilderConfiguration {
 function createResourceBuilderConfiguration() {
   return new ResourceBuilderConfiguration;
 }
-
 // ../solution-sdk/src/resources/providers/artefact-pair-binding-provider.ts
 var ARTEFACT_KIND_APP = "app";
 var ARTEFACT_KIND_APP_VERSION = "appversion";
@@ -15591,7 +15762,6 @@ function hasAnyTemplateRow(projectType) {
     return key === wanted || key.startsWith(`${wanted}_`);
   });
 }
-
 // ../solution-sdk/src/resources/services/local-resource-matcher.ts
 function normalizeFolderPath(path) {
   if (!path)
@@ -15811,6 +15981,10 @@ function parseResourceHeader(content) {
 }
 
 // ../solution-sdk/src/resources/services/sync-resources-from-bindings.ts
+var TYPE_IS_IDENTITY_REPLACE_OPTIONS = new Set([
+  "SameType",
+  "SameNameAndType"
+]);
 var BINDINGS_JSON_FALLBACK_TYPES = new Set(["agent", "function"]);
 function placeholderForType(type) {
   switch ((type ?? "string").toLowerCase()) {
@@ -15840,7 +16014,7 @@ async function buildKindResolver(metadataReader) {
     byKind.set(key, list);
   }
   return async (kind, type) => {
-    const cacheKey = `${kind}|${type ?? ""}`.toLowerCase();
+    const cacheKey = (type === undefined ? kind : `${kind}|${type}`).toLowerCase();
     if (cache.has(cacheKey))
       return cache.get(cacheKey);
     const list = byKind.get(kind.toLowerCase());
@@ -15848,7 +16022,9 @@ async function buildKindResolver(metadataReader) {
       cache.set(cacheKey, undefined);
       return;
     }
-    const entry = type ? list.find((r) => (r.type ?? "").toLowerCase() === type.toLowerCase()) ?? list[0] : list[0];
+    const subtypes = list.flatMap((r) => r.type ? [r.type] : []);
+    const matched = type === undefined ? undefined : findSubtypeEntry(list, type);
+    const entry = matched ?? list[0];
     const version = entry.versions?.[0];
     const requiredDefaults = [];
     for (const prop of version?.spec ?? []) {
@@ -15867,16 +16043,35 @@ async function buildKindResolver(metadataReader) {
         }
       }
     }
+    const takesFreeFormType = type !== undefined && type.trim() !== "" && subtypes.length === 0 && TYPE_IS_IDENTITY_REPLACE_OPTIONS.has(String(version?.replaceOption));
     const resolved = {
       type: entry.type,
       virtualizable: version?.supportsInLineCreation ?? false,
       requiredDefaults,
-      specProperties
+      specProperties,
+      subtypes,
+      typeMatched: type === undefined || matched !== undefined || takesFreeFormType
     };
     cache.set(cacheKey, resolved);
     return resolved;
   };
 }
+function formatResourceSubtypes(subtypes) {
+  return subtypes.map((subtype) => {
+    const alias = mapSolutionToResourceSubtype(subtype);
+    return alias && alias.toLowerCase() !== subtype.toLowerCase() ? `${subtype} (${alias})` : subtype;
+  }).join(", ");
+}
+function sameResourceSubtype(a, b) {
+  if (a === undefined || b === undefined)
+    return false;
+  if (a.toLowerCase() === b.toLowerCase())
+    return true;
+  return mapSolutionToResourceSubtype(a)?.toLowerCase() === mapSolutionToResourceSubtype(b)?.toLowerCase();
+}
+function findSubtypeEntry(list, type) {
+  return list.find((r) => !!r.type && sameResourceSubtype(r.type, type));
+}
 function resolveBindingResourceIdentity(binding) {
   switch (binding.resourceType) {
     case models_BindingsResourceType.TimeTrigger:
@@ -16189,14 +16384,18 @@ async function findResourceByKeyInRcs(builder, kind, expectedKey, folderPath, pr
   return;
 }
 async function searchRcsResources(builder, kind, name) {
+  const [searchError, matches] = await catchError(searchRcsResourcesStrict(builder, kind, name));
+  if (searchError) {
+    logger.warn(`Failed to search ${kind} resources in RCS: ${searchError.message}`);
+    return [];
+  }
+  return matches;
+}
+async function searchRcsResourcesStrict(builder, kind, name) {
   let pageCursor;
   const allMatches = [];
   do {
-    const [searchError, result] = await catchError(builder.searchResourcesAsync(kind, undefined, name, pageCursor, 50, undefined, false));
-    if (searchError) {
-      logger.warn(`Failed to search ${kind} resources in RCS: ${searchError.message}`);
-      return [];
-    }
+    const result = await builder.searchResourcesAsync(kind, undefined, name, pageCursor, 50, undefined, false);
     for (const folderResources of result.availableResources) {
       const matches = folderResources.resources.filter((r) => r.name.toLowerCase() === name.toLowerCase());
       for (const match of matches) {
@@ -16250,7 +16449,13 @@ async function resolveResourceKindMetadata(services, kind, type) {
 }
 async function createLocalResource(params) {
   const { builder, services, kind, type, name } = params;
+  if (type !== undefined && type.trim() === "") {
+    throw new Error(`Type for kind ${kind} is empty.`);
+  }
   const metadata = await resolveResourceKindMetadata(services, kind, type);
+  if (type !== undefined && metadata && !metadata.typeMatched) {
+    throw new Error(metadata.subtypes.length > 0 ? `Unknown type "${type}" for kind ${kind}. Use one of: ${formatResourceSubtypes(metadata.subtypes)}` : `Kind ${kind} has no subtypes, so type "${type}" does not apply.`);
+  }
   const minted = await mintVirtualResource(builder, kind, metadata?.type ?? type, name, metadata);
   if (!minted?.resource)
     return;
@@ -16496,6 +16701,96 @@ async function resourceRefreshAsync(solutionPath = ".", options = {}) {
     warnings: [...resolverWarnings, ...result.warnings]
   };
 }
+// ../solution-sdk/src/resources/services/remote-resources.ts
+function getRemoteResourceClients(services) {
+  return {
+    catalog: services.container.resolve(Tokens.IResourceCatalogClientProxy),
+    importer: services.container.resolve(Tokens.IImportResourceHelper)
+  };
+}
+async function findCatalogEntityAsync(catalog, query, match) {
+  let pageCursor;
+  do {
+    const page = await catalog.searchFolderEntities({
+      ...query,
+      pageSize: 100,
+      pageCursor
+    });
+    const found = (page.items ?? []).find(match);
+    if (found) {
+      return found;
+    }
+    pageCursor = page.nextPage ?? undefined;
+  } while (pageCursor);
+  return;
+}
+function toResourceReference(entity) {
+  return toCatalogReference({
+    kind: entity.entityType ?? "",
+    type: entity.entitySubType ?? undefined,
+    key: entity.entityKey ?? "",
+    name: entity.entityName ?? undefined,
+    folderPath: entity.fullyQualifiedName ?? undefined,
+    folderKey: entity.folderKey ?? undefined
+  });
+}
+function toCatalogReference(reference) {
+  const { folderPath, folderKey, ...rest } = reference;
+  return {
+    ...rest,
+    folder: folderPath ? { fullyQualifiedName: folderPath, folderKey } : undefined
+  };
+}
+async function exportResourceDefinitionAsync(importer, reference) {
+  const payload = await importer.exportResourceAsync(reference);
+  return payload.resourceDefinitions.find((d) => d.key === reference.key);
+}
+function readSpecProperty(spec, name) {
+  if (!spec) {
+    return;
+  }
+  if (spec[name] !== undefined) {
+    return spec[name];
+  }
+  const lower = name.toLowerCase();
+  const key = Object.keys(spec).find((k) => k.toLowerCase() === lower);
+  return key === undefined ? undefined : spec[key];
+}
+// ../solution-sdk/src/resources/services/resource-name.ts
+var MAX_RESOURCE_NAME_LENGTH = 256;
+var UNSAFE_NAME_CHARS = /[\\/:*?"<>|]/;
+function hasControlChar(value) {
+  for (let i = 0;i < value.length; i++) {
+    if (value.charCodeAt(i) < 32)
+      return true;
+  }
+  return false;
+}
+function validateResourceName(name, options = {}) {
+  const optionName = options.optionName ?? "--name";
+  if (name.trim() === "") {
+    return {
+      ok: false,
+      message: `${optionName} must not be blank`,
+      instructions: "Pass a non-empty resource name."
+    };
+  }
+  if (name.length > MAX_RESOURCE_NAME_LENGTH) {
+    return {
+      ok: false,
+      message: `${optionName} exceeds the ${MAX_RESOURCE_NAME_LENGTH}-character limit (got ${name.length})`,
+      instructions: "Shorten the resource name. Orchestrator name limits are kind-specific (queues cap at 50, assets at 256)."
+    };
+  }
+  if (UNSAFE_NAME_CHARS.test(name) || hasControlChar(name)) {
+    return {
+      ok: false,
+      message: `${optionName} contains unsafe characters`,
+      instructions: 'Resource names cannot contain path separators (/, \\), control characters, or any of: : * ? " < > |'
+    };
+  }
+  return { ok: true };
+}
 // ../solution-sdk/src/resources/services/resource-remote-sync.ts
 var NOT_FOUND_PATTERN = /not found/i;
 async function resourceRemoteSyncAsync(solutionPath = ".", resourceKey, options = {}) {
@@ -16673,6 +16968,6 @@ function sortKeysDeep(value) {
   }
   return sorted;
 }
-export { Tokens, models_BindingsResourceType, getResourceName, getFolderPathProperty, getResourceKindForBinding, assertSolutionManifest, computeEntryPointSpec, applyEntryPointEnhancementAsync, createResourceBuilderServices, findProjectFile, isProjectManifestError, isMissingProjectTypeError, readProjectFile, readSolutionFile, resolveSolutionFilePath, writeSolutionFile, restoreSolutionFile, createProjectInSolutionBuilder, normalizeFolderPath, findMatchingLocalResource, addProjectArtifactsToSolutionAsync, hasBareTemplateRow, hasAnyTemplateRow, saveCasingNormalized, normalizeResourceFileCasing, syncResourcesFromBindings, findResourceByKeyInRcs, searchRcsResources, findResourceInRcs, createResourceKindMetadataResolver, createLocalResource, readUipxProjects, syncAndLog, resourceRefreshAsync, resourceRemoteSyncAsync };
+export { Tokens, models_BindingsResourceType, getResourceName, getFolderPathProperty, getResourceKindForBinding, assertSolutionManifest, computeEntryPointSpec, applyEntryPointEnhancementAsync, createResourceBuilderServices, findProjectFile, isProjectManifestError, isMissingProjectTypeError, readProjectFile, readSolutionFile, resolveSolutionFilePath, writeSolutionFile, restoreSolutionFile, createProjectInSolutionBuilder, normalizeFolderPath, findMatchingLocalResource, addProjectArtifactsToSolutionAsync, hasBareTemplateRow, hasAnyTemplateRow, getRemoteResourceClients, findCatalogEntityAsync, toResourceReference, exportResourceDefinitionAsync, readSpecProperty, saveCasingNormalized, normalizeResourceFileCasing, validateResourceName, formatResourceSubtypes, sameResourceSubtype, syncResourcesFromBindings, findResourceByKeyInRcs, searchRcsResources, findResourceInRcs, createResourceKindMetadataResolver, resolveResourceKindMetadata, createLocalResource, readUipxProjects, syncAndLog, resourceRefreshAsync, resourceRemoteSyncAsync };
 
-//# debugId=96CDCF86612E62D764756E2164756E21
+//# debugId=904D1D8AE5997B9964756E2164756E21