@codacy/verity-cli 0.23.1 → 0.23.3

package/bin/verity.js

@@ -10902,7 +10902,9 @@ function isLegacyHook(entry) {
   return LEGACY_STOP_RE.test(c) || LEGACY_INTENT_RE.test(c) || c.includes(".gate/hooks/analyze.sh") || c.includes(".gate/hooks/capture-intent.sh");
 }
 var SETTINGS_LOCAL_FILE = ".claude/settings.local.json";
-var GLOBAL_SETTINGS_FILE = `${process.env.HOME || process.env.USERPROFILE || ""}/.claude/settings.json`;
+function globalSettingsFile() {
+  return `${process.env.HOME || process.env.USERPROFILE || ""}/.claude/settings.json`;
+}
 async function readSettings() {
   try {
     const content = await (0, import_promises4.readFile)(CLAUDE_SETTINGS_FILE, "utf-8");
@@ -10912,7 +10914,7 @@ async function readSettings() {
   }
 }
 async function readAllSettings() {
-  const files = [CLAUDE_SETTINGS_FILE, SETTINGS_LOCAL_FILE, GLOBAL_SETTINGS_FILE];
+  const files = [CLAUDE_SETTINGS_FILE, SETTINGS_LOCAL_FILE, globalSettingsFile()];
   const out = [];
   for (const f of files) {
     try {
@@ -10936,6 +10938,24 @@ async function checkAllVerityHooks() {
   }
   return { stop, intent, guard, guardOn };
 }
+async function checkExternalVerityHooks() {
+  let stop = false;
+  let intent = false;
+  let guardOn = [];
+  for (const f of [SETTINGS_LOCAL_FILE, globalSettingsFile()]) {
+    let settings;
+    try {
+      settings = JSON.parse(await (0, import_promises4.readFile)(f, "utf-8"));
+    } catch {
+      continue;
+    }
+    const r = checkVerityHooks(settings);
+    stop = stop || r.stop;
+    intent = intent || r.intent;
+    if (r.guardOn.length > guardOn.length) guardOn = r.guardOn;
+  }
+  return { stop, intent, guardOn };
+}
 async function checkAllVerityHooksDetailed() {
   let stop = false;
   let intent = false;
@@ -11102,6 +11122,12 @@ function reconcileMomentHooks(settings, moments, externalPresent = {
   if (Object.keys(s.hooks).length === 0) delete s.hooks;
   return s;
 }
+async function applyMomentSelection(moments) {
+  const external = await checkExternalVerityHooks();
+  const settings = reconcileMomentHooks(await readSettings(), moments, external);
+  await writeSettings(settings);
+  return settings;
+}
 
 // src/commands/hooks.ts
 var ALL_MOMENTS = ["stop", "pre-commit", "pre-push"];
@@ -11118,15 +11144,13 @@ function registerHooksCommands(program2) {
     const force = opts.force ?? false;
     if (opts.moments != null) {
       const moments = parseMoments(opts.moments);
-      const external = await checkAllVerityHooks();
-      const settings2 = reconcileMomentHooks(await readSettings(), moments, external);
-      await writeSettings(settings2);
+      await applyMomentSelection(moments);
       const status = await checkAllVerityHooks();
       printInfo("Verity hooks reconciled in .claude/settings.json:");
-      printInfo(`  Stop (verity analyze): ${moments.includes("stop") ? "on" : "off"}`);
+      printInfo(`  Stop (verity analyze): ${status.stop ? "on" : "off"}`);
       printInfo(`  Pre-commit gate: ${status.guardOn.includes("commit") ? "on" : "off"}`);
       printInfo(`  Pre-push/PR gate: ${status.guardOn.includes("push") ? "on" : "off"}`);
-      printInfo("  UserPromptSubmit (verity intent capture): on");
+      printInfo(`  UserPromptSubmit (verity intent capture): ${status.intent ? "on" : "off"}`);
       return;
     }
     const detail = await checkAllVerityHooksDetailed();
@@ -12809,6 +12833,11 @@ function getPushRangeFiles() {
   const last = diff("HEAD~1..HEAD");
   return { files: last, range: last.length > 0 ? "HEAD~1..HEAD" : null };
 }
+function getPushRangeMessages() {
+  const { range } = getPushRangeFiles();
+  if (!range) return "";
+  return execGit(`git log ${range} --format=%B%x00`).split("\0").map((s) => s.trim()).filter(Boolean).join("\n\n");
+}
 function getWorktreeFiles() {
   const result = [];
   const worktreeDir = ".claude/worktrees";
@@ -15033,7 +15062,48 @@ function registerGuardCommand(program2) {
 function getMomentFiles(moment) {
   return moment === "pre-commit" ? getStagedFiles() : getPushRangeFiles().files;
 }
-function buildGuardRequest(moment, files, iter, sessionId) {
+function matchFlagValue(command, flags) {
+  const re = new RegExp(`(?<![\\w-])(?:${flags})(?:=|\\s+)('((?:[^'\\\\]|\\\\.)*)'|"((?:[^"\\\\]|\\\\.)*)"|([^\\s'"-][^\\s]*))`);
+  const m = re.exec(command);
+  if (!m) return null;
+  const v = m[2] ?? m[3] ?? m[4];
+  return v != null ? v.replace(/\\(["'])/g, "$1") : null;
+}
+function parseCommitMessage(command) {
+  const parts = [];
+  const re = /(?<![\w-])(?:--message|-am|-m)(?:=|\s+)('((?:[^'\\]|\\.)*)'|"((?:[^"\\]|\\.)*)"|([^\s'"-][^\s]*))/g;
+  let m;
+  while ((m = re.exec(command)) !== null) {
+    const v = m[2] ?? m[3] ?? m[4];
+    if (v != null && v.length) parts.push(v.replace(/\\(["'])/g, "$1"));
+  }
+  return parts.length ? parts.join("\n\n") : null;
+}
+function parsePrIntent(command) {
+  const title = matchFlagValue(command, "--title|-t");
+  const body = matchFlagValue(command, "--body|-b");
+  const parts = [title, body].filter((x) => !!x);
+  return parts.length ? parts.join("\n\n") : null;
+}
+var TRIVIAL_INTENT = /^(wip|tmp|temp|test|fix|chore|amend|\.+|fixup!.*|squash!.*|merge\b.*)$/i;
+var SHELL_PLUMBING = /\$\(|`|<<-?\s*['"]?[A-Za-z_]/;
+function isSubstantiveIntent(text) {
+  if (!text) return false;
+  const t = text.trim();
+  if (t.length < 12) return false;
+  if (TRIVIAL_INTENT.test(t)) return false;
+  if (SHELL_PLUMBING.test(t)) return false;
+  return true;
+}
+function extractStatedIntent(moment, command) {
+  const text = moment === "pre-commit" ? parseCommitMessage(command) : parsePrIntent(command) ?? (getPushRangeMessages() || null);
+  return isSubstantiveIntent(text) ? text : null;
+}
+function hasBlockingFinding(response) {
+  const findings = response.findings ?? [];
+  return findings.some((f) => f.scope !== "pre-existing" && ["critical", "high"].includes((f.severity ?? "").toLowerCase()));
+}
+function buildGuardRequest(moment, files, iter, sessionId, command) {
   const analyzable = filterAnalyzable(files);
   const securityFiles = filterSecurity(files);
   let staticResults;
@@ -15063,20 +15133,21 @@ function buildGuardRequest(moment, files, iter, sessionId) {
   };
   const specs = discoverSpecs();
   const plans = discoverPlans();
-  if (specs.length > 0 || plans.length > 0) {
+  const statedIntent = extractStatedIntent(moment, command);
+  if (specs.length > 0 || plans.length > 0 || statedIntent) {
     const intentContext = {};
+    if (statedIntent) intentContext.user_prompt = statedIntent;
     if (specs.length > 0) intentContext.specs = specs;
     if (plans.length > 0) intentContext.plans = plans;
     requestBody.intent_context = intentContext;
   }
   return requestBody;
 }
-function allowWithNotice(moment, decision) {
-  resetIter(moment);
-  if (decision === "WARN") {
-    process.stderr.write(`${YELLOW}Verity ${moment}: WARN \u2014 proceeding. See findings in the report.${NC}
-`);
-  }
+function emitAllowNotice(userMsg, agentMsg) {
+  process.stdout.write(JSON.stringify({
+    systemMessage: userMsg,
+    hookSpecificOutput: { hookEventName: "PreToolUse", additionalContext: agentMsg }
+  }) + "\n");
   process.exit(0);
 }
 async function runGuard(opts, globals) {
@@ -15090,19 +15161,21 @@ async function runGuard(opts, globals) {
   }
   const moment = classifyCommand(command, on);
   if (!moment) process.exit(0);
+  const verb = moment === "pre-commit" ? "commit" : "push";
   const iter = readIter(moment);
   if (iter >= GUARD_BLOCK_CAP) {
-    process.stderr.write(`${DIM}Verity ${moment}: ${GUARD_BLOCK_CAP} review cycles reached \u2014 allowing through.${NC}
-`);
     resetIter(moment);
-    process.exit(0);
+    emitAllowNotice(
+      `Verity ${moment}: ${GUARD_BLOCK_CAP} review cycles reached \u2014 allowing the ${verb} through`,
+      `Verity ${moment}: review-cycle cap (${GUARD_BLOCK_CAP}) reached; the ${verb} was allowed without a further block.`
+    );
   }
   const files = getMomentFiles(moment);
   if (files.length === 0) process.exit(0);
   const tokenResult = await resolveToken(globals.token);
   const urlResult = await resolveServiceUrl(globals.serviceUrl);
   if (!tokenResult.ok || !urlResult.ok) process.exit(0);
-  const requestBody = buildGuardRequest(moment, files, iter, sessionId);
+  const requestBody = buildGuardRequest(moment, files, iter, sessionId, command);
   if (!requestBody) process.exit(0);
   const result = await analyzeRequest({
     serviceUrl: urlResult.data,
@@ -15113,21 +15186,39 @@ async function runGuard(opts, globals) {
     cmd: "guard"
   });
   if (!result.ok) {
-    process.stderr.write(`${DIM}Verity ${moment}: service unavailable \u2014 allowing commit/push (${result.error}).${NC}
-`);
-    process.exit(0);
-  }
-  if (opts.json) {
-    process.stdout.write(JSON.stringify(result.data) + "\n");
+    emitAllowNotice(
+      `\u26A0 Verity ${moment}: service offline \u2014 ${verb}ed WITHOUT review`,
+      `Verity ${moment}: service unavailable (${result.error}); the ${verb} was allowed WITHOUT a Verity review.`
+    );
   }
+  if (opts.json) process.stderr.write(JSON.stringify(result.data) + "\n");
   const response = result.data;
   const decision = response.gate_decision ?? "PASS";
-  if (decision === "FAIL") {
+  const viewUrl = response.view_url ?? "";
+  const link = viewUrl ? ` \u2014 ${viewUrl}` : "";
+  if (decision === "FAIL" && hasBlockingFinding(response)) {
     writeIter(moment, iter + 1);
     writeBlockMessage(moment, response);
     process.exit(2);
   }
-  allowWithNotice(moment, decision);
+  resetIter(moment);
+  if (decision === "FAIL") {
+    const narrative = response.assessment?.narrative ?? "";
+    emitAllowNotice(
+      `\u26A0 Verity ${moment}: the ${verb} may not match its stated purpose \u2014 proceeding${link}`,
+      `Verity ${moment}: intent-alignment WARNING (not blocked).${narrative ? " " + narrative : ""}${viewUrl ? ` Report: ${viewUrl}` : ""}`
+    );
+  }
+  if (decision === "WARN") {
+    emitAllowNotice(
+      `\u26A0 Verity ${moment}: WARN \u2014 proceeding${link}`,
+      `Verity ${moment} review: WARN (proceeding).${viewUrl ? ` Report: ${viewUrl}` : ""}`
+    );
+  }
+  emitAllowNotice(
+    `\u2713 Verity ${moment}: PASS${link}`,
+    `Verity ${moment} review: PASS.${viewUrl ? ` Report: ${viewUrl}` : ""}`
+  );
 }
 function writeBlockMessage(moment, response) {
   const label2 = moment === "pre-commit" ? "pre-commit" : "pre-push";
@@ -16317,7 +16408,7 @@ function registerTelemetryCommands(program2) {
 }
 
 // src/cli.ts
-program.name("verity").description("CLI for Verity quality gate service").version("0.23.1").option("--token <token>", "Override authentication token").option("--service-url <url>", "Override service URL").option("--verbose", "Log HTTP requests/responses to stderr");
+program.name("verity").description("CLI for Verity quality gate service").version("0.23.3").option("--token <token>", "Override authentication token").option("--service-url <url>", "Override service URL").option("--verbose", "Log HTTP requests/responses to stderr");
 registerAuthCommands(program);
 registerHooksCommands(program);
 registerIntentCommands(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codacy/verity-cli",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "description": "CLI for Verity quality gate service",
   "homepage": "https://verity.md",
   "repository": {