principles-disciple 1.72.0 → 1.74.0

package/src/hooks/subagent.ts

@@ -1,11 +1,8 @@
 import type { PluginHookSubagentEndedEvent, PluginHookSubagentContext, PluginLogger, OpenClawPluginApi } from '../openclaw-sdk.js';
-import { buildPainFlag, writePainFlag } from '../core/pain.js';
 import { WorkspaceContext } from '../core/workspace-context.js';
 import { extractAgentIdFromSessionKey } from '../utils/session-key.js';
-// No longer needed — diagnostician runs via HEARTBEAT, not subagent
 import { recordEvolutionSuccess } from '../core/evolution-engine.js';
 import { WorkflowStore } from '../service/subagent-workflow/workflow-store.js';
-import { EmpathyObserverWorkflowManager } from '../service/subagent-workflow/empathy-observer-workflow-manager.js';
 import type { WorkflowManager } from '../service/subagent-workflow/types.js';
 
 /**
@@ -16,24 +13,8 @@ import type { WorkflowManager } from '../service/subagent-workflow/types.js';
  
 function createWorkflowManagerForType(
     workflowType: string,
-    workspaceDir: string,
-    logger: HookLogger,
-    subagent: NonNullable<OpenClawPluginApi['runtime']>['subagent'],
 ): WorkflowManager | null {
-    const loggerAdapter: PluginLogger = {
-        info: (m: string) => logger.info(String(m)),
-        warn: (m: string) => logger.warn(String(m)),
-        error: (m: string) => logger.error(String(m)),
-        debug: () => { /* no-op */ },
-    };
-
     switch (workflowType) {
-        case 'empathy-observer':
-            return new EmpathyObserverWorkflowManager({
-                workspaceDir,
-                logger: loggerAdapter,
-                subagent,
-            });
         default:
             return null;
     }
@@ -113,7 +94,7 @@ export async function handleSubagentEnded(
                 // triggers notifyWaitResult → finalizeOnce / terminal transition.
                 const subagentRuntime = ctx.api?.runtime?.subagent;
                 if (subagentRuntime) {
-                    const mgr = createWorkflowManagerForType(workflow.workflow_type, workspaceDir, logger, subagentRuntime);
+                    const mgr = createWorkflowManagerForType(workflow.workflow_type);
                     if (mgr) {
                         await mgr.notifyLifecycleEvent(workflow.workflow_id, 'subagent_ended', { outcome: mappedOutcome });
                         mgr.dispose();
@@ -146,15 +127,7 @@ export async function handleSubagentEnded(
         const score = scoreSettings.subagent_error_penalty;
         const reason = `Subagent session ${targetSessionKey} ended with error`;
 
-        writePainFlag(workspaceDir, buildPainFlag({
-            source: 'subagent_error',
-            score: String(score),
-            reason,
-            is_risky: true,
-            session_id: ctx.sessionId || '',
-            agent_id: ctx.agentId || extractAgentIdFromSessionKey(targetSessionKey) || '',
-        }));
-
+        // Emit pain via Runtime v2 chain (M8: no .pain_flag file)
         emitSubagentPainEvent(wctx, {
             source: `subagent_error`,
             reason,

package/src/i18n/commands.ts

@@ -37,10 +37,6 @@ export const commandDescriptions: Record<string, Record<SupportedLanguage, strin
     zh: '管理思维模型 [status|propose|audit]',
     en: 'Manage Thinking OS [status|propose|audit]'
   },
-  'pd-reflect': {
-    zh: '手动触发 Nocturnal 睡眠反射（跳过 idle 检测）',
-    en: 'Manually trigger Nocturnal sleep reflection (bypass idle check)'
-  },
   'pd-daily': {
     zh: '配置并发送进化日报',
     en: 'Configure and send daily evolution report'
@@ -78,17 +74,13 @@ export const commandDescriptions: Record<string, Record<SupportedLanguage, strin
     en: 'Rollback empathy event penalty <event-id>|last'
   },
   'pd-export': {
-    zh: '导出数据 [analytics|corrections --redacted|orpo --family=<model>|orpo-list]',
-    en: 'Export data [analytics|corrections --redacted|orpo --family=<model>|orpo-list]'
+    zh: '导出数据 [analytics|corrections --redacted]',
+    en: 'Export data [analytics|corrections --redacted]'
   },
   'pd-samples': {
     zh: '查看或审核纠错样本 [review approve|reject <sample-id> [note]]',
     en: 'List or review correction samples [review approve|reject <sample-id> [note]]'
   },
-  'pd-nocturnal-review': {
-    zh: '审核 nocturnal 数据集样本 [list|show|approve|reject|set-family|stats]',
-    en: 'Review nocturnal dataset samples [list|show|approve|reject|set-family|stats]'
-  }
 };
 
 /**

package/src/index.ts

@@ -1,5 +1,6 @@
 import type {
   OpenClawPluginApi,
+  PluginCommandContext,
   PluginHookBeforePromptBuildEvent,
   PluginHookAgentContext,
   PluginHookBeforePromptBuildResult,
@@ -31,22 +32,18 @@ import * as TrajectoryCollector from './hooks/trajectory-collector.js';
 import { handleInitStrategy, handleManageOkr } from './commands/strategy.js';
 import { handleBootstrapTools, handleResearchTools } from './commands/capabilities.js';
 import { handleThinkingOs } from './commands/thinking-os.js';
-import { handlePainCommand } from './commands/pain.js';
+import { handlePainCommand, handlePainReportCommand } from './commands/pain.js';
 import { handleContextCommand } from './commands/context.js';
 import { handleFocusCommand } from './commands/focus.js';
 import { handleRollbackCommand } from './commands/rollback.js';
 import { handlePromoteImplCommand } from './commands/promote-impl.js';
 import { handleDisableImplCommand } from './commands/disable-impl.js';
-import { handlePdReflect } from './commands/pd-reflect.js';
 import { handleArchiveImplCommand } from './commands/archive-impl.js';
 import { handleRollbackImplCommand } from './commands/rollback-impl.js';
 import { handleEvolutionStatusCommand } from './commands/evolution-status.js';
 import { handlePrincipleRollbackCommand } from './commands/principle-rollback.js';
 import { handleExportCommand } from './commands/export.js';
 import { handleSamplesCommand } from './commands/samples.js';
-import { handleNocturnalReviewCommand } from './commands/nocturnal-review.js';
-import { handleNocturnalTrainCommand } from './commands/nocturnal-train.js';
-import { handleNocturnalRolloutCommand } from './commands/nocturnal-rollout.js';
 import { handleWorkflowDebugCommand } from './commands/workflow-debug.js';
 import { EvolutionWorkerService } from './service/evolution-worker.js';
 import { TrajectoryService } from './service/trajectory-service.js';
@@ -55,22 +52,22 @@ import { CentralSyncService } from './service/central-sync-service.js';
 import { ensureWorkspaceTemplates } from './core/init.js';
 import { migrateDirectoryStructure } from './core/migration.js';
 import { SystemLogger } from './core/system-logger.js';
-import { createWritePainFlagTool } from './tools/write-pain-flag.js';
 import { PathResolver } from './core/path-resolver.js';
-import { createPrinciplesConsoleRoute } from './http/principles-console-route.js';
-import { extractAgentIdFromSessionKey } from './utils/session-key.js';
 import { resolveCommandWorkspaceDir, resolveToolHookWorkspaceDirSafe } from './utils/workspace-resolver.js';
 import { computeRuntimeShadowTaskFingerprint, PD_LOCAL_PROFILES } from './utils/shadow-fingerprint.js';
 import type { WorkerProfile } from './core/model-deployment-registry.js';
 import { validateWorkspaceDir } from './core/workspace-dir-validation.js';
 import { resolveWorkspaceDirFromApi } from './core/path-resolver.js';
-import { resolveRequiredWorkspaceDir } from './core/workspace-dir-service.js';
 
 // Track initialization to avoid repeated calls
 let workspaceInitialized = false;
 // Track started evolution workers — one per workspace
 const startedWorkspaces = new Set<string>();
 
+const HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION =
+  'verify gateway plugin activation and hook workspace binding; ' +
+  'migrate live hook workspace resolution to PD-owned canonical configuration before relying on config-based recovery';
+
 // Map from childSessionKey → shadowObservationId
 // Used to complete shadow observations when subagent ends
 const pendingShadowObservations = new Map<string, string>();
@@ -82,7 +79,6 @@ const plugin = {
   register(api: OpenClawPluginApi) {
     api.logger.info(`Principles Disciple Plugin registered. (Path: ${api.rootDir ?? '(unknown)'})`);
     PathResolver.setExtensionRoot(api.rootDir ?? '.');
-    api.registerHttpRoute(createPrinciplesConsoleRoute(api));
 
     // ── Startup Health Check: Verify workspaceDir resolution ──
     // Catches OpenClaw context bugs early (e.g., missing workspaceDir in tool hooks)
@@ -106,7 +102,16 @@ const plugin = {
       'before_prompt_build',
       async (event: PluginHookBeforePromptBuildEvent, ctx: PluginHookAgentContext): Promise<PluginHookBeforePromptBuildResult | void> => {
         const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'before_prompt_build');
-        if (!workspaceDir) return;
+        if (!workspaceDir) {
+          api.logger.error(
+            `[PD:before_prompt_build] workspaceDir resolution failed. ` +
+            `agentId=${ctx.agentId ?? '(missing)'} sessionId=${ctx.sessionId ?? '(missing)'} ` +
+            `sessionKey=${ctx.sessionKey ?? '(missing)'}. ` +
+            `Hook skipped — no mutation will occur. ` +
+            `NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+          );
+          return;
+        }
         try {
           if (!workspaceInitialized) {
             migrateDirectoryStructure(api, workspaceDir);
@@ -131,7 +136,7 @@ const plugin = {
             api.logger.info(`[PD] EvolutionWorker started for workspace: ${workspaceDir}`);
           }
 
-          const result = await handleBeforePromptBuild(event, { ...ctx, api, workspaceDir });
+          const result = await handleBeforePromptBuild(event, { ...ctx, api: api as Parameters<typeof handleBeforePromptBuild>[1]['api'], workspaceDir });
           
           // Record success
           WorkspaceContext.fromHookContext({ workspaceDir }).eventLog.recordHookExecution({
@@ -156,7 +161,16 @@ const plugin = {
       'before_tool_call',
       (event: PluginHookBeforeToolCallEvent, ctx: PluginHookToolContext): PluginHookBeforeToolCallResult | void => {
         const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'before_tool_call');
-        if (!workspaceDir) return;
+        if (!workspaceDir) {
+          api.logger.error(
+            `[PD:before_tool_call] workspaceDir resolution failed. ` +
+            `agentId=${ctx.agentId ?? '(missing)'} sessionId=${ctx.sessionId ?? '(missing)'} ` +
+            `sessionKey=${ctx.sessionKey ?? '(missing)'}. ` +
+            `Hook skipped — security gate bypassed. ` +
+            `NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+          );
+          return;
+        }
         try {
           const pluginConfig = api.pluginConfig ?? {};
           const {logger} = api;
@@ -182,7 +196,16 @@ const plugin = {
       'after_tool_call',
       (event: PluginHookAfterToolCallEvent, ctx: PluginHookToolContext): void => {
         const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'after_tool_call');
-        if (!workspaceDir) return;
+        if (!workspaceDir) {
+          api.logger.error(
+            `[PD:after_tool_call] workspaceDir resolution failed. ` +
+            `agentId=${ctx.agentId ?? '(missing)'} sessionId=${ctx.sessionId ?? '(missing)'} ` +
+            `sessionKey=${ctx.sessionKey ?? '(missing)'}. ` +
+            `Hook skipped — pain detection bypassed. ` +
+            `NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+          );
+          return;
+        }
         try {
           const pluginConfig = api.pluginConfig ?? {};
           // Pass api separately to handleAfterToolCall to maintain type safety
@@ -205,8 +228,17 @@ const plugin = {
     api.on(
       'llm_output',
       (event: PluginHookLlmOutputEvent, ctx: PluginHookAgentContext): void => {
-        const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx as unknown as Record<string, unknown>, api, 'llm_output');
-        if (!workspaceDir) return;
+        const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'llm_output');
+        if (!workspaceDir) {
+          api.logger.error(
+            `[PD:llm_output] workspaceDir resolution failed. ` +
+            `agentId=${ctx.agentId ?? '(missing)'} ` +
+            `sessionId=${ctx.sessionId ?? '(missing)'}. ` +
+            `Hook skipped — LLM analysis bypassed. ` +
+            `NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+          );
+          return;
+        }
         try {
           handleLlmOutput(event, { ...ctx, workspaceDir });
 
@@ -245,7 +277,7 @@ const plugin = {
       'llm_output',
       (event: PluginHookLlmOutputEvent, ctx: PluginHookAgentContext): void => {
         try {
-          const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx as unknown as Record<string, unknown>, api, 'trajectory.llm_output');
+          const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'trajectory.llm_output');
           if (!workspaceDir) return;
           TrajectoryCollector.handleLlmOutput(event, { ...ctx, workspaceDir });
           // eslint-disable-next-line @typescript-eslint/no-unused-vars -- Reason: catch binding intentionally unused
@@ -341,19 +373,40 @@ const plugin = {
     // ── Hook: Lifecycle ──
     api.on('before_reset', (event: PluginHookBeforeResetEvent, ctx: PluginHookAgentContext) => {
       const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'before_reset');
-      if (!workspaceDir) return;
+      if (!workspaceDir) {
+        api.logger.error(
+          `[PD:before_reset] workspaceDir resolution failed. ` +
+          `agentId=${ctx.agentId ?? '(missing)'} sessionId=${ctx.sessionId ?? '(missing)'}. ` +
+          `Hook skipped. NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+        );
+        return;
+      }
       return handleBeforeReset(event, { ...ctx, workspaceDir });
     });
     
     api.on('before_compaction', (event: PluginHookBeforeCompactionEvent, ctx: PluginHookAgentContext) => {
       const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'before_compaction');
-      if (!workspaceDir) return;
+      if (!workspaceDir) {
+        api.logger.error(
+          `[PD:before_compaction] workspaceDir resolution failed. ` +
+          `agentId=${ctx.agentId ?? '(missing)'} sessionId=${ctx.sessionId ?? '(missing)'}. ` +
+          `Hook skipped. NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+        );
+        return;
+      }
       return handleBeforeCompaction(event, { ...ctx, workspaceDir });
     });
     
     api.on('after_compaction', (event: PluginHookAfterCompactionEvent, ctx: PluginHookAgentContext) => {
       const workspaceDir = resolveToolHookWorkspaceDirSafe(ctx, api, 'after_compaction');
-      if (!workspaceDir) return;
+      if (!workspaceDir) {
+        api.logger.error(
+          `[PD:after_compaction] workspaceDir resolution failed. ` +
+          `agentId=${ctx.agentId ?? '(missing)'} sessionId=${ctx.sessionId ?? '(missing)'}. ` +
+          `Hook skipped. NextAction: ${HOOK_WORKSPACE_RESOLUTION_NEXT_ACTION}`,
+        );
+        return;
+      }
       return handleAfterCompaction(event, { ...ctx, workspaceDir });
     });
 
@@ -399,17 +452,6 @@ const plugin = {
      
     registerCommandWithAlias('pd-thinking', 'pdt', getCommandDescription('pd-thinking', language), (ctx: any) => handleThinkingOs(ctx), { acceptsArgs: true });
      
-    registerCommandWithAlias('pd-reflect', 'pdrl', getCommandDescription('pd-reflect', language), (ctx: any) => {
-      try {
-        // Resolve agentId from sessionKey (if available), fallback to 'main'
-        const agentId = extractAgentIdFromSessionKey(ctx.sessionKey) ?? 'main';
-        const workspaceDir = resolveRequiredWorkspaceDir(api, { ...ctx, agentId }, { source: 'pd-reflect', fallbackAgentId: 'main' });
-        return handlePdReflect.handler({ ...ctx, api, workspaceDir });
-      } catch (err) {
-        api.logger.error(`[PD:pd-reflect] Command failed: ${String(err)}`);
-        return { text: language === 'zh' ? '命令执行失败，请查看日志。' : 'Command failed. Check logs.' };
-      }
-    });
     registerCommandWithAlias('pd-daily', 'pdd', getCommandDescription('pd-daily', language), () => ({
       text: language === 'zh'
         ? "请执行 pd-daily 技能来配置并发送进化日报。系统将引导你完成配置流程，包括发送时间、渠道和报告风格偏好。"
@@ -437,7 +479,6 @@ const plugin = {
 |--------|--------|------|
 | \`/pdk\` | \`/pd-okr\` | OKR 目标管理 |
 | \`/pdt\` | \`/pd-thinking\` | 思维模型管理 |
-| \`/pdrl\` | \`/pd-reflect\` | 手动触发反思 |
 | \`/pdd\` | \`/pd-daily\` | 进化日报 |
 | \`/pdg\` | \`/pd-grooming\` | 工作区清理 |
 
@@ -449,7 +490,6 @@ const plugin = {
 | \`/pd-focus\` | 焦点文件管理 |
 | \`/pd-export\` | 导出数据 |
 | \`/pd-samples\` | 审核纠错样本 |
-| \`/pd-nocturnal-review\` | 审核 nocturnal 样本 |
 | \`/pd-rollback\` | 回滚情绪事件惩罚 |
 | \`/pd-principle-rollback\` | 回滚原则 |
 | \`/pd-help\` | 显示本帮助 |
@@ -470,7 +510,6 @@ const plugin = {
 |-------|------|---------|
 | \`/pdk\` | \`/pd-okr\` | OKR goal management |
 | \`/pdt\` | \`/pd-thinking\` | Mental model management |
-| \`/pdrl\` | \`/pd-reflect\` | Manual reflection trigger |
 | \`/pdd\` | \`/pd-daily\` | Evolution report |
 | \`/pdg\` | \`/pd-grooming\` | Workspace cleanup |
 
@@ -482,7 +521,6 @@ const plugin = {
 | \`/pd-focus\` | Focus file management |
 | \`/pd-export\` | Export data |
 | \`/pd-samples\` | Review correction samples |
-| \`/pd-nocturnal-review\` | Review nocturnal samples |
 | \`/pd-rollback\` | Rollback empathy penalty |
 | \`/pd-principle-rollback\` | Rollback principle |
 | \`/pd-help\` | Show this help |
@@ -507,6 +545,25 @@ const plugin = {
       }
     });
 
+    api.registerCommand({
+      name: "pd-pain",
+      description: language === 'zh'
+        ? '从 OpenClaw 会话中报告 pain（context-bound provenance）'
+        : 'Report pain from OpenClaw session (context-bound provenance)',
+      acceptsArgs: true,
+      handler: async (ctx) => {
+        try {
+          const workspaceDir = resolveCommandWorkspaceDir(api, ctx);
+          ctx.workspaceDir = workspaceDir;
+          if (ctx.config) ctx.config.workspaceDir = workspaceDir;
+          return await handlePainReportCommand(ctx);
+        } catch (err) {
+          api.logger.error(`[PD] Command /pd-pain failed: ${String(err)}`);
+          return { text: language === 'zh' ? "命令执行失败，请检查日志。" : "Command failed. Check logs." };
+        }
+      }
+    });
+
     api.registerCommand({
       name: "pd-context",
       description: getCommandDescription('pd-context', language),
@@ -620,54 +677,6 @@ const plugin = {
       }
     });
 
-    api.registerCommand({
-      name: "pd-nocturnal-review",
-      description: 'Review nocturnal dataset samples [list|show|approve|reject|set-family|stats]',
-      acceptsArgs: true,
-      handler: (ctx) => {
-        try {
-          const workspaceDir = resolveCommandWorkspaceDir(api, ctx);
-          if (ctx.config) ctx.config.workspaceDir = workspaceDir;
-          return handleNocturnalReviewCommand(ctx);
-        } catch (err) {
-          api.logger.error(`[PD] Command /pd-nocturnal-review failed: ${String(err)}`);
-          return { text: language === 'zh' ? "Nocturnal review 命令执行失败，请检查日志。" : "Nocturnal review command failed. Check logs." };
-        }
-      }
-    });
-
-    api.registerCommand({
-      name: "nocturnal-train",
-      description: 'Nocturnal training operations [create-experiment|show-experiment|import-result|attach-eval|show-lineage|list-experiments|list-checkpoints|stats]',
-      acceptsArgs: true,
-      handler: (ctx) => {
-        try {
-          const workspaceDir = resolveCommandWorkspaceDir(api, ctx);
-          if (ctx.config) ctx.config.workspaceDir = workspaceDir;
-          return handleNocturnalTrainCommand(ctx);
-        } catch (err) {
-          api.logger.error(`[PD] Command /nocturnal-train failed: ${String(err)}`);
-          return { text: language === 'zh' ? "Nocturnal train 命令执行失败，请检查日志。" : "Nocturnal train command failed. Check logs." };
-        }
-      }
-    });
-
-    api.registerCommand({
-      name: "nocturnal-rollout",
-      description: 'Nocturnal rollout and promotion [evaluate-promotion|advance-promotion|bind|enable-routing|disable-routing|rollback|status|show-promotion]',
-      acceptsArgs: true,
-      handler: (ctx) => {
-        try {
-          const workspaceDir = resolveCommandWorkspaceDir(api, ctx);
-          if (ctx.config) ctx.config.workspaceDir = workspaceDir;
-          return handleNocturnalRolloutCommand(ctx);
-        } catch (err) {
-          api.logger.error(`[PD] Command /nocturnal-rollout failed: ${String(err)}`);
-          return { text: language === 'zh' ? "Nocturnal rollout 命令执行失败，请检查日志。" : "Nocturnal rollout command failed. Check logs." };
-        }
-      }
-    });
-
     api.registerCommand({
       name: "pd-workflow-debug",
       description: 'Debug helper workflow state and events [workflowId]',
@@ -676,7 +685,7 @@ const plugin = {
         try {
           const workspaceDir = resolveCommandWorkspaceDir(api, ctx);
           if (ctx.config) ctx.config.workspaceDir = workspaceDir;
-          return handleWorkflowDebugCommand(ctx);
+          return handleWorkflowDebugCommand(ctx as PluginCommandContext & { args?: string });
         } catch (err) {
           api.logger.error(`[PD] Command /pd-workflow-debug failed: ${String(err)}`);
           return { text: `Workflow debug command failed: ${String(err)}` };
@@ -749,8 +758,9 @@ const plugin = {
       }
     });
 
-    api.registerTool(createWritePainFlagTool(api));
   }
 };
 
+export { PrincipleTreeLedgerAdapter } from './core/principle-tree-ledger-adapter.js';
+
 export default plugin;