@mmerterden/multi-agent-pipeline 20.8.2 → 20.9.0

package/pipeline/scripts/unattended_policy.py

@@ -2793,3 +2793,93 @@ def git_commit_dirs(cmd, base):
         opt = _git_dir_opt(toks)
         dirs.append(cwd if opt is None else _literal_dir(opt, cwd))
     return dirs
+
+
+# `git add` and `git commit` options whose value is the next token.
+ADD_VALUE_OPTIONS = ("--chmod",)
+COMMIT_VALUE_OPTIONS = (
+    "--message", "--file", "--reuse-message", "--reedit-message", "--author",
+    "--date", "--template", "--fixup", "--squash", "--cleanup", "--trailer",
+)
+COMMIT_SHORT_VALUE = "mFCct"
+
+
+def _add_scope(args):
+    out = []
+    specs_only = False
+    i = 0
+    while i < len(args):
+        t = args[i]
+        i += 1
+        if specs_only or not t.startswith("-"):
+            out.append("ADD " + t)
+        elif t == "--":
+            specs_only = True
+        elif t in ("-A", "--all", "--no-ignore-removal") or t.startswith("--pathspec-from-file"):
+            out.append("ADD_ALL")
+        elif t in ("-u", "--update"):
+            out.append("ADD_UPDATE")
+        elif t in ADD_VALUE_OPTIONS:
+            i += 1
+        elif not t.startswith("--") and ("A" in t[1:] or "u" in t[1:]):
+            out.append("ADD_ALL" if "A" in t[1:] else "ADD_UPDATE")
+    return out
+
+
+def _commit_scope(args):
+    out = []
+    specs_only = False
+    i = 0
+    while i < len(args):
+        t = args[i]
+        i += 1
+        if specs_only or not t.startswith("-") or t == "-":
+            out.append("COMMIT " + t)
+        elif t == "--":
+            specs_only = True
+        elif t == "--all" or t.startswith("--pathspec-from-file"):
+            out.append("COMMIT_ALL")
+        elif t.startswith("--"):
+            if t in COMMIT_VALUE_OPTIONS:
+                i += 1
+        else:
+            for k, ch in enumerate(t[1:], start=1):
+                if ch == "a":
+                    out.append("COMMIT_ALL")
+                if ch in COMMIT_SHORT_VALUE:
+                    if k == len(t) - 1:
+                        i += 1
+                    break
+    return out
+
+
+def git_commit_scope(cmd, depth=0):
+    """What a shell line adds to the commit it makes, beyond the index, as
+    lines: `ADD_ALL` (`git add -A` or `.`-like), `ADD_UPDATE` (`-u`),
+    `ADD <pathspec>`, `COMMIT_ALL` (`commit -a`) and `COMMIT <pathspec>`. The
+    pre-commit hook scans the index plus these, so a dirty file the commit will
+    not include is never judged, and `commit -a` is never missed."""
+    out = []
+    inners = []
+    if depth == 0:
+        try:
+            cmd = strip_heredocs(cmd)
+        except Refused:
+            pass
+    if depth < 3:
+        try:
+            cmd, inners = extract_substitutions(cmd)
+        except Refused:
+            inners = []
+    for seg in split_ops(cmd):
+        toks = _strip_wrappers(tokenize(seg))
+        if not toks or os.path.basename(toks[0]).lower() != "git":
+            continue
+        sub, rest = _git_sub(toks)
+        if sub == "add":
+            out.extend(_add_scope(rest))
+        elif sub == "commit":
+            out.extend(_commit_scope(rest))
+    for inner in inners:
+        out.extend(git_commit_scope(inner, depth + 1))
+    return out

package/pipeline/scripts/usage-report.mjs

@@ -36,6 +36,7 @@ import { execFileSync } from "child_process";
 import { createHash } from "crypto";
 import { costUsd } from "./_cost.mjs";
 import { defaultPrefsPath, resolveReportingLogin } from "./usage-identity.mjs";
+import { KNOWN_STACKS, pluginsForStacks } from "./_stack-routing.mjs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const ENDPOINT_DEFAULT = "https://mmerterden.com/api/usage/ingest";
@@ -134,16 +135,23 @@ function readEnabledPluginNames(settings) {
     .map(([k]) => k);
 }
 
-function enabledPlugins(state) {
+// A plugin the pipeline's own marketplace does not publish is somebody's
+// private plugin, so its name stays on the host and only the constant
+// `private` says that one was enabled.
+function enabledPlugins(state, { publicPlugins, home } = {}) {
   const root = state.projectRoot || process.cwd();
+  const pub = publicPlugins ?? publicToolkits();
   const names = new Set();
   for (const s of [
     readJson(join(root, ".claude", "settings.json")),
-    readJson(join(homedir(), ".claude", "settings.json")),
+    readJson(join(home ?? homedir(), ".claude", "settings.json")),
   ]) {
-    for (const name of readEnabledPluginNames(s)) names.add(name.split("@")[0]);
+    for (const name of readEnabledPluginNames(s)) {
+      const bare = name.split("@")[0];
+      if (bare) names.add(pub.has(bare) ? bare : "private");
+    }
   }
-  return Array.from(names).filter(Boolean).slice(0, 20);
+  return Array.from(names).slice(0, 20);
 }
 
 function integrationTags(state) {
@@ -183,10 +191,31 @@ function credHealth() {
   return { on, svc };
 }
 
-function invokedCalls(state) {
+// A repo-local skill is named by whoever owns the repo, and a fallback toolkit
+// that the public marketplace does not carry is somebody's private plugin:
+// neither name is sent. Each is replaced by a constant naming its source, so
+// the panel still counts that such a skill was used.
+function publicToolkits(manifestPath) {
+  return new Set(pluginsForStacks(KNOWN_STACKS, manifestPath ? { manifestPath } : {}).plugins);
+}
+
+function invokedCalls(state, { publicPlugins, manifestPath } = {}) {
+  let pub = publicPlugins ?? null;
   const names = new Set();
   for (const c of state.telemetry?.skillCalls ?? []) {
-    if (c?.skill) names.add(String(c.skill));
+    if (!c?.skill) continue;
+    const skill = String(c.skill);
+    if (c.source === "repo") {
+      names.add("repo-local");
+      continue;
+    }
+    if (c.source === "marketplace-fallback") {
+      pub ??= publicToolkits(manifestPath);
+      const toolkit = String(c.toolkit || skill.split(":")[0]);
+      names.add(pub.has(toolkit) ? skill : "marketplace-fallback");
+      continue;
+    }
+    names.add(skill);
   }
   return Array.from(names).slice(0, 30);
 }
@@ -786,6 +815,7 @@ if (invokedDirectly) {
 
 export {
   endpointAllowed,
+  invokedCalls,
   integrationTags,
   enabledPlugins,
   readEnabledPluginNames,

package/pipeline/skills/.skill-manifest.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": "1.0.0",
-  "generatedAt": "2026-09-27T07:55:06Z",
+  "generatedAt": "2026-09-27T10:26:38Z",
   "skillCount": 218,
   "entries": [
     {