create-principles-disciple 1.92.0 → 1.94.0

package/plugin/dist/core/pain.d.ts

@@ -1,67 +1,4 @@
-/**
- * Required fields — every pain flag MUST have these.
- */
-export interface PainFlagData {
-    /** What triggered this pain signal (e.g., tool_failure, human_intervention, intercept_extraction) */
-    source: string;
-    /** Pain score 0-100 */
-    score: string;
-    /** ISO 8601 timestamp */
-    time: string;
-    /** Human-readable reason / error description */
-    reason: string;
-    /** Session ID — identifies which conversation this happened in */
-    session_id: string;
-    /** Agent ID — identifies which agent (main, builder, diagnostician, etc.) */
-    agent_id: string;
-    /** Whether this involves risky operation ('true' / 'false') */
-    is_risky: string;
-    /** Correlation trace ID (for linking events across the pipeline) */
-    trace_id: string;
-    /** Preview of the text that triggered this pain */
-    trigger_text_preview: string;
-    /** Trajectory pain_events row ID (set by recordPainEvent) */
-    pain_event_id?: string;
-}
-export interface PainFlagContractResult {
-    status: 'missing' | 'valid' | 'invalid';
-    format: 'missing' | 'empty' | 'kv' | 'json' | 'invalid_json';
-    data: Record<string, string>;
-    missingFields: string[];
-}
-/**
- * Builds legacy pain flag data for compatibility tests and historical readers.
- * Do not use this to create new Runtime V2 diagnosis requests.
- */
-export declare function buildPainFlag(input: {
-    source: string;
-    score: string;
-    time?: string;
-    reason: string;
-    session_id?: string;
-    agent_id?: string;
-    is_risky?: boolean;
-    trace_id?: string;
-    trigger_text_preview?: string;
-    pain_event_id?: string;
-}): PainFlagData;
-/**
- * Validates a pain flag read from disk.
- * Returns list of missing required fields — empty string means all present.
- */
-export declare function validatePainFlag(data: Record<string, string>): string[];
 export declare function computePainScore(rc: number, isSpiral: boolean, missingTestCommand: boolean, softScore: number, projectDir?: string): number;
-export declare function painSeverityLabel(painScore: number, isSpiral?: boolean, projectDir?: string): string;
-/**
- * Reads and validates the legacy pain flag file.
- *
- * - If file doesn't exist → returns {}
- * - If file is JSON format → converts to KV in memory only
- * - If file is KV format → validates required fields, logs warning if missing
- * - If file has unknown fields → silently ignores them (forward-compatible)
- */
-export declare function readPainFlagData(projectDir: string): Record<string, string>;
-export declare function readPainFlagContract(projectDir: string): PainFlagContractResult;
 /**
  * Track principle value metrics when a pain signal is written.
  * This is observation-only — it does NOT affect the pain flag write flow.

package/plugin/dist/core/pain.js

@@ -1,44 +1,5 @@
-import * as fs from 'fs';
-import { parseKvLines } from '../utils/io.js';
 import { resolvePdPath } from './paths.js';
 import { ConfigService } from './config-service.js';
-import { SystemLogger } from './system-logger.js';
-/**
- * Builds legacy pain flag data for compatibility tests and historical readers.
- * Do not use this to create new Runtime V2 diagnosis requests.
- */
-export function buildPainFlag(input) {
-    // Omit optional fields when not provided — prevents writing empty lines to disk
-    // which causes agent confusion (SKILL.md vs reality drift)
-    return {
-        source: input.source,
-        score: input.score,
-        time: input.time || new Date().toISOString(),
-        reason: input.reason,
-        session_id: input.session_id ?? '',
-        agent_id: input.agent_id ?? '',
-        is_risky: input.is_risky ? 'true' : 'false',
-        trace_id: input.trace_id ?? '',
-        trigger_text_preview: input.trigger_text_preview ?? '',
-        pain_event_id: input.pain_event_id,
-    };
-}
-/**
- * Validates a pain flag read from disk.
- * Returns list of missing required fields — empty string means all present.
- */
-export function validatePainFlag(data) {
-    const missing = [];
-    // Only source/score/time/reason are truly required — session_id/agent_id
-    // may be empty in automated contexts (heartbeat, background workers)
-    const required = ['source', 'score', 'time', 'reason'];
-    for (const field of required) {
-        if (!data[field] || data[field].trim() === '') {
-            missing.push(field);
-        }
-    }
-    return missing;
-}
 export function computePainScore(rc, isSpiral, missingTestCommand, softScore, projectDir) {
     let score = Math.max(0, softScore || 0);
     const stateDir = projectDir ? resolvePdPath(projectDir, 'STATE_DIR') : undefined;
@@ -59,134 +20,6 @@ export function computePainScore(rc, isSpiral, missingTestCommand, softScore, pr
     }
     return Math.min(100, score);
 }
-export function painSeverityLabel(painScore, isSpiral = false, projectDir) {
-    if (isSpiral) {
-        return "critical";
-    }
-    const stateDir = projectDir ? resolvePdPath(projectDir, 'STATE_DIR') : undefined;
-    const config = stateDir ? ConfigService.get(stateDir) : null;
-    const thresholds = config ? config.get('severity_thresholds') : {
-        high: 70,
-        medium: 40,
-        low: 20
-    };
-    if (painScore >= thresholds.high) {
-        return "high";
-    }
-    else if (painScore >= thresholds.medium) {
-        return "medium";
-    }
-    else if (painScore >= thresholds.low) {
-        return "low";
-    }
-    else {
-        return "info";
-    }
-}
-/**
- * Converts a JSON pain flag object to KV format.
- */
-function convertJsonToKv(json) {
-    const kvData = {};
-    const fieldMap = {
-        source: 'source',
-        score: 'score',
-        time: 'time',
-        timestamp: 'time',
-        reason: 'reason',
-        session_id: 'session_id',
-        sessionId: 'session_id',
-        agent_id: 'agent_id',
-        agentId: 'agent_id',
-        is_risky: 'is_risky',
-        isRisky: 'is_risky',
-        severity: 'severity',
-        painId: 'pain_id',
-    };
-    for (const [jsonKey, kvKey] of Object.entries(fieldMap)) {
-        if (json[jsonKey] !== undefined) {
-            kvData[kvKey] = String(json[jsonKey]);
-        }
-    }
-    for (const [key, value] of Object.entries(json)) {
-        if (fieldMap[key] === undefined && value !== undefined && value !== null) {
-            kvData[key] = String(value);
-        }
-    }
-    return kvData;
-}
-/**
- * Reads and validates the legacy pain flag file.
- *
- * - If file doesn't exist → returns {}
- * - If file is JSON format → converts to KV in memory only
- * - If file is KV format → validates required fields, logs warning if missing
- * - If file has unknown fields → silently ignores them (forward-compatible)
- */
-export function readPainFlagData(projectDir) {
-    const painFlagPath = resolvePdPath(projectDir, 'PAIN_FLAG');
-    try {
-        if (!fs.existsSync(painFlagPath)) {
-            return {};
-        }
-        const content = fs.readFileSync(painFlagPath, "utf-8").trim();
-        if (!content) {
-            return {};
-        }
-        // Detect JSON format. Legacy compatibility only: parse in memory and do not
-        // rewrite .pain_flag, because Runtime V2 must not create or repair this file.
-        if (content.startsWith('{')) {
-            let json;
-            try {
-                json = JSON.parse(content);
-            }
-            catch {
-                SystemLogger.log(projectDir, 'PAIN_FLAG_CORRUPT', 'Pain flag file contains invalid JSON');
-                return {};
-            }
-            const kvData = convertJsonToKv(json);
-            SystemLogger.log(projectDir, 'PAIN_FLAG_LEGACY_JSON_READ', `Read legacy JSON pain flag in memory (${Object.keys(json).length} fields)`);
-            return kvData;
-        }
-        // KV format — parse and validate
-        const data = parseKvLines(content);
-        const missing = validatePainFlag(data);
-        if (missing.length > 0) {
-            SystemLogger.log(projectDir, 'PAIN_FLAG_INCOMPLETE', `Pain flag missing required fields: ${missing.join(', ')}`);
-        }
-        return data;
-    }
-    catch (e) {
-        SystemLogger.log(projectDir, 'PAIN_FLAG_READ_ERROR', `Failed to read pain flag: ${String(e)}`);
-        return {};
-    }
-}
-export function readPainFlagContract(projectDir) {
-    const data = readPainFlagData(projectDir);
-    if (Object.keys(data).length === 0) {
-        const painFlagPath = resolvePdPath(projectDir, 'PAIN_FLAG');
-        if (!fs.existsSync(painFlagPath)) {
-            return { status: 'missing', format: 'missing', data: {}, missingFields: [] };
-        }
-        const raw = fs.readFileSync(painFlagPath, 'utf-8').trim();
-        if (!raw) {
-            return { status: 'missing', format: 'empty', data: {}, missingFields: [] };
-        }
-        return {
-            status: 'invalid',
-            format: raw.startsWith('{') ? 'invalid_json' : 'kv',
-            data: {},
-            missingFields: ['unparseable'],
-        };
-    }
-    const missing = validatePainFlag(data);
-    return {
-        status: missing.length > 0 ? 'invalid' : 'valid',
-        format: 'kv',
-        data,
-        missingFields: missing,
-    };
-}
 /**
  * Track principle value metrics when a pain signal is written.
  * This is observation-only — it does NOT affect the pain flag write flow.

package/plugin/dist/core/paths.d.ts

@@ -50,7 +50,6 @@ export declare const PD_FILES: {
     CURRENT_FOCUS: string;
     WEEK_STATE: string;
     THINKING_OS_CANDIDATES: string;
-    SEMANTIC_PAIN: string;
     EVOLUTION_STREAM: string;
     EVOLUTION_LOCK: string;
 };

package/plugin/dist/core/paths.js

@@ -64,7 +64,8 @@ export const PD_FILES = {
     CURRENT_FOCUS: posixJoin(PD_DIRS.OKR, 'CURRENT_FOCUS.md'),
     WEEK_STATE: posixJoin(PD_DIRS.OKR, 'WEEK_STATE.json'),
     THINKING_OS_CANDIDATES: posixJoin(PD_DIRS.MEMORY, 'THINKING_OS_CANDIDATES.md'),
-    SEMANTIC_PAIN: posixJoin(PD_DIRS.PAIN_SAMPLES, 'confusion_samples.md'),
+    // SEMANTIC_PAIN (confusion_samples.md) removed (PRI-451 Wave 1): the file
+    // had zero readers. The lifecycle write that populated it was also removed.
     EVOLUTION_STREAM: posixJoin(PD_DIRS.MEMORY, 'evolution.jsonl'),
     EVOLUTION_LOCK: posixJoin(PD_DIRS.LOCKS, 'evolution'),
 };

package/plugin/dist/core/principle-compiler/compiler.js

@@ -244,6 +244,8 @@ export class PrincipleCompiler {
         if (patterns.length === 0)
             return [];
         const pattern = patterns[0];
+        if (!pattern)
+            return [];
         // Skip replay when the pattern has no regex qualifier -- the generated template
         // blocks ALL calls to the tool, making it impossible to construct a passing
         // positive case. Replay is only meaningful when the template is selective.

package/plugin/dist/core/replay-engine.js

@@ -30,7 +30,7 @@ export class ReplayEngine {
     }
     getLatestReport(implementationId) {
         const reports = this.listReports(implementationId);
-        return reports.length > 0 ? reports[0] : null;
+        return reports[0] ?? null;
     }
     hasPassingReport(implementationId) {
         return this.listReports(implementationId).some((report) => report.overallDecision === 'pass');

package/plugin/dist/core/rule-host.js

@@ -188,7 +188,9 @@ export class RuleHost {
                     }
                 }
                 else {
-                    validRows.push(group[0]);
+                    const row = group[0];
+                    if (row)
+                        validRows.push(row);
                 }
             }
             const loaded = [];

package/plugin/dist/core/schema/migrations/001-init-trajectory.js

@@ -72,12 +72,9 @@ export const migration = {
     )`);
         db.exec(`CREATE INDEX IF NOT EXISTS idx_pain_events_session_id ON pain_events(session_id)`);
         db.exec(`CREATE INDEX IF NOT EXISTS idx_pain_events_created_at ON pain_events(created_at)`);
-        // FTS5
-        db.exec(`CREATE VIRTUAL TABLE IF NOT EXISTS pain_events_fts USING fts5(
-      text,
-      pain_event_id UNINDEXED,
-      tokenize='porter unicode61'
-    )`);
+        // pain_events_fts FTS5 virtual table removed (PRI-451 Wave 1): the only
+        // reader (searchPainEvents) was dead code. Existing DBs keep the orphan
+        // table harmlessly (CREATE was IF NOT EXISTS); new DBs simply don't create it.
         db.exec(`CREATE TABLE IF NOT EXISTS gate_blocks (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id TEXT,

package/plugin/dist/core/schema/schema-definitions.js

@@ -370,15 +370,10 @@ export const SCHEMAS = {
           FROM thinking_model_events GROUP BY date(created_at), model_id ORDER BY day ASC`,
             },
         },
-        fts: {
-            'trajectory.pain_events_fts': {
-                ddl: `CREATE VIRTUAL TABLE IF NOT EXISTS pain_events_fts USING fts5(
-          text,
-          pain_event_id UNINDEXED,
-          tokenize='porter unicode61'
-        )`,
-            },
-        },
+        // pain_events_fts FTS5 catalog entry removed (PRI-451 Wave 1): the only
+        // reader (searchPainEvents) was dead code. fts is now empty, matching the
+        // other DbType catalogs. Existing DBs keep the orphan table harmlessly.
+        fts: {},
     },
     // ========================================================================
     // central.db — Aggregated multi-workspace data

package/plugin/dist/core/thinking-os-parser.js

@@ -23,7 +23,10 @@ function extractTag(content, tagName) {
     const match = content.match(regex);
     if (!match)
         return '';
-    return match[1].trim().replace(/\s+/g, ' ');
+    const raw = match[1];
+    if (!raw)
+        return '';
+    return raw.trim().replace(/\s+/g, ' ');
 }
 /**
  * Parse THINKING_OS.md content and extract all <directive> blocks.
@@ -35,14 +38,20 @@ export function parseThinkingOsMd(content) {
     const directiveRegex = /<directive\s+([^>]*)>([\s\S]*?)<\/directive>/gi;
     let _match = null;
     while ((_match = directiveRegex.exec(content)) !== null) {
-        const [, attrs, body] = _match;
+        const attrs = _match[1];
+        const body = _match[2];
+        if (!attrs || !body)
+            continue;
         const idMatch = /id="([^"]+)"/i.exec(attrs);
         const nameMatch = /name="([^"]+)"/i.exec(attrs);
         if (!idMatch)
             continue;
+        const id = idMatch[1];
+        if (!id)
+            continue;
         const directive = {
-            id: idMatch[1],
-            name: nameMatch ? nameMatch[1] : '',
+            id,
+            name: nameMatch ? (nameMatch[1] ?? '') : '',
             trigger: extractTag(body, 'trigger'),
             must: extractTag(body, 'must'),
             forbidden: extractTag(body, 'forbidden'),

package/plugin/dist/core/trajectory.d.ts

@@ -16,22 +16,6 @@ export declare class TrajectoryDatabase {
     recordUserTurn(input: TrajectoryUserTurnInput): number;
     recordToolCall(input: TrajectoryToolCallInput): number;
     recordPainEvent(input: TrajectoryPainEventInput): number;
-    /**
-     * Search pain_events using FTS5 full-text search (MEM-04).
-     * Returns pain events matching the query, ordered by relevance.
-     */
-    searchPainEvents(query: string, limit?: number): {
-        id: number;
-        sessionId: string;
-        source: string;
-        score: number;
-        reason: string | null;
-        severity: string | null;
-        origin: string | null;
-        confidence: number | null;
-        text: string | null;
-        createdAt: string;
-    }[];
     recordGateBlock(input: TrajectoryGateBlockInput): void;
     recordTrustChange(input: TrajectoryTrustChangeInput): void;
     recordPrincipleEvent(input: TrajectoryPrincipleEventInput): void;

package/plugin/dist/core/trajectory.js

@@ -170,60 +170,14 @@ export class TrajectoryDatabase {
                 }
             }
         });
-        // FTS indexing is best-effort — run outside the transaction so it cannot
-        // roll back the committed pain event row (MEM-03, MEM-04).
-        if (input.text && insertedId > 0) {
-            try {
-                this.db.prepare(`
-          INSERT INTO pain_events_fts (text, pain_event_id) VALUES (?, ?)
-        `).run(input.text, insertedId);
-            }
-            catch (err) {
-                // Non-fatal: FTS index is for search convenience, not correctness.
-                // Log but do not re-throw — the pain event itself is already committed.
-                console.warn(`[trajectory] FTS index insert failed for pain_event ${insertedId}: ${String(err)}`);
-            }
-        }
+        // FTS5 index write removed (PRI-451 Wave 1): the only reader (searchPainEvents)
+        // was dead code removed in Wave 1.1. The pain event row itself is committed
+        // above; nothing reads the FTS index anymore.
         return insertedId;
     }
-    /**
-     * Search pain_events using FTS5 full-text search (MEM-04).
-     * Returns pain events matching the query, ordered by relevance.
-     */
-    searchPainEvents(query, limit = 10) {
-        if (!query || query.trim().length === 0) {
-            return [];
-        }
-        // Escape FTS5 special characters and format query for porter tokenizer
-        const ftsQuery = query.trim().split(/\s+/).map(term => `"${term.replace(/"/g, '""')}"`).join(' ');
-        try {
-            const results = this.db.prepare(`
-        SELECT pe.*
-        FROM pain_events_fts pf
-        JOIN pain_events pe ON pe.id = pf.pain_event_id
-        WHERE pain_events_fts MATCH ?
-        ORDER BY bm25(pain_events_fts) DESC
-        LIMIT ?
-      `).all(ftsQuery, limit);
-            return results.map(row => ({
-                id: row.id,
-                sessionId: row.session_id,
-                source: row.source,
-                score: row.score,
-                reason: row.reason,
-                severity: row.severity,
-                origin: row.origin,
-                confidence: row.confidence,
-                text: row.text,
-                createdAt: row.created_at,
-            }));
-        }
-        catch (err) {
-            // If FTS5 query fails (e.g., syntax error), return empty results
-            console.warn(`[PD:TrajectoryDatabase] FTS5 search failed: ${String(err)}`);
-            return [];
-        }
-    }
+    // searchPainEvents removed (PRI-451 Wave 1): dead code. Its only caller was
+    // processDetectionQueue (also removed). The FTS5 index write it read is
+    // removed in Wave 1.2.
     recordGateBlock(input) {
         this.withWrite(() => {
             this.db.prepare(`
@@ -1112,14 +1066,9 @@ export class TrajectoryDatabase {
       ON pain_events(canonical_pain_id)
       WHERE canonical_pain_id IS NOT NULL
     `);
-        // Create FTS5 virtual table for pain_events text search (MEM-04)
-        this.db.exec(`
-      CREATE VIRTUAL TABLE IF NOT EXISTS pain_events_fts USING fts5(
-        text,
-        pain_event_id UNINDEXED,
-        tokenize='porter unicode61'
-      )
-    `);
+        // pain_events_fts FTS5 virtual table creation removed (PRI-451 Wave 1):
+        // the only reader (searchPainEvents) was dead code. Existing DBs keep the
+        // orphan table harmlessly (CREATE was IF NOT EXISTS); new DBs skip it.
         // V2 migration: Add V2 columns to evolution_tasks if they don't exist
         // SQLite does not support IF NOT EXISTS for ADD COLUMN, so we must check manually
         // before each ALTER to avoid "duplicate column name" errors on existing DBs

package/plugin/dist/hooks/after-tool-call-helpers.d.ts

@@ -86,9 +86,12 @@ export declare function evaluatePainAdmissionForToolCall(event: PluginHookAfterT
  *
  * Only called when the admission decision is 'admitted'.
  */
-export declare function emitPainIfAdmitted(wctx: WorkspaceContext, event: PluginHookAfterToolCallEvent, observation: ToolCallObservation, outcome: ToolCallOutcome, admission: PainAdmissionDecision, sessionId: string, agentId: string | undefined, workspaceDir: string, emitPainDetectedEvent: (wctx: WorkspaceContext, event: import('../core/evolution-types.js').EvolutionLoopEvent) => Promise<void>): void;
+export declare function emitPainIfAdmitted(wctx: WorkspaceContext, event: PluginHookAfterToolCallEvent, observation: ToolCallObservation, outcome: ToolCallOutcome, admission: PainAdmissionDecision, sessionId: string, agentId: string | undefined, workspaceDir: string, emitPainDetectedEvent: (wctx: WorkspaceContext, event: import('../core/evolution-types.js').EvolutionLoopEvent, options?: {
+    recordObservability?: boolean;
+}) => Promise<void>): void;
 export { buildTrajectoryEvidence } from './trajectory-evidence.js';
 /**
  * Reset trigger cooldown state (for tests).
+ * PRI-454: Delegates to shared cooldown Map reset.
  */
 export declare function resetTriggerCooldownForTest(): void;

package/plugin/dist/hooks/after-tool-call-helpers.js

@@ -19,7 +19,7 @@ import { denoiseError, computeHash } from '../utils/hashing.js';
 import { SystemLogger } from '../core/system-logger.js';
 import { getEvolutionLogger, createTraceId } from '../core/evolution-logger.js';
 import { recordEvolutionSuccess, recordEvolutionFailure } from '../core/evolution-engine.js';
-import { isCooldownActive as isTriggerCooldownActive, markEpisodeAsDiagnosed, clearCooldownState } from './trigger-cooldown-tracker.js';
+import { isSharedCooldownActive, markSharedEpisodeAsDiagnosed, resetSharedCooldownForTest } from './trigger-cooldown-tracker.js';
 import { sanitizeForEvidence, sanitizeToolParamsForEvidence } from './message-sanitize.js';
 import { resolveSourceKind, buildToolFailureObservation } from './raw-observation-adapter.js';
 import { evaluateEvidenceTriage } from './triage-adapter.js';
@@ -313,15 +313,6 @@ export function handleProbationFeedback(sessionId, toolName, workspaceDir, wctx,
 }
 // ── Stage 6: Pain Admission ─────────────────────────────────────────────────
 const WRITE_TOOLS = ['write', 'edit', 'apply_patch', 'write_file', 'edit_file', 'replace'];
-/**
- * Cooldown map for trigger controller decisions.
- *
- * PRI-363: This replaces the hidden map in PainDiagnosticGate.
- * Core trigger-controller is stateless; plugin layer owns cooldown state.
- *
- * EP-05: Loop state freshness — each check reads fresh state from this map.
- */
-const TRIGGER_COOLDOWN_MAP = new Map();
 /**
  * Evaluate whether a tool failure should trigger pain diagnosis.
  *
@@ -346,8 +337,8 @@ export function evaluatePainAdmissionForToolCall(event, observation, outcome, la
         };
     }
     const failureSource = outcome.failureSource ?? 'tool_failure';
-    // Check cooldown before calling trigger controller
-    const cooldownActive = isTriggerCooldownActive(failureSource, sessionId, latestFailureState?.lastErrorHash, TRIGGER_COOLDOWN_MAP);
+    // Check cooldown before calling trigger controller (PRI-454: shared Map)
+    const cooldownActive = isSharedCooldownActive(failureSource, sessionId, latestFailureState?.lastErrorHash);
     // PRI-360 S1: Build RawObservation for unified source mapping
     const rawObs = {
         observedAt: new Date().toISOString(),
@@ -386,9 +377,9 @@ export function evaluatePainAdmissionForToolCall(event, observation, outcome, la
         tool: event.toolName,
         path: observation.relPath,
     }));
-    // If trigger controller says yes, mark cooldown and admit
+    // If trigger controller says yes, mark cooldown and admit (PRI-454: shared Map)
     if (triggerDecision.shouldCreateDiagnosticTask) {
-        markEpisodeAsDiagnosed(failureSource, sessionId, latestFailureState?.lastErrorHash, TRIGGER_COOLDOWN_MAP);
+        markSharedEpisodeAsDiagnosed(failureSource, sessionId, latestFailureState?.lastErrorHash);
         return {
             admitted: true,
             stage: 'trigger_admitted',
@@ -417,6 +408,9 @@ export function emitPainIfAdmitted(wctx, event, observation, outcome, admission,
     if (!admission.admitted)
         return;
     const failureSource = outcome.failureSource ?? 'tool_failure';
+    // PRI-453: Generate painId early so it can be passed as canonicalPainId to
+    // recordPainEvent, enabling dedup between legacy trajectory write and SDK path.
+    const painId = `pain_${Date.now()}_${observation.errorHash.slice(0, 8)}`;
     // Record to trajectory before Runtime V2 diagnosis
     wctx.trajectory?.recordPainEvent({
         sessionId,
@@ -426,6 +420,7 @@ export function emitPainIfAdmitted(wctx, event, observation, outcome, admission,
         severity: observation.painScore >= 70 ? 'severe' : observation.painScore >= 40 ? 'moderate' : 'mild',
         origin: 'system_infer',
         text: sanitizeForEvidence(observation.params.text ?? observation.params.content, workspaceDir) || undefined,
+        canonicalPainId: painId,
     });
     // Observe: track which principles would have prevented this pain (observation-only)
     try {
@@ -481,7 +476,7 @@ export function emitPainIfAdmitted(wctx, event, observation, outcome, admission,
         sessionId,
     });
     // Create painId inline (matches original createPainId)
-    const painId = `pain_${Date.now()}_${observation.errorHash.slice(0, 8)}`;
+    // PRI-453: painId is now generated early (above) to pass as canonicalPainId.
     emitPainDetectedEvent(wctx, {
         ts: new Date().toISOString(),
         type: 'pain_detected',
@@ -497,15 +492,16 @@ export function emitPainIfAdmitted(wctx, event, observation, outcome, admission,
             provenance: 'automatic_hook',
             evidence: buildTrajectoryEvidence(wctx, sessionId),
         },
-    });
+    }, { recordObservability: false });
 }
 // ── Shared Helpers ──────────────────────────────────────────────────────────
 export { buildTrajectoryEvidence } from './trajectory-evidence.js';
 /**
  * Reset trigger cooldown state (for tests).
+ * PRI-454: Delegates to shared cooldown Map reset.
  */
 export function resetTriggerCooldownForTest() {
-    clearCooldownState(TRIGGER_COOLDOWN_MAP);
+    resetSharedCooldownForTest();
 }
 // ── Source Classification ────────────────────────────────────────────────────
 // classifyToolFailureSource logic is now in resolveSourceKind (PRI-360 S1)