@event4u/agent-config 1.39.0 → 1.41.0

package/scripts/pack_mcp_content.py

@@ -41,6 +41,7 @@ from typing import Any
 _SCRIPTS_DIR = Path(__file__).resolve().parent
 sys.path.insert(0, str(_SCRIPTS_DIR))
 
+from mcp_server.catalog import load_raw as load_tool_catalog_raw  # noqa: E402
 from mcp_server.prompts import scan_commands, scan_skills  # noqa: E402
 from mcp_server.resources import scan_contexts, scan_guidelines, scan_rules  # noqa: E402
 
@@ -130,11 +131,15 @@ def _collect_entries(root: Path) -> tuple[dict[str, dict[str, Any]], list[str]]:
     return uris, errors
 
 
-def _content_signature(uris: dict[str, dict[str, Any]]) -> tuple[str, str]:
-    """SHA-256 over sorted (uri, body) pairs.
+def _content_signature(
+    uris: dict[str, dict[str, Any]],
+    tool_catalog: dict[str, Any],
+) -> tuple[str, str]:
+    """SHA-256 over sorted (uri, body) pairs plus the tool catalog JSON.
 
     Returns (full_hex, 12-char prefix). The prefix is the wire-surface
     `skillSetSignature`; the full hex is the diagnostic `content_hash_sha256`.
+    Including the catalog ensures a stub edit produces a new release_key.
     """
     hasher = hashlib.sha256()
     for uri in sorted(uris):
@@ -142,6 +147,10 @@ def _content_signature(uris: dict[str, dict[str, Any]]) -> tuple[str, str]:
         hasher.update(b"\x00")
         hasher.update(uris[uri]["body"].encode("utf-8"))
         hasher.update(b"\x1e")
+    hasher.update(b"\x1d")
+    hasher.update(
+        json.dumps(tool_catalog, ensure_ascii=False, sort_keys=True).encode("utf-8")
+    )
     digest = hasher.hexdigest()
     return digest, digest[:12]
 
@@ -164,6 +173,7 @@ def _build_manifest(
     git_sha: str,
     built_at: str,
     counts: dict[str, int],
+    tool_count: int,
 ) -> dict[str, Any]:
     short = git_sha[:7] if git_sha and git_sha != "0" * 40 else "unknown"
     return {
@@ -176,6 +186,7 @@ def _build_manifest(
         "built_at": built_at,
         "packer_version": PACKER_VERSION,
         "content_uri_count": counts,
+        "tool_count": tool_count,
     }
 
 
@@ -188,7 +199,8 @@ def pack(root: Path, out_dir: Path) -> dict[str, Any]:
             sys.stderr.write(f"  - {line}\n")
         raise SystemExit(2)
 
-    content_hash, signature = _content_signature(uris)
+    tool_catalog = load_tool_catalog_raw()
+    content_hash, signature = _content_signature(uris, tool_catalog)
     counts = _count_kinds(uris)
     built_at = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
     manifest = _build_manifest(
@@ -198,11 +210,13 @@ def pack(root: Path, out_dir: Path) -> dict[str, Any]:
         git_sha=_git_sha(root),
         built_at=built_at,
         counts=counts,
+        tool_count=len(tool_catalog.get("tools", [])),
     )
 
     blob = {
         "schema_version": SCHEMA_VERSION,
         "uris": uris,
+        "tool_catalog": tool_catalog,
         "manifest": manifest,
     }
     # Compact JSON for the bundle (saves ~20 KB vs indent=2). The R2
@@ -265,7 +279,7 @@ def main(argv: list[str] | None = None) -> int:
             f"release={manifest['release_key']} "
             f"skills={c['skill']} commands={c['command']} "
             f"rules={c['rule']} guidelines={c['guideline']} "
-            f"contexts={c['context']}\n"
+            f"contexts={c['context']} tools={manifest['tool_count']}\n"
         )
     return 0
 

package/scripts/skill_linter.py

@@ -1605,6 +1605,15 @@ def gather_changed_candidate_files(root: Path) -> list[Path]:
             if path.is_symlink():
                 continue
             norm = raw.replace("\\", "/")
+            # Only lint source-of-truth and source-mirror dirs. Projection
+            # dirs (.windsurf/, .cursor/, .clinerules/, .claude/) use
+            # tool-native frontmatter (e.g. Windsurf's trigger/globs) that
+            # the linter does not validate — they regenerate from source.
+            if not (
+                norm.startswith(".agent-src.uncompressed/")
+                or norm.startswith(".agent-src/")
+            ):
+                continue
             if path.name == "SKILL.md" or "/rules/" in norm or "/commands/" in norm:
                 files.append(path)
         return sorted(set(files))

package/scripts/sync_gitignore.py

@@ -14,7 +14,13 @@ are preserved). Call with `--replace` for a destructive full rewrite.
 
 Usage:
     python3 scripts/sync_gitignore.py [--path .gitignore] [--template config/gitignore-block.txt]
-                                      [--dry-run] [--replace] [--quiet]
+                                      [--dry-run] [--replace] [--cleanup-legacy] [--quiet]
+
+`--cleanup-legacy` additionally scrubs legacy patterns (pre-/agents/ layout
+runtime artefacts) from anywhere in the target file — inside the managed
+block and outside, where older installers or hand-edits dropped them.
+Runs before the regular sync, so a single invocation removes garbage and
+re-adds the current canonical entries.
 
 Exit codes:
     0 — no changes needed (or --dry-run ran successfully)
@@ -34,6 +40,20 @@ SECTION_FOOTER = "# event4u/agent-config — END"
 DEFAULT_GITIGNORE = ".gitignore"
 DEFAULT_TEMPLATE = Path(__file__).resolve().parent.parent / "config" / "gitignore-block.txt"
 
+# Legacy patterns that lived in older versions of config/gitignore-block.txt
+# before runtime artefacts moved under /agents/ (May 2026). They get stripped
+# wherever they appear in the consumer's .gitignore — inside the managed block
+# or outside (older installers / hand-edits). Current canonical equivalents
+# (e.g. /agents/.agent-chat-history) come from the template and are NOT
+# affected. Leading-slash variants are matched defensively.
+LEGACY_PATTERNS: tuple[str, ...] = (
+    ".agent-chat-history",
+    ".agent-chat-history.bak",
+    ".agent-chat-history.*.bak",
+    ".agent-prices.md",
+    ".council-tmp/",
+)
+
 
 def _strip(ln: str) -> str:
     return ln.rstrip("\n").rstrip()
@@ -149,6 +169,26 @@ def sync_block(existing_lines: list[str],
     return head + new_block + tail, missing
 
 
+def cleanup_legacy(lines: list[str]) -> tuple[list[str], list[str]]:
+    """Strip legacy entries from anywhere in the file.
+
+    A line is legacy when its stripped, leading-whitespace-trimmed content
+    matches a `LEGACY_PATTERNS` entry — with or without a leading slash.
+    Comments and blank lines are untouched; current managed entries (e.g.
+    `/agents/.agent-chat-history`) are not in the legacy set and survive.
+    """
+    legacy = set(LEGACY_PATTERNS)
+    kept: list[str] = []
+    removed: list[str] = []
+    for ln in lines:
+        s = _strip(ln).lstrip()
+        if s in legacy or (s.startswith("/") and s[1:] in legacy):
+            removed.append(s)
+            continue
+        kept.append(ln)
+    return kept, removed
+
+
 def format_file(lines: list[str]) -> str:
     """Join lines with newlines and enforce exactly one trailing newline."""
     text = "\n".join(lines)
@@ -174,6 +214,9 @@ def main(argv: list[str] | None = None) -> int:
     ap.add_argument("--replace", action="store_true",
                     help="rewrite the block in full (discards user-added "
                          "lines inside the block)")
+    ap.add_argument("--cleanup-legacy", action="store_true",
+                    help="strip legacy patterns (pre-/agents/ layout) from "
+                         "anywhere in the file before syncing the block")
     ap.add_argument("--quiet", action="store_true",
                     help="suppress summary on success")
     args = ap.parse_args(argv)
@@ -193,6 +236,10 @@ def main(argv: list[str] | None = None) -> int:
         existing_text = ""
         existing_lines = []
 
+    removed_legacy: list[str] = []
+    if args.cleanup_legacy:
+        existing_lines, removed_legacy = cleanup_legacy(existing_lines)
+
     new_lines, added = sync_block(
         existing_lines, template_lines, replace=args.replace,
     )
@@ -211,6 +258,10 @@ def main(argv: list[str] | None = None) -> int:
             print(f"\n(dry-run) would add {len(added)} entr"
                   f"{'y' if len(added) == 1 else 'ies'} to {target}",
                   file=sys.stderr)
+            if removed_legacy:
+                print(f"(dry-run) would remove {len(removed_legacy)} legacy "
+                      f"entr{'y' if len(removed_legacy) == 1 else 'ies'}: "
+                      f"{', '.join(removed_legacy)}", file=sys.stderr)
         return 0
 
     target.parent.mkdir(parents=True, exist_ok=True)
@@ -219,6 +270,10 @@ def main(argv: list[str] | None = None) -> int:
         action = "replaced" if args.replace else "updated"
         print(f"✅  {target}: {action} block "
               f"({len(added)} entr{'y' if len(added) == 1 else 'ies'} added)")
+        if removed_legacy:
+            print(f"   removed {len(removed_legacy)} legacy "
+                  f"entr{'y' if len(removed_legacy) == 1 else 'ies'}: "
+                  f"{', '.join(removed_legacy)}")
     return 0
 
 

package/templates/claude_desktop_config.json.template

@@ -0,0 +1,22 @@
+{
+  "//": "Claude Desktop config template — agent-config",
+  "//1": "Copy this to one of:",
+  "//2": "  macOS   ~/Library/Application Support/Claude/claude_desktop_config.json",
+  "//3": "  Windows %APPDATA%\\Claude\\claude_desktop_config.json",
+  "//4": "  Linux   ~/.config/Claude/claude_desktop_config.json",
+  "//5": "Strip the leading '_disabled_' prefix on the mcpServers entry below to enable the MCP connector.",
+  "//6": "Replace https://your-worker.workers.dev with the URL of your own deployed Cloudflare Worker (see docs/setup/mcp-cloud-setup.md). The Worker is read-only and identity-stable per release; full client setup details in docs/setup/mcp-client-config.md.",
+  "//7": "If your Worker has MCP-Token set (recommended), uncomment the --header / env lines below and paste the token. Otherwise drop them.",
+  "//8": "Restart Claude Desktop fully (Cmd+Q on macOS) after editing — the menubar process keeps the old config cached otherwise.",
+
+  "_disabled_mcpServers": {
+    "agent-config": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "mcp-remote",
+        "https://your-worker.workers.dev"
+      ]
+    }
+  }
+}

package/templates/cursor-rule.mdc.j2

@@ -0,0 +1,7 @@
+---
+description: {{ description }}
+globs: {{ globs | default("") }}
+alwaysApply: {{ "true" if always_apply else "false" }}
+---
+
+{{ body }}

package/templates/global-install-manifest.yml

@@ -0,0 +1,91 @@
+# Global Install Manifest — road-to-simplicity-and-everywhere Phase 3
+#
+# Curated subset of rules + skills shipped to user-scope directories
+# (~/.claude/, ~/.cursor/, ~/.codeium/windsurf/, ~/.config/agent-config/)
+# by `scripts/install --global`. Without curation we'd dump 200+ skills
+# into user dirs — that is the failure mode anthropics/claude-code#53950
+# flagged.
+#
+# Schema (v1):
+#   kernel_rules: list[str]   — rule IDs from router.json's `kernel`.
+#                               Always shipped to every enabled surface.
+#   top_skills:   list[entry] — curated universal skills.
+#     entry.id        : skill directory under .agent-src/skills/
+#     entry.surfaces  : subset of [claude-code, cursor, windsurf, fallback]
+#                       — fallback is always written.
+#
+# Source: kernel_rules mirrors router.json; top_skills is a 15-pick
+# distilled from .agent-src/skills/ — universal coding-loop helpers
+# (work, commit, PR, review, quality, analyze, handoff). Per-stack
+# skills (laravel, react-shadcn-ui, php-coder) stay project-local.
+#
+# Per-tool target paths (handled by scripts/install.py global subcommand):
+#   claude-code  : ~/.claude/skills/event4u/<id>/SKILL.md
+#                  ~/.claude/rules/event4u/<rule>.md
+#   cursor       : ~/.cursor/rules/imported/event4u/<rule>.mdc
+#                  ~/.cursor/skills/event4u/<id>/  (skills surface; mirrors agent-os)
+#   windsurf     : ~/.codeium/windsurf/global_workflows/event4u/<id>.md
+#   fallback     : ~/.config/agent-config/{rules,skills}/event4u/
+#
+# All writes are namespaced under `event4u/` so `--global --uninstall`
+# can `rm -rf` the namespace dir without touching user-added files.
+
+schema_version: 1
+
+# Always-loaded rules — mirrors router.json's `kernel` array.
+# Symlinked / copied into every enabled surface's rules dir.
+kernel_rules:
+  - agent-authority
+  - ask-when-uncertain
+  - commit-policy
+  - direct-answers
+  - language-and-tone
+  - no-cheap-questions
+  - non-destructive-by-default
+  - scope-control
+  - verify-before-complete
+
+# Top-N curated skills. The 15 picks below are coding-loop universals:
+# the agent reaches for them on almost any task, regardless of stack.
+# Per-stack and domain skills are deliberately omitted — they belong in
+# project-local installs where the stack signal is unambiguous.
+top_skills:
+  # --- Workflow drivers (most-touched commands) ---
+  - id: work
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: commit
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: create-pr
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: review-changes
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: quality-fix
+    surfaces: [claude-code, cursor, windsurf, fallback]
+
+  # --- Session / context management ---
+  - id: agent-handoff
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: agent-status
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: project-analyze
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: project-health
+    surfaces: [claude-code, cursor, windsurf, fallback]
+
+  # --- Investigation / debugging ---
+  - id: bug-investigate
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: bug-fix
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: systematic-debugging
+    surfaces: [claude-code, cursor, windsurf, fallback]
+
+  # --- Ticket / PR drivers ---
+  - id: implement-ticket
+    surfaces: [claude-code, cursor, windsurf, fallback]
+  - id: prepare-for-review
+    surfaces: [claude-code, cursor, windsurf, fallback]
+
+  # --- Onboarding (single command, surfaces a project) ---
+  - id: onboard
+    surfaces: [claude-code, cursor, windsurf, fallback]

package/templates/marketing-copy.yml

@@ -0,0 +1,64 @@
+# marketing-copy.yml — single source of truth for all marketplace
+# listings, GitHub repo metadata, npm package descriptions, and
+# README taglines. Edit here once; downstream surfaces sync on
+# `task generate-tools` (Phase 7 / S38 of road-to-simplicity-and-everywhere).
+
+tagline: >-
+  Shared agent configuration — skills, rules, and slash commands for
+  AI coding tools (Claude Code, Cursor, Windsurf, Cline, Aider,
+  Codex, Gemini CLI, Copilot, Augment).
+
+short_description: >-
+  Project-installable + global agent skill suite — works across
+  every major AI coding tool. One install, every editor.
+
+# GitHub repo topics (set via `gh repo edit --add-topic ...`).
+# Keep this list short and high-signal; GitHub caps display at ~6.
+github_topics:
+  - agent
+  - claude-code
+  - cursor
+  - windsurf
+  - cline
+  - mcp
+  - agents-md
+  - skill-files
+  - copilot
+  - aider
+
+# Marketplace listings (Anthropic, Cursor, Smithery) read these.
+listing:
+  name: event4u/agent-config
+  category: agent-tooling
+  primary_surface: claude-code
+  also_supports:
+    - claude-desktop
+    - cursor
+    - windsurf
+    - cline
+    - aider
+    - codex
+    - gemini-cli
+    - copilot
+    - augment
+
+# npm package metadata (synced into packages/create-agent-config/package.json
+# and any future @event4u/agent-config packages).
+npm:
+  package: "@event4u/create-agent-config"
+  description: >-
+    Zero-config installer for event4u/agent-config — picks tools,
+    runs the install, works in any directory.
+  keywords:
+    - agent
+    - claude
+    - cursor
+    - windsurf
+    - skills
+    - mcp
+
+# Authoritative URLs.
+urls:
+  homepage: https://github.com/event4u-app/agent-config
+  bugs: https://github.com/event4u-app/agent-config/issues
+  docs: https://github.com/event4u-app/agent-config/blob/main/docs/installation.md

package/templates/windsurf-rule.md.j2

@@ -0,0 +1,7 @@
+---
+trigger: {{ trigger }}
+description: {{ description }}
+globs: {{ globs | default("") }}
+---
+
+{{ body }}