Skip to content

Support relative paths for Python/Node.js executables #4230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jack251970 wants to merge 10 commits into
base: dev
Choose a base branch
from
+34 −6
Open

Support relative paths for Python/Node.js executables #4230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
438bb8a
Initial plan
Copilot Jan 24, 2026
d61ec18
Add relative path resolution support for Python and Node.js executables
Copilot Jan 24, 2026
864eedd
Add UI descriptions for relative path support
Copilot Jan 24, 2026
3de9e53
Address code review feedback: convert absolute to relative paths for …
Copilot Jan 24, 2026
ab5a0b4
Revert "Add UI descriptions for relative path support"
Jack251970 Jan 24, 2026
c59249d
Save Python/Node paths as absolute, not relative
Jack251970 Jan 24, 2026
9070ff4
Remove PathResolutionTest.cs and related path tests
Jack251970 Jan 24, 2026
d16e43d
Refactor path utilities to DataLocation from Constant
Jack251970 Jan 24, 2026
d49e5b4
Remove unused Flow.Launcher.Infrastructure using directive
Jack251970 Jan 24, 2026
9fa4c37
Remove relative path conversion for plugin settings files
Jack251970 Jan 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ internal AbstractPluginEnvironment(List<PluginMetadata> pluginMetadataList, Plug
PluginSettings = pluginSettings;
}

/// <summary>
/// Resolves the configured plugin settings file path to an absolute path.
/// Supports both absolute paths and relative paths (relative to ProgramDirectory).
/// </summary>
private string ResolvedPluginsSettingsFilePath => DataLocation.ResolveAbsolutePath(PluginsSettingsFilePath);

internal IEnumerable<PluginPair> Setup()
{
// If no plugin is using the language, return empty list
Expand All @@ -48,13 +54,14 @@ internal IEnumerable<PluginPair> Setup()
return new List<PluginPair>();
}

if (!string.IsNullOrEmpty(PluginsSettingsFilePath) && FilesFolders.FileExists(PluginsSettingsFilePath))
var resolvedPath = ResolvedPluginsSettingsFilePath;
if (!string.IsNullOrEmpty(resolvedPath) && FilesFolders.FileExists(resolvedPath))
{
// Ensure latest only if user is using Flow's environment setup.
if (PluginsSettingsFilePath.StartsWith(EnvPath, StringComparison.OrdinalIgnoreCase))
EnsureLatestInstalled(ExecutablePath, PluginsSettingsFilePath, EnvPath);
if (resolvedPath.StartsWith(EnvPath, StringComparison.OrdinalIgnoreCase))
EnsureLatestInstalled(ExecutablePath, resolvedPath, EnvPath);

return SetPathForPluginPairs(PluginsSettingsFilePath, Language);
return SetPathForPluginPairs(resolvedPath, Language);
}

var noRuntimeMessage = Localize.runtimePluginInstalledChooseRuntimePrompt(Language, EnvName, Environment.NewLine);
Expand Down Expand Up @@ -103,9 +110,10 @@ internal IEnumerable<PluginPair> Setup()
InstallEnvironment();
}

if (FilesFolders.FileExists(PluginsSettingsFilePath))
resolvedPath = ResolvedPluginsSettingsFilePath;
if (FilesFolders.FileExists(resolvedPath))
{
return SetPathForPluginPairs(PluginsSettingsFilePath, Language);
return SetPathForPluginPairs(resolvedPath, Language);
}
else
{
Expand Down
20 changes: 20 additions & 0 deletions Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,25 @@ public static bool PortableDataLocationInUse()
public const string PluginEnvironments = "Environments";
public const string PluginDeleteFile = "NeedDelete.txt";
public static readonly string PluginEnvironmentsPath = Path.Combine(DataDirectory(), PluginEnvironments);

/// <summary>
/// Resolves a path that may be relative to an absolute path.
/// If the path is already absolute, returns it as-is.
/// If the path is relative (starts with . or doesn't contain a drive), resolves it relative to ProgramDirectory.
Copy link

Copilot AI Jan 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The documentation comment states the method handles paths that "start with . or doesn't contain a drive", but the implementation only checks if the path is rooted using Path.IsPathRooted. This check returns false for relative paths (including those starting with ".") but may have unexpected behavior with UNC paths or paths on Unix-like systems. Consider clarifying the documentation to match the actual implementation, which relies on Path.IsPathRooted for the determination.

Suggested change
/// If the path is relative (starts with . or doesn't contain a drive), resolves it relative to ProgramDirectory.
/// If the path is not rooted (as determined by <see cref="Path.IsPathRooted(string)"/>), resolves it relative to ProgramDirectory.

Copilot uses AI. Check for mistakes.
/// </summary>
/// <param name="path">The path to resolve</param>
/// <returns>An absolute path</returns>
public static string ResolveAbsolutePath(string path)
{
if (string.IsNullOrEmpty(path))
return path;

// If already absolute, return as-is
if (Path.IsPathRooted(path))
return path;

// Resolve relative to ProgramDirectory
return Path.GetFullPath(Path.Combine(Constant.ProgramDirectory, path));
Comment on lines +62 to +63
Copy link

Copilot AI Jan 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ResolveAbsolutePath method doesn't handle exceptions that can be thrown by Path.GetFullPath, such as ArgumentException for invalid path characters, NotSupportedException for invalid path formats, or PathTooLongException. If a user configures an invalid relative path, this could crash the application during plugin initialization. Consider adding try-catch error handling to gracefully handle invalid paths, either by logging an error and returning the original path, or by providing a meaningful error message to the user.

Suggested change
// Resolve relative to ProgramDirectory
return Path.GetFullPath(Path.Combine(Constant.ProgramDirectory, path));
// Resolve relative to ProgramDirectory, handling invalid path formats gracefully
try
{
return Path.GetFullPath(Path.Combine(Constant.ProgramDirectory, path));
}
catch (Exception ex) when (ex is ArgumentException ||
ex is NotSupportedException ||
ex is PathTooLongException)
{
// If the path cannot be resolved (invalid characters, format, or too long),
// return the original path to avoid crashing the application.
return path;
}

Copilot uses AI. Check for mistakes.
}
Comment on lines +53 to +64
Copy link

Copilot AI Jan 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new ResolveAbsolutePath method lacks comprehensive test coverage. Given that this is a critical feature for portability and involves path resolution logic with edge cases (relative paths starting with ".", paths without drives, UNC paths, etc.), it should have unit tests to verify correct behavior across different scenarios. Consider adding tests in Flow.Launcher.Test to verify: 1) absolute paths are returned unchanged, 2) relative paths like ".\runtime\python.exe" resolve correctly, 3) paths without leading "." also resolve correctly, and 4) edge cases like null/empty strings are handled properly.

Copilot uses AI. Check for mistakes.
}
}
Loading