@ainova-systems/intelligence 0.20.0 → 0.21.0

package/engine/adapters/claude.sh

@@ -35,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
 }
 
@@ -61,29 +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=()
-    # The inventory decides which skills render, symlinked ones included
-    # (decision 0017); the glob keeps this adapter's own listing order.
-    skill_source_inventory "$repo_root" "$config_file"
-    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_source_rendered "$d" || 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
 }
 
@@ -94,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;
@@ -128,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")
@@ -140,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
@@ -163,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"
 }

package/engine/adapters/codex.sh

@@ -6,6 +6,13 @@
 # inlines always-on rules into AGENTS.md, so this adapter only emits skills
 # and subagent definitions.
 #
+# Rules: an always-on rule AGENTS.md does not carry — a local one, or one whose
+#   targets leave `agents` out — goes into AGENTS.override.md beside it
+#   (decision 0021). Codex reads that file instead of AGENTS.md in the same
+#   directory, so it holds the whole AGENTS.md plus those rules. The contract
+#   ignores it, and it exists only while such a rule does; one Intelligence did
+#   not generate is never touched, and refuses a render that needs the path.
+#
 # Skills: copy skill directories in full to .agents/skills/{name}/ (Codex
 #   reads from $REPO_ROOT/.agents/skills exclusively per official docs)
 # Agents: -> .codex/agents/{name}.toml (name, description, model,
@@ -26,8 +33,61 @@ adapter_contract_codex() {
     adapter_contract_requires agents
     adapter_contract_managed ".agents/skills"
     adapter_contract_owned "$output/agents"
+    # Marker-managed: a hand-written override is left alone.
+    adapter_contract_managed "AGENTS.override.md"
     adapter_contract_ignore ".agents/skills/"
     adapter_contract_ignore "$output/agents/"
+    adapter_contract_ignore "AGENTS.override.md"
+}
+
+CODEX_OVERRIDE_MARKER="<!-- Generated by intelligence-sync. Do not edit manually. -->"
+
+# sync_codex_override <repo_root> <config_file> — write AGENTS.override.md
+# while an always-on rule AGENTS.md does not carry is for Codex, and remove a
+# generated one otherwise.
+sync_codex_override() {
+    local repo_root="$1" config_file="$2" override="$1/AGENTS.override.md" first="" agents_file i
+    local -a files=() names=()
+    source_artifacts_var "$repo_root" "$config_file" rules codex "AGENTS.override.md"
+    for ((i = 0; i < ${#IS_SOURCE_FILES[@]}; i++)); do
+        [ "${IS_SOURCE_SCOPED[i]}" = 0 ] && [ "${IS_SOURCE_IN_AGENTS[i]}" = 0 ] || continue
+        files+=("${IS_SOURCE_FILES[i]}")
+        names+=("${IS_SOURCE_NAMES[i]}")
+    done
+    if [ -f "$override" ]; then
+        IFS= read -r first < "$override" || true
+        if [ "${first%$'\r'}" != "$CODEX_OVERRIDE_MARKER" ]; then
+            [ "${#files[@]}" -gt 0 ] || return 0
+            echo "ERROR: AGENTS.override.md was not generated by intelligence-sync, but ${names[*]} need it: always-on rules for Codex that AGENTS.md does not carry go there. Move its guidance into a rule, remove it, then sync." >&2
+            return 1
+        fi
+    fi
+    if [ "${#files[@]}" -eq 0 ]; then
+        rm -f "$override"
+        return 0
+    fi
+    target_output_var "$config_file" "agents"
+    agents_output_path_var "${IS_TGT_OUTPUT:-.agents}"
+    agents_file="$repo_root/$IS_AGENTS_OUTPUT_PATH"
+    {
+        if [ -f "$agents_file" ]; then
+            cat "$agents_file"
+        else
+            printf '%s\n\n' "$CODEX_OVERRIDE_MARKER"
+        fi
+        echo "---"
+        echo ""
+        echo "## Codex Project Context"
+        echo ""
+        echo "<!-- Always-on rules AGENTS.md does not carry. Codex reads this file instead of AGENTS.md. -->"
+        echo ""
+        emit_rule_bodies "${files[@]}"
+    } > "$override"
+    finalize_output_file "$override"
+    for ((i = 0; i < ${#names[@]}; i++)); do
+        echo "  rule: ${names[i]} (always-on, AGENTS.override.md)"
+    done
+    echo "  -> AGENTS.override.md"
 }
 
 # Codex-specific guard for its documented project-instruction byte budget.
@@ -52,6 +112,8 @@ codex_warn_project_doc_size() {
     target_output_var "$config_file" "agents"
     local output
     output="$(agents_output_path "${IS_TGT_OUTPUT:-.agents}")"
+    # Codex reads AGENTS.override.md instead of AGENTS.md when it exists.
+    [ ! -f "$repo_root/AGENTS.override.md" ] || output="AGENTS.override.md"
 
     local output_file="$repo_root/$output"
     [ -f "$output_file" ] || return 0
@@ -83,19 +145,13 @@ sync_codex_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"
+    local -a files=() names=()
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" agents codex "$IS_OUTPUT_REL/{}.toml"
+    if [ "${#IS_SOURCE_FILES[@]}" -gt 0 ]; then
+        files=("${IS_SOURCE_FILES[@]}")
+        names=("${IS_SOURCE_NAMES[@]}")
+    fi
 
     local count=0
     if [ "${#files[@]}" -gt 0 ]; then
@@ -103,8 +159,7 @@ sync_codex_agents() {
 
         local path tier access description effort name sandbox spec="" report="" LS=$'\x1e'
         while IFS=$'\x1f' read -r path tier access description effort; do
-            [ -n "$path" ] || continue
-            name="${path##*/}"; name="${name%.md}"
+            name="${names[count]}"
             resolve_model_var "$tier"
             map_effort_var codex "$effort"
             case "$access" in
@@ -155,5 +210,9 @@ sync_to_codex() {
     mkdir -p "$agents_dir"
     sync_codex_agents "$repo_root" "$config_file" "$agents_dir"
 
+    # Rules AGENTS.md does not carry -> AGENTS.override.md. The contract
+    # requires `agents`, so AGENTS.md has rendered by now.
+    sync_codex_override "$repo_root" "$config_file" || return 1
+
     codex_warn_project_doc_size "$repo_root" "$config_file"
 }

package/engine/adapters/copilot.sh

@@ -8,7 +8,9 @@
 #     natively, and the `agents` adapter inlines always-on rule content
 #     into AGENTS.md. We also do not generate .github/copilot-instructions.md
 #     because Copilot bug copilot-cli#489 makes AGENTS.md ignored when
-#     copilot-instructions.md is present.
+#     copilot-instructions.md is present. An always-on rule AGENTS.md does not
+#     carry — a local one, or one whose targets leave `agents` out — becomes
+#     an .instructions.md file with `applyTo: "**"` (decision 0021).
 # Skills: copy skill directories in full to .github/skills/{name}/
 # Agents: -> .github/agents/{name}.agent.md (description, tools, model)
 #
@@ -100,8 +102,8 @@ copilot_paths_rows() {
     ' "$@"
 }
 
-# Sync rules to Copilot format. Only path-scoped rules are emitted —
-# always-on rules live in AGENTS.md (read by Copilot natively).
+# Sync rules to Copilot format. Path-scoped rules are emitted, and an always-on
+# rule only when AGENTS.md (read by Copilot natively) does not carry it.
 sync_copilot_rules() {
     local repo_root="$1"
     local config_file="$2"
@@ -112,35 +114,28 @@ sync_copilot_rules() {
 
     local scoped_count=0
 
-    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"
-
-    local -a scoped=()
-    if [ "${#files[@]}" -gt 0 ]; then
-        local path hp
-        while IFS=$'\x1f' read -r path hp; do
-            [ -n "$path" ] || continue
-            [ "$hp" -eq 0 ] && continue
-            scoped+=("$path")
-        done < <(frontmatter_index "paths#" "${files[@]}")
-    fi
+    local i always_count=0 spec="" report="" LS=$'\x1e'
+    local -a scoped=() scoped_names=()
+    output_rel_var "$repo_root" "$instructions_dir"
+    source_artifacts_var "$repo_root" "$config_file" rules copilot "$IS_OUTPUT_REL/{}.instructions.md"
+    for ((i = 0; i < ${#IS_SOURCE_FILES[@]}; i++)); do
+        if [ "${IS_SOURCE_SCOPED[i]}" = 1 ]; then
+            scoped+=("${IS_SOURCE_FILES[i]}")
+            scoped_names+=("${IS_SOURCE_NAMES[i]}")
+        elif [ "${IS_SOURCE_IN_AGENTS[i]}" = 0 ]; then
+            # An always-on rule AGENTS.md does not carry applies everywhere.
+            spec+="${IS_SOURCE_FILES[i]}"$'\x1f'"$instructions_dir/${IS_SOURCE_NAMES[i]}.instructions.md"$'\x1f'"fence_nofm"$'\x1f'"0"$'\x1f'"none"$'\x1f'"${LS}---${LS}applyTo: \"**\"${LS}---${LS}"$'\x1f\n'
+            report+="  rule: ${IS_SOURCE_NAMES[i]}.instructions.md (always-on)"$'\n'
+            always_count=$((always_count + 1))
+        fi
+    done
 
     if [ "${#scoped[@]}" -gt 0 ]; then
-        local base paths_line spec="" report="" LS=$'\x1e'
+        local path base paths_line
+        i=0
         while IFS=$'\x1f' read -r path paths_line; do
-            [ -n "$path" ] || continue
-            base="${path##*/}"; base="${base%.md}"
+            base="${scoped_names[i]}"
+            i=$((i + 1))
 
             local header
             header="${LS}---"
@@ -152,12 +147,17 @@ sync_copilot_rules() {
             report+="  rule: $base.instructions.md (scoped)"$'\n'
             scoped_count=$((scoped_count + 1))
         done < <(copilot_paths_rows "${scoped[@]}")
-
+    fi
+    if [ -n "$spec" ]; then
         emit_wrapped_bodies "$spec"
         printf '%s' "$report"
     fi
 
-    echo "  rules: $scoped_count scoped"
+    if [ "$always_count" -gt 0 ]; then
+        echo "  rules: $scoped_count scoped, $always_count always-on"
+    else
+        echo "  rules: $scoped_count scoped"
+    fi
 }
 
 # Sync skills to Copilot format (SKILL.md in .github/skills/)
@@ -166,33 +166,23 @@ sync_copilot_skills() {
     local config_file="$2"
     local output_dir="$3"
 
-    local src d skill_name
+    local i name
     local -a skill_dirs=()
-    # The inventory decides which skills render, symlinked ones included
-    # (decision 0017); the glob keeps this adapter's own listing order.
-    skill_source_inventory "$repo_root" "$config_file"
-    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_source_rendered "$d" || continue
-            skill_dirs+=("$d")
-        done
-    done <<< "$list"
+    # 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 copilot "$IS_OUTPUT_REL/skills/{}"
+    for ((i = 0; i < ${#IS_SOURCE_FILES[@]}; i++)); do
+        skill_dirs+=("${IS_SOURCE_FILES[i]%/SKILL.md}/")
+    done
 
     local count=0
     if [ "${#skill_dirs[@]}" -gt 0 ]; then
         # Copilot has no effort field: the copy carries no `effort:`.
-        copy_skill_bundle_dirs_for copilot "$output_dir/skills" "${skill_dirs[@]}"
-        for d in "${skill_dirs[@]}"; do
-            skill_name="${d%/}"
+        copy_skill_bundle_dirs_named copilot "$output_dir/skills" "$IS_SOURCE_NAME_MAP" "${skill_dirs[@]}"
+        for name in "${IS_SOURCE_NAMES[@]}"; do
             count=$((count + 1))
-            echo "  skill: ${skill_name##*/}"
+            echo "  skill: $name"
         done
     fi
 
@@ -205,19 +195,13 @@ sync_copilot_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"
+    local -a files=() names=()
+    output_rel_var "$repo_root" "$output_dir"
+    source_artifacts_var "$repo_root" "$config_file" agents copilot "$IS_OUTPUT_REL/agents/{}.agent.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
@@ -225,8 +209,7 @@ sync_copilot_agents() {
 
         local path tier access description name tools_line 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"
 
             # Build tools list based on access. Tool aliases per Copilot custom-agent