principles-disciple 1.8.1 → 1.8.2

package/{dist/hooks/llm.js → src/hooks/llm.ts}

@@ -1,44 +1,64 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { trackLlmOutput, recordThinkingCheckpoint, resetFriction } from '../core/session-tracker.js';
+import { PluginHookLlmOutputEvent, PluginHookAgentContext } from '../openclaw-sdk.js';
+import { trackFriction, trackLlmOutput, recordThinkingCheckpoint, resetFriction } from '../core/session-tracker.js';
 import { writePainFlag } from '../core/pain.js';
 import { ControlUiDatabase } from '../core/control-ui-db.js';
 import { DetectionService } from '../core/detection-service.js';
 import { detectThinkingModelMatches, deriveThinkingScenarios } from '../core/thinking-models.js';
 import { WorkspaceContext } from '../core/workspace-context.js';
 import { sanitizeAssistantText } from './message-sanitize.js';
-const empathyDedupState = new Map();
-const empathyRateState = new Map();
-function clamp(value, min, max) {
+
+export interface EmpathySignal {
+    detected: boolean;
+    severity: 'mild' | 'moderate' | 'severe';
+    confidence: number;
+    reason?: string;
+    mode?: 'structured' | 'legacy_tag';
+}
+
+type EmpathyRateState = {
+    turnScore: number;
+    hourScore: number;
+    hourWindowStart: number;
+    lastRunId?: string;
+};
+
+const empathyDedupState = new Map<string, number>();
+const empathyRateState = new Map<string, EmpathyRateState>();
+
+function clamp(value: number, min: number, max: number): number {
     return Math.max(min, Math.min(max, value));
 }
-function normalizeSeverity(input) {
+
+function normalizeSeverity(input?: string): 'mild' | 'moderate' | 'severe' {
     const normalized = (input || '').toLowerCase();
-    if (normalized === 'severe' || normalized === 'high')
-        return 'severe';
-    if (normalized === 'moderate' || normalized === 'medium')
-        return 'moderate';
+    if (normalized === 'severe' || normalized === 'high') return 'severe';
+    if (normalized === 'moderate' || normalized === 'medium') return 'moderate';
     return 'mild';
 }
-function parseConfidence(raw) {
+
+function parseConfidence(raw?: string): number {
     const parsed = Number(raw);
-    if (!Number.isFinite(parsed))
-        return 1;
+    if (!Number.isFinite(parsed)) return 1;
     return clamp(parsed, 0, 1);
 }
-function parseTrustedLegacyTag(text) {
+
+function parseTrustedLegacyTag(text: string): RegExpMatchArray | null {
     return text.match(/^\s*\[EMOTIONAL_DAMAGE_DETECTED(?::(mild|moderate|severe))?\]\s*$/i);
 }
+
 /**
  * 检测标签是否是被用户诱导/引用输出的（回显），而非 LLM 主动输出的情绪信号
  */
-function isEchoedTag(text, tagMatch) {
+function isEchoedTag(text: string, tagMatch: RegExpMatchArray): boolean {
     const tagIndex = tagMatch.index ?? 0;
     const before = text.substring(Math.max(0, tagIndex - 100), tagIndex).toLowerCase();
+
     // 1. 检查是否在引号内（用户引用）
     const quotesBefore = (before.match(/["'\u300c\u300d\u201c\u201d`]/g) || []).length;
-    if (quotesBefore % 2 === 1)
-        return true;
+    if (quotesBefore % 2 === 1) return true;
+
     // 2. Strong patterns: 用户指令关键词（任意位置匹配）
     const strongPatterns = [
         /用户(说|让|要求|让我输出)/,
@@ -48,9 +68,9 @@ function isEchoedTag(text, tagMatch) {
         /你让我输出/,
     ];
     for (const pattern of strongPatterns) {
-        if (pattern.test(before))
-            return true;
+        if (pattern.test(before)) return true;
     }
+
     // 3. Weak patterns: 仅在标签 15 字符内触发
     const weakPatterns = [
         { pattern: /echo/, window: 15 },
@@ -59,19 +79,21 @@ function isEchoedTag(text, tagMatch) {
     ];
     for (const { pattern, window } of weakPatterns) {
         const nearTag = text.substring(Math.max(0, tagIndex - window), tagIndex).toLowerCase();
-        if (pattern.test(nearTag))
-            return true;
+        if (pattern.test(nearTag)) return true;
     }
+
     // 4. 检查是否在代码块内
     const codeBlocksBefore = (before.match(/```/g) || []).length;
-    if (codeBlocksBefore % 2 === 1)
-        return true;
+    if (codeBlocksBefore % 2 === 1) return true;
+
     return false;
 }
-export function extractEmpathySignal(text) {
+
+export function extractEmpathySignal(text: string): EmpathySignal {
     if (!text || typeof text !== 'string') {
         return { detected: false, severity: 'mild', confidence: 1 };
     }
+
     const xmlMatch = text.match(/<empathy\s+([^>]*)\/?>(?:<\/empathy>)?/i);
     if (xmlMatch?.[1]) {
         const attrs = xmlMatch[1];
@@ -83,11 +105,14 @@ export function extractEmpathySignal(text) {
             return { detected: true, severity, confidence, reason, mode: 'structured' };
         }
     }
+
     const jsonMatch = text.match(/"empathy"\s*:\s*\{[\s\S]*?\}/i);
     if (jsonMatch) {
         const jsonText = `{${jsonMatch[0]}}`;
         try {
-            const parsed = JSON.parse(jsonText);
+            const parsed = JSON.parse(jsonText) as {
+                empathy?: { damageDetected?: boolean; severity?: string; confidence?: number; reason?: string };
+            };
             if (parsed.empathy?.damageDetected === true) {
                 return {
                     detected: true,
@@ -97,11 +122,11 @@ export function extractEmpathySignal(text) {
                     mode: 'structured'
                 };
             }
-        }
-        catch {
+        } catch {
             // ignore malformed snippet
         }
     }
+
     const tagMatch = parseTrustedLegacyTag(text);
     if (tagMatch) {
         if (isEchoedTag(text, tagMatch)) {
@@ -114,22 +139,25 @@ export function extractEmpathySignal(text) {
             mode: 'legacy_tag'
         };
     }
+
     return { detected: false, severity: 'mild', confidence: 1 };
 }
-function mapSeverityToPenalty(severity, config) {
+
+function mapSeverityToPenalty(severity: 'mild' | 'moderate' | 'severe', config: ReturnType<typeof WorkspaceContext.fromHookContext>['config']): number {
     const mild = Number(config.get('empathy_engine.penalties.mild') ?? 10);
     const moderate = Number(config.get('empathy_engine.penalties.moderate') ?? 25);
     const severe = Number(config.get('empathy_engine.penalties.severe') ?? 40);
-    if (severity === 'severe')
-        return severe;
-    if (severity === 'moderate')
-        return moderate;
+
+    if (severity === 'severe') return severe;
+    if (severity === 'moderate') return moderate;
     return mild;
 }
-function dedupeKey(sessionId, runId, signal) {
+
+function dedupeKey(sessionId: string, runId: string, signal: EmpathySignal): string {
     return `${sessionId}:${runId}:${signal.severity}:${(signal.reason || '').slice(0, 80)}`;
 }
-function shouldDedupe(sessionId, runId, signal, windowMs) {
+
+function shouldDedupe(sessionId: string, runId: string, signal: EmpathySignal, windowMs: number): boolean {
     const key = dedupeKey(sessionId, runId, signal);
     const now = Date.now();
     const last = empathyDedupState.get(key);
@@ -139,69 +167,88 @@ function shouldDedupe(sessionId, runId, signal, windowMs) {
     empathyDedupState.set(key, now);
     return false;
 }
-function resolveCalibrationFactor(event, config) {
-    const table = config.get('empathy_engine.model_calibration');
-    if (!table || typeof table !== 'object')
-        return 1;
+
+function resolveCalibrationFactor(
+    event: PluginHookLlmOutputEvent,
+    config: ReturnType<typeof WorkspaceContext.fromHookContext>['config']
+): number {
+    const table = config.get('empathy_engine.model_calibration') as Record<string, number> | undefined;
+    if (!table || typeof table !== 'object') return 1;
+
     const modelKey = `${event.provider}/${event.model}`;
     const factor = Number(table[modelKey] ?? 1);
-    if (!Number.isFinite(factor))
-        return 1;
+    if (!Number.isFinite(factor)) return 1;
     return clamp(factor, 0.1, 3);
 }
-function applyRateLimit(sessionId, runId, score, config) {
+
+function applyRateLimit(
+    sessionId: string,
+    runId: string,
+    score: number,
+    config: ReturnType<typeof WorkspaceContext.fromHookContext>['config']
+): number {
     const maxPerTurn = Number(config.get('empathy_engine.rate_limit.max_per_turn') ?? 40);
     const maxPerHour = Number(config.get('empathy_engine.rate_limit.max_per_hour') ?? 120);
     const now = Date.now();
+
     const prev = empathyRateState.get(sessionId) ?? {
         turnScore: 0,
         hourScore: 0,
         hourWindowStart: now,
         lastRunId: runId,
     };
+
     if (prev.lastRunId !== runId) {
         prev.turnScore = 0;
         prev.lastRunId = runId;
     }
+
     if (now - prev.hourWindowStart >= 60 * 60 * 1000) {
         prev.hourScore = 0;
         prev.hourWindowStart = now;
     }
+
     const byTurn = Math.max(0, maxPerTurn - prev.turnScore);
     const byHour = Math.max(0, maxPerHour - prev.hourScore);
     const allowed = Math.max(0, Math.min(score, byTurn, byHour));
+
     prev.turnScore += allowed;
     prev.hourScore += allowed;
     empathyRateState.set(sessionId, prev);
+
     return allowed;
 }
-export function isEmpathyAuditPayload(text) {
-    if (!text || typeof text !== 'string')
-        return false;
+
+
+export function isEmpathyAuditPayload(text: string): boolean {
+    if (!text || typeof text !== 'string') return false;
     const trimmed = text.trim();
-    if (/^\{[\s\S]*"damageDetected"[\s\S]*\}$/.test(trimmed))
-        return true;
-    if (/^<empathy\s+([^>]*)\/?>/i.test(trimmed))
-        return true;
-    if (/^\s*\[EMOTIONAL_DAMAGE_DETECTED(?::(mild|moderate|severe))?\]\s*$/i.test(trimmed))
-        return true;
+    if (/^\{[\s\S]*"damageDetected"[\s\S]*\}$/.test(trimmed)) return true;
+    if (/^<empathy\s+([^>]*)\/?>/i.test(trimmed)) return true;
+    if (/^\s*\[EMOTIONAL_DAMAGE_DETECTED(?::(mild|moderate|severe))?\]\s*$/i.test(trimmed)) return true;
     return false;
 }
-export function handleLlmOutput(event, ctx) {
-    if (!ctx.workspaceDir || !ctx.sessionId)
-        return;
+
+export function handleLlmOutput(
+    event: PluginHookLlmOutputEvent,
+    ctx: PluginHookAgentContext & { workspaceDir?: string }
+): void {
+    if (!ctx.workspaceDir || !ctx.sessionId) return;
+
     const wctx = WorkspaceContext.fromHookContext(ctx);
     const config = wctx.config;
     const eventLog = wctx.eventLog;
+
     // Track this turn in the core session memory
     const state = trackLlmOutput(ctx.sessionId, event.usage, config, ctx.workspaceDir, ctx.sessionKey, ctx.trigger);
+
     // We need actual assistant text to analyze
-    if (!event.assistantTexts || event.assistantTexts.length === 0)
-        return;
+    if (!event.assistantTexts || event.assistantTexts.length === 0) return;
+
     const text = event.assistantTexts.join('\n');
     const signal = extractEmpathySignal(text);
     const createdAt = new Date().toISOString();
-    let assistantTurnId = null;
+    let assistantTurnId: number | null = null;
     try {
         assistantTurnId = wctx.trajectory?.recordAssistantTurn?.({
             sessionId: ctx.sessionId,
@@ -214,14 +261,15 @@ export function handleLlmOutput(event, ctx) {
             empathySignalJson: signal,
             createdAt,
         });
-    }
-    catch (error) {
+    } catch (error) {
         ctx.logger?.warn?.(`[PD:LLM] Failed to persist assistant turn to trajectory: ${String(error)}`);
     }
+
     // ── Track B: Semantic Pain Detection (V1.3.0 Funnel) ──
     const detectionText = isEmpathyAuditPayload(text) ? '' : text;
     const detectionService = DetectionService.get(wctx.stateDir);
     const detection = detectionService.detect(detectionText);
+
     if (detection.detected) {
         eventLog.recordRuleMatch(ctx.sessionId, {
             ruleId: detection.ruleId || detection.source,
@@ -230,6 +278,7 @@ export function handleLlmOutput(event, ctx) {
             textPreview: detectionText.substring(0, 100)
         });
     }
+
     let painScore = detection.detected ? (detection.severity || 0) : 0;
     let source = detection.detected
         ? (detection.ruleId ? `llm_${detection.ruleId.toLowerCase()}` : `llm_${detection.source}`)
@@ -237,12 +286,18 @@ export function handleLlmOutput(event, ctx) {
     let matchedReason = detection.detected
         ? `Agent triggered pain detection (Source: ${detection.source}${detection.ruleId ? `, Rule: ${detection.ruleId}` : ''})`
         : '';
+
     // ═══ Natural Language Rollback Detection ═══
     const rollbackMatch = text.match(/^\s*\[EMPATHY_ROLLBACK_REQUEST\]\s*$/m);
     if (rollbackMatch) {
         const eventId = eventLog.getLastEmpathyEventId(ctx.sessionId);
         if (eventId) {
-            const rolledBackScore = eventLog.rollbackEmpathyEvent(eventId, ctx.sessionId, 'Natural language rollback request detected', 'natural_language');
+            const rolledBackScore = eventLog.rollbackEmpathyEvent(
+                eventId,
+                ctx.sessionId,
+                'Natural language rollback request detected',
+                'natural_language'
+            );
             if (rolledBackScore > 0) {
                 // Reset GFI after successful rollback
                 resetFriction(ctx.sessionId, ctx.workspaceDir, {
@@ -252,28 +307,37 @@ export function handleLlmOutput(event, ctx) {
             }
         }
     }
+
     // 3. Paralysis Check (from session state tracker)
     const stuckThreshold = config.get('thresholds.stuck_loops_trigger') || 3;
     const inputThreshold = config.get('thresholds.cognitive_paralysis_input') || 4000;
     const paralysisScore = config.get('scores.paralysis') || 40;
+
     if (state.stuckLoops >= stuckThreshold && state.totalInputTokens > inputThreshold && painScore < paralysisScore) {
         painScore = paralysisScore;
         source = 'llm_paralysis';
         matchedReason = `Agent is stuck in low-output loops (${state.stuckLoops} consecutive turns with tiny output but huge context), indicating cognitive paralysis.`;
     }
+
     // If a pain threshold is crossed, write the autonomous pain flag
     const painTriggerThreshold = config.get('thresholds.pain_trigger') || 30;
     if (painScore >= painTriggerThreshold) {
         // Inject the actual text snippet that triggered this for the diagnostician to read later
         const snippet = text.length > 200 ? text.substring(0, 100) + '...' + text.substring(text.length - 100) : text;
-        writePainFlag(ctx.workspaceDir, {
-            source,
-            score: String(painScore),
-            time: new Date().toISOString(),
-            reason: matchedReason,
-            is_risky: 'false',
-            trigger_text_preview: snippet
-        });
+
+        try {
+            writePainFlag(ctx.workspaceDir, {
+                source,
+                score: String(painScore),
+                time: new Date().toISOString(),
+                reason: matchedReason,
+                is_risky: 'false',
+                trigger_text_preview: snippet
+            });
+        } catch (e) {
+            ctx.logger?.warn?.(`[PD:LLM] Failed to write pain flag: ${String(e)}`);
+        }
+
         eventLog.recordPainSignal(ctx.sessionId, {
             score: painScore,
             source: source,
@@ -281,6 +345,7 @@ export function handleLlmOutput(event, ctx) {
             isRisky: false
         });
     }
+
     // ═══ Thinking OS: Mental Model Usage Tracking ═══
     trackThinkingModelUsage({
         text,
@@ -292,41 +357,56 @@ export function handleLlmOutput(event, ctx) {
         logger: ctx.logger,
     });
 }
-function trackThinkingModelUsage(args) {
+
+function trackThinkingModelUsage(args: {
+    text: string;
+    wctx: WorkspaceContext;
+    sessionId?: string;
+    runId: string;
+    assistantTurnId: number | null;
+    createdAt: string;
+    logger?: PluginHookAgentContext['logger'];
+}): void {
     const { text, wctx, sessionId, runId, assistantTurnId, createdAt, logger } = args;
     const logPath = wctx.resolve('THINKING_OS_USAGE');
     const logDir = path.dirname(logPath);
-    if (!fs.existsSync(logDir))
-        fs.mkdirSync(logDir, { recursive: true });
-    let usageLog = {};
+    if (!fs.existsSync(logDir)) fs.mkdirSync(logDir, { recursive: true });
+
+    let usageLog: Record<string, number> = {};
+
     if (fs.existsSync(logPath)) {
         try {
             usageLog = JSON.parse(fs.readFileSync(logPath, 'utf8'));
-        }
-        catch (e) {
-            console.error(`[PD:LLM] Failed to parse thinking OS usage log: ${String(e)}`);
+        } catch (e) {
+            logger?.error?.(`[PD:LLM] Failed to parse thinking OS usage log: ${String(e)}`);
         }
     }
+
     const matches = detectThinkingModelMatches(text);
     for (const match of matches) {
         usageLog[match.modelId] = (usageLog[match.modelId] || 0) + 1;
     }
+
     usageLog['_total_turns'] = (usageLog['_total_turns'] || 0) + 1;
+
     try {
         fs.writeFileSync(logPath, JSON.stringify(usageLog, null, 2), 'utf8');
+    } catch (e) {
+        logger?.error?.(`[PD:LLM] Failed to write thinking OS usage log: ${String(e)}`);
     }
-    catch (e) {
-        console.error(`[PD:LLM] Failed to write thinking OS usage log: ${String(e)}`);
-    }
+
     if (matches.length === 0) {
         return;
     }
+
     if (sessionId) {
         recordThinkingCheckpoint(sessionId, wctx.workspaceDir);
     }
+
     if (!sessionId || !assistantTurnId) {
         return;
     }
+
     const uiDb = new ControlUiDatabase({ workspaceDir: wctx.workspaceDir });
     try {
         const recentContext = uiDb.getRecentThinkingContext(sessionId, createdAt);
@@ -344,6 +424,7 @@ function trackThinkingModelUsage(args) {
             eventType: event.eventType,
         }));
         const triggerExcerpt = text.length > 280 ? `${text.slice(0, 277)}...` : text;
+
         for (const match of matches) {
             const scenarios = deriveThinkingScenarios(match.modelId, {
                 recentToolCalls: toolContext,
@@ -357,6 +438,7 @@ function trackThinkingModelUsage(args) {
                 })),
                 recentPrincipleEvents: principleContext,
             });
+
             uiDb.recordThinkingModelEvent({
                 sessionId,
                 runId,
@@ -371,11 +453,9 @@ function trackThinkingModelUsage(args) {
                 createdAt,
             });
         }
-    }
-    catch (error) {
+    } catch (error) {
         logger?.warn?.(`[PD:LLM] Failed to persist thinking model events: ${String(error)}`);
-    }
-    finally {
+    } finally {
         uiDb.dispose();
     }
 }

package/src/hooks/message-sanitize.ts

@@ -0,0 +1,45 @@
+import type { PluginHookBeforeMessageWriteEvent, PluginHookBeforeMessageWriteResult } from '../openclaw-sdk.js';
+
+const INTERNAL_TAG_PATTERNS = [
+  /\[EMOTIONAL_DAMAGE_DETECTED(?::(?:mild|moderate|severe))?\]/gi,
+  /\[EMPATHY_ROLLBACK_REQUEST\]/gi,
+  /<empathy\s+[^>]*\/?>(?:<\/empathy>)?/gi,
+];
+
+export function sanitizeAssistantText(text: string): string {
+  let result = text;
+  for (const pattern of INTERNAL_TAG_PATTERNS) {
+    result = result.replace(pattern, '');
+  }
+  return result
+    .replace(/[ \t]+\n/g, '\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim();
+}
+
+export function handleBeforeMessageWrite(
+  event: PluginHookBeforeMessageWriteEvent,
+): PluginHookBeforeMessageWriteResult | void {
+  const msg = event.message as { role?: string; content?: unknown } | undefined;
+  if (!msg || msg.role !== 'assistant') return;
+
+  if (typeof msg.content === 'string') {
+    const sanitized = sanitizeAssistantText(msg.content);
+    if (sanitized !== msg.content) {
+      return { message: { ...msg, content: sanitized } as any };
+    }
+    return;
+  }
+
+  if (Array.isArray(msg.content)) {
+    const next = msg.content.map((part: any) => {
+      if (part && typeof part === 'object' && part.type === 'text' && typeof part.text === 'string') {
+        return { ...part, text: sanitizeAssistantText(part.text) };
+      }
+      return part;
+    });
+    return { message: { ...msg, content: next } as any };
+  }
+
+  return;
+}