Skip to content

Fix: Detect workspace as default when it matches cwd (#311) #338

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
beyandbey wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Detect workspace as default when it matches cwd (#311) #338

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc21c62
Fix: Detect workspace as default when it matches cwd (#311)
beyandbey Nov 11, 2025
68f9a24
Fix linting
beyandbey Nov 18, 2025
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
14 changes: 9 additions & 5 deletions comfy_cli/workspace_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,18 +230,22 @@ def get_workspace_path(self) -> tuple[str, WorkspaceType]:
WorkspaceType.CURRENT_DIR,
)

# Check for user-set default workspace
default_workspace = self.config_manager.get(constants.CONFIG_KEY_DEFAULT_WORKSPACE)
valid_default_workspace = default_workspace and check_comfy_repo(default_workspace)[0]

# Check the current directory for a ComfyUI
if self.use_here is None:
current_directory = os.getcwd()
found_comfy_repo, comfy_repo = check_comfy_repo(os.path.join(current_directory))
# If it's in a sub dir of the ComfyUI repo, get the repo working dir
if found_comfy_repo:
return comfy_repo.working_dir, WorkspaceType.CURRENT_DIR

# Check for user-set default workspace
default_workspace = self.config_manager.get(constants.CONFIG_KEY_DEFAULT_WORKSPACE)
w_type = WorkspaceType.CURRENT_DIR
if valid_default_workspace and default_workspace == current_directory:
w_type = WorkspaceType.DEFAULT
return comfy_repo.working_dir, w_type

if default_workspace and check_comfy_repo(default_workspace)[0]:
if valid_default_workspace:
return default_workspace, WorkspaceType.DEFAULT

# Fallback to the most recent workspace if it exists
Expand Down