principles-disciple 1.5.4 → 1.6.0

package/dist/commands/pain.js

@@ -8,6 +8,65 @@ function createProgressBar(value, max, length = 10) {
     const emptyLength = length - filledLength;
     return `[${'█'.repeat(filledLength)}${'░'.repeat(emptyLength)}]`;
 }
+/**
+ * Creates a mini bar for daily trends
+ */
+function createMiniBar(count, max, length = 6) {
+    const filledLength = Math.round((count / max) * length);
+    return '█'.repeat(filledLength) + '░'.repeat(length - filledLength);
+}
+/**
+ * Format empathy stats for display
+ */
+function formatEmpathyCard(stats, range, isZh) {
+    if (stats.totalEvents === 0 && stats.dedupedCount === 0) {
+        return isZh
+            ? `🫀 **情绪事件统计** (${range})\n   暂无数据`
+            : `🫀 **Empathy Events** (${range})\n   No data available`;
+    }
+    const lines = [];
+    lines.push(isZh ? `🫀 **情绪事件统计** (${range})` : `🫀 **Empathy Events** (${range})`);
+    lines.push('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+    // Total events
+    const totalLabel = isZh ? '📊 总事件' : '📊 Total Events';
+    lines.push(`${totalLabel}: ${stats.totalEvents} 次`);
+    lines.push(`   ├─ 😟 mild: ${stats.bySeverity.mild} 次 (${stats.scoreBySeverity.mild}分)`);
+    lines.push(`   ├─ 😠 moderate: ${stats.bySeverity.moderate} 次 (${stats.scoreBySeverity.moderate}分)`);
+    lines.push(`   └─ 😡 severe: ${stats.bySeverity.severe} 次 (${stats.scoreBySeverity.severe}分)`);
+    lines.push('');
+    // Dedupe hit rate
+    const dedupeRate = (stats.dedupeHitRate * 100).toFixed(0);
+    const dedupeLabel = isZh ? '🔄 去重命中率' : '🔄 Dedupe Hit Rate';
+    lines.push(`${dedupeLabel}: ${dedupeRate}% (${stats.dedupedCount}/${stats.totalEvents + stats.dedupedCount})`);
+    if (stats.dedupedCount > 0) {
+        lines.push(isZh ? '   ↳ 避免了重复惩罚' : '   ↳ Prevented duplicate penalties');
+    }
+    lines.push('');
+    // Rollback info
+    if (stats.rollbackCount > 0) {
+        const rollbackLabel = isZh ? '↩️ 已回滚' : '↩️ Rolled Back';
+        lines.push(`${rollbackLabel}: ${stats.rollbackCount} 次 (${stats.rolledBackScore}分)`);
+        lines.push('');
+    }
+    // Daily trend
+    if (stats.dailyTrend.length > 1) {
+        const trendLabel = isZh ? '📈 趋势 (按天)' : '📈 Trend (by day)';
+        lines.push(`${trendLabel}:`);
+        const maxCount = Math.max(...stats.dailyTrend.map(d => d.count), 1);
+        for (const day of stats.dailyTrend) {
+            const bar = createMiniBar(day.count, maxCount, 6);
+            const dateStr = day.date.slice(5); // MM-DD
+            lines.push(`   ${dateStr}: ${bar} ${day.count}次`);
+        }
+    }
+    // Detection mode distribution
+    if (stats.byDetectionMode.structured > 0 || stats.byDetectionMode.legacy_tag > 0) {
+        lines.push('');
+        const modeLabel = isZh ? '🔍 检测模式' : '🔍 Detection Mode';
+        lines.push(`${modeLabel}: 结构化 ${stats.byDetectionMode.structured} | 标签 ${stats.byDetectionMode.legacy_tag}`);
+    }
+    return lines.join('\n');
+}
 /**
  * Handles the /pd-status command
  */
@@ -18,6 +77,10 @@ export function handlePainCommand(ctx) {
     const isZh = lang === 'zh';
     const sessionId = ctx.sessionId;
     const args = (ctx.args || '').trim();
+    // Handle empathy subcommand
+    if (args.startsWith('empathy')) {
+        return handleEmpathySubcommand(wctx, args, sessionId, isZh);
+    }
     if (args === 'reset') {
         if (sessionId) {
             resetFriction(sessionId);
@@ -40,6 +103,24 @@ export function handlePainCommand(ctx) {
     const trustStage = trust.getStage();
     const gfiBar = createProgressBar(gfi, 100, 15);
     const trustBar = createProgressBar(trustScore, 100, 15);
+    // Determine Mental Mode (aligned with prompt.ts logic)
+    let mentalMode = '';
+    if (isZh) {
+        if (gfi >= 70)
+            mentalMode = '🚑 救赎模式 (HUMBLE_RECOVERY)';
+        else if (gfi >= 40)
+            mentalMode = '🤝 安抚模式 (CONCILIATORY)';
+        else
+            mentalMode = '⚡ 高效模式 (EFFICIENT)';
+    }
+    else {
+        if (gfi >= 70)
+            mentalMode = '🚑 HUMBLE_RECOVERY';
+        else if (gfi >= 40)
+            mentalMode = '🤝 CONCILIATORY';
+        else
+            mentalMode = '⚡ EFFICIENT';
+    }
     // Determine health status based on GFI
     let healthLabel = 'Healthy';
     let suggestionText = '';
@@ -77,20 +158,30 @@ export function handlePainCommand(ctx) {
         else
             healthLabel = 'Healthy 🟢';
     }
+    // Get session empathy stats for inline display
+    const sessionEmpathy = sessionId ? wctx.eventLog.getEmpathyStats('session', sessionId) : null;
+    let empathyInline = '';
+    if (sessionEmpathy && sessionEmpathy.totalEvents > 0) {
+        empathyInline = isZh
+            ? `\n🫀 **情绪事件 (当前会话)**: ${sessionEmpathy.totalEvents} 次 (${sessionEmpathy.totalPenaltyScore}分)`
+            : `\n🫀 **Empathy Events (Session)**: ${sessionEmpathy.totalEvents} (${sessionEmpathy.totalPenaltyScore}pts)`;
+    }
     if (isZh) {
         let text = `📊 **Principles Disciple - 系统健康度监控**\n`;
         text += `━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n`;
         text += `💊 **当前疲劳指数 (GFI)**: ${gfiBar} ${gfi}/100\n`;
         text += `💰 **当前信任积分 (Trust)**: ${trustBar} ${trustScore}/100 (Stage ${trustStage})\n`;
-        text += `   ↳ 状态诊断: ${healthLabel}\n\n`;
-        text += `🧠 **痛苦进化词典**: 已吸收 ${stats.totalRules} 条规则\n`;
+        text += `🧠 **当前心智模式**: ${mentalMode}\n`;
+        text += `   ↳ 状态诊断: ${healthLabel}\n`;
+        text += empathyInline;
+        text += `\n\n🧠 **痛苦进化词典**: 已吸收 ${stats.totalRules} 条规则\n`;
         text += `   ↳ 累计帮您拦截了 ${stats.totalHits} 次无效操作\n`;
         text += `━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n`;
         if (suggestionText) {
             text += suggestionText;
         }
         else {
-            text += `*💡 提示: 如果 AI 陷入死循环，您可以使用 \`/pd-status reset\` 来强制清零疲劳值。*`;
+            text += `*💡 提示: 使用 \`/pd-status empathy\` 查看详细情绪事件统计。*`;
         }
         return { text };
     }
@@ -99,16 +190,54 @@ export function handlePainCommand(ctx) {
         text += `━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n`;
         text += `💊 **Current Friction (GFI)**: ${gfiBar} ${gfi}/100\n`;
         text += `💰 **Current Trust Score**: ${trustBar} ${trustScore}/100 (Stage ${trustStage})\n`;
-        text += `   ↳ Diagnosis: ${healthLabel}\n\n`;
-        text += `🧠 **Evolution Dictionary**: ${stats.totalRules} active rules\n`;
+        text += `🧠 **Current Mental Mode**: ${mentalMode}\n`;
+        text += `   ↳ Diagnosis: ${healthLabel}\n`;
+        text += empathyInline;
+        text += `\n\n🧠 **Evolution Dictionary**: ${stats.totalRules} active rules\n`;
         text += `   ↳ Successfully blocked ${stats.totalHits} invalid operations\n`;
         text += `━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n`;
         if (suggestionText) {
             text += suggestionText;
         }
         else {
-            text += `*💡 Hint: If the AI is stuck in a loop, use \`/pd-status reset\` to clear friction and restart.*`;
+            text += `*💡 Hint: Use \`/pd-status empathy\` to view detailed empathy event statistics.*`;
         }
         return { text };
     }
 }
+/**
+ * Handle /pd-status empathy subcommand
+ */
+function handleEmpathySubcommand(wctx, args, sessionId, isZh) {
+    // Parse range argument
+    let range = 'today';
+    if (args.includes('--week') || args.includes('-w')) {
+        range = 'week';
+    }
+    else if (args.includes('--session') || args.includes('-s')) {
+        range = 'session';
+    }
+    else if (args.includes('--today') || args.includes('-t')) {
+        range = 'today';
+    }
+    // Validate session range
+    if (range === 'session' && !sessionId) {
+        return {
+            text: isZh
+                ? `❌ 无法获取会话统计，请在聊天会话中使用此命令。`
+                : `❌ Session not found. Use this command in a chat session.`
+        };
+    }
+    const stats = wctx.eventLog.getEmpathyStats(range, sessionId);
+    const rangeLabel = isZh
+        ? { today: '今天', week: '最近 7 天', session: '当前会话' }[range]
+        : { today: 'Today', week: 'Last 7 Days', session: 'Current Session' }[range];
+    let text = formatEmpathyCard(stats, rangeLabel, isZh);
+    // Add usage hint
+    if (range === 'today') {
+        text += isZh
+            ? `\n\n*💡 使用 \`/pd-status empathy --week\` 查看周统计，\`--session\` 查看会话统计。*`
+            : `\n\n*💡 Use \`/pd-status empathy --week\` for weekly stats, \`--session\` for session stats.*`;
+    }
+    return { text };
+}

package/dist/commands/rollback.d.ts

@@ -0,0 +1,19 @@
+import { WorkspaceContext } from '../core/workspace-context.js';
+import type { PluginCommandContext, PluginCommandResult } from '../openclaw-sdk.js';
+/**
+ * Handles the /pd-rollback command
+ *
+ * Usage:
+ *   /pd-rollback <event-id>  - Rollback a specific empathy event by ID
+ *   /pd-rollback last        - Rollback the last empathy event in current session
+ */
+export declare function handleRollbackCommand(ctx: PluginCommandContext): PluginCommandResult;
+/**
+ * Handle natural language rollback request
+ * Called from prompt hook when user says things like "撤销刚才的惩罚"
+ */
+export declare function handleNaturalLanguageRollback(wctx: WorkspaceContext, sessionId: string | undefined, reason: string): {
+    success: boolean;
+    score: number;
+    message: string;
+};

package/dist/commands/rollback.js

@@ -0,0 +1,119 @@
+import { WorkspaceContext } from '../core/workspace-context.js';
+import { resetFriction } from '../core/session-tracker.js';
+/**
+ * Handles the /pd-rollback command
+ *
+ * Usage:
+ *   /pd-rollback <event-id>  - Rollback a specific empathy event by ID
+ *   /pd-rollback last        - Rollback the last empathy event in current session
+ */
+export function handleRollbackCommand(ctx) {
+    const workspaceDir = ctx.config?.workspaceDir || process.cwd();
+    const wctx = WorkspaceContext.fromHookContext({ workspaceDir, ...ctx.config });
+    const lang = ctx.config?.language || 'en';
+    const isZh = lang === 'zh';
+    const sessionId = ctx.sessionId;
+    const args = (ctx.args || '').trim();
+    if (!args) {
+        return {
+            text: isZh
+                ? `❌ 请指定要回滚的事件 ID 或使用 "last" 回滚最近一次事件。
+    
+用法:
+  /pd-rollback <event-id>  - 回滚指定事件
+  /pd-rollback last        - 回滚当前会话最近一次事件`
+                : `❌ Please specify an event ID or use "last" to rollback the most recent event.
+
+Usage:
+  /pd-rollback <event-id>  - Rollback a specific event
+  /pd-rollback last        - Rollback the last event in current session`
+        };
+    }
+    if (!sessionId) {
+        return {
+            text: isZh
+                ? `❌ 无法识别当前会话，请在聊天会话中使用此命令。`
+                : `❌ Session ID not found. Use this command in a chat session.`
+        };
+    }
+    let eventId = null;
+    let triggerMethod = 'user_command';
+    if (args === 'last') {
+        // Find the last empathy event in current session
+        eventId = wctx.eventLog.getLastEmpathyEventId(sessionId);
+        if (!eventId) {
+            return {
+                text: isZh
+                    ? `❌ 当前会话没有可回滚的情绪事件。`
+                    : `❌ No empathy events found in current session to rollback.`
+            };
+        }
+    }
+    else {
+        // Use the provided event ID
+        eventId = args;
+    }
+    // Perform rollback
+    const rolledBackScore = wctx.eventLog.rollbackEmpathyEvent(eventId, sessionId, isZh ? '用户手动回滚' : 'User manual rollback', 'user_command');
+    if (rolledBackScore === 0) {
+        return {
+            text: isZh
+                ? `❌ 无法回滚事件 "${eventId}"。可能事件不存在或已被去重。`
+                : `❌ Failed to rollback event "${eventId}". Event may not exist or was deduped.`
+        };
+    }
+    // Reduce the GFI by the rolled back score
+    resetFriction(sessionId);
+    return {
+        text: isZh
+            ? `✅ 已回滚情绪事件
+   📋 事件 ID: ${eventId}
+   💰 撤销分数: ${rolledBackScore} 分
+   
+💡 提示: 已重置当前会话的疲劳指数。`
+            : `✅ Empathy event rolled back successfully
+   📋 Event ID: ${eventId}
+   💰 Score recovered: ${rolledBackScore} pts
+   
+💡 Hint: Session friction has been reset.`
+    };
+}
+/**
+ * Handle natural language rollback request
+ * Called from prompt hook when user says things like "撤销刚才的惩罚"
+ */
+export function handleNaturalLanguageRollback(wctx, sessionId, reason) {
+    const isZh = wctx.config.get('language') === 'zh';
+    if (!sessionId) {
+        return {
+            success: false,
+            score: 0,
+            message: isZh ? '无法识别当前会话' : 'Session not found'
+        };
+    }
+    const eventId = wctx.eventLog.getLastEmpathyEventId(sessionId);
+    if (!eventId) {
+        return {
+            success: false,
+            score: 0,
+            message: isZh ? '当前会话没有可回滚的情绪事件' : 'No empathy events to rollback'
+        };
+    }
+    const rolledBackScore = wctx.eventLog.rollbackEmpathyEvent(eventId, sessionId, reason, 'natural_language');
+    if (rolledBackScore === 0) {
+        return {
+            success: false,
+            score: 0,
+            message: isZh ? '回滚失败，事件可能不存在' : 'Rollback failed, event may not exist'
+        };
+    }
+    // Reduce the GFI
+    resetFriction(sessionId);
+    return {
+        success: true,
+        score: rolledBackScore,
+        message: isZh
+            ? `已回滚 ${rolledBackScore} 分`
+            : `Rolled back ${rolledBackScore} pts`
+    };
+}

package/dist/core/config.d.ts

@@ -13,6 +13,23 @@ export interface DeepReflectionSettings {
     timeout_ms?: number;
     modelsDir?: string;
 }
+export interface GfiGateSettings {
+    enabled: boolean;
+    thresholds: {
+        low_risk_block: number;
+        high_risk_block: number;
+        large_change_block: number;
+    };
+    large_change_lines: number;
+    trust_stage_multipliers: {
+        '1': number;
+        '2': number;
+        '3': number;
+        '4': number;
+    };
+    bash_safe_patterns: string[];
+    bash_dangerous_patterns: string[];
+}
 export interface TrustSettings {
     stages: {
         stage_1_observer: number;
@@ -79,6 +96,21 @@ export interface PainSettings {
     };
     trust: TrustSettings;
     deep_reflection?: DeepReflectionSettings;
+    empathy_engine?: {
+        enabled?: boolean;
+        dedupe_window_ms?: number;
+        penalties?: {
+            mild?: number;
+            moderate?: number;
+            severe?: number;
+        };
+        rate_limit?: {
+            max_per_turn?: number;
+            max_per_hour?: number;
+        };
+        model_calibration?: Record<string, number>;
+    };
+    gfi_gate?: GfiGateSettings;
 }
 export declare const DEFAULT_SETTINGS: PainSettings;
 export declare class PainConfig {

package/dist/core/config.js

@@ -89,6 +89,53 @@ export const DEFAULT_SETTINGS = {
         default_model: 'T-01',
         default_depth: 2,
         timeout_ms: 60000
+    },
+    empathy_engine: {
+        enabled: true,
+        dedupe_window_ms: 60000,
+        penalties: {
+            mild: 10,
+            moderate: 25,
+            severe: 40,
+        },
+        rate_limit: {
+            max_per_turn: 40,
+            max_per_hour: 120,
+        },
+        model_calibration: {}
+    },
+    gfi_gate: {
+        enabled: true,
+        thresholds: {
+            low_risk_block: 70, // TIER 1: write, edit, spawn_agent
+            high_risk_block: 40, // TIER 2: delete_file, move_file
+            large_change_block: 50, // 大规模修改警告阈值
+        },
+        large_change_lines: 50,
+        trust_stage_multipliers: {
+            '1': 0.5, // Observer: 更严格，阈值减半
+            '2': 0.75, // Editor: 阈值降低 25%
+            '3': 1.0, // Developer: 标准阈值
+            '4': 1.5, // Architect: 更宽松，阈值提高 50%
+        },
+        bash_safe_patterns: [
+            '^(ls|dir|pwd|which|where|echo|env|cat|type|head|tail|less|more)\\b',
+            '^git\\s+(status|log|diff|branch|show|remote)\\b',
+            '^npm\\s+(run|test|build|start)\\b',
+            '^make\\s*$', // 只允许纯 make 命令
+            '^make\\s+(-j\\d+|--jobs\\s*\\d+)$', // 允许 make -j4 等
+            '^(gradle|mvn)\\s+(clean|build|test|compile)\\b', // 只允许安全参数
+        ],
+        bash_dangerous_patterns: [
+            'rm\\s+(-[a-z]*r[a-z]*f|-rf)',
+            'del\\s+/s',
+            'rmdir\\s+/s',
+            'git\\s+(push\\s+.*--force|reset\\s+--hard|clean\\s+-fd)',
+            'npm\\s+publish',
+            'pip\\s+upload',
+            'docker\\s+push',
+            '(curl|wget).*\\|\\s*(ba)?sh',
+        ],
     }
 };
 export class PainConfig {

package/dist/core/event-log.d.ts

@@ -1,4 +1,4 @@
-import type { DailyStats, ToolCallEventData, PainSignalEventData, RuleMatchEventData, RulePromotionEventData, HookExecutionEventData, GateBlockEventData, PlanApprovalEventData, EvolutionTaskEventData, DeepReflectionEventData, TrustChangeEventData } from '../types/event-types.js';
+import type { DailyStats, EmpathyEventStats, ToolCallEventData, PainSignalEventData, RuleMatchEventData, RulePromotionEventData, HookExecutionEventData, GateBlockEventData, PlanApprovalEventData, EvolutionTaskEventData, DeepReflectionEventData, TrustChangeEventData, EmpathyRollbackEventData } from '../types/event-types.js';
 import type { PluginLogger } from '../openclaw-sdk.js';
 /**
  * EventLog - Structured event logging with daily statistics aggregation.
@@ -23,6 +23,7 @@ export declare class EventLog {
     recordEvolutionTask(data: EvolutionTaskEventData): void;
     recordDeepReflection(sessionId: string | undefined, data: DeepReflectionEventData): void;
     recordTrustChange(sessionId: string | undefined, data: TrustChangeEventData): void;
+    recordEmpathyRollback(sessionId: string | undefined, data: EmpathyRollbackEventData): void;
     recordError(sessionId: string | undefined, message: string, context?: Record<string, unknown>): void;
     recordWarn(sessionId: string | undefined, message: string, context?: Record<string, unknown>): void;
     private record;
@@ -38,6 +39,25 @@ export declare class EventLog {
      * Returns empty stats if no events recorded for that date.
      */
     getDailyStats(date: string): DailyStats;
+    /**
+     * Get aggregated empathy statistics for multiple time ranges.
+     * @param range 'today' | 'week' | 'session'
+     * @param sessionId Optional session ID for session-scoped stats
+     */
+    getEmpathyStats(range: 'today' | 'week' | 'session', sessionId?: string): EmpathyEventStats;
+    /**
+     * Aggregate empathy stats for a specific session.
+     */
+    private aggregateSessionEmpathy;
+    /**
+     * Rollback an empathy event by ID.
+     * Returns the rolled back score, or 0 if event not found.
+     */
+    rollbackEmpathyEvent(eventId: string, sessionId: string | undefined, reason: string, triggeredBy: 'user_command' | 'natural_language' | 'system'): number;
+    /**
+     * Get the last empathy event ID for a session (for rollback).
+     */
+    getLastEmpathyEventId(sessionId: string): string | null;
     /**
      * Dispose of the EventLog, flushing pending data and clearing timer.
      */