From 4ffc6a6f020a23801c3ebdda9364df882ffe96ff Mon Sep 17 00:00:00 2001
From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com>
Date: Wed, 27 May 2026 14:03:52 +0000
Subject: [PATCH] Fix skill creator remote project scopes (#57453) (cherry-pick
 to preview) (#57816)

Cherry-pick of #57453 to preview

----
Summary:

- Include remote worktrees as project-scope options in the skill
creator.
- Reuse workspace root path detection for project scope paths.

Validation:

- cargo check -p skill_creator
- cargo test -p skill_creator

Release Notes:

- Fixed project-local skill creation for remote projects.

Co-authored-by: MartinYe1234 <52641447+MartinYe1234@users.noreply.github.com>
---
 crates/skill_creator/src/skill_creator.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/crates/skill_creator/src/skill_creator.rs b/crates/skill_creator/src/skill_creator.rs
index 5c5317d96af..e95fe876ef3 100644
--- a/crates/skill_creator/src/skill_creator.rs
+++ b/crates/skill_creator/src/skill_creator.rs
@@ -91,19 +91,17 @@ fn project_scopes_from_workspace(
         return Vec::new();
     };
     let workspace = workspace.read(cx);
-    let project = workspace.project().read(cx);
-    project
+    let root_paths = workspace.root_paths(cx);
+    workspace
         .visible_worktrees(cx)
-        .filter_map(|worktree| {
+        .zip(root_paths)
+        .map(|(worktree, abs_path)| {
             let worktree = worktree.read(cx);
-            if !worktree.is_local() {
-                return None;
-            }
-            Some(ScopeChoice::Project {
+            ScopeChoice::Project {
                 worktree_id: worktree.id(),
                 root_name: SharedString::from(worktree.root_name_str().to_string()),
-                abs_path: worktree.abs_path(),
-            })
+                abs_path,
+            }
         })
         .collect()
 }