diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..dfdb8b77
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh text eol=lf
diff --git a/skill.sh b/skill.sh
index 7f19ae7b..fd97d91b 100644
--- a/skill.sh
+++ b/skill.sh
@@ -17,9 +17,36 @@ declare -A SKILLS=(
   [stitch-skill]="skills/stitch-skill/SKILL.md"
 )
 
-if [[ $# -eq 0 ]]; then
+print_help() {
   echo "Usage: source ./skill.sh <skill-name>"
-  echo "Available skills: ${!SKILLS[@]}"
-else
-  echo "${SKILLS[$1]}"
-fi
+  echo "       source ./skill.sh --list"
+  echo
+  echo "Available skills:"
+  printf '%s\n' "${!SKILLS[@]}" | sort
+}
+
+skill_main() {
+  if [[ $# -eq 0 || "$1" == "-h" || "$1" == "--help" ]]; then
+    print_help
+    return 0
+  fi
+
+  if [[ "$1" == "--list" ]]; then
+    printf '%s\n' "${!SKILLS[@]}" | sort
+    return 0
+  fi
+
+  local skill_name="$1"
+  local skill_path="${SKILLS[$skill_name]-}"
+
+  if [[ -z "$skill_path" ]]; then
+    echo "Unknown skill: $skill_name" >&2
+    echo >&2
+    print_help >&2
+    return 2
+  fi
+
+  echo "$skill_path"
+}
+
+skill_main "$@"
diff --git a/tests/skill_test.sh b/tests/skill_test.sh
new file mode 100644
index 00000000..ca9f2460
--- /dev/null
+++ b/tests/skill_test.sh
@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+
+set -u
+
+repo_root="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$repo_root"
+
+failures=0
+
+assert_contains() {
+  local actual="$1"
+  local expected="$2"
+
+  if [[ "$actual" != *"$expected"* ]]; then
+    printf 'Expected output to contain:\n  %s\nActual output:\n%s\n' "$expected" "$actual" >&2
+    return 1
+  fi
+}
+
+assert_not_contains() {
+  local actual="$1"
+  local unexpected="$2"
+
+  if [[ "$actual" == *"$unexpected"* ]]; then
+    printf 'Expected output not to contain:\n  %s\nActual output:\n%s\n' "$unexpected" "$actual" >&2
+    return 1
+  fi
+}
+
+assert_equal() {
+  local actual="$1"
+  local expected="$2"
+  local message="$3"
+
+  if [[ "$actual" != "$expected" ]]; then
+    printf '%s\nExpected: %s\nActual:   %s\n' "$message" "$expected" "$actual" >&2
+    return 1
+  fi
+}
+
+run_test() {
+  local name="$1"
+  shift
+
+  if "$@"; then
+    printf 'ok - %s\n' "$name"
+  else
+    printf 'not ok - %s\n' "$name" >&2
+    failures=$((failures + 1))
+  fi
+}
+
+assert_source_returns_to_caller() {
+  local expected_status="$1"
+  shift
+
+  local caller_output
+  local caller_status
+
+  caller_output="$(
+    "$BASH" -c '
+      set -u
+      source ./skill.sh "$@" >/dev/null 2>&1
+      source_status=$?
+      printf "continued:%s\n" "$source_status"
+    ' bash "$@"
+  )"
+  caller_status=$?
+
+  assert_equal "$caller_status" "0" "Sourcing caller terminated before it could handle the result." || return 1
+  assert_equal "$caller_output" "continued:$expected_status" "Sourced helper returned the wrong status."
+}
+
+test_help_uses_source_invocation() {
+  local output
+  output="$(source ./skill.sh --help)"
+
+  assert_contains "$output" "Usage: source ./skill.sh <skill-name>" || return 1
+  assert_contains "$output" "       source ./skill.sh --list" || return 1
+  assert_not_contains "$output" "Usage: ./skill.sh <skill-name>" || return 1
+  assert_not_contains "$output" "       ./skill.sh --list"
+}
+
+test_help_returns_to_sourcing_caller() {
+  assert_source_returns_to_caller 0 --help
+}
+
+test_list_returns_to_sourcing_caller() {
+  assert_source_returns_to_caller 0 --list
+}
+
+test_valid_skill_returns_path_to_sourcing_caller() {
+  local caller_output
+  local caller_status
+
+  caller_output="$(
+    "$BASH" -c '
+      set -u
+      source ./skill.sh taste-skill
+      source_status=$?
+      printf "continued:%s\n" "$source_status"
+    '
+  )"
+  caller_status=$?
+
+  assert_equal "$caller_status" "0" "Valid lookup terminated the sourcing caller." || return 1
+  assert_equal "$caller_output" $'skills/taste-skill/SKILL.md\ncontinued:0' "Valid lookup returned the wrong path or status."
+}
+
+test_unknown_skill_returns_to_sourcing_caller() {
+  assert_source_returns_to_caller 2 typo
+}
+
+run_test "help documents only the supported source invocation" test_help_uses_source_invocation
+run_test "help returns to the sourcing caller" test_help_returns_to_sourcing_caller
+run_test "list returns to the sourcing caller" test_list_returns_to_sourcing_caller
+run_test "valid skills return paths to the sourcing caller" test_valid_skill_returns_path_to_sourcing_caller
+run_test "unknown skills return to the sourcing caller with status 2" test_unknown_skill_returns_to_sourcing_caller
+
+if ((failures > 0)); then
+  exit 1
+fi