diff --git a/.agents/scripts/tests/test-pulse-wrapper-worker-count.sh b/.agents/scripts/tests/test-pulse-wrapper-worker-count.sh
index 64a11aa83..eb1e739b9 100755
--- a/.agents/scripts/tests/test-pulse-wrapper-worker-count.sh
+++ b/.agents/scripts/tests/test-pulse-wrapper-worker-count.sh
@@ -106,6 +106,96 @@ test_does_not_exclude_non_supervisor_role_pulse_commands() {
 	return 0
 }
 
+# Fix #1 & #2: prefetch_active_workers must use the same filter as count_active_workers
+# so the snapshot count is consistent with the global capacity counter and the
+# supervisor pulse is excluded via token-boundary matching (not substring grep).
+test_prefetch_active_workers_excludes_supervisor() {
+	PS_MOCK_OUTPUT="1 00:01 /usr/local/bin/.opencode run --dir /repo-a --title \"Issue #100\" \"/full-loop Implement issue #100\"
+2 00:02 /usr/local/bin/.opencode run --role pulse --session-key supervisor-pulse --dir /repo-a --title \"Supervisor Pulse\" --prompt \"/pulse state includes /full-loop markers\"
+3 00:03 /usr/local/bin/.opencode run --dir /repo-b --title \"Issue #101\" \"/full-loop Implement issue #101\""
+
+	local prefetch_out
+	prefetch_out=$(prefetch_active_workers 2>/dev/null)
+
+	# Supervisor pulse must not appear in the snapshot
+	if echo "$prefetch_out" | grep -q 'supervisor-pulse'; then
+		print_result "prefetch_active_workers excludes supervisor pulse" 1 \
+			"Supervisor pulse appeared in prefetch output"
+		return 0
+	fi
+
+	# Both worker PIDs (1 and 3) must appear
+	if echo "$prefetch_out" | grep -q 'PID 1' && echo "$prefetch_out" | grep -q 'PID 3'; then
+		print_result "prefetch_active_workers excludes supervisor pulse" 0
+		return 0
+	fi
+
+	print_result "prefetch_active_workers excludes supervisor pulse" 1 \
+		"Expected PIDs 1 and 3 in prefetch output, got: $(echo "$prefetch_out" | grep 'PID' || echo 'none')"
+	return 0
+}
+
+test_prefetch_active_workers_consistent_with_count() {
+	PS_MOCK_OUTPUT="1 00:01 /usr/local/bin/.opencode run --dir /repo-a --title \"Issue #100\" \"/full-loop Implement issue #100\"
+2 00:02 /usr/local/bin/.opencode run --role pulse --session-key supervisor-pulse --dir /repo-a --title \"Supervisor Pulse\" --prompt \"/pulse\"
+3 00:03 /usr/local/bin/.opencode run --dir /repo-b --title \"Issue #101\" \"/full-loop Implement issue #101\""
+
+	local count_out prefetch_worker_count
+	count_out=$(count_active_workers)
+	prefetch_worker_count=$(prefetch_active_workers 2>/dev/null | grep -c '^- PID' || echo "0")
+
+	if [[ "$count_out" == "$prefetch_worker_count" ]]; then
+		print_result "prefetch_active_workers count matches count_active_workers" 0
+		return 0
+	fi
+
+	print_result "prefetch_active_workers count matches count_active_workers" 1 \
+		"count_active_workers=${count_out}, prefetch worker lines=${prefetch_worker_count}"
+	return 0
+}
+
+# Fix #3: has_worker_for_repo_issue must use exact --dir matching to prevent
+# sibling-path false positives (e.g. /tmp/aidevops matching /tmp/aidevops-tools).
+test_has_worker_exact_dir_match_no_sibling_false_positive() {
+	local repos_json_path="${HOME}/.config/aidevops/repos.json"
+	mkdir -p "$(dirname "$repos_json_path")"
+	printf '{"initialized_repos":[{"slug":"owner/repo","path":"/tmp/aidevops","pulse":true}]}\n' \
+		>"$repos_json_path"
+	REPOS_JSON="$repos_json_path"
+
+	# Sibling repo path — must NOT match
+	PS_MOCK_OUTPUT="/usr/local/bin/.opencode run --dir /tmp/aidevops-tools --title \"Issue #42\" \"/full-loop Implement issue #42\""
+
+	if has_worker_for_repo_issue "42" "owner/repo"; then
+		print_result "has_worker_for_repo_issue rejects sibling-path match" 1 \
+			"Sibling path /tmp/aidevops-tools incorrectly matched repo /tmp/aidevops"
+		return 0
+	fi
+
+	print_result "has_worker_for_repo_issue rejects sibling-path match" 0
+	return 0
+}
+
+test_has_worker_exact_dir_match_accepts_correct_path() {
+	local repos_json_path="${HOME}/.config/aidevops/repos.json"
+	mkdir -p "$(dirname "$repos_json_path")"
+	printf '{"initialized_repos":[{"slug":"owner/repo","path":"/tmp/aidevops","pulse":true}]}\n' \
+		>"$repos_json_path"
+	REPOS_JSON="$repos_json_path"
+
+	# Exact repo path — must match
+	PS_MOCK_OUTPUT="/usr/local/bin/.opencode run --dir /tmp/aidevops --title \"Issue #42\" \"/full-loop Implement issue #42\""
+
+	if has_worker_for_repo_issue "42" "owner/repo"; then
+		print_result "has_worker_for_repo_issue accepts exact path match" 0
+		return 0
+	fi
+
+	print_result "has_worker_for_repo_issue accepts exact path match" 1 \
+		"Exact path /tmp/aidevops was not matched"
+	return 0
+}
+
 main() {
 	trap teardown_test_env EXIT
 	setup_test_env
@@ -113,6 +203,10 @@ main() {
 	test_counts_workers_and_ignores_supervisor_session
 	test_returns_zero_when_no_full_loop_workers
 	test_does_not_exclude_non_supervisor_role_pulse_commands
+	test_prefetch_active_workers_excludes_supervisor
+	test_prefetch_active_workers_consistent_with_count
+	test_has_worker_exact_dir_match_no_sibling_false_positive
+	test_has_worker_exact_dir_match_accepts_correct_path
 
 	printf '\nRan %s tests, %s failed\n' "$TESTS_RUN" "$TESTS_FAILED"
 	if [[ "$TESTS_FAILED" -ne 0 ]]; then