Fix wrapper validator portability

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: amichne

.agents/skills/kast/SKILL.md

@@ -209,7 +209,9 @@ marker as proof that the result is bounded.
 
 After any code change, run `kast-diagnostics.sh` on the modified files. When
 you need a quick contract check for the wrappers themselves, run
-`validate-wrapper-json.sh`.
+`validate-wrapper-json.sh`. It creates a temporary sample Kotlin workspace and
+checks that each wrapper still emits valid JSON on both success and failure
+paths.
 
 ```bash
 bash "$SKILL_ROOT/scripts/validate-wrapper-json.sh" \

.agents/skills/kast/references/command-reference.md

@@ -910,9 +910,10 @@ bash "$SKILL_ROOT/scripts/validate-wrapper-json.sh" \
   /absolute/path/to/workspace
 ```
 
-The script discovers a sample Kotlin declaration from the workspace, runs the
-wrappers against that workspace, and emits aggregated validation JSON on
-stdout.
+The script creates a temporary sample Kotlin workspace, runs the wrappers
+against that workspace, and emits aggregated validation JSON on stdout. If you
+want `resolve-kast.sh` to prefer a local checkout, pass that source root as the
+positional argument.
 
 ---
 

.agents/skills/kast/scripts/kast-callers.sh

@@ -110,13 +110,13 @@ fi
 CALLERS_RESULT="${TMP_DIR}/callers.json"
 if ! kast_run_json \
     "${CALLERS_RESULT}" \
-    "${KAST}" call hierarchy \
+    "${KAST}" call-hierarchy \
     --workspace-root="${WORKSPACE_ROOT}" \
     --file-path="${RESOLVED_FILE_PATH}" \
     --offset="${RESOLVED_OFFSET}" \
     --direction="${DIRECTION}" \
     --depth="${DEPTH}"; then
-    emit_failure "call_hierarchy" "kast call hierarchy failed." "${CALLERS_RESULT}"
+    emit_failure "call_hierarchy" "kast call-hierarchy failed." "${CALLERS_RESULT}"
     exit 1
 fi
 

.agents/skills/kast/scripts/kast-common.sh

@@ -99,32 +99,45 @@ kast_collect_candidate_files() {
     local kind="${4:-}"
     local candidate_file="${TMP_DIR}/candidate-files.raw"
     local regex
-    local status
-
     regex="$(kast_build_search_regex "${symbol}" "${kind}")"
     : > "${candidate_file}"
 
-    if (cd "${workspace_root}" && rg -l --glob '*.kt' -e "${regex}" . >"${candidate_file}") 2>>"${LOG_FILE}"; then
-        :
-    else
-        status=$?
-        if [[ "${status}" -gt 1 ]]; then
-            printf 'rg declaration search failed with exit status %s\n' "${status}" >>"${LOG_FILE}"
-        fi
-    fi
+    python3 - "${workspace_root}" "${regex}" "${symbol}" "${candidate_file}" <<'PY' 2>>"${LOG_FILE}"
+import re
+import sys
+from pathlib import Path
 
-    if [[ ! -s "${candidate_file}" ]]; then
-        printf 'No declaration-pattern candidates found for %s; widening to plain symbol search.\n' \
-            "${symbol}" >>"${LOG_FILE}"
-        if (cd "${workspace_root}" && rg -l -F --glob '*.kt' -- "${symbol}" . >"${candidate_file}") 2>>"${LOG_FILE}"; then
-            :
-        else
-            status=$?
-            if [[ "${status}" -gt 1 ]]; then
-                printf 'rg fallback search failed with exit status %s\n' "${status}" >>"${LOG_FILE}"
-            fi
-        fi
-    fi
+workspace_root = Path(sys.argv[1]).resolve()
+regex = re.compile(sys.argv[2], re.MULTILINE)
+symbol = sys.argv[3]
+candidate_file = Path(sys.argv[4])
+
+def matching_files(predicate):
+    matches = []
+    for path in sorted(workspace_root.rglob("*.kt")):
+        if not path.is_file():
+            continue
+        try:
+            content = path.read_text(encoding="utf-8")
+        except (OSError, UnicodeDecodeError):
+            continue
+        if predicate(content):
+            matches.append(str(path))
+    return matches
+
+matches = matching_files(lambda content: bool(regex.search(content)))
+if not matches:
+    print(
+        f"No declaration-pattern candidates found for {symbol}; widening to plain symbol search.",
+        file=sys.stderr,
+    )
+    matches = matching_files(lambda content: symbol in content)
+
+candidate_file.write_text(
+    "".join(f"{path}\n" for path in matches),
+    encoding="utf-8",
+)
+PY
 
     python3 - "${workspace_root}" "${file_hint}" "${candidate_file}" <<'PY'
 from fnmatch import fnmatchcase

.agents/skills/kast/scripts/kast-impact.sh

@@ -115,13 +115,13 @@ if [[ "${INCLUDE_CALLERS}" == "true" ]]; then
     CALLERS_RESULT="${TMP_DIR}/callers.json"
     if ! kast_run_json \
         "${CALLERS_RESULT}" \
-        "${KAST}" call hierarchy \
+        "${KAST}" call-hierarchy \
         --workspace-root="${WORKSPACE_ROOT}" \
         --file-path="${RESOLVED_FILE_PATH}" \
         --offset="${RESOLVED_OFFSET}" \
         --direction=incoming \
         --depth=2; then
-        emit_failure "call_hierarchy" "kast call hierarchy failed." "${CALLERS_RESULT}"
+        emit_failure "call_hierarchy" "kast call-hierarchy failed." "${CALLERS_RESULT}"
         exit 1
     fi
 fi

.agents/skills/kast/scripts/validate-wrapper-json.sh

@@ -2,47 +2,29 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-WORKSPACE_ROOT="${1:-$(git -C "${SCRIPT_DIR}" rev-parse --show-toplevel)}"
+REQUEST_ROOT="${1:-$(git -C "${SCRIPT_DIR}" rev-parse --show-toplevel)}"
 TMP_DIR="$(mktemp -d)"
 trap 'rm -rf "${TMP_DIR}"' EXIT
 
-DISCOVERY_TEXT="${TMP_DIR}/discovery.txt"
-if ! rg -n --glob '*.kt' '^\s*(class|object|interface)\s+[A-Za-z_][A-Za-z0-9_]*' \
-    "${WORKSPACE_ROOT}" >"${DISCOVERY_TEXT}"; then
-    python3 - "${DISCOVERY_TEXT}" <<'PY'
-import json
-import sys
-from pathlib import Path
+WORKSPACE_ROOT="${TMP_DIR}/workspace"
+mkdir -p "${WORKSPACE_ROOT}/src/main/kotlin/sample"
 
-log_path = Path(sys.argv[1])
-payload = {
-    "ok": False,
-    "stage": "discovery",
-    "message": "Could not discover a Kotlin class, object, or interface in the workspace.",
-    "log_file": str(log_path),
-}
-print(json.dumps(payload, indent=2))
-PY
-    exit 1
-fi
+cat >"${WORKSPACE_ROOT}/src/main/kotlin/sample/Greeter.kt" <<'EOF'
+package sample
 
-read -r SAMPLE_SYMBOL SAMPLE_FILE <<<"$(
-    python3 - "${DISCOVERY_TEXT}" <<'PY'
-import re
-import sys
-from pathlib import Path
+fun greet(name: String): String = "hi $name"
+EOF
 
-pattern = re.compile(r"^(.*?):\d+:\s*(?:class|object|interface)\s+([A-Za-z_][A-Za-z0-9_]*)")
-for line in Path(sys.argv[1]).read_text(encoding="utf-8").splitlines():
-    match = pattern.match(line)
-    if match:
-        print(match.group(2), match.group(1))
-        break
-else:
-    raise SystemExit("No sample symbol found in discovery output.")
-PY
-)"
+cat >"${WORKSPACE_ROOT}/src/main/kotlin/sample/UseGreeter.kt" <<'EOF'
+package sample
+
+fun greetTwice(): String = greet("kast") + greet("again")
+EOF
+
+export KAST_SOURCE_ROOT="${REQUEST_ROOT}"
 
+SAMPLE_SYMBOL="greet"
+SAMPLE_FILE="${WORKSPACE_ROOT}/src/main/kotlin/sample/Greeter.kt"
 MISSING_SYMBOL="DefinitelyMissingSymbolForWrapperValidation"
 SUCCESS_DIAGNOSTICS_FILE="${SAMPLE_FILE}"
 FAILURE_DIAGNOSTICS_FILE="${WORKSPACE_ROOT}/definitely-missing-file.kt"
@@ -106,7 +88,7 @@ print(json.dumps(entry))
 PY
 done
 
-python3 - "${RESULTS_FILE}" "${WORKSPACE_ROOT}" "${SAMPLE_SYMBOL}" "${SAMPLE_FILE}" <<'PY'
+python3 - "${RESULTS_FILE}" "${REQUEST_ROOT}" "${WORKSPACE_ROOT}" "${SAMPLE_SYMBOL}" "${SAMPLE_FILE}" <<'PY'
 import json
 import sys
 from pathlib import Path
@@ -115,9 +97,10 @@ results = [json.loads(line) for line in Path(sys.argv[1]).read_text(encoding="ut
 ok = all(item.get("valid_json") and item.get("matches_expectation") for item in results)
 payload = {
     "ok": ok,
-    "workspace_root": sys.argv[2],
-    "sample_symbol": sys.argv[3],
-    "sample_file": sys.argv[4],
+    "request_root": sys.argv[2],
+    "workspace_root": sys.argv[3],
+    "sample_symbol": sys.argv[4],
+    "sample_file": sys.argv[5],
     "checks": results,
 }
 print(json.dumps(payload, indent=2))

.github/workflows/ci.yml

@@ -71,7 +71,8 @@ jobs:
         run: |
           set -euo pipefail
           dist_dir="$RUNNER_TEMP/kast-dist"
-          bash .agents/skills/kast/scripts/validate-wrapper-json.sh "$dist_dir/kast"
+          KAST_CLI_PATH="$dist_dir/kast/kast" \
+            bash .agents/skills/kast/scripts/validate-wrapper-json.sh "$PWD"
 
       - name: Smoke installer
         shell: bash