principles-disciple 1.66.0 → 1.68.0

package/src/index.ts

@@ -55,7 +55,6 @@ import { CentralSyncService } from './service/central-sync-service.js';
 import { ensureWorkspaceTemplates } from './core/init.js';
 import { migrateDirectoryStructure } from './core/migration.js';
 import { SystemLogger } from './core/system-logger.js';
-import { createDeepReflectTool } from './tools/deep-reflect.js';
 import { createWritePainFlagTool } from './tools/write-pain-flag.js';
 import { PathResolver } from './core/path-resolver.js';
 import { createPrinciplesConsoleRoute } from './http/principles-console-route.js';
@@ -750,7 +749,6 @@ const plugin = {
       }
     });
 
-    api.registerTool(createDeepReflectTool(api));
     api.registerTool(createWritePainFlagTool(api));
   }
 };

package/src/service/evolution-worker.ts

@@ -31,7 +31,6 @@ import { checkWorkspaceIdle, checkCooldown, recordCooldown } from './nocturnal-r
 import { loadCooldownEscalationConfig, loadNocturnalConfigMerged } from './nocturnal-config.js';
 import { WorkflowStore } from './subagent-workflow/workflow-store.js';
 import { EmpathyObserverWorkflowManager } from './subagent-workflow/empathy-observer-workflow-manager.js';
-import { DeepReflectWorkflowManager } from './subagent-workflow/deep-reflect-workflow-manager.js';
 import { NocturnalWorkflowManager, nocturnalWorkflowSpec } from './subagent-workflow/nocturnal-workflow-manager.js';
 import {
     createNocturnalTrajectoryExtractor,
@@ -2443,18 +2442,6 @@ export const EvolutionWorkerService: ExtendedEvolutionWorkerService = {
                             empathyMgr.dispose();
                         }
 
-                        const deepReflectMgr = new DeepReflectWorkflowManager({
-                            workspaceDir: wctx.workspaceDir,
-                            logger: api.logger,
-                            subagent: subagentRuntime,
-                            agentSession,
-                        });
-                        try {
-                            swept += await deepReflectMgr.sweepExpiredWorkflows(WORKFLOW_TTL_MS);
-                        } finally {
-                            deepReflectMgr.dispose();
-                        }
-
                         // #183 + #188: Sweep Nocturnal workflows too (with gateway-safe fallback)
                         try {
                             const nocturnalMgr = new NocturnalWorkflowManager({

package/src/service/runtime-summary-service.ts

@@ -6,6 +6,7 @@ import { WorkspaceContext } from '../core/workspace-context.js';
 import { evaluatePhase3Inputs } from './phase3-input-filter.js';
 import { TrajectoryRegistry } from '../core/trajectory.js';
 import { getPendingDiagnosticianTasks } from '../core/diagnostician-task-store.js';
+import type { WorkflowStage } from '../core/workflow-funnel-loader.js';
 import type { RuntimeTruth, AnalyticsTruth } from '../types/runtime-summary.js';
 
 export type RuntimeDataQuality = 'authoritative' | 'partial';
@@ -106,11 +107,15 @@ export interface RuntimeSummary {
     recentBypasses: number | null;
     dataQuality: RuntimeDataQuality;
   };
+  /** YAML-driven funnel counts — only present when funnels param is provided (YAML-SSOT-01) */
+  workflowFunnels?: WorkflowFunnelOutput[];
   metadata: {
     generatedAt: string;
     workspaceDir: string;
     sessionId: string | null;
     selectedSessionReason: 'explicit' | 'latest_active' | 'none';
+    /** 'degraded' when YAML load errors or unresolved statsField paths exist; 'ok' otherwise */
+    status: 'ok' | 'degraded';
     warnings: string[];
   };
 }
@@ -153,6 +158,23 @@ interface EventLogEntry {
   data?: Record<string, unknown>;
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Workflow Funnel Types (YAML-SSOT-01 / YAML-SSOT-02)
+// ─────────────────────────────────────────────────────────────────────────────
+
+export interface WorkflowFunnelStageOutput {
+  key: string;
+  label: string;
+  statsField: string;
+  count: number;
+}
+
+export interface WorkflowFunnelOutput {
+  funnelKey: string;
+  funnelLabel: string;
+  stages: WorkflowFunnelStageOutput[];
+}
+
 const MAX_SOURCE_EVENTS = 5;
 const GFI_PARTIAL_WARNING =
   'GFI source attribution remains partial in Phase 2b because only the empathy slice is source-attributed; most non-empathy friction still lacks full per-source attribution.';
@@ -167,17 +189,30 @@ function pushWarning(warnings: string[], message: string): void {
   }
 }
 
+/**
+ * YAML-SSOT-03: resolve a dot-path (e.g. 'evolution.nocturnalDreamerCompleted') from dailyStats.
+ * Returns { count, resolvable } to distinguish "field not found / non-numeric" from "legitimate zero".
+ */
+function resolveStatsField(stats: unknown, dotPath: string): { count: number; resolvable: boolean } {
+  const parts = dotPath.split('.');
+  let current: unknown = stats;
+  for (const part of parts) {
+    if (current == null || typeof current !== 'object') return { count: 0, resolvable: false };
+    current = (current as Record<string, unknown>)[part];
+  }
+  if (typeof current === 'number') {
+    return { count: current, resolvable: true };
+  }
+  return { count: 0, resolvable: false };
+}
+
 export class RuntimeSummaryService {
   static getSummary(
     workspaceDir: string,
-    options?: { sessionId?: string | null; loaderWarnings?: string[] }
+    options?: { sessionId?: string | null; loaderWarnings?: string[]; funnels?: Map<string, WorkflowStage[]> }
   ): RuntimeSummary {
     const generatedAt = new Date().toISOString();
     const warnings: string[] = [];
-    // ERR-01: surface loader warnings (YAML parse failures) into metadata.warnings
-    if (options?.loaderWarnings) {
-      warnings.push(...options.loaderWarnings);
-    }
     const wctx = WorkspaceContext.fromHookContext({ workspaceDir });
 
     const sessions = this.mergeSessionSnapshots(
@@ -215,11 +250,54 @@ export class RuntimeSummaryService {
       false
     );
 
-    // Get most recent date from daily stats, fallback to today
-    const today = generatedAt.slice(0, 10);
-    const availableDates = Object.keys(dailyStats || {}).sort().reverse();
-    const statsDate = availableDates.length > 0 ? availableDates[0] : today;
-    const dailyGfiPeak = dailyStats?.[statsDate]?.gfi?.peak;
+    // Unified date for all "today"-scope reads in this summary — ensures funnel counts,
+    // heartbeat stats, and dailyStats all agree on the same date and never contradict.
+    const todayStr = generatedAt.slice(0, 10);
+
+    // YAML-SSOT-02/03: build workflowFunnels from funnels Map if provided
+    let workflowFunnelsOutput: WorkflowFunnelOutput[] | undefined;
+    if (options?.funnels) {
+      workflowFunnelsOutput = [];
+      for (const [funnelKey, stages] of options.funnels) {
+        const stageOutputs: WorkflowFunnelStageOutput[] = stages.map(stage => {
+          const { count, resolvable } = resolveStatsField(dailyStats?.[todayStr], stage.statsField);
+          return {
+            key: stage.name,
+            label: stage.name,
+            statsField: stage.statsField,
+            count,
+            _resolvable: resolvable, // internal tag for degraded detection
+          };
+        });
+        workflowFunnelsOutput.push({ funnelKey, funnelLabel: funnelKey, stages: stageOutputs });
+      }
+    }
+
+    // YAML-SSOT-04: warn for any unresolvable statsField paths
+    let hasUnresolvableStage = false;
+    if (workflowFunnelsOutput) {
+      for (const funnel of workflowFunnelsOutput) {
+        for (const stage of funnel.stages) {
+          if (!(stage as { _resolvable?: boolean })._resolvable) {
+            hasUnresolvableStage = true;
+            pushWarning(warnings, `statsField not resolvable: ${stage.statsField}`);
+          }
+        }
+      }
+    }
+
+    // DEGRADED-01/02: status is degraded when YAML load errors or unresolvable statsField paths exist
+    const loaderWarnings = options?.loaderWarnings ?? [];
+    if (loaderWarnings.length > 0) {
+      for (const w of loaderWarnings) {
+        pushWarning(warnings, `YAML load warning: ${w}`);
+      }
+    }
+    const status: 'ok' | 'degraded' =
+      (loaderWarnings.length > 0 || hasUnresolvableStage) ? 'degraded' : 'ok';
+
+    // GFI peak — use today's data (consistent with funnel/heartbeat)
+    const dailyGfiPeak = dailyStats?.[todayStr]?.gfi?.peak;
 
     const gfiCurrent =
       selectedSession.session && Number.isFinite(selectedSession.session.currentGfi)
@@ -269,7 +347,6 @@ export class RuntimeSummaryService {
     // Read pending tasks from the diagnostician task store
     const pendingDiagTasks = getPendingDiagnosticianTasks(wctx.stateDir);
     // Read heartbeat diagnosis stats from daily event log
-    const todayStr = generatedAt.slice(0, 10);
     const diagDailyStats = dailyStats?.[todayStr]?.evolution;
     const heartbeatDiagnosis = {
       pendingTasks: pendingDiagTasks.length,
@@ -310,10 +387,10 @@ export class RuntimeSummaryService {
         lastUpdated: trajectoryStats.lastIngestAt ?? generatedAt,
       },
       dailyStats: {
-        toolCalls: dailyStats?.[statsDate]?.toolCalls ?? 0,
-        painSignals: dailyStats?.[statsDate]?.painSignals ?? 0,
-        evolutionTasks: dailyStats?.[statsDate]?.evolutionTasks ?? 0,
-        lastUpdated: statsDate,
+        toolCalls: dailyStats?.[todayStr]?.toolCalls ?? 0,
+        painSignals: dailyStats?.[todayStr]?.painSignals ?? 0,
+        evolutionTasks: dailyStats?.[todayStr]?.evolutionTasks ?? 0,
+        lastUpdated: todayStr,
       },
       trends: {
         sevenDay: { successRateChange: 0, toolCallVolumeChange: 0, painSignalRateChange: 0 },
@@ -360,11 +437,13 @@ export class RuntimeSummaryService {
       gate: gateStats,
       // D: Heartbeat Diagnostician chain — separate from evolution/nocturnal
       heartbeatDiagnosis,
+      ...(workflowFunnelsOutput && { workflowFunnels: workflowFunnelsOutput }),
       metadata: {
         generatedAt,
         workspaceDir,
         sessionId: selectedSessionId,
         selectedSessionReason: selectedSession.reason,
+        status,
         warnings,
       },
     };

package/src/service/subagent-workflow/deep-reflect-workflow-manager.ts

@@ -1,204 +1 @@
-import type { PluginLogger } from '../../openclaw-sdk.js';
-import type {
-    SubagentWorkflowSpec,
-    DeepReflectResult,
-    WorkflowResultContext,
-    WorkflowPersistContext,
-    WorkflowHandle,
-} from './types.js';
-
-// Re-export DeepReflectResult so index.ts can re-export it
-export type { DeepReflectResult } from './types.js';
-import type { RuntimeDirectDriver } from './runtime-direct-driver.js';
-import { isSubagentRuntimeAvailable } from '../../utils/subagent-probe.js';
-import { buildCritiquePromptV2 } from '../../tools/critique-prompt.js';
-import { WorkflowManagerBase } from './workflow-manager-base.js';
-import { DEEP_REFLECT_TTL_MS } from '../../config/defaults/runtime.js';
-
-const WORKFLOW_SESSION_PREFIX = 'agent:main:subagent:workflow-';
-
-const DEFAULT_TIMEOUT_MS = 60_000; // Deep-reflect needs more time than empathy
-
-export interface DeepReflectWorkflowOptions {
-    workspaceDir: string;
-    logger: PluginLogger;
-    subagent: RuntimeDirectDriver['subagent'];
-    /** Pass api.runtime.agent.session to enable heartbeat-safe cleanup (#188) */
-    agentSession?: RuntimeDirectDriver['agentSession'];
-}
-
-export class DeepReflectWorkflowManager extends WorkflowManagerBase {
-    constructor(opts: DeepReflectWorkflowOptions) {
-        super({
-            workspaceDir: opts.workspaceDir,
-            logger: opts.logger,
-            subagent: opts.subagent,
-            agentSession: opts.agentSession,
-            workflowType: 'deep-reflect',
-            sessionPrefix: WORKFLOW_SESSION_PREFIX,
-            defaultTimeoutMs: DEFAULT_TIMEOUT_MS,
-            defaultTtlMs: DEEP_REFLECT_TTL_MS,
-        });
-    }
-
-    async startWorkflow<TResult>(
-        spec: SubagentWorkflowSpec<TResult>,
-        options: {
-            parentSessionId: string;
-            workspaceDir?: string;
-            taskInput: unknown;
-            metadata?: Record<string, unknown>;
-        }
-    ): Promise<WorkflowHandle> {
-        // Surface degrade: skip boot sessions
-        if (options.parentSessionId.startsWith('boot-')) {
-            this.logger.info(`[PD:DeepReflectWorkflow] Skipping workflow: boot session`);
-            throw new Error(`DeepReflectWorkflowManager: cannot start workflow for boot session`);
-        }
-
-        // Surface degrade: check subagent runtime availability
-        if (!isSubagentRuntimeAvailable(this.driver.getSubagent())) {
-            this.logger.info(`[PD:DeepReflectWorkflow] Skipping workflow: subagent runtime unavailable`);
-            throw new Error(`DeepReflectWorkflowManager: subagent runtime unavailable`);
-        }
-
-        if (spec.transport !== 'runtime_direct') {
-            throw new Error(`DeepReflectWorkflowManager only supports runtime_direct transport`);
-        }
-
-        return super.startWorkflow(spec, options);
-    }
-
-     
-     
-    protected override generateWorkflowId(): string {
-        return `wf_dr_${Date.now()}_${Math.random().toString(36).substring(2, 10)}`;
-    }
-}
-
-// ─── Interfaces ───────────────────────────────────────────────────────────────
-
-export interface DeepReflectTaskInput {
-    context: string;
-    depth: number;
-    model_id?: string;
-}
-
-export interface DeepReflectBuildPromptContext {
-    parentSessionId: string;
-    workspaceDir?: string;
-    taskInput: unknown;
-    startedAt: number;
-    workflowType: string;
-}
-
-// ─── Workflow Spec ─────────────────────────────────────────────────────────────
-
-export const deepReflectWorkflowSpec: SubagentWorkflowSpec<DeepReflectResult> = {
-    workflowType: 'deep-reflect',
-    transport: 'runtime_direct',
-    timeoutMs: 60_000,
-    ttlMs: DEEP_REFLECT_TTL_MS,
-    shouldDeleteSessionAfterFinalize: true,
-
-    buildPrompt(taskInput: unknown, ctx: DeepReflectBuildPromptContext): string {
-        const input = taskInput as DeepReflectTaskInput;
-        // Use the existing critique prompt builder
-        return buildCritiquePromptV2({
-            context: input.context,
-            depth: input.depth,
-            model_id: input.model_id,
-            api: undefined, // Not available in workflow context
-            workspaceDir: ctx.workspaceDir,
-        });
-    },
-
-    shouldFinalizeOnWaitStatus(status: 'ok' | 'error' | 'timeout'): boolean {
-        return status === 'ok';
-    },
-
-    async parseResult(ctx: WorkflowResultContext): Promise<DeepReflectResult | null> {
-        const { assistantTexts, messages } = ctx;
-
-        let insights = '';
-        if (assistantTexts && assistantTexts.length > 0) {
-            insights = assistantTexts[assistantTexts.length - 1] || '';
-        } else if (messages && messages.length > 0) {
-            const lastMessage = messages[messages.length - 1] as { role?: string; content?: unknown };
-            if (typeof lastMessage?.content === 'string') {
-                insights = lastMessage.content;
-            } else if (Array.isArray(lastMessage?.content)) {
-                insights = (lastMessage.content as { type?: string; text?: string }[])
-                    .filter((c) => c?.type === 'text' && typeof c.text === 'string')
-                     
-                    .map((c) => c.text!)
-                    .join('\n');
-            }
-        }
-
-        if (!insights?.trim()) {
-            return null;
-        }
-
-        const taskInput = ctx.metadata.taskInput as DeepReflectTaskInput | undefined;
-
-        return {
-            insights,
-            context: taskInput?.context ?? '',
-            depth: taskInput?.depth ?? 2,
-            modelId: taskInput?.model_id ?? 'auto-select',
-            passed: !insights.includes('REFLECTION_FAIL'),
-        };
-    },
-
-     
-    async persistResult(ctx: WorkflowPersistContext<DeepReflectResult>): Promise<void> {
-        const { result, metadata, workspaceDir } = ctx;
-
-        if (!result || !result.insights) return;
-
-        try {
-            const fs = await import('fs');
-            const pathMod = await import('path');
-            const { resolvePdPath } = await import('../../core/paths.js');
-
-            const reflectionLogPath = resolvePdPath(workspaceDir, 'REFLECTION_LOG');
-            const memoryDir = pathMod.default.dirname(reflectionLogPath);
-            if (!fs.default.existsSync(memoryDir)) {
-                fs.default.mkdirSync(memoryDir, { recursive: true });
-            }
-
-            const timestamp = new Date().toISOString();
-            const taskInput = metadata.taskInput as DeepReflectTaskInput | undefined;
-            const entry = `
----
-## Reflection at ${timestamp}
-**Model**: ${result.modelId || 'auto-select'}
-**Depth**: ${result.depth || 2}
-
-### Context
-${(taskInput?.context ?? '').substring(0, 500)}${(taskInput?.context ?? '').length > 500 ? '...' : ''}
-
-### Insights
-${result.insights}
-
-`;
-
-            const header = `# Reflection Log\n\n> Auto-generated by Deep Reflection Tool\n> Retention: 30 days\n`;
-
-            let existingContent = '';
-            if (fs.default.existsSync(reflectionLogPath)) {
-                existingContent = fs.default.readFileSync(reflectionLogPath, 'utf8');
-            }
-
-            const newContent = header + entry + existingContent.replace(header, '');
-
-            const tempPath = `${reflectionLogPath}.tmp`;
-            fs.default.writeFileSync(tempPath, newContent, 'utf8');
-            fs.default.renameSync(tempPath, reflectionLogPath);
-        } catch (err) {
-            // Let the error propagate to finalizeOnce for proper event logging
-            throw new Error(`DeepReflectWorkflow persistResult failed: ${String(err)}`, { cause: err });
-        }
-    },
-};
+export {};

package/src/service/subagent-workflow/index.ts

@@ -21,14 +21,6 @@ export {
     type EmpathyObserverWorkflowOptions,
 } from './empathy-observer-workflow-manager.js';
 
-export {
-    DeepReflectWorkflowManager,
-    deepReflectWorkflowSpec,
-    type DeepReflectWorkflowOptions,
-    type DeepReflectTaskInput,
-    type DeepReflectResult,
-} from './deep-reflect-workflow-manager.js';
-
 export {
     NocturnalWorkflowManager,
     nocturnalWorkflowSpec,

package/src/service/subagent-workflow/types.ts

@@ -204,17 +204,6 @@ export interface EmpathyResult {
     painScore: number;
 }
 
-/**
- * Deep-reflect workflow result.
- */
-export interface DeepReflectResult {
-    insights: string;
-    context: string;
-    depth: number;
-    modelId: string;
-    passed: boolean;
-}
-
 /**
  * Empathy observer workflow specification.
  * This is the concrete spec for PR2 migration.

package/src/service/subagent-workflow/workflow-manager-base.ts

@@ -2,7 +2,7 @@
  * WorkflowManagerBase - Shared base class for polling-based workflow managers
  *
  * Extracts common lifecycle, state transitions, and store operations from
- * EmpathyObserverWorkflowManager and DeepReflectWorkflowManager.
+ * EmpathyObserverWorkflowManager.
  *
  * Both managers implement the same polling-based workflow lifecycle:
  *   startWorkflow → driver.run() → store.createWorkflow → scheduleWaitPollWithRetry

package/src/tools/critique-prompt.ts

@@ -1,97 +1 @@
-import type { OpenClawPluginApi } from '../openclaw-sdk.js';
-import { loadModelIndex } from './model-index.js';
-import { resolveWorkspaceDirFromApi } from '../core/path-resolver.js';
-
-/**
- * 深度指令模板 (必须与测试用例中的 quick/balanced/thorough 关键字对齐)
- */
-const DEPTH_INSTRUCTIONS = {
-    1: 'Provide a quick surface-level analysis.',
-    2: 'Provide a balanced analysis with moderate depth.',
-    3: 'Provide an extremely thorough and exhaustive analysis.',
-};
-
-/**
- * 构建反思提示词 (Critique Prompt) V2
- * 
- * 严格按照测试用例的调用习惯和断言要求进行重写。
- * 增加 OpenClaw 兼容性路径解析。
- */
-     
-export function buildCritiquePromptV2(
-    params: {
-        context: string;
-        depth?: number;
-        model_id?: string;
-        workspaceDir?: string;
-        api?: OpenClawPluginApi;
-    }
-): string {
-    const { context, depth = 2, workspaceDir, api } = params;
-    
-    // FIX (B): Priority: explicitly passed workspaceDir > official API resolution
-    // Do NOT chain through api.config?.workspaceDir which may be stale.
-    const effectiveWorkspaceDir = workspaceDir || resolveWorkspaceDirFromApi(api);
-
-    if (!effectiveWorkspaceDir) {
-        throw new Error('Workspace directory is required for deep reflection.');
-    }
-
-    // 2. 深度校验与警告日志
-    let validatedDepth = 2;
-    if (typeof depth === 'number') {
-        if (depth >= 1 && depth <= 3) {
-            validatedDepth = depth;
-        } else {
-            if (api?.logger) {
-                api.logger.warn(`[DeepReflect] Invalid depth value ${depth}. Falling back to 2.`);
-            }
-        }
-    }
-    
-    const depthMsg = DEPTH_INSTRUCTIONS[validatedDepth as keyof typeof DEPTH_INSTRUCTIONS];
-
-    // 3. 加载模型索引
-    const modelIndexMessage = loadModelIndex(effectiveWorkspaceDir, api);
-
-    // 4. 构造最终提示词
-    return `
-# Role: Principal Critical Thinker & Strategist
----
-[SYSTEM_ID: Critical Analysis Engine]
-
-## Objective
-Provide a high-intensity critical analysis and actionable feedback for the provided task context.
-
-## Depth Requirement
-${depthMsg}
-
-## Meta-Cognitive Models
-The agent has inherited meta-cognitive models (T-01 to T-09) from the **thinking_os** framework. Use these as your foundational logic.
-
-## Model Selection Guidelines
-Step 1: Determine if the task context is a **general planning** task or **domain-specific**.
-Step 2: Select 1-2 relevant models.
-Step 3: If no match is found, use **Fallback** to **Meta-Cognitive Models**.
-
-## Domain-Specific Models Index
-${modelIndexMessage}
-
-## Task Context to Analyze
----
-${context}
----
-
-## Instructions
-1. Apply the selected models rigorously.
-2. Identify blind spots and logic gaps.
-3. Provide high-impact recommendations.
-
-## Output Structure
-- **Blind Spots**: ...
-- **Risk Warnings**: ...
-- **Alternative Approaches**: ...
-- **Recommendations**: ...
-- **Confidence Level**: [LOW/MEDIUM/HIGH]
-`.trim();
-}
+export {};