@gendigital/sage-openclaw 0.12.0 → 0.13.1

package/dist/index.cjs

@@ -4316,7 +4316,8 @@ var init_types2 = __esm({
     VerdictSeveritySchema = external_exports.enum(["info", "warning", "critical"]);
     ThreatSchema = external_exports.object({
       id: external_exports.string(),
-      version: external_exports.number().int().optional(),
+      version: external_exports.number().int().positive(),
+      detectionName: external_exports.string(),
       category: external_exports.string(),
       severity: VerdictSeveritySchema,
       confidence: external_exports.number(),
@@ -4418,6 +4419,7 @@ var init_types2 = __esm({
       sensitivity: SensitivitySchema.default("balanced"),
       disabled_threats: external_exports.array(external_exports.string()).default([]),
       announce_clean_scans: external_exports.boolean().default(true),
+      manage_status_line: external_exports.boolean().default(true),
       brand_key: external_exports.string().min(1).max(32).regex(/^[a-z0-9_-]+$/u).optional(),
       community_iq: external_exports.boolean().default(true)
     });
@@ -14601,6 +14603,7 @@ async function logVerdict(config2, input) {
     severity: input.verdict.severity,
     reasons: input.verdict.reasons,
     source: input.verdict.source,
+    threat_id: input.verdict.matchedThreatId,
     user_override: userOverride,
     signals: input.signals,
     tool_use_id: input.toolUseId
@@ -14608,6 +14611,9 @@ async function logVerdict(config2, input) {
   if (input.content !== void 0) {
     entry.content = input.content;
   }
+  if (input.contentSnippet !== void 0) {
+    entry.content_snippet = input.contentSnippet;
+  }
   try {
     await appendEntry(config2, entry);
   } catch {
@@ -15439,7 +15445,7 @@ init_file_utils();
 var import_meta = {};
 function resolveVersion() {
   if (true)
-    return "0.12.0";
+    return "0.13.0";
   try {
     const pkgPath = (0, import_node_path5.join)((0, import_node_path5.dirname)((0, import_node_url.fileURLToPath)(import_meta.url)), "..", "package.json");
     const pkg = JSON.parse(getFileContentSync(pkgPath));
@@ -16025,14 +16031,29 @@ var BundledPiProvider = class _BundledPiProvider {
       if (truncated.length === 0)
         return null;
       const loaded = await this.ensureLoaded();
-      if (!loaded)
+      if (!loaded) {
+        this.logger.info("PI model inference skipped", {
+          context,
+          reason: "model_unavailable"
+        });
         return null;
+      }
       const chunks = this.chunkText(truncated);
+      const modelId = (0, import_node_path9.basename)(this.modelPath);
+      this.logger.info("PI model inference started", {
+        context,
+        modelId,
+        contentLength: content.length,
+        truncatedContentLength: truncated.length,
+        chunks: chunks.length
+      });
       let maxRisk = 0;
       let maxChunk = "";
+      let chunksScanned = 0;
       for (const chunk of chunks) {
         if (chunk.length < 10)
           continue;
+        chunksScanned++;
         const risk = await this.classifyChunk(chunk);
         if (risk > maxRisk) {
           maxRisk = risk;
@@ -16044,13 +16065,21 @@ var BundledPiProvider = class _BundledPiProvider {
         const snippet = maxChunk.length > 80 ? `${maxChunk.slice(0, 77)}...` : maxChunk;
         findings.push(snippet);
       }
-      return {
+      const result = {
         risk: maxRisk,
         findings,
         contentName: context,
-        modelId: (0, import_node_path9.basename)(this.modelPath),
+        modelId,
         contentSnippet: maxChunk || void 0
       };
+      this.logger.info("PI model inference completed", {
+        context,
+        modelId,
+        risk: result.risk,
+        findingsCount: result.findings.length,
+        chunksScanned
+      });
+      return result;
     } catch (err) {
       this.logger.warn("PI check failed (fail-open)", {
         error: err instanceof Error ? err.message : String(err),
@@ -16289,7 +16318,7 @@ var import_node_path10 = require("node:path");
 init_file_utils();
 init_types2();
 var CONFIG_DEFAULTS_FILENAME = "config.default.json";
-var CONFIG_DEFAULTS_SCHEMA_VERSION = 1;
+var CONFIG_DEFAULTS_SCHEMA_VERSION = 2;
 function buildConfigDefaults() {
   return {
     schema_version: CONFIG_DEFAULTS_SCHEMA_VERSION,
@@ -16483,6 +16512,56 @@ function isScannableContent(content) {
   return SNIFF_HTML.test(head) || SNIFF_HTML_TAGS.test(head) || SNIFF_JSON.test(head) || SNIFF_XML.test(head) || SNIFF_YAML.test(head) || SNIFF_SHEBANG_SHELL.test(head) || SNIFF_SHEBANG_PYTHON.test(head) || SNIFF_PYTHON.test(head) || SNIFF_JS_TS.test(head) || SNIFF_C_CPP.test(head) || SNIFF_KOTLIN.test(head) || SNIFF_CSV.test(head);
 }
 
+// ../core/dist/detection-names.js
+var PI_DETECTION_NAME = "Other:SagePromptInjectionML-A [Susp]";
+var REPORTING_ENGINE_SHORTHANDS = {
+  package: "sgpk",
+  amsi: "sgam",
+  heuristics: "sghe",
+  ml: "sgml"
+};
+var REPORTING_DETECTION_SUFFIX = "sage";
+function formatReportingDetectionName(canonicalName, engine, optionalData = "") {
+  const engineMetadata = optionalData ? `${REPORTING_ENGINE_SHORTHANDS[engine]}:${optionalData}` : REPORTING_ENGINE_SHORTHANDS[engine];
+  return `${canonicalName}|${engineMetadata}|${REPORTING_DETECTION_SUFFIX}`;
+}
+var PACKAGE_DETECTION_NAMES = {
+  not_found: "Other:SagePackageNotFound-A [Susp]",
+  suspicious_age: "Other:SagePackageNew-A [Susp]",
+  malicious: "Other:SagePackageMalicious-A [Trj]",
+  unknown: "Other:SagePackageUnknown-A [Susp]"
+};
+var AMSI_DETECTION_NAMES = {
+  detected: "Other:SageAmsiDetected-A [Heur]",
+  blocked_by_admin: "Other:SageAmsiBlockedByAdmin-A [Heur]",
+  unknown: "Other:SageAmsiUnknown-A [Susp]"
+};
+var AMSI_REPORTING_RULE_NAMES = {
+  detected: "AMSI_DETECTED",
+  blocked_by_admin: "AMSI_BLOCKED_BY_ADMIN",
+  unknown: "AMSI_UNKNOWN"
+};
+function isCanonicalDetectionName(name) {
+  return /^\w+:\w+-[A-Z]+ \[[^\]\r\n]+\]$/.test(name);
+}
+function packageDetectionName(verdict) {
+  return PACKAGE_DETECTION_NAMES[verdict];
+}
+function amsiDetectionClass(amsiResult) {
+  if (amsiResult >= 32768)
+    return "detected";
+  if (amsiResult >= 16384)
+    return "blocked_by_admin";
+  return "unknown";
+}
+function amsiDetectionName(amsiResult) {
+  return AMSI_DETECTION_NAMES[amsiDetectionClass(amsiResult)];
+}
+function amsiReportingData(amsiResult) {
+  const ruleName = AMSI_REPORTING_RULE_NAMES[amsiDetectionClass(amsiResult)];
+  return `${ruleName}:${Math.trunc(amsiResult).toString(16)}`;
+}
+
 // ../core/dist/extended-info.js
 var import_promises4 = require("node:fs/promises");
 var import_node_os3 = require("node:os");
@@ -16735,7 +16814,8 @@ async function sendCommunityIqTelemetry(args) {
       ...blocking ? { user_action: "blocked" } : {},
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       ...args.signals && Object.keys(args.signals).length > 0 ? { signals: args.signals } : {},
-      content: args.content ?? {}
+      content: args.content ?? {},
+      ...args.contentSnippet ? { content_snippet: args.contentSnippet } : {}
     },
     event_id: args.eventId,
     comment: ""
@@ -17640,6 +17720,7 @@ var PackageChecker = class {
       if (pkg.name.startsWith("@")) {
         results.push({
           packageName: pkg.name,
+          packageVersion: pkg.version,
           registry: pkg.registry,
           verdict: "clean",
           confidence: 1,
@@ -17660,6 +17741,7 @@ var PackageChecker = class {
     } catch {
       return {
         packageName: pkg.name,
+        packageVersion: pkg.version,
         registry: pkg.registry,
         verdict: "unknown",
         confidence: 0.6,
@@ -17669,6 +17751,7 @@ var PackageChecker = class {
     if (metadata === null) {
       return {
         packageName: pkg.name,
+        packageVersion: pkg.version,
         registry: pkg.registry,
         verdict: "not_found",
         confidence: 0.95,
@@ -17678,6 +17761,7 @@ var PackageChecker = class {
     if (!metadata.requestedVersionFound && pkg.version) {
       return {
         packageName: pkg.name,
+        packageVersion: pkg.version,
         registry: pkg.registry,
         verdict: "not_found",
         confidence: 0.95,
@@ -17693,6 +17777,7 @@ var PackageChecker = class {
             const detections = fileResult.detectionNames.length > 0 ? fileResult.detectionNames.join(", ") : sev;
             return {
               packageName: pkg.name,
+              packageVersion: pkg.version,
               registry: pkg.registry,
               verdict: "malicious",
               confidence: 1,
@@ -17711,6 +17796,7 @@ var PackageChecker = class {
     if (ageDays !== void 0 && ageDays < SUSPICIOUS_AGE_DAYS) {
       return {
         packageName: pkg.name,
+        packageVersion: pkg.version,
         registry: pkg.registry,
         verdict: "suspicious_age",
         confidence: 0.6,
@@ -17720,6 +17806,7 @@ var PackageChecker = class {
     }
     return {
       packageName: pkg.name,
+      packageVersion: pkg.version,
       registry: pkg.registry,
       verdict: "clean",
       confidence: 1,
@@ -18155,6 +18242,8 @@ init_file_utils();
 init_types2();
 var REQUIRED_FIELDS = /* @__PURE__ */ new Set([
   "id",
+  "version",
+  "detection_name",
   "category",
   "severity",
   "confidence",
@@ -18162,6 +18251,37 @@ var REQUIRED_FIELDS = /* @__PURE__ */ new Set([
   "match_on",
   "title"
 ]);
+var MACRO_FILENAME = "_macros.yaml";
+var MAX_MACRO_PASSES = 5;
+var MACRO_REF = /\{\{([A-Z0-9_]+)\}\}/g;
+function expandMacros(pattern, macros) {
+  let expanded = pattern;
+  for (let pass = 0; pass <= MAX_MACRO_PASSES; pass++) {
+    if (!expanded.includes("{{"))
+      return expanded;
+    if (pass === MAX_MACRO_PASSES) {
+      throw new Error(`macro nesting exceeds ${MAX_MACRO_PASSES} passes`);
+    }
+    expanded = expanded.replace(MACRO_REF, (_match, name) => {
+      const value = macros[name];
+      if (value === void 0)
+        throw new Error(`undefined macro {{${name}}}`);
+      return value;
+    });
+  }
+  return expanded;
+}
+function readMacros(filename, data, logger) {
+  const macros = {};
+  for (const [name, value] of Object.entries(data)) {
+    if (typeof value !== "string") {
+      logger.warn(`Skipping macro ${name} in ${filename}: not a string`);
+      continue;
+    }
+    macros[name] = value;
+  }
+  return macros;
+}
 function parseExpiresAt(value) {
   if (value == null)
     return null;
@@ -18187,11 +18307,12 @@ async function loadThreats(threatDir, logger = nullLogger) {
     logger.warn("Threat directory does not exist or is unreadable", { path: threatDir });
     return threats;
   }
+  const ruleFiles = [];
+  let macros = {};
   for (const filename of files) {
-    const filePath = (0, import_node_path17.join)(threatDir, filename);
     let content;
     try {
-      content = await getFileContent(filePath);
+      content = await getFileContent((0, import_node_path17.join)(threatDir, filename));
     } catch (e) {
       logger.warn(`Failed to read ${filename}`, { error: String(e) });
       continue;
@@ -18203,10 +18324,21 @@ async function loadThreats(threatDir, logger = nullLogger) {
       logger.warn(`Failed to parse ${filename}`, { error: String(e) });
       continue;
     }
+    if (filename === MACRO_FILENAME) {
+      if (typeof data !== "object" || data === null || Array.isArray(data)) {
+        logger.warn(`Expected mapping in ${filename}, got ${Array.isArray(data) ? "list" : typeof data}`);
+        continue;
+      }
+      macros = readMacros(filename, data, logger);
+      continue;
+    }
     if (!Array.isArray(data)) {
       logger.warn(`Expected list in ${filename}, got ${typeof data}`);
       continue;
     }
+    ruleFiles.push({ filename, data });
+  }
+  for (const { filename, data } of ruleFiles) {
     for (const entry of data) {
       if (typeof entry !== "object" || entry === null) {
         logger.warn(`Skipping non-object entry in ${filename}`);
@@ -18223,10 +18355,12 @@ async function loadThreats(threatDir, logger = nullLogger) {
         continue;
       if (isExpired(record))
         continue;
+      let pattern;
       let compiledPattern;
       try {
+        pattern = expandMacros(record.pattern, macros);
         const flags2 = record.case_insensitive === true ? "i" : "";
-        compiledPattern = new RegExp(record.pattern, flags2);
+        compiledPattern = new RegExp(pattern, flags2);
       } catch (e) {
         logger.warn(`Skipping threat ${record.id}: invalid regex pattern`, {
           error: String(e)
@@ -18244,13 +18378,28 @@ async function loadThreats(threatDir, logger = nullLogger) {
         });
         continue;
       }
+      const version = record.version;
+      if (typeof version !== "number" || !Number.isInteger(version) || version <= 0) {
+        logger.warn(`Skipping threat ${record.id}: invalid version`, {
+          version
+        });
+        continue;
+      }
+      const detectionName = record.detection_name;
+      if (typeof detectionName !== "string" || !isCanonicalDetectionName(detectionName)) {
+        logger.warn(`Skipping threat ${record.id}: invalid detection_name`, {
+          detectionName
+        });
+        continue;
+      }
       threats.push({
         id: record.id,
-        version: typeof record.version === "number" ? record.version : void 0,
+        version,
+        detectionName,
         category: record.category,
         severity: record.severity,
         confidence,
-        pattern: record.pattern,
+        pattern,
         compiledPattern,
         matchOn,
         title: record.title,
@@ -18268,6 +18417,29 @@ async function loadThreats(threatDir, logger = nullLogger) {
 init_types2();
 var AMSI_CONTENT_SNIPPET_MAX = 200;
 var AMSI_CONTENT_NAME_MAX = 256;
+var HEURISTIC_PI_CONTENT_SNIPPET_MAX = 200;
+function buildHeuristicSignal(match) {
+  return {
+    detection_name: formatReportingDetectionName(match.threat.detectionName, "heuristics", `${match.threat.id}:${match.threat.version}`),
+    rule_id: match.threat.id,
+    rule_version: match.threat.version
+  };
+}
+function resolvePiContentSnippet(piResults, heuristicMatches) {
+  let highestRiskResult;
+  for (const result of piResults) {
+    if (result.risk >= DEFAULT_PI_MEDIUM_RISK_THRESHOLD && result.contentSnippet && (!highestRiskResult || result.risk > highestRiskResult.risk)) {
+      highestRiskResult = result;
+    }
+  }
+  if (highestRiskResult?.contentSnippet)
+    return scrubHomePath(highestRiskResult.contentSnippet);
+  const heuristicMatch = heuristicMatches.find((match) => match.threat.category === "prompt_injection");
+  if (!heuristicMatch)
+    return void 0;
+  const snippet = safeTruncate(scrubHomePath(heuristicMatch.matchValue), HEURISTIC_PI_CONTENT_SNIPPET_MAX);
+  return snippet || void 0;
+}
 function scrubAmsiContentName(contentName) {
   const colon = contentName.indexOf(":");
   if (colon < 0)
@@ -18277,16 +18449,10 @@ function scrubAmsiContentName(contentName) {
   return `${head}${scrubHomePath(tail)}`;
 }
 function buildAmsiSignal(r) {
-  const detectionName = r.amsiResult >= 32768 ? "AMSI|DETECTED" : r.amsiResult >= 16384 ? "AMSI|BLOCKED_BY_ADMIN" : (
-    // Defensive: callers should filter these out via `isDetected || isBlockedByAdmin`,
-    // but if a non-detected/non-blocked result still reaches here we emit a
-    // meaningful label rather than silently dropping the entry.
-    "AMSI|UNKNOWN"
-  );
   const contentName = safeTruncate(scrubAmsiContentName(r.contentName), AMSI_CONTENT_NAME_MAX);
   const snippet = r.content ? safeTruncate(scrubHomePath(r.content), AMSI_CONTENT_SNIPPET_MAX) : "";
   return {
-    detection_name: detectionName,
+    detection_name: formatReportingDetectionName(amsiDetectionName(r.amsiResult), "amsi", amsiReportingData(r.amsiResult)),
     content_name: contentName,
     amsi_result: r.amsiResult,
     ...snippet ? { content_snippet: snippet } : {}
@@ -18358,7 +18524,7 @@ async function evaluateToolCall(request, context) {
         severity: "critical",
         source: "exception",
         artifacts: [denyMatch.artifact.value],
-        matchedThreatId: null,
+        matchedThreatId: denyMatch.rule.id,
         reasons: [
           `Deny exception: ${denyMatch.rule.match} pattern '${denyMatch.rule.pattern}'${denyMatch.rule.reason ? ` \u2014 ${denyMatch.rule.reason}` : ""}`
         ]
@@ -18528,6 +18694,12 @@ async function evaluateToolCall(request, context) {
               if (result) {
                 allPiResults.push(result);
               }
+            } else {
+              logger.info("PI model inference skipped", {
+                context: `WebFetch:${url}`,
+                reason: "content_not_scannable",
+                contentType: fetched.contentType ?? "unknown"
+              });
             }
           }
         }
@@ -18573,24 +18745,9 @@ async function evaluateToolCall(request, context) {
     }
   }
   await cacheUrlResults(urlCheckResults, cache2);
-  function formatPackageDetectionName(p) {
-    const base = `PKG|${p.verdict}|registry=${p.registry}|name=${p.packageName}`;
-    if (p.verdict === "suspicious_age") {
-      const ageDays = typeof p.ageDays === "number" ? Math.floor(p.ageDays) : void 0;
-      return ageDays !== void 0 ? `${base}|age_days=${ageDays}` : base;
-    }
-    if (p.verdict === "malicious") {
-      const det = (p.fileDetectionNames ?? []).filter((d) => typeof d === "string" && d.length > 0);
-      return det.length > 0 ? `${base}|det=${det.join(",")}` : base;
-    }
-    return base;
-  }
   const auditSignals = {};
   if (heuristicMatches.length > 0) {
-    auditSignals.heuristics = heuristicMatches.map((m) => ({
-      rule_id: m.threat.id,
-      rule_version: typeof m.threat.version === "number" ? m.threat.version : void 0
-    }));
+    auditSignals.heuristics = heuristicMatches.map(buildHeuristicSignal);
   }
   if (urlCheckResults.length > 0) {
     const relevant = urlCheckResults.filter((r) => r.isMalicious);
@@ -18621,9 +18778,9 @@ async function evaluateToolCall(request, context) {
     const relevant = packageCheckResults.filter((p) => p.verdict !== "clean");
     if (relevant.length > 0) {
       auditSignals.package_checks = relevant.map((p) => ({
-        detection_name: formatPackageDetectionName(p),
+        detection_name: formatReportingDetectionName(packageDetectionName(p.verdict), "package", p.packageVersion ? `${p.packageName}:${p.packageVersion}` : p.packageName),
         package_name: p.packageName,
-        package_version: void 0,
+        package_version: p.packageVersion,
         package_registry: p.registry
       }));
     }
@@ -18638,6 +18795,7 @@ async function evaluateToolCall(request, context) {
   if (allPiResults.length > 0) {
     const piSnippetFloor = DEFAULT_PI_MEDIUM_RISK_THRESHOLD;
     auditSignals.pi_checks = allPiResults.map((r) => ({
+      detection_name: formatReportingDetectionName(PI_DETECTION_NAME, "ml", `${r.modelId}:${MODEL_SCHEMA_VERSION}`),
       risk: r.risk,
       model_id: r.modelId,
       content_name: r.contentName,
@@ -18651,6 +18809,7 @@ async function evaluateToolCall(request, context) {
     }
   }
   const resolvedSignals = Object.keys(auditSignals).length > 0 ? auditSignals : void 0;
+  const contentSnippet = resolvePiContentSnippet(allPiResults, heuristicMatches);
   const builtContent = buildContentSnapshot(request.toolName, request.toolInput, request.artifacts, auditSignals);
   const resolvedContent = Object.keys(builtContent).length > 0 ? builtContent : void 0;
   try {
@@ -18664,6 +18823,7 @@ async function evaluateToolCall(request, context) {
       hookType: request.hookType,
       signals: resolvedSignals,
       content: resolvedContent,
+      contentSnippet,
       eventId,
       toolUseId: request.toolUseId
     });
@@ -18679,6 +18839,7 @@ async function evaluateToolCall(request, context) {
         hookType: request.hookType,
         toolName: request.toolName,
         content: resolvedContent,
+        contentSnippet,
         signals: resolvedSignals,
         communityIqEnabled: config2.community_iq,
         config: config2,
@@ -18804,6 +18965,7 @@ async function checkPackages(request, config2, cache2, logger) {
       }
       results.push({
         packageName: pkg.name,
+        packageVersion: pkg.version,
         registry: pkg.registry,
         verdict: rawVerdict,
         confidence: rawConf,
@@ -18868,6 +19030,19 @@ function kv(key, value) {
 function separatorLine(headerLength) {
   return "\u2501".repeat(headerLength);
 }
+function ruleLabel(verdict) {
+  if (!verdict.matchedThreatId)
+    return null;
+  return verdict.source === "exception" ? `${verdict.matchedThreatId} (your exception rule)` : verdict.matchedThreatId;
+}
+function remediationHint(verdict) {
+  if (verdict.source === "exception") {
+    const id = verdict.matchedThreatId ? ` (id ${verdict.matchedThreatId})` : "";
+    return `This block comes from your own rule in ~/.sage/exceptions.json${id} \u2014 edit or remove it there.`;
+  }
+  const rule = verdict.matchedThreatId ? ` (rule ${verdict.matchedThreatId})` : "";
+  return `If this is a false positive, use the sage_report_false_positive MCP tool to report it${rule}.`;
+}
 function formatUpdateNotice(result) {
   return `\u2B06\uFE0F  Update available: v${result.currentVersion} \u2192 v${result.latestVersion} (https://github.com/gendigitalinc/sage)`;
 }
@@ -19014,12 +19189,14 @@ function summarizeArtifacts(artifacts) {
 function formatDenyMessage(verdict, branding2 = defaultBranding) {
   const maxReasons = 5;
   const reasons = verdict.reasons.length > 0 ? verdict.reasons.slice(0, maxReasons).join("; ") + (verdict.reasons.length > maxReasons ? `; ... and ${verdict.reasons.length - maxReasons} more` : "") : verdict.category;
+  const rule = ruleLabel(verdict);
   return [
     `${branding2.name} blocked this action.`,
     `Severity: ${verdict.severity}`,
     `Category: ${verdict.category}`,
+    ...rule ? [`Rule: ${rule}`] : [],
     `Reason: ${reasons}`,
-    `If this is a false positive, use the sage_report_false_positive MCP tool to report it.`
+    remediationHint(verdict)
   ].join("\n");
 }
 
@@ -19688,6 +19865,10 @@ async function computeSkillIdsForRoot(rootDir, logger) {
   for (const folder of folders) {
     try {
       const entries = await entriesFromDirectory(folder, MAX_SKILL_BYTES);
+      if (entries.length === 0) {
+        logger?.warn("Skill enumerates to no entries; not analyzable, skipping", { folder });
+        continue;
+      }
       const { skillId } = computeSkillId(entries);
       out.push({ folder, skillId });
     } catch (e) {
@@ -20869,7 +21050,7 @@ function createOpenClawScanHandler(logger, context, branding2 = defaultBranding,
     branding: branding2,
     onResult,
     // No onNotices: OpenClaw delivers the one-time notice from
-    // `before_agent_start` (a different process/turn than this scan) via
+    // `before_prompt_build` (a different process/turn than this scan) via
     // takePendingNotices, so the scan-time callback would never fire.
     modelDownloadWorkerPath: (0, import_node_path28.resolve)(__dirname, "model-download-worker.cjs"),
     skillUploadWorkerPath: (0, import_node_path28.resolve)(__dirname, "skill-upload-worker.cjs"),
@@ -20884,15 +21065,15 @@ function createStartupScanHandler(logger, branding2 = defaultBranding, onResult,
 function createSessionScanHandler(logger, branding2 = defaultBranding, onResult, announceCleanScans = true) {
   return createOpenClawScanHandler(logger, "session", branding2, onResult, announceCleanScans);
 }
-function createBeforeAgentStartHandler(getSecurityFindings, clearFindings, logger, branding2 = defaultBranding) {
+function createPromptContextHandler(getSecurityFindings, clearFindings, logger, branding2 = defaultBranding) {
   return (notices) => {
     const findings = getSecurityFindings();
     if (!notices && !findings) {
-      logger.debug(`${branding2.name}: before_agent_start - nothing pending to surface`);
+      logger.debug(`${branding2.name}: before_prompt_build - nothing pending to surface`);
       return void 0;
     }
     if (findings) clearFindings();
-    logger.debug(`${branding2.name}: surfacing context via before_agent_start`, {
+    logger.debug(`${branding2.name}: surfacing context via before_prompt_build`, {
       hasNotices: Boolean(notices),
       hasFindings: Boolean(findings)
     });
@@ -21057,6 +21238,7 @@ function createToolCallHandler(approvalStore, logger, threatsDir, trustedDomains
       }
       const maxReasons = 3;
       const reasons = verdict.reasons.length > 0 ? verdict.reasons.slice(0, maxReasons).join("; ") + (verdict.reasons.length > maxReasons ? `; ... and ${verdict.reasons.length - maxReasons} more` : "") : verdict.category;
+      const rule = ruleLabel(verdict);
       const intersected = artifacts.filter((a) => verdict.artifacts.includes(a.value));
       const flaggedArtifacts = intersected.length > 0 ? intersected : artifacts;
       completeHook("evaluated", {
@@ -21073,6 +21255,7 @@ function createToolCallHandler(approvalStore, logger, threatsDir, trustedDomains
           title: `${branding2.name}: ${verdict.category}`,
           description: [
             `Severity: ${verdict.severity}`,
+            ...rule ? [`Rule: ${rule}`] : [],
             `Reason: ${reasons}`,
             `Artifacts: ${summarizeArtifacts(artifacts)}`
           ].join("\n"),
@@ -21143,7 +21326,7 @@ ${notice}` : notice;
       pendingScanFindings = msg;
     };
     const getPendingSecurityFindings = () => [pendingConfigurationWarnings, pendingScanFindings].filter(Boolean).join("\n\n") || null;
-    const beforeAgentStartHandler = createBeforeAgentStartHandler(
+    const promptContextHandler = createPromptContextHandler(
       getPendingSecurityFindings,
       () => {
         pendingConfigurationWarnings = null;
@@ -21179,10 +21362,10 @@ ${notice}` : notice;
       "session_start",
       createSessionScanHandler(scanLogger, branding, onFindings, config.announce_clean_scans)
     );
-    api.on("before_agent_start", async () => {
+    api.on("before_prompt_build", async () => {
       await migrationCheckPromise;
       const notices = await resolveNoticeText();
-      return beforeAgentStartHandler(notices);
+      return promptContextHandler(notices);
     });
   }
 };