Merge pull request #14 from jkdihenkar/fix/bash3-awk-field-offset

fix: strip PID field from awk fallback on bash < 4

Author: timvw

.github/workflows/test.yml

@@ -13,25 +13,62 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        bash: [bash, bash3.2]
+    name: test (bash ${{ matrix.bash == 'bash' && '5' || '3.2' }})
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - uses: docker/setup-buildx-action@v3
+
       - name: Build test image
-        run: docker build -t tmux-assistant-resurrect-test -f test/Dockerfile .
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: test/Dockerfile
+          load: true
+          tags: tmux-assistant-resurrect-test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Run tests
         run: |
           mkdir -p test-results
-          docker run --rm -v ${{ github.workspace }}/test-results:/tmp/test-results tmux-assistant-resurrect-test
+          docker run --rm \
+            -e TEST_BASH=${{ matrix.bash }} \
+            -v ${{ github.workspace }}/test-results:/tmp/test-results \
+            tmux-assistant-resurrect-test
 
       - name: Publish test results
         uses: EnricoMi/publish-unit-test-result-action@v2
         if: always()
         with:
           files: test-results/junit.xml
           comment_mode: off
+          check_name: tests (${{ matrix.bash == 'bash' && 'bash 5' || 'bash 3.2' }})
+
+  benchmark:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build test image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: test/Dockerfile
+          load: true
+          tags: tmux-assistant-resurrect-test
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Prepare benchmark baseline
         run: |

justfile

@@ -370,12 +370,13 @@ status:
     fi
 
 # Manually trigger a save of current assistant sessions
+# TEST_BASH overrides the interpreter (e.g. bash3.2 for compat testing).
 save:
-    @bash "{{repo_dir}}/scripts/save-assistant-sessions.sh"
+    @"${TEST_BASH:-bash}" "{{repo_dir}}/scripts/save-assistant-sessions.sh"
 
 # Manually trigger a restore of saved assistant sessions
 restore:
-    @bash "{{repo_dir}}/scripts/restore-assistant-sessions.sh"
+    @"${TEST_BASH:-bash}" "{{repo_dir}}/scripts/restore-assistant-sessions.sh"
 
 # Clean up stale state files (from dead processes)
 clean:

scripts/save-assistant-sessions.sh

@@ -348,7 +348,7 @@ resolve_pane_candidates() {
 			if [ "$has_assoc_cache" -eq 1 ]; then
 				cached="${STATE_CACHE[$cand_pid]:-}"
 			elif [ -s "$state_cache_file" ]; then
-				cached=$(awk -F"$us" -v p="$cand_pid" '$1 == p {print; exit}' "$state_cache_file")
+				cached=$(awk -F"$us" -v p="$cand_pid" '$1 == p {for(i=2;i<=NF;i++) printf "%s%s",$i,(i<NF?FS:""); print ""; exit}' "$state_cache_file")
 			fi
 			if [ -n "$cached" ]; then
 				cached_sid="${cached%%"$us"*}"
@@ -391,7 +391,9 @@ resolve_pane_candidates() {
 				fi
 
 				# Fallback: parse --model from CLI args if not in state file.
-				if [ -z "$model" ] && [[ "$cand_args" =~ --model[=\ ]([^\ ]+) ]]; then
+				# Regex stored in variable for bash 3.2 compat (inline capture groups fail).
+				local _model_re='--model[= ]([^ ]+)'
+				if [ -z "$model" ] && [[ "$cand_args" =~ $_model_re ]]; then
 					model="${BASH_REMATCH[1]}"
 				fi
 

test/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Core tools
+# Core tools + build deps for bash 3.2
 RUN apt-get update && apt-get install -y \
     tmux \
     jq \
@@ -13,8 +13,24 @@ RUN apt-get update && apt-get install -y \
     nodejs \
     npm \
     python3 \
+    gcc \
+    make \
     && rm -rf /var/lib/apt/lists/*
 
+# Install bash 3.2 from source (macOS ships bash 3.2; needed for awk-fallback tests)
+# SHA256 pinned for reproducibility (GPG sig also at bash-3.2.tar.gz.sig on ftp.gnu.org).
+RUN BASH32_SHA256="26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4" && \
+    curl -sSfL -o /tmp/bash-3.2.tar.gz https://ftp.gnu.org/gnu/bash/bash-3.2.tar.gz \
+    && echo "$BASH32_SHA256  /tmp/bash-3.2.tar.gz" | sha256sum -c - \
+    && tar xz -C /tmp -f /tmp/bash-3.2.tar.gz \
+    && ARCH=$(uname -m) \
+    && case "$ARCH" in x86_64) TRIPLE="x86_64-pc-linux-gnu";; aarch64) TRIPLE="aarch64-unknown-linux-gnu";; *) TRIPLE="$ARCH-pc-linux-gnu";; esac \
+    && cd /tmp/bash-3.2 \
+    && ./configure --build="$TRIPLE" --prefix=/usr/local --without-bash-malloc >/dev/null 2>&1 \
+    && make -j"$(nproc)" >/dev/null 2>&1 \
+    && cp bash /usr/local/bin/bash3.2 \
+    && rm -rf /tmp/bash-3.2 /tmp/bash-3.2.tar.gz
+
 # Install just
 RUN curl -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
 
@@ -34,4 +50,8 @@ WORKDIR /home/testuser
 # Copy the repo in (done as testuser for correct ownership)
 COPY --chown=testuser:testuser . /home/testuser/tmux-assistant-resurrect
 
-ENTRYPOINT ["bash", "/home/testuser/tmux-assistant-resurrect/test/run-tests.sh"]
+# TEST_BASH: override bash used by scripts under test (save/restore).
+# "bash" (default) = system bash 5; "bash3.2" = bash 3.2 awk-fallback path.
+# The test harness itself always runs under bash 5 (explicit in ENTRYPOINT).
+ENV TEST_BASH="bash"
+ENTRYPOINT ["/bin/bash", "/home/testuser/tmux-assistant-resurrect/test/run-tests.sh"]

test/run-tests.sh

@@ -5,6 +5,9 @@ set -euo pipefail
 
 REPO_DIR="$HOME/tmux-assistant-resurrect"
 JUNIT_FILE="${JUNIT_FILE:-/tmp/test-results/junit.xml}"
+echo "Test harness bash: $BASH_VERSION"
+echo "Scripts under test: $(${TEST_BASH:-bash} --version | head -1)"
+echo ""
 PASS=0
 FAIL=0
 ERRORS=""