diff --git a/tests/safe-outputs/azure-cli.lock.yml b/tests/safe-outputs/azure-cli.lock.yml
index 79ff2af5..32f2ec85 100644
--- a/tests/safe-outputs/azure-cli.lock.yml
+++ b/tests/safe-outputs/azure-cli.lock.yml
@@ -1,5 +1,5 @@
 # This file is auto-generated by ado-aw. Do not edit manually.
-# @ado-aw source="tests/safe-outputs/azure-cli.md" version=0.47.0
+# @ado-aw source="tests/safe-outputs/azure-cli.md" version=0.48.0
 
 name: Daily smoke az CLI access-$(BuildID)
 resources:
@@ -84,7 +84,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -99,7 +99,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       AGENTIC_PIPELINES_PATH="$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
       chmod +x "$AGENTIC_PIPELINES_PATH"
@@ -139,6 +139,8 @@ jobs:
               "noop",
               "--enabled-tools",
               "report-incomplete",
+              "--self-repository-directory",
+              "$(Build.SourcesDirectory)",
               "/safeoutputs",
               "$(Build.SourcesDirectory)"
             ],
@@ -259,11 +261,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - bash: |
@@ -272,15 +274,15 @@ jobs:
     displayName: Resolve runtime imports (agent prompt)
     condition: succeeded()
   - bash: |
-      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/azure-cli.md","target":"standalone","version":"0.47.0"}
-      echo 'ado-aw metadata: source=tests/safe-outputs/azure-cli.md org= repo= version=0.47.0 target=standalone'
+      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/azure-cli.md","target":"standalone","version":"0.48.0"}
+      echo 'ado-aw metadata: source=tests/safe-outputs/azure-cli.md org= repo= version=0.48.0 target=standalone'
     displayName: ado-aw
   - bash: |
       set -eo pipefail
 
       mkdir -p "$(Agent.TempDirectory)/staging"
       cat >"$(Agent.TempDirectory)/staging/aw_info.json" <<'AW_INFO_EOF'
-      {"agent_name":"Daily smoke: az CLI access","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.47.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/azure-cli.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
+      {"agent_name":"Daily smoke: az CLI access","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.48.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/azure-cli.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
       AW_INFO_EOF
     displayName: Emit aw_info.json
     condition: always()
@@ -373,8 +375,7 @@ jobs:
 
       # Wait for MCPG to be ready
       READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 30); do
+      for _i in $(seq 1 30); do
         if curl -sf "http://localhost:8080/health" > /dev/null 2>&1; then
           echo "MCPG is ready"
           READY=true
@@ -391,8 +392,7 @@ jobs:
       # Health check passing doesn't guarantee stdout is flushed, so poll.
       echo "Waiting for gateway output file..."
       GATEWAY_READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 15); do
+      for _i in $(seq 1 15); do
         if [ -s "$GATEWAY_OUTPUT" ] && jq -e '.mcpServers' "$GATEWAY_OUTPUT" > /dev/null 2>&1; then
           echo "Gateway output is ready"
           GATEWAY_READY=true
@@ -583,7 +583,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -598,7 +598,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - task: DockerInstaller@0
     inputs:
       dockerVersion: 26.1.4
@@ -802,7 +802,7 @@ jobs:
     artifact: analyzed_outputs_$(Build.BuildId)
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -817,7 +817,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       ls -la "$(Pipeline.Workspace)/agentic-pipeline-compiler"
       chmod +x "$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
@@ -842,6 +842,8 @@ jobs:
     workingDirectory: $(Build.SourcesDirectory)
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      ADO_AW_SELF_REPOSITORY_DIRECTORY: $(Build.SourcesDirectory)
+      ADO_AW_SELF_REPOSITORY_NAME: $(Build.Repository.Name)
   - bash: |
       # Copy all logs to output directory for artifact upload
       mkdir -p "$(Agent.TempDirectory)/staging/logs"
@@ -891,11 +893,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - task: DownloadPipelineArtifact@2
diff --git a/tests/safe-outputs/canary.lock.yml b/tests/safe-outputs/canary.lock.yml
index d538ba16..10793119 100644
--- a/tests/safe-outputs/canary.lock.yml
+++ b/tests/safe-outputs/canary.lock.yml
@@ -1,5 +1,5 @@
 # This file is auto-generated by ado-aw. Do not edit manually.
-# @ado-aw source="tests/safe-outputs/canary.md" version=0.47.0
+# @ado-aw source="tests/safe-outputs/canary.md" version=0.48.0
 
 name: Daily safe-output smoke canary-$(BuildID)
 resources:
@@ -84,7 +84,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -99,7 +99,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       AGENTIC_PIPELINES_PATH="$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
       chmod +x "$AGENTIC_PIPELINES_PATH"
@@ -143,6 +143,8 @@ jobs:
               "noop",
               "--enabled-tools",
               "report-incomplete",
+              "--self-repository-directory",
+              "$(Build.SourcesDirectory)",
               "/safeoutputs",
               "$(Build.SourcesDirectory)"
             ],
@@ -263,11 +265,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - bash: |
@@ -276,15 +278,15 @@ jobs:
     displayName: Resolve runtime imports (agent prompt)
     condition: succeeded()
   - bash: |
-      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/canary.md","target":"standalone","version":"0.47.0"}
-      echo 'ado-aw metadata: source=tests/safe-outputs/canary.md org= repo= version=0.47.0 target=standalone'
+      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/canary.md","target":"standalone","version":"0.48.0"}
+      echo 'ado-aw metadata: source=tests/safe-outputs/canary.md org= repo= version=0.48.0 target=standalone'
     displayName: ado-aw
   - bash: |
       set -eo pipefail
 
       mkdir -p "$(Agent.TempDirectory)/staging"
       cat >"$(Agent.TempDirectory)/staging/aw_info.json" <<'AW_INFO_EOF'
-      {"agent_name":"Daily safe-output smoke: canary","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.47.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/canary.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
+      {"agent_name":"Daily safe-output smoke: canary","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.48.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/canary.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
       AW_INFO_EOF
     displayName: Emit aw_info.json
     condition: always()
@@ -377,8 +379,7 @@ jobs:
 
       # Wait for MCPG to be ready
       READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 30); do
+      for _i in $(seq 1 30); do
         if curl -sf "http://localhost:8080/health" > /dev/null 2>&1; then
           echo "MCPG is ready"
           READY=true
@@ -395,8 +396,7 @@ jobs:
       # Health check passing doesn't guarantee stdout is flushed, so poll.
       echo "Waiting for gateway output file..."
       GATEWAY_READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 15); do
+      for _i in $(seq 1 15); do
         if [ -s "$GATEWAY_OUTPUT" ] && jq -e '.mcpServers' "$GATEWAY_OUTPUT" > /dev/null 2>&1; then
           echo "Gateway output is ready"
           GATEWAY_READY=true
@@ -587,7 +587,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -602,7 +602,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - task: DockerInstaller@0
     inputs:
       dockerVersion: 26.1.4
@@ -818,7 +818,7 @@ jobs:
     artifact: analyzed_outputs_$(Build.BuildId)
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -833,7 +833,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       ls -la "$(Pipeline.Workspace)/agentic-pipeline-compiler"
       chmod +x "$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
@@ -858,6 +858,8 @@ jobs:
     workingDirectory: $(Build.SourcesDirectory)
     env:
       SYSTEM_ACCESSTOKEN: $(SC_WRITE_TOKEN)
+      ADO_AW_SELF_REPOSITORY_DIRECTORY: $(Build.SourcesDirectory)
+      ADO_AW_SELF_REPOSITORY_NAME: $(Build.Repository.Name)
   - bash: |
       # Copy all logs to output directory for artifact upload
       mkdir -p "$(Agent.TempDirectory)/staging/logs"
@@ -907,11 +909,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - task: AzureCLI@2
diff --git a/tests/safe-outputs/janitor.lock.yml b/tests/safe-outputs/janitor.lock.yml
index 13a228b2..4883524d 100644
--- a/tests/safe-outputs/janitor.lock.yml
+++ b/tests/safe-outputs/janitor.lock.yml
@@ -1,5 +1,5 @@
 # This file is auto-generated by ado-aw. Do not edit manually.
-# @ado-aw source="tests/safe-outputs/janitor.md" version=0.47.0
+# @ado-aw source="tests/safe-outputs/janitor.md" version=0.48.0
 
 name: ado-aw smoke janitor-$(BuildID)
 resources:
@@ -107,7 +107,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -122,7 +122,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       AGENTIC_PIPELINES_PATH="$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
       chmod +x "$AGENTIC_PIPELINES_PATH"
@@ -162,6 +162,8 @@ jobs:
               "noop",
               "--enabled-tools",
               "report-incomplete",
+              "--self-repository-directory",
+              "$(Build.SourcesDirectory)",
               "/safeoutputs",
               "$(Build.SourcesDirectory)"
             ],
@@ -282,11 +284,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - bash: |
@@ -295,15 +297,15 @@ jobs:
     displayName: Resolve runtime imports (agent prompt)
     condition: succeeded()
   - bash: |
-      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/janitor.md","target":"standalone","version":"0.47.0"}
-      echo 'ado-aw metadata: source=tests/safe-outputs/janitor.md org= repo= version=0.47.0 target=standalone'
+      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/janitor.md","target":"standalone","version":"0.48.0"}
+      echo 'ado-aw metadata: source=tests/safe-outputs/janitor.md org= repo= version=0.48.0 target=standalone'
     displayName: ado-aw
   - bash: |
       set -eo pipefail
 
       mkdir -p "$(Agent.TempDirectory)/staging"
       cat >"$(Agent.TempDirectory)/staging/aw_info.json" <<'AW_INFO_EOF'
-      {"agent_name":"ado-aw smoke janitor","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.47.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/janitor.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
+      {"agent_name":"ado-aw smoke janitor","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.48.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/janitor.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
       AW_INFO_EOF
     displayName: Emit aw_info.json
     condition: always()
@@ -396,8 +398,7 @@ jobs:
 
       # Wait for MCPG to be ready
       READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 30); do
+      for _i in $(seq 1 30); do
         if curl -sf "http://localhost:8080/health" > /dev/null 2>&1; then
           echo "MCPG is ready"
           READY=true
@@ -414,8 +415,7 @@ jobs:
       # Health check passing doesn't guarantee stdout is flushed, so poll.
       echo "Waiting for gateway output file..."
       GATEWAY_READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 15); do
+      for _i in $(seq 1 15); do
         if [ -s "$GATEWAY_OUTPUT" ] && jq -e '.mcpServers' "$GATEWAY_OUTPUT" > /dev/null 2>&1; then
           echo "Gateway output is ready"
           GATEWAY_READY=true
@@ -606,7 +606,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -621,7 +621,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - task: DockerInstaller@0
     inputs:
       dockerVersion: 26.1.4
@@ -837,7 +837,7 @@ jobs:
     artifact: analyzed_outputs_$(Build.BuildId)
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -852,7 +852,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       ls -la "$(Pipeline.Workspace)/agentic-pipeline-compiler"
       chmod +x "$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
@@ -877,6 +877,8 @@ jobs:
     workingDirectory: $(Build.SourcesDirectory)
     env:
       SYSTEM_ACCESSTOKEN: $(SC_WRITE_TOKEN)
+      ADO_AW_SELF_REPOSITORY_DIRECTORY: $(Build.SourcesDirectory)
+      ADO_AW_SELF_REPOSITORY_NAME: $(Build.Repository.Name)
   - bash: |
       # Copy all logs to output directory for artifact upload
       mkdir -p "$(Agent.TempDirectory)/staging/logs"
@@ -926,11 +928,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - task: AzureCLI@2
diff --git a/tests/safe-outputs/noop-target.lock.yml b/tests/safe-outputs/noop-target.lock.yml
index 9b40decd..917be100 100644
--- a/tests/safe-outputs/noop-target.lock.yml
+++ b/tests/safe-outputs/noop-target.lock.yml
@@ -1,5 +1,5 @@
 # This file is auto-generated by ado-aw. Do not edit manually.
-# @ado-aw source="tests/safe-outputs/noop-target.md" version=0.47.0
+# @ado-aw source="tests/safe-outputs/noop-target.md" version=0.48.0
 
 name: ado-aw smoke noop target-$(BuildID)
 resources:
@@ -75,7 +75,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -90,7 +90,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       AGENTIC_PIPELINES_PATH="$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
       chmod +x "$AGENTIC_PIPELINES_PATH"
@@ -130,6 +130,8 @@ jobs:
               "noop",
               "--enabled-tools",
               "report-incomplete",
+              "--self-repository-directory",
+              "$(Build.SourcesDirectory)",
               "/safeoutputs",
               "$(Build.SourcesDirectory)"
             ],
@@ -250,11 +252,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - bash: |
@@ -263,15 +265,15 @@ jobs:
     displayName: Resolve runtime imports (agent prompt)
     condition: succeeded()
   - bash: |
-      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/noop-target.md","target":"standalone","version":"0.47.0"}
-      echo 'ado-aw metadata: source=tests/safe-outputs/noop-target.md org= repo= version=0.47.0 target=standalone'
+      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/noop-target.md","target":"standalone","version":"0.48.0"}
+      echo 'ado-aw metadata: source=tests/safe-outputs/noop-target.md org= repo= version=0.48.0 target=standalone'
     displayName: ado-aw
   - bash: |
       set -eo pipefail
 
       mkdir -p "$(Agent.TempDirectory)/staging"
       cat >"$(Agent.TempDirectory)/staging/aw_info.json" <<'AW_INFO_EOF'
-      {"agent_name":"ado-aw smoke noop target","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.47.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/noop-target.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
+      {"agent_name":"ado-aw smoke noop target","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.48.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/noop-target.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
       AW_INFO_EOF
     displayName: Emit aw_info.json
     condition: always()
@@ -364,8 +366,7 @@ jobs:
 
       # Wait for MCPG to be ready
       READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 30); do
+      for _i in $(seq 1 30); do
         if curl -sf "http://localhost:8080/health" > /dev/null 2>&1; then
           echo "MCPG is ready"
           READY=true
@@ -382,8 +383,7 @@ jobs:
       # Health check passing doesn't guarantee stdout is flushed, so poll.
       echo "Waiting for gateway output file..."
       GATEWAY_READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 15); do
+      for _i in $(seq 1 15); do
         if [ -s "$GATEWAY_OUTPUT" ] && jq -e '.mcpServers' "$GATEWAY_OUTPUT" > /dev/null 2>&1; then
           echo "Gateway output is ready"
           GATEWAY_READY=true
@@ -574,7 +574,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -589,7 +589,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - task: DockerInstaller@0
     inputs:
       dockerVersion: 26.1.4
@@ -793,7 +793,7 @@ jobs:
     artifact: analyzed_outputs_$(Build.BuildId)
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -808,7 +808,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       ls -la "$(Pipeline.Workspace)/agentic-pipeline-compiler"
       chmod +x "$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
@@ -833,6 +833,8 @@ jobs:
     workingDirectory: $(Build.SourcesDirectory)
     env:
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+      ADO_AW_SELF_REPOSITORY_DIRECTORY: $(Build.SourcesDirectory)
+      ADO_AW_SELF_REPOSITORY_NAME: $(Build.Repository.Name)
   - bash: |
       # Copy all logs to output directory for artifact upload
       mkdir -p "$(Agent.TempDirectory)/staging/logs"
@@ -882,11 +884,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - task: DownloadPipelineArtifact@2
diff --git a/tests/safe-outputs/smoke-failure-reporter.lock.yml b/tests/safe-outputs/smoke-failure-reporter.lock.yml
index b4088514..e92b12f2 100644
--- a/tests/safe-outputs/smoke-failure-reporter.lock.yml
+++ b/tests/safe-outputs/smoke-failure-reporter.lock.yml
@@ -1,5 +1,5 @@
 # This file is auto-generated by ado-aw. Do not edit manually.
-# @ado-aw source="tests/safe-outputs/smoke-failure-reporter.md" version=0.47.0
+# @ado-aw source="tests/safe-outputs/smoke-failure-reporter.md" version=0.48.0
 
 name: ado-aw smoke failure reporter-$(BuildID)
 resources:
@@ -84,7 +84,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -99,7 +99,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       AGENTIC_PIPELINES_PATH="$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
       chmod +x "$AGENTIC_PIPELINES_PATH"
@@ -167,6 +167,8 @@ jobs:
               "noop",
               "--enabled-tools",
               "report-incomplete",
+              "--self-repository-directory",
+              "$(Build.SourcesDirectory)",
               "/safeoutputs",
               "$(Build.SourcesDirectory)"
             ],
@@ -287,11 +289,11 @@ jobs:
   - bash: |
       set -eo pipefail
       mkdir -p /tmp/ado-aw-scripts
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
-      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.47.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/checksums.txt" -o /tmp/ado-aw-scripts/checksums.txt
+      curl -fsSL "https://github.com/githubnext/ado-aw/releases/download/v0.48.0/ado-script.zip" -o /tmp/ado-aw-scripts/ado-script.zip
       cd /tmp/ado-aw-scripts && grep "ado-script.zip" checksums.txt | sha256sum -c -
       unzip -o /tmp/ado-aw-scripts/ado-script.zip -d /tmp/ado-aw-scripts/
-    displayName: Download ado-aw scripts (v0.47.0)
+    displayName: Download ado-aw scripts (v0.48.0)
     timeoutInMinutes: 5
     condition: succeeded()
   - bash: |
@@ -300,15 +302,15 @@ jobs:
     displayName: Resolve runtime imports (agent prompt)
     condition: succeeded()
   - bash: |
-      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/smoke-failure-reporter.md","target":"standalone","version":"0.47.0"}
-      echo 'ado-aw metadata: source=tests/safe-outputs/smoke-failure-reporter.md org= repo= version=0.47.0 target=standalone'
+      # ado-aw-metadata: {"org":"","repo":"","schema":1,"source":"tests/safe-outputs/smoke-failure-reporter.md","target":"standalone","version":"0.48.0"}
+      echo 'ado-aw metadata: source=tests/safe-outputs/smoke-failure-reporter.md org= repo= version=0.48.0 target=standalone'
     displayName: ado-aw
   - bash: |
       set -eo pipefail
 
       mkdir -p "$(Agent.TempDirectory)/staging"
       cat >"$(Agent.TempDirectory)/staging/aw_info.json" <<'AW_INFO_EOF'
-      {"agent_name":"ado-aw smoke failure reporter","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.47.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/smoke-failure-reporter.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
+      {"agent_name":"ado-aw smoke failure reporter","build_definition_id":"$(System.DefinitionId)","build_id":"$(Build.BuildId)","compiler_version":"0.48.0","engine":"copilot","model":"claude-sonnet-4.6","org":"","repo":"","schema":"ado-aw/aw_info/1","source":"tests/safe-outputs/smoke-failure-reporter.md","source_branch":"$(Build.SourceBranch)","source_version":"$(Build.SourceVersion)","target":"standalone"}
       AW_INFO_EOF
     displayName: Emit aw_info.json
     condition: always()
@@ -400,8 +402,7 @@ jobs:
 
       # Wait for MCPG to be ready
       READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 30); do
+      for _i in $(seq 1 30); do
         if curl -sf "http://localhost:8080/health" > /dev/null 2>&1; then
           echo "MCPG is ready"
           READY=true
@@ -418,8 +419,7 @@ jobs:
       # Health check passing doesn't guarantee stdout is flushed, so poll.
       echo "Waiting for gateway output file..."
       GATEWAY_READY=false
-      # shellcheck disable=SC2034 # i is intentionally unused; wait-N-times loop
-      for i in $(seq 1 15); do
+      for _i in $(seq 1 15); do
         if [ -s "$GATEWAY_OUTPUT" ] && jq -e '.mcpServers' "$GATEWAY_OUTPUT" > /dev/null 2>&1; then
           echo "Gateway output is ready"
           GATEWAY_READY=true
@@ -604,7 +604,7 @@ jobs:
     displayName: Output copilot version
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -619,7 +619,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - task: DockerInstaller@0
     inputs:
       dockerVersion: 26.1.4
@@ -835,7 +835,7 @@ jobs:
     artifact: analyzed_outputs_$(Build.BuildId)
   - bash: |
       set -eo pipefail
-      COMPILER_VERSION="0.47.0"
+      COMPILER_VERSION="0.48.0"
       DOWNLOAD_DIR="$(Pipeline.Workspace)/agentic-pipeline-compiler"
       DOWNLOAD_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/ado-aw-linux-x64"
       CHECKSUM_URL="https://github.com/githubnext/ado-aw/releases/download/v${COMPILER_VERSION}/checksums.txt"
@@ -850,7 +850,7 @@ jobs:
       grep "ado-aw-linux-x64" checksums.txt | sha256sum -c -
       mv ado-aw-linux-x64 ado-aw
       chmod +x ado-aw
-    displayName: Download agentic pipeline compiler (v0.47.0)
+    displayName: Download agentic pipeline compiler (v0.48.0)
   - bash: |
       ls -la "$(Pipeline.Workspace)/agentic-pipeline-compiler"
       chmod +x "$(Pipeline.Workspace)/agentic-pipeline-compiler/ado-aw"
@@ -876,6 +876,8 @@ jobs:
     env:
       SYSTEM_ACCESSTOKEN: $(SC_WRITE_TOKEN)
       ADO_AW_DEBUG_GITHUB_TOKEN: $(ADO_AW_DEBUG_GITHUB_TOKEN)
+      ADO_AW_SELF_REPOSITORY_DIRECTORY: $(Build.SourcesDirectory)
+      ADO_AW_SELF_REPOSITORY_NAME: $(Build.Repository.Name)
   - bash: |
       # Copy all logs to output directory for artifact upload
       mkdir -p "$(Agent.TempDirectory)/staging/logs"