Merge origin/main and resolve Agents.md conflict intent

Author: Copilot

.cursor/rules/scenescape.mdc

@@ -0,0 +1,32 @@
+---
+description: SceneScape Cursor agent router — canonical instructions and workflow
+alwaysApply: true
+---
+
+<!--
+SPDX-FileCopyrightText: (C) 2026 Intel Corporation
+SPDX-License-Identifier: Apache-2.0
+-->
+
+# SceneScape (Cursor)
+
+## Canonical instructions (read first)
+
+For project-wide conventions, read [`.github/copilot-instructions.md`](../../.github/copilot-instructions.md): licensing, security defaults, architecture, Makefile targets, documentation policy, and how skills are organized.
+
+**Do not duplicate** policy from that file or from skills. Use short pointers only in Cursor rules.
+
+## Skills
+
+When the task touches a language, build system, tests, security, or documentation, discover and read the relevant `SKILL.md` under [`.github/skills/`](../../.github/skills/) (browse the directory or follow routing in `copilot-instructions.md`). Do not assume a fixed list of skill files.
+
+## Service guides
+
+Before substantive changes in a component tree, find and read `Agents.md` in that service’s directory (search upward from edited paths or the component root). Not every folder has one; use it when present.
+
+## Cursor workflow
+
+- Prefer root `Makefile` test targets unless a narrower pytest run is explicitly required (details live in skills).
+- Run commands in the real environment; investigate failures before giving up.
+- Commits and pull requests only when the user asks (see user/global Cursor rules).
+- Keep changes minimal and match existing conventions in the touched area.

.github/CODEOWNERS

@@ -2,17 +2,19 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Default Code Owners
-@saratpoluri
-@ltalarcz
-@tdorauintc
-@MikolajKasprzak
-@dmytroye
-@GrzegorzWrobel
-@Irakus
-@daddo-intel
-@sarthakdeva-intel
-@sbelhaik
+*                         @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+
+
+# Tests content
+
+autocalibration/tests/    @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+cluster_analytics/tests/  @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+controller/tests/         @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+manager/test/             @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+mapping/tests/            @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+tracker/test/             @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
+tests/                    @sbelhaik @dpitulax @FilipAdamus97 @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel
 
 # documentation content
-/docs/               @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @GrzegorzWrobel @Irakus @daddo-intel @sarthakdeva-intel @sbelhaik @open-edge-platform/open-edge-platform-docs-write
-/README.md           @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @GrzegorzWrobel @Irakus @daddo-intel @sarthakdeva-intel @sbelhaik @open-edge-platform/open-edge-platform-docs-write
+/docs/                    @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel @sbelhaik @open-edge-platform/open-edge-platform-docs-write
+/README.md                @saratpoluri @ltalarcz @tdorauintc @MikolajKasprzak @dmytroye @Irakus @daddo-intel @sbelhaik @open-edge-platform/open-edge-platform-docs-write

.github/actions/setup-cache/action.yaml

@@ -8,22 +8,24 @@ outputs:
   cache_registry:
     description: "The cache registry path"
     value: ${{ steps.cache.outputs.CACHE_REGISTRY }}
-  cache_tag:
-    description: "The cache tag"
-    value: ${{ steps.cache.outputs.CACHE_TAG }}
-  github_actions_cache:
-    description: "Whether GitHub Actions cache is enabled"
-    value: ${{ steps.cache.outputs.GITHUB_ACTIONS_CACHE }}
+  ghcr_cache:
+    description: "Whether GHCR cache is enabled"
+    value: ${{ steps.cache.outputs.GHCR_CACHE }}
 runs:
   using: "composite"
   steps:
+    - name: Setup Docker with containerd storage backend
+      shell: bash
+      continue-on-error: true
+      run: |
+        sudo rm -f /etc/docker/daemon.json
+        echo '{"features":{"containerd-snapshotter":true}}' | sudo tee /etc/docker/daemon.json
+        sudo systemctl restart docker
     - name: Setup Cache Targets
       id: cache
       shell: bash
       env:
         TAG_BASE: ${{ github.head_ref || github.ref_name }}
       run: |
-        CACHE_TAG=$(echo "$TAG_BASE" | tr '/' '_' | tr '-' '_')
         echo "CACHE_REGISTRY=${{ github.repository }}" >> "$GITHUB_OUTPUT"
-        echo "CACHE_TAG=${CACHE_TAG}" >> "$GITHUB_OUTPUT"
-        echo "GITHUB_ACTIONS_CACHE=true" >> "$GITHUB_OUTPUT"
+        echo "GHCR_CACHE=true" >> "$GITHUB_OUTPUT"

.github/actions/setup-env/action.yaml

@@ -0,0 +1,74 @@
+---
+# SPDX-FileCopyrightText: (C) 2026 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+name: "Setup Test Environment"
+description: "Install Pytest and dependencies for testing, setup Docker and Python"
+inputs:
+  dockerhub-token:
+    description: "DockerHub token"
+    required: true
+  ghcr-token:
+    description: "GHCR token"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Python
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      with:
+        python-version: "3.12"
+        check-latest: true
+
+    - name: "Log in to DockerHub"
+      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+      continue-on-error: true
+      with:
+        username: scenescape
+        password: ${{ inputs.dockerhub-token }}
+
+    - name: "Log in to GHCR"
+      uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+      continue-on-error: true
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ inputs.ghcr-token }}
+
+    - name: "Setup Cache Targets"
+      id: setup-cache
+      uses: ./.github/actions/setup-cache
+
+    - name: "Build common base"
+      shell: bash
+      env:
+        CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+        GHCR_CACHE: ${{ steps.setup-cache.outputs.ghcr_cache }}
+      run: |
+        make build-common
+
+    - name: "Build images"
+      shell: bash
+      env:
+        CACHE_REGISTRY: ${{ steps.setup-cache.outputs.cache_registry }}
+        GHCR_CACHE: ${{ steps.setup-cache.outputs.ghcr_cache }}
+      run: |
+        make build-all
+
+    - name: "Setup Test Environment"
+      shell: bash
+      run: |
+        make setup-tests
+
+    - name: "Install github annotate plugin"
+      shell: bash
+      run: |
+        source tests/.venv/bin/activate
+        pip install -r .github/resources/requirements-pytest.txt
+
+    - name: "Set correct Firefox version for tests"
+      shell: bash
+      run: |
+        sudo apt remove -y firefox
+        sudo snap remove --purge firefox
+        sudo apt install -y firefox

.github/actions/setup-tests/action.yaml

@@ -22,12 +22,12 @@ Intel® SceneScape is a microservice-based spatial awareness framework for multi
 
 Consult these based on the code you're working with:
 
-- **Python** (`.github/skills/python.md`): Coding standards, imports, patterns
+- **Python** (`.github/skills/python/SKILL.md`): Coding standards, imports, patterns
   - **CRITICAL**: 2 spaces for indentation (checked by `make indent-check`)
-- **JavaScript** (`.github/skills/javascript.md`): Frontend conventions
-- **Shell** (`.github/skills/shell.md`): Bash scripting guidelines
-- **Makefile** (`.github/skills/makefile.md`): Build system conventions
-- **Testing** (`.github/skills/testing.md`): Test creation frameworks
+- **JavaScript** (`.github/skills/javascript/SKILL.md`): Frontend conventions
+- **Shell** (`.github/skills/shell/SKILL.md`): Bash scripting guidelines
+- **Makefile** (`.github/skills/makefile/SKILL.md`): Build system conventions
+- **Testing** (`.github/skills/testing/SKILL.md`): Test creation frameworks
 - **Agents.md Evaluation** (`.github/skills/agent_evaluation/SKILL.md`): Scoring rubric and efficacy testing for service agent guides
 
 ### Skills Caching Strategy
@@ -37,15 +37,15 @@ Skills are loaded on-demand based on task context to optimize token usage:
 **Pre-Cached (Always Available)**:
 
 - `.github/copilot-instructions.md` (this file, always loaded)
-- `.github/skills/python.md` (high frequency, pre-cached)
-- `.github/skills/documentation-how.md` (high frequency, pre-cached)
+- `.github/skills/python/SKILL.md` (high frequency, pre-cached)
+- `.github/skills/documentation-how/SKILL.md` (high frequency, pre-cached)
 
 **Loaded Automatically on Demand**:
 
-- `.github/skills/testing.md` - Loaded when task involves tests or `test` keyword detected
-- `.github/skills/javascript.md` - Loaded when `.js` files are being edited
-- `.github/skills/shell.md` - Loaded when `.sh` files are being edited
-- `.github/skills/makefile.md` - Loaded when Makefile or build system changes
+- `.github/skills/testing/SKILL.md` - Loaded when task involves tests or `test` keyword detected
+- `.github/skills/javascript/SKILL.md` - Loaded when `.js` files are being edited
+- `.github/skills/shell/SKILL.md` - Loaded when `.sh` files are being edited
+- `.github/skills/makefile/SKILL.md` - Loaded when Makefile or build system changes
 - `.github/skills/agent_evaluation/SKILL.md` - Loaded when task asks to evaluate, score, audit, review, or test the efficacy of an `Agents.md`
 
 Skills are detected and loaded based on file type, task keywords, and context signals. Explicitly request a skill if the auto-detection doesn't load it.
@@ -81,7 +81,7 @@ Treat AI-generated output as **untrusted draft code** until reviewed and tested.
 Reject suggestions that bypass security controls for convenience or introduce unsafe defaults.
 
 For detailed security review guidance, follow:
-`.github/skills/security.md`.
+`.github/skills/security/SKILL.md`.
 
 ## Architecture Overview
 
@@ -131,7 +131,7 @@ make rebuild-core                  # Clean + build (useful after code changes)
 
 ## Testing Framework
 
-**For comprehensive test creation guidance, see `.github/skills/testing.md`** - detailed instructions on creating unit, functional, integration, UI, and smoke tests with both positive and negative cases.
+**For comprehensive test creation guidance, see `.github/skills/testing/SKILL.md`** - detailed instructions on creating unit, functional, integration, UI, and smoke tests with both positive and negative cases.
 
 **Running Tests** (must have containers running via docker-compose):
 
@@ -145,11 +145,11 @@ make -C tests geometry-unit                           # Specific test (e.g., geo
 ### Completion Gate For Test Tasks (Critical)
 
 For runtime test verification requirements, use
-`.github/skills/test-verification-gate.md`.
+`.github/skills/test-verification-gate/SKILL.md`.
 
 ### Containerized Test Image Freshness Gate (Critical)
 
-Use `.github/skills/test-verification-gate.md` as the single source of truth
+Use `.github/skills/test-verification-gate/SKILL.md` as the single source of truth
 for image freshness checks, rebuild-before-test requirements, and retry policy
 for containerized test targets.
 
@@ -261,7 +261,7 @@ pubsub.publish(topic, json_payload)
 
 ### HOW to Update Documentation
 
-**For detailed procedures, see `.github/skills/documentation-how.md`.**
+**For detailed procedures, see `.github/skills/documentation-how/SKILL.md`.**
 
 This skill contains:
 

.github/copilot-instructions.md

@@ -99,6 +99,7 @@ updates:
       - "/tools/pipeline_runner"
       - "/tracker/test/service"
       - "/tracker/test/load"
+      - "/tools/tracker/evaluation"
     schedule:
       interval: "monthly"
     commit-message:

.github/dependabot.yml

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # This file is licensed under Apache 2.0 License.
 
-pip == 26.0.1
-setuptools >= 78.1.1
-wheel == 0.46.3
-pybind11 == 3.0.3
+pip == 26.1
+setuptools == 82.0.1
+wheel == 0.47.0
+pybind11 == 3.0.4

.github/resources/coverity-requirements.txt

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: (C) 2026 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+# This file is licensed under Apache 2.0 License.
+
+pytest-github-actions-annotate-failures==0.4.0 \
+  --hash=sha256:285fed86e16b0b7a8eac6acdcde31913798fb739b15ef5b86895b4f5e32bf237

.github/resources/requirements-pytest.txt

@@ -2,16 +2,16 @@
 # SPDX-License-Identifier: Apache-2.0
 # This file is licensed under Apache 2.0 License.
 
-pip == 26.0.1
+pip == 26.1
 pytest == 9.0.3
 numpy == 2.2.6
-selenium == 4.41.0
+selenium == 4.43.0
 selenium-wire == 5.1.0
 blinker == 1.9.0
 pyvirtualdisplay == 3.0
 opencv-python == 4.13.0.92
-setuptools >= 78.1.1
+setuptools >= 82.0.1
 xmltodict == 1.0.4
-PyYAML >=6.0.1,<7.0
+PyYAML == 6.0.3
 pylint [spelling] == 4.0.5
 flake8 == 7.3.0