@uipath/solution-tool 1.204.0-preview.255 → 1.205.0-preview.256

package/dist/{packager-tool-yrz4mwfn.js → packager-tool-6kz1pv9f.js}

@@ -9,28 +9,30 @@ import {
 } from "./packager-tool-53w8skv5.js";
 import {
   getSolutionAuthContext
-} from "./packager-tool-f5gq77m5.js";
+} from "./packager-tool-61pwb567.js";
 import {
   UsersApi,
   createApiClient
-} from "./packager-tool-zdfn32bc.js";
+} from "./packager-tool-8ptbmmmp.js";
 import {
   findSolutionFileUpward,
   normalizeProjectType,
   toPortableRelativePath
-} from "./packager-tool-f2e9rzxk.js";
+} from "./packager-tool-5edvzz80.js";
+import {
+  getLoginStatusAsync
+} from "./packager-tool-43ahv5mn.js";
 import {
-  catchError,
-  extractErrorMessage,
   isGuid,
   logger
-} from "./packager-tool-kswwd3hp.js";
+} from "./packager-tool-tx834spe.js";
 import {
-  getLoginStatusAsync
-} from "./packager-tool-gb35b4qs.js";
+  catchError,
+  extractErrorMessage
+} from "./packager-tool-6ybywxxn.js";
 import {
   getFileSystem
-} from "./packager-tool-zf3929se.js";
+} from "./packager-tool-v1f5e8t9.js";
 import {
   __commonJS,
   __require,
@@ -2398,103 +2400,6 @@ var require_cjs = __commonJS(function(exports) {
     return dependency_container_1.instance;
   } });
 });
-
-// ../solution-sdk/src/resources/services/solution-manifest.ts
-async function assertSolutionManifest(dir) {
-  const fs = getFileSystem();
-  const entries = await fs.readdir(dir);
-  const hasManifest = entries.some((f) => f.endsWith(".uipx"));
-  if (!hasManifest) {
-    throw new Error(`${dir} is not a UiPath solution (no .uipx manifest found). Run 'uip solution init' first, or pass --solution-folder pointing at an existing solution.`);
-  }
-}
-async function readSolutionManifest(fs, solutionDir) {
-  const [readdirError, entries] = await catchError(fs.readdir(solutionDir));
-  if (readdirError || !entries)
-    return;
-  const uipx = entries.find((name) => name.endsWith(".uipx"));
-  if (!uipx)
-    return;
-  const uipxPath = fs.path.join(solutionDir, uipx);
-  const [readError, raw] = await catchError(fs.readFile(uipxPath, "utf-8"));
-  if (readError || !raw)
-    return;
-  const [parseError, parsed] = catchError(() => JSON.parse(raw));
-  if (parseError)
-    return;
-  return normalizeManifest(parsed);
-}
-function normalizeManifest(parsed) {
-  if (!parsed || typeof parsed !== "object")
-    return {};
-  const raw = parsed.Projects;
-  if (!Array.isArray(raw))
-    return {};
-  const projects = raw.filter((p) => typeof p === "object" && p !== null);
-  return { Projects: projects };
-}
-async function resolveProjectDirFromManifest(fs, solutionDir, projectKey) {
-  const manifest = await readSolutionManifest(fs, solutionDir);
-  if (!manifest)
-    return;
-  const entry = manifest.Projects?.find((p) => p.Id === projectKey);
-  const relativePath = entry?.ProjectRelativePath;
-  if (typeof relativePath !== "string" || !relativePath)
-    return;
-  return fs.path.join(solutionDir, fs.path.dirname(toPortableRelativePath(relativePath)));
-}
-
-// ../solution-sdk/src/resources/services/entry-point-spec-enhancer.ts
-var ENTRY_POINTS_FILE = "entry-points.json";
-
-class EntryPointSpecEnhancer {
-  fs;
-  constructor(fs) {
-    this.fs = fs ?? getFileSystem();
-  }
-  async enhanceSpecAsync(context, resource, _propertiesMetadata, spec, _cancellationToken) {
-    if (!resource.projectKey) {
-      return;
-    }
-    const [enhanceError] = await catchError(this.applyEntryPointAsync(context, resource.projectKey, spec));
-    if (enhanceError) {
-      logger.warn(`EntryPointSpecEnhancer: failed to enhance spec for resource ${resource.key}: ${enhanceError.message}`);
-    }
-  }
-  async applyEntryPointAsync(context, projectKey, spec) {
-    const computed = await computeEntryPointSpec(this.fs, context.path, projectKey);
-    if (!computed)
-      return;
-    for (const [key, value] of Object.entries(computed)) {
-      spec.set(key, value);
-    }
-  }
-}
-async function computeEntryPointSpec(fs, solutionDir, projectKey) {
-  const projectDir = await resolveProjectDirFromManifest(fs, solutionDir, projectKey);
-  if (!projectDir)
-    return;
-  const entryPointsPath = fs.path.join(projectDir, ENTRY_POINTS_FILE);
-  if (!await fs.exists(entryPointsPath))
-    return;
-  const entryRaw = await fs.readFile(entryPointsPath, "utf-8");
-  if (!entryRaw)
-    return;
-  const parsed = JSON.parse(entryRaw);
-  const entries = Array.isArray(parsed.entryPoints) ? parsed.entryPoints : [];
-  const only = entries.length === 1 ? entries[0] : undefined;
-  return {
-    entryPoints: entryRaw,
-    entryPointName: only ? only.filePath ?? null : null,
-    entryPointUniqueId: only ? only.uniqueId ?? null : null
-  };
-}
-async function applyEntryPointEnhancementAsync(context, resource, spec) {
-  const specMap = new Map(Object.entries(spec));
-  const enhancer = new EntryPointSpecEnhancer;
-  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")
@@ -2566,6 +2471,19 @@ class NullSecretsProvider {
   }
 }
 
+// ../../node_modules/@uipath/resource-builder-sdk/dist/providers/feature-flag-provider.js
+class NullFeatureFlagProvider {
+  getBool(_featureFlagName, defaultValue) {
+    return defaultValue ?? false;
+  }
+  getInt(_featureFlagName, defaultValue) {
+    return defaultValue ?? 0;
+  }
+  getString(_featureFlagName, defaultValue) {
+    return defaultValue ?? "";
+  }
+}
+
 // ../../node_modules/@uipath/resource-builder-sdk/dist/exceptions/timeout-exception.js
 class TimeoutException extends Error {
   constructor(message, timeoutMs) {
@@ -2720,10 +2638,12 @@ function withFileOperationTimeout2(provider, timeoutMs) {
 // ../../node_modules/@uipath/resource-builder-sdk/dist/solution/solution-context-options.js
 var DEFAULT_SOLUTION_CONTEXT_OPTIONS = {
   lockTimeoutMs: 30000,
-  fileOperationTimeoutMs: 30000
+  fileOperationTimeoutMs: 30000,
+  maxDegreeOfParallelism: 1
 };
 var SOLUTION_CONTEXT_TIMEOUT_STORAGE_KEY = "SOL_RB_SOLUTION_CONTEXT_TIMEOUT_MS";
 var FILE_OPERATION_TIMEOUT_STORAGE_KEY = "SOL_RB_FILE_OPERATION_TIMEOUT_MS";
+var MAX_DEGREE_OF_PARALLELISM_STORAGE_KEY = "SOL_RB_MAX_DEGREE_OF_PARALLELISM";
 function resolveTimeoutMs(storageKey, configured, fallback) {
   const override = readTimeoutOverrideMs(storageKey);
   if (override !== undefined)
@@ -2736,10 +2656,33 @@ function resolveLockTimeoutMs(options) {
 function resolveFileOperationTimeoutMs(options) {
   return resolveTimeoutMs(FILE_OPERATION_TIMEOUT_STORAGE_KEY, options?.fileOperationTimeoutMs, DEFAULT_SOLUTION_CONTEXT_OPTIONS.fileOperationTimeoutMs);
 }
+function isValidDegreeOfParallelism(value) {
+  return typeof value == "number" && Number.isInteger(value) && value > 0;
+}
+function resolveMaxDegreeOfParallelism(options) {
+  const override = readDegreeOfParallelismOverride(MAX_DEGREE_OF_PARALLELISM_STORAGE_KEY);
+  if (override !== undefined)
+    return override;
+  return isValidDegreeOfParallelism(options?.maxDegreeOfParallelism) ? options.maxDegreeOfParallelism : DEFAULT_SOLUTION_CONTEXT_OPTIONS.maxDegreeOfParallelism;
+}
+function readDegreeOfParallelismOverride(storageKey) {
+  try {
+    if ("u" < typeof localStorage)
+      return;
+    const raw = localStorage.getItem(storageKey);
+    if (raw === null || raw.trim() === "")
+      return;
+    const parsed = Number(raw);
+    return isValidDegreeOfParallelism(parsed) ? parsed : undefined;
+  } catch {
+    return;
+  }
+}
 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
+    fileOperationTimeoutMs: isValidTimeoutMs(options?.fileOperationTimeoutMs) ? options.fileOperationTimeoutMs : DEFAULT_SOLUTION_CONTEXT_OPTIONS.fileOperationTimeoutMs,
+    maxDegreeOfParallelism: isValidDegreeOfParallelism(options?.maxDegreeOfParallelism) ? options.maxDegreeOfParallelism : DEFAULT_SOLUTION_CONTEXT_OPTIONS.maxDegreeOfParallelism
   };
 }
 
@@ -3530,6 +3473,16 @@ function getRootFolder(solution) {
 }
 
 // ../../node_modules/@uipath/resource-builder-sdk/dist/solution/multi-file-solution-definition-provider.js
+function nowMs() {
+  return globalThis.performance?.now?.() ?? Date.now();
+}
+function round1(ms) {
+  return Math.round(10 * ms) / 10;
+}
+function cancellationError(signal) {
+  return signal?.reason instanceof OperationCancelledException ? signal.reason : new OperationCancelledException;
+}
+
 class MultiFileSolutionDefinitionProvider {
   get caseInsensitiveSerializer() {
     if (!this._caseInsensitiveSerializer)
@@ -3547,137 +3500,344 @@ class MultiFileSolutionDefinitionProvider {
   }
   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.getFileStorageProviderAsync(context, cancellationToken);
-    const resources = [];
-    const solutionFiles = [];
-    let hashes;
-    let paths;
-    const pathsByKind = this.getPathsByKind(context);
-    let tree;
-    pathsByKind.clear();
+    const loadStarted = nowMs();
+    let fileCount = 0;
+    let listMs = 0;
+    let readStarted = loadStarted;
+    let readWallMs = 0;
+    let readCompleted = false;
+    let ioMs = 0;
+    let maxFileIoMs = 0;
+    let parseMs = 0;
+    let hashMs = 0;
+    let chars = 0;
+    let loadedCount = 0;
     const parseErrors = [];
     const missingFiles = [];
     const invalidFiles = [];
-    context.items[SolutionContextKeys.PARSE_ERRORS_ITEM_KEY] = parseErrors;
-    if (!context.isReadOnly) {
-      hashes = this.getHashes(context);
-      paths = this.getPaths(context);
-      tree = this.getTree(context);
-      hashes.clear();
-      paths.clear();
-      tree.length = 0;
-    }
-    const resourceFiles = await fileStorageProvider.getFilesAsync(SolutionConstants.RESOURCE_FILES_FOLDER_NAME, "*.json", cancellationToken);
-    for (const resourceFile of resourceFiles)
-      try {
-        const stream = await fileStorageProvider.openFileAsync(resourceFile, cancellationToken);
-        const content = await this.streamToString(stream);
-        const wrapper = this.caseInsensitiveSerializer.deserialize(content);
-        if (wrapper?.resource) {
-          const rd = this.fromSerializable(wrapper.resource, solutionFiles);
-          const relPath = resourceFile.replace(/\\/g, "/");
-          const segments = relPath.split("/").filter((s) => s.length > 0);
-          const firstSegment = segments[0];
-          if (segments.length >= 3 && firstSegment && firstSegment.toLowerCase() === SolutionConstants.RESOURCE_FILES_FOLDER_NAME.toLowerCase()) {
-            const hasType = !!rd.type;
-            const folderSegmentCount = hasType ? segments.length - 3 : segments.length - 2;
-            if (folderSegmentCount < 1)
-              rd.folders = [
-                {
-                  fullyQualifiedName: SolutionConstants.ROOT_FOLDER_NAME
-                }
-              ];
-            else {
-              const segmentsToUse = segments.slice(1, folderSegmentCount);
-              const folderFqn = segmentsToUse.join("/");
-              rd.folders = [
-                {
-                  fullyQualifiedName: folderFqn
-                }
-              ];
+    let metricsLogged = false;
+    const logReadMetrics = (outcome) => {
+      metricsLogged = true;
+      const totalMs = nowMs() - loadStarted;
+      const mergeMs = readCompleted ? nowMs() - readStarted - readWallMs : 0;
+      const metrics = {
+        outcome,
+        path: context.path,
+        fileCount,
+        totalMs: round1(totalMs),
+        listMs: round1(listMs),
+        readWallMs: round1(readWallMs),
+        ioMs: round1(ioMs),
+        maxFileIoMs: round1(maxFileIoMs),
+        parseMs: round1(parseMs),
+        hashMs: round1(hashMs),
+        mergeMs: round1(mergeMs),
+        chars,
+        degreeOfParallelism: resolveMaxDegreeOfParallelism(this.options),
+        isReadOnly: context.isReadOnly,
+        loaded: loadedCount,
+        missing: missingFiles.length,
+        invalid: invalidFiles.length,
+        parseErrors: parseErrors.length
+      };
+      const message = `Solution read ${outcome} for solution ${context.path}: ${metrics.fileCount} files in ${metrics.totalMs} ms (list ${metrics.listMs} ms, read ${metrics.readWallMs} ms wall, io ${metrics.ioMs} ms summed, max file io ${metrics.maxFileIoMs} ms, parse ${metrics.parseMs} ms, hash ${metrics.hashMs} ms, merge ${metrics.mergeMs} ms); ${metrics.chars} chars; parallelism ${metrics.degreeOfParallelism}; readOnly ${metrics.isReadOnly}; loaded ${metrics.loaded}, missing ${metrics.missing}, invalid ${metrics.invalid}, parseErrors ${metrics.parseErrors}`;
+      if (outcome === "Success")
+        this.logger.info(message, metrics);
+      else
+        this.logger.warn(message, metrics);
+    };
+    const readCore = async () => {
+      const solutionKey = this.getSolutionKey(context);
+      const fileStorageProvider = await this.getFileStorageProviderAsync(context, cancellationToken);
+      const resources = [];
+      const solutionFiles = [];
+      let hashes;
+      let paths;
+      const pathsByKind = this.getPathsByKind(context);
+      let tree;
+      pathsByKind.clear();
+      context.items[SolutionContextKeys.PARSE_ERRORS_ITEM_KEY] = parseErrors;
+      if (!context.isReadOnly) {
+        hashes = this.getHashes(context);
+        paths = this.getPaths(context);
+        tree = this.getTree(context);
+        hashes.clear();
+        paths.clear();
+        tree.length = 0;
+      }
+      const listStarted = nowMs();
+      const resourceFiles = await fileStorageProvider.getFilesAsync(SolutionConstants.RESOURCE_FILES_FOLDER_NAME, "*.json", cancellationToken);
+      listMs = nowMs() - listStarted;
+      fileCount = resourceFiles.length;
+      readStarted = nowMs();
+      const readResults = await this.readResourceFilesAsync(context, fileStorageProvider, resourceFiles, cancellationToken);
+      readWallMs = nowMs() - readStarted;
+      readCompleted = true;
+      let fatal;
+      let hasFatal = false;
+      for (const result of readResults)
+        if (result !== undefined) {
+          if (result.timings) {
+            ioMs += result.timings.ioMs;
+            maxFileIoMs = Math.max(maxFileIoMs, result.timings.ioMs);
+            parseMs += result.timings.parseMs;
+            hashMs += result.timings.hashMs;
+            chars += result.timings.chars;
+          }
+          if (result.fatal !== undefined) {
+            if (!hasFatal) {
+              fatal = result.fatal;
+              hasFatal = true;
             }
-          } else
-            rd.folders = [
-              {
-                fullyQualifiedName: SolutionConstants.ROOT_FOLDER_NAME
+            continue;
+          }
+          if (!hasFatal)
+            switch (result.outcome) {
+              case "loaded": {
+                loadedCount++;
+                const rd = result.resource;
+                for (const file of result.files)
+                  if (!solutionFiles.some((sf) => sf.name === file.name && sf.kind === file.kind))
+                    solutionFiles.push(file);
+                resources.push(rd);
+                const resourceKey = rd.key;
+                const normalizedFullPath = result.normalizedPath;
+                if (!pathsByKind.has(rd.kind))
+                  pathsByKind.set(rd.kind, []);
+                const kindPaths = pathsByKind.get(rd.kind);
+                if (kindPaths)
+                  kindPaths.push({
+                    name: rd.name,
+                    key: rd.key,
+                    path: normalizedFullPath
+                  });
+                if (!context.isReadOnly && hashes && paths) {
+                  paths.set(resourceKey, normalizedFullPath);
+                  hashes.set(resourceKey, result.hash);
+                }
+                break;
               }
-            ];
-          resources.push(rd);
-          const resourceKey = rd.key;
-          const normalizedFullPath = this.getNormalizedPath(resourceFile);
-          if (!pathsByKind.has(rd.kind))
-            pathsByKind.set(rd.kind, []);
-          const kindPaths = pathsByKind.get(rd.kind);
-          if (kindPaths)
-            kindPaths.push({
-              name: rd.name,
-              key: rd.key,
-              path: normalizedFullPath
+              case "missing":
+                missingFiles.push(result.file);
+                break;
+              case "invalid":
+                invalidFiles.push(result.file);
+                break;
+              case "parseError":
+                parseErrors.push(result.file);
+                break;
+            }
+        }
+      if (hasFatal) {
+        logReadMetrics("Fatal");
+        throw fatal;
+      }
+      if (missingFiles.length > 0) {
+        logReadMetrics("MissingFiles");
+        throw new BadRequestException(ErrorCodes.Resources.MissingFileDependencies, `Solution has missing files: ${missingFiles.join(", ")}`);
+      }
+      if (invalidFiles.length > 0) {
+        logReadMetrics("InvalidFiles");
+        throw new BadRequestException(ErrorCodes.Resources.InvalidResourceFile, `Solution has resource files with invalid content: ${invalidFiles.join(", ")}`);
+      }
+      if (parseErrors.length > 0) {
+        logReadMetrics("ParseErrors");
+        throw new Error(`Failed to read resource files for solution ${context.path}: ${parseErrors.join(", ")}`);
+      }
+      const folderMap = new Map;
+      const rootFolder = this.buildRootFolder(solutionKey, SolutionConstants.ROOT_FOLDER_NAME);
+      folderMap.set(rootFolder.fullyQualifiedName.toLowerCase(), rootFolder);
+      for (const res of resources)
+        for (const fdep of res.folders ?? []) {
+          const fqnLower = fdep.fullyQualifiedName.toLowerCase();
+          if (!folderMap.has(fqnLower)) {
+            const folderKey = this.generateGuidFromString(fdep.fullyQualifiedName);
+            const pathSegments = fdep.fullyQualifiedName.split("/").filter((s) => s.length > 0).map((p) => {
+              if (p.toLowerCase() !== SolutionConstants.ROOT_FOLDER_NAME.toLowerCase())
+                return this.generateGuidFromString(SolutionConstants.ROOT_FOLDER_NAME);
+              return rootFolder.key;
+            });
+            const folderPath = pathSegments.join(".");
+            folderMap.set(fqnLower, {
+              key: folderKey,
+              fullyQualifiedName: fdep.fullyQualifiedName,
+              path: folderPath
             });
-          if (!context.isReadOnly && hashes && paths) {
-            paths.set(resourceKey, normalizedFullPath);
-            hashes.set(resourceKey, await this.computeHash(content));
           }
-        } else {
-          this.logger.error("Failed to read resource file %s for solution %s: invalid content", undefined, resourceFile, context.path);
-          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);
-        } else {
-          this.logger.error("Failed to read resource file %s for solution %s", ex, resourceFile, context.path);
-          parseErrors.push(resourceFile);
         }
+      const solution = {
+        key: solutionKey,
+        docVersion: SolutionConstants.CURRENT_DOC_VERSION,
+        folders: Array.from(folderMap.values()),
+        resources,
+        files: solutionFiles
+      };
+      await this.replaceDuplicateKeysAsync(solution, cancellationToken);
+      if (!context.isReadOnly && tree) {
+        const orderedResourceKeys = getTopologicalIdsOrdering(buildDependencyGraph(solution.resources));
+        tree.push(...orderedResourceKeys);
       }
-    if (missingFiles.length > 0)
-      throw new BadRequestException(ErrorCodes.Resources.MissingFileDependencies, `Solution has missing files: ${missingFiles.join(", ")}`);
-    if (invalidFiles.length > 0)
-      throw new BadRequestException(ErrorCodes.Resources.InvalidResourceFile, `Solution has resource files with invalid content: ${invalidFiles.join(", ")}`);
-    if (parseErrors.length > 0)
-      throw new Error(`Failed to read resource files for solution ${context.path}: ${parseErrors.join(", ")}`);
-    const folderMap = new Map;
-    const rootFolder = this.buildRootFolder(solutionKey, SolutionConstants.ROOT_FOLDER_NAME);
-    folderMap.set(rootFolder.fullyQualifiedName.toLowerCase(), rootFolder);
-    for (const res of resources)
-      for (const fdep of res.folders ?? []) {
-        const fqnLower = fdep.fullyQualifiedName.toLowerCase();
-        if (!folderMap.has(fqnLower)) {
-          const folderKey = this.generateGuidFromString(fdep.fullyQualifiedName);
-          const pathSegments = fdep.fullyQualifiedName.split("/").filter((s) => s.length > 0).map((p) => {
-            if (p.toLowerCase() !== SolutionConstants.ROOT_FOLDER_NAME.toLowerCase())
-              return this.generateGuidFromString(SolutionConstants.ROOT_FOLDER_NAME);
-            return rootFolder.key;
-          });
-          const folderPath = pathSegments.join(".");
-          folderMap.set(fqnLower, {
-            key: folderKey,
-            fullyQualifiedName: fdep.fullyQualifiedName,
-            path: folderPath
-          });
-        }
+      logReadMetrics("Success");
+      return solution;
+    };
+    try {
+      return await readCore();
+    } catch (ex) {
+      if (!metricsLogged)
+        logReadMetrics("Fatal");
+      throw ex;
+    }
+  }
+  async readResourceFilesAsync(context, fileStorageProvider, resourceFiles, cancellationToken) {
+    const results = Array.from({
+      length: resourceFiles.length
+    }, () => {
+      return;
+    });
+    if (resourceFiles.length === 0)
+      return results;
+    const computeHash = !context.isReadOnly;
+    const degreeOfParallelism = Math.min(resolveMaxDegreeOfParallelism(this.options), resourceFiles.length);
+    let nextIndex = 0;
+    let stopRequested = false;
+    const runWorkerAsync = async () => {
+      while (!stopRequested && nextIndex < resourceFiles.length) {
+        const index = nextIndex++;
+        const resourceFile = resourceFiles[index];
+        const result = await this.readResourceFileAsync(context, fileStorageProvider, resourceFile, computeHash, cancellationToken);
+        results[index] = result;
+        if (result.fatal !== undefined)
+          stopRequested = true;
       }
-    const solution = {
-      key: solutionKey,
-      docVersion: SolutionConstants.CURRENT_DOC_VERSION,
-      folders: Array.from(folderMap.values()),
-      resources,
-      files: solutionFiles
     };
-    await this.replaceDuplicateKeysAsync(solution, cancellationToken);
-    if (!context.isReadOnly && tree) {
-      const orderedResourceKeys = getTopologicalIdsOrdering(buildDependencyGraph(solution.resources));
-      tree.push(...orderedResourceKeys);
+    const workers = [];
+    for (let i = 0;i < degreeOfParallelism; i++)
+      workers.push(runWorkerAsync());
+    await Promise.all(workers);
+    if (cancellationToken?.aborted && !results.some((result) => result?.fatal !== undefined))
+      throw cancellationError(cancellationToken);
+    return results;
+  }
+  async readResourceFileAsync(context, fileStorageProvider, resourceFile, computeHash, cancellationToken) {
+    const started = nowMs();
+    let ioMs;
+    let content;
+    const failureTimings = () => {
+      const elapsed = nowMs() - started;
+      return ioMs === undefined ? {
+        ioMs: elapsed,
+        parseMs: 0,
+        hashMs: 0,
+        chars: 0
+      } : {
+        ioMs,
+        parseMs: elapsed - ioMs,
+        hashMs: 0,
+        chars: content?.length ?? 0
+      };
+    };
+    try {
+      if (cancellationToken?.aborted)
+        throw cancellationError(cancellationToken);
+      const stream = await fileStorageProvider.openFileAsync(resourceFile, cancellationToken);
+      content = await this.streamToString(stream);
+      ioMs = nowMs() - started;
+      const parseStarted = nowMs();
+      const wrapper = this.caseInsensitiveSerializer.deserialize(content);
+      if (!wrapper?.resource) {
+        this.logger.error("Failed to read resource file %s for solution %s: invalid content", undefined, resourceFile, context.path);
+        return {
+          file: resourceFile,
+          outcome: "invalid",
+          timings: failureTimings()
+        };
+      }
+      const files = [];
+      const rd = this.fromSerializable(wrapper.resource, files);
+      this.applyFolders(rd, resourceFile);
+      const parseMs = nowMs() - parseStarted;
+      let hash;
+      let hashMs = 0;
+      if (computeHash) {
+        const hashStarted = nowMs();
+        hash = await this.computeHash(content);
+        hashMs = nowMs() - hashStarted;
+      }
+      return {
+        file: resourceFile,
+        outcome: "loaded",
+        resource: rd,
+        files,
+        normalizedPath: this.getNormalizedPath(resourceFile),
+        hash,
+        timings: {
+          ioMs,
+          parseMs,
+          hashMs,
+          chars: content.length
+        }
+      };
+    } catch (ex) {
+      if (ex instanceof OperationCancelledException || cancellationToken?.aborted) {
+        this.logger.warn("Operation cancelled while reading file %s for solution %s", resourceFile, context.path);
+        return {
+          file: resourceFile,
+          outcome: "fatal",
+          fatal: ex instanceof OperationCancelledException ? ex : cancellationError(cancellationToken),
+          timings: failureTimings()
+        };
+      }
+      if (ex instanceof TimeoutException)
+        return {
+          file: resourceFile,
+          outcome: "fatal",
+          fatal: new TimeoutException(`Reading resource file ${resourceFile} for solution ${context.path} timed out: ${ex.message}`, ex.timeoutMs),
+          timings: failureTimings()
+        };
+      if (isFileNotFoundError(ex)) {
+        this.logger.warn("Resource file listed but missing in storage for solution %s: %s", resourceFile, context.path);
+        return {
+          file: resourceFile,
+          outcome: "missing",
+          timings: failureTimings()
+        };
+      }
+      this.logger.error("Failed to read resource file %s for solution %s", ex, resourceFile, context.path);
+      return {
+        file: resourceFile,
+        outcome: "parseError",
+        timings: failureTimings()
+      };
     }
-    return solution;
+  }
+  applyFolders(resource, resourceFile) {
+    const relPath = resourceFile.replace(/\\/g, "/");
+    const segments = relPath.split("/").filter((s) => s.length > 0);
+    const firstSegment = segments[0];
+    if (segments.length >= 3 && firstSegment && firstSegment.toLowerCase() === SolutionConstants.RESOURCE_FILES_FOLDER_NAME.toLowerCase()) {
+      const hasType = !!resource.type;
+      const folderSegmentCount = hasType ? segments.length - 3 : segments.length - 2;
+      if (folderSegmentCount < 1)
+        resource.folders = [
+          {
+            fullyQualifiedName: SolutionConstants.ROOT_FOLDER_NAME
+          }
+        ];
+      else {
+        const segmentsToUse = segments.slice(1, folderSegmentCount);
+        const folderFqn = segmentsToUse.join("/");
+        resource.folders = [
+          {
+            fullyQualifiedName: folderFqn
+          }
+        ];
+      }
+    } else
+      resource.folders = [
+        {
+          fullyQualifiedName: SolutionConstants.ROOT_FOLDER_NAME
+        }
+      ];
   }
   async writeAsync(context, solution, cancellationToken) {
     if (context.isReadOnly)
@@ -3982,7 +4142,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-rf2g1kfj.js"),
+    import("./embedded-file-reader-z4becc02.js"),
     import("./index-dqa169gp.js")
   ]);
   return new EmbeddedFileReader(new JsonSerializerFactory2);
@@ -4000,6 +4160,7 @@ var ServiceTokens = {
   SecretsProvider: "ISecretsProvider",
   FileStorageProviderFactory: "IFileStorageProviderFactory",
   IpRangeBypassSecretProvider: "IIpRangeBypassSecretProvider",
+  FeatureFlagProvider: "IFeatureFlagProvider",
   SolutionDefinitionProvider: "ISolutionDefinitionProvider",
   SolutionDefinitionFactory: "ISolutionDefinitionFactory",
   ArtifactResourceSpecEnhancer: "IArtifactResourceSpecEnhancer",
@@ -4350,6 +4511,9 @@ function getBindingType(resourceKind, resourceType) {
 }
 
 // ../../node_modules/@uipath/resource-builder-sdk/dist/bindings/bindings-metadata-serializer.js
+var SUPPORTED_SCHEMA_MAJOR_VERSION = 2;
+var INT32_MAX_VALUE = 2147483647;
+
 class BindingsMetadataSerializer {
   tryDeserialize(input) {
     if (!input)
@@ -4360,30 +4524,52 @@ class BindingsMetadataSerializer {
       let cleanInput = input.charCodeAt(0) === 65279 ? input.slice(1) : input;
       if (cleanInput.charCodeAt(cleanInput.length - 1) === 26)
         cleanInput = cleanInput.slice(0, -1);
-      const jsonObject = JSON.parse(cleanInput);
+      const root = JSON.parse(cleanInput);
+      if (root === null || typeof root != "object" || Array.isArray(root)) {
+        this.logger.warn("Invalid bindings: content is not a JSON object");
+        return {
+          success: false
+        };
+      }
+      const jsonObject = root;
       const versionValue = jsonObject[BindingsKnownKeys.Version];
-      if (!versionValue)
+      if (typeof versionValue != "string") {
+        this.logger.warn(`Invalid bindings: '${BindingsKnownKeys.Version}' is missing or not a string`);
+        return {
+          success: false
+        };
+      }
+      const majorVersion = BindingsMetadataSerializer.tryParseMajorVersion(versionValue);
+      if (majorVersion === undefined) {
+        this.logger.warn(`Invalid bindings: '${BindingsKnownKeys.Version}' is not a valid version`);
+        return {
+          success: false
+        };
+      }
+      if (majorVersion !== SUPPORTED_SCHEMA_MAJOR_VERSION) {
+        this.logger.warn(`Invalid bindings: unsupported schema major version ${majorVersion}`);
         return {
           success: false
         };
-      const versionParts = versionValue.split(".").map(Number);
-      const majorVersion = versionParts[0];
-      if (majorVersion !== 2)
-        throw new Error("Unsupported bindings schema");
+      }
+      const resources = jsonObject[BindingsKnownKeys.Resources];
+      if (!Array.isArray(resources)) {
+        this.logger.warn(`Invalid bindings: '${BindingsKnownKeys.Resources}' is missing or not an array`);
+        return {
+          success: false
+        };
+      }
       const metadata = {
         version: versionValue,
         resources: []
       };
-      const resources = jsonObject[BindingsKnownKeys.Resources];
-      if (Array.isArray(resources))
-        for (const resourceElement of resources) {
-          if (resourceElement == null) {
-            this.logger.warn("Skipping null bindings resource element");
-            continue;
-          }
-          const resource = this.getBindingsResourceV2(resourceElement);
-          metadata.resources.push(resource);
+      for (const resourceElement of resources) {
+        if (resourceElement == null) {
+          this.logger.warn("Skipping null bindings resource element");
+          continue;
         }
+        metadata.resources.push(this.getBindingsResourceV2(resourceElement));
+      }
       this.linkDependencies(metadata.resources);
       return {
         success: true,
@@ -4396,6 +4582,22 @@ class BindingsMetadataSerializer {
       };
     }
   }
+  static tryParseMajorVersion(value) {
+    const parts = value.split(".");
+    if (parts.length < 2 || parts.length > 4)
+      return;
+    let major;
+    for (const [index, part] of parts.entries()) {
+      if (!/^\s*[+-]?\d+\s*$/.test(part))
+        return;
+      const component = Number(part);
+      if (component < 0 || component > INT32_MAX_VALUE)
+        return;
+      if (index === 0)
+        major = component === 0 ? 0 : component;
+    }
+    return major;
+  }
   linkDependencies(resources) {
     for (const resource of resources) {
       const propertyMeta = resource.metadata;
@@ -4582,8 +4784,7 @@ class BindingOverwritesHandler {
           [BindingsKnownKeys.FolderKeyPropertyName]: resourceOverwrite.folderKey ?? ""
         };
       else {
-        const isBusinessRule = bindingResource.binding.resourceType === models_BindingsResourceType.BusinessRule;
-        const folderPath = bindingResource.isArtefactResource && !isBusinessRule ? "" : resourceOverwrite.folderFullyQualifiedName ?? "";
+        const folderPath = bindingResource.isArtefactResource && !bindingResource.isCodedApp ? "" : resourceOverwrite.folderFullyQualifiedName ?? "";
         overwrite = {
           [BindingsKnownKeys.FolderPathPropertyName]: folderPath,
           [BindingsKnownKeys.NamePropertyName]: resourceOverwrite.resourceName
@@ -4616,6 +4817,11 @@ function removeTimeTriggerBindings(bindings) {
 }
 
 // ../../node_modules/@uipath/resource-builder-sdk/dist/bindings/binding-overwrites-mapping-handler.js
+function isCodedAppType(type) {
+  const normalized = type?.toLowerCase();
+  return normalized === "coded" || normalized === "codedaction";
+}
+
 class BindingOverwritesMappingRequestHandler {
   async handleAsync(request, cancellationToken) {
     const solutionBindings = request.bindings.resources.filter((x) => isSolutionResource(x.metadata));
@@ -4641,7 +4847,8 @@ class BindingOverwritesMappingRequestHandler {
           result.push({
             binding: bindingsResource,
             resourceKey: resource.key,
-            isArtefactResource: resource.projectKey != null
+            isArtefactResource: resource.projectKey != null,
+            isCodedApp: bindingsResource.resourceType === models_BindingsResourceType.App && isCodedAppType(resource.type)
           });
       } else {
         this.logger.error(`Solution does not contain binding resource of type ${models_BindingsResourceType[bindingsResource.resourceType]}.`);
@@ -5646,6 +5853,9 @@ class SolutionPublishLocationRequest {
 }
 
 class SolutionPublishLocationRequestV2 {
+  constructor(permissionType) {
+    this.permissionType = permissionType;
+  }
 }
 
 class SettingsRequest {
@@ -5810,12 +6020,13 @@ function _ts_param3(paramIndex, decorator) {
 }
 
 class SolutionPublishLocationRequestV2Handler {
-  async handleAsync(_request, cancellationToken) {
+  async handleAsync(request, cancellationToken) {
     try {
       const orchestratorClient = await this.orchestratorClientFactory.getClientAsync(cancellationToken);
       if (!orchestratorClient)
         throw new InvalidOperationException("Failed to create Orchestrator client");
-      return await orchestratorClient.getPublishLocationsAsync(cancellationToken);
+      const { permissionType } = request;
+      return permissionType == null ? await orchestratorClient.getPublishLocationsAsync(cancellationToken) : await orchestratorClient.getAccessiblePublishLocationsAsync(permissionType, cancellationToken);
     } catch (error) {
       this.logger.error("An unexpected error occurred while retrieving publish locations from Automation Solutions service.", error);
       throw error;
@@ -7845,7 +8056,7 @@ class GetResourceKeyForProjectRequestHandler {
       projectKey: request.projectKey,
       solution: request.context.path
     });
-    const cacheKey = `prk:${request.projectKey}`;
+    const cacheKey = `prk:${request.context.path}:${request.projectKey}`;
     const cached = await this.cacheProvider.getAsync(cacheKey, cancellationToken);
     if (cached && typeof cached == "object" && "resourceKey" in cached) {
       this.logger.info("Cache hit for project {projectKey} resource key.", {
@@ -8673,7 +8884,11 @@ class UpdateResourceConfigurationCommandHandler {
     for (const prop of command.properties) {
       const propKey = prop.property.toLowerCase();
       const metadata = propertiesMetadata.get(propKey);
-      if (!(!metadata || isAnyReferenceProperty(metadata)) && metadata.readOnly !== true) {
+      if (metadata && metadata.readOnly !== true) {
+        if (isAnyReferenceProperty(metadata)) {
+          updated = this.setSolutionReference(solution, resource, currentConfiguration, propertiesMetadata, metadata, prop.configuredValue) || updated;
+          continue;
+        }
         if (isSecretProperty(metadata)) {
           const secretValue = prop.configuredValue?.toString() || "";
           const existingKey = currentConfiguration[metadata.property]?.toString();
@@ -8717,6 +8932,38 @@ class UpdateResourceConfigurationCommandHandler {
     await command.context.saveChangesAsync(cancellationToken);
     return resourceConfiguration;
   }
+  setSolutionReference(solution, resource, currentConfiguration, propertiesMetadata, metadata, configuredValue) {
+    const referenceKind = metadata["referenceKind"];
+    if (!isSingleReferenceProperty(metadata) || isFileReferenceProperty(metadata) || typeof referenceKind != "string" || !referenceKind)
+      return false;
+    const requested = asReference(configuredValue);
+    const target = requested?.key ? solution.resources.find((r) => invariantEquals(r.key, requested.key) && invariantEquals(r.kind, referenceKind)) : undefined;
+    if (!requested || !target || invariantEquals(target.key, resource.key))
+      return false;
+    const dependencies = resource.dependencies ??= [];
+    const previous = asReference(currentConfiguration[metadata.property]);
+    const previousKey = previous?.key;
+    const isReferencedElsewhere = (key) => [
+      ...propertiesMetadata.values()
+    ].some((p) => isAnyReferenceProperty(p) && !isFileReferenceProperty(p) && typeof p["referenceKind"] == "string" && invariantEquals(p["referenceKind"], target.kind) && !invariantEquals(p.property, metadata.property) && asReferences(currentConfiguration[p.property]).some((r) => r.key !== undefined && invariantEquals(r.key, key)));
+    if (previousKey && !invariantEquals(previousKey, target.key) && !isReferencedElsewhere(previousKey)) {
+      const previousName = solution.resources.find((r) => invariantEquals(r.key, previousKey) && invariantEquals(r.kind, target.kind))?.name ?? previous?.name ?? "";
+      resource.dependencies = dependencies.filter((d) => !(invariantEquals(d.kind, target.kind) && invariantEquals(d.name, previousName)));
+    }
+    if (!resource.dependencies.some((d) => invariantEquals(d.kind, target.kind) && invariantEquals(d.name, target.name)))
+      resource.dependencies.push({
+        kind: target.kind,
+        name: target.name
+      });
+    currentConfiguration[metadata.property] = {
+      name: target.name,
+      key: target.key,
+      folderKey: requested.folderKey ?? null,
+      lookupStrategy: null,
+      info: null
+    };
+    return true;
+  }
   async updateReferencesName(solutionDefinition, resource, oldName, cancellationToken) {
     const resourcesToBeChanged = solutionDefinition.resources.filter((r) => r.key !== resource.key && (r.dependencies ?? []).some((d) => invariantEquals(d.kind, resource.kind) && invariantEquals(d.name, oldName)));
     if (resourcesToBeChanged.length === 0)
@@ -9003,9 +9250,31 @@ class UpsertResourceSecretCommandHandler {
     this.secretsProvider = secretsProvider;
   }
 }
-
-// ../../node_modules/@uipath/resource-builder-sdk/dist/handlers/solution-handlers.js
-var DUPLICATE_NAMES_SUPPORTED_KINDS = new Set([
+function asReference(value) {
+  if (!value || typeof value != "object" || Array.isArray(value))
+    return;
+  const record = value;
+  const pick = (name) => {
+    const entry = Object.entries(record).find(([k]) => k.toLowerCase() === name.toLowerCase());
+    return typeof entry?.[1] == "string" ? entry[1] : undefined;
+  };
+  return {
+    key: pick("key"),
+    name: pick("name"),
+    folderKey: pick("folderKey")
+  };
+}
+function asReferences(value) {
+  if (Array.isArray(value))
+    return value.map(asReference).filter((r) => r !== undefined);
+  const single = asReference(value);
+  return single ? [
+    single
+  ] : [];
+}
+
+// ../../node_modules/@uipath/resource-builder-sdk/dist/handlers/solution-handlers.js
+var DUPLICATE_NAMES_SUPPORTED_KINDS = new Set([
   "package"
 ]);
 
@@ -9974,6 +10243,9 @@ class ResourceCatalogApi extends HttpClient {
 // ../../node_modules/@uipath/resource-builder-sdk/dist/clients/resource-catalog/resource-catalog-client.factory.js
 var RESOURCE_CATALOG_SCOPE = "RCS.FolderAuthorization";
 var RESOURCE_CATALOG_SERVICE_NAME = "resourcecatalog";
+function trimTrailingSlashes(url) {
+  return url.replace(/\/+$/, "");
+}
 
 class ResourceCatalogClientFactory {
   async getClientAsync(cancellationToken) {
@@ -9987,9 +10259,8 @@ class ResourceCatalogClientFactory {
     ], true, cancellationToken);
     const ipRangeBypassSecret = await this.ipRangeBypassSecretProvider?.getIpRangeBypassSecretAsync(cancellationToken);
     const gatewayIntegrationEnabled = this.resourceBuilderAccessProvider.isGatewayIntegrationEnabled();
-    const normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl : baseUrl + "/";
     const client = new ResourceCatalogApi({
-      baseUrl: normalizedBaseUrl,
+      baseUrl: trimTrailingSlashes(baseUrl),
       securityWorker: (securityData) => {
         if (!securityData)
           return {};
@@ -10032,7 +10303,7 @@ class ResourceCatalogClientFactory {
     if (!accountKey)
       throw new Error("Unable to obtain account key");
     const client = new ResourceCatalogApi({
-      baseUrl,
+      baseUrl: trimTrailingSlashes(baseUrl),
       securityWorker: (securityData) => {
         if (!securityData)
           return {};
@@ -12251,7 +12522,16 @@ class AutomationSolutionsClientProxy2 {
 // ../../node_modules/@uipath/resource-builder-sdk/dist/clients/orchestrator/orchestrator-client.js
 class OrchestratorClient {
   async getPublishLocationsAsync(cancellationToken) {
-    const url = `${this.options.baseUrl}api/v2/AutomationSolutions/publish_locations`;
+    return this.getPublishLocationsFromAsync(this.publishLocationsUrl(), cancellationToken);
+  }
+  async getAccessiblePublishLocationsAsync(permissionType, cancellationToken) {
+    const url = `${this.publishLocationsUrl()}?permissionType=${encodeURIComponent(permissionType)}`;
+    return this.getPublishLocationsFromAsync(url, cancellationToken);
+  }
+  publishLocationsUrl() {
+    return `${this.options.baseUrl}api/v2/AutomationSolutions/publish_locations`;
+  }
+  async getPublishLocationsFromAsync(url, cancellationToken) {
     const headers = OrchestratorClientFactory.buildHeaders(this.options.securityData);
     const response = await fetch(url, {
       method: "GET",
@@ -12941,7 +13221,7 @@ class ReconcileProjectsCommandHandler {
     } : {
       resourceKey: undefined
     };
-    await this.cacheProvider.setAsync(`prk:${projectKey}`, result, cancellationToken);
+    await this.cacheProvider.setAsync(`prk:${context.path}:${projectKey}`, result, cancellationToken);
   }
   groupByProjectKey(artefactResources) {
     const map = new Map;
@@ -13815,6 +14095,11 @@ class ResourceBuilder {
     const request = new SolutionPublishLocationRequestV2;
     return this._mediator.sendAsync(request, cancellationToken);
   }
+  async getAccessiblePublishLocationsAsync(permissionType, cancellationToken) {
+    this.throwIfCancelled(cancellationToken);
+    const request = new SolutionPublishLocationRequestV2(permissionType);
+    return this._mediator.sendAsync(request, cancellationToken);
+  }
   async getSettingsAsync(cancellationToken) {
     this.throwIfCancelled(cancellationToken);
     const request = new SettingsRequest;
@@ -14374,9 +14659,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, solutionContextOptions) {
+function createContainer(accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, embeddedFileReader, solutionContextOptions, featureFlagProvider) {
   const childContainer = import_tsyringe6.container.createChildContainer();
-  registerProviders(childContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, solutionContextOptions);
+  registerProviders(childContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, solutionContextOptions, featureFlagProvider);
   registerServices(childContainer, embeddedFileReader);
   registerHandlers(childContainer);
   childContainer.register(ServiceTokens.Mediator, {
@@ -14400,11 +14685,15 @@ function registerProvider(diContainer, token, provider) {
       break;
   }
 }
-function registerProviders(diContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, solutionContextOptions) {
+function registerProviders(diContainer, accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, httpReaderOptions, loggerFactory, solutionContextOptions, featureFlagProvider) {
   registerProvider(diContainer, ServiceTokens.AccessProvider, accessProvider);
   registerProvider(diContainer, ServiceTokens.CacheProvider, cacheProvider);
   registerProvider(diContainer, ServiceTokens.SecretsProvider, secretsProvider);
   registerProvider(diContainer, ServiceTokens.IpRangeBypassSecretProvider, ipRangeBypassSecretProvider);
+  registerProvider(diContainer, ServiceTokens.FeatureFlagProvider, featureFlagProvider ?? {
+    instance: new NullFeatureFlagProvider,
+    lifetime: service_tokens_ServiceLifetime.Singleton
+  });
   registerProvider(diContainer, ServiceTokens.FileStorageProviderFactory, fileStorageProviderFactory);
   registerProvider(diContainer, ServiceTokens.SolutionDefinitionProvider, solutionDefinitionProvider);
   registerProvider(diContainer, ServiceTokens.SolutionDefinitionFactory, solutionDefinitionFactory);
@@ -15131,6 +15420,11 @@ class ResourceBuilderConfiguration {
     this._ipRangeBypassSecretProviderLifetime = lifetime;
     return this;
   }
+  addFeatureFlagProvider(provider, lifetime = service_tokens_ServiceLifetime.Scoped) {
+    this._featureFlagProviderProvider = provider;
+    this._featureFlagProviderLifetime = lifetime;
+    return this;
+  }
   addSolutionDefinitionProvider(provider, lifetime = service_tokens_ServiceLifetime.Scoped) {
     this._solutionDefinitionProviderProvider = provider;
     this._solutionDefinitionProviderLifetime = lifetime;
@@ -15184,6 +15478,11 @@ class ResourceBuilderConfiguration {
       instance: ipRangeBypassSecretProviderInstance,
       lifetime: this._ipRangeBypassSecretProviderLifetime
     };
+    const featureFlagProviderInstance = this._featureFlagProviderProvider ? await resolveProvider(this._featureFlagProviderProvider) : new NullFeatureFlagProvider;
+    const featureFlagProvider = {
+      instance: featureFlagProviderInstance,
+      lifetime: this._featureFlagProviderLifetime
+    };
     const secretsProviderInstance = this._secretsProviderProvider ? await resolveProvider(this._secretsProviderProvider) : new NullSecretsProvider;
     const secretsProvider = {
       instance: secretsProviderInstance,
@@ -15227,7 +15526,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, this._solutionContextOptions);
+    const container3 = createContainer(accessProvider, cacheProvider, secretsProvider, fileStorageProviderFactory, ipRangeBypassSecretProvider, solutionDefinitionProvider, solutionDefinitionFactory, artifactResourceSpecEnhancer, this._httpReaderOptions, loggerFactory, embeddedFileReader, this._solutionContextOptions, featureFlagProvider);
     return new ResourceBuilderServices(container3);
   }
   async buildServices() {
@@ -15239,6 +15538,7 @@ class ResourceBuilderConfiguration {
     this._secretsProviderLifetime = service_tokens_ServiceLifetime.Scoped;
     this._fileStorageProviderFactoryLifetime = service_tokens_ServiceLifetime.Singleton;
     this._ipRangeBypassSecretProviderLifetime = service_tokens_ServiceLifetime.Scoped;
+    this._featureFlagProviderLifetime = service_tokens_ServiceLifetime.Scoped;
     this._solutionDefinitionProviderLifetime = service_tokens_ServiceLifetime.Scoped;
     this._solutionDefinitionFactoryLifetime = service_tokens_ServiceLifetime.Scoped;
     this._artifactResourceSpecEnhancerLifetime = service_tokens_ServiceLifetime.Scoped;
@@ -15248,13 +15548,161 @@ class ResourceBuilderConfiguration {
 function createResourceBuilderConfiguration() {
   return new ResourceBuilderConfiguration;
 }
+// ../solution-sdk/src/resources/services/solution-manifest.ts
+async function assertSolutionManifest(dir) {
+  const fs = getFileSystem();
+  const entries = await fs.readdir(dir);
+  const hasManifest = entries.some((f) => f.endsWith(".uipx"));
+  if (!hasManifest) {
+    throw new Error(`${dir} is not a UiPath solution (no .uipx manifest found). Run 'uip solution init' first, or pass --solution-folder pointing at an existing solution.`);
+  }
+}
+async function readSolutionManifest(fs, solutionDir) {
+  const [readdirError, entries] = await catchError(fs.readdir(solutionDir));
+  if (readdirError || !entries)
+    return;
+  const uipx = entries.find((name) => name.endsWith(".uipx"));
+  if (!uipx)
+    return;
+  const uipxPath = fs.path.join(solutionDir, uipx);
+  const [readError, raw] = await catchError(fs.readFile(uipxPath, "utf-8"));
+  if (readError || !raw)
+    return;
+  const [parseError, parsed] = catchError(() => JSON.parse(raw));
+  if (parseError)
+    return;
+  return normalizeManifest(parsed);
+}
+function normalizeManifest(parsed) {
+  if (!parsed || typeof parsed !== "object")
+    return {};
+  const raw = parsed.Projects;
+  if (!Array.isArray(raw))
+    return {};
+  const projects = raw.filter((p) => typeof p === "object" && p !== null);
+  return { Projects: projects };
+}
+async function resolveProjectDirFromManifest(fs, solutionDir, projectKey) {
+  const manifest = await readSolutionManifest(fs, solutionDir);
+  if (!manifest)
+    return;
+  const entry = manifest.Projects?.find((p) => p.Id === projectKey);
+  const relativePath = entry?.ProjectRelativePath;
+  if (typeof relativePath !== "string" || !relativePath)
+    return;
+  return fs.path.join(solutionDir, fs.path.dirname(toPortableRelativePath(relativePath)));
+}
+
+// ../solution-sdk/src/resources/services/entry-point-spec-enhancer.ts
+var ENTRY_POINTS_FILE = "entry-points.json";
+
+class EntryPointSpecEnhancer {
+  fs;
+  constructor(fs) {
+    this.fs = fs ?? getFileSystem();
+  }
+  async enhanceSpecAsync(context, resource, _propertiesMetadata, spec, _cancellationToken) {
+    if (!resource.projectKey) {
+      return;
+    }
+    const [enhanceError] = await catchError(this.applyEntryPointAsync(context, resource.projectKey, spec));
+    if (enhanceError) {
+      logger.warn(`EntryPointSpecEnhancer: failed to enhance spec for resource ${resource.key}: ${enhanceError.message}`);
+    }
+  }
+  async applyEntryPointAsync(context, projectKey, spec) {
+    const computed = await computeEntryPointSpec(this.fs, context.path, projectKey);
+    if (!computed)
+      return;
+    for (const [key, value] of Object.entries(computed)) {
+      spec.set(key, value);
+    }
+  }
+}
+async function computeEntryPointSpec(fs, solutionDir, projectKey) {
+  const projectDir = await resolveProjectDirFromManifest(fs, solutionDir, projectKey);
+  if (!projectDir)
+    return;
+  const entryPointsPath = fs.path.join(projectDir, ENTRY_POINTS_FILE);
+  if (!await fs.exists(entryPointsPath))
+    return;
+  const entryRaw = await fs.readFile(entryPointsPath, "utf-8");
+  if (!entryRaw)
+    return;
+  const parsed = JSON.parse(entryRaw);
+  const entries = Array.isArray(parsed.entryPoints) ? parsed.entryPoints : [];
+  const only = entries.length === 1 ? entries[0] : undefined;
+  return {
+    entryPoints: entryRaw,
+    entryPointName: only ? only.filePath ?? null : null,
+    entryPointUniqueId: only ? only.uniqueId ?? null : null
+  };
+}
+async function applyEntryPointEnhancementAsync(context, resource, spec) {
+  const specMap = new Map(Object.entries(spec));
+  const enhancer = new EntryPointSpecEnhancer;
+  await enhancer.enhanceSpecAsync(context, resource, new Map, specMap);
+  return Object.fromEntries(specMap.entries());
+}
+
 // ../solution-sdk/src/resources/providers/artefact-pair-binding-provider.ts
 var ARTEFACT_KIND_APP = "app";
 var ARTEFACT_KIND_APP_VERSION = "appversion";
 var ARTEFACT_KIND_PACKAGE = "package";
 var SPEC_KEY_PACKAGE = "package";
+var RESOURCE_FILES_FOLDER_NAME = "resources";
+var RESOURCE_FILE_PATTERN = "*.json";
+var FIX_SHARED_KEY = "Delete all but one file for each key, then retry.";
+var FIX_KEYLESS = 'Give each file without a key its own unique "key", then retry.';
+
+class DuplicateKeysError extends Error {
+  keys;
+  constructor(keys) {
+    super(`Duplicate resource keys: ${keys.map(describeKey).join(", ")}`);
+    this.keys = keys;
+  }
+}
 
 class ArtefactPairBindingProvider extends MultiFileSolutionDefinitionProvider {
+  async readAsync(context, cancellationToken) {
+    const [readError, solution] = await catchError(super.readAsync(context, cancellationToken));
+    if (!readError)
+      return solution;
+    if (!(readError instanceof DuplicateKeysError))
+      throw readError;
+    const [describeError, message] = await catchError(this.describeDuplicateKeys(context, readError.keys, cancellationToken));
+    throw describeError ? readError : new Error(message);
+  }
+  async replaceDuplicateKeysAsync(solution) {
+    const keys = findDuplicateKeys(solution);
+    if (keys.length > 0)
+      throw new DuplicateKeysError(keys);
+  }
+  async describeDuplicateKeys(context, keys, cancellationToken) {
+    const storage = await this.getFileStorageProviderAsync(context, cancellationToken);
+    const files = await storage.getFilesAsync(RESOURCE_FILES_FOLDER_NAME, RESOURCE_FILE_PATTERN, cancellationToken);
+    const pathsByKey = new Map(keys.map((key) => [key, []]));
+    for (const file of [...files].sort()) {
+      const [readError, key] = await catchError(this.readResourceKey(storage, file, cancellationToken));
+      if (readError)
+        continue;
+      pathsByKey.get(key)?.push(toPortableRelativePath(file));
+    }
+    const lines = [...pathsByKey].map(([key, paths]) => `Resource key ${describeKey(key)} is used by: ${paths.join(", ")}`);
+    const fixes = [
+      keys.some((key) => !isKeyless(key)) && FIX_SHARED_KEY,
+      keys.some(isKeyless) && FIX_KEYLESS
+    ].filter(Boolean);
+    return [...lines, ...fixes].join(`
+`);
+  }
+  async readResourceKey(storage, file, cancellationToken) {
+    const content = await storage.readFileToEndAsync(file, cancellationToken);
+    const wrapper = this.caseInsensitiveSerializer.deserialize(content);
+    if (!wrapper?.resource)
+      throw new Error(`No resource in ${file}`);
+    return wrapper.resource.key;
+  }
   async writeAsync(context, solution, cancellationToken) {
     patchAppPackageLinkage(solution);
     return super.writeAsync(context, solution, cancellationToken);
@@ -15266,6 +15714,22 @@ class ArtefactPairBindingSolutionDefinitionFactory extends MultiFileSolutionDefi
     return new ArtefactPairBindingProvider(this.fileStorageProviderFactory, this.jsonSerializerFactory, this.loggerFactory);
   }
 }
+function findDuplicateKeys(solution) {
+  const counts = new Map;
+  for (const resource of solution.resources ?? []) {
+    const key = resource.key;
+    counts.set(key, (counts.get(key) ?? 0) + 1);
+  }
+  return [...counts].filter(([, count]) => count > 1).map(([key]) => key);
+}
+function isKeyless(key) {
+  return typeof key !== "string" || !key;
+}
+function describeKey(key) {
+  if (typeof key === "string" && key)
+    return key;
+  return key === undefined ? "(missing)" : JSON.stringify(key);
+}
 function patchAppPackageLinkage(solution) {
   const resources = solution.resources ?? [];
   const projectKeys = new Set;
@@ -15737,30 +16201,107 @@ async function createProjectInSolutionBuilder(solutionDir, projectId, projectNam
   await catchError(solutionBuilder.disposeAsync());
   return createError;
 }
-
-// ../solution-sdk/src/resources/services/project-artifacts-service.ts
-async function addProjectArtifactsToSolutionAsync(options) {
-  const error = await createProjectInSolutionBuilder(options.solutionDir, options.projectId, options.projectName, normalizeProjectType(options.projectType), options.projectSubType);
-  return error ? artifactFailure(options, error) : { Created: true };
+// ../solution-sdk/src/resources/services/catalog-lookup-failure.ts
+var NO_CLIENT_MESSAGE = "Unable to create Resource Catalog client";
+function classifyCatalogFailure(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  if (message.includes(NO_CLIENT_MESSAGE)) {
+    return { message, kind: "no_session" };
+  }
+  const match = /\bHTTP (\d{3})\b/.exec(message);
+  const status = match ? Number(match[1]) : undefined;
+  if (status === 401 || status === 403) {
+    return { message, kind: "refused", status };
+  }
+  return { message, kind: "failed", ...status ? { status } : {} };
 }
-function artifactFailure(options, error) {
-  logger.warn(`Solution artifact-resource generation failed for project "${options.projectName}": ${error.message}. ` + "The project was created and registered, but 'uip solution pack' may omit its resource. " + "Re-run init with --force to retry, or run 'uip solution projects add' to finish setup.");
-  return { Created: false, Error: error.message };
+function stopsCatalogLookups(failure) {
+  return failure.kind !== "failed";
 }
-
-// ../solution-sdk/src/resources/services/project-template-types.ts
-var reader;
-function hasBareTemplateRow(projectType) {
-  reader ??= new EmbeddedProjectConfigurationReader;
-  return reader.getTemplateResourcesByType(projectType, undefined, false).length > 0;
+function describeBindings(bindings) {
+  return bindings.map((b) => `${b.kind} "${b.name}"`).join(", ");
 }
-function hasAnyTemplateRow(projectType) {
-  reader ??= new EmbeddedProjectConfigurationReader;
-  const wanted = projectType.toLowerCase();
-  return Object.keys(reader.getAll()).some((row) => {
-    const key = row.toLowerCase();
-    return key === wanted || key.startsWith(`${wanted}_`);
-  });
+function describeCause(failure) {
+  switch (failure.kind) {
+    case "no_session":
+      return "There is no login, so the Resource Catalog could not be searched";
+    case "refused":
+      return `The Resource Catalog refused this login (${failure.message})`;
+    default:
+      return `A Resource Catalog call failed (${failure.message})`;
+  }
+}
+function classify(failure) {
+  const refreshAndCommit = "or run 'uip solution resources refresh' under a login the Resource Catalog accepts and commit the solution's resources. The resources already in the solution are used as they are.";
+  if (failure.kind === "no_session") {
+    return {
+      errorCode: "authentication_required",
+      retry: "RetryWillNotFix",
+      instructions: `Run 'uip login', then re-run; ${refreshAndCommit}`
+    };
+  }
+  if (failure.kind === "refused") {
+    return {
+      errorCode: "permission_denied",
+      retry: "RetryWillNotFix",
+      instructions: `Use a login the Resource Catalog accepts (a user login: 'uip login'), ${refreshAndCommit}`
+    };
+  }
+  const status = failure.status;
+  if (status === 429) {
+    return {
+      errorCode: "rate_limited",
+      retry: "RetryLater",
+      instructions: `Wait, then re-run; ${refreshAndCommit}`
+    };
+  }
+  if (status !== undefined && status >= 500) {
+    return {
+      errorCode: "server_error",
+      retry: "RetryLater",
+      instructions: `Retry once the Resource Catalog is back; ${refreshAndCommit}`
+    };
+  }
+  if (status !== undefined && status >= 400) {
+    return {
+      errorCode: "unknown_error",
+      retry: "RetryWillNotFix",
+      instructions: `The Resource Catalog rejected the lookup for these bindings, so a retry gets the same answer. Check them in the project's bindings, ${refreshAndCommit}`
+    };
+  }
+  return {
+    errorCode: "unknown_error",
+    retry: "RetryLater",
+    instructions: `Retry; if it keeps failing, ${refreshAndCommit}`
+  };
+}
+function catalogLookupWarning(failure, kept, unresolved) {
+  const parts = [
+    `${describeCause(failure)}, so ${kept + unresolved.length} binding(s) were not checked against the cloud.`
+  ];
+  if (kept > 0) {
+    parts.push(`${kept} already in the solution were kept as they are.`);
+  }
+  if (unresolved.length > 0) {
+    parts.push(`Not added to the solution: ${describeBindings(unresolved)}.`);
+  }
+  return parts.join(" ");
+}
+
+class CatalogLookupError extends Error {
+  errorCode;
+  retry;
+  instructions;
+  unresolved;
+  constructor(failure, unresolved) {
+    super(`${describeCause(failure)}, so these bindings could not be resolved and are not in the solution: ${describeBindings(unresolved)}.`);
+    this.name = "CatalogLookupError";
+    const { errorCode, retry, instructions } = classify(failure);
+    this.errorCode = errorCode;
+    this.retry = retry;
+    this.instructions = instructions;
+    this.unresolved = unresolved;
+  }
 }
 // ../solution-sdk/src/resources/services/local-resource-matcher.ts
 function normalizeFolderPath(path) {
@@ -15821,71 +16362,182 @@ function findMemberCloneResources(resources, memberProjectKeys) {
 function hasPackageDependency(resource) {
   return (resource.dependencies ?? []).some((dependency) => (dependency.kind ?? "").toLowerCase() === "package");
 }
-
-// ../solution-sdk/src/resources/services/resource-casing.ts
-var RESOURCE_FILES_FOLDER_NAME = "resources";
-function lowerFirstChar(value) {
-  return value ? value.charAt(0).toLowerCase() + value.slice(1) : value;
+// ../solution-sdk/src/resources/services/project-artifacts-service.ts
+async function addProjectArtifactsToSolutionAsync(options) {
+  const error = await createProjectInSolutionBuilder(options.solutionDir, options.projectId, options.projectName, normalizeProjectType(options.projectType), options.projectSubType);
+  return error ? artifactFailure(options, error) : { Created: true };
 }
-function normalizeResourceCasing(solution) {
-  let normalized = 0;
-  for (const resource of solution?.resources ?? []) {
-    const kind = lowerFirstChar(resource.kind);
-    const type = resource.type ? lowerFirstChar(resource.type) : resource.type;
-    if (kind === resource.kind && type === resource.type)
-      continue;
-    resource.kind = kind;
-    resource.type = type;
-    normalized++;
-  }
-  return normalized;
+function artifactFailure(options, error) {
+  logger.warn(`Solution artifact-resource generation failed for project "${options.projectName}": ${error.message}. ` + "The project was created and registered, but 'uip solution pack' may omit its resource. " + "Re-run init with --force to retry, or run 'uip solution projects add' to finish setup.");
+  return { Created: false, Error: error.message };
 }
-async function saveCasingNormalized(builder) {
-  const [loadError, solution] = await catchError(builder.context.loadAsync());
-  if (loadError) {
-    logger.warn(`Skipping resource casing normalization; failed to load solution: ${loadError.message}`);
-  } else {
-    normalizeResourceCasing(solution);
-  }
-  const [disposeError] = await catchError(builder.disposeAsync());
-  return disposeError ?? null;
+// ../solution-sdk/src/resources/services/project-template-types.ts
+var reader;
+function hasBareTemplateRow(projectType) {
+  reader ??= new EmbeddedProjectConfigurationReader;
+  return reader.getTemplateResourcesByType(projectType, undefined, false).length > 0;
 }
-async function normalizeResourceFileCasing(solutionDir) {
-  const fs = getFileSystem();
-  const root = fs.path.join(solutionDir, RESOURCE_FILES_FOLDER_NAME);
-  if (!await fs.exists(root))
-    return [];
-  const byTarget = new Map;
-  for (const [path, target] of await collectResourceFiles(root, [])) {
-    byTarget.set(target, [...byTarget.get(target) ?? [], path]);
-  }
-  const changed = [];
-  for (const [target, paths] of byTarget) {
-    const keep = paths.includes(target) ? target : paths[0];
-    for (const path of paths) {
-      if (path === keep)
-        continue;
-      const [removeError] = await catchError(fs.rm(path));
-      if (removeError) {
-        logger.warn(`Could not remove case-variant resource file ${path}: ${removeError.message}`);
-        continue;
-      }
-      changed.push(path);
-      logger.info(`Removed case-variant resource file ${path}; ${keep} holds the same resource`);
-    }
-    if (keep === target)
-      continue;
-    if (keep.toLowerCase() === target.toLowerCase() && await fs.exists(target)) {
-      continue;
-    }
-    const [makeDirError] = await catchError(fs.mkdir(fs.path.dirname(target)));
-    if (makeDirError) {
-      logger.warn(`Could not create directory for resource file ${target}: ${makeDirError.message}`);
-      continue;
-    }
-    const [renameError] = await catchError(fs.rename(keep, target));
-    if (renameError) {
-      logger.warn(`Could not move resource file ${keep} to ${target}: ${renameError.message}`);
+function hasAnyTemplateRow(projectType) {
+  reader ??= new EmbeddedProjectConfigurationReader;
+  const wanted = projectType.toLowerCase();
+  return Object.keys(reader.getAll()).some((row) => {
+    const key = row.toLowerCase();
+    return key === wanted || key.startsWith(`${wanted}_`);
+  });
+}
+// ../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;
+}
+async function findCatalogEntitiesAsync(catalog, query, match) {
+  const found = [];
+  let pageCursor;
+  do {
+    const page = await catalog.searchFolderEntities({
+      ...query,
+      pageSize: 100,
+      pageCursor
+    });
+    found.push(...(page.items ?? []).filter(match));
+    pageCursor = page.nextPage ?? undefined;
+  } while (pageCursor);
+  return found;
+}
+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];
+}
+function readSpecEntryPoints(spec) {
+  const entryPoints = parseJsonString(readSpecProperty(spec, "entryPoints"));
+  if (!Array.isArray(entryPoints) || !entryPoints.every((entry) => entry !== null && typeof entry === "object")) {
+    return;
+  }
+  return entryPoints.map((entry) => ({
+    UniqueId: String(readSpecProperty(entry, "uniqueId") ?? ""),
+    Path: String(readSpecProperty(entry, "path") ?? ""),
+    DisplayName: String(readSpecProperty(entry, "displayName") ?? ""),
+    InputArguments: readSpecProperty(entry, "inputArguments"),
+    OutputArguments: readSpecProperty(entry, "outputArguments")
+  }));
+}
+function parseJsonString(raw) {
+  if (typeof raw !== "string") {
+    return raw;
+  }
+  const [error, parsed] = catchError(() => JSON.parse(raw));
+  return error ? undefined : parsed;
+}
+// ../solution-sdk/src/resources/services/resource-casing.ts
+var RESOURCE_FILES_FOLDER_NAME2 = "resources";
+function lowerFirstChar(value) {
+  return value ? value.charAt(0).toLowerCase() + value.slice(1) : value;
+}
+function normalizeResourceCasing(solution) {
+  let normalized = 0;
+  for (const resource of solution?.resources ?? []) {
+    const kind = lowerFirstChar(resource.kind);
+    const type = resource.type ? lowerFirstChar(resource.type) : resource.type;
+    if (kind === resource.kind && type === resource.type)
+      continue;
+    resource.kind = kind;
+    resource.type = type;
+    normalized++;
+  }
+  return normalized;
+}
+async function saveCasingNormalized(builder) {
+  const [loadError, solution] = await catchError(builder.context.loadAsync());
+  if (loadError) {
+    logger.warn(`Skipping resource casing normalization; failed to load solution: ${loadError.message}`);
+  } else {
+    normalizeResourceCasing(solution);
+  }
+  const [disposeError] = await catchError(builder.disposeAsync());
+  return disposeError ?? null;
+}
+async function normalizeResourceFileCasing(solutionDir) {
+  const fs = getFileSystem();
+  const root = fs.path.join(solutionDir, RESOURCE_FILES_FOLDER_NAME2);
+  if (!await fs.exists(root))
+    return [];
+  const byTarget = new Map;
+  for (const [path, target] of await collectResourceFiles(root, [])) {
+    byTarget.set(target, [...byTarget.get(target) ?? [], path]);
+  }
+  const changed = [];
+  for (const [target, paths] of byTarget) {
+    const keep = paths.includes(target) ? target : paths[0];
+    for (const path of paths) {
+      if (path === keep)
+        continue;
+      const [removeError] = await catchError(fs.rm(path));
+      if (removeError) {
+        logger.warn(`Could not remove case-variant resource file ${path}: ${removeError.message}`);
+        continue;
+      }
+      changed.push(path);
+      logger.info(`Removed case-variant resource file ${path}; ${keep} holds the same resource`);
+    }
+    if (keep === target)
+      continue;
+    if (keep.toLowerCase() === target.toLowerCase() && await fs.exists(target)) {
+      continue;
+    }
+    const [makeDirError] = await catchError(fs.mkdir(fs.path.dirname(target)));
+    if (makeDirError) {
+      logger.warn(`Could not create directory for resource file ${target}: ${makeDirError.message}`);
+      continue;
+    }
+    const [renameError] = await catchError(fs.rename(keep, target));
+    if (renameError) {
+      logger.warn(`Could not move resource file ${keep} to ${target}: ${renameError.message}`);
       continue;
     }
     changed.push(target);
@@ -15900,13 +16552,17 @@ function targetSegments(segments, kind, type) {
   const kindIndex = type ? target.length - 3 : target.length - 2;
   if (kindIndex < 0)
     return target;
-  if (target[kindIndex] === kind)
+  if (sameIgnoringCase(target[kindIndex], kind)) {
     target[kindIndex] = lowerFirstChar(kind);
-  if (type && target[kindIndex + 1] === type) {
+  }
+  if (type && sameIgnoringCase(target[kindIndex + 1], type)) {
     target[kindIndex + 1] = lowerFirstChar(type);
   }
   return target;
 }
+function sameIgnoringCase(a, b) {
+  return a.toLowerCase() === b.toLowerCase();
+}
 async function collectResourceFiles(root, segments) {
   const fs = getFileSystem();
   const [readError, names] = await catchError(fs.readdir(fs.path.join(root, ...segments)));
@@ -15979,13 +16635,168 @@ function parseResourceHeader(content) {
     return null;
   }
 }
-
+// ../solution-sdk/src/resources/services/resource-configurations.ts
+var ROOT_RESOURCE_TYPES = new Set(["resource", "solutionresource"]);
+var KEY_NOT_FOUND = /^(?:Solution)?Resource with key '([^']+)' was not found$/i;
+function isResourceKeyNotFound(error, resourceKey) {
+  if (!(error instanceof Error))
+    return false;
+  const typed = error;
+  const sameKey = (key) => key !== undefined && key.toLowerCase() === resourceKey.toLowerCase();
+  if (typeof typed.resourceType === "string" && typeof typed.resourceKey === "string") {
+    return ROOT_RESOURCE_TYPES.has(typed.resourceType.toLowerCase()) && sameKey(typed.resourceKey);
+  }
+  return sameKey(KEY_NOT_FOUND.exec(error.message.trim())?.[1]);
+}
+async function refreshArtefactSpecsAsync(builder, configurations) {
+  const resources = new Map;
+  const [loadError, solution] = await catchError(builder.context.loadAsync());
+  if (loadError || !solution)
+    return resources;
+  for (const configuration of configurations) {
+    const resource = solution.resources.find((r) => r.key === configuration?.key);
+    if (!resource)
+      continue;
+    resources.set(resource.key, resource);
+    if (!resource.projectKey)
+      continue;
+    configuration.spec = await applyEntryPointEnhancementAsync(builder.context, resource, configuration.spec ?? {});
+  }
+  return resources;
+}
+async function exportResourceConfigurationsAsync(services, resourceKey, hint = {}) {
+  const { catalog, importer } = getRemoteResourceClients(services);
+  const byKey = (item) => item.entityKey === resourceKey;
+  const entity = (hint.name ? await findCatalogEntityAsync(catalog, { name: hint.name }, byKey) : undefined) ?? await findCatalogEntityAsync(catalog, {}, byKey);
+  if (!entity) {
+    throw new Error(`Resource '${resourceKey}' was not found in the solution or in the resource catalog`);
+  }
+  const payload = await importer.exportResourceAsync(toResourceReference(entity));
+  const definitions = payload.resourceDefinitions ?? [];
+  if (definitions.length === 0) {
+    throw new Error(`FPS export for '${resourceKey}' returned no resource definitions`);
+  }
+  return {
+    resources: definitions.map((d) => ({
+      key: d.key ?? "",
+      spec: d.spec ?? {},
+      locks: d.locks ?? [],
+      apiVersion: d.apiVersion,
+      isOverridable: d.isOverridable,
+      name: d.name ?? "",
+      kind: d.kind ?? "",
+      dependencies: (d.dependencies ?? []).map((dep) => ({
+        kind: dep.kind ?? "",
+        name: dep.name ?? ""
+      }))
+    }))
+  };
+}
+async function readLocalAsync(builder, resourceKey, read) {
+  if (!builder)
+    return;
+  const [error, value] = await catchError(read(builder));
+  if (!error)
+    return { builder, value };
+  if (isResourceKeyNotFound(error, resourceKey))
+    return;
+  throw error;
+}
+async function readResourceConfigurationsAsync(services, builder, resourceKey, hint = {}) {
+  const local = await readLocalAsync(builder, resourceKey, (b) => b.getAllConfigurationsAsync(resourceKey));
+  if (!local) {
+    return exportResourceConfigurationsAsync(services, resourceKey, hint);
+  }
+  await refreshArtefactSpecsAsync(local.builder, local.value?.resources ?? []);
+  return local.value;
+}
+async function readResourceConfigurationAsync(services, builder, resourceKey) {
+  const local = await readLocalAsync(builder, resourceKey, (b) => b.getConfigurationAsync(resourceKey));
+  if (local) {
+    const configuration = local.value;
+    const resources2 = await refreshArtefactSpecsAsync(local.builder, [
+      configuration
+    ]);
+    return { configuration, resource: resources2.get(configuration.key) };
+  }
+  const { resources } = await exportResourceConfigurationsAsync(services, resourceKey);
+  const primary = resources.find((r) => r.key === resourceKey) ?? resources[0];
+  const { key, spec, locks, apiVersion, isOverridable } = primary;
+  return { configuration: { key, spec, locks, apiVersion, isOverridable } };
+}
+// ../solution-sdk/src/resources/services/resource-lookup.ts
+async function findResourcesByNameAsync(services, builder, { kind, name, subTypes, folderKey }) {
+  const same = (a, b) => (a ?? "").toLowerCase() === b.toLowerCase();
+  const ofSubType = (type) => subTypes === undefined || subTypes.some((t) => same(type, t));
+  if (builder) {
+    const solution = await builder.context.loadAsync();
+    const local = solution.resources.filter((r) => same(r.kind, kind) && same(r.name, name) && ofSubType(r.type)).map((r) => ({
+      key: r.key,
+      local: true,
+      folderPath: r.folders?.[0]?.fullyQualifiedName
+    }));
+    if (local.length > 0)
+      return local;
+  }
+  const { catalog } = getRemoteResourceClients(services);
+  const rows = await findCatalogEntitiesAsync(catalog, { name, entityTypes: [kind] }, (row) => same(row.entityType, kind) && same(row.entityName, name) && ofSubType(row.entitySubType) && (folderKey === undefined || same(row.folderKey, folderKey)));
+  return rows.map((row) => ({
+    key: row.entityKey ?? "",
+    local: false,
+    folderPath: row.fullyQualifiedName ?? undefined,
+    folderKey: row.folderKey ?? undefined
+  }));
+}
+// ../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 };
+}
+function assertValidResourceName(name, options = {}) {
+  const result = validateResourceName(name, options);
+  if (!result.ok) {
+    throw new Error(`${result.message}. ${result.instructions}`);
+  }
+}
 // ../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"]);
+
+class OverwriteRefreshError extends Error {
+}
 function placeholderForType(type) {
   switch ((type ?? "string").toLowerCase()) {
     case "boolean":
@@ -16086,13 +16897,15 @@ function resolveBindingResourceIdentity(binding) {
       };
   }
 }
-async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTypes) {
+async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTypes, projectBindings) {
   const result = {
     created: 0,
     imported: 0,
     skipped: 0,
     pruned: 0,
-    warnings: []
+    projectResourcesCreated: 0,
+    warnings: [],
+    unresolved: []
   };
   const uipxProjects = await readUipxProjects(solutionDir);
   const paths = projectPaths ?? uipxProjects.map((p) => p.path);
@@ -16106,7 +16919,7 @@ async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTy
     return result;
   }
   const serializer = services.container.resolve(Tokens.IBindingsMetadataSerializer);
-  const { bindings: allBindings, parseErrors } = await collectBindings(solutionDir, paths, bindingsJsonFallbackDirs, serializer);
+  const { bindings: allBindings, parseErrors } = await collectBindings(bindingsJsonFallbackDirs, serializer, bindingSources(solutionDir, paths, uipxProjects, projectBindings));
   if (parseErrors.length > 0) {
     const detail = parseErrors.map((e) => `${e.path}: ${e.reason}`).join("; ");
     throw new Error(`Invalid bindings file — ${detail}`);
@@ -16120,7 +16933,8 @@ async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTy
     logger.warn(`Failed to get solution builder: ${builderError.message}`);
     return result;
   }
-  await reconcileSolutionProjects(builder, solutionDir, projectSubTypes);
+  const reconcileOutcome = await reconcileSolutionProjects(builder, solutionDir, projectSubTypes);
+  result.projectResourcesCreated = reconcileOutcome.resourcesAdded;
   const memberProjectKeys = new Set(uipxProjects.map((project) => project.id.toLowerCase()));
   await pruneMemberClones(builder, memberProjectKeys, result);
   if (allBindings.length === 0) {
@@ -16135,6 +16949,28 @@ async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTy
   const resolveKindMetadata = await buildKindResolver(metadataReader);
   const solution = await builder.context.loadAsync();
   const knownResourceKeys = new Set((solution.resources ?? []).map((r) => r.key?.toLowerCase()).filter((k) => !!k));
+  let keptUnchecked = 0;
+  const resolvedKeys = new Set;
+  const overwrittenKeys = new Set;
+  const bindingKey = (kind, name) => `${kind}:${name ?? ""}`.toLowerCase();
+  const recordUnchecked = async (error, kind, name, directCloudKey) => {
+    if (error) {
+      const failure = classifyCatalogFailure(error);
+      if (!result.catalogLookupFailure || stopsCatalogLookups(failure) && !stopsCatalogLookups(result.catalogLookupFailure)) {
+        result.catalogLookupFailure = failure;
+      }
+    }
+    const covered = await isUncheckedBindingCovered(builder, knownResourceKeys, kind, name, directCloudKey);
+    if (covered) {
+      keptUnchecked++;
+      result.skipped++;
+      return;
+    }
+    result.unresolved.push({
+      kind,
+      name: directCloudKey ?? name
+    });
+  };
   const virtualCandidates = [];
   for (const binding of allBindings) {
     const identity = resolveBindingResourceIdentity(binding);
@@ -16164,7 +17000,12 @@ async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTy
       logger.info(`Skipping ${kind} "${name}" — the solution provisions this project itself; its member declaration covers the binding`);
       continue;
     }
-    const rcsMatch = directCloudKey ? await findResourceByKeyInRcs(builder, kind, directCloudKey, folderPath) : await findResourceInRcs(builder, kind, name, folderPath);
+    const lookupsStopped = !!result.catalogLookupFailure && stopsCatalogLookups(result.catalogLookupFailure);
+    const [lookupError, rcsMatch] = lookupsStopped ? [undefined, undefined] : await catchError(directCloudKey ? findResourceByKeyInRcs(builder, kind, directCloudKey, folderPath, true) : findResourceInRcs(builder, kind, name, folderPath, true));
+    if (lookupsStopped || lookupError) {
+      await recordUnchecked(lookupError, kind, name, directCloudKey);
+      continue;
+    }
     const resolvedType = identity.type ?? rcsMatch?.type ?? metadata?.type;
     if (!rcsMatch) {
       if (isConnection) {
@@ -16183,30 +17024,48 @@ async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTy
     }
     if (!isConnection && rcsMatch.key && knownResourceKeys.has(rcsMatch.key.toLowerCase())) {
       result.skipped++;
+      resolvedKeys.add(bindingKey(kind, name));
       continue;
     }
     const callType = isConnection ? binding.metadata?.connector : resolvedType;
-    const [importError] = await catchError(builder.addOrUpdateResourceToSolutionAsync({
+    const wasKnown = !!rcsMatch.key && knownResourceKeys.has(rcsMatch.key.toLowerCase());
+    const reference = {
       kind,
       type: callType,
       key: rcsMatch.key,
       name: rcsMatch.name,
       folder: rcsMatch.folder
-    }, true));
+    };
+    const [importError] = await catchError(wasKnown ? refreshKnownResource(services, builder, reference, overwrittenKeys) : builder.addOrUpdateResourceToSolutionAsync(reference, true));
     if (!importError) {
+      resolvedKeys.add(bindingKey(kind, directCloudKey ?? name));
+      if (wasKnown) {
+        result.skipped++;
+        logger.info(`Refreshed ${kind} "${rcsMatch.name}" (key: ${rcsMatch.key}), already in solution`);
+        continue;
+      }
       if (rcsMatch.key) {
         knownResourceKeys.add(rcsMatch.key.toLowerCase());
+        overwrittenKeys.add(rcsMatch.key.toLowerCase());
       }
       result.imported++;
       logger.info(`Imported ${kind} "${rcsMatch.name}" (key: ${rcsMatch.key}) into solution`);
       continue;
     }
+    if (stopsCatalogLookups(classifyCatalogFailure(importError))) {
+      await recordUnchecked(importError, kind, name, directCloudKey);
+      continue;
+    }
     if (isConnection) {
-      result.warnings.push(`Failed to import connection ${directCloudKey}: ${importError.message}`);
-      logger.warn(`Failed to import connection ${directCloudKey}: ${importError.message}`);
+      const failedStep = importError instanceof OverwriteRefreshError ? "refresh the debug overwrite for" : "import";
+      const warning = `Failed to ${failedStep} connection ${directCloudKey}: ${importError.message}`;
+      result.warnings.push(warning);
+      logger.warn(warning);
       continue;
     }
-    logger.warn(`Failed to import ${kind} "${name}" from Orchestrator: ${importError.message}. Will create locally instead.`);
+    const importWarning = `Failed to import ${kind} "${name}" from Orchestrator: ${importError.message}. Created it locally instead; link it before deploy if it must point at the cloud resource.`;
+    result.warnings.push(importWarning);
+    logger.warn(importWarning);
     virtualCandidates.push({
       binding,
       kind,
@@ -16225,11 +17084,29 @@ async function syncResourcesFromBindings(solutionDir, projectPaths, projectSubTy
     return true;
   });
   for (const candidate of dedupedVirtuals) {
-    const [syncError] = await catchError(createVirtualForBinding(builder, candidate.binding, candidate.kind, candidate.type, candidate.metadata, candidate.name, candidate.folderPath, result));
+    const [syncError, created] = await catchError(createVirtualForBinding(builder, candidate.binding, candidate.kind, candidate.type, candidate.metadata, candidate.name, candidate.folderPath, result));
     if (syncError) {
       logger.warn(`Failed to create virtual ${candidate.kind}/${candidate.name}: ${syncError.message}`);
+    } else if (created) {
+      resolvedKeys.add(bindingKey(candidate.kind, candidate.name));
     }
   }
+  if (result.catalogLookupFailure) {
+    const seen = new Set;
+    result.unresolved = result.unresolved.filter((b) => {
+      const key = bindingKey(b.kind, b.name);
+      if (resolvedKeys.has(key)) {
+        keptUnchecked++;
+        result.skipped++;
+        return false;
+      }
+      if (seen.has(key))
+        return false;
+      seen.add(key);
+      return true;
+    });
+    result.warnings.push(catalogLookupWarning(result.catalogLookupFailure, keptUnchecked, result.unresolved));
+  }
   const saveError = await saveAndDisposeBuilder(builder, solutionDir);
   if (saveError) {
     throw new Error(`Failed to save solution changes: ${saveError.message}`);
@@ -16257,6 +17134,43 @@ async function pruneMemberClones(builder, memberProjectKeys, result) {
     logger.info(`Removed duplicate ${clone.kind} "${clone.name}" (key: ${clone.key}) — the solution provisions this project itself`);
   }
 }
+async function isUncheckedBindingCovered(builder, knownResourceKeys, kind, name, directCloudKey) {
+  if (directCloudKey) {
+    return knownResourceKeys.has(directCloudKey.toLowerCase());
+  }
+  const solution = await builder.context.loadAsync();
+  return !!findMatchingLocalResource(solution.resources ?? [], kind, name, undefined);
+}
+async function refreshKnownResource(services, builder, reference, overwrittenKeys) {
+  const solution = await builder.context.loadAsync();
+  const referenceKey = reference.key.toLowerCase();
+  const existing = (solution.resources ?? []).find((resource) => resource.key?.toLowerCase() === referenceKey);
+  const mediator = services.container.resolve(Tokens.IMediator);
+  const response = await mediator.sendCommandAsync(new AddOrUpdateResourceToSolutionCommand(builder.context, reference, true, existing?.key));
+  const sdkWroteOverwrite = response.saved && existing?.key === reference.key;
+  if (!existing || sdkWroteOverwrite || overwrittenKeys.has(referenceKey)) {
+    overwrittenKeys.add(referenceKey);
+    return response;
+  }
+  const [overwriteError] = await catchError(refreshOverwrite(services, builder, reference, existing.key));
+  if (overwriteError)
+    throw new OverwriteRefreshError(overwriteError.message);
+  overwrittenKeys.add(referenceKey);
+  return response;
+}
+async function refreshOverwrite(services, builder, reference, solutionResourceKey) {
+  const importer = services.container.resolve(Tokens.IImportResourceHelper);
+  const payload = await importer.exportResourceAsync(reference);
+  const referenceKey = reference.key.toLowerCase();
+  const overwrite = [...payload.overwrites].find(([key]) => key.toLowerCase() === referenceKey)?.[1];
+  if (!overwrite) {
+    throw new Error(`Overwrite not found for resource key '${reference.key}' in exported payload`);
+  }
+  const overwrites = services.container.resolve(Tokens.IResourceOverwritesService);
+  await overwrites.manageSolutionOverwritesAsync(builder.context, [
+    { solutionResourceKey, overwrite }
+  ]);
+}
 async function saveAndDisposeBuilder(builder, solutionDir) {
   const context = builder.context;
   if (!context?.forceSaveChangesAsync) {
@@ -16326,11 +17240,11 @@ async function createVirtualForBinding(builder, _binding, kind, type, metadata,
   if (alreadyVirtualized) {
     result.skipped++;
     logger.info(`Skipping virtual ${kind} "${name}" — existing resource "${alreadyVirtualized.name}" in solution_folder already covers this binding (requested folder "${folderPath}")`);
-    return;
+    return true;
   }
   const minted = await mintVirtualResource(builder, kind, type, name, metadata);
   if (!minted)
-    return;
+    return false;
   result.created++;
   logger.info(`Created ${kind} "${name}" in solution`);
   if (!virtualizable) {
@@ -16338,6 +17252,7 @@ async function createVirtualForBinding(builder, _binding, kind, type, metadata,
     result.warnings.push(warning);
     logger.warn(warning);
   }
+  return true;
 }
 async function findResourceByKeyInRcs(builder, kind, expectedKey, folderPath, propagateErrors = false) {
   const expectedLower = expectedKey.toLowerCase();
@@ -16415,8 +17330,8 @@ async function searchRcsResourcesStrict(builder, kind, name) {
   } while (pageCursor);
   return allMatches;
 }
-async function findResourceInRcs(builder, kind, name, folderPath) {
-  const allMatches = await searchRcsResources(builder, kind, name);
+async function findResourceInRcs(builder, kind, name, folderPath, propagateErrors = false) {
+  const allMatches = propagateErrors ? await searchRcsResourcesStrict(builder, kind, name) : await searchRcsResources(builder, kind, name);
   if (allMatches.length === 0) {
     return;
   }
@@ -16514,9 +17429,15 @@ async function readUiprojName(uiprojPath) {
     return;
   }
 }
+async function snapshotResourceIdentities(builder) {
+  const [loadError, solution] = await catchError(builder.context.loadAsync());
+  if (loadError || !solution)
+    return;
+  return new Set((solution.resources ?? []).map((resource) => resource.key ? resource.key.toLowerCase() : `${resource.kind}:${resource.name}`.toLowerCase()));
+}
 async function reconcileSolutionProjects(builder, solutionDir, projectSubTypes) {
   const fs = getFileSystem();
-  const outcome = { projectsCount: 0 };
+  const outcome = { projectsCount: 0, resourcesAdded: 0 };
   const uipxProjects = await readUipxProjects(solutionDir);
   const projectDetails = uipxProjects.flatMap((project) => {
     const reconcileType = mapUipxTypeToReconcileType(project.type);
@@ -16534,6 +17455,7 @@ async function reconcileSolutionProjects(builder, solutionDir, projectSubTypes)
   if (projectDetails.length === 0)
     return outcome;
   const solutionName = fs.path.basename(solutionDir);
+  const before = await snapshotResourceIdentities(builder);
   const [reconcileError] = await catchError(builder.reconcileProjectsAsync({
     solutionName,
     projects: projectDetails
@@ -16543,6 +17465,10 @@ async function reconcileSolutionProjects(builder, solutionDir, projectSubTypes)
     return outcome;
   }
   outcome.projectsCount = projectDetails.length;
+  const after = before && await snapshotResourceIdentities(builder);
+  if (before && after) {
+    outcome.resourcesAdded = [...after].filter((identity) => !before.has(identity)).length;
+  }
   logger.info(`Reconciled ${projectDetails.length} .uipx project(s) in solution ${solutionName}`);
   return outcome;
 }
@@ -16584,12 +17510,48 @@ function findBindingsSchemaError(content) {
   }
   return null;
 }
-async function collectBindings(solutionDir, projectPaths, bindingsJsonFallbackDirs, serializer) {
+function bindingSources(solutionDir, projectPaths, projects, projectBindings) {
+  const sources = [{ directory: solutionDir }];
+  const fileDirectories = new Set([solutionDir]);
+  const contributedIds = new Set;
+  for (const directory of new Set(projectPaths)) {
+    const owners = projects.filter((project) => project.path === directory);
+    for (const project of owners) {
+      const bindings = projectBindings?.get(project.id);
+      if (bindings === undefined || contributedIds.has(project.id))
+        continue;
+      contributedIds.add(project.id);
+      sources.push({
+        directory,
+        contribution: { projectId: project.id, bindings }
+      });
+    }
+    const needsFile = owners.length === 0 || owners.some((project) => !projectBindings?.has(project.id));
+    if (needsFile && !fileDirectories.has(directory)) {
+      fileDirectories.add(directory);
+      sources.push({ directory });
+    }
+  }
+  return sources;
+}
+async function collectBindings(bindingsJsonFallbackDirs, serializer, sources) {
   const fs = getFileSystem();
   const allBindings = [];
   const parseErrors = [];
-  const candidateDirs = [solutionDir, ...projectPaths];
-  for (const dir of candidateDirs) {
+  for (const { directory: dir, contribution } of sources) {
+    if (contribution) {
+      if (contribution.bindings.length === 0)
+        continue;
+      const parsed2 = deserializeBindings(JSON.stringify({
+        version: "2.0",
+        resources: contribution.bindings
+      }), `${dir} (bindings contributed by the project's tool; project ${contribution.projectId})`, serializer);
+      if ("error" in parsed2)
+        parseErrors.push(parsed2.error);
+      else
+        allBindings.push(...parsed2.resources);
+      continue;
+    }
     const v2Path = fs.path.join(dir, "bindings_v2.json");
     let bindingsPath = v2Path;
     let exists = await fs.exists(v2Path);
@@ -16608,37 +17570,44 @@ async function collectBindings(solutionDir, projectPaths, bindingsJsonFallbackDi
       });
       continue;
     }
-    const decoded = new TextDecoder().decode(content);
-    let success;
-    let metadata;
-    try {
-      const result = serializer.tryDeserialize(decoded);
-      success = result.success;
-      metadata = result.metadata;
-    } catch (err) {
-      parseErrors.push({
-        path: bindingsPath,
+    const parsed = deserializeBindings(new TextDecoder().decode(content), bindingsPath, serializer);
+    if ("error" in parsed)
+      parseErrors.push(parsed.error);
+    else
+      allBindings.push(...parsed.resources);
+  }
+  return { bindings: allBindings, parseErrors };
+}
+function deserializeBindings(decoded, source, serializer) {
+  let success;
+  let metadata;
+  try {
+    const result = serializer.tryDeserialize(decoded);
+    success = result.success;
+    metadata = result.metadata;
+  } catch (err) {
+    return {
+      error: {
+        path: source,
         reason: findBindingsSchemaError(decoded) ?? `does not match the expected v2 bindings schema — check each resource's 'kind' and required fields${err instanceof Error ? ` (${err.message})` : ""}`
-      });
-      continue;
-    }
-    if (!success) {
-      parseErrors.push({
-        path: bindingsPath,
+      }
+    };
+  }
+  if (!success) {
+    return {
+      error: {
+        path: source,
         reason: findBindingsSchemaError(decoded) ?? "does not match the expected v2 bindings schema (the serializer rejected it)"
-      });
-      continue;
-    }
-    if (!metadata?.resources?.length) {
-      continue;
-    }
-    allBindings.push(...metadata.resources);
+      }
+    };
   }
-  return { bindings: allBindings, parseErrors };
+  return { resources: metadata?.resources ?? [] };
 }
-async function syncAndLog(solutionDir, projectSubTypes) {
-  const [syncError, syncResult] = await catchError(syncResourcesFromBindings(solutionDir, undefined, projectSubTypes));
+async function syncAndLog(solutionDir, projectSubTypes, options) {
+  const [syncError, syncResult] = await catchError(syncResourcesFromBindings(solutionDir, undefined, projectSubTypes, options?.projectBindings));
   if (syncError) {
+    if (options?.failOnUnresolved)
+      throw syncError;
     logger.warn(`Resource sync failed: ${syncError.message}. Continuing.`);
     return;
   }
@@ -16648,6 +17617,9 @@ async function syncAndLog(solutionDir, projectSubTypes) {
   for (const warning of syncResult.warnings) {
     logger.warn(warning);
   }
+  if (options?.failOnUnresolved && syncResult.catalogLookupFailure && syncResult.unresolved.length > 0) {
+    throw new CatalogLookupError(syncResult.catalogLookupFailure, syncResult.unresolved);
+  }
 }
 
 // ../solution-sdk/src/resources/services/resource-refresh-service.ts
@@ -16684,7 +17656,11 @@ async function resourceRefreshAsync(solutionPath = ".", options = {}) {
   const resolverWarnings = subTypesError ? [
     `Could not resolve project subTypes: ${subTypesError.message}. Project artefacts for types that need a variant were left as they are; fix the tool install and re-run 'uip solution resources refresh'.`
   ] : [];
-  const [syncError, result] = await catchError(syncResourcesFromBindings(resolvedPath, undefined, projectSubTypes ?? new Map));
+  const [bindingsError, projectBindings] = await catchError(options.resolveProjectBindingsAsync?.() ?? Promise.resolve(new Map));
+  if (bindingsError) {
+    resolverWarnings.push(`Could not read the bindings projects contribute: ${bindingsError.message}. Those projects were synced from any bindings_v2.json on disk instead; fix the tool install and re-run 'uip solution resources refresh'.`);
+  }
+  const [syncError, result] = await catchError(syncResourcesFromBindings(resolvedPath, undefined, projectSubTypes ?? new Map, projectBindings ?? new Map));
   if (syncError) {
     return {
       ok: false,
@@ -16698,99 +17674,10 @@ async function resourceRefreshAsync(solutionPath = ".", options = {}) {
     imported: result.imported,
     skipped: result.skipped,
     pruned: result.pruned,
+    projectResourcesCreated: result.projectResourcesCreated,
     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 = {}) {
@@ -16968,6 +17855,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, getRemoteResourceClients, findCatalogEntityAsync, toResourceReference, exportResourceDefinitionAsync, readSpecProperty, saveCasingNormalized, normalizeResourceFileCasing, validateResourceName, formatResourceSubtypes, sameResourceSubtype, syncResourcesFromBindings, findResourceByKeyInRcs, searchRcsResources, findResourceInRcs, createResourceKindMetadataResolver, resolveResourceKindMetadata, createLocalResource, readUipxProjects, syncAndLog, resourceRefreshAsync, resourceRemoteSyncAsync };
+export { Tokens, models_BindingsResourceType, getResourceName, getFolderPathProperty, getResourceKindForBinding, assertSolutionManifest, readSolutionManifest, resolveProjectDirFromManifest, EntryPointSpecEnhancer, computeEntryPointSpec, applyEntryPointEnhancementAsync, createResourceBuilderServices, findProjectFile, ProjectManifestError, isProjectManifestError, isMissingProjectTypeError, readProjectFile, readSolutionFile, resolveSolutionFilePath, writeSolutionFile, restoreSolutionFile, createProjectInSolutionBuilder, CatalogLookupError, normalizeFolderPath, findMatchingLocalResource, findMatchingMemberResource, findMemberCloneResources, addProjectArtifactsToSolutionAsync, hasBareTemplateRow, hasAnyTemplateRow, getRemoteResourceClients, findCatalogEntityAsync, findCatalogEntitiesAsync, toResourceReference, toCatalogReference, exportResourceDefinitionAsync, readSpecProperty, readSpecEntryPoints, normalizeResourceCasing, saveCasingNormalized, normalizeResourceFileCasing, isResourceKeyNotFound, refreshArtefactSpecsAsync, exportResourceConfigurationsAsync, readResourceConfigurationsAsync, readResourceConfigurationAsync, findResourcesByNameAsync, MAX_RESOURCE_NAME_LENGTH, validateResourceName, assertValidResourceName, formatResourceSubtypes, sameResourceSubtype, syncResourcesFromBindings, uniqueNameForResource, findResourceByKeyInRcs, searchRcsResources, searchRcsResourcesStrict, findResourceInRcs, createResourceKindMetadataResolver, resolveResourceKindMetadata, createLocalResource, readUipxProjects, syncAndLog, resourceRefreshAsync, resourceRemoteSyncAsync };
 
-//# debugId=503E17628305A6E964756E2164756E21
+//# debugId=D96A40C680DB2DF664756E2164756E21