principles-disciple 1.34.2 → 1.35.0

package/src/service/subagent-workflow/deep-reflect-workflow-manager.ts

@@ -13,11 +13,11 @@ import type { RuntimeDirectDriver } from './runtime-direct-driver.js';
 import { isSubagentRuntimeAvailable } from '../../utils/subagent-probe.js';
 import { buildCritiquePromptV2 } from '../../tools/critique-prompt.js';
 import { WorkflowManagerBase } from './workflow-manager-base.js';
+import { DEEP_REFLECT_TTL_MS } from '../../config/defaults/runtime.js';
 
 const WORKFLOW_SESSION_PREFIX = 'agent:main:subagent:workflow-';
 
 const DEFAULT_TIMEOUT_MS = 60_000; // Deep-reflect needs more time than empathy
-const DEFAULT_TTL_MS = 10 * 60 * 1000;
 
 export interface DeepReflectWorkflowOptions {
     workspaceDir: string;
@@ -37,7 +37,7 @@ export class DeepReflectWorkflowManager extends WorkflowManagerBase {
             workflowType: 'deep-reflect',
             sessionPrefix: WORKFLOW_SESSION_PREFIX,
             defaultTimeoutMs: DEFAULT_TIMEOUT_MS,
-            defaultTtlMs: DEFAULT_TTL_MS,
+            defaultTtlMs: DEEP_REFLECT_TTL_MS,
         });
     }
 
@@ -70,7 +70,7 @@ export class DeepReflectWorkflowManager extends WorkflowManagerBase {
     }
 
      
-    // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+     
     protected override generateWorkflowId(): string {
         return `wf_dr_${Date.now()}_${Math.random().toString(36).substring(2, 10)}`;
     }
@@ -98,7 +98,7 @@ export const deepReflectWorkflowSpec: SubagentWorkflowSpec<DeepReflectResult> =
     workflowType: 'deep-reflect',
     transport: 'runtime_direct',
     timeoutMs: 60_000,
-    ttlMs: 10 * 60 * 1000,
+    ttlMs: DEEP_REFLECT_TTL_MS,
     shouldDeleteSessionAfterFinalize: true,
 
     buildPrompt(taskInput: unknown, ctx: DeepReflectBuildPromptContext): string {

package/src/service/subagent-workflow/empathy-observer-workflow-manager.ts

@@ -14,11 +14,11 @@ import { trackFriction } from '../../core/session-tracker.js';
 import { isSubagentRuntimeAvailable } from '../../utils/subagent-probe.js';
 import { WorkflowManagerBase } from './workflow-manager-base.js';
 import { normalizeSeverity } from '../../core/empathy-types.js';
+import { WORKFLOW_TTL_MS } from '../../config/defaults/runtime.js';
 
 const WORKFLOW_SESSION_PREFIX = 'agent:main:subagent:workflow-';
 
 const DEFAULT_TIMEOUT_MS = 30_000;
-const DEFAULT_TTL_MS = 5 * 60 * 1000;
 
 export interface EmpathyObserverWorkflowOptions {
     workspaceDir: string;
@@ -38,7 +38,7 @@ export class EmpathyObserverWorkflowManager extends WorkflowManagerBase {
             workflowType: 'empathy-observer',
             sessionPrefix: WORKFLOW_SESSION_PREFIX,
             defaultTimeoutMs: DEFAULT_TIMEOUT_MS,
-            defaultTtlMs: DEFAULT_TTL_MS,
+            defaultTtlMs: WORKFLOW_TTL_MS,
         });
     }
 
@@ -71,7 +71,7 @@ export class EmpathyObserverWorkflowManager extends WorkflowManagerBase {
     }
 
      
-    // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+     
     protected override createWorkflowMetadata<TResult>(
         spec: SubagentWorkflowSpec<TResult>,
         options: {
@@ -105,7 +105,7 @@ export class EmpathyObserverWorkflowManager extends WorkflowManagerBase {
     }
 
      
-    // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+     
     protected override generateWorkflowId(): string {
         return `wf_${Date.now()}_${Math.random().toString(36).substring(2, 10)}`;
     }

package/src/service/subagent-workflow/nocturnal-workflow-manager.ts

@@ -36,7 +36,7 @@ import {
 } from '../nocturnal-service.js';
 import { type TrinityStageFailure, type TrinityResult } from '../../core/nocturnal-trinity.js';
 import type { TrinityRuntimeAdapter } from '../../core/nocturnal-trinity.js';
-import type { RecentPainContext } from '../evolution-worker.js';
+import type { RecentPainContext } from './types.js';
 import * as fs from 'fs';
 import * as path from 'path';
 import { validateNocturnalSnapshotIngress } from '../../core/nocturnal-snapshot-contract.js';
@@ -394,7 +394,7 @@ export class NocturnalWorkflowManager implements WorkflowManager {
     }
 
      
-    // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+     
     async notifyLifecycleEvent(
          
         _workflowId: string,

package/src/service/subagent-workflow/types.ts

@@ -11,6 +11,7 @@
 
 import type {
     NocturnalArtifact,
+    ArbiterResult,
 } from '../../core/nocturnal-arbiter.js';
 import type {
     BoundedAction,
@@ -18,12 +19,16 @@ import type {
 import type {
     NocturnalSessionSnapshot,
 } from '../../core/nocturnal-trajectory-extractor.js';
-import type {
-    NocturnalRunDiagnostics,
-} from '../nocturnal-service.js';
 import type {
     TrinityResult,
 } from '../../core/nocturnal-trinity.js';
+import type {
+    IdleCheckResult,
+    PreflightCheckResult,
+} from '../nocturnal-runtime.js';
+import type {
+    NocturnalSelectionResult,
+} from '../nocturnal-target-selector.js';
 
 // ── Workflow Transport ────────────────────────────────────────────────────────
 
@@ -366,6 +371,27 @@ export type { PluginLogger } from '../../openclaw-sdk.js';
 
 // ── Nocturnal Workflow Types ───────────────────────────────────────────────────
 
+/**
+ * Recent pain context for sleep_reflection tasks.
+ * Used by target selector for ranking bias and context enrichment.
+ * Originally from evolution-worker.ts, moved here to break circular dependency.
+ */
+export interface RecentPainContext {
+    /** Most recent unresolved pain event */
+    mostRecent: {
+        score: number;
+        source: string;
+        reason: string;
+        timestamp: string;
+        /** Session ID where the pain occurred */
+        sessionId: string;
+    } | null;
+    /** Count of pain events in the recent window (for signal strength) */
+    recentPainCount: number;
+    /** Highest pain score in the recent window */
+    recentMaxPainScore: number;
+}
+
 /**
  * Nocturnal workflow result type.
  * Mirrors NocturnalRunResult from nocturnal-service.ts (per D-02).
@@ -381,3 +407,43 @@ export type NocturnalResult = {
     diagnostics: NocturnalRunDiagnostics;
     trinityTelemetry?: TrinityResult['telemetry'];
 };
+
+/**
+ * Diagnostics from each pipeline stage.
+ * Duplicated from nocturnal-service.ts to break circular dependency.
+ */
+export interface NocturnalRunDiagnostics {
+    /** Pre-flight check result */
+    preflight: PreflightCheckResult | null;
+    /** Selection result */
+    selection: NocturnalSelectionResult | null;
+    /** Idle check result */
+    idle: IdleCheckResult | null;
+    /** Whether Trinity chain was attempted */
+    trinityAttempted: boolean;
+    /** Trinity result (if trinityAttempted === true) */
+    trinityResult: TrinityResult | null;
+    /** Which chain mode was used */
+    chainModeUsed: 'trinity' | 'single-reflector' | null;
+    /** Arbiter validation result */
+    arbiterResult: ArbiterResult | null;
+    /** Executability validation result (if arbiter passed) */
+    executabilityResult: { executable: boolean; failures: string[] } | null;
+    /** Whether artifact was persisted */
+    persisted: boolean;
+    /** Persistence path (if persisted) */
+    persistedPath?: string;
+    /** Code-candidate sidecar diagnostics */
+    artificer: NocturnalArtificerDiagnostics;
+}
+
+export interface NocturnalArtificerDiagnostics {
+    status: 'skipped' | 'validation_failed' | 'persisted_candidate';
+    reason?:
+        | 'behavioral_artifact_unavailable'
+        | 'no_deterministic_rule'
+        | 'persistence_failed'
+        | 'cancelled';
+    validationErrors?: string[];
+    persistedPath?: string;
+}

package/src/utils/shadow-fingerprint.ts

@@ -0,0 +1,42 @@
+/**
+ * Shadow Observation Fingerprint Utilities
+ *
+ * Computes fingerprints for shadow task routing and tracking.
+ */
+
+import * as crypto from 'crypto';
+import type { PluginHookSubagentSpawningEvent } from '../openclaw-sdk.js';
+
+/**
+ * PD local worker profiles that are managed by the shadow routing policy.
+ */
+const _pdLocalProfiles = new Set(['local-reader', 'local-editor']);
+export const PD_LOCAL_PROFILES: ReadonlySet<string> = _pdLocalProfiles;
+
+/**
+ * Check if a profile is a local PD profile.
+ */
+export function isLocalProfile(profile: string): boolean {
+  return _pdLocalProfiles.has(profile);
+}
+
+const RUNTIME_SHADOW_FINGERPRINT_HEX_LENGTH = 16;
+
+/**
+ * Compute a fingerprint for runtime shadow task tracking.
+ * Used to correlate shadow routing decisions with subagent lifecycle events.
+ */
+export function computeRuntimeShadowTaskFingerprint(
+  event: PluginHookSubagentSpawningEvent,
+): string {
+  const payload = {
+    childSessionKey: event.childSessionKey,
+    agentId: event.agentId,
+    label: event.label ?? '',
+    mode: event.mode,
+    threadRequested: event.threadRequested,
+    requesterChannel: event.requester?.channel ?? '',
+    requesterThreadId: event.requester?.threadId ?? '',
+  };
+  return crypto.createHash('sha256').update(JSON.stringify(payload)).digest('hex').slice(0, RUNTIME_SHADOW_FINGERPRINT_HEX_LENGTH);
+}

package/src/utils/workspace-resolver.ts

@@ -0,0 +1,54 @@
+/**
+ * Workspace Directory Resolution Utilities
+ *
+ * Shared helpers for resolving workspace directories across commands and hooks.
+ */
+
+import type { OpenClawPluginApi } from '../openclaw-sdk.js';
+import { validateWorkspaceDir, type WorkspaceResolutionContext } from '../core/workspace-dir-validation.js';
+import { resolveWorkspaceDir } from '../core/workspace-dir-service.js';
+import { resolveWorkspaceDirFromApi } from '../core/path-resolver.js';
+
+/**
+ * Resolve workspace directory for command execution.
+ *
+ * Chain: ctx.workspaceDir → resolveWorkspaceDirFromApi (official OpenClaw API + env vars)
+ *
+ * CRITICAL: Throws if workspaceDir cannot be resolved. Silent failures are dangerous
+ * because commands might operate on the wrong directory.
+ */
+export function resolveCommandWorkspaceDir(
+  api: OpenClawPluginApi,
+  ctx: { workspaceDir?: string },
+): string {
+  // 1. Direct from command context (most reliable — set by OpenClaw for current session)
+  if (ctx.workspaceDir) {
+    const issue = validateWorkspaceDir(ctx.workspaceDir);
+    if (!issue) return ctx.workspaceDir;
+    api.logger.error(`[PD:Command] ctx.workspaceDir="${ctx.workspaceDir}" is invalid: ${issue}`);
+  }
+
+  // 2. Official OpenClaw API → env vars → config file
+  const resolved = resolveWorkspaceDirFromApi(api);
+  if (resolved) return resolved;
+
+  // CRITICAL FAILURE: Cannot determine workspace directory
+  const errorMsg = `[PD:Command] CRITICAL: Cannot resolve workspace directory. ` +
+    `ctx.workspaceDir="${ctx.workspaceDir}" is invalid, and all fallbacks failed. ` +
+    `Commands will NOT execute to prevent data corruption.`;
+  api.logger.error(errorMsg);
+
+  throw new Error(errorMsg);
+}
+
+/**
+ * Resolve workspace directory for tool hook execution (safe version).
+ * Returns undefined instead of throwing if resolution fails.
+ */
+export function resolveToolHookWorkspaceDirSafe(
+  ctx: WorkspaceResolutionContext,
+  api: OpenClawPluginApi,
+  source: string,
+): string | undefined {
+  return resolveWorkspaceDir(api, ctx, { source });
+}

package/tests/core/workspace-dir-validation.test.ts

@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import * as os from 'os';
-import { validateWorkspaceDir, resolveValidWorkspaceDir, logWorkspaceDirHealth } from '../../src/core/workspace-dir-validation.js';
+import { validateWorkspaceDir, resolveValidWorkspaceDir, logWorkspaceDirHealth } from '../../src/core/workspace-dir-service.js';
 
 const homeDir = os.homedir();
 

package/tests/integration/tool-hooks-workspace-dir.e2e.test.ts

@@ -65,7 +65,7 @@ describe('E2E: Tool Hooks workspaceDir Resolution', () => {
 
   describe('Scenario 2: ctx.workspaceDir is undefined (current OpenClaw behavior)', () => {
     it('should fallback to agentId resolution', async () => {
-      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-validation.js');
+      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-service.js');
       
       const mockApi = createMockApi(testWorkspaceDir);
       const ctx = { 
@@ -80,7 +80,7 @@ describe('E2E: Tool Hooks workspaceDir Resolution', () => {
     });
 
     it('should refuse to guess a workspace when agentId is also undefined', async () => {
-      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-validation.js');
+      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-service.js');
       
       const mockApi = createMockApi(testWorkspaceDir);
       const ctx = { 
@@ -131,7 +131,7 @@ describe('E2E: Tool Hooks workspaceDir Resolution', () => {
 
   describe('Scenario 4: Invalid workspace candidates are rejected', () => {
     it('should return undefined when all workspace resolution candidates are invalid', async () => {
-      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-validation.js');
+      const { resolveValidWorkspaceDir } = await import('../../src/core/workspace-dir-service.js');
       
       const mockApi = createMockApi(os.homedir());
       mockApi.runtime.agent.resolveAgentWorkspaceDir.mockReturnValue(os.homedir());

package/vitest.config.ts

@@ -1,12 +1,41 @@
 import { defineConfig } from 'vitest/config';
 
+/**
+ * Vitest configuration with test layering
+ *
+ * LAYERS:
+ * - unit: Mock-based tests, no real DB (fast, parallel)
+ * - integration: Tests using real SQLite DB (requires threads pool)
+ *
+ * USAGE:
+ * - npm test              → run all tests
+ * - npm run test:unit     → run unit tests only (fast)
+ * - npm run test:integration → run integration tests only
+ *
+ * WHY threads pool?
+ * better-sqlite3 native handles don't clean up properly in fork subprocesses,
+ * causing teardown hangs. Threads pool handles this correctly.
+ */
+
+// Integration tests: use real SQLite database
+const integrationTests = [
+  'tests/core/control-ui-db.test.ts',
+  'tests/core/evolution-logger.test.ts',
+  'tests/core/nocturnal-e2e.test.ts',
+  'tests/core/nocturnal-trajectory-extractor.test.ts',
+  'tests/core/replay-engine.test.ts',
+  'tests/core/trajectory.test.ts',
+  'tests/integration/**/*.test.ts',
+  'tests/integration/**/*.test.tsx',
+  'tests/service/nocturnal-service-code-candidate.test.ts',
+  'tests/service/nocturnal-target-selector.test.ts',
+];
+
 export default defineConfig({
   test: {
     environment: 'node',
     include: ['tests/**/*.test.ts', 'tests/**/*.test.tsx'],
-    // vitest 4: pool: 'forks' 默认启用隔离，每个测试文件在独立进程中运行
-    pool: 'forks',
-    // 确保测试完成后进程能正常退出
+    pool: 'threads',
     teardownTimeout: 15000,
     coverage: {
       provider: 'v8',
@@ -18,6 +47,24 @@ export default defineConfig({
         branches: 60,
         statements: 70,
       },
-    }
-  }
-});
+    },
+    // Workspace projects for layered testing
+    projects: [
+      {
+        test: {
+          name: 'unit',
+          include: ['tests/**/*.test.ts', 'tests/**/*.test.tsx'],
+          exclude: integrationTests,
+          pool: 'threads',
+        },
+      },
+      {
+        test: {
+          name: 'integration',
+          include: integrationTests,
+          pool: 'threads',
+        },
+      },
+    ],
+  },
+});