diff --git a/scripts/run-entire-copilot-migration-with-optional-rewind-resume.sh b/scripts/run-entire-copilot-migration-with-optional-rewind-resume.sh
index 955d491..e26e84b 100755
--- a/scripts/run-entire-copilot-migration-with-optional-rewind-resume.sh
+++ b/scripts/run-entire-copilot-migration-with-optional-rewind-resume.sh
@@ -14,17 +14,23 @@ need_cmd entire
 need_cmd copilot
 need_cmd git
 
-if [ ! -d "$PROJECT_DIR" ]; then
-  echo "ERROR: project directory '$PROJECT_DIR' not found." >&2
+if ! git rev-parse --show-toplevel >/dev/null 2>&1; then
+  echo "ERROR: Dieses Skript muss innerhalb eines bestehenden Git-Repositories gestartet werden." >&2
+  echo "Bitte zuerst im Repo-Root 'git init' oder in einem bestehenden Repo arbeiten." >&2
   exit 1
 fi
 
-cd "$PROJECT_DIR"
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+cd "$REPO_ROOT"
 
-if [ ! -d .git ]; then
-  git init
+if [ ! -d "$PROJECT_DIR" ]; then
+  echo "ERROR: project directory '$PROJECT_DIR' not found relative to repo root '$REPO_ROOT'." >&2
+  exit 1
 fi
 
+echo "Repo root: $REPO_ROOT"
+echo "Legacy project: $PROJECT_DIR"
+
 entire agent add copilot-cli
 entire status
 
@@ -35,16 +41,18 @@ else
   git commit -m "baseline: Qt5/C++11 legacy benchmark before Qt6/C++23 migration"
 fi
 
+echo
+echo "== Checkpoints vor der Session =="
 entire checkpoint list
 
-cat <<'PROMPT'
+cat <<PROMPT
 
 Use this prompt in Copilot CLI:
 
 Migrate the legacy Qt5/C++11 desktop application to Qt6/C++23.
 
 Requirements:
-- Read the legacy source project from qt5-before/qt5-legacy-migration-benchmark
+- Read the legacy source project from ${PROJECT_DIR}
 - Write the migrated project into qt6-after/qt6-migrated-benchmark
 - Do not modify the legacy source tree in place
 - Update CMake from Qt5 to Qt6
@@ -66,6 +74,8 @@ PROMPT
 
 copilot
 
+echo
+echo "== Git status after Copilot session =="
 git status --short
 git add .
 
@@ -75,6 +85,8 @@ else
   git commit -m "migrate: Qt5/C++11 app to Qt6/C++23 with tests and modern Qt APIs"
 fi
 
+echo
+echo "== Checkpoints nach der Session =="
 entire checkpoint list
 entire checkpoint explain HEAD || true
 
diff --git a/scripts/run-entire-copilot-migration.sh b/scripts/run-entire-copilot-migration.sh
index 085dc03..35f3fc7 100755
--- a/scripts/run-entire-copilot-migration.sh
+++ b/scripts/run-entire-copilot-migration.sh
@@ -14,17 +14,23 @@ need_cmd entire
 need_cmd copilot
 need_cmd git
 
-if [ ! -d "$PROJECT_DIR" ]; then
-  echo "ERROR: project directory '$PROJECT_DIR' not found." >&2
+if ! git rev-parse --show-toplevel >/dev/null 2>&1; then
+  echo "ERROR: Dieses Skript muss innerhalb eines bestehenden Git-Repositories gestartet werden." >&2
+  echo "Bitte zuerst im Repo-Root 'git init' oder in einem bestehenden Repo arbeiten." >&2
   exit 1
 fi
 
-cd "$PROJECT_DIR"
+REPO_ROOT="$(git rev-parse --show-toplevel)"
+cd "$REPO_ROOT"
 
-if [ ! -d .git ]; then
-  git init
+if [ ! -d "$PROJECT_DIR" ]; then
+  echo "ERROR: project directory '$PROJECT_DIR' not found relative to repo root '$REPO_ROOT'." >&2
+  exit 1
 fi
 
+echo "Repo root: $REPO_ROOT"
+echo "Legacy project: $PROJECT_DIR"
+
 entire agent add copilot-cli
 entire status
 
@@ -35,16 +41,18 @@ else
   git commit -m "baseline: Qt5/C++11 legacy benchmark before Qt6/C++23 migration"
 fi
 
+echo
+echo "== Checkpoints vor der Session =="
 entire checkpoint list
 
-cat <<'PROMPT'
+cat <<PROMPT
 
 Use this prompt in Copilot CLI:
 
 Migrate the legacy Qt5/C++11 desktop application to Qt6/C++23.
 
 Requirements:
-- Read the legacy source project from qt5-before/qt5-legacy-migration-benchmark
+- Read the legacy source project from ${PROJECT_DIR}
 - Write the migrated project into qt6-after/qt6-migrated-benchmark
 - Do not modify the legacy source tree in place
 - Update CMake from Qt5 to Qt6
@@ -66,7 +74,10 @@ PROMPT
 
 copilot
 
+echo
+echo "== Git status after Copilot session =="
 git status --short
+
 git add .
 
 if git diff --cached --quiet; then
@@ -75,5 +86,8 @@ if git diff --cached --quiet; then
 fi
 
 git commit -m "migrate: Qt5/C++11 app to Qt6/C++23 with tests and modern Qt APIs"
+
+echo
+echo "== Checkpoints nach der Session =="
 entire checkpoint list
 entire checkpoint explain HEAD || true