Fix REPO_ROOT priority: prefer .specify walk-up over git root

In monorepos the git toplevel may differ from the project root that
contains .specify/. The previous fix still preferred git rev-parse
over the walk-up result.

Bash scripts (20): prefer the discovered _root when it contains
.specify/; only accept git root if it also contains .specify/.

PowerShell scripts (20): validate git root contains .specify/ before
using it; fall back to walking up from script directory otherwise.

Author: mnriem

src/specify_cli/integrations/amp/scripts/update-context.ps1

@@ -10,9 +10,12 @@ $ErrorActionPreference = 'Stop'
 # Derive repo root from script location (walks up to find .specify/)
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $repoRoot = git rev-parse --show-toplevel 2>$null
-if (-not $repoRoot) {
+# If git did not return a repo root, or the git root does not contain .specify,
+# fall back to walking up from the script directory to find the initialized project root.
+if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot '.specify'))) {
     $repoRoot = $scriptDir
-    while ($repoRoot -ne [System.IO.Path]::GetPathRoot($repoRoot) -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
+    $fsRoot = [System.IO.Path]::GetPathRoot($repoRoot)
+    while ($repoRoot -and $repoRoot -ne $fsRoot -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
         $repoRoot = Split-Path -Parent $repoRoot
     }
 }

src/specify_cli/integrations/amp/scripts/update-context.sh

@@ -12,6 +12,17 @@ set -euo pipefail
 _script_dir="$(cd "$(dirname "$0")" && pwd)"
 _root="$_script_dir"
 while [ "$_root" != "/" ] && [ ! -d "$_root/.specify" ]; do _root="$(dirname "$_root")"; done
-REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo "$_root")}"
+if [ -z "${REPO_ROOT:-}" ]; then
+  if [ -d "$_root/.specify" ]; then
+    REPO_ROOT="$_root"
+  else
+    git_root="$(git rev-parse --show-toplevel 2>/dev/null || true)"
+    if [ -n "$git_root" ] && [ -d "$git_root/.specify" ]; then
+      REPO_ROOT="$git_root"
+    else
+      REPO_ROOT="$_root"
+    fi
+  fi
+fi
 
 exec "$REPO_ROOT/.specify/scripts/bash/update-agent-context.sh" amp

src/specify_cli/integrations/auggie/scripts/update-context.ps1

@@ -10,9 +10,12 @@ $ErrorActionPreference = 'Stop'
 # Derive repo root from script location (walks up to find .specify/)
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $repoRoot = git rev-parse --show-toplevel 2>$null
-if (-not $repoRoot) {
+# If git did not return a repo root, or the git root does not contain .specify,
+# fall back to walking up from the script directory to find the initialized project root.
+if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot '.specify'))) {
     $repoRoot = $scriptDir
-    while ($repoRoot -ne [System.IO.Path]::GetPathRoot($repoRoot) -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
+    $fsRoot = [System.IO.Path]::GetPathRoot($repoRoot)
+    while ($repoRoot -and $repoRoot -ne $fsRoot -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
         $repoRoot = Split-Path -Parent $repoRoot
     }
 }

src/specify_cli/integrations/auggie/scripts/update-context.sh

@@ -12,6 +12,17 @@ set -euo pipefail
 _script_dir="$(cd "$(dirname "$0")" && pwd)"
 _root="$_script_dir"
 while [ "$_root" != "/" ] && [ ! -d "$_root/.specify" ]; do _root="$(dirname "$_root")"; done
-REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo "$_root")}"
+if [ -z "${REPO_ROOT:-}" ]; then
+  if [ -d "$_root/.specify" ]; then
+    REPO_ROOT="$_root"
+  else
+    git_root="$(git rev-parse --show-toplevel 2>/dev/null || true)"
+    if [ -n "$git_root" ] && [ -d "$git_root/.specify" ]; then
+      REPO_ROOT="$git_root"
+    else
+      REPO_ROOT="$_root"
+    fi
+  fi
+fi
 
 exec "$REPO_ROOT/.specify/scripts/bash/update-agent-context.sh" auggie

src/specify_cli/integrations/bob/scripts/update-context.ps1

@@ -10,9 +10,12 @@ $ErrorActionPreference = 'Stop'
 # Derive repo root from script location (walks up to find .specify/)
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $repoRoot = git rev-parse --show-toplevel 2>$null
-if (-not $repoRoot) {
+# If git did not return a repo root, or the git root does not contain .specify,
+# fall back to walking up from the script directory to find the initialized project root.
+if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot '.specify'))) {
     $repoRoot = $scriptDir
-    while ($repoRoot -ne [System.IO.Path]::GetPathRoot($repoRoot) -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
+    $fsRoot = [System.IO.Path]::GetPathRoot($repoRoot)
+    while ($repoRoot -and $repoRoot -ne $fsRoot -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
         $repoRoot = Split-Path -Parent $repoRoot
     }
 }

src/specify_cli/integrations/bob/scripts/update-context.sh

@@ -12,6 +12,17 @@ set -euo pipefail
 _script_dir="$(cd "$(dirname "$0")" && pwd)"
 _root="$_script_dir"
 while [ "$_root" != "/" ] && [ ! -d "$_root/.specify" ]; do _root="$(dirname "$_root")"; done
-REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo "$_root")}"
+if [ -z "${REPO_ROOT:-}" ]; then
+  if [ -d "$_root/.specify" ]; then
+    REPO_ROOT="$_root"
+  else
+    git_root="$(git rev-parse --show-toplevel 2>/dev/null || true)"
+    if [ -n "$git_root" ] && [ -d "$git_root/.specify" ]; then
+      REPO_ROOT="$git_root"
+    else
+      REPO_ROOT="$_root"
+    fi
+  fi
+fi
 
 exec "$REPO_ROOT/.specify/scripts/bash/update-agent-context.sh" bob

src/specify_cli/integrations/claude/scripts/update-context.ps1

@@ -10,9 +10,12 @@ $ErrorActionPreference = 'Stop'
 # Derive repo root from script location (walks up to find .specify/)
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $repoRoot = git rev-parse --show-toplevel 2>$null
-if (-not $repoRoot) {
+# If git did not return a repo root, or the git root does not contain .specify,
+# fall back to walking up from the script directory to find the initialized project root.
+if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot '.specify'))) {
     $repoRoot = $scriptDir
-    while ($repoRoot -ne [System.IO.Path]::GetPathRoot($repoRoot) -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
+    $fsRoot = [System.IO.Path]::GetPathRoot($repoRoot)
+    while ($repoRoot -and $repoRoot -ne $fsRoot -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
         $repoRoot = Split-Path -Parent $repoRoot
     }
 }

src/specify_cli/integrations/claude/scripts/update-context.sh

@@ -12,6 +12,17 @@ set -euo pipefail
 _script_dir="$(cd "$(dirname "$0")" && pwd)"
 _root="$_script_dir"
 while [ "$_root" != "/" ] && [ ! -d "$_root/.specify" ]; do _root="$(dirname "$_root")"; done
-REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo "$_root")}"
+if [ -z "${REPO_ROOT:-}" ]; then
+  if [ -d "$_root/.specify" ]; then
+    REPO_ROOT="$_root"
+  else
+    git_root="$(git rev-parse --show-toplevel 2>/dev/null || true)"
+    if [ -n "$git_root" ] && [ -d "$git_root/.specify" ]; then
+      REPO_ROOT="$git_root"
+    else
+      REPO_ROOT="$_root"
+    fi
+  fi
+fi
 
 exec "$REPO_ROOT/.specify/scripts/bash/update-agent-context.sh" claude

src/specify_cli/integrations/codebuddy/scripts/update-context.ps1

@@ -10,9 +10,12 @@ $ErrorActionPreference = 'Stop'
 # Derive repo root from script location (walks up to find .specify/)
 $scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition
 $repoRoot = git rev-parse --show-toplevel 2>$null
-if (-not $repoRoot) {
+# If git did not return a repo root, or the git root does not contain .specify,
+# fall back to walking up from the script directory to find the initialized project root.
+if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot '.specify'))) {
     $repoRoot = $scriptDir
-    while ($repoRoot -ne [System.IO.Path]::GetPathRoot($repoRoot) -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
+    $fsRoot = [System.IO.Path]::GetPathRoot($repoRoot)
+    while ($repoRoot -and $repoRoot -ne $fsRoot -and -not (Test-Path (Join-Path $repoRoot '.specify'))) {
         $repoRoot = Split-Path -Parent $repoRoot
     }
 }

src/specify_cli/integrations/codebuddy/scripts/update-context.sh

@@ -12,6 +12,17 @@ set -euo pipefail
 _script_dir="$(cd "$(dirname "$0")" && pwd)"
 _root="$_script_dir"
 while [ "$_root" != "/" ] && [ ! -d "$_root/.specify" ]; do _root="$(dirname "$_root")"; done
-REPO_ROOT="${REPO_ROOT:-$(git rev-parse --show-toplevel 2>/dev/null || echo "$_root")}"
+if [ -z "${REPO_ROOT:-}" ]; then
+  if [ -d "$_root/.specify" ]; then
+    REPO_ROOT="$_root"
+  else
+    git_root="$(git rev-parse --show-toplevel 2>/dev/null || true)"
+    if [ -n "$git_root" ] && [ -d "$git_root/.specify" ]; then
+      REPO_ROOT="$git_root"
+    else
+      REPO_ROOT="$_root"
+    fi
+  fi
+fi
 
 exec "$REPO_ROOT/.specify/scripts/bash/update-agent-context.sh" codebuddy