diff --git a/bin/gstack-patch-names b/bin/gstack-patch-names
index bef02aae4..d86884176 100755
--- a/bin/gstack-patch-names
+++ b/bin/gstack-patch-names
@@ -8,13 +8,15 @@ DO_PREFIX="$2"
 
 # Normalize prefix arg
 case "$DO_PREFIX" in true|1) DO_PREFIX=1 ;; *) DO_PREFIX=0 ;; esac
+# Names are read with a bash builtin loop: no process per skill (#2120).
+. "$(dirname "$0")/gstack-skill-name.sh"
 
 PATCHED=0
 for skill_dir in "$GSTACK_DIR"/*/; do
   [ -f "$skill_dir/SKILL.md" ] || continue
-  dir_name="$(basename "$skill_dir")"
+  dir_name=${skill_dir%/}; dir_name=${dir_name##*/}
   [ "$dir_name" = "node_modules" ] && continue
-  cur=$(grep -m1 '^name:' "$skill_dir/SKILL.md" 2>/dev/null | sed 's/^name:[[:space:]]*//' | tr -d '[:space:]' || true)
+  gstack_skill_md_name "$skill_dir/SKILL.md"; cur=$GSTACK_SKILL_NAME
   [ -z "$cur" ] && continue
   [ "$cur" = "gstack" ] && continue  # never prefix root skill
   if [ "$DO_PREFIX" -eq 1 ]; then
diff --git a/bin/gstack-skill-name.sh b/bin/gstack-skill-name.sh
new file mode 100644
index 000000000..01ca61d23
--- /dev/null
+++ b/bin/gstack-skill-name.sh
@@ -0,0 +1,21 @@
+# shellcheck shell=bash
+# gstack-skill-name.sh: sourced helper (bash 3.2). gstack_skill_md_name FILE
+# sets GSTACK_SKILL_NAME to the first column-0 "name:" line of FILE with every
+# whitespace character removed (CR included), or to "" when there is none or
+# FILE cannot be read. Always returns 0.
+#
+# It starts no process: no subshell, pipe or command substitution, and callers
+# must not wrap it in $( ). Setup reads ~55 names per run, and the
+# grep | sed | tr pipeline it replaces deadlocked MSYS2's fork() under x64
+# emulation on Windows ARM64 (#2120).
+gstack_skill_md_name() {
+  GSTACK_SKILL_NAME=
+  [ -f "$1" ] && [ -r "$1" ] || return 0
+  local _gsn_line
+  while IFS= read -r _gsn_line || [ -n "$_gsn_line" ]; do
+    case "$_gsn_line" in
+      name:*) _gsn_line=${_gsn_line#name:}; GSTACK_SKILL_NAME=${_gsn_line//[[:space:]]/}; return 0 ;;
+    esac
+  done < "$1"
+  return 0
+}
diff --git a/bin/gstack-uninstall b/bin/gstack-uninstall
index 5bbc12222..53315688e 100755
--- a/bin/gstack-uninstall
+++ b/bin/gstack-uninstall
@@ -59,6 +59,9 @@ GSTACK_DIR="${GSTACK_DIR:-$(cd "$(dirname "$0")/.." && pwd)}"
 STATE_DIR="$HOME/.gstack"
 _STATE_DOC="https://github.com/garrytan/gstack/blob/main/docs/state-root.md"
 . "$(dirname "$0")/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $(dirname "$0")/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade ($_STATE_DOC)" >&2; exit 1; }
+# Skill names without a process per skill (#2120); an older copy lacking the helper keeps the pipeline.
+. "$(dirname "$0")/gstack-skill-name.sh" 2>/dev/null \
+  || gstack_skill_md_name() { GSTACK_SKILL_NAME=$(grep -m1 '^name:' "$1" 2>/dev/null | sed 's/^name:[[:space:]]*//' | tr -d '[:space:]' || true); }
 gstack_state_root_select
 RESOLVED_ROOT="$_gstack_sr_root"
 RESOLVED_VAR="$_gstack_sr_var"
@@ -288,8 +291,8 @@ _INVENTORY=" _gstack-command connect-chrome gstack-connect-chrome "
 if [ -d "$GSTACK_DIR" ]; then
   for _SRC in "$GSTACK_DIR"/*/; do
     [ -f "$_SRC/SKILL.md" ] || continue
-    _SRC_NAME="$(basename "$_SRC")"
-    _FM_NAME=$(grep -m1 '^name:' "$_SRC/SKILL.md" 2>/dev/null | sed 's/^name:[[:space:]]*//' | tr -d '[:space:]' || true)
+    _SRC_NAME=${_SRC%/}; _SRC_NAME=${_SRC_NAME##*/}
+    gstack_skill_md_name "$_SRC/SKILL.md"; _FM_NAME=$GSTACK_SKILL_NAME
     for _N in "$_SRC_NAME" "$_FM_NAME"; do
       [ -n "$_N" ] || continue
       case "$_INVENTORY" in *" $_N "*) ;; *) _INVENTORY="$_INVENTORY$_N gstack-$_N " ;; esac
diff --git a/setup b/setup
index ce2a5cccc..3e6a8a38b 100755
--- a/setup
+++ b/setup
@@ -297,6 +297,7 @@ SOURCE_GSTACK_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 . "$SOURCE_GSTACK_DIR/bin/gstack-state-root.sh" 2>/dev/null || { echo "$0: cannot resolve the gstack state root: $SOURCE_GSTACK_DIR/bin/gstack-state-root.sh is missing. fix: reinstall with ./setup or /gstack-upgrade (docs/state-root.md)" >&2; exit 1; }
 gstack_state_root_select; GSTACK_STATE_ROOT="$_gstack_sr_root"
 . "$SOURCE_GSTACK_DIR/bin/gstack-path-spelling.sh" || { echo "$0: $SOURCE_GSTACK_DIR/bin/gstack-path-spelling.sh is missing. fix: reinstall from a fresh clone" >&2; exit 1; }
+. "$SOURCE_GSTACK_DIR/bin/gstack-skill-name.sh" || { echo "$0: $SOURCE_GSTACK_DIR/bin/gstack-skill-name.sh is missing. fix: reinstall from a fresh clone" >&2; exit 1; }
 . "$SOURCE_GSTACK_DIR/bin/gstack-claude-root.sh" || { echo "$0: $SOURCE_GSTACK_DIR/bin/gstack-claude-root.sh is missing. fix: reinstall from a fresh clone" >&2; exit 1; }
 . "$SOURCE_GSTACK_DIR/bin/gstack-install-registry.sh" || { echo "$0: $SOURCE_GSTACK_DIR/bin/gstack-install-registry.sh is missing. fix: reinstall from a fresh clone (docs/ADDING_A_HOST.md)" >&2; exit 1; }
 . "$SOURCE_GSTACK_DIR/bin/gstack-render-claude.sh" || { echo "$0: $SOURCE_GSTACK_DIR/bin/gstack-render-claude.sh is missing. fix: reinstall from a fresh clone" >&2; exit 1; }
@@ -2456,11 +2457,11 @@ link_claude_skill_dirs() {
   local linked=()
   for skill_dir in "$gstack_dir"/*/; do
     if [ -f "$skill_dir/SKILL.md" ]; then
-      dir_name="$(basename "$skill_dir")"
+      dir_name=${skill_dir%/}; dir_name=${dir_name##*/}
       # Skip node_modules
       [ "$dir_name" = "node_modules" ] && continue
       # Use frontmatter name: if present (e.g., run-tests/ with name: test → symlink as "test")
-      skill_name=$(grep -m1 '^name:' "$skill_dir/SKILL.md" 2>/dev/null | sed 's/^name:[[:space:]]*//' | tr -d '[:space:]')
+      gstack_skill_md_name "$skill_dir/SKILL.md"; skill_name=$GSTACK_SKILL_NAME
       [ -z "$skill_name" ] && skill_name="$dir_name"
       case "${_DISABLED_SKILLS:- }" in *" $skill_name "*|*" $dir_name "*) continue ;; esac
       # Apply gstack- prefix unless --no-prefix or already prefixed
@@ -2626,7 +2627,7 @@ cleanup_old_claude_symlinks() {
   # literal (empty skills_dir) is rejected by the same guard.
   for old_target in "$skills_dir"/*; do
     [ -e "$old_target" ] || [ -L "$old_target" ] || continue
-    skill_name="$(basename "$old_target")"
+    skill_name=${old_target##*/}
     [ "$skill_name" = "node_modules" ] && continue
     [ "$skill_name" = "gstack" ] && continue
     # Skip already-prefixed dirs (gstack-upgrade) — no old symlink to clean
@@ -2666,7 +2667,7 @@ cleanup_old_claude_symlinks() {
   if [ "${IS_WINDOWS:-0}" -eq 1 ] && [ -d "$gstack_dir" ]; then
     for skill_dir in "$gstack_dir"/*/; do
       if [ -f "$skill_dir/SKILL.md" ]; then
-        skill_name="$(basename "$skill_dir")"
+        skill_name=${skill_dir%/}; skill_name=${skill_name##*/}
         [ "$skill_name" = "node_modules" ] && continue
         case "$skill_name" in gstack-*) continue ;; esac
         old_target="$skills_dir/$skill_name"
@@ -2697,7 +2698,7 @@ cleanup_prefixed_claude_symlinks() {
   local removed=()
   for skill_dir in "$gstack_dir"/*/; do
     if [ -f "$skill_dir/SKILL.md" ]; then
-      skill_name="$(basename "$skill_dir")"
+      skill_name=${skill_dir%/}; skill_name=${skill_name##*/}
       [ "$skill_name" = "node_modules" ] && continue
       # Only clean up prefixed entries for dirs that AREN'T already prefixed
       # (e.g., remove gstack-qa but NOT gstack-upgrade which is the real dir name)
@@ -2762,7 +2763,7 @@ link_codex_skill_dirs() {
 
   for skill_dir in "$agents_dir"/gstack*/; do
     if [ -f "$skill_dir/SKILL.md" ]; then
-      skill_name="$(basename "$skill_dir")"
+      skill_name=${skill_dir%/}; skill_name=${skill_name##*/}
       case "${_DISABLED_SKILLS:- }" in *" ${skill_name#gstack-} "*) _remove_disabled_host_entry "$skills_dir/$skill_name"; continue ;; esac
       # Skip the sidecar directory — it contains runtime asset symlinks (bin/,
       # browse/), not a skill. Linking it would overwrite the root gstack
diff --git a/test/relink.test.ts b/test/relink.test.ts
index 87dfa51d9..b054cd274 100644
--- a/test/relink.test.ts
+++ b/test/relink.test.ts
@@ -58,6 +58,7 @@ function setupMockInstall(skills: string[]): void {
   fs.chmodSync(path.join(mockBin, 'gstack-config'), 0o755);
   // A real install always ships the state-root twin beside the bins that source it.
   fs.copyFileSync(path.join(BIN, 'gstack-state-root.sh'), path.join(mockBin, 'gstack-state-root.sh'));
+  fs.copyFileSync(path.join(BIN, 'gstack-skill-name.sh'), path.join(mockBin, 'gstack-skill-name.sh'));
   if (fs.existsSync(path.join(BIN, 'gstack-relink'))) {
     fs.copyFileSync(path.join(BIN, 'gstack-relink'), path.join(mockBin, 'gstack-relink'));
     fs.chmodSync(path.join(mockBin, 'gstack-relink'), 0o755);
diff --git a/test/setup-alias-name-uniqueness.test.ts b/test/setup-alias-name-uniqueness.test.ts
index eeca36123..b2a772ba4 100644
--- a/test/setup-alias-name-uniqueness.test.ts
+++ b/test/setup-alias-name-uniqueness.test.ts
@@ -80,6 +80,7 @@ beforeAll(() => {
     extractFn('_write_owned_marker'),
     extractFn('_print_windows_copy_note_once'),
     extractFn('_link_skill_runtime_assets'),
+    `. "${path.join(ROOT, 'bin/gstack-skill-name.sh')}"`,
     extractFn('link_claude_skill_dirs'),
     extractFn('_install_alias_skill_md'),
     extractFn('link_claude_root_skill_alias'),
diff --git a/test/setup-claude-code-migration.test.ts b/test/setup-claude-code-migration.test.ts
index cbc4ad113..85ebe5e9f 100644
--- a/test/setup-claude-code-migration.test.ts
+++ b/test/setup-claude-code-migration.test.ts
@@ -31,7 +31,7 @@ function fixture(copy: boolean) {
   put(path.join(root, 'VERSION'), '2.0.0.0\n');
   put(path.join(root, 'ETHOS.md'), 'Fixture ethos\n');
   put(path.join(root, 'package.json'), JSON.stringify({ type: 'module', scripts: { 'gen:skill-docs': 'bun run scripts/gen-skill-docs.ts' } }));
-  for (const bin of ['gstack-config', 'gstack-patch-names', 'gstack-relink', 'gstack-migrate-claude-code', 'gstack-claude-code', 'gstack-models', 'gstack-state-root.sh', 'gstack-bun-version.sh', 'gstack-path-spelling.sh', 'gstack-claude-root.sh', 'gstack-install-registry.sh', 'gstack-render-claude.sh', 'gstack-host-renders.sh']) {
+  for (const bin of ['gstack-config', 'gstack-patch-names', 'gstack-relink', 'gstack-migrate-claude-code', 'gstack-claude-code', 'gstack-models', 'gstack-state-root.sh', 'gstack-bun-version.sh', 'gstack-path-spelling.sh', 'gstack-skill-name.sh', 'gstack-claude-root.sh', 'gstack-install-registry.sh', 'gstack-render-claude.sh', 'gstack-host-renders.sh']) {
     const target = path.join(root, 'bin', bin);
     fs.mkdirSync(path.dirname(target), { recursive: true });
     fs.copyFileSync(path.join(ROOT, 'bin', bin), target);
diff --git a/test/setup-claude-skill-assets.test.ts b/test/setup-claude-skill-assets.test.ts
index d6cffb8a1..ca95ddc9d 100644
--- a/test/setup-claude-skill-assets.test.ts
+++ b/test/setup-claude-skill-assets.test.ts
@@ -82,6 +82,7 @@ beforeAll(() => {
     '_FOREIGN_SKIPPED_ENTRIES=()',
     '_BACKED_UP_SKILL_MDS=()',
     `_SKILL_BACKUP_ROOT="${os.tmpdir()}/gstack-harness-backups-${process.pid}"`,
+    `. "${path.join(ROOT, 'bin/gstack-skill-name.sh')}"`,
     extractFn('link_claude_skill_dirs'),
     `link_claude_skill_dirs "${ROOT}" "${installDir}"`,
   ].join('\n');
diff --git a/test/setup-fork-free-skill-names.test.ts b/test/setup-fork-free-skill-names.test.ts
new file mode 100644
index 000000000..a42168f6d
--- /dev/null
+++ b/test/setup-fork-free-skill-names.test.ts
@@ -0,0 +1,150 @@
+/**
+ * #2120: on Windows on ARM64, x64-emulated Git Bash intermittently deadlocks
+ * in MSYS2's fork() emulation, and ./setup hung in the per-skill loops that
+ * read each SKILL.md name with a grep | sed | tr pipeline plus a basename
+ * (about four process starts per skill, ~55 skills a run). The deadlock
+ * itself needs that host; these cases pin the cause they can see anywhere:
+ * the loops start none of those processes per skill. Every grep, sed, tr and
+ * basename the code under test starts goes through a logging shim on PATH.
+ */
+import { describe, expect, test } from 'bun:test';
+import { spawnSync } from 'child_process';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { runBashScript } from './helpers/bash-script';
+
+const ROOT = path.resolve(import.meta.dir, '..');
+const SETUP_SRC = fs.readFileSync(path.join(ROOT, 'setup'), 'utf-8');
+const HELPER = path.join(ROOT, 'bin/gstack-skill-name.sh');
+const SHIMMED = ['grep', 'sed', 'tr', 'basename'];
+const SKILLS = ['qa', 'review', 'ship', 'office-hours', 'investigate', 'land-and-deploy', 'retro', 'cso'];
+
+function extractFn(name: string): string {
+  const start = SETUP_SRC.indexOf(`\n${name}() {`);
+  const end = SETUP_SRC.indexOf('\n}\n', start);
+  if (start < 0 || end < 0) throw new Error(`function not found: ${name}`);
+  return SETUP_SRC.slice(start + 1, end + 2);
+}
+
+/** A temp tree, a PATH whose grep/sed/tr/basename log each start to calls.log, and a reader for that log. */
+function sandbox() {
+  const tmp = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), 'gstack-fork-free-')));
+  const shim = path.join(tmp, 'shim');
+  const log = path.join(tmp, 'calls.log');
+  fs.mkdirSync(shim);
+  for (const name of SHIMMED) {
+    const real = spawnSync('bash', ['-c', `type -P ${name}`], { encoding: 'utf8', timeout: 10_000 }).stdout.trim();
+    fs.writeFileSync(path.join(shim, name), `#!/bin/sh\necho ${name} >> "${log}"\nexec "${real}" "$@"\n`, { mode: 0o755 });
+  }
+  return {
+    tmp, env: { PATH: `${shim}${path.delimiter}${process.env.PATH ?? ''}`, HOME: tmp, GSTACK_USER_RENDER_DIR: path.join(tmp, 'no-render') },
+    calls: () => fs.existsSync(log) ? fs.readFileSync(log, 'utf8').split('\n').filter(Boolean) : [],
+    reset: () => fs.rmSync(log, { force: true }),
+    cleanup: () => fs.rmSync(tmp, { recursive: true, force: true }),
+  };
+}
+
+const skillMd = (name: string, eol = '\n') => ['---', `name: ${name}`, 'description: fixture', '---', `# ${name}`, ''].join(eol);
+
+/** A payload of SKILLS (qa in CRLF, office-hours named "oh"), then "zz-nameless" with no name: line after them. */
+function payload(dir: string) {
+  for (const name of SKILLS) {
+    fs.mkdirSync(path.join(dir, name), { recursive: true });
+    fs.writeFileSync(path.join(dir, name, 'SKILL.md'), skillMd(name === 'office-hours' ? 'oh' : name, name === 'qa' ? '\r\n' : '\n'));
+  }
+  fs.mkdirSync(path.join(dir, 'zz-nameless'), { recursive: true });
+  fs.writeFileSync(path.join(dir, 'zz-nameless', 'SKILL.md'), '---\ndescription: no name\n---\n# nameless\n');
+}
+
+describe.skipIf(process.platform === 'win32')('setup name reads start no process per skill (#2120)', () => {
+  // Value: protects=the helper returns what the old grep -m1 | sed | tr pipeline returned, and never a stale name; fails_when=it keeps the
+  //   previous value, reads a non-column-0 name, keeps a CR or space, or returns non-zero; why_new=the helper is new; seam=none
+  test('gstack_skill_md_name matches the old pipeline on odd inputs, resets between files and always returns 0', () => {
+    const s = sandbox();
+    try {
+      const cases: Record<string, string> = {
+        plain: '---\nname: qa\n---\n', crlf: '---\r\nname: qa\r\n---\r\n', spaced: 'name:   my skill \t\n', noeol: 'name: last',
+        indented: '  name: no\nname: yes\n', nameless: '---\ndescription: x\n---\n', empty: '', later: '# t\nbody\nname: deep\nname: second\n',
+      };
+      const files = Object.entries(cases).map(([k, v]) => { const f = path.join(s.tmp, k); fs.writeFileSync(f, v); return f; });
+      files.push(path.join(s.tmp, 'missing'));
+      const old = (f: string) => spawnSync('bash', ['-c', "grep -m1 '^name:' \"$1\" 2>/dev/null | sed 's/^name:[[:space:]]*//' | tr -d '[:space:]'", '_', f], { encoding: 'utf8', timeout: 10_000 }).stdout;
+      const script = [`set -euo pipefail; . "${HELPER}"; GSTACK_SKILL_NAME=stale`,
+        ...files.map(f => `gstack_skill_md_name "${f}"; printf '%s\n' "[$GSTACK_SKILL_NAME]"`)].join('\n');
+      const r = runBashScript(script, { timeout: 10_000, env: s.env });
+      expect(r.status, r.stderr ?? '').toBe(0);
+      expect(r.stdout.trim().split('\n')).toEqual(files.map(f => `[${old(f)}]`));
+      expect(s.calls()).toEqual([]);
+    } finally {
+      s.cleanup();
+    }
+  });
+
+  // Value: protects=no caller re-adds a fork per skill by wrapping the helper in $( ), and the helper itself stays fork-free;
+  //   fails_when=a call site uses $(gstack_skill_md_name ...) or the helper body gains $(, a pipe or a backquote; why_new=the shims cannot see a subshell fork; seam=none
+  test('the helper starts no subshell and no caller wraps it in $( )', () => {
+    const body = fs.readFileSync(HELPER, 'utf8').split('\n').filter(l => !/^\s*#/.test(l)).join('\n');
+    expect(body).not.toMatch(/\$\(|`|(^|[^|])\|([^|]|$)/m);
+    for (const rel of ['setup', 'bin/gstack-patch-names', 'bin/gstack-uninstall']) {
+      expect(fs.readFileSync(path.join(ROOT, rel), 'utf8'), rel).not.toMatch(/\$\(\s*gstack_skill_md_name/);
+    }
+  });
+
+  // Value: protects=gstack-patch-names reads every name without a per-skill grep|sed|tr|basename (the first loop #2120 hung in);
+  //   fails_when=the loop goes back to a process pipeline per SKILL.md; why_new=no case counted process starts; seam=PATH shims
+  test('gstack-patch-names: no process per skill when nothing needs a rename; a rename starts only its own sed', () => {
+    const s = sandbox();
+    try {
+      const dir = path.join(s.tmp, 'gstack');
+      payload(dir);
+      const off = spawnSync('bash', [path.join(ROOT, 'bin/gstack-patch-names'), dir, '0'], { encoding: 'utf8', env: s.env, timeout: 30_000 });
+      expect(off.status, off.stderr).toBe(0);
+      expect(off.stdout).toBe('');
+      expect(s.calls()).toEqual([]);
+
+      const on = spawnSync('bash', [path.join(ROOT, 'bin/gstack-patch-names'), dir, '1'], { encoding: 'utf8', env: s.env, timeout: 30_000 });
+      expect(on.status, on.stderr).toBe(0);
+      expect(on.stdout).toContain(`patched name: field in ${SKILLS.length} skills`);
+      for (const name of SKILLS) expect(fs.readFileSync(path.join(dir, name, 'SKILL.md'), 'utf8')).toContain(`name: gstack-${name === 'office-hours' ? 'oh' : name}`);
+      expect(fs.readFileSync(path.join(dir, 'zz-nameless', 'SKILL.md'), 'utf8')).not.toContain('name:');
+      expect(s.calls()).toEqual(Array(SKILLS.length).fill('sed'));
+    } finally {
+      s.cleanup();
+    }
+  });
+
+  // Value: protects=link_claude_skill_dirs and both cleanup loops run with no per-skill grep, sed, tr or basename, and a nameless SKILL.md links
+  //   under its directory name, never the previous skill's name (#2120); fails_when=a loop goes back to a pipeline or basename, or the name leaks;
+  //   why_new=link tests checked links, not process starts; seam=PATH shims
+  test('link_claude_skill_dirs and the two cleanup loops: no per-skill grep, sed, tr or basename; names come from frontmatter', () => {
+    const s = sandbox();
+    try {
+      const pl = path.join(s.tmp, 'skills', 'gstack');
+      payload(pl);
+      const script = [
+        'set -e', 'IS_WINDOWS=0', 'SKILL_PREFIX=0', '_FOREIGN_SKIPPED_ENTRIES=()', '_BACKED_UP_SKILL_MDS=()',
+        '_link_skill_runtime_assets() { :; }', '_print_windows_copy_note_once() { :; }',
+        ...['_link_or_copy', '_gstack_link_target_abs', '_gstack_target_is_ours', '_claude_entry_is_ours', '_write_owned_marker',
+          '_gstack_generated_header', '_claude_entry_owned_strongly', '_backup_skill_md', '_cleanup_weak_dir', '_gstack_dir_only_links',
+          '_cleanup_linked_dir'].map(extractFn),
+        `. "${HELPER}"`,
+        ...['link_claude_skill_dirs', 'cleanup_old_claude_symlinks', 'cleanup_prefixed_claude_symlinks'].map(extractFn),
+        `cleanup_old_claude_symlinks "${pl}" "${path.dirname(pl)}"`,
+        `cleanup_prefixed_claude_symlinks "${pl}" "${path.dirname(pl)}"`,
+        `link_claude_skill_dirs "${pl}" "${path.dirname(pl)}"`,
+      ].join('\n');
+      const r = runBashScript(script, { timeout: 30_000, env: s.env });
+      expect(r.stderr ?? '').not.toContain('command not found');
+      expect(r.status, r.stderr ?? '').toBe(0);
+      expect(r.stdout).toContain('linked skills:');
+      for (const name of [...SKILLS.map(n => n === 'office-hours' ? 'oh' : n), 'zz-nameless']) {
+        expect(fs.existsSync(path.join(s.tmp, 'skills', name, 'SKILL.md')), name).toBe(true);
+      }
+      expect(fs.existsSync(path.join(s.tmp, 'skills', 'office-hours'))).toBe(false);
+      expect(s.calls()).toEqual([]);
+    } finally {
+      s.cleanup();
+    }
+  });
+});
diff --git a/test/setup-link-ownership.test.ts b/test/setup-link-ownership.test.ts
index ed8f5c465..745c44b39 100644
--- a/test/setup-link-ownership.test.ts
+++ b/test/setup-link-ownership.test.ts
@@ -28,6 +28,7 @@ const HELPERS = [
   '_link_skill_runtime_assets() { :; }',
   '_print_windows_copy_note_once() { :; }',
   extractFn('_link_or_copy'),
+  `. "${path.join(ROOT, 'bin/gstack-skill-name.sh')}"`,
   extractFn('_gstack_link_target_abs'),
   extractFn('_gstack_target_is_ours'),
   extractFn('_claude_entry_is_ours'),
diff --git a/test/team-mode.test.ts b/test/team-mode.test.ts
index ad36946a2..4bca76887 100644
--- a/test/team-mode.test.ts
+++ b/test/team-mode.test.ts
@@ -455,7 +455,7 @@ describe('setup --team / --no-team / -q', () => {
     try {
       for (const rel of [
         'setup', 'VERSION', 'SKILL.md', 'qa/SKILL.md', 'bin/gstack-config', 'bin/gstack-patch-names',
-        'bin/gstack-state-root.sh', 'bin/gstack-bun-version.sh', 'bin/gstack-path-spelling.sh', 'bin/gstack-claude-root.sh', 'bin/gstack-install-registry.sh', 'bin/gstack-render-claude.sh', 'bin/gstack-host-renders.sh',
+        'bin/gstack-state-root.sh', 'bin/gstack-bun-version.sh', 'bin/gstack-path-spelling.sh', 'bin/gstack-skill-name.sh', 'bin/gstack-claude-root.sh', 'bin/gstack-install-registry.sh', 'bin/gstack-render-claude.sh', 'bin/gstack-host-renders.sh',
         'scripts/resolve-codex-generation-model.ts', 'scripts/models.ts', 'scripts/preflight-codex-overlap.ts',
         'scripts/discover-skills.ts', 'scripts/external-skill-names.ts', 'scripts/host-config.ts',
         'lib/claude-code-migration.ts', 'lib/model-policy.ts', 'lib/model-catalog.ts',