From 2538cc300f72130e7e94ed3a537c9d6628cbc822 Mon Sep 17 00:00:00 2001
From: garrytan <garrytan@gmail.com>
Date: Mon, 2 Nov 2026 03:07:32 +0000
Subject: [PATCH 1/2] ci(free): run the #3680/#3679 BSD-userland regression on
 macos-named-regressions

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
---
 .github/workflows/free-tests.yml                       |  5 +++--
 .../regression-issue3680-ubicloud-bsd-userland.test.ts | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/free-tests.yml b/.github/workflows/free-tests.yml
index 966419ad3..9c2dc887f 100644
--- a/.github/workflows/free-tests.yml
+++ b/.github/workflows/free-tests.yml
@@ -186,7 +186,8 @@ jobs:
   # code that compares a realpath with an unresolved path passes on Linux's
   # /tmp and fails here (#2982). TMPDIR is deliberately left at the runner's
   # default, and the job fails if that layout is not symlinked. It also sources
-  # the Codex probe from zsh, macOS's default shell (#3024; no paid call).
+  # the Codex probe from zsh, macOS's default shell (#3024; no paid call), and
+  # runs ubi-runner under macOS's bsdtar and one-true-awk (#3680, #3679).
   macos-named-regressions:
     needs: reuse
     if: ${{ !cancelled() && (needs.reuse.result != 'success' || needs.reuse.outputs.reused != 'true') }}
@@ -229,7 +230,7 @@ jobs:
           resolved="$(realpath "$tmp")"
           echo "temp root: $tmp -> $resolved"
           test "$resolved" != "${tmp%/}"
-          files=(test/gstack-design-detect.test.ts browse/test/chromium-profile-isolation.test.ts test/cso-git-hardening.test.ts test/plan-count-file-permission.test.ts test/spec-quality-gate-secret-sink.test.ts test/gstack-memory-ingest.test.ts test/regression-issue3024-zsh-sourced-helpers.test.ts test/codex-probe-subcommands.test.ts browse/test/proxy-env-daemon.test.ts browse/test/proxy-direct-launch-args.test.ts)
+          files=(test/gstack-design-detect.test.ts browse/test/chromium-profile-isolation.test.ts test/cso-git-hardening.test.ts test/plan-count-file-permission.test.ts test/spec-quality-gate-secret-sink.test.ts test/gstack-memory-ingest.test.ts test/regression-issue3024-zsh-sourced-helpers.test.ts test/codex-probe-subcommands.test.ts browse/test/proxy-env-daemon.test.ts browse/test/proxy-direct-launch-args.test.ts test/regression-issue3680-ubicloud-bsd-userland.test.ts)
           for file in "${files[@]}"; do test -f "$file"; done
           bun test "${files[@]}"
 
diff --git a/test/regression-issue3680-ubicloud-bsd-userland.test.ts b/test/regression-issue3680-ubicloud-bsd-userland.test.ts
index a6fd98a86..85561a029 100644
--- a/test/regression-issue3680-ubicloud-bsd-userland.test.ts
+++ b/test/regression-issue3680-ubicloud-bsd-userland.test.ts
@@ -120,3 +120,13 @@ printf 200
     } finally { rmSync(f.root, { recursive: true, force: true }); }
   }, 60_000);
 });
+
+describe('CI runs these cases on the BSD userland itself', () => {
+  // Value: protects=the cases above run where /usr/bin/tar and /usr/bin/awk are the BSD tools; fails_when=macos-named-regressions stops naming this file, so Linux CI (no bsdtar or one-true-awk installed) skips every case and a #3680 or #3679 regression ships green; why_new=the file was only in the Linux free suite; seam=.github/workflows/free-tests.yml; no_claim=the job's runner image or its tool versions
+  test('free-tests.yml macos-named-regressions names this file', () => {
+    const workflow = Bun.YAML.parse(readFileSync(join(ROOT, '.github/workflows/free-tests.yml'), 'utf8')) as any;
+    const mac = workflow.jobs['macos-named-regressions'];
+    expect(mac['runs-on']).toMatch(/^macos-/);
+    expect((mac.steps as any[]).map(step => String(step.run ?? '')).join('\n')).toContain('test/regression-issue3680-ubicloud-bsd-userland.test.ts');
+  });
+});

From 234b6d37ee225e237f6bed35e288ddff771f8cd0 Mon Sep 17 00:00:00 2001
From: garrytan <garrytan@gmail.com>
Date: Mon, 2 Nov 2026 03:12:23 +0000
Subject: [PATCH 2/2] changelog: macos-named-regressions runs the BSD-userland
 ubi-runner regression (#3680)

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>
---
 changelog.d/gsta203-macos-bsd-userland.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/gsta203-macos-bsd-userland.md

diff --git a/changelog.d/gsta203-macos-bsd-userland.md b/changelog.d/gsta203-macos-bsd-userland.md
new file mode 100644
index 000000000..2e83d15d8
--- /dev/null
+++ b/changelog.d/gsta203-macos-bsd-userland.md
@@ -0,0 +1 @@
+The macOS `macos-named-regressions` CI job now runs `test/regression-issue3680-ubicloud-bsd-userland.test.ts`, so the ubi-runner cases for #3680 (bsdtar) and #3679 (macOS awk) run on a real Mac against `/usr/bin/tar` and `/usr/bin/awk`. Before, the file ran only on Linux CI, where bsdtar and one-true-awk aren't installed, so every case skipped and a regression in either could merge green. A new wiring test fails if the macOS job stops naming the file.