principles-disciple 1.11.0 → 1.13.0

package/src/service/control-ui-query-service.ts

@@ -1,5 +1,5 @@
 import { ControlUiDatabase } from '../core/control-ui-db.js';
-import { getThinkingModel, listThinkingModels } from '../core/thinking-models.js';
+import { getThinkingModel, listThinkingModels, getThinkingModelDefinitions } from '../core/thinking-models.js';
 import { WorkspaceContext } from '../core/workspace-context.js';
 
 /** Time window (in minutes) for querying principle events related to a sample */
@@ -22,33 +22,35 @@ export interface OverviewResponse {
     gateBlocks: number;
     taskOutcomes: number;
   };
-  dailyTrend: Array<{
+  dailyTrend: {
     day: string;
     toolCalls: number;
     failures: number;
     userCorrections: number;
     thinkingTurns: number;
-  }>;
-  topRegressions: Array<{
+  }[];
+  topRegressions: {
     toolName: string;
     errorType: string;
     occurrences: number;
-  }>;
+  }[];
   sampleQueue: {
     counters: Record<string, number>;
-    preview: Array<{
+    preview: {
       sampleId: string;
       sessionId: string;
       qualityScore: number;
       reviewStatus: string;
       createdAt: string;
-    }>;
+    }[];
   };
   thinkingSummary: {
     activeModels: number;
     dormantModels: number;
     effectiveModels: number;
     coverageRate: number;
+    modelBreakdown?: { modelId: string; hits: number }[];
+    modelDefinitions?: { modelId: string; name: string; description: string }[];
   };
 }
 
@@ -64,7 +66,7 @@ export interface SampleListFilters {
 
 export interface SamplesResponse {
   counters: Record<string, number>;
-  items: Array<{
+  items: {
     sampleId: string;
     sessionId: string;
     reviewStatus: string;
@@ -74,7 +76,7 @@ export interface SamplesResponse {
     createdAt: string;
     updatedAt: string;
     diffExcerpt: string;
-  }>;
+  }[];
   pagination: {
     page: number;
     pageSize: number;
@@ -102,13 +104,13 @@ export interface SampleDetailResponse {
     correctionCue: string | null;
     createdAt: string;
   };
-  recoveryToolSpan: Array<{ id: number; toolName: string }>;
-  relatedPrinciples: Array<{
+  recoveryToolSpan: { id: number; toolName: string }[];
+  relatedPrinciples: {
     principleId: string | null;
     eventType: string;
     createdAt: string;
-  }>;
-  relatedThinkingHits: Array<{
+  }[];
+  relatedThinkingHits: {
     id: number;
     modelId: string;
     modelName: string;
@@ -116,12 +118,12 @@ export interface SampleDetailResponse {
     scenarios: string[];
     createdAt: string;
     triggerExcerpt: string;
-  }>;
-  reviewHistory: Array<{
+  }[];
+  reviewHistory: {
     reviewStatus: string;
     note: string | null;
     createdAt: string;
-  }>;
+  }[];
 }
 
 export interface ThinkingModelSummary {
@@ -148,24 +150,24 @@ export interface ThinkingOverviewResponse {
     coverageRate: number;
   };
   topModels: ThinkingModelSummary[];
-  dormantModels: Array<{
+  dormantModels: {
     modelId: string;
     name: string;
     description: string;
-  }>;
+  }[];
   effectiveModels: ThinkingModelSummary[];
-  scenarioMatrix: Array<{
+  scenarioMatrix: {
     modelId: string;
     modelName: string;
     scenario: string;
     hits: number;
-  }>;
-  coverageTrend: Array<{
+  }[];
+  coverageTrend: {
     day: string;
     assistantTurns: number;
     thinkingTurns: number;
     coverageRate: number;
-  }>;
+  }[];
 }
 
 export interface ThinkingModelDetailResponse {
@@ -177,14 +179,14 @@ export interface ThinkingModelDetailResponse {
     coverageRate: number;
     recommendation: 'reinforce' | 'rework' | 'archive';
   };
-  usageTrend: Array<{
+  usageTrend: {
     day: string;
     hits: number;
-  }>;
-  scenarioDistribution: Array<{
+  }[];
+  scenarioDistribution: {
     scenario: string;
     hits: number;
-  }>;
+  }[];
   outcomeStats: {
     events: number;
     successRate: number;
@@ -193,16 +195,16 @@ export interface ThinkingModelDetailResponse {
     correctionRate: number;
     correctionSampleRate: number;
   };
-  recentEvents: Array<{
+  recentEvents: {
     id: number;
     createdAt: string;
     matchedPattern: string;
     scenarios: string[];
     triggerExcerpt: string;
-    toolContext: Array<{ toolName: string; outcome: string; errorType?: string | null }>;
-    painContext: Array<{ source: string; score: number }>;
-    principleContext: Array<{ principleId: string | null; eventType: string }>;
-  }>;
+    toolContext: { toolName: string; outcome: string; errorType?: string | null }[];
+    painContext: { source: string; score: number }[];
+    principleContext: { principleId: string | null; eventType: string }[];
+  }[];
 }
 
 function parseJson<T>(raw: string | null | undefined, fallback: T): T {
@@ -253,7 +255,7 @@ export class ControlUiQueryService {
     this.uiDb.dispose();
   }
 
-  getOverview(days: number = 30): OverviewResponse {
+  getOverview(days = 30): OverviewResponse {
     const stats = this.trajectory.getDataStats();
     const regressionRows = this.uiDb.all<{
       tool_name: string;
@@ -313,6 +315,12 @@ export class ControlUiQueryService {
         painRate: roundRate(Number(row.pain_windows), Number(row.events)),
         correctionRate: roundRate(Number(row.correction_windows), Number(row.events)),
       }) === 'reinforce').length;
+    const modelBreakdown = this.uiDb.all<{ modelId: string; hits: number }>(`
+      SELECT model_id as modelId, COUNT(*) as hits
+      FROM thinking_model_events
+      GROUP BY model_id
+      ORDER BY hits DESC
+    `).map(row => ({ modelId: row.modelId, hits: Number(row.hits) }));
     const dailyTrend = this.uiDb.all<{
       day: string;
       tool_calls: number;
@@ -385,6 +393,8 @@ export class ControlUiQueryService {
         dormantModels: Math.max(0, listThinkingModels().length - activeModels),
         effectiveModels: effectiveCount,
         coverageRate: roundRate(coverageRow.thinking_turns, coverageRow.assistant_turns),
+        modelBreakdown,
+        modelDefinitions: getThinkingModelDefinitions(),
       },
     };
   }
@@ -621,7 +631,7 @@ export class ControlUiQueryService {
         correctionCue: row.user_correction_cue,
         createdAt: row.user_created_at,
       },
-      recoveryToolSpan: parseJson<Array<{ id: number; toolName: string }>>(row.recovery_tool_span_json, []),
+      recoveryToolSpan: parseJson<{ id: number; toolName: string }[]>(row.recovery_tool_span_json, []),
       relatedPrinciples: [
         ...seededPrincipleIds,
         ...relatedPrinciples.map((item) => ({
@@ -822,9 +832,9 @@ export class ControlUiQueryService {
         matchedPattern: row.matched_pattern,
         scenarios: parseJson<string[]>(row.scenario_json, []),
         triggerExcerpt: row.trigger_excerpt,
-        toolContext: parseJson<Array<{ toolName: string; outcome: string; errorType?: string | null }>>(row.tool_context_json, []),
-        painContext: parseJson<Array<{ source: string; score: number }>>(row.pain_context_json, []),
-        principleContext: parseJson<Array<{ principleId: string | null; eventType: string }>>(row.principle_context_json, []),
+        toolContext: parseJson<{ toolName: string; outcome: string; errorType?: string | null }[]>(row.tool_context_json, []),
+        painContext: parseJson<{ source: string; score: number }[]>(row.pain_context_json, []),
+        principleContext: parseJson<{ principleId: string | null; eventType: string }[]>(row.principle_context_json, []),
       })),
     };
   }

package/src/service/event-log-auditor.ts

@@ -0,0 +1,261 @@
+/**
+ * EventLog Auditor — Search and verify events across all .state directories
+ * 
+ * This tool addresses a common debugging issue where hook events may be
+ * written to the wrong .state directory due to workspaceDir resolution bugs.
+ * 
+ * Usage:
+ *   const report = await auditEventLogs(openclawDir, ['after_tool_call', 'before_tool_call']);
+ *   console.log(report.summary);
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
+
+interface EventLogEntry {
+  ts: string;
+  date: string;
+  type: string;
+  category: string;
+  sessionId?: string;
+  data: Record<string, unknown>;
+}
+
+interface LocationReport {
+  path: string;
+  lastModified: Date | null;
+  totalEntries: number;
+  hookCounts: Record<string, number>;
+  recentEntries: EventLogEntry[];
+}
+
+interface AuditReport {
+  searchedPaths: string[];
+  locations: LocationReport[];
+  primaryPath: string | null;
+  misplacedEvents: { path: string; entries: EventLogEntry[] }[];
+}
+
+/**
+ * Find all events.jsonl files under a directory tree.
+ */
+function findEventLogs(baseDir: string, maxDepth = 4): string[] {
+  const results: string[] = [];
+  
+  function scan(dir: string, depth: number): void {
+    if (depth > maxDepth) return;
+    try {
+      const entries = fs.readdirSync(dir, { withFileTypes: true });
+      for (const entry of entries) {
+        if (entry.name === 'events.jsonl') {
+          results.push(path.join(dir, entry.name));
+        } else if (entry.isDirectory() && !entry.name.startsWith('.')) {
+          scan(path.join(dir, entry.name), depth + 1);
+        }
+      }
+    } catch {
+      // Permission denied or directory doesn't exist
+    }
+  }
+  
+  scan(baseDir, 0);
+  return results;
+}
+
+/**
+ * Find events.jsonl in well-known locations.
+ */
+function findKnownEventLogPaths(): string[] {
+  const homeDir = os.homedir();
+  const candidates: string[] = [];
+  
+  // Common patterns
+  const patterns = [
+    path.join(homeDir, '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-main', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-builder', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-pm', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-hr', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-repair', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-research', '.state', 'logs', 'events.jsonl'),
+    path.join(homeDir, '.openclaw', 'workspace-scout', '.state', 'logs', 'events.jsonl'),
+  ];
+  
+  for (const p of patterns) {
+    if (fs.existsSync(p)) {
+      candidates.push(p);
+    }
+  }
+  
+  return candidates;
+}
+
+/**
+ * Read the last N entries from an events.jsonl file.
+ */
+function readRecentEntries(filePath: string, count = 50): EventLogEntry[] {
+  try {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const lines = content.trim().split('\n').filter(Boolean);
+    const recent = lines.slice(-count);
+    return recent.map(line => JSON.parse(line));
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Count all hooks in the entire file (for summary).
+ */
+function countAllHooks(filePath: string): Record<string, number> {
+  const counts: Record<string, number> = {};
+  try {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const lines = content.trim().split('\n').filter(Boolean);
+    for (const line of lines) {
+      try {
+        const entry = JSON.parse(line) as EventLogEntry;
+        if (entry.type === 'hook_execution' && entry.data?.hook) {
+          const hook = entry.data.hook as string;
+          counts[hook] = (counts[hook] || 0) + 1;
+        }
+      } catch {
+        // Skip malformed lines
+      }
+    }
+  } catch {
+    // File doesn't exist or can't be read
+  }
+  return counts;
+}
+
+/**
+ * Audit all events.jsonl files.
+ * 
+ * @param openclawDir - Base OpenClaw directory (e.g., ~/.openclaw)
+ * @param expectedToolHooks - Hook names that should appear in the primary workspace
+ */
+export async function auditEventLogs(
+  openclawDir: string,
+  expectedToolHooks: string[] = ['before_tool_call', 'after_tool_call'],
+): Promise<AuditReport> {
+  const homeDir = os.homedir();
+  
+  // Find all event logs
+  const knownPaths = findKnownEventLogPaths();
+  const scannedPaths = findEventLogs(homeDir, 4);
+  const allPaths = [...new Set([...knownPaths, ...scannedPaths])];
+  
+  const locations: LocationReport[] = [];
+  let primaryPath: string | null = null;
+  
+  for (const filePath of allPaths) {
+    try {
+      const stat = fs.statSync(filePath);
+      const allCounts = countAllHooks(filePath);
+      const recent = readRecentEntries(filePath, 30);
+
+      locations.push({
+        path: filePath,
+        lastModified: stat.mtime,
+        totalEntries: Object.values(allCounts).reduce((a, b) => a + b, 0),
+        hookCounts: allCounts,
+        recentEntries: recent,
+      });
+      
+      // Determine primary path (workspace-main or most recent)
+      if (filePath.includes('workspace-main') || filePath.includes('workspace-main')) {
+        primaryPath = filePath;
+      }
+    } catch {
+      // Skip unreadable files
+    }
+  }
+  
+  // If no primary found, use most recent
+  if (!primaryPath && locations.length > 0) {
+    locations.sort((a, b) => {
+      if (!a.lastModified) return 1;
+      if (!b.lastModified) return -1;
+      return b.lastModified.getTime() - a.lastModified.getTime();
+    });
+    primaryPath = locations[0].path;
+  }
+  
+  // Detect misplaced tool hook events
+  const misplacedEvents: { path: string; entries: EventLogEntry[] }[] = [];
+  for (const loc of locations) {
+    if (loc.path === primaryPath) continue;
+    
+    const toolHookEntries = loc.recentEntries.filter(e => 
+      e.type === 'hook_execution' && expectedToolHooks.includes(e.data?.hook as string)
+    );
+    
+    if (toolHookEntries.length > 0) {
+      misplacedEvents.push({ path: loc.path, entries: toolHookEntries });
+    }
+  }
+  
+  return {
+    searchedPaths: allPaths,
+    locations,
+    primaryPath,
+    misplacedEvents,
+  };
+}
+
+/**
+ * Format audit report for display.
+ */
+export function formatAuditReport(report: AuditReport): string {
+  const lines: string[] = [];
+  
+  lines.push('=== Event Log Audit Report ===\n');
+  
+  lines.push(`Searched ${report.searchedPaths.length} paths:\n`);
+  for (const p of report.searchedPaths) {
+    lines.push(`  ${p}`);
+  }
+  lines.push('');
+  
+  lines.push(`Primary: ${report.primaryPath ?? 'NOT FOUND'}\n`);
+  
+  for (const loc of report.locations) {
+    const isPrimary = loc.path === report.primaryPath;
+    lines.push(`─── ${isPrimary ? '[PRIMARY]' : '[OTHER]   '}${loc.path}`);
+    lines.push(`    Last modified: ${loc.lastModified?.toISOString() ?? 'never'}`);
+    lines.push(`    Hook counts:`);
+    
+    const hooks = Object.entries(loc.hookCounts).sort((a, b) => b[1] - a[1]);
+    for (const [hook, count] of hooks) {
+      lines.push(`      ${hook}: ${count}`);
+    }
+    
+    if (hooks.length === 0) {
+      lines.push(`      (no hooks recorded)`);
+    }
+    lines.push('');
+  }
+  
+  if (report.misplacedEvents.length > 0) {
+    lines.push('⚠️  MISPLACED tool hook events detected:');
+    for (const me of report.misplacedEvents) {
+      lines.push(`\n  ${me.path}:`);
+      for (const entry of me.entries.slice(0, 5)) {
+        lines.push(`    ${entry.ts} - ${entry.data.hook}`);
+      }
+      if (me.entries.length > 5) {
+        lines.push(`    ... and ${me.entries.length - 5} more`);
+      }
+    }
+    lines.push('');
+    lines.push('This means tool hooks are writing events to the wrong .state directory.');
+    lines.push('Check workspaceDir resolution in the hook handler.');
+  } else {
+    lines.push('✅ No misplaced tool hook events detected.');
+  }
+  
+  return lines.join('\n');
+}

package/src/service/evolution-query-service.ts

@@ -8,7 +8,7 @@
  * - getStats() - 获取统计数据
  */
 
-import type { TrajectoryDatabase, EvolutionTaskRecord, EvolutionEventRecord } from '../core/trajectory.js';
+import type { TrajectoryDatabase, EvolutionTaskRecord } from '../core/trajectory.js';
 import { STAGE_LABELS, STAGE_COLORS } from '../core/evolution-logger.js';
 
 export interface TaskListFilters {
@@ -27,7 +27,7 @@ export interface EventFilters {
 }
 
 export interface TasksResponse {
-  items: Array<{
+  items: {
     taskId: string;
     traceId: string;
     source: string;
@@ -41,7 +41,7 @@ export interface TasksResponse {
     resolution: string | null;
     eventCount: number;
     createdAt: string;
-  }>;
+  }[];
   pagination: {
     page: number;
     pageSize: number;
@@ -51,7 +51,7 @@ export interface TasksResponse {
 }
 
 export interface EventsResponse {
-  items: Array<{
+  items: {
     id: number;
     traceId: string;
     taskId: string | null;
@@ -63,7 +63,7 @@ export interface EventsResponse {
     summary: string | null;
     metadata: Record<string, unknown>;
     createdAt: string;
-  }>;
+  }[];
   pagination: {
     limit: number;
     offset: number;
@@ -88,7 +88,7 @@ export interface TraceDetailResponse {
     createdAt: string;
     updatedAt: string;
   };
-  events: Array<{
+  events: {
     id: number;
     traceId: string;
     taskId: string | null;
@@ -100,15 +100,15 @@ export interface TraceDetailResponse {
     summary: string | null;
     metadata: Record<string, unknown>;
     createdAt: string;
-  }>;
-  timeline: Array<{
+  }[];
+  timeline: {
     stage: string;
     stageLabel: string;
     stageColor: string;
     timestamp: string;
     message: string;
     summary: string | null;
-  }>;
+  }[];
 }
 
 export interface EvolutionStatsResponse {
@@ -117,16 +117,16 @@ export interface EvolutionStatsResponse {
   inProgress: number;
   completed: number;
   failed: number;
-  recentActivity: Array<{
+  recentActivity: {
     day: string;
     created: number;
     completed: number;
-  }>;
-  stageDistribution: Array<{
+  }[];
+  stageDistribution: {
     stage: string;
     stageLabel: string;
     count: number;
-  }>;
+  }[];
 }
 
 /**
@@ -154,6 +154,7 @@ export class EvolutionQueryService {
    * 释放资源
    * 注意：不关闭 trajectory，因为它是单例由 TrajectoryRegistry 管理
    */
+  /* eslint-disable @typescript-eslint/class-methods-use-this -- Reason: Delegates to TrajectoryRegistry lifecycle management */
   dispose(): void {
     // EvolutionQueryService 不拥有 trajectory，所以不关闭它
     // trajectory 是由 TrajectoryRegistry 管理的单例
@@ -324,7 +325,7 @@ export class EvolutionQueryService {
   /**
    * 获取统计数据
    */
-  getStats(days: number = 30): EvolutionStatsResponse {
+  getStats(days = 30): EvolutionStatsResponse {
     // 获取基础统计
     const stats = this.trajectory.getEvolutionStats();
 
@@ -340,21 +341,21 @@ export class EvolutionQueryService {
     const activityByDay = new Map<string, { created: number; completed: number }>();
     for (let i = 0; i < days; i++) {
       const day = new Date(now.getTime() - i * 24 * 60 * 60 * 1000);
-      const dayStr = day.toISOString().split('T')[0];
+      const [dayStr] = day.toISOString().split('T');
       activityByDay.set(dayStr, { created: 0, completed: 0 });
     }
 
     for (const task of recentTasks) {
-      const createdDay = task.createdAt.split('T')[0];
+      const [createdDay] = task.createdAt.split('T');
       if (activityByDay.has(createdDay)) {
-        const entry = activityByDay.get(createdDay)!;
-        entry.created++;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Reason: has() check guarantees entry exists
+        activityByDay.get(createdDay)!.created++;
       }
       if (task.completedAt) {
-        const completedDay = task.completedAt.split('T')[0];
+        const [completedDay] = task.completedAt.split('T');
         if (activityByDay.has(completedDay)) {
-          const entry = activityByDay.get(completedDay)!;
-          entry.completed++;
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Reason: has() check guarantees entry exists
+          activityByDay.get(completedDay)!.completed++;
         }
       }
     }
@@ -394,7 +395,7 @@ const serviceCache = new Map<string, EvolutionQueryService>();
  */
 export function getEvolutionQueryService(trajectory: TrajectoryDatabase): EvolutionQueryService {
   // 使用 trajectory 的 dbPath 作为缓存键
-  const cacheKey = (trajectory as any).dbPath || 'default';
+  const cacheKey = (trajectory as unknown as { dbPath?: string }).dbPath || 'default';
   const cached = serviceCache.get(cacheKey);
   if (cached) {
     return cached;