@event4u/agent-config 5.7.0 → 5.9.0

package/.agent-src/skills/rtk-output-filtering/SKILL.md

@@ -1,5 +1,5 @@
 ---
-model_tier: inherit
+model_tier: medium
 name: rtk-output-filtering
 description: "Use when running verbose CLI commands — wraps them with rtk (Rust Token Killer) for 60-90% token savings. Covers installation, configuration, and usage patterns."
 domain: process

package/.agent-src/skills/script-writing/SKILL.md

@@ -1,5 +1,5 @@
 ---
-model_tier: inherit
+model_tier: medium
 name: script-writing
 description: "Use when adding or editing any script under `scripts/` — `--quiet` flag, `_lib/script_output` helpers, silent Taskfile wiring, Iron-Law carve-outs — even when you just say 'add a check script for X'."
 domain: process

package/.agent-src/skills/token-optimizer/SKILL.md

@@ -1,5 +1,5 @@
 ---
-model_tier: inherit
+model_tier: medium
 name: token-optimizer
 description: "Use BEFORE any verbose CLI run, large file read, doc conversion, or near-context handoff — single decision tree keyed by intent that cites the canonical token-saving asset. Consult before the action."
 domain: process

package/.agent-src/skills/using-git-worktrees/SKILL.md

@@ -1,5 +1,5 @@
 ---
-model_tier: inherit
+model_tier: medium
 name: using-git-worktrees
 description: "Use when starting parallel work in isolation from the current branch — spawn a git worktree with ignore-safety checks and a clean test baseline — even when the user says 'try this on the side'."
 domain: process

package/.agent-src/templates/agents/agent-project-settings.example.yml

@@ -39,7 +39,7 @@ schema_version: 1
 # CI guard: a release bump of `package.json` must update this value
 # in lockstep — see scripts/check_template_pin_drift.py (road-to-
 # portable-runtime-and-update-check P3.3).
-agent_config_version: "5.6.1"
+agent_config_version: "5.7.0"
 
 # --- Project identity ---
 project:

package/.agent-src/templates/scripts/work_engine/_lib/agent_settings.py

@@ -76,6 +76,45 @@ def _local_settings_path(project_root: Path) -> Path:
     return project_root.joinpath(*LOCAL_PROJECT_SUBDIR, LOCAL_PROJECT_FILE)
 
 
+def _canonical_settings_path(project_root: Path) -> Path:
+    """Canonical project settings file: ``<root>/agents/settings/.agent-settings.yml``.
+
+    The project settings file lives in the project's settings layer
+    (``agents/settings/``, alongside ``contexts/`` and ``policies/`` and
+    the ``.agent-settings.local.yml`` override), NOT at the repo root.
+    The repo-root ``.agent-settings.yml`` is a legacy location read only
+    as a back-compat fallback (see :func:`project_settings_path`).
+    """
+    return project_root.joinpath(*LOCAL_PROJECT_SUBDIR, DEFAULT_PROJECT_FILE)
+
+
+def project_settings_path(project_root: Path) -> Path:
+    """Resolve the project settings file for **reading**.
+
+    Returns the canonical ``agents/settings/.agent-settings.yml`` when it
+    exists; otherwise the legacy repo-root ``.agent-settings.yml`` when
+    that exists (back-compat for installs predating the relocation);
+    otherwise the canonical path (so the caller still names the right
+    target on a fresh repo). Existence-checked, never writes.
+    """
+    canonical = _canonical_settings_path(project_root)
+    if canonical.exists():
+        return canonical
+    legacy = project_root / DEFAULT_PROJECT_FILE
+    if legacy.exists():
+        return legacy
+    return canonical
+
+
+def canonical_settings_write_path(project_root: Path) -> Path:
+    """Always the canonical **write** target: ``agents/settings/.agent-settings.yml``.
+
+    Writers (install, sync, migrate) target this unconditionally; the
+    legacy root file is migrated into it, never written afresh.
+    """
+    return _canonical_settings_path(project_root)
+
+
 DEFAULT_TEAM_FILE = ".agent-project-settings.yml"
 USER_GLOBAL_FILENAME = "agent-settings.yml"
 
@@ -431,12 +470,14 @@ def _resolve_cascade_paths(
     """
     if cwd is None:
         legacy = Path(project_path) if project_path else Path(DEFAULT_PROJECT_FILE)
-        return [legacy, _local_settings_path(legacy.parent)]
+        return [legacy, _canonical_settings_path(legacy.parent),
+                _local_settings_path(legacy.parent)]
 
     root = find_project_root(cwd)
     if root is None:
         legacy = Path(project_path) if project_path else Path(DEFAULT_PROJECT_FILE)
-        return [legacy, _local_settings_path(legacy.parent)]
+        return [legacy, _canonical_settings_path(legacy.parent),
+                _local_settings_path(legacy.parent)]
 
     cwd_resolved = cwd.resolve()
     # Build the chain root → … → cwd (shallowest first, deepest last).
@@ -451,9 +492,15 @@ def _resolve_cascade_paths(
             break
         cursor = parent
     chain.reverse()
-    # Committed cascade root → cwd, then the single project-level local override
-    # under agents/settings/ as the deepest (winning) layer.
-    return [d / DEFAULT_PROJECT_FILE for d in chain] + [_local_settings_path(root)]
+    # Legacy per-dir cascade root → cwd (repo-root .agent-settings.yml is the
+    # shallowest, back-compat), then the canonical project settings file under
+    # agents/settings/ (wins over the legacy root location), then the
+    # per-machine local override under agents/settings/ as the deepest (winning)
+    # layer.
+    return (
+        [d / DEFAULT_PROJECT_FILE for d in chain]
+        + [_canonical_settings_path(root), _local_settings_path(root)]
+    )
 
 
 def load_agent_settings(