@ainova-systems/intelligence 0.19.0 → 0.21.0

package/cli/lib/sync-lock.sh

@@ -31,7 +31,11 @@ sync_lock_pgid() {
     local stat
     local -a fields
     IS_PGID=""
-    if [ -r "/proc/$$/stat" ] && IFS= read -r stat < "/proc/$$/stat"; then
+    # Cygwin and MSYS publish the group on its own; composing their stat file
+    # takes tens of milliseconds.
+    if [ -r "/proc/$$/pgid" ] && IFS= read -r IS_PGID < "/proc/$$/pgid"; then
+        :
+    elif [ -r "/proc/$$/stat" ] && IFS= read -r stat < "/proc/$$/stat"; then
         # pid (comm) state ppid pgrp …: comm may hold spaces, so cut after it.
         read -r -a fields <<< "${stat##*) }"
         IS_PGID="${fields[2]:-}"
@@ -87,7 +91,8 @@ sync_lock_is_stale() {
 # sync_lock_acquire <root> — take <root>/.intelligence/sync.lock or refuse.
 sync_lock_acquire() {
     local root="$1" lock="$1/.intelligence/sync.lock" took=0 age=""
-    mkdir -p "$root/.intelligence" || die "cannot create $root/.intelligence"
+    # A process start costs tens of milliseconds on Git Bash: skip the usual case.
+    [ -d "$root/.intelligence" ] || mkdir -p "$root/.intelligence" || die "cannot create $root/.intelligence"
     if mkdir "$lock" 2>/dev/null; then
         took=1
     elif mkdir "$lock.takeover" 2>/dev/null; then
@@ -146,3 +151,15 @@ sync_lock_release() {
     fi
     SYNC_LOCK_HELD=""
 }
+
+# project_lock_scratch <root> — set IS_LOCK_SCRATCH to a path prefix inside the
+# lock this process holds or joined, for files that live only as long as the
+# run: releasing the lock removes them with it, so a hot path needs no process
+# to create or delete a temporary directory. Names carry the pid, because a
+# joined child shares the directory with its holder.
+# shellcheck disable=SC2034  # IS_LOCK_SCRATCH is the return channel
+project_lock_scratch() {
+    local lock="$1/.intelligence/sync.lock"
+    [ -d "$lock" ] && [ ! -L "$lock" ] || return 1
+    IS_LOCK_SCRATCH="$lock/scratch.$$"
+}

package/engine/ENGINE_SHA

@@ -1 +1 @@
-b1113b0658f6fddb23017e845a4ba79401caedbf
+af0a0fdbc3f505e4f063ae516c9243c92db6e376

package/engine/VERSION

@@ -1 +1 @@
-0.19.0
+0.21.0

package/engine/adapters/_template.sh

@@ -30,9 +30,17 @@
 #   map_effort(tool, effort)            — the tool's level for a neutral effort; "" when none
 #   map_access_to_claude_tools(access)  — full->"" (no tools list; inherits all), readonly->restricted
 #   map_access_to_claude_disallowed(access) — readonly->"Write, Edit", full->""
-#   read_yaml_list(manifest, section)   — read a source list from intelligence.yaml,
-#                                         package references as their store paths
+#   source_artifacts_var(root, config, section, adapter, output)
+#                                       — the sources this adapter renders (below)
+#   finalize_copy_named(dir, map, file...) — copy and finalize files under their rendered names
+#   copy_skill_bundle_dirs_named(tool, dir, map, skill_dir...) — copy skills under their rendered names
 #   get_target_field(config, target, field) — read a target's config field
+#
+# Read sources through source_artifacts_var, never with a glob of your own: it
+# names each artifact (`.draft.md` is `draft`, `me.local.md` is `me`), renders
+# only the later of two same-named artifacts, and leaves a local artifact out of
+# every output path Git tracks (decision 0021). An adapter that globs sources
+# itself can write a teammate's local file into a committed output.
 
 # Project adapters are sourced by engine/sync.sh after the shared library is
 # loaded. Keep this template position-independent: after scaffolding it lives
@@ -61,13 +69,24 @@ adapter_contract_<name>() {
 #   - Copy as-is (like Claude)
 #   - Convert paths: to globs: (like Cursor)
 #   - Merge into single file (like Copilot)
+#
+# source_artifacts_var takes the repo-relative path an artifact lands at, `{}`
+# standing for its name, and fills IS_SOURCE_FILES (the source file, or a
+# skill's SKILL.md), IS_SOURCE_NAMES, IS_SOURCE_SCOPED (1 for a rule with
+# `paths:`), IS_SOURCE_IN_AGENTS (1 when AGENTS.md carries the artifact too)
+# and IS_SOURCE_NAME_MAP, the names finalize_copy_named and
+# copy_skill_bundle_dirs_named write under. It lists only the artifacts whose
+# `targets:` / `exclude_targets:` select this adapter; the shared helpers drop
+# both fields from every copy, and a frontmatter copied by hand must too.
 sync_<name>_rules() {
     local repo_root="$1"
     local config_file="$2"
     local output_dir="$3"
 
-    # TODO: Implement rule sync logic
-    echo "  rules: not implemented"
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" rules <name> "$IS_OUTPUT_REL/rules/{}.md"
+    # TODO: Render each of IS_SOURCE_FILES into $output_dir/rules/ under its IS_SOURCE_NAMES entry
+    echo "  rules: ${#IS_SOURCE_FILES[@]} found, not rendered"
 }
 
 # Sync skills for <agent-name>
@@ -76,8 +95,11 @@ sync_<name>_skills() {
     local config_file="$2"
     local output_dir="$3"
 
-    # TODO: Implement skill sync logic
-    echo "  skills: not implemented"
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" skills <name> "$IS_OUTPUT_REL/skills/{}"
+    # TODO: Copy each skill directory ("${IS_SOURCE_FILES[i]%/SKILL.md}") with
+    # copy_skill_bundle_dirs_named <name> "$output_dir/skills" "$IS_SOURCE_NAME_MAP" <dir>...
+    echo "  skills: ${#IS_SOURCE_FILES[@]} found, not rendered"
 }
 
 # Sync agents for <agent-name>
@@ -86,8 +108,10 @@ sync_<name>_agents() {
     local config_file="$2"
     local output_dir="$3"
 
-    # TODO: Implement agent sync logic
-    echo "  agents: not implemented"
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" agents <name> "$IS_OUTPUT_REL/agents/{}.md"
+    # TODO: Render each of IS_SOURCE_FILES into $output_dir/agents/ under its IS_SOURCE_NAMES entry
+    echo "  agents: ${#IS_SOURCE_FILES[@]} found, not rendered"
 }
 
 # Main entry point

package/engine/adapters/agents.sh

@@ -14,7 +14,9 @@
 # Every per-file loop batches its work into one awk process (see the batched
 # helpers in lib/common.sh): process spawns dominate sync time on Windows.
 
-source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
+# The engine and the CLI load the shared library before any adapter. Only a
+# standalone source of this file loads it here: that costs a dirname process.
+declare -F finalize_output_file >/dev/null 2>&1 || source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
 
 # Repo-relative paths to the project's content dir and to the installed sync
 # package, taken from the env contract — never hardcoded. The content dir is
@@ -58,15 +60,19 @@ agents_md_append_agents_table() {
     local rows=""
     local count=0
 
-    local -a files=()
-    read_source_artifact_files "$repo_root" "$config_file" "agents"
-    [ "${#IS_SOURCE_FILES[@]}" -eq 0 ] || files=("${IS_SOURCE_FILES[@]}")
+    local -a files=() names=()
+    source_artifacts_var "$repo_root" "$config_file" agents agents "${output#"$repo_root"/}"
+    if [ "${#IS_SOURCE_FILES[@]}" -gt 0 ]; then
+        files=("${IS_SOURCE_FILES[@]}")
+        names=("${IS_SOURCE_NAMES[@]}")
+    fi
 
     if [ "${#files[@]}" -gt 0 ]; then
-        local path tier access desc name
+        local path tier access desc name i=0
+        # frontmatter_index prints one row per file, in argument order.
         while IFS=$'\x1f' read -r path tier access desc; do
-            [ -n "$path" ] || continue
-            name="${path##*/}"; name="${name%.md}"
+            name="${names[i]}"
+            i=$((i + 1))
             repo_rel_link_var "$repo_root" "$path"
             if [ -n "$IS_REPO_REL" ]; then
                 rows+="| [$name]($IS_REPO_REL) | ${tier:--} | ${access:--} | ${desc:--} |"$'\n'
@@ -99,21 +105,24 @@ agents_md_append_skills_table() {
     local rows=""
     local count=0
 
-    local dirname
-    local -a skill_files=()
-    read_source_artifact_files "$repo_root" "$config_file" "skills"
-    [ "${#IS_SOURCE_FILES[@]}" -eq 0 ] || skill_files=("${IS_SOURCE_FILES[@]}")
+    local name
+    local -a skill_files=() names=()
+    source_artifacts_var "$repo_root" "$config_file" skills agents "${output#"$repo_root"/}"
+    if [ "${#IS_SOURCE_FILES[@]}" -gt 0 ]; then
+        skill_files=("${IS_SOURCE_FILES[@]}")
+        names=("${IS_SOURCE_NAMES[@]}")
+    fi
 
     if [ "${#skill_files[@]}" -gt 0 ]; then
-        local path desc
+        local path desc i=0
         while IFS=$'\x1f' read -r path desc; do
-            [ -n "$path" ] || continue
-            dirname="${path%/SKILL.md}"; dirname="${dirname##*/}"
+            name="${names[i]}"
+            i=$((i + 1))
             repo_rel_link_var "$repo_root" "$path"
             if [ -n "$IS_REPO_REL" ]; then
-                rows+="| [$dirname]($IS_REPO_REL) | ${desc:--} |"$'\n'
+                rows+="| [$name]($IS_REPO_REL) | ${desc:--} |"$'\n'
             else
-                rows+="| $dirname | ${desc:--} |"$'\n'
+                rows+="| $name | ${desc:--} |"$'\n'
             fi
             count=$((count + 1))
         done < <(frontmatter_index "description" "${skill_files[@]}")
@@ -142,30 +151,25 @@ agents_md_append_rules_list() {
     local count=0
     local global_rule_files=()
 
-    local -a files=()
-    read_source_artifact_files "$repo_root" "$config_file" "rules"
-    [ "${#IS_SOURCE_FILES[@]}" -eq 0 ] || files=("${IS_SOURCE_FILES[@]}")
-
-    if [ "${#files[@]}" -gt 0 ]; then
-        local path hp name scope
-        while IFS=$'\x1f' read -r path hp; do
-            [ -n "$path" ] || continue
-            name="${path##*/}"; name="${name%.md}"
-            scope="global"
-            if [ "$hp" != "0" ]; then
-                scope="scoped"
-            else
-                global_rule_files+=("$path")
-            fi
-            repo_rel_link_var "$repo_root" "$path"
-            if [ -n "$IS_REPO_REL" ]; then
-                lines+="- [$name]($IS_REPO_REL) ($scope)"$'\n'
-            else
-                lines+="- $name ($scope)"$'\n'
-            fi
-            count=$((count + 1))
-        done < <(frontmatter_index "paths#" "${files[@]}")
-    fi
+    local i path name scope
+    source_artifacts_var "$repo_root" "$config_file" rules agents "${output#"$repo_root"/}"
+    for ((i = 0; i < ${#IS_SOURCE_FILES[@]}; i++)); do
+        path="${IS_SOURCE_FILES[i]}"
+        name="${IS_SOURCE_NAMES[i]}"
+        scope="global"
+        if [ "${IS_SOURCE_SCOPED[i]}" = 1 ]; then
+            scope="scoped"
+        else
+            global_rule_files+=("$path")
+        fi
+        repo_rel_link_var "$repo_root" "$path"
+        if [ -n "$IS_REPO_REL" ]; then
+            lines+="- [$name]($IS_REPO_REL) ($scope)"$'\n'
+        else
+            lines+="- $name ($scope)"$'\n'
+        fi
+        count=$((count + 1))
+    done
 
     [ "$count" -eq 0 ] && return 0
 
@@ -194,17 +198,7 @@ agents_md_append_rules_list() {
             echo "<!-- Inlined from always-on rules in $content_rel/rules/ -->"
             echo ""
         } >> "$output"
-        # One awk inlines every global rule body, with a blank line after
-        # each — the same output the per-file passes produced.
-        awk '
-            FNR == 1 { if (NR != 1) print ""; in_fm = 0; past_fm = 0 }
-            { sub(/\r$/, "") }
-            /^---$/ {
-                if (!past_fm) { in_fm = !in_fm; if (!in_fm) { past_fm = 1 }; next }
-            }
-            past_fm || !in_fm { print }
-            END { print "" }
-        ' "${global_rule_files[@]}" >> "$output"
+        emit_rule_bodies "${global_rule_files[@]}" >> "$output"
         echo "  rules: ${#global_rule_files[@]} global rule(s) inlined"
     fi
 }
@@ -212,7 +206,8 @@ agents_md_append_rules_list() {
 # Main entry point for AGENTS.md adapter
 adapter_contract_agents() {
     local output
-    output="$(agents_output_path "$1")"
+    agents_output_path_var "$1"
+    output="$IS_AGENTS_OUTPUT_PATH"
     adapter_contract_version 1
     adapter_contract_owned "$output"
     adapter_contract_legacy "AGENTS.md"

package/engine/adapters/antigravity.sh

@@ -11,7 +11,11 @@
 #   - Always-on (no `paths:`) -> SKIPPED here. The CLI docs tell a project to
 #     "Create a GEMINI.md or AGENTS.md file at your workspace root", and the
 #     `agents` adapter inlines always-on rule content into AGENTS.md. Emitting
-#     copies under .agents/rules/ would double-load the same text.
+#     copies under .agents/rules/ would double-load the same text. An always-on
+#     rule AGENTS.md does not carry — a local one, or one whose targets leave
+#     `agents` out — becomes .agents/rules/<name>.md with `trigger: always_on`,
+#     the same key family as `trigger: glob` and just as undocumented
+#     (decision 0021).
 #   - Path-scoped (with `paths:`) -> .agents/rules/<name>.md carrying
 #     `trigger: glob` and `globs:`. NOT vendor-documented: the rules page names
 #     four activation modes in prose (manual, always on, model decision, glob
@@ -42,7 +46,9 @@
 # Every per-file loop batches its work into one awk process (see the batched
 # helpers in lib/common.sh): process spawns dominate sync time on Windows.
 
-source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
+# The engine and the CLI load the shared library before any adapter. Only a
+# standalone source of this file loads it here: that costs a dirname process.
+declare -F finalize_output_file >/dev/null 2>&1 || source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
 
 adapter_contract_antigravity() {
     local output="${1%/}"
@@ -93,45 +99,46 @@ sync_antigravity_rules() {
     antigravity_rule_limit "$config_file" || return 1
     rule_limit="$IS_AG_RULE_LIMIT"
 
-    local src f
-    local -a files=()
-    load_yaml_list "$config_file" "rules"
-    local list="$IS_YAML_LIST"
-    while IFS= read -r src; do
-        [ -z "$src" ] && continue
-        local dir="$repo_root/$src"
-        [ -d "$dir" ] || continue
-        for f in "$dir"/*.md; do
-            [ -f "$f" ] || continue
-            files+=("$f")
-        done
-    done <<< "$list"
-
-    # Skip always-on rules: AGENTS.md (canonical) carries them.
-    local path hp base
-    local -a scoped=()
-    if [ "${#files[@]}" -gt 0 ]; then
-        while IFS=$'\x1f' read -r path hp; do
-            [ -n "$path" ] || continue
-            [ "$hp" -eq 0 ] && continue
-            scoped+=("$path")
-        done < <(frontmatter_index "paths#" "${files[@]}")
-    fi
-    if [ "${#scoped[@]}" -eq 0 ]; then
+    # Skip always-on rules AGENTS.md (canonical) carries; one it does not
+    # carry takes the always_on trigger instead (decision 0021).
+    local i always="" always_count=0
+    local -a files=() names=() kinds=()
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" rules antigravity "$IS_OUTPUT_REL/rules/{}.md"
+    for ((i = 0; i < ${#IS_SOURCE_FILES[@]}; i++)); do
+        if [ "${IS_SOURCE_SCOPED[i]}" = 1 ]; then
+            kinds+=(scoped)
+        elif [ "${IS_SOURCE_IN_AGENTS[i]}" = 0 ]; then
+            kinds+=(always-on)
+            always="$always${IS_SOURCE_FILES[i]}"$'\n'
+            always_count=$((always_count + 1))
+        else
+            continue
+        fi
+        files+=("${IS_SOURCE_FILES[i]}")
+        names+=("${IS_SOURCE_NAMES[i]}")
+    done
+    if [ "${#files[@]}" -eq 0 ]; then
         echo "  -> Rules: 0 scoped (AGENTS.md carries always-on)"
         return 0
     fi
 
-    # Path-scoped rule -> Glob activation (paths -> globs). The rewrite is
-    # anchored inside the frontmatter block: a body line may legitimately start
-    # with `paths:` (a rule documenting rule syntax does exactly that), and
-    # rewriting it would corrupt the text it teaches.
+    # Path-scoped rule -> Glob activation (paths -> globs); always-on rule ->
+    # `trigger: always_on`, with a frontmatter block of its own when the source
+    # has none. The rewrite is anchored inside the frontmatter block: a body
+    # line may legitimately start with `paths:` (a rule documenting rule
+    # syntax does exactly that), and rewriting it would corrupt the text it
+    # teaches.
     #
     # stdout carries nothing but the character-count overflow report, so the
     # limit check costs no extra process.
     local overflow
     is_fin_awk_vars
-    overflow="$(awk "${IS_FIN_V[@]}" -v dst="$output_dir/rules" -v limit="$rule_limit" "$IS_AWK_LIB"'
+    overflow="$(IS_AG_ALWAYS="$always" IS_NAME_MAP="$IS_SOURCE_NAME_MAP" awk "${IS_FIN_V[@]}" -v dst="$output_dir/rules" -v limit="$rule_limit" "$IS_AWK_LIB"'
+        BEGIN {
+            n = split(ENVIRON["IS_AG_ALWAYS"], al, "\n")
+            for (k = 1; k <= n; k++) if (al[k] != "") ALWAYS[al[k]] = 1
+        }
         function emit(line,   rendered) {
             rendered = fin_line(line)
             print rendered > out
@@ -139,11 +146,21 @@ sync_antigravity_rules() {
         }
         FNR == 1 {
             if (out != "") close(out)
-            out = dst "/" base_name(FILENAME)
+            out = dst "/" art_file(FILENAME, ".md")
             chars[out] = 0
             fm = 0
+            tgt_reset()
         }
         { sub(/\r$/, "") }
+        FNR == 1 && (FILENAME in ALWAYS) {
+            emit("---")
+            emit("trigger: always_on")
+            if ($0 == "---") { fm = 1; next }
+            emit("---")
+            fm = 2
+            emit($0)
+            next
+        }
         FNR == 1 {
             if ($0 == "---") fm = 1
             emit($0)
@@ -151,6 +168,7 @@ sync_antigravity_rules() {
             next
         }
         fm == 1 && $0 == "---" { fm = 2; emit($0); next }
+        fm == 1 && tgt_drop($0) { next }
         fm == 1 { sub(/^paths:/, "globs:") }
         { emit($0) }
         END {
@@ -159,7 +177,7 @@ sync_antigravity_rules() {
                 for (f in chars)
                     if (chars[f] > limit) printf "%s\t%d\n", f, chars[f]
         }
-    ' "${scoped[@]}" | sort)"
+    ' "${files[@]}" | sort)"
 
     local over_file over_chars
     while IFS=$'\t' read -r over_file over_chars; do
@@ -167,11 +185,18 @@ sync_antigravity_rules() {
         echo "WARNING: Antigravity limits a rule file to $rule_limit characters: ${over_file#"$repo_root/"} renders $over_chars; split the rule, shorten it, set targets.antigravity.warn_rule_limit to the effective limit, or set it to false to disable this warning." >&2
     done <<< "$overflow"
 
-    for f in "${scoped[@]}"; do
-        base="${f##*/}"
-        echo "  rule: $base (scoped)"
+    for ((i = 0; i < ${#files[@]}; i++)); do
+        # awk never reads a record from an empty source.
+        if [ "${kinds[i]}" = always-on ] && [ ! -s "${files[i]}" ]; then
+            printf -- '---\ntrigger: always_on\n---\n' > "$output_dir/rules/${names[i]}.md"
+        fi
+        echo "  rule: ${names[i]}.md (${kinds[i]})"
     done
-    echo "  -> Rules: ${#scoped[@]} scoped"
+    if [ "$always_count" -gt 0 ]; then
+        echo "  -> Rules: $(( ${#files[@]} - always_count )) scoped, $always_count always-on"
+    else
+        echo "  -> Rules: ${#files[@]} scoped"
+    fi
 }
 
 sync_antigravity_agents() {
@@ -179,19 +204,13 @@ sync_antigravity_agents() {
     local config_file="$2"
     local agents_dir="$3"
 
-    local src f
-    local -a files=()
-    load_yaml_list "$config_file" "agents"
-    local list="$IS_YAML_LIST"
-    while IFS= read -r src; do
-        [ -z "$src" ] && continue
-        local dir="$repo_root/$src"
-        [ -d "$dir" ] || continue
-        for f in "$dir"/*.md; do
-            [ -f "$f" ] || continue
-            files+=("$f")
-        done
-    done <<< "$list"
+    local -a files=() names=()
+    output_rel_var "$repo_root" "$agents_dir"
+    source_artifacts_var "$repo_root" "$config_file" agents antigravity "$IS_OUTPUT_REL/{}.md"
+    if [ "${#IS_SOURCE_FILES[@]}" -gt 0 ]; then
+        files=("${IS_SOURCE_FILES[@]}")
+        names=("${IS_SOURCE_NAMES[@]}")
+    fi
 
     local count=0
     if [ "${#files[@]}" -gt 0 ]; then
@@ -199,8 +218,7 @@ sync_antigravity_agents() {
 
         local path tier access description name spec="" report="" LS=$'\x1e'
         while IFS=$'\x1f' read -r path tier access description; do
-            [ -n "$path" ] || continue
-            name="${path##*/}"; name="${name%.md}"
+            name="${names[count]}"
             resolve_model_var "$tier"
 
             local header

package/engine/adapters/claude.sh

@@ -10,7 +10,9 @@
 # Every per-file loop batches its work into one awk process (see the batched
 # helpers in lib/common.sh): process spawns dominate sync time on Windows.
 
-source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
+# The engine and the CLI load the shared library before any adapter. Only a
+# standalone source of this file loads it here: that costs a dirname process.
+declare -F finalize_output_file >/dev/null 2>&1 || source "$(dirname "${BASH_SOURCE[0]}")/../lib/common.sh"
 
 adapter_contract_claude() {
     local output="${1%/}"
@@ -33,23 +35,15 @@ sync_claude_rules() {
     local config_file="$2"
     local output_dir="$3"
 
-    local src f
-    local -a files=()
-    load_yaml_list "$config_file" "rules"
-    local list="$IS_YAML_LIST"
-    while IFS= read -r src; do
-        [ -z "$src" ] && continue
-        local dir="$repo_root/$src"
-        [ -d "$dir" ] || continue
-        for f in "$dir"/*.md; do
-            [ -f "$f" ] || continue
-            files+=("$f")
-        done
-    done <<< "$list"
-    [ "${#files[@]}" -gt 0 ] || return 0
-    finalize_copy_files "$output_dir/rules" "${files[@]}"
-    for f in "${files[@]}"; do
-        echo "  rule: ${f##*/}"
+    local name
+    # Every source reaches this adapter through the source catalog (decision
+    # 0021): rendered names, overrides and local artifacts are settled there.
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" rules claude "$IS_OUTPUT_REL/rules/{}.md"
+    [ "${#IS_SOURCE_FILES[@]}" -gt 0 ] || return 0
+    finalize_copy_named "$output_dir/rules" "$IS_SOURCE_NAME_MAP" "${IS_SOURCE_FILES[@]}"
+    for name in "${IS_SOURCE_NAMES[@]}"; do
+        echo "  rule: $name.md"
     done
 }
 
@@ -59,25 +53,19 @@ sync_claude_skills() {
     local config_file="$2"
     local output_dir="$3"
 
-    local src d skill_name
+    local i name
     local -a skill_dirs=()
-    load_yaml_list "$config_file" "skills"
-    local list="$IS_YAML_LIST"
-    while IFS= read -r src; do
-        [ -z "$src" ] && continue
-        local dir="$repo_root/$src"
-        [ -d "$dir" ] || continue
-        for d in "$dir"/*/; do
-            [ -d "$d" ] || continue
-            [ -f "$d/SKILL.md" ] || continue
-            skill_dirs+=("$d")
-        done
-    done <<< "$list"
-    [ "${#skill_dirs[@]}" -gt 0 ] || return 0
-    copy_skill_bundle_dirs_for claude "$output_dir/skills" "${skill_dirs[@]}"
-    for d in "${skill_dirs[@]}"; do
-        skill_name="${d%/}"
-        echo "  skill: ${skill_name##*/}"
+    # The catalog's skills are the ones the inventory renders, symlinked ones
+    # included (decision 0017).
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" skills claude "$IS_OUTPUT_REL/skills/{}"
+    [ "${#IS_SOURCE_FILES[@]}" -gt 0 ] || return 0
+    for ((i = 0; i < ${#IS_SOURCE_FILES[@]}; i++)); do
+        skill_dirs+=("${IS_SOURCE_FILES[i]%/SKILL.md}/")
+    done
+    copy_skill_bundle_dirs_named claude "$output_dir/skills" "$IS_SOURCE_NAME_MAP" "${skill_dirs[@]}"
+    for name in "${IS_SOURCE_NAMES[@]}"; do
+        echo "  skill: $name"
     done
 }
 
@@ -88,32 +76,27 @@ sync_claude_agents() {
     local config_file="$2"
     local output_dir="$3"
 
-    local src f
-    local -a files=()
-    load_yaml_list "$config_file" "agents"
-    local list="$IS_YAML_LIST"
-    while IFS= read -r src; do
-        [ -z "$src" ] && continue
-        local dir="$repo_root/$src"
-        [ -d "$dir" ] || continue
-        for f in "$dir"/*.md; do
-            [ -f "$f" ] || continue
-            files+=("$f")
-        done
-    done <<< "$list"
-    [ "${#files[@]}" -gt 0 ] || return 0
+    local i
+    local -a files=() names=()
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" agents claude "$IS_OUTPUT_REL/agents/{}.md"
+    [ "${#IS_SOURCE_FILES[@]}" -gt 0 ] || return 0
+    files=("${IS_SOURCE_FILES[@]}")
+    names=("${IS_SOURCE_NAMES[@]}")
+    local name_map="$IS_SOURCE_NAME_MAP"
 
     load_model_tiers "$config_file" "claude"
 
     local path tier access effort spec="" report=""
+    i=0
     while IFS=$'\x1f' read -r path tier access effort; do
-        [ -n "$path" ] || continue
         resolve_model_var "$tier"
         map_effort_var claude "$effort"
         map_access_to_claude_tools_var "$access"
         map_access_to_claude_disallowed_var "$access"
         spec+="$path"$'\x1f'"$IS_MODEL"$'\x1f'"$IS_CLAUDE_TOOLS"$'\x1f'"$IS_CLAUDE_DISALLOWED"$'\x1f'"$IS_EFFORT"$'\n'
-        report+="  agent: ${path##*/} (tier=$tier -> model=$IS_MODEL, access=$access)"$'\n'
+        report+="  agent: ${names[i]}.md (tier=$tier -> model=$IS_MODEL, access=$access)"$'\n'
+        i=$((i + 1))
     done < <(frontmatter_index "tier,access,effort" "${files[@]}")
 
     # The transform used to run per file with the values injected via -v;
@@ -122,7 +105,7 @@ sync_claude_agents() {
     # becomes Claude's level in place, or goes when there is none; a later
     # one goes too, since frontmatter_index read only the first.
     is_fin_awk_vars
-    IS_MAP_SPEC="$spec" awk "${IS_FIN_V[@]}" -v dst="$output_dir/agents" "$IS_AWK_LIB"'
+    IS_NAME_MAP="$name_map" IS_MAP_SPEC="$spec" awk "${IS_FIN_V[@]}" -v dst="$output_dir/agents" "$IS_AWK_LIB"'
         BEGIN {
             US = sprintf("%c", 31)
             n = split(ENVIRON["IS_MAP_SPEC"], recs, "\n")
@@ -134,16 +117,18 @@ sync_claude_agents() {
         }
         FNR == 1 {
             if (out != "") close(out)
-            out = dst "/" base_name(FILENAME)
+            out = dst "/" art_file(FILENAME, ".md")
             count = 0
             fm = 0
             effort_seen = 0
+            tgt_reset()
         }
         /^tier:/  { next }
         /^access:/ { next }
         { sub(/\r$/, "") }
         FNR == 1 && $0 == "---" { fm = 1 }
         /^---$/ { count++ }
+        fm && count == 1 && !/^---$/ && tgt_drop($0) { next }
         fm && count == 1 && substr($0, 1, 7) == "effort:" {
             if (!effort_seen++ && EFFORT[FILENAME] != "") print fin_line("effort: " EFFORT[FILENAME]) > out
             next
@@ -157,8 +142,8 @@ sync_claude_agents() {
     ' "${files[@]}"
     # awk never reads a record from an empty source; the old per-file shell
     # redirect still created an empty output for it.
-    for f in "${files[@]}"; do
-        [ -s "$f" ] || : > "$output_dir/agents/${f##*/}"
+    for ((i = 0; i < ${#files[@]}; i++)); do
+        [ -s "${files[i]}" ] || : > "$output_dir/agents/${names[i]}.md"
     done
     printf '%s' "$report"
 }
@@ -176,7 +161,7 @@ sync_to_claude() {
     # commands/, statusline.sh, etc.).
     rm -rf "$output_dir/rules" "$output_dir/agents"
     if [ -d "$output_dir/skills" ]; then
-        find "$output_dir/skills" -mindepth 1 -maxdepth 1 -type d -exec rm -rf {} +
+        find "$output_dir/skills" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) -exec rm -rf {} +
     fi
     mkdir -p "$output_dir/rules" "$output_dir/skills" "$output_dir/agents"