principles-disciple 1.168.0 → 1.170.0

package/dist/core/behavior-example-pack-assembler.d.ts

@@ -13,6 +13,10 @@ export interface BehaviorExamplePackAssemblerInput {
     readonly sourcePainId: string;
     /** Owner's natural-language desired outcome — must be non-empty. */
     readonly ownerDesiredOutcome: string;
+    /** Owner-selected call that demonstrates behaviour to block. */
+    readonly sourceNegativeToolCallId: number;
+    /** Owner-selected calls that demonstrate behaviour to allow (1..3). */
+    readonly positiveToolCallIds: readonly number[];
     /**
      * Project directory, used to detect absolute paths that should be redacted
      * to relative/basename form in the assembled pack.
@@ -28,16 +32,7 @@ export interface BehaviorExamplePackAssemblerInput {
 export declare class BehaviorExamplePackAssembler {
     private readonly db;
     constructor(opts: BehaviorExamplePackAssemblerOptions);
-    /**
-     * Assemble a BehaviorExamplePack from the pain lineage anchored at
-     * `input.sourcePainId`.
-     *
-     * Fail-loud contract (spec §7.2, ERR-069):
-     *   - pain event not found → throws
-     *   - empty trajectory → throws
-     *   - no failing tool call to anchor sourceNegativeCase → throws
-     *   - no successful tool call for positiveCounterexamples → throws
-     *   - assembled pack fails validateBehaviorExamplePack → throws
-     */
+    /** Assemble only from explicit Owner labels; execution outcome is not a label. */
     assemble(input: BehaviorExamplePackAssemblerInput): BehaviorExamplePack;
+    private buildSelectedCase;
 }

package/dist/core/behavior-example-pack-assembler.js

@@ -19,8 +19,9 @@
  * Boundary: this module is I/O. Pure logic (type + validator) lives in
  * `@principles/core/runtime-v2` → `behavior-example-pack.ts`.
  */
-import { validateBehaviorExamplePack, } from '@principles/core/runtime-v2';
+import { buildRuleHostAction, computeBehaviorFacts, validateBehaviorExamplePack, } from '@principles/core/runtime-v2';
 import { TrajectoryRegistry } from './trajectory.js';
+import { assembleHistoryFromRows } from './rule-context-assembler.js';
 // ── internal constants ─────────────────────────────────────────────────────
 const MAX_POSITIVES = 3;
 const MAX_EVIDENCE_REFS = 5;
@@ -52,98 +53,29 @@ export class BehaviorExamplePackAssembler {
         // owns dispose.
         this.db = TrajectoryRegistry.get(opts.workspaceDir);
     }
-    /**
-     * Assemble a BehaviorExamplePack from the pain lineage anchored at
-     * `input.sourcePainId`.
-     *
-     * Fail-loud contract (spec §7.2, ERR-069):
-     *   - pain event not found → throws
-     *   - empty trajectory → throws
-     *   - no failing tool call to anchor sourceNegativeCase → throws
-     *   - no successful tool call for positiveCounterexamples → throws
-     *   - assembled pack fails validateBehaviorExamplePack → throws
-     */
+    /** Assemble only from explicit Owner labels; execution outcome is not a label. */
     assemble(input) {
-        // ── 1. Look up the anchoring pain event ──
         const pain = this.db.getPainEventByCanonicalId(input.sourcePainId);
         if (!pain) {
             throw new Error(`[BehaviorExamplePackAssembler] pain event not found for canonical_pain_id="${input.sourcePainId}" (ERR-069 fail loud)`);
         }
-        // ── 2. Pull the recent trajectory for the pain's session ──
-        // getRuleHostContextRows returns rows WITH params_json (which
-        // listToolCallsForSession does not), so we use it here.
-        const ctxResult = this.db.getRuleHostContextRows(pain.sessionId, HISTORY_LIMIT);
-        const rows = ctxResult.rows;
-        if (rows.length === 0) {
-            throw new Error(`[BehaviorExamplePackAssembler] empty trajectory (no tool calls) for sessionId="${pain.sessionId}" (pain=${input.sourcePainId}, ERR-069 fail loud)`);
-        }
-        // ── 3. Partition into failures (negative candidates) and successes (positives) ──
-        const failures = [];
-        const successes = [];
-        for (const row of rows) {
-            if (row.outcome === 'failure') {
-                failures.push(row);
-            }
-            else if (row.outcome === 'success') {
-                successes.push(row);
+        validateOwnerSelection(input);
+        const negativeRow = requireSelectedRow(this.db.getRuleHostEvidenceRow(input.sourceNegativeToolCallId), input.sourceNegativeToolCallId);
+        const positiveRows = input.positiveToolCallIds.map((id) => requireSelectedRow(this.db.getRuleHostEvidenceRow(id), id));
+        for (const row of [negativeRow, ...positiveRows]) {
+            if (row.sessionId !== pain.sessionId) {
+                throw new Error(`[BehaviorExamplePackAssembler] selected tool call ${row.id} session mismatch; all examples must belong to pain session ${pain.sessionId}`);
             }
-            // 'blocked' rows are not used as either positive or negative cases.
-        }
-        if (failures.length === 0) {
-            throw new Error(`[BehaviorExamplePackAssembler] no failing tool call in sessionId="${pain.sessionId}" — cannot build sourceNegativeCase (pain=${input.sourcePainId}, ERR-069 fail loud)`);
-        }
-        if (successes.length === 0) {
-            throw new Error(`[BehaviorExamplePackAssembler] no successful tool call in sessionId="${pain.sessionId}" — cannot build positiveCounterexamples (pain=${input.sourcePainId}, ERR-069 fail loud)`);
-        }
-        // ── 4. Build sourceNegativeCase from the most recent failure ──
-        const sourceFailure = failures[failures.length - 1];
-        if (!sourceFailure) {
-            // Defensive: should be unreachable due to the failures.length === 0 check
-            // above, but noUncheckedIndexedAccess requires the guard.
-            throw new Error(`[BehaviorExamplePackAssembler] internal error: sourceFailure undefined (pain=${input.sourcePainId})`);
-        }
-        const sourceNegativeCase = buildCaseFromRow(sourceFailure, 'negative', 'block', input.projectDir);
-        // ── 5. Build positiveCounterexamples from successes (≤3, most recent first) ──
-        const positiveRows = successes.slice(-MAX_POSITIVES); // most recent ≤3
-        const positiveCounterexamples = [];
-        for (const row of positiveRows) {
-            positiveCounterexamples.push(buildCaseFromRow(row, 'positive', 'allow', input.projectDir));
-        }
-        // ── 6. Build evidenceRefs from pain events + gate blocks (≤5) ──
-        const evidenceRefs = [];
-        const sessionPainEvents = this.db.listPainEventsForSession(pain.sessionId);
-        for (const p of sessionPainEvents) {
-            if (evidenceRefs.length >= MAX_EVIDENCE_REFS)
-                break;
-            evidenceRefs.push(`pain:${p.id}`);
-        }
-        const gateBlocks = this.db.listGateBlocksForSession(pain.sessionId);
-        for (const g of gateBlocks) {
-            if (evidenceRefs.length >= MAX_EVIDENCE_REFS)
-                break;
-            evidenceRefs.push(`gate:${g.id}`);
         }
-        if (evidenceRefs.length === 0) {
-            // The anchor pain event itself always provides at least one evidenceRef.
-            evidenceRefs.push(`pain:${pain.id}`);
-        }
-        // ── 7. Apply redaction (spec §7.2: "经过脱敏") ──
-        const redactionResult = redactParams(sourceNegativeCase.params, input.projectDir);
-        const redactedNegativeCase = {
-            ...sourceNegativeCase,
-            params: redactionResult.redacted,
-        };
-        const redactedPositives = positiveCounterexamples.map((c) => {
-            const r = redactParams(c.params, input.projectDir);
-            return { ...c, params: r.redacted };
-        });
-        const redactionNotes = [...redactionResult.notes];
-        // ── 8. Assemble the pack ──
+        const redactionNotes = [];
+        const buildCtx = { projectDir: input.projectDir, redactionNotes };
+        const sourceNegativeCase = this.buildSelectedCase(negativeRow, 'negative', 'block', buildCtx);
+        const positiveCounterexamples = positiveRows.map((row) => this.buildSelectedCase(row, 'positive', 'allow', buildCtx));
         const pack = {
-            sourceNegativeCase: redactedNegativeCase,
+            sourceNegativeCase,
             ownerDesiredOutcome: input.ownerDesiredOutcome,
-            positiveCounterexamples: redactedPositives,
-            evidenceRefs,
+            positiveCounterexamples,
+            evidenceRefs: [`pain:${pain.id}`, `tool_call:${negativeRow.id}`, ...positiveRows.map((row) => `tool_call:${row.id}`)].slice(0, MAX_EVIDENCE_REFS),
             redactionNotes,
         };
         // ── 9. Validate — fail loud (ERR-069) ──
@@ -153,6 +85,34 @@ export class BehaviorExamplePackAssembler {
         }
         return pack;
     }
+    buildSelectedCase(row, kind, expectedDecision, ctx) {
+        const { projectDir, redactionNotes } = ctx;
+        const base = buildCaseFromRow(row, kind, expectedDecision, projectDir);
+        const redaction = redactParams(base.params, projectDir);
+        redactionNotes.push(...redaction.notes);
+        const historyResult = this.db.getRuleHostContextRowsBefore(row.sessionId, row.id, HISTORY_LIMIT);
+        const history = assembleHistoryFromRows(historyResult.rows, historyResult.truncated, projectDir);
+        const action = buildRuleHostAction(row.toolName, redaction.redacted, projectDir);
+        const ruleContext = { version: 2, history, facts: computeBehaviorFacts(history, action.normalizedPath || null, null) };
+        return { ...base, params: redaction.redacted, ruleContext };
+    }
+}
+function validateOwnerSelection(input) {
+    if (!Number.isSafeInteger(input.sourceNegativeToolCallId) || input.sourceNegativeToolCallId <= 0) {
+        throw new Error('[BehaviorExamplePackAssembler] sourceNegativeToolCallId must be a positive integer');
+    }
+    if (!Array.isArray(input.positiveToolCallIds) || input.positiveToolCallIds.length === 0 || input.positiveToolCallIds.length > MAX_POSITIVES) {
+        throw new Error('[BehaviorExamplePackAssembler] positiveToolCallIds must contain 1 to at most 3 IDs');
+    }
+    const allIds = [input.sourceNegativeToolCallId, ...input.positiveToolCallIds];
+    if (allIds.some((id) => !Number.isSafeInteger(id) || id <= 0) || new Set(allIds).size !== allIds.length) {
+        throw new Error('[BehaviorExamplePackAssembler] selected tool call IDs must be unique positive integers');
+    }
+}
+function requireSelectedRow(row, id) {
+    if (!row)
+        throw new Error(`[BehaviorExamplePackAssembler] selected tool call id=${id} not found`);
+    return row;
 }
 // ── internal: case builder ─────────────────────────────────────────────────
 /**

package/dist/core/pd-config-loader.js

@@ -14,7 +14,7 @@
  */
 import * as fs from 'fs';
 import * as path from 'path';
-import yaml from 'js-yaml';
+import * as yaml from 'js-yaml';
 import { validatePdConfig, computeEffectivePdConfig, computeFeatureFlagsFromConfig, INTERNAL_AGENT_NAMES, } from '@principles/core/runtime-v2';
 // ── Constants ────────────────────────────────────────────────────────────────
 export const PD_CONFIG_DIR = '.pd';

package/dist/core/trajectory-types.d.ts

@@ -232,6 +232,10 @@ export interface RuleHostContextRow {
     readonly outcome: string;
     readonly paramsJson: string;
 }
+/** A single tool call selected by an Owner as labelled RuleHost evidence. */
+export interface RuleHostEvidenceRow extends RuleHostContextRow {
+    readonly sessionId: string;
+}
 /**
  * Result of getRuleHostContextRows: FIFO-ordered rows + truncated flag.
  * truncated=true when more than `limit` rows existed (limit+1 read trick).

package/dist/core/trajectory.d.ts

@@ -1,5 +1,5 @@
-import type { CorrectionSampleReviewStatus, CorrectionExportMode, TrajectoryDataStats, TrajectoryAssistantTurnInput, TrajectoryUserTurnInput, TrajectoryToolCallInput, TrajectoryPainEventInput, TrajectoryGateBlockInput, TrajectoryTrustChangeInput, TrajectoryPrincipleEventInput, TrajectoryTaskOutcomeInput, TrajectorySessionInput, EvolutionTaskInput, EvolutionEventInput, EvolutionTaskRecord, EvolutionEventRecord, EvolutionTaskFilters, AssistantTurnRecord, CorrectionSampleRecord, TrajectoryExportResult, TrajectoryDatabaseOptions, RuleHostContextResult } from './trajectory-types.js';
-export type { CorrectionSampleReviewStatus, CorrectionExportMode, TrajectoryDataStats, TrajectoryAssistantTurnInput, TrajectoryUserTurnInput, TrajectoryToolCallInput, TrajectoryPainEventInput, TrajectoryGateBlockInput, DailyMetricRow, TrajectoryTrustChangeInput, TrajectoryPrincipleEventInput, TrajectoryTaskOutcomeInput, TrajectorySessionInput, TaskKind, TaskPriority, EvolutionTaskInput, EvolutionEventInput, EvolutionTaskRecord, EvolutionEventRecord, EvolutionTaskFilters, AssistantTurnRecord, CorrectionSampleRecord, TrajectoryExportResult, TrajectoryDatabaseOptions, RuleHostContextRow, RuleHostContextResult, } from './trajectory-types.js';
+import type { CorrectionSampleReviewStatus, CorrectionExportMode, TrajectoryDataStats, TrajectoryAssistantTurnInput, TrajectoryUserTurnInput, TrajectoryToolCallInput, TrajectoryPainEventInput, TrajectoryGateBlockInput, TrajectoryTrustChangeInput, TrajectoryPrincipleEventInput, TrajectoryTaskOutcomeInput, TrajectorySessionInput, EvolutionTaskInput, EvolutionEventInput, EvolutionTaskRecord, EvolutionEventRecord, EvolutionTaskFilters, AssistantTurnRecord, CorrectionSampleRecord, TrajectoryExportResult, TrajectoryDatabaseOptions, RuleHostContextResult, RuleHostEvidenceRow } from './trajectory-types.js';
+export type { CorrectionSampleReviewStatus, CorrectionExportMode, TrajectoryDataStats, TrajectoryAssistantTurnInput, TrajectoryUserTurnInput, TrajectoryToolCallInput, TrajectoryPainEventInput, TrajectoryGateBlockInput, DailyMetricRow, TrajectoryTrustChangeInput, TrajectoryPrincipleEventInput, TrajectoryTaskOutcomeInput, TrajectorySessionInput, TaskKind, TaskPriority, EvolutionTaskInput, EvolutionEventInput, EvolutionTaskRecord, EvolutionEventRecord, EvolutionTaskFilters, AssistantTurnRecord, CorrectionSampleRecord, TrajectoryExportResult, TrajectoryDatabaseOptions, RuleHostContextRow, RuleHostContextResult, RuleHostEvidenceRow, } from './trajectory-types.js';
 /**
  * Initialize trajectory.db schema at the given workspace directory.
  *
@@ -130,6 +130,10 @@ export declare class TrajectoryDatabase {
      * Spec: §5.1, §5.2. ERR-026: reuses production schema (no hand-written DDL).
      */
     getRuleHostContextRows(sessionId: string, limit?: number): RuleHostContextResult;
+    /** Resolve one Owner-selected tool call without inferring its desired label. */
+    getRuleHostEvidenceRow(id: number): RuleHostEvidenceRow | null;
+    /** Return FIFO history strictly before an Owner-selected tool call. */
+    getRuleHostContextRowsBefore(sessionId: string, beforeId: number, limit?: number): RuleHostContextResult;
     /**
      * List pain events for a session.
      *

package/dist/core/trajectory.js

@@ -961,6 +961,47 @@ export class TrajectoryDatabase {
             truncated,
         };
     }
+    /** Resolve one Owner-selected tool call without inferring its desired label. */
+    getRuleHostEvidenceRow(id) {
+        const row = this.db.prepare(`
+      SELECT id, session_id, tool_name, outcome, params_json
+      FROM tool_calls
+      WHERE id = ?
+      LIMIT 1
+    `).get(id);
+        if (!isStringRecord(row))
+            return null;
+        if (typeof row.id !== 'number' || typeof row.session_id !== 'string')
+            return null;
+        if (typeof row.tool_name !== 'string' || typeof row.outcome !== 'string' || typeof row.params_json !== 'string')
+            return null;
+        return {
+            id: row.id,
+            sessionId: row.session_id,
+            toolName: row.tool_name,
+            outcome: row.outcome,
+            paramsJson: row.params_json,
+        };
+    }
+    /** Return FIFO history strictly before an Owner-selected tool call. */
+    getRuleHostContextRowsBefore(sessionId, beforeId, limit = 20) {
+        const cappedLimit = Math.max(1, Math.floor(limit));
+        const rows = this.db.prepare(`
+      SELECT id, tool_name, outcome, params_json
+      FROM tool_calls
+      WHERE session_id = ? AND id < ?
+      ORDER BY id DESC
+      LIMIT ?
+    `).all(sessionId, beforeId, cappedLimit + 1);
+        const truncated = rows.length > cappedLimit;
+        const output = (truncated ? rows.slice(0, cappedLimit) : rows).reverse();
+        return {
+            rows: output.map((row) => ({
+                id: Number(row.id), toolName: String(row.tool_name), outcome: String(row.outcome), paramsJson: String(row.params_json),
+            })),
+            truncated,
+        };
+    }
     /**
      * List pain events for a session.
      *

package/dist/core/workflow-funnel-loader.js

@@ -9,7 +9,7 @@
  */
 import * as fs from 'fs';
 import * as path from 'path';
-import yaml from 'js-yaml';
+import * as yaml from 'js-yaml';
 // ─────────────────────────────────────────────────────────────────────────────
 // WorkflowFunnelLoader
 // ─────────────────────────────────────────────────────────────────────────────
@@ -33,7 +33,7 @@ export class WorkflowFunnelLoader {
         }
         try {
             const content = fs.readFileSync(this.configPath, 'utf-8');
-            const config = yaml.load(content, { schema: yaml.DEFAULT_SCHEMA });
+            const config = yaml.load(content, { schema: yaml.CORE_SCHEMA });
             if (!config || typeof config.version !== 'string' || !Array.isArray(config.funnels)) {
                 const msg = 'workflows.yaml validation failed: missing version or funnels array. Preserving last valid config.';
                 console.warn(`[WorkflowFunnelLoader] ${msg}`);

package/dist/hooks/gate.js

@@ -30,7 +30,13 @@ export function handleBeforeToolCall(event, ctx) {
     const wctx = WorkspaceContext.fromHookContext(ctx);
     // 2. Use the same action builder as Golden Trace replay. This is the single
     // path extraction + normalization contract for production and evaluation.
-    const action = buildRuleHostAction(event.toolName, event.params ?? {}, ctx.workspaceDir, {
+    // CodeRabbit PR2 Comment 1: pass the normalized workspace root from
+    // WorkspaceContext (wctx.workspaceDir) rather than the raw ctx.workspaceDir,
+    // so action.normalizedPath is consistent with the rest of the hook path
+    // (which uses WorkspaceContext.fromHookContext's normalized root). Mixing
+    // the raw value here produced paths that disagreed with the normalized root
+    // used downstream by the rule host / rule-context assembler.
+    const action = buildRuleHostAction(event.toolName, event.params ?? {}, wctx.workspaceDir, {
         isBashTool: isBash,
         isWriteTool,
     });

package/dist/rulehost-evidence.d.ts

@@ -0,0 +1,4 @@
+/** Side-effect-free public boundary for RuleHost evidence assembly. */
+export { BehaviorExamplePackAssembler } from './core/behavior-example-pack-assembler.js';
+export type { BehaviorExamplePackAssemblerInput, BehaviorExamplePackAssemblerOptions, } from './core/behavior-example-pack-assembler.js';
+export { TrajectoryRegistry as RuleHostEvidenceRegistry } from './core/trajectory.js';

package/dist/rulehost-evidence.js

@@ -0,0 +1,3 @@
+/** Side-effect-free public boundary for RuleHost evidence assembly. */
+export { BehaviorExamplePackAssembler } from './core/behavior-example-pack-assembler.js';
+export { TrajectoryRegistry as RuleHostEvidenceRegistry } from './core/trajectory.js';

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.168.0",
+  "version": "1.170.0",
   "activation": {
     "onCapabilities": [
       "hook"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "principles-disciple",
-  "version": "1.168.0",
+  "version": "1.170.0",
   "description": "Native OpenClaw plugin for Principles Disciple",
   "type": "module",
   "main": "./dist/index.js",
@@ -9,6 +9,10 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
+    },
+    "./rulehost-evidence": {
+      "types": "./dist/rulehost-evidence.d.ts",
+      "default": "./dist/rulehost-evidence.js"
     }
   },
   "repository": {
@@ -83,7 +87,7 @@
     "@sinclair/typebox": "^0.34.48",
     "better-sqlite3": "^12.9.0",
     "commander": "^12.0.0",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^5.2.0",
     "micromatch": "^4.0.8"
   }
 }