@uipath/project-packager 1.197.0 → 1.198.0-preview.100

package/dist/index.js

@@ -6,7 +6,7 @@ var de_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -89,7 +89,7 @@ var en = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -171,7 +171,7 @@ var es_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -253,7 +253,7 @@ var es_MX_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -335,7 +335,7 @@ var fr_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -417,7 +417,7 @@ var ja_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -499,7 +499,7 @@ var ko_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -581,7 +581,7 @@ var pt_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -663,7 +663,7 @@ var pt_BR_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -745,7 +745,7 @@ var ro_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -827,7 +827,7 @@ var ru_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -909,7 +909,7 @@ var tr_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -991,7 +991,7 @@ var zh_CN_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -1073,7 +1073,7 @@ var zh_TW_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -1155,7 +1155,7 @@ var zu_default = {
     projectLoader: {
       errors: {
         pathRequired: "Project directory path is required",
-        noProjectFile: "No {projectFile} or {manifestFile} found in directory: {path}",
+        noProjectFile: "No {projectFile}, {projectJsonFile}, or {manifestFile} found in directory: {path}",
         readFailed: "Failed to read project file: {path}",
         invalidProject: "Invalid project file: {path}. Missing ProjectType field."
       }
@@ -22494,6 +22494,7 @@ var loggerSingleton = singleton(SimpleLogger);
 var logger = SimpleLogger.getInstance();
 var formatSlot = singleton("OutputFormat");
 var formatExplicitSlot = singleton("OutputFormatExplicit");
+var helpRequestedSlot = singleton("HelpRequested");
 var filterSlot = singleton("OutputFilter");
 var PollOutcome = {
   Completed: "completed",
@@ -22537,34 +22538,7 @@ var telemetryPropsSlot = singleton("TelemetryDefaultProps");
 function getGlobalTelemetryProperties() {
   return telemetryPropsSlot.get();
 }
-var USER_AGENT_HEADER = "User-Agent";
 var sdkUserAgentHostToken = singleton("SdkUserAgentHostToken");
-function splitUserAgentTokens(value) {
-  return value?.trim().split(/\s+/).filter(Boolean) ?? [];
-}
-function appendUserAgentToken(value, userAgent) {
-  const tokens = splitUserAgentTokens(value);
-  const seen = new Set(tokens);
-  for (const token of splitUserAgentTokens(userAgent)) {
-    if (!seen.has(token)) {
-      tokens.push(token);
-      seen.add(token);
-    }
-  }
-  return tokens.join(" ");
-}
-function getEffectiveUserAgent(userAgent) {
-  return appendUserAgentToken(sdkUserAgentHostToken.get(), userAgent);
-}
-function getHeaderName(headers, headerName) {
-  return Object.keys(headers).find((key) => key.toLowerCase() === headerName.toLowerCase());
-}
-function addSdkUserAgentHeader(headers, userAgent) {
-  const result = { ...headers ?? {} };
-  const headerName = getHeaderName(result, USER_AGENT_HEADER);
-  result[headerName ?? USER_AGENT_HEADER] = appendUserAgentToken(headerName ? result[headerName] : undefined, getEffectiveUserAgent(userAgent));
-  return result;
-}
 class BrowserContextStorage {
   contextStack = [];
   run(context, fn) {
@@ -22741,10 +22715,33 @@ class ConsoleTelemetryProvider {
     console.debug(`[Telemetry] Dependency: ${name} [${type}] (${duration}ms, ${success ? "ok" : "fail"})`);
   }
 }
+var TELEMETRY_TRACEPARENT_ENV = "TRACEPARENT";
+var TRACEPARENT_PATTERN = /^00-([0-9a-f]{32})-([0-9a-f]{16})-[0-9a-f]{2}$/;
+function getProcessEnv() {
+  return globalThis.process?.env;
+}
+function parseInboundTraceparent(value) {
+  if (!value) {
+    return;
+  }
+  const match = TRACEPARENT_PATTERN.exec(value.trim().toLowerCase());
+  if (!match) {
+    return;
+  }
+  const [, traceId, parentSpanId] = match;
+  if (/^0+$/.test(traceId) || /^0+$/.test(parentSpanId)) {
+    return;
+  }
+  return { traceId, parentSpanId };
+}
+function getInboundTraceContext() {
+  return parseInboundTraceparent(getProcessEnv()?.[TELEMETRY_TRACEPARENT_ENV]);
+}
 var TELEMETRY_SESSION_ID_ENV = "UIPATH_SESSION_ID";
 var TELEMETRY_SESSION_ID_PROPERTY = "session_id";
 var telemetrySessionIdSlot = singleton("TelemetrySessionId");
-function getProcessEnv() {
+var telemetryOperationIdSlot = singleton("TelemetryOperationId");
+function getProcessEnv2() {
   return globalThis.process?.env;
 }
 function normalizeSessionId(value) {
@@ -22755,11 +22752,21 @@ function normalizeSessionId(value) {
   return trimmed || undefined;
 }
 function getConfiguredTelemetrySessionId() {
-  return normalizeSessionId(getProcessEnv()?.[TELEMETRY_SESSION_ID_ENV]);
+  return normalizeSessionId(getProcessEnv2()?.[TELEMETRY_SESSION_ID_ENV]);
 }
 function resolveTelemetrySessionId(existingSessionId) {
   return getConfiguredTelemetrySessionId() ?? normalizeSessionId(existingSessionId);
 }
+function getTelemetryOperationId() {
+  const existing = telemetryOperationIdSlot.get();
+  if (existing) {
+    return existing;
+  }
+  const inboundTraceId = getInboundTraceContext()?.traceId;
+  const generated = inboundTraceId ?? crypto.randomUUID().replaceAll("-", "");
+  telemetryOperationIdSlot.set(generated);
+  return generated;
+}
 var KNOWN_AGENTS = [
   { envVar: "CLAUDECODE", value: "1", id: "claude-code" },
   { envVar: "CURSOR_AGENT", value: "1", id: "cursor" },
@@ -22886,6 +22893,140 @@ function getExecutionContextTelemetryProperties() {
     ...detected.ciProvider ? { ci_provider: detected.ciProvider } : {}
   };
 }
+var REDACTED = "[REDACTED]";
+var MAX_VALUE_LENGTH = 200;
+var SENSITIVE_NAME_TOKENS = new Set([
+  "token",
+  "tokens",
+  "secret",
+  "secrets",
+  "password",
+  "passwords",
+  "pwd",
+  "credential",
+  "credentials",
+  "auth",
+  "authentication",
+  "authorization",
+  "authority",
+  "cert",
+  "certificate",
+  "certificates"
+]);
+var SENSITIVE_KEY_PREFIXES = new Set([
+  "api",
+  "access",
+  "client",
+  "private",
+  "public",
+  "signing",
+  "encryption",
+  "session",
+  "master",
+  "shared",
+  "root",
+  "ssh",
+  "rsa",
+  "aes",
+  "hmac",
+  "oauth"
+]);
+var UUID_PATTERN = /\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b/gi;
+var EMAIL_PATTERN = /\b[^\s@]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\b/g;
+var JWT_PATTERN = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g;
+var LONG_TOKEN_PATTERN = /\b[A-Za-z0-9_-]{40,}\b/g;
+var USER_HOME_PATTERN = /([/\\])(Users|home)([/\\])([^/\\]+)/gi;
+var URL_PATTERN = /\bhttps?:\/\/[^\s,;]+/gi;
+var URL_TRAILING_PUNCT = /[.,;:!?)\]}>'"]+$/;
+function shortHash(input) {
+  let hash = 2166136261;
+  for (let i2 = 0;i2 < input.length; i2++) {
+    hash ^= input.charCodeAt(i2);
+    hash = Math.imul(hash, 16777619);
+  }
+  return (hash >>> 0).toString(16).padStart(8, "0");
+}
+function redactUrl(raw) {
+  try {
+    const url = new URL(raw);
+    return `${url.protocol}//${url.host}`;
+  } catch {
+    return `url#${shortHash(raw)}`;
+  }
+}
+function redactValueDetectors(value) {
+  let out = value;
+  out = out.replace(JWT_PATTERN, () => REDACTED);
+  out = out.replace(URL_PATTERN, (match) => {
+    const trailing = match.match(URL_TRAILING_PUNCT)?.[0] ?? "";
+    const core = trailing ? match.slice(0, -trailing.length) : match;
+    return `${redactUrl(core)}${trailing}`;
+  });
+  out = out.replace(USER_HOME_PATTERN, (_match, sep1, folder, sep2) => `${sep1}${folder}${sep2}<user>`);
+  out = out.replace(EMAIL_PATTERN, (match) => `email#${shortHash(match)}`);
+  out = out.replace(UUID_PATTERN, (match) => `uuid#${shortHash(match)}`);
+  out = out.replace(LONG_TOKEN_PATTERN, () => REDACTED);
+  if (out.length > MAX_VALUE_LENGTH) {
+    out = `${out.slice(0, MAX_VALUE_LENGTH)}…`;
+  }
+  return out;
+}
+function redactValue(value) {
+  return redactValueDetectors(value);
+}
+function redactError(error) {
+  const safe = new Error(redactValueDetectors(error.message ?? ""));
+  safe.name = error.name;
+  safe.stack = typeof error.stack === "string" ? redactValueDetectors(error.stack) : undefined;
+  return safe;
+}
+function nameTokens(name) {
+  return name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").split(/[\s._-]+/).map((t) => t.toLowerCase()).filter(Boolean);
+}
+function isSensitiveName(name) {
+  const tokens = nameTokens(name);
+  for (let i2 = 0;i2 < tokens.length; i2++) {
+    const token = tokens[i2];
+    if (SENSITIVE_NAME_TOKENS.has(token)) {
+      return true;
+    }
+    if (token === "key" || token === "keys") {
+      const prev = tokens[i2 - 1];
+      if (prev && SENSITIVE_KEY_PREFIXES.has(prev)) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function redactProperty(name, value) {
+  if (value === undefined || value === null) {
+    return;
+  }
+  if (isSensitiveName(name)) {
+    return REDACTED;
+  }
+  if (typeof value === "boolean" || typeof value === "number") {
+    return value;
+  }
+  if (typeof value !== "string") {
+    return "[OBJECT]";
+  }
+  return redactValueDetectors(value);
+}
+function redactProperties(properties) {
+  const out = {};
+  for (const [name, value] of Object.entries(properties)) {
+    const redacted = redactProperty(name, value);
+    if (redacted !== undefined) {
+      out[name] = redacted;
+    }
+  }
+  return out;
+}
+var TELEMETRY_OPERATION_ID_PROPERTY = "uip.trace.operation_id";
+var TELEMETRY_PARENT_ID_PROPERTY = "uip.trace.parent_id";
+var TELEMETRY_SPAN_ID_PROPERTY = "uip.trace.span_id";
 
 class TelemetryService {
   telemetryProvider;
@@ -22913,11 +23054,15 @@ class TelemetryService {
   trackException(error, properties) {
     const context = this.getCurrentContext();
     const enrichedProperties = this.enrichPropertiesWithContext(properties, context);
-    this.telemetryProvider.trackException(error, enrichedProperties);
+    this.telemetryProvider.trackException(redactError(error), enrichedProperties);
   }
   async trackRequest(name, fn, properties) {
+    const parentContext = this.getCurrentContext();
+    const operationId = parentContext?.operationId ?? this.operationId ?? getTelemetryOperationId();
+    const parentId = parentContext ? parentContext.id : this.inboundParentIdFor(operationId);
     const context = {
-      operationId: this.operationId ?? this.generateId(),
+      operationId,
+      ...parentId !== undefined ? { parentId } : {},
       id: this.generateId()
     };
     const startTime = performance.now();
@@ -22935,6 +23080,45 @@ class TelemetryService {
       throw error;
     }
   }
+  trackRequestResult(name, durationMs, success, properties, context) {
+    const requestContext = context ?? {
+      operationId: this.operationId ?? getTelemetryOperationId(),
+      id: this.generateId()
+    };
+    const enrichedProperties = this.enrichPropertiesWithContext(properties, requestContext);
+    this.telemetryProvider.trackRequest(name, durationMs, success, enrichedProperties);
+  }
+  createRequestContext() {
+    const operationId = this.operationId ?? getTelemetryOperationId();
+    const parentId = this.inboundParentIdFor(operationId);
+    return {
+      operationId,
+      ...parentId !== undefined ? { parentId } : {},
+      id: this.generateId()
+    };
+  }
+  inboundParentIdFor(operationId) {
+    const inbound = getInboundTraceContext();
+    return inbound && inbound.traceId === operationId ? inbound.parentSpanId : undefined;
+  }
+  runWithContext(context, fn) {
+    return this.contextStorage.run(context, fn);
+  }
+  createDependencyContext() {
+    const parentContext = this.getCurrentContext();
+    if (!parentContext) {
+      return;
+    }
+    return {
+      operationId: parentContext.operationId,
+      parentId: parentContext.id,
+      id: this.generateId()
+    };
+  }
+  trackDependencyResult(name, type, durationMs, success, properties, context, resultCode) {
+    const enrichedProperties = this.enrichPropertiesWithContext(properties, context);
+    this.telemetryProvider.trackDependency(redactValue(name), type, durationMs, success, enrichedProperties, resultCode);
+  }
   async trackDependencyOperation(name, type, fn, properties) {
     const parentContext = this.getCurrentContext();
     if (!parentContext) {
@@ -22971,8 +23155,12 @@ class TelemetryService {
       ...getExecutionContextTelemetryProperties(),
       ...globalProperties,
       ...this.defaultProperties,
-      ...properties,
-      ...context
+      ...redactProperties(properties ?? {}),
+      ...context ? {
+        [TELEMETRY_OPERATION_ID_PROPERTY]: context.operationId,
+        ...context.parentId !== undefined ? { [TELEMETRY_PARENT_ID_PROPERTY]: context.parentId } : {},
+        [TELEMETRY_SPAN_ID_PROPERTY]: context.id
+      } : {}
     };
     if (sessionId === undefined) {
       delete enriched[TELEMETRY_SESSION_ID_PROPERTY];
@@ -22982,7 +23170,16 @@ class TelemetryService {
     return enriched;
   }
   generateId() {
-    return crypto.randomUUID().replaceAll("-", "");
+    const bytes = new Uint8Array(8);
+    let hex = "";
+    do {
+      crypto.getRandomValues(bytes);
+      hex = "";
+      for (const byte of bytes) {
+        hex += byte.toString(16).padStart(2, "0");
+      }
+    } while (/^0+$/.test(hex));
+    return hex;
   }
 }
 var factorySlot = singleton("PackagerFactoryProvider");
@@ -23000,6 +23197,7 @@ var RulesConfigFileType;
 class PackagerParameters {
   inputPath;
   downloadUrl;
+  projectId;
   logLevel = LogLevel2.Warn;
   outputPath;
   targetFramework;
@@ -23026,6 +23224,11 @@ class ProjectValidateOptions extends ProjectRestoreOptions {
 class ProjectBuildOptions extends ProjectValidateOptions {
   outputType;
 }
+// src/models/project-cleanup-options.ts
+class ProjectCleanupOptions extends PackagerParameters {
+  dryRun = false;
+  skipImports = false;
+}
 // src/models/project-pack-options.ts
 class ProjectPackOptions extends ProjectBuildOptions {
   destinationPath;
@@ -23313,13 +23516,72 @@ var ExtendedFolderDtoFeedTypeEnum = {
   FolderHierarchy: "FolderHierarchy"
 };
 
+// ../../common/dist/sdk-user-agent.js
+var PREFIX2 = "@uipath/common/";
+var _g2 = globalThis;
+function singleton2(ctorOrName) {
+  const name = typeof ctorOrName === "string" ? ctorOrName : ctorOrName.name;
+  const key = Symbol.for(PREFIX2 + name);
+  return {
+    get(fallback) {
+      return _g2[key] ?? fallback;
+    },
+    set(value) {
+      _g2[key] = value;
+    },
+    clear() {
+      delete _g2[key];
+    },
+    getOrInit(factory, guard) {
+      const existing = _g2[key];
+      if (existing != null && typeof existing === "object") {
+        if (!guard || guard(existing)) {
+          return existing;
+        }
+      }
+      const instance = factory();
+      _g2[key] = instance;
+      return instance;
+    }
+  };
+}
+var telemetryPropsSlot2 = singleton2("TelemetryDefaultProps");
+var USER_AGENT_HEADER = "User-Agent";
+var sdkUserAgentHostToken2 = singleton2("SdkUserAgentHostToken");
+function splitUserAgentTokens(value) {
+  return value?.trim().split(/\s+/).filter(Boolean) ?? [];
+}
+function appendUserAgentToken(value, userAgent) {
+  const tokens = splitUserAgentTokens(value);
+  const seen = new Set(tokens);
+  for (const token of splitUserAgentTokens(userAgent)) {
+    if (!seen.has(token)) {
+      tokens.push(token);
+      seen.add(token);
+    }
+  }
+  return tokens.join(" ");
+}
+function getEffectiveUserAgent(userAgent) {
+  return appendUserAgentToken(sdkUserAgentHostToken2.get(), userAgent);
+}
+function getHeaderName(headers, headerName) {
+  return Object.keys(headers).find((key) => key.toLowerCase() === headerName.toLowerCase());
+}
+function addSdkUserAgentHeader(headers, userAgent) {
+  const result = { ...headers ?? {} };
+  const headerName = getHeaderName(result, USER_AGENT_HEADER);
+  result[headerName ?? USER_AGENT_HEADER] = appendUserAgentToken(headerName ? result[headerName] : undefined, getEffectiveUserAgent(userAgent));
+  return result;
+}
+
 // src/publish/services/orchestrator-feeds-service.ts
 import { translate as translate3 } from "@uipath/solutionpackager-tool-core";
 // package.json
 var package_default = {
   name: "@uipath/project-packager",
   license: "MIT",
-  version: "1.197.0",
+  version: "1.198.0-preview.100",
   description: "UiPath Project Packager - core library for packing individual UiPath projects",
   type: "module",
   main: "./dist/index.js",
@@ -24008,6 +24270,7 @@ import {
 class ProjectLoader {
   fileSystem;
   static WebAppManifestFileName = "webAppManifest.json";
+  static ProjectJsonFileName = "project.json";
   constructor(fileSystem) {
     this.fileSystem = fileSystem;
   }
@@ -24020,6 +24283,10 @@ class ProjectLoader {
     if (projectFileExists) {
       return await this.loadFromProjectFile(projectPath, projectFilePath);
     }
+    const projectJsonPath = Path2.join(projectPath, ProjectLoader.ProjectJsonFileName);
+    if (await this.fileSystem.exists(projectJsonPath)) {
+      return await this.loadFromProjectFile(projectPath, projectJsonPath, true);
+    }
     const webAppManifestPath = Path2.join(projectPath, ProjectLoader.WebAppManifestFileName);
     const webAppManifestExists = await this.fileSystem.exists(webAppManifestPath);
     if (webAppManifestExists) {
@@ -24027,11 +24294,12 @@ class ProjectLoader {
     }
     throw new Error(translate8.t("solutionpackager.projectLoader.errors.noProjectFile", {
       projectFile: ProjectTool.ProjectFileName,
+      projectJsonFile: ProjectLoader.ProjectJsonFileName,
       manifestFile: ProjectLoader.WebAppManifestFileName,
       path: projectPath
     }));
   }
-  async loadFromProjectFile(projectPath, projectFilePath) {
+  async loadFromProjectFile(projectPath, projectFilePath, useProjectJson = false) {
     const fileContent = await this.fileSystem.readFile(projectFilePath);
     if (!fileContent) {
       throw new Error(translate8.t("solutionpackager.projectLoader.errors.readFailed", {
@@ -24040,7 +24308,8 @@ class ProjectLoader {
     }
     const json = typeof fileContent === "string" ? fileContent : new TextDecoder("utf-8").decode(fileContent);
     const projectData = JSON.parse(json);
-    const projectType = projectData?.ProjectType || projectData?.type;
+    const outputType = useProjectJson ? projectData.designOptions?.outputType : undefined;
+    const projectType = outputType ?? (projectData?.ProjectType || projectData?.type);
     if (!projectData || !projectType) {
       throw new Error(translate8.t("solutionpackager.projectLoader.errors.invalidProject", {
         path: projectFilePath
@@ -24083,10 +24352,12 @@ var TelemetryNames;
   TelemetryNames2["ProjectToolRestore"] = "ProjectPackager.Tool.Restore";
   TelemetryNames2["ProjectToolValidate"] = "ProjectPackager.Tool.Validate";
   TelemetryNames2["ProjectToolBuild"] = "ProjectPackager.Tool.Build";
+  TelemetryNames2["ProjectToolCleanup"] = "ProjectPackager.Tool.Cleanup";
   TelemetryNames2["ProjectPackagerPack"] = "ProjectPackager.Pack";
   TelemetryNames2["ProjectPackagerRestore"] = "ProjectPackager.Restore";
   TelemetryNames2["ProjectPackagerValidate"] = "ProjectPackager.Validate";
   TelemetryNames2["ProjectPackagerBuild"] = "ProjectPackager.Build";
+  TelemetryNames2["ProjectPackagerCleanup"] = "ProjectPackager.Cleanup";
   TelemetryNames2["ProjectPackagerProjectLoaded"] = "ProjectPackager.ProjectLoaded";
 })(TelemetryNames ||= {});
 
@@ -24176,6 +24447,12 @@ class ProjectToolExecutor {
       projectType: project.Type
     }));
   }
+  async cleanupAsync(options, project, context, cancellationToken) {
+    return await this.executeToolOperationAsync(project, context, (tool) => this.telemetry.trackDependencyOperation("ProjectPackager.Tool.Cleanup" /* ProjectToolCleanup */, project.Type, async () => tool.cleanupAsync(options, cancellationToken), {
+      projectId: project.Id,
+      projectType: project.Type
+    }));
+  }
   async executeToolOperationAsync(project, context, operation) {
     try {
       const tool = await this.toolsFactory.createProjectToolAsync(project, context);
@@ -24295,7 +24572,8 @@ class ProjectPackager {
         logLevel: options.logLevel,
         outputPath: options.outputPath
       };
-      return await this.projectExecutor.restoreAsync(restoreOptions, uiPathProject, undefined, cancellationToken);
+      const context = this.createOperationContext(options, uiPathProject);
+      return await this.projectExecutor.restoreAsync(restoreOptions, uiPathProject, context, cancellationToken);
     }, cancellationToken);
   }
   async validateProjectAsync(options, cancellationToken) {
@@ -24393,6 +24671,20 @@ class ProjectPackager {
       }
     });
   }
+  async cleanupProjectAsync(options, cancellationToken) {
+    return await this.executeProjectOperationAsync(options, "Cleanup", "ProjectPackager.Cleanup" /* ProjectPackagerCleanup */, async (uiPathProject, loadedProject) => {
+      const cleanupOptions = {
+        projectPath: loadedProject.projectPath,
+        excludeConfiguredSources: options.excludeConfiguredSources ?? false,
+        nuGetSourcesConfigPath: options.nuGetSourcesConfigPath,
+        logLevel: options.logLevel,
+        dryRun: options.dryRun ?? false,
+        skipImports: options.skipImports ?? false
+      };
+      const context = this.createOperationContext(options, uiPathProject);
+      return await this.projectExecutor.cleanupAsync(cleanupOptions, uiPathProject, context, cancellationToken);
+    }, cancellationToken);
+  }
   async getPackageStreamsAsync(result) {
     if (!result.isSuccess) {
       throw new Error(translate9.t("solutionpackager.packager.errors.failedToGetStreams", {
@@ -24447,6 +24739,7 @@ class ProjectPackager {
       id: crypto.randomUUID(),
       projects: [uiPathProject],
       downloadUrl: options.downloadUrl,
+      projectId: options.projectId,
       targetFramework: options.targetFramework ?? TargetFramework.Portable,
       connection: options.connection,
       logger: this.logger,
@@ -24506,6 +24799,7 @@ export {
   ProjectPackager,
   ProjectPackOptions,
   ProjectLoader,
+  ProjectCleanupOptions,
   ProjectBuildOptionsValidator,
   ProjectBuildOptions,
   PackagerParametersValidator,
@@ -24516,4 +24810,4 @@ export {
   BrowserContextStorage
 };
 
-//# debugId=A8536B2F0A3FFAB464756E2164756E21
+//# debugId=2B503C1E781E436B64756E2164756E21