create-principles-disciple 1.93.0 → 1.94.0

package/pd-cli/dist/services/rulehost-readiness.js

@@ -0,0 +1,214 @@
+/**
+ * RuleHost Readiness Resolver — PRI-461
+ *
+ * Checks all preconditions for `run-rulehost` BEFORE constructing adapters,
+ * returning one of three user-visible statuses:
+ *   - `ready`: all agents enabled with pi-ai profiles and API keys; code-rule capability ON
+ *   - `text_principle_only`: dreamer/philosopher/scribe ready, but code-rule capability OFF
+ *     (flag disabled, or artificer/evaluator not ready)
+ *   - `refused`: dreamer/philosopher/scribe chain broken (disabled, wrong profile, missing API key,
+ *     or config malformed)
+ *
+ * This module NEVER throws. It always returns a structured result with reason + nextAction,
+ * so the CLI handler can emit a clear status instead of an opaque adapter-resolution failure.
+ *
+ * ERR refs:
+ *   - EP-02 / ERR-024, ERR-025: wired into the production handler path (runtime-internalization-run-rulehost.ts)
+ *   - EP-03: refused/text_principle_only include reason + nextAction
+ *   - EP-07: uses the same config source as the pipeline (resolveRuntimeFromPdConfig)
+ *   - EP-09: tests cover the default installed config pattern
+ */
+import { resolveAgentRuntimeBinding, checkAgentRuntimeReadiness, computeFeatureFlagsFromConfig, isFeatureEnabled, } from '@principles/core/runtime-v2';
+import { resolveRuntimeFromPdConfig } from './resolve-runtime-from-pd-config.js';
+// ── Constants ─────────────────────────────────────────────────────────────────
+/**
+ * Agents required for the text-principle path (dreamer → philosopher → scribe).
+ * If any of these is not ready, the pipeline cannot produce even text principles.
+ */
+const REQUIRED_AGENTS = ['dreamer', 'philosopher', 'scribe'];
+/**
+ * Agents required for the code-rule capability (artificer + evaluator).
+ * Both must be ready for the adversarial loop to run.
+ */
+const CODE_RULE_AGENTS = ['artificer', 'evaluator'];
+// ── Implementation ────────────────────────────────────────────────────────────
+/**
+ * Check a single agent's readiness for the RuleHost pipeline.
+ *
+ * Checks (in order):
+ *   1. Agent enabled (via resolveAgentRuntimeBinding)
+ *   2. Profile exists (via resolveAgentRuntimeBinding)
+ *   3. Profile type is 'pi-ai' (RuleHost needs PiAiRuntimeAdapter)
+ *   4. Profile is ready (via checkAgentRuntimeReadiness — provider/model/apiKeyEnv set, env var exists)
+ *
+ * Returns a structured AgentReadiness result. Never throws.
+ */
+function checkAgentReadiness(effective, agentName, getEnvVar) {
+    const binding = resolveAgentRuntimeBinding(effective, agentName);
+    if (!binding.ok) {
+        return {
+            status: binding.readiness === 'disabled' ? 'disabled' : binding.readiness === 'needs_setup' ? 'needs_setup' : 'not_ready',
+            reason: binding.reason,
+            nextAction: binding.nextAction,
+        };
+    }
+    const profile = binding.profile;
+    const profileType = profile.type;
+    // RuleHost pipeline constructs PiAiRuntimeAdapter instances, so the profile
+    // must be pi-ai. OpenClaw profiles delegate to OpenClaw's own runtime, which
+    // is not available in the RuleHost pipeline context.
+    if (profileType !== 'pi-ai') {
+        return {
+            status: 'wrong_profile_type',
+            reason: `Agent '${agentName}' uses profile '${binding.profileId}' with type '${profileType}', but RuleHost requires pi-ai profile type`,
+            nextAction: `Add a pi-ai runtime profile to .pd/config.yaml and assign it to ${agentName} via internalAgents.agents.${agentName}.runtimeProfile`,
+            profileId: binding.profileId,
+            profileType,
+        };
+    }
+    const readiness = checkAgentRuntimeReadiness(profile, getEnvVar);
+    if (readiness.readiness !== 'ready') {
+        return {
+            status: readiness.readiness === 'needs_setup' ? 'needs_setup' : 'not_ready',
+            reason: readiness.reason,
+            nextAction: readiness.nextAction,
+            profileId: binding.profileId,
+            profileType,
+        };
+    }
+    return {
+        status: 'ready',
+        profileId: binding.profileId,
+        profileType,
+    };
+}
+function emptyAgentStatuses() {
+    const empty = { status: 'not_ready', reason: 'not checked' };
+    return {
+        dreamer: empty,
+        philosopher: empty,
+        scribe: empty,
+        artificer: empty,
+        evaluator: empty,
+    };
+}
+function buildRefusedResult(reason, nextAction, parts) {
+    return {
+        status: 'refused',
+        reason,
+        nextAction,
+        agentStatuses: parts.agentStatuses,
+        codeRuleCapability: parts.codeRuleCapability,
+    };
+}
+function buildTextPrincipleOnlyResult(reason, nextAction, parts) {
+    return {
+        status: 'text_principle_only',
+        reason,
+        nextAction,
+        agentStatuses: parts.agentStatuses,
+        codeRuleCapability: parts.codeRuleCapability,
+    };
+}
+function resolveRuleHostReadinessUnchecked(workspaceDir, getEnvVar) {
+    // ── Step 1: Load config ──
+    const { configLoadResult } = resolveRuntimeFromPdConfig(workspaceDir, getEnvVar);
+    if (!configLoadResult.ok) {
+        const [firstError] = configLoadResult.errors;
+        const reason = `config_malformed: ${firstError?.reason ?? 'unknown config error'}`;
+        const nextAction = firstError?.nextAction ?? 'Fix .pd/config.yaml syntax and retry';
+        return buildRefusedResult(reason, nextAction, {
+            agentStatuses: emptyAgentStatuses(),
+            codeRuleCapability: { enabled: false, disabledReason: 'config_malformed' },
+        });
+    }
+    const { effective } = configLoadResult;
+    // ── Step 2: Check required agents (dreamer, philosopher, scribe) ──
+    // Start with all 5 keys set to 'not checked'; updated as each agent is checked.
+    const agentStatuses = emptyAgentStatuses();
+    const requiredFailures = [];
+    for (const agentName of REQUIRED_AGENTS) {
+        const readiness = checkAgentReadiness(effective, agentName, getEnvVar);
+        agentStatuses[agentName] = readiness;
+        if (readiness.status !== 'ready') {
+            requiredFailures.push(`${agentName}: ${readiness.reason ?? readiness.status}`);
+        }
+    }
+    if (requiredFailures.length > 0) {
+        const reason = `required_agents_not_ready: ${requiredFailures.join('; ')}`;
+        const nextAction = `Fix the following agent issues in .pd/config.yaml: ${requiredFailures.join('; ')}. RuleHost requires dreamer, philosopher, and scribe agents to be enabled with pi-ai runtime profiles and valid API keys.`;
+        return buildRefusedResult(reason, nextAction, {
+            agentStatuses,
+            codeRuleCapability: { enabled: false, disabledReason: 'required_agents_not_ready' },
+        });
+    }
+    // ── Step 3: Check code_rule_capability feature flag ──
+    const featureFlags = computeFeatureFlagsFromConfig(effective);
+    if (!isFeatureEnabled(featureFlags, 'code_rule_capability')) {
+        const reason = 'code_rule_capability feature flag is disabled';
+        const nextAction = "Enable code_rule_capability in .pd/config.yaml features.code_rule_capability.enabled to run the full adversarial pipeline. Text-principle-only mode is available.";
+        // Still check artificer/evaluator for reporting, but they don't affect the status
+        for (const agentName of CODE_RULE_AGENTS) {
+            agentStatuses[agentName] = checkAgentReadiness(effective, agentName, getEnvVar);
+        }
+        return buildTextPrincipleOnlyResult(reason, nextAction, {
+            agentStatuses,
+            codeRuleCapability: { enabled: false, disabledReason: reason },
+        });
+    }
+    // ── Step 4: Check code-rule agents (artificer, evaluator) ──
+    const codeRuleFailures = [];
+    for (const agentName of CODE_RULE_AGENTS) {
+        const readiness = checkAgentReadiness(effective, agentName, getEnvVar);
+        agentStatuses[agentName] = readiness;
+        if (readiness.status !== 'ready') {
+            codeRuleFailures.push(`${agentName}: ${readiness.reason ?? readiness.status}`);
+        }
+    }
+    if (codeRuleFailures.length > 0) {
+        const reason = `code_rule_agents_not_ready: ${codeRuleFailures.join('; ')}`;
+        const nextAction = `Fix the following agent issues to enable code-rule capability: ${codeRuleFailures.join('; ')}. Text-principle-only mode is available with the current configuration.`;
+        return buildTextPrincipleOnlyResult(reason, nextAction, {
+            agentStatuses,
+            codeRuleCapability: { enabled: false, disabledReason: reason },
+        });
+    }
+    // ── Step 5: All checks pass → ready ──
+    return {
+        status: 'ready',
+        reason: 'All agents ready with pi-ai profiles and valid API keys. Code-rule capability is ON.',
+        nextAction: 'Pass --confirm to run the full pipeline.',
+        agentStatuses,
+        codeRuleCapability: { enabled: true },
+    };
+}
+/**
+ * Resolve RuleHost readiness from the workspace's .pd/config.yaml.
+ *
+ * This is the production entry point called by the `run-rulehost` handler
+ * BEFORE constructing any adapters. It returns a structured result so the
+ * handler can emit a clear status instead of an opaque adapter-resolution failure.
+ *
+ * This function NEVER throws. Any unexpected exception from config loading,
+ * feature-flag computation, agent checks, or getEnvVar is caught and converted
+ * to a `refused` result with reason + nextAction (Runtime Contract #9).
+ *
+ * @param workspaceDir - The workspace directory containing .pd/config.yaml
+ * @param getEnvVar - Env var accessor, defaults to process.env. Injected for testability.
+ * @returns Structured readiness result. Never throws.
+ */
+export function resolveRuleHostReadiness(workspaceDir, getEnvVar = (name) => process.env[name]) {
+    try {
+        return resolveRuleHostReadinessUnchecked(workspaceDir, getEnvVar);
+    }
+    catch (error) {
+        const message = error instanceof Error && error.message.length > 0
+            ? error.message
+            : 'unknown readiness resolution error';
+        return buildRefusedResult(`readiness_resolution_failed: ${message}`, 'Fix the readiness resolution error and retry. Run `pd config doctor` for diagnostics.', {
+            agentStatuses: emptyAgentStatuses(),
+            codeRuleCapability: { enabled: false, disabledReason: 'readiness_resolution_failed' },
+        });
+    }
+}
+//# sourceMappingURL=rulehost-readiness.js.map

package/pd-cli/dist/services/rulehost-readiness.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rulehost-readiness.js","sourceRoot":"","sources":["../../src/services/rulehost-readiness.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC1B,6BAA6B,EAC7B,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAmDjF,iFAAiF;AAEjF;;;GAGG;AACH,MAAM,eAAe,GAAiC,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;AAE3F;;;GAGG;AACH,MAAM,gBAAgB,GAAiC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAElF,iFAAiF;AAEjF;;;;;;;;;;GAUG;AACH,SAAS,mBAAmB,CAC1B,SAA4B,EAC5B,SAA4B,EAC5B,SAA+C;IAE/C,MAAM,OAAO,GAAG,0BAA0B,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAEjE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QAChB,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;YACzH,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAmB,OAAO,CAAC,OAAO,CAAC;IAChD,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjC,4EAA4E;IAC5E,6EAA6E;IAC7E,qDAAqD;IACrD,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QAC5B,OAAO;YACL,MAAM,EAAE,oBAAoB;YAC5B,MAAM,EAAE,UAAU,SAAS,mBAAmB,OAAO,CAAC,SAAS,gBAAgB,WAAW,6CAA6C;YACvI,UAAU,EAAE,mEAAmE,SAAS,8BAA8B,SAAS,iBAAiB;YAChJ,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW;SACZ,CAAC;IACJ,CAAC;IAED,MAAM,SAAS,GAAG,0BAA0B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACjE,IAAI,SAAS,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;QACpC,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,SAAS,KAAK,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW;YAC3E,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,WAAW;SACZ,CAAC;IACJ,CAAC;IAED,OAAO;QACL,MAAM,EAAE,OAAO;QACf,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW;KACZ,CAAC;AACJ,CAAC;AASD,SAAS,kBAAkB;IACzB,MAAM,KAAK,GAAmB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IAC7E,OAAO;QACL,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,KAAK;QAClB,MAAM,EAAE,KAAK;QACb,SAAS,EAAE,KAAK;QAChB,SAAS,EAAE,KAAK;KACjB,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,MAAc,EACd,UAAkB,EAClB,KAA2B;IAE3B,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,MAAM;QACN,UAAU;QACV,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;KAC7C,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,MAAc,EACd,UAAkB,EAClB,KAA2B;IAE3B,OAAO;QACL,MAAM,EAAE,qBAAqB;QAC7B,MAAM;QACN,UAAU;QACV,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;KAC7C,CAAC;AACJ,CAAC;AAED,SAAS,iCAAiC,CACxC,YAAoB,EACpB,SAA+C;IAE/C,4BAA4B;IAC5B,MAAM,EAAE,gBAAgB,EAAE,GAAG,0BAA0B,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAEjF,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC;QACzB,MAAM,CAAC,UAAU,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC;QAC7C,MAAM,MAAM,GAAG,qBAAqB,UAAU,EAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;QACnF,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,sCAAsC,CAAC;QACpF,OAAO,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE;YAC5C,aAAa,EAAE,kBAAkB,EAAE;YACnC,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAC3E,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC;IAEvC,qEAAqE;IACrE,gFAAgF;IAChF,MAAM,aAAa,GAAqB,kBAAkB,EAAE,CAAC;IAC7D,MAAM,gBAAgB,GAAa,EAAE,CAAC;IAEtC,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACvE,aAAa,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;QACrC,IAAI,SAAS,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACjC,gBAAgB,CAAC,IAAI,CAAC,GAAG,SAAS,KAAK,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,8BAA8B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3E,MAAM,UAAU,GAAG,sDAAsD,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,2HAA2H,CAAC;QAChO,OAAO,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE;YAC5C,aAAa;YACb,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,2BAA2B,EAAE;SACpF,CAAC,CAAC;IACL,CAAC;IAED,wDAAwD;IACxD,MAAM,YAAY,GAAG,6BAA6B,CAAC,SAAS,CAAC,CAAC;IAC9D,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,sBAAsB,CAAC,EAAE,CAAC;QAC5D,MAAM,MAAM,GAAG,+CAA+C,CAAC;QAC/D,MAAM,UAAU,GAAG,mKAAmK,CAAC;QACvL,kFAAkF;QAClF,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,aAAa,CAAC,SAAS,CAAC,GAAG,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,4BAA4B,CAAC,MAAM,EAAE,UAAU,EAAE;YACtD,aAAa;YACb,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,8DAA8D;IAC9D,MAAM,gBAAgB,GAAa,EAAE,CAAC;IAEtC,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,mBAAmB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACvE,aAAa,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;QACrC,IAAI,SAAS,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACjC,gBAAgB,CAAC,IAAI,CAAC,GAAG,SAAS,KAAK,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,+BAA+B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5E,MAAM,UAAU,GAAG,kEAAkE,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,yEAAyE,CAAC;QAC1L,OAAO,4BAA4B,CAAC,MAAM,EAAE,UAAU,EAAE;YACtD,aAAa;YACb,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,wCAAwC;IACxC,OAAO;QACL,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,sFAAsF;QAC9F,UAAU,EAAE,0CAA0C;QACtD,aAAa;QACb,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;KACtC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,wBAAwB,CACtC,YAAoB,EACpB,YAAkD,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;IAE7E,IAAI,CAAC;QACH,OAAO,iCAAiC,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,MAAM,OAAO,GACX,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAChD,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,oCAAoC,CAAC;QAC3C,OAAO,kBAAkB,CACvB,gCAAgC,OAAO,EAAE,EACzC,uFAAuF,EACvF;YACE,aAAa,EAAE,kBAAkB,EAAE;YACnC,kBAAkB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,6BAA6B,EAAE;SACtF,CACF,CAAC;IACJ,CAAC;AACH,CAAC"}

package/pd-cli/dist/services/runtime-adapter-resolver.d.ts

@@ -13,7 +13,7 @@
  * - CLI-gate concerns (process.exit, telemetry, help text) stay at call sites.
  *   This resolver throws structured `ConfigResolutionError` that handlers translate.
  * - Lives in pd-cli/services (NOT core) because it constructs adapters and reads
- *   CLI feature flags via `loadEffectiveFeatureFlags`, which is a pd-cli service.
+ *   PD config via `loadPdConfig` + `computeFlagsFromLoadResult`, which are pd-cli services.
  *
  * ERR refs:
  * - ERR-001 (no any): all types explicit

package/pd-cli/dist/services/runtime-adapter-resolver.js

@@ -13,7 +13,7 @@
  * - CLI-gate concerns (process.exit, telemetry, help text) stay at call sites.
  *   This resolver throws structured `ConfigResolutionError` that handlers translate.
  * - Lives in pd-cli/services (NOT core) because it constructs adapters and reads
- *   CLI feature flags via `loadEffectiveFeatureFlags`, which is a pd-cli service.
+ *   PD config via `loadPdConfig` + `computeFlagsFromLoadResult`, which are pd-cli services.
  *
  * ERR refs:
  * - ERR-001 (no any): all types explicit
@@ -24,7 +24,7 @@
  */
 import { TestDoubleRuntimeAdapter, PiAiRuntimeAdapter, OpenClawCliRuntimeAdapter, L2AgentLoopAdapter, buildL2PrincipleReaderFromLedger, isRuntimeConfigError, validateRuntimeConfig, } from '@principles/core/runtime-v2';
 import { loadLedger } from '@principles/core/principle-tree-ledger';
-import { loadEffectiveFeatureFlags } from './feature-flag-loader.js';
+import { loadPdConfig, computeFlagsFromLoadResult } from './pd-config-loader.js';
 import { resolveRuntimeFromPdConfig } from './resolve-runtime-from-pd-config.js';
 export class ConfigResolutionError extends Error {
     kind;
@@ -126,7 +126,7 @@ export function resolveRuntimeAdapterFromConfig(opts) {
         // dreamer runner, route through the L2 multi-turn agent loop adapter.
         // Other runners (philosopher/scribe/...) stay on L1.
         if (opts.runnerKind === 'dreamer' && opts.l2ArtifactReader && opts.l2StateDir) {
-            const effectiveFlags = loadEffectiveFeatureFlags(opts.workspaceDir);
+            const effectiveFlags = computeFlagsFromLoadResult(loadPdConfig(opts.workspaceDir));
             const l2FlagDef = Object.hasOwn(effectiveFlags.flags, 'l2_dreamer')
                 ? effectiveFlags.flags.l2_dreamer
                 : undefined;

package/pd-cli/dist/services/runtime-adapter-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-adapter-resolver.js","sourceRoot":"","sources":["../../src/services/runtime-adapter-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-adapter-resolver.js","sourceRoot":"","sources":["../../src/services/runtime-adapter-resolver.ts"],"names":[],"mappings":"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"}

package/plugin/dist/commands/evolution-status.js

@@ -38,7 +38,6 @@ function buildEnglishOutput(workspaceDir, sessionId, warnings, stats, summary, r
         'Control Plane',
         `- Session GFI: current ${formatNumber(summary.gfi.current)}, peak ${formatNumber(summary.gfi.peak)} (${summary.gfi.dataQuality})`,
         `- GFI Sources: ${formatSources(summary.gfi.sources)}`,
-        `- Pain Flag: ${summary.pain.activeFlag ? 'active' : 'inactive'}${summary.pain.activeFlagSource ? ` (${summary.pain.activeFlagSource})` : ''}`,
         `- Last Pain Signal: ${summary.pain.lastSignal ? `${summary.pain.lastSignal.source}${summary.pain.lastSignal.reason ? ` - ${summary.pain.lastSignal.reason}` : ''}` : '--'}`,
         `- Gate Events: blocks ${formatNumber(summary.gate.recentBlocks)}, bypasses ${formatNumber(summary.gate.recentBypasses)} (${summary.gate.dataQuality})`,
         '',
@@ -97,7 +96,6 @@ function buildChineseOutput(workspaceDir, sessionId, warnings, stats, summary, r
         '控制面',
         `- 会话 GFI: 当前 ${formatNumber(summary.gfi.current)}，峰值 ${formatNumber(summary.gfi.peak)} (${summary.gfi.dataQuality})`,
         `- GFI 来源: ${formatSources(summary.gfi.sources)}`,
-        `- Pain Flag: ${summary.pain.activeFlag ? 'active' : 'inactive'}${summary.pain.activeFlagSource ? ` (${summary.pain.activeFlagSource})` : ''}`,
         `- 最近 Pain 信号: ${summary.pain.lastSignal ? `${summary.pain.lastSignal.source}${summary.pain.lastSignal.reason ? ` - ${summary.pain.lastSignal.reason}` : ''}` : '--'}`,
         `- Gate 事件: block ${formatNumber(summary.gate.recentBlocks)}，bypass ${formatNumber(summary.gate.recentBypasses)} (${summary.gate.dataQuality})`,
         '',

package/plugin/dist/core/detection-funnel.d.ts

@@ -1,24 +1,38 @@
+/**
+ * Detection Funnel — PRI-446 thin adapter
+ *
+ * The pure three-layer funnel logic (LRU cache, async queue, layer dispatch)
+ * now lives in principles-core
+ * (runtime-v2/detection/detection-funnel-policy.ts). This file is a thin shell
+ * that wires DetectionFunnelCore with the two environment-coupled dependencies
+ * the plugin owns:
+ *   - crypto.createHash (the L2 cache key hasher)
+ *   - PainDictionary.match (the L1 exact matcher)
+ *   - shouldIgnorePainProtocolText (the protocol-token gate)
+ *
+ * It re-exports DetectionFunnel (same class name + constructor signature) and
+ * DetectionResult so DetectionService, llm.ts, and evolution-worker keep working
+ * unchanged.
+ *
+ * ERR checklist:
+ * - ERR-011: this is a thin adapter delegating to core pure logic.
+ */
 import { type PainDictionary } from './dictionary.js';
-export interface DetectionResult {
-    detected: boolean;
-    severity?: number;
-    ruleId?: string;
-    source: 'l1_exact' | 'l2_cache' | 'l3_async_queued' | 'l3_semantic_hit';
-}
+import { type DetectionResult } from '@principles/core/runtime-v2';
+export type { DetectionResult };
 /**
  * Orchestrates the three-layer detection funnel for pain signals.
+ *
+ * Delegates to the core DetectionFunnelCore, injecting the crypto hasher,
+ * the dictionary matcher, and the protocol-token gate.
  */
 export declare class DetectionFunnel {
-    private readonly cache;
-    private asyncQueue;
-    private readonly dictionary;
+    private readonly core;
     constructor(dictionary: PainDictionary);
     /**
      * Detects pain in the given text using L1 (Exact), L2 (Cache), and L3 (Async).
      */
     detect(text: string): DetectionResult;
-    private static computeHash;
-    private enqueueAsync;
     /**
      * Internal method for the worker to update the cache after a semantic hit.
      */

package/plugin/dist/core/detection-funnel.js

@@ -1,104 +1,56 @@
-import { createHash } from 'crypto';
-import { shouldIgnorePainProtocolText } from './dictionary.js';
 /**
- * A simple LRU Cache implementation using Map.
+ * Detection Funnel — PRI-446 thin adapter
+ *
+ * The pure three-layer funnel logic (LRU cache, async queue, layer dispatch)
+ * now lives in principles-core
+ * (runtime-v2/detection/detection-funnel-policy.ts). This file is a thin shell
+ * that wires DetectionFunnelCore with the two environment-coupled dependencies
+ * the plugin owns:
+ *   - crypto.createHash (the L2 cache key hasher)
+ *   - PainDictionary.match (the L1 exact matcher)
+ *   - shouldIgnorePainProtocolText (the protocol-token gate)
+ *
+ * It re-exports DetectionFunnel (same class name + constructor signature) and
+ * DetectionResult so DetectionService, llm.ts, and evolution-worker keep working
+ * unchanged.
+ *
+ * ERR checklist:
+ * - ERR-011: this is a thin adapter delegating to core pure logic.
  */
-class SimpleLRU {
-    cache;
-    maxSize;
-    constructor(maxSize = 100) {
-        this.cache = new Map();
-        this.maxSize = maxSize;
-    }
-    get(key) {
-        const item = this.cache.get(key);
-        if (item !== undefined) {
-            // Refresh: delete and re-insert
-            this.cache.delete(key);
-            this.cache.set(key, item);
-        }
-        return item;
-    }
-    set(key, value) {
-        if (this.cache.has(key)) {
-            this.cache.delete(key);
-        }
-        else if (this.cache.size >= this.maxSize) {
-            // Remove the oldest (first) item
-            const firstKey = this.cache.keys().next().value;
-            if (firstKey !== undefined) {
-                this.cache.delete(firstKey);
-            }
-        }
-        this.cache.set(key, value);
-    }
-}
+import { createHash } from 'crypto';
+import { shouldIgnorePainProtocolText } from './dictionary.js';
+import { DetectionFunnelCore, } from '@principles/core/runtime-v2';
 /**
  * Orchestrates the three-layer detection funnel for pain signals.
+ *
+ * Delegates to the core DetectionFunnelCore, injecting the crypto hasher,
+ * the dictionary matcher, and the protocol-token gate.
  */
 export class DetectionFunnel {
-    cache = new SimpleLRU(100);
-    asyncQueue = [];
-    dictionary;
+    core;
     constructor(dictionary) {
-        this.dictionary = dictionary;
+        this.core = new DetectionFunnelCore({
+            match: (text) => dictionary.match(text),
+            hash: (text) => createHash('sha256').update(text).digest('hex'),
+            shouldIgnoreProtocol: shouldIgnorePainProtocolText,
+        });
     }
     /**
      * Detects pain in the given text using L1 (Exact), L2 (Cache), and L3 (Async).
      */
     detect(text) {
-        if (shouldIgnorePainProtocolText(text)) {
-            return { detected: false, source: 'l1_exact' };
-        }
-        // --- Layer 1: Exact Match (Sync) ---
-        const exactMatch = this.dictionary.match(text);
-        if (exactMatch) {
-            return {
-                detected: true,
-                severity: exactMatch.severity,
-                ruleId: exactMatch.ruleId,
-                source: 'l1_exact'
-            };
-        }
-        // --- Layer 2: LRU Cache (Sync) ---
-        const hash = DetectionFunnel.computeHash(text);
-        const cached = this.cache.get(hash);
-        if (cached) {
-            return {
-                detected: cached.detected,
-                severity: cached.severity,
-                source: 'l2_cache'
-            };
-        }
-        // --- Layer 3: Async Semantic Queue ---
-        this.enqueueAsync(text);
-        return {
-            detected: false,
-            source: 'l3_async_queued'
-        };
-    }
-    static computeHash(text) {
-        return createHash('sha256').update(text).digest('hex');
-    }
-    enqueueAsync(text) {
-        if (this.asyncQueue.length < 1000) {
-            this.asyncQueue.push(text);
-        }
-        // Worker will pick this up and perform semantic search via createMemorySearchTool
+        return this.core.detect(text);
     }
     /**
      * Internal method for the worker to update the cache after a semantic hit.
      */
     updateCache(text, result) {
-        const hash = DetectionFunnel.computeHash(text);
-        this.cache.set(hash, result);
+        this.core.updateCache(text, result);
     }
     /**
      * Retrieves and clears the current asynchronous queue.
      */
     flushQueue() {
-        const queue = [...this.asyncQueue];
-        this.asyncQueue = [];
-        return queue;
+        return this.core.flushQueue();
     }
 }

package/plugin/dist/core/event-log.d.ts

@@ -1,4 +1,4 @@
-import type { EventLogEntry, DailyStats, EmpathyEventStats, ToolCallEventData, PainSignalEventData, RuleMatchEventData, RulePromotionEventData, HookExecutionEventData, GateBlockEventData, GateBypassEventData, PlanApprovalEventData, EvolutionTaskEventData, EmpathyRollbackEventData, DiagnosisTaskEventData, HeartbeatDiagnosisEventData, DiagnosticianReportEventData, PrincipleCandidateEventData, RuleEnforcedEventData, RuleHostEvaluatedEventData, RuleHostBlockedEventData, RuleHostRequireApprovalEventData, RuleHostAutoCorrectProposedEventData, RuleHostAutoCorrectAppliedEventData, RuntimeV2PromptActivationsInjectedEventData, RuleHostUnhealthyEventData } from '../types/event-types.js';
+import type { EventLogEntry, DailyStats, EmpathyEventStats, ToolCallEventData, PainSignalEventData, RulePromotionEventData, HookExecutionEventData, GateBlockEventData, GateBypassEventData, PlanApprovalEventData, EvolutionTaskEventData, EmpathyRollbackEventData, DiagnosisTaskEventData, HeartbeatDiagnosisEventData, DiagnosticianReportEventData, PrincipleCandidateEventData, RuleEnforcedEventData, RuleHostEvaluatedEventData, RuleHostBlockedEventData, RuleHostRequireApprovalEventData, RuleHostAutoCorrectProposedEventData, RuleHostAutoCorrectAppliedEventData, RuntimeV2PromptActivationsInjectedEventData, RuleHostUnhealthyEventData } from '../types/event-types.js';
 import type { PluginLogger } from '../openclaw-sdk.js';
 export declare class EventLog {
     private readonly logsDir;
@@ -11,7 +11,6 @@ export declare class EventLog {
     private flushTimer?;
     private currentEventsFile;
     private currentDate;
-    private readonly painScoreSums;
     constructor(stateDir: string, logger?: PluginLogger);
     private getEventsFile;
     private getTodayStr;
@@ -19,7 +18,6 @@ export declare class EventLog {
     private cleanupOldEventFiles;
     recordToolCall(sessionId: string | undefined, data: ToolCallEventData): void;
     recordPainSignal(sessionId: string | undefined, data: PainSignalEventData): void;
-    recordRuleMatch(sessionId: string | undefined, data: RuleMatchEventData): void;
     recordRulePromotion(data: RulePromotionEventData): void;
     recordHookExecution(data: HookExecutionEventData, opts?: {
         flushImmediately?: boolean;

package/plugin/dist/core/event-log.js

@@ -15,7 +15,8 @@ export class EventLog {
     flushTimer;
     currentEventsFile;
     currentDate;
-    painScoreSums = new Map();
+    // painScoreSums map removed (PRI-451 Wave 1.5): it only fed the dead
+    // stats.pain.avgScore counter, which is also removed.
     constructor(stateDir, logger) {
         this.logsDir = path.join(stateDir, 'logs');
         if (!fs.existsSync(this.logsDir)) {
@@ -68,9 +69,8 @@ export class EventLog {
     recordPainSignal(sessionId, data) {
         this.record('pain_signal', 'detected', sessionId, data);
     }
-    recordRuleMatch(sessionId, data) {
-        this.record('rule_match', 'detected', sessionId, data);
-    }
+    // recordRuleMatch removed (PRI-451 Wave 1): dead code. Its only effect was
+    // incrementing stats.pain.rulesMatched (also dead, removed in Wave 1.5).
     recordRulePromotion(data) {
         this.record('rule_promotion', 'promoted', undefined, data);
     }
@@ -293,16 +293,8 @@ export class EventLog {
         }
         else if (entry.type === 'pain_signal') {
             const data = entry.data;
-            stats.pain.signalsDetected++;
-            stats.pain.maxScore = Math.max(stats.pain.maxScore, data.score);
-            if (data.source) {
-                stats.pain.signalsBySource[data.source] = (stats.pain.signalsBySource[data.source] || 0) + 1;
-            }
-            const currentSum = this.painScoreSums.get(entry.date) ?? 0;
-            this.painScoreSums.set(entry.date, currentSum + (data.score || 0));
-            stats.pain.avgScore = stats.pain.signalsDetected > 0
-                ? Math.round((currentSum + (data.score || 0)) / stats.pain.signalsDetected)
-                : 0;
+            // stats.pain.* counters removed (PRI-451 Wave 1.5): no live reader.
+            // The user_empathy aggregation below (stats.empathy.*) is LIVE and stays.
             if (data.source === 'user_empathy') {
                 if (data.deduped) {
                     stats.empathy.dedupedCount++;
@@ -358,14 +350,11 @@ export class EventLog {
             stats.empathy.rollbackCount++;
             stats.empathy.rolledBackScore += data.originalScore || 0;
         }
-        else if (entry.type === 'rule_match') {
-            const data = entry.data;
-            if (data.ruleId) {
-                stats.pain.rulesMatched[data.ruleId] = (stats.pain.rulesMatched[data.ruleId] || 0) + 1;
-            }
-        }
+        // rule_match handler removed (PRI-451 Wave 1.5): recordRuleMatch is gone
+        // (Wave 1.1), so no rule_match events are emitted; stats.pain.rulesMatched
+        // was its only consumer and is also removed.
         else if (entry.type === 'rule_promotion') {
-            stats.pain.candidatesPromoted++;
+            // stats.pain.candidatesPromoted removed (PRI-451 Wave 1.5): dead counter.
             stats.evolution.rulesPromoted++;
         }
         else if (entry.type === 'evolution_task') {

package/plugin/dist/core/evolution-reducer.d.ts

@@ -52,20 +52,12 @@ export declare class EvolutionReducerImpl implements EvolutionReducer {
     private readonly failureStreak;
     private lastPromotedAt;
     private isReplaying;
-    /** Registered pain_detected callbacks (e.g., PainSignalBridge). */
-    private readonly _painCallbacks;
     constructor(opts: {
         workspaceDir: string;
         stateDir?: string;
     });
     emit(event: EvolutionLoopEvent): void;
     emitSync(event: EvolutionLoopEvent): void;
-    /**
-     * Register a callback for 'pain_detected' events.
-     * The callback is invoked synchronously within emitSync() after applyEvent completes.
-     * HG-4: Callbacks are fire-and-forget from the emitSync perspective.
-     */
-    on(callback: (event: EvolutionLoopEvent) => void): void;
     getEventLog(): EvolutionLoopEvent[];
     getCandidatePrinciples(): Principle[];
     getProbationPrinciples(): Principle[];

package/plugin/dist/core/evolution-reducer.js

@@ -38,8 +38,9 @@ export class EvolutionReducerImpl {
     failureStreak = new Map();
     lastPromotedAt = null;
     isReplaying = false;
-    /** Registered pain_detected callbacks (e.g., PainSignalBridge). */
-    _painCallbacks = [];
+    // _painCallbacks pub/sub removed (PRI-451 Wave 1): no code ever registered a
+    // callback via .on(). The pain_detected → PainSignalBridge bridge happens via
+    // emitPainDetectedEvent (hooks/pain.ts), not this pub/sub layer.
     constructor(opts) {
         this.workspaceDir = opts.workspaceDir;
         this.stateDir = opts.stateDir;
@@ -77,14 +78,9 @@ export class EvolutionReducerImpl {
         }
         // Performance: sweepExpiredProbation() moved to getProbationPrinciples() for lazy cleanup
     }
-    /**
-     * Register a callback for 'pain_detected' events.
-     * The callback is invoked synchronously within emitSync() after applyEvent completes.
-     * HG-4: Callbacks are fire-and-forget from the emitSync perspective.
-     */
-    on(callback) {
-        this._painCallbacks.push(callback);
-    }
+    // on(callback) pub/sub registration removed (PRI-451 Wave 1): dead code —
+    // no caller ever registered a callback. pain_detected events still flow via
+    // emitPainDetectedEvent → PainSignalBridge, unaffected.
     getEventLog() {
         return [...this.memoryEvents];
     }
@@ -522,15 +518,9 @@ export class EvolutionReducerImpl {
                 if (!this.isReplaying) {
                     this.onPainDetected(event.data, event.ts);
                 }
-                // PainSignalBridge subscriptions: invoke registered callbacks (fire-and-forget)
-                for (const cb of this._painCallbacks) {
-                    try {
-                        cb(event);
-                    }
-                    catch {
-                        // Keep the evolution loop resilient — callback errors must not propagate
-                    }
-                }
+                // _painCallbacks dispatch removed (PRI-451 Wave 1): no callback was ever
+                // registered via .on() (also removed). The pain_detected → PainSignalBridge
+                // bridge flows through emitPainDetectedEvent (hooks/pain.ts), not here.
                 return;
             case 'candidate_created':
                 this.onCandidateCreated(event.data, event.ts);