@dadado/agent-kit-cli 4.8.2 → 4.8.4

package/dist/index.js

@@ -1767,8 +1767,11 @@ import path22 from "path";
 import { defineCommand as defineCommand6 } from "citty";
 
 // src/invariants/hooks-health.ts
-import { access as access4, readFile as readFile6 } from "fs/promises";
+import { execFile as execFile2 } from "child_process";
+import { constants as constants2, access as access4, readFile as readFile6, stat } from "fs/promises";
 import path12 from "path";
+import { promisify as promisify2 } from "util";
+var execFileAsync2 = promisify2(execFile2);
 var EXPECTED_EVENTS = [
   "sessionStart",
   "preCompact",
@@ -1784,6 +1787,37 @@ async function exists(p) {
     return false;
   }
 }
+async function isExecutable(p) {
+  try {
+    await access4(p, constants2.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function resolveAgentKitCli(rootDir) {
+  const root = path12.resolve(rootDir);
+  const candidates = [
+    path12.join(root, "node_modules", ".bin", "agent-kit"),
+    path12.join(root, "packages", "cli", "dist", "index.js")
+  ];
+  for (const c of candidates) {
+    if (await exists(c)) return c;
+  }
+  try {
+    const { stdout } = await execFileAsync2("which", ["agent-kit"], { encoding: "utf8" });
+    const hit = stdout.trim().split("\n")[0]?.trim();
+    if (hit) return hit;
+  } catch {
+  }
+  return null;
+}
+function commandLooksLikeAdapter(command) {
+  const trimmed = command.trim();
+  if (!trimmed) return null;
+  const m = trimmed.match(/(\.cursor\/hooks\/agent\/[A-Za-z0-9._-]+\.sh)\b/);
+  return m?.[1] ?? null;
+}
 async function assessHooksHealth(rootDir) {
   const root = path12.resolve(rootDir);
   const hooksJsonPath = ".cursor/hooks.json";
@@ -1812,6 +1846,7 @@ async function assessHooksHealth(rootDir) {
     };
   }
   const hooks = parsed.hooks ?? {};
+  const adapterRels = /* @__PURE__ */ new Set();
   for (const event of EXPECTED_EVENTS) {
     const list = hooks[event];
     if (Array.isArray(list) && list.length > 0) {
@@ -1822,6 +1857,8 @@ async function assessHooksHealth(rootDir) {
         if (command.endsWith(".py") || command.includes("python")) {
           reasons.push(`${event} still points at a Python script (${command})`);
         }
+        const rel = commandLooksLikeAdapter(command);
+        if (rel) adapterRels.add(rel);
       }
     } else {
       reasons.push(`missing hook event: ${event}`);
@@ -1830,6 +1867,34 @@ async function assessHooksHealth(rootDir) {
   const resolveLib = path12.join(root, ".cursor", "hooks", "agent", "resolve-agent-kit.sh");
   if (!await exists(resolveLib)) {
     reasons.push("missing `.cursor/hooks/agent/resolve-agent-kit.sh` (thin adapter resolver)");
+  } else if (!await isExecutable(resolveLib)) {
+    reasons.push("`.cursor/hooks/agent/resolve-agent-kit.sh` is not executable (chmod +x)");
+  }
+  for (const rel of adapterRels) {
+    const abs = path12.join(root, rel);
+    if (!await exists(abs)) {
+      reasons.push(`missing adapter script: \`${rel}\``);
+      continue;
+    }
+    try {
+      const st = await stat(abs);
+      if (!st.isFile()) {
+        reasons.push(`adapter path is not a file: \`${rel}\``);
+        continue;
+      }
+    } catch {
+      reasons.push(`unreadable adapter script: \`${rel}\``);
+      continue;
+    }
+    if (!await isExecutable(abs)) {
+      reasons.push(`adapter not executable: \`${rel}\` (chmod +x)`);
+    }
+  }
+  const cli = await resolveAgentKitCli(root);
+  if (!cli) {
+    reasons.push(
+      "agent-kit CLI not resolvable (PATH, node_modules/.bin/agent-kit, or packages/cli/dist)"
+    );
   }
   if (Array.isArray(hooks.stop) && hooks.stop.length > 0) {
     reasons.push("`stop` hook is registered (forbidden; remove it)");
@@ -2240,10 +2305,10 @@ async function detectSafety(rootDir, trackedFiles) {
 import path19 from "path";
 
 // src/scanner/detect-git.ts
-import { execFile as execFile2 } from "child_process";
+import { execFile as execFile3 } from "child_process";
 import path14 from "path";
-import { promisify as promisify2 } from "util";
-var exec = promisify2(execFile2);
+import { promisify as promisify3 } from "util";
+var exec = promisify3(execFile3);
 function remoteHostname(remoteUrl) {
   const scpMatch = remoteUrl.match(/^[^@]+@([^:]+):/);
   if (scpMatch?.[1]) return scpMatch[1].toLowerCase();
@@ -3034,6 +3099,8 @@ var doctorCommand = defineCommand6({
 });
 
 // src/commands/guard.ts
+import { execFile as execFile4 } from "child_process";
+import { promisify as promisify4 } from "util";
 import { defineCommand as defineCommand7 } from "citty";
 
 // src/hooks/read-stdin-json.ts
@@ -3075,10 +3142,21 @@ var SECRET_PATTERNS2 = [
     re: /\bsk-[A-Za-z0-9]{20,}\b/
   }
 ];
+function maskSecretExcerpt(raw) {
+  return raw.replace(/\b(ghp_|sk-|AKIA)([A-Za-z0-9_]{4,})/g, (_m, p1, p2) => {
+    return `${p1}${"*".repeat(Math.min(8, p2.length))}`;
+  }).replace(
+    /(=\s*['"]?)([^\s'"]{4,})/g,
+    (_m, p1, p2) => `${p1}${"*".repeat(Math.min(8, p2.length))}`
+  ).replace(
+    /("(?:password|apiKey|api_key|secret|token|auth)"\s*:\s*")([^"]{4,})(")/gi,
+    (_m, p1, p2, p3) => `${p1}${"*".repeat(Math.min(8, p2.length))}${p3}`
+  );
+}
 function excerptAround(text, index, len) {
   const start = Math.max(0, index - 8);
   const end = Math.min(text.length, index + len + 8);
-  return text.slice(start, end).replace(/\s+/g, " ");
+  return maskSecretExcerpt(text.slice(start, end).replace(/\s+/g, " "));
 }
 function scanTextForSecrets(text) {
   if (!text) return [];
@@ -3105,6 +3183,7 @@ function secretsAdviseMessage(hits) {
 
 // src/invariants/shell-guard.ts
 var CITE2 = "agent-kit guard shell (ADR 2026-07-29_cli-invariants-thin-hook-adapters)";
+var PROTECTED_BRANCH_RE = /^(?:main|master|prod)$/;
 function normalizeShellCommand(command) {
   return command.replace(/\s+/g, " ").trim();
 }
@@ -3116,11 +3195,61 @@ function shellInvocationHeads(command) {
 function anyHeadMatches(command, re) {
   return shellInvocationHeads(command).some((head) => re.test(head));
 }
+function isProtectedBranch(name) {
+  return typeof name === "string" && PROTECTED_BRANCH_RE.test(name.trim());
+}
+function normalizePushRefspecToken(token) {
+  let t = token.trim();
+  if (t.startsWith("'") && t.endsWith("'") && t.length >= 2 || t.startsWith('"') && t.endsWith('"') && t.length >= 2) {
+    t = t.slice(1, -1).trim();
+  }
+  if (t.startsWith("+")) t = t.slice(1);
+  if (t.startsWith("refs/heads/")) t = t.slice("refs/heads/".length);
+  if (t.startsWith("origin/")) t = t.slice("origin/".length);
+  return t;
+}
+function pushHeadHasProtectedDest(head) {
+  if (/HEAD:(?:refs\/heads\/)?(?:main|master|prod)\b/.test(head)) return true;
+  if (/(?:^|\s)-(?:u|--set-upstream)\s+\S+\s+(?:main|master|prod)(?:\s|$)/.test(head)) {
+    return true;
+  }
+  const after = head.replace(/^(?:[\w./-]+\/)?git\s+push\b/, "");
+  for (const raw of after.split(/\s+/).filter(Boolean)) {
+    if (raw.startsWith("-")) continue;
+    const dest = raw.includes(":") ? raw.slice(raw.lastIndexOf(":") + 1) : raw;
+    if (PROTECTED_BRANCH_RE.test(normalizePushRefspecToken(dest))) return true;
+  }
+  return false;
+}
+function isBareOrHeadPushToCurrent(head) {
+  if (!/^(?:[\w./-]+\/)?git\s+push\b/.test(head)) return false;
+  if (pushHeadHasProtectedDest(head)) {
+    return false;
+  }
+  if (/(?:^|\s)\+?(?:refs\/heads\/)?(?:origin\/)?(?:staging|develop|homologacao)(?:\s|$|:)/.test(
+    head
+  ) || /HEAD:(?:refs\/heads\/)?(?!main|master|prod)[A-Za-z0-9._/-]+/.test(head)) {
+    return false;
+  }
+  const after = head.replace(/^(?:[\w./-]+\/)?git\s+push\b/, "").trim();
+  const withoutFlags = after.replace(/(?:^|\s)(?:--force|-f|-u|--set-upstream|--tags|--all|--prune)(?=\s|$)/g, " ").replace(/(?:^|\s)--\w[\w-]*(?:=\S+)?/g, " ").replace(/\s+/g, " ").trim();
+  if (!withoutFlags) return true;
+  const tokens = withoutFlags.split(/\s+/);
+  if (tokens.length === 1) return true;
+  if (tokens.length >= 2 && tokens[1] === "HEAD") return true;
+  if (/\bHEAD\b/.test(withoutFlags) && !/HEAD:/.test(withoutFlags)) return true;
+  return false;
+}
 var SHELL_DENY_RULES = [
   {
     id: "git-checkout-path",
-    description: "git checkout -- <paths> discards working-tree edits",
-    test: (cmd) => anyHeadMatches(cmd, /^(?:[\w./-]+\/)?git\s+checkout\s+--(?:\s|$)/)
+    description: "git checkout -- / HEAD -- / . discards working-tree edits",
+    test: (cmd) => shellInvocationHeads(cmd).some((head) => {
+      if (!/^(?:[\w./-]+\/)?git\s+checkout\b/.test(head)) return false;
+      if (/\s--(?:\s|$)/.test(head)) return true;
+      if (/\scheckout\s+\.(?:\s|$)/.test(head)) return true;
+      return false;
+    })
   },
   {
     id: "git-restore",
@@ -3142,19 +3271,25 @@ var SHELL_DENY_RULES = [
   {
     id: "git-push-main",
     description: "direct push to main/master/prod bypasses staging",
-    test: (cmd) => shellInvocationHeads(cmd).some((head) => {
+    test: (cmd, opts) => shellInvocationHeads(cmd).some((head) => {
       if (!/^(?:[\w./-]+\/)?git\s+push\b/.test(head)) return false;
-      return /(?:^|\s)(?:origin\/)?(?:main|master|prod)(?:\s|$|:)/.test(head) || /HEAD:(?:refs\/heads\/)?(?:main|master|prod)\b/.test(head) || /(?:^|\s)-(?:u|--set-upstream)\s+\S+\s+(?:main|master|prod)(?:\s|$)/.test(head);
+      if (pushHeadHasProtectedDest(head)) {
+        return true;
+      }
+      if (isProtectedBranch(opts?.currentBranch) && isBareOrHeadPushToCurrent(head)) {
+        return true;
+      }
+      return false;
     })
   }
 ];
-function evaluateShellCommand(command) {
+function evaluateShellCommand(command, opts = {}) {
   const normalized = normalizeShellCommand(command);
   if (!normalized) {
     return { permission: "allow" };
   }
   for (const rule of SHELL_DENY_RULES) {
-    if (rule.test(normalized)) {
+    if (rule.test(normalized, opts)) {
       const agent_message = `Denied by ${CITE2}: ${rule.description} (rule \`${rule.id}\`). Use /git-staging; never discard human hunks or push protected branches from the agent.`;
       return {
         permission: "deny",
@@ -3168,6 +3303,18 @@ function evaluateShellCommand(command) {
 }
 
 // src/commands/guard.ts
+var execFileAsync3 = promisify4(execFile4);
+async function detectCurrentBranch() {
+  try {
+    const { stdout } = await execFileAsync3("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
+      encoding: "utf8"
+    });
+    const branch = stdout.trim();
+    return branch && branch !== "HEAD" ? branch : void 0;
+  } catch {
+    return void 0;
+  }
+}
 var guardCommand = defineCommand7({
   meta: {
     name: "guard",
@@ -3196,7 +3343,8 @@ var guardCommand = defineCommand7({
           const payload = await readStdinJson();
           command = typeof payload.command === "string" ? payload.command : "";
         }
-        const result = evaluateShellCommand(command);
+        const currentBranch = await detectCurrentBranch();
+        const result = evaluateShellCommand(command, { currentBranch });
         console.log(JSON.stringify(result));
       }
     }),
@@ -3224,7 +3372,7 @@ var guardCommand = defineCommand7({
             continue: true,
             user_message: secretsAdviseMessage(hits),
             agent_message: secretsAdviseMessage(hits),
-            hits
+            hits: hits.map((h) => ({ patternId: h.patternId }))
           })
         );
       }
@@ -4299,12 +4447,16 @@ import path30 from "path";
 import { defineCommand as defineCommand12 } from "citty";
 
 // src/invariants/monitors-untriaged.ts
-import { execFile as execFile3 } from "child_process";
-import { readFile as readFile14, readdir as readdir3, stat } from "fs/promises";
+import { execFile as execFile5 } from "child_process";
+import { readFile as readFile14, readdir as readdir3, stat as stat2 } from "fs/promises";
 import path29 from "path";
-import { promisify as promisify3 } from "util";
-var execFileAsync2 = promisify3(execFile3);
-var TRIAGE_HEADING_RE = /^#{2,6}\s+.*\b(triage|follow-?up plan|residuals plan)\b/im;
+import { promisify as promisify5 } from "util";
+
+// src/invariants/triage-heading.ts
+var TRIAGE_HEADING_RE = /^#{2,6}\s+(?:Triage note|Follow-?up plan|Residuals plan)\b/im;
+
+// src/invariants/monitors-untriaged.ts
+var execFileAsync4 = promisify5(execFile5);
 var CITE4 = "agent-kit monitors --untriaged (ADR 2026-07-27_plan-review-triage-untriaged-not-mtime; never newest-mtime-wins)";
 function hasOpenGaps(content) {
   if (/###\s+Still open[^\n]*\n+(?:\s*\n)*(?:None\.|none\.|\*None\*)/i.test(content)) {
@@ -4330,7 +4482,7 @@ async function listMonitorFiles(memoryDir) {
 async function gitFreshMonitorNames(rootDir) {
   const names = /* @__PURE__ */ new Set();
   try {
-    const { stdout } = await execFileAsync2(
+    const { stdout } = await execFileAsync4(
       "git",
       ["status", "--porcelain", "--", ".cursor/memory"],
       { cwd: rootDir, maxBuffer: 2 * 1024 * 1024 }
@@ -4369,7 +4521,7 @@ async function selectUntriagedMonitors(rootDir) {
   for (const name of allNames) {
     const abs = path29.join(memoryDir, name);
     try {
-      const [content, st] = await Promise.all([readFile14(abs, "utf8"), stat(abs)]);
+      const [content, st] = await Promise.all([readFile14(abs, "utf8"), stat2(abs)]);
       byName.set(name, { content, mtimeMs: st.mtimeMs });
     } catch {
     }
@@ -5176,10 +5328,10 @@ var statusCommand = defineCommand15({
 import { defineCommand as defineCommand16 } from "citty";
 
 // src/lifecycle/check-updates.ts
-import { execFile as execFile4 } from "child_process";
+import { execFile as execFile6 } from "child_process";
 import path37 from "path";
-import { promisify as promisify4 } from "util";
-var execFileAsync3 = promisify4(execFile4);
+import { promisify as promisify6 } from "util";
+var execFileAsync5 = promisify6(execFile6);
 var SEMVER_CORE = /^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/i;
 var FACTORY_URL_MARKERS = ["agent-kit-dev"];
 var FACTORY_REFS = /* @__PURE__ */ new Set(["staging", "homologacao", "develop", "dev"]);
@@ -5238,7 +5390,7 @@ function pickLatestSemverTag(lsRemoteStdout) {
 }
 async function fetchLatestPublicVersion(registryUrl = DEFAULT_REGISTRY_URL) {
   assertSafeRegistrySource(registryUrl, "main");
-  const { stdout } = await execFileAsync3("git", ["ls-remote", "--tags", "--", registryUrl], {
+  const { stdout } = await execFileAsync5("git", ["ls-remote", "--tags", "--", registryUrl], {
     env: gitEnv2(),
     timeout: 2e4
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dadado/agent-kit-cli",
-  "version": "4.8.2",
+  "version": "4.8.4",
   "description": "Agent Kit CLI: HITL framework install and tooling for AI-assisted IDEs (rules, skills, plan/handoff, context).",
   "type": "module",
   "bin": {