Revert "fix: correct ruby/setup-ruby version comment to match SHA"

This reverts commit 92a77d7.

Author: Wenxin-Jiang

.github/workflows/ci.yml

@@ -151,7 +151,7 @@ jobs:
 
       - name: Setup Ruby
         if: matrix.suite == 'e2e_gem'
-        uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0
+        uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1
         with:
           ruby-version: '3.2'
           bundler-cache: false

crates/socket-patch-core/src/package_json/find.rs

@@ -93,6 +93,19 @@ pub async fn detect_workspaces(package_json_path: &Path) -> WorkspaceConfig {
         Err(_) => return default,
     };
 
+    // Check for pnpm workspaces first — pnpm projects may also have
+    // "workspaces" in package.json for compatibility, but
+    // pnpm-workspace.yaml is the definitive signal.
+    let dir = package_json_path.parent().unwrap_or(Path::new("."));
+    let pnpm_workspace = dir.join("pnpm-workspace.yaml");
+    if let Ok(yaml_content) = fs::read_to_string(&pnpm_workspace).await {
+        let patterns = parse_pnpm_workspace_patterns(&yaml_content);
+        return WorkspaceConfig {
+            ws_type: WorkspaceType::Pnpm,
+            patterns,
+        };
+    }
+
     // Check for npm/yarn workspaces
     if let Some(workspaces) = pkg.get("workspaces") {
         let patterns = if let Some(arr) = workspaces.as_array() {
@@ -118,17 +131,6 @@ pub async fn detect_workspaces(package_json_path: &Path) -> WorkspaceConfig {
         };
     }
 
-    // Check for pnpm workspaces
-    let dir = package_json_path.parent().unwrap_or(Path::new("."));
-    let pnpm_workspace = dir.join("pnpm-workspace.yaml");
-    if let Ok(yaml_content) = fs::read_to_string(&pnpm_workspace).await {
-        let patterns = parse_pnpm_workspace_patterns(&yaml_content);
-        return WorkspaceConfig {
-            ws_type: WorkspaceType::Pnpm,
-            patterns,
-        };
-    }
-
     default
 }
 
@@ -450,6 +452,28 @@ mod tests {
         assert_eq!(config.patterns, vec!["packages/*"]);
     }
 
+    #[tokio::test]
+    async fn test_detect_workspaces_pnpm_with_workspaces_field() {
+        // When both pnpm-workspace.yaml AND "workspaces" in package.json
+        // exist, pnpm should take priority (e.g. depscan repo)
+        let dir = tempfile::tempdir().unwrap();
+        let pkg = dir.path().join("package.json");
+        fs::write(
+            &pkg,
+            r#"{"name": "root", "workspaces": ["packages/*"]}"#,
+        )
+        .await
+        .unwrap();
+        let pnpm = dir.path().join("pnpm-workspace.yaml");
+        fs::write(&pnpm, "packages:\n  - workspaces/*")
+            .await
+            .unwrap();
+        let config = detect_workspaces(&pkg).await;
+        assert!(matches!(config.ws_type, WorkspaceType::Pnpm));
+        // Should use pnpm-workspace.yaml patterns, not package.json workspaces
+        assert_eq!(config.patterns, vec!["workspaces/*"]);
+    }
+
     #[tokio::test]
     async fn test_detect_workspaces_none() {
         let dir = tempfile::tempdir().unwrap();