Merge branch 'main' into fix/10085-config-get-doc-example

Author: prekshivyas

.github/workflows/e2e.yaml

@@ -313,7 +313,7 @@ jobs:
           case "${JOBS}:${TARGETS}" in
             :)
               matrix='[{"id":"ubuntu-policy-custom-missing-presets-negative","runner":"ubuntu-latest"},{"id":"ubuntu-repo-cloud-langchain-deepagents-code","runner":"ubuntu-latest"},{"id":"ubuntu-repo-cloud-openclaw","runner":"ubuntu-latest"},{"id":"ubuntu-repo-docker-post-reboot-recovery","runner":"ubuntu-latest"}]'
-              test_matrix='[{"id":"onboard-managed-image-buildless-e2e","file":"test/onboard-managed-image-buildless-e2e.test.ts","project":"integration"},{"id":"vllm-docker-storage","file":"test/vllm-docker-storage.test.ts","project":"integration"}]'
+              test_matrix='[{"id":"onboard-managed-image-buildless-e2e","file":"test/onboarding/onboard-managed-image-buildless-e2e.test.ts","project":"integration"},{"id":"vllm-docker-storage","file":"test/vllm-docker-storage.test.ts","project":"integration"}]'
               ;;
             inference-routing: | managed-image-protected-runtime: | native-runtime-qualification-producer: | :jetson-nvmap-gpu)
               matrix='[]'

.github/workflows/issue-9880-staging-reproduction.yaml

@@ -17,20 +17,31 @@ jobs:
   reproduce:
     if: ${{ github.repository == 'NVIDIA/NemoClaw' && github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
-    timeout-minutes: 95
+    timeout-minutes: 210
     env:
       INSTANCE_NAME: issue-9880-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: Check out trusted reproduction lane
+        timeout-minutes: 10
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           ref: ${{ github.workflow_sha }}
           persist-credentials: false
           sparse-checkout: |
-            tools/e2e/brev-launchable-issue-9880.sh
+            test/e2e/
+            test/helpers/
+            tools/e2e/
+            package.json
+            package-lock.json
+            vitest.config.ts
+            nemoclaw/vitest.project.ts
+            tsconfig.json
+            oxlint.config.ts
+            oxfmt.config.ts
           sparse-checkout-cone-mode: false
 
       - name: Authorize maintainer dispatch
+        timeout-minutes: 5
         env:
           ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ github.token }}
@@ -43,8 +54,20 @@ jobs:
             case "$role" in maintain|admin) ;; *) echo "::error::maintain or admin permission is required"; exit 1 ;; esac
           done
 
+      - name: Set up Node
+        timeout-minutes: 10
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        with:
+          node-version: "22"
+          cache: npm
+
+      - name: Install dependencies
+        timeout-minutes: 10
+        run: npm ci --ignore-scripts --no-audit --no-fund
+
       - id: prepare
         name: Prepare Brev CLI and evidence directory
+        timeout-minutes: 20
         env:
           BREV_API_KEY: ${{ secrets.BREV_API_KEY }}
           BREV_CLI_SHA256: d4aa49db1716f10308a6587778a676a0c0076bd48a212d86a421ab9550bc8f32
@@ -65,26 +88,30 @@ jobs:
           printf 'work_dir=%s\n' "$work_dir" >>"$GITHUB_OUTPUT"
 
       - name: Reproduce issue 9880 on the staging Launchable
-        timeout-minutes: 65
+        timeout-minutes: 120
         env:
           BREV_LAUNCHABLE_ID: ${{ vars.NEMOCLAW_STAGING_LAUNCHABLE_ID }}
-          GH_TOKEN: ${{ secrets.NEMOCLAW_IMAGE_DISPATCH_TOKEN }}
+          BREV_WORKSPACE_OWNERSHIP_FILE: ${{ steps.prepare.outputs.work_dir }}/workspace-owner.json
+          E2E_ARTIFACT_DIR: ${{ steps.prepare.outputs.work_dir }}
+          E2E_TARGET_ID: issue-9880-staging-launchable
           HOME: ${{ runner.temp }}/issue-9880-home
+          NEMOCLAW_IMAGE_DISPATCH_TOKEN: ${{ secrets.NEMOCLAW_IMAGE_DISPATCH_TOKEN }}
+          NEMOCLAW_RUN_LIVE_E2E: "1"
           NVIDIA_API_KEY: ${{ secrets.NVIDIA_API_KEY }}
-          WORK_DIR: ${{ steps.prepare.outputs.work_dir }}
-        run: tools/e2e/brev-launchable-issue-9880.sh
+        run: ./node_modules/.bin/vitest run --project e2e-live test/e2e/live/issue-9880-staging-launchable.test.ts --silent=false --reporter=default
 
       - name: Verify workflow-owned workspace cleanup
         if: ${{ always() && steps.prepare.outputs.work_dir != '' }}
         timeout-minutes: 15
         env:
-          BREV_DELETE_TIMEOUT_SECONDS: "720"
+          BREV_WORKSPACE_OWNERSHIP_FILE: ${{ steps.prepare.outputs.work_dir }}/workspace-owner.json
+          E2E_ARTIFACT_DIR: ${{ steps.prepare.outputs.work_dir }}
           HOME: ${{ runner.temp }}/issue-9880-home
-          WORK_DIR: ${{ steps.prepare.outputs.work_dir }}
-        run: tools/e2e/brev-launchable-issue-9880.sh cleanup-owned-workspace
+        run: node --experimental-strip-types tools/e2e/cleanup-brev-workspace.mts
 
       - name: Remove Brev credentials
         if: always()
+        timeout-minutes: 5
         env:
           HOME: ${{ runner.temp }}/issue-9880-home
         run: |
@@ -93,12 +120,9 @@ jobs:
           test ! -e "$HOME"
 
       - name: Upload issue 9880 evidence
+        timeout-minutes: 10
         if: ${{ always() && steps.prepare.outputs.work_dir != '' }}
         uses: NVIDIA/NemoClaw/.github/actions/upload-e2e-artifacts@7768e15eb90d3ee2d33432f481dfe8747e4f6d57
         with:
           name: issue-9880-staging-reproduction-${{ github.run_id }}-${{ github.run_attempt }}
-          path: |
-            ${{ steps.prepare.outputs.work_dir }}/lane.log
-            ${{ steps.prepare.outputs.work_dir }}/issue-9880.json
-            ${{ steps.prepare.outputs.work_dir }}/issue-9880.log
-            ${{ steps.prepare.outputs.work_dir }}/cleanup.json
+          path: ${{ steps.prepare.outputs.work_dir }}/

.github/workflows/llama-cpp-image.yaml

@@ -12,9 +12,9 @@ on:
       - "managed-inference/recipes/llama-cpp.nemotron-3-nano-30b-a3b.spark-single.v1.yaml"
       - "scripts/checks/export-llama-cpp-image-config.mts"
       - "scripts/checks/verify-llama-cpp-image-publication-evidence.sh"
-      - "test/llama-cpp-image.test.ts"
-      - "test/llama-cpp-image-publication-evidence.test.ts"
-      - "test/llama-cpp-image-workflow.test.ts"
+      - "test/inference/llama/llama-cpp-image.test.ts"
+      - "test/inference/llama/llama-cpp-image-publication-evidence.test.ts"
+      - "test/inference/llama/llama-cpp-image-workflow.test.ts"
   workflow_dispatch:
     inputs:
       publish:

.github/workflows/main.yaml

@@ -123,17 +123,17 @@ jobs:
       - name: Audit the real patched OpenClaw distribution
         env:
           NEMOCLAW_REAL_OPENCLAW_DIST_HARNESS: "1"
-        run: npx vitest run --project integration test/openclaw-real-patched-dist-harness.test.ts --silent=false --reporter=default
+        run: npx vitest run --project integration test/agents/openclaw/openclaw-real-patched-dist-harness.test.ts --silent=false --reporter=default
 
       - name: Verify reviewed Jaeger header handling
         env:
           NEMOCLAW_REAL_OPENCLAW_JAEGER_HARNESS: "1"
-        run: npx vitest run --project integration test/openclaw-diagnostics-jaeger-runtime.test.ts --silent=false --reporter=default
+        run: npx vitest run --project integration test/agents/openclaw/openclaw-diagnostics-jaeger-runtime.test.ts --silent=false --reporter=default
 
       - name: Audit managed OpenClaw security finding suppressions
         env:
           NEMOCLAW_REAL_OPENCLAW_AUDIT_HARNESS: "1"
-        run: npx vitest run --project integration test/openclaw-security-audit-suppressions-real.test.ts --silent=false --reporter=default
+        run: npx vitest run --project integration test/agents/openclaw/openclaw-security-audit-suppressions-real.test.ts --silent=false --reporter=default
 
   cli-test-shards:
     runs-on: ubuntu-24.04

.github/workflows/platform-vitest-main.yaml

@@ -365,10 +365,10 @@ jobs:
             scripts/lib/normalize_mutable_config_perms.py \
             /usr/local/lib/nemoclaw/normalize_mutable_config_perms.py
           npx vitest run --project integration \
-            test/hermes-restart-config-seal-recovery.test.ts \
+            test/agents/hermes/hermes-restart-config-seal-recovery.test.ts \
             -t 'keeps the locked Hermes entry sticky-protected|lets a sandbox-group peer create state'
           npx vitest run --project integration \
-            test/nemoclaw-start-perms.test.ts \
+            test/agents/openclaw/runtime/nemoclaw-start-perms.test.ts \
             -t 'requires both fixed files to match|reclaims a root-owned collapsed config|leaves a root-owned recovery baseline untouched'
           "@
           Invoke-WslScript -Distro $env:WSL_DISTRO -User root -Script $script

Dockerfile

@@ -2163,7 +2163,7 @@ RUN set -eu; \
 # dropped. The `id -nG` checks make this idempotent. Remove this block after
 # the minimum supported OpenClaw sandbox base tag is v0.0.71 or newer and
 # Dockerfile.base guarantees both memberships; keep that base contract covered
-# by test/sandbox-provisioning.test.ts.
+# by test/runtime/sandbox/sandbox-provisioning.test.ts.
 # hadolint ignore=DL4006
 RUN if id gateway >/dev/null 2>&1 && id sandbox >/dev/null 2>&1; then \
         if ! id -nG gateway | tr ' ' '\n' | grep -qx sandbox; then \
@@ -2203,7 +2203,7 @@ RUN set -eu; \
 # /etc/bash.bashrc hook, or the root-owned helper mode. Remove this block after
 # the minimum supported OpenClaw sandbox base tag is v0.0.69 or newer and those
 # three artifacts are guaranteed by the base image and covered by
-# test/sandbox-provisioning.test.ts.
+# test/runtime/sandbox/sandbox-provisioning.test.ts.
 # Ref: https://github.com/NVIDIA/NemoClaw/issues/2704
 # hadolint ignore=SC2028,DL4006
 RUN chmod 444 /usr/local/lib/nemoclaw/sandbox-rlimits.sh \

SECURITY.md

@@ -100,7 +100,7 @@ This control covers cooperating NemoClaw processes, crashes, retries, and recycl
 - **Runtime bind changes.** The probe runs at startup only. A backend that binds loopback at proxy-start time and later rebinds to a public interface is out of scope. Adding a periodic re-probe is a follow-up.
 - **Inference providers this proxy does not front.** The probe covers only what the proxy forwards to: the local Ollama daemon, or a compatible endpoint onboarded without authentication. NIM, the NemoClaw-managed Local vLLM and llama.cpp providers, remote providers, and compatible endpoints onboarded with a credential do not route through this proxy and are not covered. A vLLM server you run yourself and onboard as an unauthenticated compatible endpoint is covered, because that path is the one `noAuthProxy()` fronts.
 
-**Enforced by:** `test/ollama-auth-proxy-bind-probe.test.ts` covers the `/proc` and `lsof` loopback classifiers (accepts full 127.0.0.0/8 including IPv4-mapped IPv6, refuses wildcard and LAN-scope, refuses the lsof `*` token) and pins `EXIT_BACKEND_NOT_LOOPBACK = 2`; the host CLI acts on the structured status reason, which the following tests cover. `src/lib/inference/ollama/proxy-status.test.ts` covers Ollama, compatible-endpoint, and unknown-backend remediation. `test/ollama-proxy-startup.test.ts` covers the real startup path (port conflict, spawn failure, slow bind, IPv6-only listener, reclaim of a prior NemoClaw proxy) and proves `noAuthProxy()` keeps the refusal and the endpoint remediation for a compatible endpoint, including one on the Ollama port. `test/ollama-proxy-recovery.test.ts` covers descriptor persistence, legacy migration, cross-gateway adoption, and structured recovery refusals for managed Ollama and a compatible endpoint on the same port.
+**Enforced by:** `test/inference/ollama/ollama-auth-proxy-bind-probe.test.ts` covers the `/proc` and `lsof` loopback classifiers (accepts full 127.0.0.0/8 including IPv4-mapped IPv6, refuses wildcard and LAN-scope, refuses the lsof `*` token) and pins `EXIT_BACKEND_NOT_LOOPBACK = 2`; the host CLI acts on the structured status reason, which the following tests cover. `src/lib/inference/ollama/proxy-status.test.ts` covers Ollama, compatible-endpoint, and unknown-backend remediation. `test/inference/ollama/ollama-proxy-startup.test.ts` covers the real startup path (port conflict, spawn failure, slow bind, IPv6-only listener, reclaim of a prior NemoClaw proxy) and proves `noAuthProxy()` keeps the refusal and the endpoint remediation for a compatible endpoint, including one on the Ollama port. `test/inference/ollama/ollama-proxy-recovery.test.ts` covers descriptor persistence, legacy migration, cross-gateway adoption, and structured recovery refusals for managed Ollama and a compatible endpoint on the same port.
 
 ## Documented Risk Acceptances
 
@@ -112,6 +112,6 @@ The following security-relevant defaults are intentional. Each item names the co
 - **Constraint:** `/tmp/nemoclaw-proxy-env.sh` is sandbox-user-owned convenience state, not an integrity boundary. It is created with mode `0444` so independent login and exec shells can source the same credential-free settings. The Deep Agents Code runtime deliberately runs as the non-root sandbox user, unlike the root-supervised OpenClaw and Hermes startup paths.
 - **Compensating controls:**
   1. The file is credential-free by construction. `prepare_runtime_env` writes normalized proxy config and inherited trust-store paths. It does not persist LangSmith tracing, project, or API key variables.
-  2. A regression test in [`test/langchain-deepagents-code-image.test.ts`](test/langchain-deepagents-code-image.test.ts) injects token-shaped values through LangSmith tracing and both project variables, scans the emitted env file against canonical token shapes, and fails CI if any secret-shaped value is present.
+  2. A regression test in [`test/agents/deepagents/langchain-deepagents-code-image.test.ts`](test/agents/deepagents/langchain-deepagents-code-image.test.ts) injects token-shaped values through LangSmith tracing and both project variables, scans the emitted env file against canonical token shapes, and fails CI if any secret-shaped value is present.
   3. The root-owned, image-baked proxy host/port files and direct `dcode-launcher.sh` boundary remain the routing source of truth. Focused and live login-shell checks compare the sourced convenience values with that root-owned source; file metadata checks detect accidental drift but do not claim sandbox-owner tamper resistance.
 - **When to revisit:** If a future change adds credential-shaped values to the env-file writer, or if the Deep Agents Code runtime moves back to the root-supervised startup model, revisit the mode and the compensating controls together.

agents/hermes/Dockerfile

@@ -491,7 +491,7 @@ RUN chmod -R a+rX /opt/nemoclaw-blueprint/
 # only repairs stale bases predating the v0.0.69 base layer, which may lack the
 # profile hook, bashrc hook, or root-owned helper mode. Remove it once the
 # minimum supported Hermes sandbox base tag guarantees those artifacts and
-# test/sandbox-rlimit-hooks.test.ts covers that base.
+# test/runtime/sandbox/sandbox-rlimit-hooks.test.ts covers that base.
 RUN chmod 755 /usr/local/bin/nemoclaw-start /usr/local/bin/nemoclaw-managed-startup-hold /usr/local/bin/nemoclaw-managed-bootstrap /usr/local/lib/nemoclaw/sandbox-init.sh /usr/local/lib/nemoclaw/validate-hermes-env-secret-boundary.py /usr/local/lib/nemoclaw/patch-hermes-session-list-preview.py /usr/local/lib/nemoclaw/patch-hermes-sqlite-temp-store.py /usr/local/lib/nemoclaw/patch-hermes-discord-recovery-permissions.py /usr/local/lib/nemoclaw/patch-hermes-profile-policy-defaults.py /usr/local/lib/nemoclaw/seed-hermes-dashboard-config.py /usr/local/lib/nemoclaw/hermes-runtime-config-guard.py /usr/local/lib/nemoclaw/finalize-tirith-marker.py /usr/local/lib/nemoclaw/hermes-mcp-config-transaction.py \
     && chown root:root /usr/local/bin/nemoclaw-gateway-control /usr/local/lib/nemoclaw/gateway-supervisor.sh /usr/local/lib/nemoclaw/state-dir-guard.py /usr/local/lib/nemoclaw/runtime-state-mutation-control.py /usr/local/lib/nemoclaw/runtime-state-mutation-startup-gate.py /usr/local/lib/nemoclaw/runtime_state_mutation_hermes_publisher.py /usr/local/share/nemoclaw/state-lock-plan.json /usr/local/share/nemoclaw/runtime-state-mutation-publisher-v1.json /usr/local/lib/nemoclaw/managed-gateway-control.py /usr/local/lib/nemoclaw/build-hermes-mcp-digest.py /usr/local/lib/nemoclaw/hermes-cron-restore-control.py /usr/local/lib/nemoclaw/openshell-child-visible-credentials.v0.0.106.json \
     && chmod 700 /usr/local/bin/nemoclaw-gateway-control /usr/local/lib/nemoclaw/hermes-cron-restore-control.py \

agents/hermes/hermes-wrapper.py

@@ -40,7 +40,7 @@
 #     either Hermes CLI native env-var reference support (an upstream
 #     change) or a redesigned dashboard/runtime contract that no longer
 #     needs an `sk-`-prefixed rewrite sentinel in the rendered config.
-#   - Regression test: `test/hermes-gateway-wrapper.test.ts` —
+#   - Regression test: `test/agents/hermes/hermes-gateway-wrapper.test.ts` —
 #     `masks every api_key emitted by the managed policy ...` derives a
 #     fixture from `buildHermesManagedPolicy()` and asserts no raw sentinel
 #     survives in stdout for `config show`.

agents/hermes/patch-profile-policy-defaults.py

@@ -34,7 +34,7 @@
 the managed-policy values to a config-less named profile across
 ``DEFAULT_CONFIG`` and every independent fallback listed above. The unmodified
 upstream files must then pass the ``profile-policy`` image probe and
-``test/hermes-profile-policy-defaults.test.ts``.
+``test/agents/hermes/hermes-profile-policy-defaults.test.ts``.
 """
 
 from __future__ import annotations