principles-disciple 1.72.0 → 1.73.0

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

@@ -9,27 +9,6 @@
  * @module subagent-workflow/types
  */
 
-import type {
-    NocturnalArtifact,
-    ArbiterResult,
-} from '../../core/nocturnal-arbiter.js';
-import type {
-    BoundedAction,
-} from '../../core/nocturnal-executability.js';
-import type {
-    NocturnalSessionSnapshot,
-} from '../../core/nocturnal-trajectory-extractor.js';
-import type {
-    TrinityResult,
-} from '../../core/nocturnal-trinity.js';
-import type {
-    IdleCheckResult,
-    PreflightCheckResult,
-} from '../nocturnal-runtime.js';
-import type {
-    NocturnalSelectionResult,
-} from '../nocturnal-target-selector.js';
-
 // ── Workflow Transport ────────────────────────────────────────────────────────
 
 /**
@@ -59,14 +38,14 @@ export type WorkflowTransport = 'runtime_direct';
  * States marked with (*) are terminal states.
  */
 export type WorkflowState =
-    | 'pending'           // Workflow created, not yet started
-    | 'active'           // Subagent spawned, running
-    | 'wait_result'      // Waiting for result (runtime_direct path)
-    | 'finalizing'       // Reading and parsing result
-    | 'completed'        // Successfully finalized and cleaned up (*)
-    | 'terminal_error'   // Finalized with error (*)
-    | 'cleanup_pending'  // Cleanup failed, pending retry (*)
-    | 'expired';        // TTL expired, cleaned up (*)
+    | 'pending'
+    | 'active'
+    | 'wait_result'
+    | 'finalizing'
+    | 'completed'
+    | 'terminal_error'
+    | 'cleanup_pending'
+    | 'expired';
 
 // ── Workflow Metadata ────────────────────────────────────────────────────────
 
@@ -150,7 +129,6 @@ export interface WorkflowHandle {
  * ```
  */
 export interface SubagentWorkflowSpec<TResult> {
-     
     /** Unique identifier for this workflow type */
     workflowType: string;
     /** Which transport mechanism to use */
@@ -177,7 +155,6 @@ export interface SubagentWorkflowSpec<TResult> {
      * For runtime_direct: typically finalize only on 'ok', skip on 'timeout'/'error'.
      */
     shouldFinalizeOnWaitStatus: (status: 'ok' | 'error' | 'timeout') => boolean;
-     
 }
 
 // ── Empathy Observer Specific Types ──────────────────────────────────────────
@@ -212,7 +189,7 @@ export interface EmpathyObserverWorkflowSpec extends SubagentWorkflowSpec<Empath
     workflowType: 'empathy-observer';
     transport: 'runtime_direct';
     timeoutMs: 30_000;
-    ttlMs: 300_000; // 5 minutes
+    ttlMs: 300_000;
     shouldDeleteSessionAfterFinalize: true;
 }
 
@@ -223,7 +200,6 @@ export interface EmpathyObserverWorkflowSpec extends SubagentWorkflowSpec<Empath
  * This is what the helper exposes to business modules.
  */
 export interface WorkflowManager {
-     
     /**
      * Start a new workflow.
      * Creates workflow state, spawns subagent, and returns handle.
@@ -283,7 +259,6 @@ export interface WorkflowManager {
      * Release resources (DB connections, timers).
      */
     dispose: () => void;
-     
 }
 
 // ── Workflow Store (for SQLite persistence) ──────────────────────────────────
@@ -339,13 +314,6 @@ export interface WorkflowDebugSummary {
         createdAt: number;
         payload: Record<string, unknown>;
     }[];
-    // NOC-16: Trinity stage states
-    trinityStageStates?: {
-        stage: 'dreamer' | 'philosopher' | 'scribe';
-        status: 'pending' | 'running' | 'completed' | 'failed';
-        reason?: string;
-        completedAt?: number;
-    }[];
 }
 
 // ── Convenience Re-exports ────────────────────────────────────────────────────
@@ -357,82 +325,3 @@ export type {
 } from '../../openclaw-sdk.js';
 
 export type { PluginLogger } from '../../openclaw-sdk.js';
-
-// ── Nocturnal Workflow Types ───────────────────────────────────────────────────
-
-/**
- * Recent pain context for sleep_reflection tasks.
- * Used by target selector for ranking bias and context enrichment.
- * Originally from evolution-worker.ts, moved here to break circular dependency.
- */
-export interface RecentPainContext {
-    /** Most recent unresolved pain event */
-    mostRecent: {
-        score: number;
-        source: string;
-        reason: string;
-        timestamp: string;
-        /** Session ID where the pain occurred */
-        sessionId: string;
-    } | null;
-    /** Count of pain events in the recent window (for signal strength) */
-    recentPainCount: number;
-    /** Highest pain score in the recent window */
-    recentMaxPainScore: number;
-}
-
-/**
- * Nocturnal workflow result type.
- * Mirrors NocturnalRunResult from nocturnal-service.ts (per D-02).
- */
-export type NocturnalResult = {
-    success: boolean;
-    artifact?: NocturnalArtifact & { boundedAction?: BoundedAction };
-    skipReason?: string;
-    noTargetSelected: boolean;
-    validationFailed: boolean;
-    validationFailures: string[];
-    snapshot?: NocturnalSessionSnapshot;
-    diagnostics: NocturnalRunDiagnostics;
-    trinityTelemetry?: TrinityResult['telemetry'];
-};
-
-/**
- * Diagnostics from each pipeline stage.
- * Duplicated from nocturnal-service.ts to break circular dependency.
- */
-export interface NocturnalRunDiagnostics {
-    /** Pre-flight check result */
-    preflight: PreflightCheckResult | null;
-    /** Selection result */
-    selection: NocturnalSelectionResult | null;
-    /** Idle check result */
-    idle: IdleCheckResult | null;
-    /** Whether Trinity chain was attempted */
-    trinityAttempted: boolean;
-    /** Trinity result (if trinityAttempted === true) */
-    trinityResult: TrinityResult | null;
-    /** Which chain mode was used */
-    chainModeUsed: 'trinity' | 'single-reflector' | null;
-    /** Arbiter validation result */
-    arbiterResult: ArbiterResult | null;
-    /** Executability validation result (if arbiter passed) */
-    executabilityResult: { executable: boolean; failures: string[] } | null;
-    /** Whether artifact was persisted */
-    persisted: boolean;
-    /** Persistence path (if persisted) */
-    persistedPath?: string;
-    /** Code-candidate sidecar diagnostics */
-    artificer: NocturnalArtificerDiagnostics;
-}
-
-export interface NocturnalArtificerDiagnostics {
-    status: 'skipped' | 'validation_failed' | 'persisted_candidate';
-    reason?:
-        | 'behavioral_artifact_unavailable'
-        | 'no_deterministic_rule'
-        | 'persistence_failed'
-        | 'cancelled';
-    validationErrors?: string[];
-    persistedPath?: string;
-}

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

@@ -1,9 +1,8 @@
- 
+
 import Database from 'better-sqlite3';
 import * as fs from 'fs';
 import * as path from 'path';
 import type { WorkflowRow, WorkflowEventRow, WorkflowState } from './types.js';
-import type { DreamerOutput, PhilosopherOutput } from '../../core/nocturnal-trinity.js';
 
 const SCHEMA_VERSION = 2;
 
@@ -75,17 +74,6 @@ export class WorkflowStore {
             CREATE INDEX IF NOT EXISTS idx_workflows_child_session ON subagent_workflows(child_session_key);
             CREATE INDEX IF NOT EXISTS idx_workflows_state ON subagent_workflows(state);
             CREATE INDEX IF NOT EXISTS idx_workflows_type ON subagent_workflows(workflow_type);
-            CREATE TABLE IF NOT EXISTS subagent_workflow_stage_outputs (
-                workflow_id TEXT NOT NULL,
-                stage TEXT NOT NULL CHECK (stage IN ('dreamer', 'philosopher')),
-                output_json TEXT NOT NULL,
-                idempotency_key TEXT NOT NULL,
-                created_at INTEGER NOT NULL,
-                FOREIGN KEY (workflow_id) REFERENCES subagent_workflows(workflow_id) ON DELETE CASCADE
-            );
-
-            CREATE INDEX IF NOT EXISTS idx_stage_outputs_workflow ON subagent_workflow_stage_outputs(workflow_id);
-            CREATE UNIQUE INDEX IF NOT EXISTS idx_stage_outputs_idempotency ON subagent_workflow_stage_outputs(idempotency_key);
 
             CREATE INDEX IF NOT EXISTS idx_events_workflow ON subagent_workflow_events(workflow_id);
         `);
@@ -95,7 +83,6 @@ export class WorkflowStore {
         if (currentVersion === 0) {
             this.db.prepare('INSERT INTO schema_version (version) VALUES (?)').run(SCHEMA_VERSION);
         } else if (currentVersion < SCHEMA_VERSION) {
-            // Run migrations for existing databases
             this.runMigrations(currentVersion, SCHEMA_VERSION);
             this.db.prepare('UPDATE schema_version SET version = ?').run(SCHEMA_VERSION);
         }
@@ -103,12 +90,11 @@ export class WorkflowStore {
 
     private runMigrations(fromVersion: number, toVersion: number): void {
         if (fromVersion < 2 && toVersion >= 2) {
-            // v1 → v2: Add duration_ms column for adaptive timeout tracking
             try {
                 this.db.exec('ALTER TABLE subagent_workflows ADD COLUMN duration_ms INTEGER');
                 console.info(`[PD:WorkflowStore] Schema migration v${fromVersion} → v${toVersion}: added duration_ms column`);
             } catch {
-                // Column may already exist if migration was partially applied
+                void 0;
             }
         }
     }
@@ -218,7 +204,6 @@ export class WorkflowStore {
         `).all(cutoff) as WorkflowRow[];
     }
 
-    /** List all workflows, optionally filtered by state. */
     listWorkflows(state?: string): WorkflowRow[] {
         if (state) {
             return this.db.prepare(`
@@ -233,8 +218,6 @@ export class WorkflowStore {
         `).all() as WorkflowRow[];
     }
     
-     
-     
     recordEvent(
         workflowId: string,
         eventType: string,
@@ -264,117 +247,17 @@ export class WorkflowStore {
             SELECT * FROM subagent_workflow_events WHERE workflow_id = ? ORDER BY created_at ASC
         `).all(workflowId) as WorkflowEventRow[];
     }
-    
-    /**
-     * Record a Trinity stage output to the database (NOC-11).
-     * idempotencyKey must be unique per (workflow_id, stage). If a row with the
-     * same idempotency_key already exists, this is a no-op (idempotent).
-     */
-     
-     
-    recordStageOutput(
-        workflowId: string,
-        stage: 'dreamer' | 'philosopher',
-        output: DreamerOutput | PhilosopherOutput,
-        idempotencyKey: string
-    ): void {
-        const now = Date.now();
-        // Use INSERT OR IGNORE for idempotency — if idempotency_key already exists, silently skip
-        this.db.prepare(`
-            INSERT OR IGNORE INTO subagent_workflow_stage_outputs (
-                workflow_id, stage, output_json, idempotency_key, created_at
-            ) VALUES (?, ?, ?, ?, ?)
-        `).run(
-            workflowId,
-            stage,
-            JSON.stringify(output),
-            idempotencyKey,
-            now
-        );
-    }
-
-    /**
-     * Get all stage outputs for a workflow (NOC-13 crash recovery).
-     * Returns outputs ordered by created_at ascending.
-     */
-    getStageOutputs(workflowId: string): {
-        stage: string;
-        output: DreamerOutput | PhilosopherOutput;
-        idempotencyKey: string;
-        createdAt: number;
-    }[] {
-        const rows = this.db.prepare(`
-            SELECT workflow_id, stage, output_json, idempotency_key, created_at
-            FROM subagent_workflow_stage_outputs
-            WHERE workflow_id = ?
-            ORDER BY created_at ASC
-        `).all(workflowId) as {
-            workflow_id: string;
-            stage: string;
-            output_json: string;
-            idempotency_key: string;
-            created_at: number;
-        }[];
-
-        return rows.map(row => ({
-            workflowId: row.workflow_id,
-            stage: row.stage,
-            output: JSON.parse(row.output_json) as DreamerOutput | PhilosopherOutput,
-            idempotencyKey: row.idempotency_key,
-            createdAt: row.created_at,
-        }));
-    }
-
-    /**
-     * Get a stage output by its idempotency key (NOC-12 idempotency check).
-     * Returns null if not found.
-     */
-    getStageOutputByKey(idempotencyKey: string): {
-        stage: string;
-        output: DreamerOutput | PhilosopherOutput;
-        workflowId: string;
-        createdAt: number;
-    } | null {
-        const row = this.db.prepare(`
-            SELECT workflow_id, stage, output_json, idempotency_key, created_at
-            FROM subagent_workflow_stage_outputs
-            WHERE idempotency_key = ?
-        `).get(idempotencyKey) as {
-            workflow_id: string;
-            stage: string;
-            output_json: string;
-            idempotency_key: string;
-            created_at: number;
-        } | undefined;
-
-        if (!row) return null;
-
-        return {
-            workflowId: row.workflow_id,
-            stage: row.stage,
-            output: JSON.parse(row.output_json) as DreamerOutput | PhilosopherOutput,
-            createdAt: row.created_at,
-        };
-    }
 
     deleteWorkflow(workflowId: string): void {
         this.db.prepare('DELETE FROM subagent_workflows WHERE workflow_id = ?').run(workflowId);
     }
 
-    /**
-     * Record the actual completion duration for a workflow.
-     * Used by adaptive timeout learning.
-     */
     recordDuration(workflowId: string, durationMs: number): void {
         this.db.prepare(`
             UPDATE subagent_workflows SET duration_ms = ?, updated_at = ? WHERE workflow_id = ?
         `).run(durationMs, Date.now(), workflowId);
     }
 
-    /**
-     * Get completion durations for a specific workflow type, ordered by most recent first.
-     * Returns an array of duration_ms values for adaptive timeout calculation.
-     */
     getCompletionDurations(workflowType: string, limit = 50): number[] {
         const rows = this.db.prepare(`
             SELECT duration_ms FROM subagent_workflows

package/src/service/workflow-watchdog.ts

@@ -12,8 +12,6 @@
  *         workflows as terminal_error (line 122)
  * BUG-02: Gateway fallback cleans up child sessions via agentSession when
  *         subagentRuntime unavailable (lines 148-156)
- * BUG-03: Nocturnal workflow snapshot validation detects pain_context_fallback
- *         with zero stats (lines 184-198)
  */
 
 import type { WorkspaceContext } from '../core/workspace-context.js';
@@ -26,7 +24,6 @@ import { WORKFLOW_TTL_MS } from '../config/defaults/runtime.js';
 export interface WatchdogResult {
   anomalies: number;
   details: string[];
-  /** Set when the watchdog scan itself failed (e.g., store errors). Undefined means scan succeeded. */
   scanError?: string;
 }
 
@@ -46,7 +43,6 @@ export async function runWorkflowWatchdog(
     try {
       const allWorkflows: WorkflowRow[] = store.listWorkflows();
 
-      // Check 1: Stale active workflows (active > 2x TTL)
       const staleThreshold = WORKFLOW_TTL_MS * 2;
       const staleActive = allWorkflows.filter(
         (wf: WorkflowRow) => wf.state === 'active' && (now - wf.created_at) > staleThreshold,
@@ -56,9 +52,6 @@ export async function runWorkflowWatchdog(
           const ageMin = Math.round((now - wf.created_at) / 60000);
           details.push(`stale_active: ${wf.workflow_id} (${wf.workflow_type}, ${ageMin}min old)`);
 
-          // #257: Check if the last recorded event reason indicates expected subagent unavailability.
-          // If so, skip marking as terminal_error — the workflow is stale because the subagent
-          // was expectedly unavailable (daemon mode, process isolation), not due to a hard failure.
           const events = store.getEvents(wf.workflow_id);
           const lastEventReason = events.length > 0 ? events[events.length - 1].reason : 'unknown';
           if (isExpectedSubagentError(lastEventReason)) {
@@ -69,7 +62,6 @@ export async function runWorkflowWatchdog(
           store.updateWorkflowState(wf.workflow_id, 'terminal_error');
           store.recordEvent(wf.workflow_id, 'watchdog_timeout', 'active', 'terminal_error', `Stale active > ${staleThreshold / 60000}s`, { ageMs: now - wf.created_at });
 
-          // Cleanup session if possible (#188: gateway-safe fallback)
           if (wf.child_session_key) {
             try {
               if (subagentRuntime) {
@@ -104,7 +96,6 @@ export async function runWorkflowWatchdog(
         }
       }
 
-      // Check 2: Workflows in terminal_error/expired without cleanup
       const unclearedTerminal = allWorkflows.filter(
         (wf: WorkflowRow) => (wf.state === 'terminal_error' || wf.state === 'expired') && wf.cleanup_state === 'pending',
       );
@@ -112,40 +103,6 @@ export async function runWorkflowWatchdog(
         details.push(`uncleared_terminal: ${unclearedTerminal.length} workflows (will be swept next cycle)`);
       }
 
-      // Check 3: Nocturnal workflow result validation (#181 pattern)
-      const nocturnalCompleted = allWorkflows.filter(
-        (wf: WorkflowRow) => wf.workflow_type === 'nocturnal' && wf.state === 'completed',
-      );
-      for (const wf of nocturnalCompleted) {
-        // Check if the metadata snapshot has all zeros (invalid data)
-        try {
-          const meta = JSON.parse(wf.metadata_json) as Record<string, unknown>;
-          const snapshot = meta.snapshot as Record<string, unknown> | undefined;
-          if (snapshot) {
-            // #219: Check for fallback data source (partial stats from pain context)
-            const dataSource = snapshot._dataSource as string | undefined;
-            if (dataSource === 'pain_context_fallback') {
-              details.push(`fallback_snapshot: nocturnal workflow ${wf.workflow_id} uses pain-context fallback (stats may be incomplete)`);
-            }
-            const stats = snapshot.stats as Record<string, number> | undefined;
-            // #246: Stats are now always number (never null). Detect "empty" fallback:
-            // fallback + all counts zero means no real data was available.
-            // NOTE: totalAssistantTurns may be 0 even for valid sessions because
-            // listRecentNocturnalCandidateSessions (used in fallback path) does not
-            // populate assistantTurnCount (only getNocturnalSessionSnapshot does).
-            // We use totalToolCalls=0 as the primary indicator instead.
-            if (stats && dataSource === 'pain_context_fallback' &&
-                stats.totalToolCalls === 0 && stats.totalGateBlocks === 0 &&
-                stats.failureCount === 0) {
-              details.push(`fallback_snapshot_stats: nocturnal workflow ${wf.workflow_id} has empty fallback stats (no trajectory data found)`);
-            }
-          }
-        } catch (err) {
-          details.push(`malformed_metadata: workflow ${wf.workflow_id} has unparseable metadata: ${String(err).slice(0, 100)}`);
-        }
-      }
-
-      // Summary
       const stateCounts: Record<string, number> = {};
       for (const wf of allWorkflows) {
         stateCounts[wf.state] = (stateCounts[wf.state] || 0) + 1;

package/src/types/event-payload.ts

@@ -1,74 +1,16 @@
-/**
- * Discriminated union for EventLogEntry — replaces flat data: Record<string, unknown>.
- * Each union member is keyed on the `type` field for type narrowing.
- */
-
-import type {
-  ToolCallEventData,
-  PainSignalEventData,
-  RuleMatchEventData,
-  RulePromotionEventData,
-  HookExecutionEventData,
-  GateBlockEventData,
-  GateBypassEventData,
-  PlanApprovalEventData,
-  EvolutionTaskEventData,
-  EmpathyRollbackEventData,
-  EventCategory,
-} from './event-types.js';
-
-export type EventLogEntry =
-  | { ts: string; date: string; type: 'tool_call'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: ToolCallEventData }
-  | { ts: string; date: string; type: 'pain_signal'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: PainSignalEventData }
-  | { ts: string; date: string; type: 'rule_match'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: RuleMatchEventData }
-  | { ts: string; date: string; type: 'rule_promotion'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: RulePromotionEventData }
-  | { ts: string; date: string; type: 'hook_execution'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: HookExecutionEventData }
-  | { ts: string; date: string; type: 'gate_block'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: GateBlockEventData }
-  | { ts: string; date: string; type: 'gate_bypass'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: GateBypassEventData }
-  | { ts: string; date: string; type: 'plan_approval'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: PlanApprovalEventData }
-  | { ts: string; date: string; type: 'evolution_task'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: EvolutionTaskEventData }
-  | { ts: string; date: string; type: 'empathy_rollback'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: EmpathyRollbackEventData }
-  | { ts: string; date: string; type: 'error'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: Record<string, unknown> }
-  | { ts: string; date: string; type: 'warn'; category: EventCategory; sessionId?: string; workspaceDir?: string; data: Record<string, unknown> };
-
-// Type predicates for safe narrowing
-
-export function isToolCallEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'tool_call' }> {
-  return entry.type === 'tool_call';
-}
-
-export function isPainSignalEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'pain_signal' }> {
-  return entry.type === 'pain_signal';
-}
-
-export function isRuleMatchEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'rule_match' }> {
-  return entry.type === 'rule_match';
-}
-
-export function isRulePromotionEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'rule_promotion' }> {
-  return entry.type === 'rule_promotion';
-}
-
-export function isHookExecutionEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'hook_execution' }> {
-  return entry.type === 'hook_execution';
-}
-
-export function isGateBlockEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'gate_block' }> {
-  return entry.type === 'gate_block';
-}
-
-export function isGateBypassEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'gate_bypass' }> {
-  return entry.type === 'gate_bypass';
-}
-
-export function isPlanApprovalEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'plan_approval' }> {
-  return entry.type === 'plan_approval';
-}
-
-export function isEvolutionTaskEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'evolution_task' }> {
-  return entry.type === 'evolution_task';
-}
-
-export function isEmpathyRollbackEventEntry(entry: EventLogEntry): entry is Extract<EventLogEntry, { type: 'empathy_rollback' }> {
-  return entry.type === 'empathy_rollback';
-}
+export type {
+  EventLogEntry as DiscriminatedEventLogEntry,
+} from '@principles/core/runtime-v2';
+
+export {
+  isToolCallEventEntry,
+  isPainSignalEventEntry,
+  isRuleMatchEventEntry,
+  isRulePromotionEventEntry,
+  isHookExecutionEventEntry,
+  isGateBlockEventEntry,
+  isGateBypassEventEntry,
+  isPlanApprovalEventEntry,
+  isEvolutionTaskEventEntry,
+  isEmpathyRollbackEventEntry,
+} from '@principles/core/runtime-v2';