principles-disciple 1.20.0 → 1.22.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.20.0",
+  "version": "1.22.0",
   "skills": [
     "./skills"
   ],

package/package.json

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

package/src/commands/archive-impl.ts

@@ -126,7 +126,11 @@ function _handleArchiveImpl(
   updateImplementation(stateDir, implId, {
     archivedAt: new Date().toISOString(),
   });
-  refreshPrincipleLifecycle(workspaceDir, stateDir);
+  try {
+    refreshPrincipleLifecycle(workspaceDir, stateDir);
+  } catch (err) {
+    console.warn('[archive-impl] Lifecycle refresh failed:', err instanceof Error ? err.stack : err);
+  }
 
   return {
     text: isZh

package/src/commands/disable-impl.ts

@@ -109,7 +109,11 @@ function _handleDisableImpl(
     disabledBy: sessionId || 'manual',
     disabledReason: reasonText,
   });
-  refreshPrincipleLifecycle(workspaceDir, stateDir);
+  try {
+    refreshPrincipleLifecycle(workspaceDir, stateDir);
+  } catch (err) {
+    console.warn('[disable-impl] Lifecycle refresh failed:', err instanceof Error ? err.stack : err);
+  }
 
   return {
     text: isZh

package/src/commands/nocturnal-review.ts

@@ -22,6 +22,7 @@
  */
 
 import * as fs from 'fs';
+import * as path from 'path';
 import {
   listDatasetRecords,
   getDatasetRecord,
@@ -31,6 +32,7 @@ import {
   type NocturnalDatasetRecord,
   type NocturnalReviewStatus,
 } from '../core/nocturnal-dataset.js';
+import { getPrincipleState, setPrincipleState } from '../core/principle-training-state.js';
 import type { PluginCommandContext, PluginCommandResult } from '../openclaw-sdk.js';
 
 function isZh(ctx: PluginCommandContext): boolean {
@@ -194,6 +196,16 @@ export function handleNocturnalReviewCommand(ctx: PluginCommandContext): PluginC
 
       const updated = updateReviewStatus(workspaceDir, fingerprint, 'approved_for_training', reason);
 
+      // #251: Sync approvedSampleCount in training store
+      try {
+        const stateDir = path.join(workspaceDir, '.state');
+        const state = getPrincipleState(stateDir, updated.principleId);
+        state.approvedSampleCount += 1;
+        setPrincipleState(stateDir, state);
+      } catch (err) {
+        console.warn(`[nocturnal-review] Failed to sync approvedSampleCount for ${updated.principleId}:`, err instanceof Error ? err.stack : err);
+      }
+
       return {
         text: zh
           ? `样本已批准用于训练:\n  fingerprint: ${updated.sampleFingerprint.substring(0, 16)}...\n  principleId: ${updated.principleId}\n  targetModelFamily: ${updated.targetModelFamily ?? '(none)'}\n  reason: ${updated.reviewReason}`

package/src/commands/nocturnal-rollout.ts

@@ -56,6 +56,11 @@ import {
 import {
   getCheckpoint,
 } from '../core/model-training-registry.js';
+import {
+  runMergeGateAudit,
+  formatMergeGateAuditReport,
+} from '../core/merge-gate-audit.js';
+import { resolvePdPath } from '../core/paths.js';
 
 function isZh(ctx: PluginCommandContext): boolean {
   return String(ctx.config?.language || 'en').startsWith('zh');
@@ -257,6 +262,14 @@ ${result.passes
       return { text };
     }
 
+    // ── Merge-Gate Audit ──────────────────────────────────────────────────
+    if (subcommand === 'audit') {
+      const stateDir = resolvePdPath(workspaceDir, 'STATE_DIR');
+      const report = runMergeGateAudit(workspaceDir, stateDir);
+      const formatted = formatMergeGateAuditReport(report);
+      return { text: formatted };
+    }
+
     // ── Advance Promotion ─────────────────────────────────────────────────
     if (subcommand === 'advance-promotion') {
       const checkpointId = parts[1] || checkpointIdArg;
@@ -267,6 +280,28 @@ ${result.passes
       const profile = parseProfile(profileArg);
       const hasReview = args.includes('--review');
       const noteArg = parts.find((p) => p.startsWith('--note='))?.split('=')[1];
+      const skipAudit = args.includes('--skip-audit');
+
+      // ── Merge-gate auto-gate: block advance-promotion if audit is BLOCK ──
+      if (!skipAudit) {
+        const stateDir = resolvePdPath(workspaceDir, 'STATE_DIR');
+        const auditReport = runMergeGateAudit(workspaceDir, stateDir);
+        if (auditReport.overallStatus === 'block') {
+          return {
+            text: zh
+              ? `❌ Merge-Gate 审计阻止了晋升：发现 ${auditReport.counts.block} 个阻断项
+
+${formatMergeGateAuditReport(auditReport)}
+
+如需强制晋升，请添加 --skip-audit 标志。`
+              : `❌ Merge-Gate audit blocked promotion: ${auditReport.counts.block} blocking issue(s) found
+
+${formatMergeGateAuditReport(auditReport)}
+
+To force promotion, add --skip-audit flag.`,
+          };
+        }
+      }
 
       try {
         const promotion = advancePromotion(workspaceDir, {

package/src/commands/promote-impl.ts

@@ -172,7 +172,11 @@ function _handlePromoteImpl(options: PromoteImplOptions): PluginCommandResult {
       disabledBy: undefined,
       disabledReason: undefined,
     });
-    refreshPrincipleLifecycle(workspaceDir, stateDir);
+    try {
+      refreshPrincipleLifecycle(workspaceDir, stateDir);
+    } catch (err) {
+      console.warn('[promote-impl] Lifecycle refresh failed (re-enable):', err instanceof Error ? err.stack : err);
+    }
 
     output += isZh
       ? `\n✅ 实现已重新启用: ${implId}\n   状态: disabled -> active`
@@ -225,7 +229,11 @@ function _handlePromoteImpl(options: PromoteImplOptions): PluginCommandResult {
   withLock(eventPath, () => {
     fs.writeFileSync(eventPath, JSON.stringify(promotionEvent, null, 2), 'utf-8');
   });
-  refreshPrincipleLifecycle(workspaceDir, stateDir);
+  try {
+    refreshPrincipleLifecycle(workspaceDir, stateDir);
+  } catch (err) {
+    console.warn('[promote-impl] Lifecycle refresh failed (promotion):', err instanceof Error ? err.stack : err);
+  }
 
   output += isZh
     ? `\n\n✅ 实现已晋升: ${implId}\n   状态: candidate -> active`

package/src/commands/rollback-impl.ts

@@ -185,7 +185,11 @@ function _handleRollbackImpl(
   withLock(rollbackPath, () => {
     fs.writeFileSync(rollbackPath, JSON.stringify(rollbackRecord, null, 2), 'utf-8');
   });
-  refreshPrincipleLifecycle(workspaceDir, stateDir);
+  try {
+    refreshPrincipleLifecycle(workspaceDir, stateDir);
+  } catch (err) {
+    console.warn('[rollback-impl] Lifecycle refresh failed:', err instanceof Error ? err.stack : err);
+  }
 
   let output = isZh
     ? `\n\u2705 \u56de\u6eda\u5b8c\u6210: ${implId}\n   \u72b6\u6001: active -> disabled\n   \u539f\u56e0: ${reasonText}`

package/src/core/principle-internalization/internalization-routing-policy.ts

@@ -121,14 +121,14 @@ export function recommendInternalizationRoute(
     principle.summary.repeatedErrorSignal === 0;
 
   if (principle.rules.length === 0) {
-    reasonCodes.push('no_material_rules');
+    reasonCodes.push('insufficient_data', 'no_material_rules');
     return {
       principleId: principle.principle.id,
       route: 'defer',
-      confidence: 95,
+      confidence: 50,
       reasonCodes,
       evidenceSummary,
-      nextAction: 'Define at least one concrete rule before choosing an internalization route.',
+      nextAction: 'No rules defined for this principle. Create at least one rule via pain→principle→rule pipeline before internalization routing can produce meaningful recommendations.',
     };
   }
 

package/src/core/principle-internalization/lifecycle-metrics.ts

@@ -11,6 +11,8 @@ export interface RuleMetricResult {
 }
 
 export interface PrincipleAdherenceResult {
+  /** True when no rules exist — all numeric fields are defaults, not computed values */
+  insufficientData?: boolean;
   adherenceRate: number;
   averageRuleCoverage: number;
   averageFalsePositiveRate: number;
@@ -108,6 +110,7 @@ export function computePrincipleAdherence(
 
   if (principle.rules.length === 0) {
     return {
+      insufficientData: true,
       adherenceRate: 0,
       averageRuleCoverage: 0,
       averageFalsePositiveRate: 0,

package/src/service/nocturnal-service.ts

@@ -98,9 +98,24 @@ import {
 } from './nocturnal-runtime.js';
 import { NocturnalPathResolver } from '../core/nocturnal-paths.js';
 import { registerSample } from '../core/nocturnal-dataset.js';
+import { getPrincipleState, setPrincipleState } from '../core/principle-training-state.js';
 import type { Implementation } from '../types/principle-tree-schema.js';
 import { validateNocturnalSnapshotIngress } from '../core/nocturnal-snapshot-contract.js';
 
+// ---------------------------------------------------------------------------
+// #251: Sync trainingStore sample counts after registration
+// ---------------------------------------------------------------------------
+
+function incrementGeneratedSampleCount(stateDir: string, principleId: string): void {
+  try {
+    const state = getPrincipleState(stateDir, principleId);
+    state.generatedSampleCount += 1;
+    setPrincipleState(stateDir, state);
+  } catch (err) {
+    console.warn(`[nocturnal-service] Failed to sync generatedSampleCount for ${principleId}:`, err instanceof Error ? err.stack : err);
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
@@ -467,7 +482,11 @@ function persistCodeCandidate(
       implementationId,
       createdAt: now,
     });
-    refreshPrincipleLifecycle(workspaceDir, stateDir);
+    try {
+      refreshPrincipleLifecycle(workspaceDir, stateDir);
+    } catch (err) {
+      console.warn('[nocturnal-service] Lifecycle refresh failed after code candidate persistence:', err instanceof Error ? err.stack : err);
+    }
     return {
       status: 'persisted_candidate',
       ruleResolution: {
@@ -993,7 +1012,10 @@ export function executeNocturnalReflection(
   // Approved artifacts must enter the dataset registry so they can be reviewed
   // before export. Without this, new samples never appear in the review queue.
   try {
-    registerSample(workspaceDir, arbiterResult.artifact, persistedPath, null);
+    const regResult = registerSample(workspaceDir, arbiterResult.artifact, persistedPath, null);
+    if (regResult.isNew) {
+      incrementGeneratedSampleCount(stateDir, arbiterResult.artifact.principleId);
+    }
   } catch (err) {
     // Non-fatal: artifact is persisted, registry is secondary.
     // Log but don't fail the run.
@@ -1380,7 +1402,10 @@ async function executeNocturnalReflectionWithAdapter(
 
   // Step 8: Register in dataset lineage
   try {
-    registerSample(workspaceDir, arbiterResult.artifact, persistedPath, null);
+    const regResult = registerSample(workspaceDir, arbiterResult.artifact, persistedPath, null);
+    if (regResult.isNew) {
+      incrementGeneratedSampleCount(stateDir, arbiterResult.artifact.principleId);
+    }
   } catch (err) {
     console.warn(`[nocturnal-service] Failed to register sample in dataset registry: ${String(err)}`);
   }