principles-disciple 1.183.0 → 1.185.0

package/dist/service/evolution-dedup.d.ts

@@ -4,7 +4,7 @@
  * Dedup logic for preventing duplicate pain tasks and redundant reflections.
  * Extracted from evolution-worker.ts.
  */
-import type { EvolutionQueueItem } from './evolution-queue-migration.js';
+import type { EvolutionQueueItem } from '../core/evolution-types.js';
 /**
  * Dedup window for pain queue tasks (30 minutes).
  */

package/dist/service/evolution-worker.d.ts

@@ -1,6 +1,5 @@
 import type { OpenClawPluginServiceContext, OpenClawPluginApi, PluginLogger } from '../openclaw-sdk.js';
 import { WorkspaceContext } from '../core/workspace-context.js';
-import type { TaskKind, TaskPriority } from '../core/trajectory-types.js';
 export type { TaskKind, TaskPriority } from '../core/trajectory-types.js';
 export { loadEvolutionQueue, saveEvolutionQueue, withQueueLock, acquireQueueLock, requireQueueLock } from './queue-io.js';
 export { EVOLUTION_QUEUE_LOCK_SUFFIX, LOCK_MAX_RETRIES, LOCK_RETRY_DELAY_MS, LOCK_STALE_MS } from './queue-io.js';
@@ -24,37 +23,14 @@ export type { WatchdogResult };
  * Pain diagnosis is Runtime v2 only: after_tool_call / pd pain record ->
  * PainSignalBridge -> SplitDiagnosticianRunner. EvolutionWorker does not read
  * .pain_flag or process pain_diagnosis queue items.
+ *
+ * Types (QueueStatus / TaskResolution / EvolutionQueueItem) are re-exported
+ * from queue-migration.ts, which sources them from evolution-types.ts
+ * (canonical single source of truth).
  */
-/** @deprecated Use PDTaskStatus from '@principles/core/runtime-v2'. M2 migration will replace this. */
-export type QueueStatus = 'pending' | 'in_progress' | 'completed' | 'failed' | 'canceled';
-export type TaskResolution = 'marker_detected' | 'auto_completed_timeout' | 'failed_max_retries' | 'runtime_unavailable' | 'canceled' | 'late_marker_principle_created' | 'late_marker_no_principle' | 'stub_fallback' | 'skipped_thin_violation' | 'noise_classified' | 'retired';
-export interface EvolutionQueueItem {
-    id: string;
-    taskKind: TaskKind;
-    priority: TaskPriority;
-    source: string;
-    traceId?: string;
-    task?: string;
-    score: number;
-    reason: string;
-    timestamp: string;
-    enqueued_at?: string;
-    started_at?: string;
-    completed_at?: string;
-    assigned_session_key?: string;
-    trigger_text_preview?: string;
-    status: QueueStatus;
-    resolution?: TaskResolution;
-    session_id?: string;
-    agent_id?: string;
-    retryCount: number;
-    maxRetries: number;
-    lastError?: string;
-    resultRef?: string;
-    painEventId?: number;
-}
-import { migrateToV2, isLegacyQueueItem, migrateQueueToV2, LegacyEvolutionQueueItem, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES, type RawQueueItem } from './queue-migration.js';
-export { migrateToV2, isLegacyQueueItem, migrateQueueToV2, LegacyEvolutionQueueItem, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES };
+export type { QueueStatus, TaskResolution, EvolutionQueueItem } from './queue-migration.js';
+import { migrateToV2, isLegacyQueueItem, migrateQueueToV2, LegacyEvolutionQueueItem, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES, validateQueueItem, VALID_TASK_KINDS, isValidQueueItem, type RawQueueItem, type EvolutionQueueItem } from './queue-migration.js';
+export { migrateToV2, isLegacyQueueItem, migrateQueueToV2, LegacyEvolutionQueueItem, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES, validateQueueItem, VALID_TASK_KINDS, isValidQueueItem };
 export type { RawQueueItem };
 export declare function extractEvolutionTaskId(task: string): string | null;
 export declare function purgeStaleFailedTasks(queue: EvolutionQueueItem[], logger: PluginLogger): {

package/dist/service/evolution-worker.js

@@ -11,7 +11,7 @@ import { atomicWriteFileSync } from '../utils/io.js';
 // Re-export queue I/O (extracted to queue-io.ts)
 export { loadEvolutionQueue, saveEvolutionQueue, withQueueLock, acquireQueueLock, requireQueueLock } from './queue-io.js';
 export { EVOLUTION_QUEUE_LOCK_SUFFIX, LOCK_MAX_RETRIES, LOCK_RETRY_DELAY_MS, LOCK_STALE_MS } from './queue-io.js';
-import { saveEvolutionQueue, requireQueueLock } from './queue-io.js';
+import { saveEvolutionQueue, requireQueueLock, loadEvolutionQueue } from './queue-io.js';
 import { WorkflowStore } from './subagent-workflow/workflow-store.js';
 import { PrincipleCompiler } from '../core/principle-compiler/index.js';
 import { loadLedger, updatePrinciple } from '../core/principle-tree-ledger.js';
@@ -58,8 +58,8 @@ import { runWorkflowWatchdog } from './workflow-watchdog.js';
 export { runWorkflowWatchdog };
 let timeoutId = null;
 // ── Queue Migration (extracted to queue-migration.ts) ────────────────────────
-import { migrateToV2, isLegacyQueueItem, migrateQueueToV2, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES } from './queue-migration.js';
-export { migrateToV2, isLegacyQueueItem, migrateQueueToV2, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES };
+import { migrateToV2, isLegacyQueueItem, migrateQueueToV2, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES, validateQueueItem, VALID_TASK_KINDS, isValidQueueItem } from './queue-migration.js';
+export { migrateToV2, isLegacyQueueItem, migrateQueueToV2, DEFAULT_TASK_KIND, DEFAULT_PRIORITY, DEFAULT_MAX_RETRIES, validateQueueItem, VALID_TASK_KINDS, isValidQueueItem };
 // Queue lock constants and requireQueueLock are imported from queue-io.ts
 export function extractEvolutionTaskId(task) {
     if (!task)
@@ -302,30 +302,12 @@ async function processEvolutionQueue(wctx, logger, _eventLog, _api) {
             logger?.info?.(`[PD:EvolutionWorker] Dropped ${beforeLegacyPainDrop - queue.length} legacy pain_diagnosis queue item(s); use PainSignalBridge/pd pain record`);
         }
         // Validate queue items — filter out malformed entries before processing.
-        // Malformed items are logged + skipped; they never crash the evolution cycle.
+        // rc-1/rc-4 (ERR-007): consolidated in validateQueueItem (queue-migration.ts)
+        // so every load path applies the same filter. Malformed items are logged +
+        // skipped; they never crash the evolution cycle.
         const beforeValidation = queue.length;
         queue = queue.filter((item) => {
-            const errors = [];
-            if (!item.id || typeof item.id !== 'string')
-                errors.push('missing/invalid id');
-            if (!item.source || typeof item.source !== 'string')
-                errors.push('missing/invalid source');
-            if (typeof item.score !== 'number')
-                errors.push('missing/invalid score');
-            if (!item.status || typeof item.status !== 'string')
-                errors.push('missing/invalid status');
-            if (!item.taskKind || typeof item.taskKind !== 'string')
-                errors.push('missing/invalid taskKind');
-            else {
-                const validTaskKinds = ['model_eval'];
-                if (!validTaskKinds.includes(item.taskKind)) {
-                    errors.push(`invalid taskKind value '${item.taskKind}' (expected one of: ${validTaskKinds.join(', ')})`);
-                }
-            }
-            if (typeof item.retryCount !== 'number')
-                errors.push('missing/invalid retryCount');
-            if (typeof item.maxRetries !== 'number')
-                errors.push('missing/invalid maxRetries');
+            const errors = validateQueueItem(item);
             if (errors.length > 0) {
                 logger?.warn?.(`[PD:EvolutionWorker] Skipping malformed queue item: ${errors.join(', ')} | ${JSON.stringify(item).slice(0, 200)}`);
                 SystemLogger.log(wctx.workspaceDir, 'QUEUE_ITEM_MALFORMED', `Skipped: ${errors.join(', ')} | id=${item.id || 'N/A'}`);
@@ -361,16 +343,11 @@ export async function registerEvolutionTaskSession(workspaceResolve, taskId, ses
         return false;
     const releaseLock = await requireQueueLock(queuePath, logger, 'registerEvolutionTaskSession');
     try {
-        let rawQueue;
-        try {
-            rawQueue = JSON.parse(fs.readFileSync(queuePath, 'utf8'));
-        }
-        catch (parseErr) {
-            logger?.warn?.(`[PD:EvolutionWorker] Failed to parse EVOLUTION_QUEUE for session registration: ${queuePath} - ${parseErr instanceof Error ? parseErr.message : String(parseErr)}`);
-            return false;
-        }
-        // V2: Migrate queue to current schema
-        const queue = migrateQueueToV2(rawQueue);
+        // loadEvolutionQueue handles JSON parse + migrate + validate (rc-1/rc-4).
+        // Previously this inlined JSON.parse + migrate cast without validating,
+        // so malformed queue items could reach the find() below. Reusing the
+        // shared loader keeps a single chokepoint for queue validation.
+        const queue = loadEvolutionQueue(queuePath);
         const task = queue.find((item) => item.id === taskId && item.status === 'in_progress');
         if (!task) {
             logger?.warn?.(`[PD:EvolutionWorker] Could not find in-progress evolution task ${taskId} for session assignment`);
@@ -406,7 +383,11 @@ async function processEvolutionQueueWithResult(wctx, logger, eventLog, api) {
         if (!fs.existsSync(queuePath)) {
             return { queue: queueResult, errors };
         }
-        const queue = JSON.parse(fs.readFileSync(queuePath, 'utf8'));
+        // rc-1/rc-2/rc-4 (ERR-001/ERR-005/ERR-007): use the canonical loader
+        // instead of raw JSON.parse + cast. loadEvolutionQueue handles parse,
+        // migrate, and element-wise validation; malformed items are dropped
+        // with a console.warn (rc-9: no silent fallback).
+        const queue = loadEvolutionQueue(queuePath);
         // Purge stale failed tasks before processing (keeps queue lean)
         const purgeResult = purgeStaleFailedTasks(queue, logger);
         if (purgeResult.purged > 0) {

package/dist/service/queue-io.js

@@ -11,7 +11,7 @@ import { createHash } from 'crypto';
 import { acquireLockAsync, releaseLock as releaseImportedLock } from '../utils/file-lock.js';
 import { atomicWriteFileSync } from '../utils/io.js';
 import { LockUnavailableError } from '../config/errors.js';
-import { migrateQueueToV2 } from './queue-migration.js';
+import { migrateQueueToV2, validateQueueItem } from './queue-migration.js';
 export const EVOLUTION_QUEUE_LOCK_SUFFIX = '.lock';
 export const LOCK_MAX_RETRIES = 50;
 export const LOCK_RETRY_DELAY_MS = 50;
@@ -72,7 +72,19 @@ export function loadEvolutionQueue(queuePath) {
             rawQueue = [];
         }
     }
-    return migrateQueueToV2(rawQueue);
+    // rc-1/rc-4 (ERR-007): every element of the parsed array is untrusted disk
+    // JSON — validate before returning. Malformed items are filtered out and
+    // reported via console.warn (rc-9: no silent drop). This is the single
+    // chokepoint that loadEvolutionQueue callers inherit.
+    const migrated = migrateQueueToV2(rawQueue);
+    return migrated.filter((item) => {
+        const errors = validateQueueItem(item);
+        if (errors.length > 0) {
+            console.warn(`[queue-io] Dropping malformed queue item: ${errors.join(', ')} | id=${item?.id ?? 'N/A'}`);
+            return false;
+        }
+        return true;
+    });
 }
 export function saveEvolutionQueue(queuePath, queue) {
     atomicWriteFileSync(queuePath, JSON.stringify(queue, null, 2));

package/dist/service/queue-migration.d.ts

@@ -5,32 +5,8 @@
  * to the V2 schema. Zero I/O, zero imports from evolution-worker.ts.
  */
 import type { TaskKind, TaskPriority } from '../core/trajectory-types.js';
-export type QueueStatus = 'pending' | 'in_progress' | 'completed' | 'failed';
-export type TaskResolution = 'success' | 'failure' | 'skipped';
-export interface EvolutionQueueItem {
-    id: string;
-    taskKind: TaskKind;
-    priority: TaskPriority;
-    source: string;
-    traceId?: string;
-    task?: string;
-    score: number;
-    reason: string;
-    timestamp: string;
-    enqueued_at?: string;
-    started_at?: string;
-    completed_at?: string;
-    assigned_session_key?: string;
-    trigger_text_preview?: string;
-    status: QueueStatus;
-    resolution?: TaskResolution;
-    session_id?: string;
-    agent_id?: string;
-    retryCount: number;
-    maxRetries: number;
-    lastError?: string;
-    resultRef?: string;
-}
+import type { EvolutionQueueItem } from '../core/evolution-types.js';
+export type { QueueStatus, TaskResolution, EvolutionQueueItem } from '../core/evolution-types.js';
 /**
  * Legacy queue item shape (pre-V2) for migration compatibility.
  * These items lack taskKind, priority, retryCount, maxRetries, lastError fields.
@@ -81,3 +57,28 @@ export declare function isLegacyQueueItem(item: RawQueueItem): boolean;
  * Returns a new array with all items migrated to V2 format.
  */
 export declare function migrateQueueToV2(queue: RawQueueItem[]): EvolutionQueueItem[];
+/**
+ * Canonical set of valid taskKind values. Single source of truth — mirrors
+ * TaskKind in trajectory-types.ts. Previously the inline validator in
+ * evolution-worker.ts hard-coded `['model_eval']`, which silently rejected
+ * three legitimate taskKind values (pain_diagnosis / sleep_reflection /
+ * keyword_optimization). Keep this in sync with TaskKind.
+ */
+export declare const VALID_TASK_KINDS: readonly TaskKind[];
+/**
+ * Validate a single queue item loaded from untrusted disk JSON.
+ *
+ * Returns an array of human-readable error reasons; an empty array means the
+ * item is valid. Use {@link isValidQueueItem} for a type-guard form.
+ *
+ * This consolidates the inline validation that lived in processEvolutionQueue
+ * (evolution-worker.ts) so every queue load path (loadEvolutionQueue,
+ * registerEvolutionTaskSession) applies the same filter. rc-4 (ERR-007):
+ * array elements from parsed JSON must be element-wise validated.
+ */
+export declare function validateQueueItem(item: unknown): string[];
+/**
+ * Type-guard convenience over {@link validateQueueItem}.
+ * Drops the reason strings (callers that need them should call validateQueueItem).
+ */
+export declare function isValidQueueItem(item: unknown): item is EvolutionQueueItem;

package/dist/service/queue-migration.js

@@ -54,3 +54,60 @@ export function isLegacyQueueItem(item) {
 export function migrateQueueToV2(queue) {
     return queue.map(item => isLegacyQueueItem(item) ? migrateToV2(item) : item);
 }
+// ── Validation (rc-1/rc-2, rc-4: validate array elements from untrusted JSON) ─
+/**
+ * Canonical set of valid taskKind values. Single source of truth — mirrors
+ * TaskKind in trajectory-types.ts. Previously the inline validator in
+ * evolution-worker.ts hard-coded `['model_eval']`, which silently rejected
+ * three legitimate taskKind values (pain_diagnosis / sleep_reflection /
+ * keyword_optimization). Keep this in sync with TaskKind.
+ */
+export const VALID_TASK_KINDS = [
+    'pain_diagnosis',
+    'sleep_reflection',
+    'model_eval',
+    'keyword_optimization',
+];
+/**
+ * Validate a single queue item loaded from untrusted disk JSON.
+ *
+ * Returns an array of human-readable error reasons; an empty array means the
+ * item is valid. Use {@link isValidQueueItem} for a type-guard form.
+ *
+ * This consolidates the inline validation that lived in processEvolutionQueue
+ * (evolution-worker.ts) so every queue load path (loadEvolutionQueue,
+ * registerEvolutionTaskSession) applies the same filter. rc-4 (ERR-007):
+ * array elements from parsed JSON must be element-wise validated.
+ */
+export function validateQueueItem(item) {
+    const errors = [];
+    if (item === null || typeof item !== 'object' || Array.isArray(item)) {
+        return ['item is not an object'];
+    }
+    const it = item;
+    if (!it.id || typeof it.id !== 'string')
+        errors.push('missing/invalid id');
+    if (!it.source || typeof it.source !== 'string')
+        errors.push('missing/invalid source');
+    if (typeof it.score !== 'number')
+        errors.push('missing/invalid score');
+    if (!it.status || typeof it.status !== 'string')
+        errors.push('missing/invalid status');
+    if (!it.taskKind || typeof it.taskKind !== 'string')
+        errors.push('missing/invalid taskKind');
+    else if (!VALID_TASK_KINDS.includes(it.taskKind)) {
+        errors.push(`invalid taskKind value '${it.taskKind}' (expected one of: ${VALID_TASK_KINDS.join(', ')})`);
+    }
+    if (typeof it.retryCount !== 'number')
+        errors.push('missing/invalid retryCount');
+    if (typeof it.maxRetries !== 'number')
+        errors.push('missing/invalid maxRetries');
+    return errors;
+}
+/**
+ * Type-guard convenience over {@link validateQueueItem}.
+ * Drops the reason strings (callers that need them should call validateQueueItem).
+ */
+export function isValidQueueItem(item) {
+    return validateQueueItem(item).length === 0;
+}

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "principles-disciple",
   "name": "Principles Disciple",
   "description": "Evolutionary programming agent framework with strategic guardrails and reflection loops.",
-  "version": "1.183.0",
+  "version": "1.185.0",
   "activation": {
     "onCapabilities": [
       "hook"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "principles-disciple",
-  "version": "1.183.0",
+  "version": "1.185.0",
   "description": "Native OpenClaw plugin for Principles Disciple",
   "type": "module",
   "main": "./dist/index.js",

package/dist/service/evolution-queue-migration.d.ts

@@ -1,128 +0,0 @@
-/**
- * Evolution Queue Migration — V1 to V2 Schema
- *
- * Pure transformation functions and shared queue types.
- */
-import type { TaskKind, TaskPriority } from '../core/trajectory-types.js';
-export type { TaskKind, TaskPriority } from '../core/trajectory-types.js';
-/**
- * Queue item status values.
- */
-export type QueueStatus = 'pending' | 'in_progress' | 'completed' | 'failed' | 'canceled';
-/**
- * Task resolution strings.
- */
-export type TaskResolution = 'marker_detected' | 'auto_completed_timeout' | 'failed_max_retries' | 'runtime_unavailable' | 'canceled' | 'late_marker_principle_created' | 'late_marker_no_principle' | 'stub_fallback' | 'skipped_thin_violation' | 'noise_classified' | 'retired';
-/**
- * Recent pain context for sleep_reflection tasks.
- * Attached to queue items to provide pain signal context.
- */
-export interface RecentPainContext {
-    mostRecent: {
-        score: number;
-        source: string;
-        reason: string;
-        timestamp: string;
-        sessionId: string;
-    } | null;
-    recentPainCount: number;
-    recentMaxPainScore: number;
-}
-/**
- * Default values for new V2 fields when migrating legacy items.
- */
-export declare const DEFAULT_TASK_KIND: TaskKind;
-export declare const DEFAULT_PRIORITY: TaskPriority;
-export declare const DEFAULT_MAX_RETRIES = 3;
-/**
- * Legacy (pre-V2) queue item schema.
- */
-export interface LegacyEvolutionQueueItem {
-    id: string;
-    source: string;
-    traceId?: string;
-    task?: string;
-    score: number;
-    reason: string;
-    timestamp: string;
-    enqueued_at?: string;
-    started_at?: string;
-    completed_at?: string;
-    assigned_session_key?: string;
-    trigger_text_preview?: string;
-    status?: string;
-    resolution?: string;
-    session_id?: string;
-    agent_id?: string;
-    taskKind?: string;
-    priority?: string;
-    retryCount?: number;
-    maxRetries?: number;
-    lastError?: string;
-    resultRef?: string;
-}
-/**
- * V2 queue item schema.
- */
-export interface EvolutionQueueItem {
-    id: string;
-    taskKind: TaskKind;
-    priority: TaskPriority;
-    source: string;
-    traceId?: string;
-    task?: string;
-    score: number;
-    reason: string;
-    timestamp: string;
-    enqueued_at?: string;
-    started_at?: string;
-    completed_at?: string;
-    assigned_session_key?: string;
-    trigger_text_preview?: string;
-    status: QueueStatus;
-    resolution?: TaskResolution;
-    session_id?: string;
-    agent_id?: string;
-    retryCount: number;
-    maxRetries: number;
-    lastError?: string;
-    resultRef?: string;
-    recentPainContext?: RecentPainContext;
-}
-export type RawQueueItem = Record<string, unknown>;
-/**
- * Migrate a legacy queue item to V2 schema.
- * Old items without taskKind are assumed to be pain_diagnosis for backward compatibility.
- */
-export declare function migrateToV2(item: LegacyEvolutionQueueItem): {
-    id: string;
-    taskKind: TaskKind;
-    priority: TaskPriority;
-    source: string;
-    traceId?: string;
-    task?: string;
-    score: number;
-    reason: string;
-    timestamp: string;
-    enqueued_at?: string;
-    started_at?: string;
-    completed_at?: string;
-    assigned_session_key?: string;
-    trigger_text_preview?: string;
-    status: QueueStatus;
-    resolution?: TaskResolution;
-    session_id?: string;
-    agent_id?: string;
-    retryCount: number;
-    maxRetries: number;
-    lastError?: string;
-    resultRef?: string;
-};
-/**
- * Check if an item is a legacy (pre-V2) queue item.
- */
-export declare function isLegacyQueueItem(item: RawQueueItem): boolean;
-/**
- * Migrate entire queue to V2 schema if needed.
- */
-export declare function migrateQueueToV2(queue: RawQueueItem[]): ReturnType<typeof migrateToV2>[];

package/dist/service/evolution-queue-migration.js

@@ -1,53 +0,0 @@
-/**
- * Evolution Queue Migration — V1 to V2 Schema
- *
- * Pure transformation functions and shared queue types.
- */
-/**
- * Default values for new V2 fields when migrating legacy items.
- */
-export const DEFAULT_TASK_KIND = 'pain_diagnosis';
-export const DEFAULT_PRIORITY = 'medium';
-export const DEFAULT_MAX_RETRIES = 3;
-/**
- * Migrate a legacy queue item to V2 schema.
- * Old items without taskKind are assumed to be pain_diagnosis for backward compatibility.
- */
-export function migrateToV2(item) {
-    return {
-        id: item.id,
-        taskKind: item.taskKind || DEFAULT_TASK_KIND,
-        priority: item.priority || DEFAULT_PRIORITY,
-        source: item.source,
-        traceId: item.traceId,
-        task: item.task,
-        score: item.score,
-        reason: item.reason,
-        timestamp: item.timestamp,
-        enqueued_at: item.enqueued_at,
-        started_at: item.started_at,
-        completed_at: item.completed_at,
-        assigned_session_key: item.assigned_session_key,
-        trigger_text_preview: item.trigger_text_preview,
-        status: item.status || 'pending',
-        resolution: item.resolution,
-        session_id: item.session_id,
-        agent_id: item.agent_id,
-        retryCount: item.retryCount || 0,
-        maxRetries: item.maxRetries || DEFAULT_MAX_RETRIES,
-        lastError: item.lastError,
-        resultRef: item.resultRef,
-    };
-}
-/**
- * Check if an item is a legacy (pre-V2) queue item.
- */
-export function isLegacyQueueItem(item) {
-    return item && typeof item === 'object' && !('taskKind' in item);
-}
-/**
- * Migrate entire queue to V2 schema if needed.
- */
-export function migrateQueueToV2(queue) {
-    return queue.map(item => isLegacyQueueItem(item) ? migrateToV2(item) : item);
-}