@kenhkl/agent-moss 0.12.0 → 0.12.2

package/dist/engine/coordinator.d.ts

@@ -17,6 +17,15 @@ interface AnalysisInput {
         actionType: string;
         actionDetail: string;
     }[];
+    /** 完整的交错历史 prompt（可选），每轮 {text, actions}，按时间序。
+     *  供 L2 意图一致性与 L3 语义分析使用；空则回退单条 promptSession。 */
+    promptHistory?: {
+        text: string;
+        actions: {
+            actionType: string;
+            actionDetail: string;
+        }[];
+    }[];
     aNext: {
         actionType: string;
         actionDetail: string;

package/dist/engine/coordinator.js

@@ -672,6 +672,32 @@ function matchDangerousAction(actionDetail, action) {
   const re = new RegExp(`(?<![-\\w])${escaped}\\b`, "i");
   return re.test(actionDetail);
 }
+function collectIntentTexts(promptSession, promptHistory) {
+  const texts = [];
+  if (promptHistory) {
+    for (const turn of promptHistory) {
+      if (typeof turn === "string") {
+        const t2 = turn.trim();
+        if (t2) texts.push(t2.toLowerCase());
+        continue;
+      }
+      const t = (turn?.text || "").trim();
+      if (t) texts.push(t.toLowerCase());
+    }
+  }
+  if (promptSession && promptSession.trim()) {
+    texts.push(promptSession.toLowerCase());
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const deduped = [];
+  for (const t of texts) {
+    if (!seen.has(t)) {
+      seen.add(t);
+      deduped.push(t);
+    }
+  }
+  return deduped;
+}
 function runLogicCheck(input) {
   const { actionHistory, aNext, cwd } = input;
   const actionDetail = aNext.actionDetail.toLowerCase();
@@ -681,25 +707,24 @@ function runLogicCheck(input) {
   const isExcludedType = EXCLUDED_PREFIXES.some((p) => actionType.startsWith(p));
   const rbwResult = checkReadBeforeWrite(actionType, actionDetail, actionHistory, input.reason, resolvedCwd);
   if (rbwResult) return rbwResult;
-  if (input.promptSession && input.promptSession.trim()) {
-    if (!isExcludedType) {
-      if (INLINE_SCRIPT_RE.test(actionDetail)) {
-      } else {
-        const promptLower = input.promptSession.toLowerCase();
-        for (const pattern of INTENT_DEVIATION_PATTERNS) {
-          const intentMatched = pattern.intentKeywords.some((kw) => promptLower.includes(kw));
-          const dangerousMatched = pattern.dangerousActions.some((kw) => matchDangerousAction(actionDetail, kw));
-          if (intentMatched && dangerousMatched) {
-            return {
-              allowed: false,
-              reason: pattern.reason,
-              riskLevel: "high",
-              riskType: "intent_deviation",
-              confidence: 85,
-              source: "logic_rule",
-              violatedLayers: ["2"]
-            };
-          }
+  if (!isExcludedType) {
+    if (!INLINE_SCRIPT_RE.test(actionDetail)) {
+      const intentTexts = collectIntentTexts(input.promptSession, input.promptHistory);
+      for (const pattern of INTENT_DEVIATION_PATTERNS) {
+        const intentMatched = intentTexts.some(
+          (text) => pattern.intentKeywords.some((kw) => text.includes(kw))
+        );
+        const dangerousMatched = pattern.dangerousActions.some((kw) => matchDangerousAction(actionDetail, kw));
+        if (intentMatched && dangerousMatched) {
+          return {
+            allowed: false,
+            reason: pattern.reason,
+            riskLevel: "high",
+            riskType: "intent_deviation",
+            confidence: 85,
+            source: "logic_rule",
+            violatedLayers: ["2"]
+          };
         }
       }
     }
@@ -2264,7 +2289,7 @@ function runHeuristicCheck(input) {
     } catch {
     }
   }
-  const scanDetail = stripLiteralTextSegments(input.aNext.actionDetail);
+  const scanDetail = normalizePathSegments(stripLiteralTextSegments(input.aNext.actionDetail));
   const scanCommand = `${input.aNext.actionType}: ${scanDetail}`;
   let topRiskType = "";
   for (const rule of DANGEROUS_PATTERNS) {
@@ -2375,6 +2400,28 @@ function stripHeredocContent(actionDetail) {
     "<<heredoc>>\n"
   );
 }
+function normalizePathSegments(text) {
+  const protTokens = [];
+  let t = text.replace(/\b(https?|ftp|file):\/\//gi, (m) => {
+    const scheme = m.slice(0, m.indexOf(":"));
+    protTokens.push("://");
+    return `${scheme}__PROT${protTokens.length - 1}__`;
+  });
+  const quoteTokens = [];
+  t = t.replace(/'[^']*'|"[^"]*"/g, (m) => {
+    quoteTokens.push(m);
+    return `__Q${quoteTokens.length - 1}__`;
+  });
+  t = t.replace(/\/{2,}/g, "/");
+  t = t.replace(/\/\.\//g, "/");
+  for (let i = 0; i < quoteTokens.length; i++) {
+    t = t.replace(`__Q${i}__`, quoteTokens[i]);
+  }
+  for (let i = 0; i < protTokens.length; i++) {
+    t = t.replace(`__PROT${i}__`, protTokens[i]);
+  }
+  return t;
+}
 function splitCommandSegments(actionDetail) {
   const segments = [];
   let cur = "";
@@ -2427,7 +2474,7 @@ function isSearchActionType(actionType) {
 function checkSensitivePath(command, cwd, agentExt) {
   const expandedCwd = cwd.replace(/^~/, process.env.HOME || "/home/user");
   const isWriteOpFlag = isWriteOperation("", command);
-  const pathScanText = stripLiteralTextSegments(command);
+  const pathScanText = normalizePathSegments(stripLiteralTextSegments(command));
   const pathMatches = (text, path3) => {
     const parts = path3.split(/(\(\?!.*?\))/);
     const escaped = parts.map((part) => {
@@ -3711,11 +3758,12 @@ ${prompt}
 function buildPrompt(input, previous, matchedSkills, templates, scriptAnalysis, skipL3Hints = "", scriptChainText = "") {
   const skillsText = formatSkillsForPrompt(matchedSkills);
   const historyStr = input.actionHistory.map((h, i) => `${i + 1}. ${h.actionType}: ${h.actionDetail}`).join("\n") || "(\u65E0\u5386\u53F2\u64CD\u4F5C)";
+  const promptHistoryText = formatPromptHistory(input.promptHistory);
   const scriptAnalysisText = scriptChainText ? scriptChainText : scriptAnalysis ? formatScriptAnalysisForPrompt(scriptAnalysis) : "";
   const hintsText = formatHints(previous);
   const securityJudgeTemplate = templates["security_judge"];
   if (securityJudgeTemplate) {
-    return securityJudgeTemplate.replaceAll("{prompt_session}", input.promptSession || "\uFF08\u672A\u63D0\u4F9B\uFF09").replaceAll("{action_history}", historyStr).replaceAll("{action_type}", input.aNext.actionType).replaceAll("{action_detail}", input.aNext.actionDetail).replaceAll("{reason}", input.reason || "\u672A\u8BF4\u660E").replaceAll("{skills_text}", skillsText).replaceAll("{hints_text}", hintsText).replaceAll("{script_analysis_text}", scriptAnalysisText).replaceAll("{skip_l3_hints}", skipL3Hints).replaceAll("{{", "{").replaceAll("}}", "}");
+    return securityJudgeTemplate.replaceAll("{prompt_session}", input.promptSession || "\uFF08\u672A\u63D0\u4F9B\uFF09").replaceAll("{prompt_history_text}", promptHistoryText).replaceAll("{action_history}", historyStr).replaceAll("{action_type}", input.aNext.actionType).replaceAll("{action_detail}", input.aNext.actionDetail).replaceAll("{reason}", input.reason || "\u672A\u8BF4\u660E").replaceAll("{skills_text}", skillsText).replaceAll("{hints_text}", hintsText).replaceAll("{script_analysis_text}", scriptAnalysisText).replaceAll("{skip_l3_hints}", skipL3Hints).replaceAll("{{", "{").replaceAll("}}", "}");
   }
   console.warn("[AgentMoss] security_judge template missing, using sparse fallback prompt");
   return `## \u5F53\u524D\u64CD\u4F5C\u4E0A\u4E0B\u6587
@@ -3745,6 +3793,27 @@ ${scriptAnalysisText}` : ""}
 \u8F93\u51FA\u683C\u5F0F:
 {"allowed": true/false, "reason": "\u5224\u65AD\u7406\u7531", "riskLevel": "low|medium|high|critical", "riskType": "\u98CE\u9669\u7C7B\u578B", "confidence": 0-100}`;
 }
+function formatPromptHistory(promptHistory, maxTextChars = 500) {
+  if (!promptHistory || promptHistory.length === 0) {
+    return "\uFF08\u672A\u63D0\u4F9B\u5386\u53F2\u610F\u56FE\uFF09";
+  }
+  const lines = [];
+  for (let i = 0; i < promptHistory.length; i++) {
+    const turn = promptHistory[i];
+    const text = (turn?.text || "").trim();
+    if (!text) continue;
+    let line = `  \u7B2C${i + 1}\u8F6E\u7528\u6237\u610F\u56FE: ${text.slice(0, maxTextChars)}`;
+    const actions = turn?.actions;
+    if (actions && actions.length > 0) {
+      const types = actions.map((a) => a?.actionType).filter((t) => typeof t === "string" && t.length > 0);
+      if (types.length > 0) {
+        line += `  \u2192 \u52A8\u4F5C: ${types.join(", ")}`;
+      }
+    }
+    lines.push(line);
+  }
+  return lines.length > 0 ? lines.join("\n") : "\uFF08\u672A\u63D0\u4F9B\u5386\u53F2\u610F\u56FE\uFF09";
+}
 function formatHints(previous) {
   const hints = [];
   if (previous.heuristic) {