principles-disciple 1.56.0 → 1.58.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.56.0",
+  "version": "1.58.0",
   "skills": [
     "./skills"
   ],

package/package.json

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

package/scripts/sync-plugin.mjs

@@ -17,7 +17,7 @@
  *   --help             Show help message
  */
 
-import { copyFileSync, cpSync, existsSync, rmSync, readFileSync, readFileSync as readFileSyncRaw, mkdirSync, writeFileSync, readdirSync } from 'fs';
+import { copyFileSync, cpSync, existsSync, lstatSync, rmSync, readFileSync, readFileSync as readFileSyncRaw, mkdirSync, writeFileSync, readdirSync } from 'fs';
 import { createHash } from 'crypto';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
@@ -80,7 +80,7 @@ function parseArgs() {
         skipBuild: false,
         skipDeps: false,
         force: false,
-        restart: false,
+        restart: true,
         dev: false,
         bump: false,
         help: false,
@@ -100,7 +100,8 @@ function parseArgs() {
                 args.skipDeps = true;
                 break;
             case '--restart':
-                args.restart = true;
+            case '--no-restart':
+                args.restart = !arg.startsWith('--no-');
                 break;
             case '--dev':
             case '-d':
@@ -145,7 +146,7 @@ Options:
   --lang <zh|en>     Language for skills (default: zh)
   --skip-build       Skip build step (use existing dist/)
   --skip-deps        Skip dependency installation
-  --restart          Automatically restart OpenClaw gateway after installation
+  --restart         Automatically restart OpenClaw gateway after installation (default: true, use --no-restart to skip)
   --dev, -d          Developer mode: --force + --restart + --bump + clean stale backups
   --bump, -b         Auto-bump patch version if there are uncommitted source changes
   --force, -f        Force overwrite without prompts
@@ -610,6 +611,58 @@ function syncItem(item) {
     }
 }
 
+/**
+ * Recursive directory copy (Windows-safe, no symlinks).
+ */
+function copyDir(src, dest) {
+    mkdirSync(dest, { recursive: true });
+    for (const entry of readdirSync(src)) {
+        const srcPath = join(src, entry);
+        const destPath = join(dest, entry);
+        if (lstatSync(srcPath).isDirectory()) {
+            copyDir(srcPath, destPath);
+        } else {
+            copyFileSync(srcPath, destPath);
+        }
+    }
+}
+
+/**
+ * Inject local workspace packages (monorepo) into node_modules before npm install.
+ * @principles/core is a workspace package, not published to npm — we must copy it
+ * from the monorepo's node_modules so npm install --production doesn't 404 it.
+ */
+function injectLocalWorkspacePackages() {
+    const monorepoModules = join(SOURCE_DIR, '..', '..', 'node_modules', '@principles', 'core');
+    const targetModules = join(INSTALL_DIR, 'node_modules', '@principles', 'core');
+
+    if (!existsSync(monorepoModules)) {
+        // Not in monorepo context (e.g., npm pack / CI tarball) — skip
+        return;
+    }
+
+    console.log('  📦 Injecting local workspace packages (@principles/core)...');
+    mkdirSync(dirname(targetModules), { recursive: true });
+    // cpSync creates symlinks on Windows for symlinked dirs — use cp -rL (dereference) via exec
+    let injected = false;
+    try {
+        execSync(`cp -rL "${monorepoModules}" "${targetModules}"`, { stdio: 'ignore' });
+        injected = true;
+    } catch {
+        // Fallback: manual copy via node (Windows-compatible)
+        try {
+            copyDir(monorepoModules, targetModules);
+            injected = true;
+        } catch (copyErr) {
+            console.warn('  ⚠️ Failed to inject @principles/core from monorepo: ' + copyErr.message);
+            console.warn('  ⚠️ npm install --production may fail if @principles/core is not published');
+        }
+    }
+    if (injected && !existsSync(targetModules)) {
+        console.warn('  ⚠️ Injection reported success but target not found: ' + targetModules);
+    }
+}
+
 /**
  * Install production dependencies in target.
  */
@@ -844,6 +897,7 @@ function main() {
     for (const item of SYNC_ITEMS) syncItem(item);
     syncSkills(args.lang);
 
+    injectLocalWorkspacePackages();
     installTargetDependencies();
 
     console.log('\n🔍 Verifying installed plugin can load native dependencies...');

package/src/core/evolution-logger.ts

@@ -260,7 +260,7 @@ export class EvolutionLogger {
   logCompleted(params: {
     traceId: string;
     taskId: string;
-    resolution: 'marker_detected' | 'auto_completed_timeout' | 'manual' | 'late_marker_principle_created' | 'late_marker_no_principle' | 'diagnostician_timeout';
+    resolution: 'marker_detected' | 'auto_completed_timeout' | 'manual' | 'late_marker_principle_created' | 'late_marker_no_principle' | 'diagnostician_timeout' | 'noise_classified' | 'duplicate' | 'serverDuplicate';
     durationMs?: number;
     principlesGenerated?: number;
   }): void {
@@ -271,6 +271,8 @@ export class EvolutionLogger {
       summary = `任务 ${params.taskId} 完成，已生成 ${params.principlesGenerated || 0} 条原则`;
     } else if (params.resolution === 'auto_completed_timeout' || params.resolution === 'diagnostician_timeout' || params.resolution === 'late_marker_no_principle') {
       summary = `任务 ${params.taskId} 超时自动完成`;
+    } else if (params.resolution === 'noise_classified' || params.resolution === 'duplicate' || params.resolution === 'serverDuplicate') {
+      summary = `任务 ${params.taskId} 分类为噪音/重复，已过滤`;
     } else {
       summary = `任务 ${params.taskId} 已完成`;
     }

package/src/service/evolution-worker.ts

@@ -921,6 +921,7 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
             if (fs.existsSync(completeMarker)) {
                 if (logger) logger.info(`[PD:EvolutionWorker] Task ${task.id} completed - marker file detected`);
 
+                let principlesGenerated = 0;
                 // Create principle from the diagnostician's JSON report.
                 const reportPath = path.join(wctx.stateDir, `.diagnostician_report_${task.id}.json`);
                 if (fs.existsSync(reportPath)) {
@@ -1021,6 +1022,7 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                                     });
                                     if (principleId) {
                                         logger.info(`[PD:EvolutionWorker] Created principle ${principleId} from marker fallback for task ${task.id}`);
+                                        principlesGenerated = 1;
                                     } else {
                                         logger.warn(`[PD:EvolutionWorker] createPrincipleFromDiagnosis returned null for task ${task.id} (may be duplicate or blacklisted)`);
                                     }
@@ -1042,7 +1044,8 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
 
                 task.status = 'completed';
                 task.completed_at = new Date().toISOString();
-                task.resolution = 'marker_detected';
+                // resolution already set by each branch (noise_classified | marker_detected)
+                if (!task.resolution) task.resolution = 'marker_detected';
                 try {
                     fs.unlinkSync(completeMarker);
                 } catch { /* marker may have been deleted already, not critical */ }
@@ -1063,8 +1066,9 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                 evoLogger.logCompleted({
                     traceId: task.traceId || task.id,
                     taskId: task.id,
-                    resolution: 'marker_detected',
+                    resolution: task.resolution as 'marker_detected' | 'auto_completed_timeout' | 'manual' | 'late_marker_principle_created' | 'late_marker_no_principle' | 'diagnostician_timeout',
                     durationMs,
+                    principlesGenerated,
                 });
 
                 // Record task completion in event stats
@@ -1078,14 +1082,14 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                 wctx.trajectory?.updateEvolutionTask?.(task.id, {
                     status: 'completed',
                     completedAt: task.completed_at,
-                    resolution: 'marker_detected',
+                    resolution: task.resolution as 'marker_detected' | 'auto_completed_timeout' | 'manual' | 'late_marker_principle_created' | 'late_marker_no_principle' | 'diagnostician_timeout',
                 });
 
                 wctx.trajectory?.recordTaskOutcome({
                     sessionId: task.assigned_session_key || 'heartbeat:diagnostician',
                     taskId: task.id,
                     outcome: 'ok',
-                    summary: `Task ${task.id} completed - marker file detected.`
+                    summary: `Task ${task.id} completed — ${principlesGenerated} principle(s) generated (${task.resolution}).`
                 });
                 queueChanged = true;
                 continue;
@@ -1098,9 +1102,11 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                 const timeoutCompleteMarker = path.join(wctx.stateDir, `.evolution_complete_${task.id}`);
                 const timeoutReportPath = path.join(wctx.stateDir, `.diagnostician_report_${task.id}.json`);
 
+                let principlesGenerated = 0;
+
+
                 if (fs.existsSync(timeoutCompleteMarker) && fs.existsSync(timeoutReportPath)) {
                     if (logger) logger.info(`[PD:EvolutionWorker] Task ${task.id} timed out but marker found — creating principle anyway`);
-                    let principleCreated = false;
                     try {
                         const reportData = JSON.parse(fs.readFileSync(timeoutReportPath, 'utf8'));
                         const principle = reportData?.principle
@@ -1126,7 +1132,7 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                                     });
                                 if (principleId) {
                                     logger.info(`[PD:EvolutionWorker] Created principle ${principleId} from late marker for task ${task.id}`);
-                                    principleCreated = true;
+                                    principlesGenerated = 1;
                                 }
                             }
                         }
@@ -1139,7 +1145,7 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                         const lateReportPath = path.join(wctx.stateDir, `.diagnostician_report_${task.id}.json`);
                         if (fs.existsSync(lateReportPath)) fs.unlinkSync(lateReportPath);
                     } catch { /* report may not exist, not critical */ }
-                    task.resolution = principleCreated ? 'late_marker_principle_created' : 'late_marker_no_principle';
+                    task.resolution = principlesGenerated > 0 ? 'late_marker_principle_created' : 'late_marker_no_principle';
                 } else {
                     if (logger) logger.info(`[PD:EvolutionWorker] Task ${task.id} auto-completed after ${timeoutMinutes} minute timeout`);
                     // #190: Clean up diagnostician report file even on timeout (may have been written late)
@@ -1160,6 +1166,7 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                     taskId: task.id,
                     resolution: task.resolution,
                     durationMs: age,
+                    principlesGenerated,
                 });
 
                 // Record task completion in event stats (for timeout path too)
@@ -1180,7 +1187,7 @@ async function processEvolutionQueue(wctx: WorkspaceContext, logger: PluginLogge
                     sessionId: task.assigned_session_key || 'heartbeat:diagnostician',
                     taskId: task.id,
                     outcome: 'timeout',
-                    summary: `Task ${task.id} auto-completed after ${timeoutMinutes} minute timeout.`
+                    summary: `Task ${task.id} completed — ${principlesGenerated} principle(s) generated (${task.resolution}).`
                 });
                 queueChanged = true;
             }