fix: Allow west commands to be imported from a project subdirectory if manifest is located in subdirectory

Author: nmunnich

src/west/manifest.py

@@ -2628,7 +2628,7 @@ def _import_path_from_project(self, project: Project, path: str) -> None:
             return
 
         for data in imported:
-            self._import_data_from_project(project, data, None)
+            self._import_data_from_project(project, data, None, path)
 
         _logger.debug(f'done resolving import {path} for {project}')
 
@@ -2642,12 +2642,13 @@ def _import_map_from_project(self, project: Project, imp: dict) -> None:
             return
 
         for data in imported:
-            self._import_data_from_project(project, data, imap)
+            self._import_data_from_project(project, data, imap, imap.file)
 
         _logger.debug(f'done resolving import {imap} for {project}')
 
     def _import_data_from_project(
-        self, project: Project, data: Any, imap: _import_map | None
+        self, project: Project, data: Any,
+        imap: _import_map | None, manifest_path: str | None = None
     ) -> None:
         # Destructively add the imported data into our 'projects' map.
 
@@ -2678,8 +2679,22 @@ def _import_data_from_project(
 
         # Patch up any extension commands in the imported data
         # by allocating them to the project.
+
+        # If the manifest was imported from a project subdirectory
+        # (manifest_path is a relative path within the project),
+        # we need to adjust the west_commands paths to be relative
+        # to the project root, not to the manifest subdirectory.
+        west_commands_to_merge = submanifest._ctx.manifest_west_commands
+        if manifest_path and manifest_path != _WEST_YML:
+            manifest_dir = os.path.dirname(manifest_path)
+            if manifest_dir:
+                west_commands_to_merge = [
+                    os.path.join(manifest_dir, cmd).replace('\\', '/')
+                    for cmd in west_commands_to_merge
+                ]
+
         project.west_commands = _west_commands_merge(
-            project.west_commands, submanifest._ctx.manifest_west_commands
+            project.west_commands, west_commands_to_merge
         )
 
     def _import_content_from_project(self, project: Project, path: str) -> ImportedContentType:

tests/test_manifest.py

@@ -2095,6 +2095,48 @@ def test_import_project_submanifest_commands_both(manifest_repo):
     assert p1.west_commands == expected
 
 
+def test_import_project_submanifest_commands_from_project_subdirectory(manifest_repo):
+    # When a manifest is imported from a project subdirectory (e.g., app/west.yml),
+    # and that manifest defines west-commands, the paths should be
+    # resolved relative to the manifest subdirectory.
+    # This tests _import_path_from_project with a string path.
+
+    with open(manifest_repo / 'west.yml', 'w') as f:
+        f.write('''\
+        manifest:
+          projects:
+          - name: p1
+            url: p1-url
+            import: app/west.yml
+        ''')
+
+    p1 = manifest_repo / '..' / 'p1'
+    create_repo(p1)
+    create_branch(p1, 'manifest-rev', checkout=True)
+    add_commit(
+        p1,
+        'add app/west.yml with west-commands',
+        files={
+            'app/west.yml': '''\
+                                manifest:
+                                  projects:
+                                  - name: p2
+                                    url: p2-url
+                                  self:
+                                    west-commands: west-commands.yml
+                                ''',
+        },
+    )
+    checkout_branch(p1, 'master')
+
+    p1_proj = MF().get_projects(['p1'])[0]
+    # The west_commands path should be 'app/west-commands.yml',
+    # not 'west-commands.yml', to be resolved correctly
+    # relative to the project root.
+    expected = ['app/west-commands.yml']
+    assert p1_proj.west_commands == expected
+
+
 def test_import_map_error_handling():
     # Make sure we handle expected errors when loading import:
     # values that are maps.