diff --git a/actions/rubric-check/action.yml b/actions/rubric-check/action.yml
index b093260..47a541c 100644
--- a/actions/rubric-check/action.yml
+++ b/actions/rubric-check/action.yml
@@ -26,18 +26,23 @@ runs:
   steps:
     - name: Verify binary exists
       shell: bash
+      env:
+        INPUT_CLI_BINARY: ${{ inputs.cli-binary }}
       run: |
-        if [ ! -x "${{ inputs.cli-binary }}" ]; then
-          echo "::error::CLI binary not found or not executable: ${{ inputs.cli-binary }}"
+        if [ ! -x "$INPUT_CLI_BINARY" ]; then
+          echo "ERROR: CLI binary not found or not executable: $INPUT_CLI_BINARY" >&2
           exit 1
         fi
 
     - name: Score rubric
       id: score
       shell: bash
+      env:
+        INPUT_CLI_BINARY: ${{ inputs.cli-binary }}
+        INPUT_PROFILE: ${{ inputs.profile }}
       run: |
-        BINARY="${{ inputs.cli-binary }}"
-        PROFILE="${{ inputs.profile }}"
+        BINARY="$INPUT_CLI_BINARY"
+        PROFILE="$INPUT_PROFILE"
         PASSED=0
         FAILED=0
         TOTAL=0
diff --git a/actions/surface-compat/action.yml b/actions/surface-compat/action.yml
index d0da717..51d3bb8 100644
--- a/actions/surface-compat/action.yml
+++ b/actions/surface-compat/action.yml
@@ -22,21 +22,26 @@ runs:
   steps:
     - name: Verify inputs
       shell: bash
+      env:
+        INPUT_CLI_BINARY: ${{ inputs.cli-binary }}
+        INPUT_BASELINE: ${{ inputs.baseline }}
       run: |
-        if [ ! -x "${{ inputs.cli-binary }}" ]; then
-          echo "::error::CLI binary not found: ${{ inputs.cli-binary }}"
+        if [ ! -x "$INPUT_CLI_BINARY" ]; then
+          echo "ERROR: CLI binary not found: $INPUT_CLI_BINARY" >&2
           exit 1
         fi
-        if [ ! -f "${{ inputs.baseline }}" ]; then
-          echo "::error::Baseline file not found: ${{ inputs.baseline }}"
+        if [ ! -f "$INPUT_BASELINE" ]; then
+          echo "ERROR: Baseline file not found: $INPUT_BASELINE" >&2
           exit 1
         fi
 
     - name: Generate current surface
       shell: bash
+      env:
+        INPUT_CLI_BINARY: ${{ inputs.cli-binary }}
       run: |
         # Walk the CLI command tree and produce surface snapshot
-        BINARY="${{ inputs.cli-binary }}"
+        BINARY="$INPUT_CLI_BINARY"
         ROOT_NAME=$(basename "$BINARY")
 
         walk_commands() {
@@ -48,7 +53,7 @@ runs:
 
           local json
           json=$("$BINARY" "${args[@]}" --help --agent 2>/dev/null) || {
-            echo "::warning::--help --agent failed for: $cmd_path"
+            echo "WARNING: --help --agent failed for: $cmd_path" >&2
             return 0
           }
 
@@ -72,8 +77,10 @@ runs:
     - name: Diff surfaces
       id: diff
       shell: bash
+      env:
+        INPUT_BASELINE: ${{ inputs.baseline }}
       run: |
-        BASELINE="${{ inputs.baseline }}"
+        BASELINE="$INPUT_BASELINE"
         CURRENT="/tmp/surface-current.txt"
 
         # comm requires sorted input — sort both with consistent locale