create-principles-disciple 1.145.28 → 1.145.29

package/host-runtime/dist/governance-signal-admission.js

@@ -395,7 +395,9 @@ function tryConsumeRateLimit({ db, rootSessionId, ruleVersion, now }) {
 }
 function insertCorrectionPain({ db, candidate, workspaceDir, painId, detection, nowIso }) {
     const reason = candidate.explicitOwnerStatement === true
-        ? `${candidate.hostKind === 'workbuddy' ? 'WorkBuddy' : 'Codex'} explicit owner statement (PD记录痛苦 prefix)`
+        ? candidate.explicitChannel === 'codex_explicit_agent'
+            ? 'Codex explicit owner statement (agent-assisted, no prefix)'
+            : `${candidate.hostKind === 'workbuddy' ? 'WorkBuddy' : 'Codex'} explicit owner statement (PD记录痛苦 prefix)`
         : detection !== undefined && detection.matchedTerms.length > 0
             ? `User correction detected: ${detection.matchedTerms.join(', ')}`
             : 'User correction detected';
@@ -461,7 +463,7 @@ function taskSubmissionPayload(candidate, workspaceDir, details) {
             ...(candidate.explicitOwnerStatement === true
                 ? { correctionEvidence: candidate.hostKind === 'workbuddy'
                         ? { text: boundCorrectionEvidenceText({ text: candidate.text, classification: 'owner_statement', channel: 'workbuddy_explicit_prefix' }, workspaceDir).text, classification: 'owner_statement', channel: 'workbuddy_explicit_prefix' }
-                        : { text: sanitizeString(candidate.text, workspaceDir), classification: 'owner_statement', channel: 'codex_explicit_prefix' } }
+                        : { text: sanitizeString(candidate.text, workspaceDir), classification: 'owner_statement', channel: candidate.explicitChannel === 'codex_explicit_agent' ? 'codex_explicit_agent' : 'codex_explicit_prefix' } }
                 : {}),
         };
         return JSON.stringify(payload);
@@ -482,6 +484,35 @@ function insertAdmissionMarker({ db, identity, canonicalPainId, ruleVersion, rea
     VALUES (?, ?, ?, ?, ?, 'admitted', ?, NULL, ?, ?, ?, ?, ?)`)
         .run(identity.hostKind, identity.logicalObservationKey, identity.rolloutIdentity, identity.rootSessionId, identity.signalKind, canonicalPainId, ruleVersion, reason.slice(0, MAX_REASON_BOUND) || null, payloadJson, nowIso, nowIso);
 }
+/**
+ * Convergence probe for the concurrent-redelivery race: two admission
+ * processes passed the pre-transaction marker probe before either committed,
+ * so the loser's marker INSERT hits the store UNIQUE constraint and its whole
+ * transaction rolls back. A marker AND its canonical pain now existing means
+ * the idempotency contract already WON — converge on the winner's state (the
+ * same semantics as the task-ensure race in ensureGovernanceDiagnosticianTask)
+ * instead of surfacing a governance_admission_failed that contradicts the
+ * durable state. The probe re-reads the store fresh (rc-7); when the durable
+ * facts do NOT exist it returns null and the original error propagates.
+ */
+function convergeOnAdmittedMarker(args) {
+    const marker = args.db.prepare('SELECT * FROM governance_signal_admissions WHERE logical_observation_key = ?').get(args.logicalObservationKey);
+    if (!isRecord(marker))
+        return null;
+    const canonicalPainId = rowField(marker, 'canonical_pain_id');
+    const taskId = rowField(marker, 'diagnostician_task_id');
+    if (typeof canonicalPainId !== 'string')
+        return null;
+    if (args.db.prepare('SELECT 1 FROM pain_events WHERE canonical_pain_id = ?').get(canonicalPainId) === undefined)
+        return null;
+    return {
+        disposition: 'already_admitted',
+        kind: args.kind,
+        logicalObservationKey: args.logicalObservationKey,
+        canonicalPainId,
+        diagnosticianTaskId: typeof taskId === 'string' ? taskId : null,
+    };
+}
 function admitCorrection({ db, candidate, workspaceDir, now, nowIso, keywordStore, onDegradation }) {
     // SPEC-CODEX-PAIN-CLOSURE-001 CR-07: an EXPLICIT Owner statement
     // (`PD记录痛苦：<text>` in the current Codex message) does not pass through
@@ -672,10 +703,23 @@ function admitOne({ db, candidate, workspaceDir, now, nowIso, keywordStore, onDe
             diagnosticianTaskId: typeof taskId === 'string' ? taskId : null,
         };
     }
-    if (candidate.kind === 'user_correction') {
-        return admitCorrection({ db, candidate, workspaceDir, now, nowIso, ...(keywordStore ? { keywordStore } : {}), ...(onDegradation ? { onDegradation } : {}) });
+    try {
+        if (candidate.kind === 'user_correction') {
+            return admitCorrection({ db, candidate, workspaceDir, now, nowIso, ...(keywordStore ? { keywordStore } : {}), ...(onDegradation ? { onDegradation } : {}) });
+        }
+        return admitToolFailure({ db, candidate, workspaceDir, nowIso });
+    }
+    catch (error) {
+        // RateLimitedSignal never reaches here — admitCorrection converts it to a
+        // rate_limited outcome internally. A store-level failure (e.g. the loser
+        // of a concurrent redelivery hitting the marker UNIQUE constraint) first
+        // gets a fresh convergence probe; only a failure with NO durable
+        // idempotency facts propagates as governance_admission_failed.
+        const converged = convergeOnAdmittedMarker({ db, logicalObservationKey: candidate.logicalObservationKey, kind: candidate.kind });
+        if (converged !== null)
+            return converged;
+        throw error;
     }
-    return admitToolFailure({ db, candidate, workspaceDir, nowIso });
 }
 /**
  * Admit governance signal candidates. Each candidate commits in its own
@@ -836,7 +880,7 @@ function isGovernanceTaskPayload(value) {
     const correctionEvidence = own(value, 'correctionEvidence');
     const hasOwnerStatement = isRecord(correctionEvidence)
         && own(correctionEvidence, 'classification') === 'owner_statement'
-        && (own(correctionEvidence, 'channel') === 'codex_explicit_prefix' && hostKind === 'codex'
+        && ((own(correctionEvidence, 'channel') === 'codex_explicit_prefix' || own(correctionEvidence, 'channel') === 'codex_explicit_agent') && hostKind === 'codex'
             || own(correctionEvidence, 'channel') === 'workbuddy_explicit_prefix' && hostKind === 'workbuddy')
         && typeof own(correctionEvidence, 'text') === 'string'
         && own(correctionEvidence, 'text').length > 0;
@@ -908,7 +952,7 @@ export async function ensureGovernanceDiagnosticianTask(input) {
         const stateManager = new RuntimeStateManager({ workspaceDir });
         try {
             await stateManager.initialize();
-            const existing = await stateManager.getTask(taskId);
+            let existing = await stateManager.getTask(taskId);
             if (existing === null) {
                 const stateDir = path.join(workspaceDir, '.state');
                 const config = loadPdConfigForPlugin(workspaceDir);
@@ -949,7 +993,16 @@ export async function ensureGovernanceDiagnosticianTask(input) {
                 // worker, so release it immediately (hook processes exit anyway).
                 await disposePainSignalBridgesForWorkspace(workspaceDir).catch(() => undefined);
                 if (result.status === 'failed') {
-                    return { ok: false, reason: `task_submit_failed:${(result.message ?? result.failureCategory ?? 'unknown').slice(0, 160)}`, nextAction: 'inspect the diagnostician runtime profile; reconciliation retries task creation without losing the admitted pain' };
+                    // Concurrent-ensure race (hook redelivery × worker reconcile): both
+                    // callers passed the getTask probe before either committed, and the
+                    // DETERMINISTIC task id makes the loser's insert hit the store PK.
+                    // The task existing now is the idempotency contract winning, not a
+                    // failure — converge on it (Case-B repair semantics) instead of
+                    // reporting a task_submit_failed that contradicts the durable state.
+                    existing = await stateManager.getTask(taskId);
+                    if (existing === null) {
+                        return { ok: false, reason: `task_submit_failed:${(result.message ?? result.failureCategory ?? 'unknown').slice(0, 160)}`, nextAction: 'inspect the diagnostician runtime profile; reconciliation retries task creation without losing the admitted pain' };
+                    }
                 }
             }
             db.prepare('UPDATE governance_signal_admissions SET diagnostician_task_id = ?, updated_at = ? WHERE logical_observation_key = ?')
@@ -995,11 +1048,12 @@ export function promoteAdmittedGovernanceEvidence(input) {
     return { ok: true, promoted: result.promoted, tailState: result.tailState };
 }
 /**
- * Given an admitted canonical pain (identified by its marker), ensure both
- * the Diagnostician task AND the evidence promotion exist idempotently.
+ * Given an admitted canonical pain (identified by its marker), ensure the
+ * Diagnostician task and, only with current conversation-ingestion consent,
+ * the evidence promotion exist idempotently.
  * Single ensure path for both fresh admits and crash recovery (already_admitted
- * redelivery). The marker row carries rollout_identity so the function is
- * self-contained (caller only needs workspaceDir, logicalObservationKey, painId).
+ * redelivery). The marker row carries rollout_identity; callers must also
+ * provide the current conversation-ingestion consent.
  */
 export async function ensureGovernanceContinuation(input) {
     const workspaceDir = path.resolve(input.workspaceDir);
@@ -1016,23 +1070,26 @@ export async function ensureGovernanceContinuation(input) {
         if (typeof rolloutIdentity !== 'string' || rolloutIdentity.length === 0) {
             return { ok: false, reason: 'marker_missing_rollout_identity', nextAction: 're-admit the signal' };
         }
-        // 1. Ensure task (idempotent)
+        // Promote before making a runnable task visible, so a worker racing this
+        // continuation cannot begin diagnosis before the eligible evidence window
+        // has been promoted. A promotion failure is retained as a degradation,
+        // but never prevents the task from being durably ensured.
+        const promoted = input.conversationIngestionEnabled
+            ? promoteAdmittedGovernanceEvidence({
+                workspaceDir,
+                rolloutIdentity,
+                triggerLogicalKey: input.logicalObservationKey,
+                canonicalPainId: input.canonicalPainId,
+            })
+            : undefined;
         const ensured = await ensureGovernanceDiagnosticianTask({ workspaceDir, logicalObservationKey: input.logicalObservationKey, canonicalPainId: input.canonicalPainId });
         if (!ensured.ok) {
             return { ok: false, reason: ensured.reason, nextAction: ensured.nextAction };
         }
-        // 2. Ensure promotion (idempotent substrate — already promoted = no-op,
-        //    pending tail = re-complete, never started = start now).
-        const promoted = promoteAdmittedGovernanceEvidence({
-            workspaceDir,
-            rolloutIdentity,
-            triggerLogicalKey: input.logicalObservationKey,
-            canonicalPainId: input.canonicalPainId,
-        });
-        if (!promoted.ok) {
-            return { ok: false, reason: promoted.reason, nextAction: promoted.nextAction };
+        if (promoted !== undefined && !promoted.ok) {
+            return { ok: false, reason: promoted.reason, nextAction: promoted.nextAction, taskId: ensured.taskId, taskCreated: ensured.created, linkRepaired: ensured.linkRepaired };
         }
-        return { ok: true, taskId: ensured.taskId, taskCreated: ensured.created, linkRepaired: ensured.linkRepaired, promoted: promoted.promoted, tailState: promoted.tailState };
+        return { ok: true, taskId: ensured.taskId, taskCreated: ensured.created, linkRepaired: ensured.linkRepaired, promoted: promoted?.promoted ?? 0, tailState: promoted?.tailState ?? 'skipped' };
     }
     finally {
         close();
@@ -1164,10 +1221,13 @@ export async function admitBareHostPains(input) {
 /**
  * Narrow idempotent reconciliation between the trajectory admission markers
  * and the Runtime V2 task store (separate SQLite databases — no cross-store
- * transaction exists, SPEC §13). Recovers:
+ * transaction exists, SPEC §13). Current conversation-ingestion consent is
+ * mandatory because it controls whether Codex observations may be read and
+ * promoted; task/link recovery remains available when consent is off. Recovers:
  *  - Case A: pain admitted, crash before task creation → create the task now;
  *  - Case B: task exists, crash before the link write → repair the link;
- *  - Case C: pain+task, crash before promotion → promote evidence now;
+ *  - Case C: pain+task, crash before promotion → promote evidence now only
+ *    while conversation-ingestion consent is enabled;
  *  - Case D: promotion started → pending tail → retry completion once; stale
  *    tails are reported (never silently dropped).
  * Not a background worker — Slice C's Companion worker and the CLI call this.
@@ -1194,7 +1254,8 @@ export async function reconcileGovernanceContinuation(input) {
         //
         // Recovery needed:
         //   Case A/B: task link missing (crash before task, or before the link write)
-        //   Case C:   promotion never started (no observation carries this painRef)
+        //   Case C:   promotion never started (no observation carries this painRef),
+        //             but only while current conversation-ingestion consent is on.
         //
         // Case C/D (promotion recovery) is scoped to the hosts whose evidence
         // substrate it exists for: the promotion rows come from transcript
@@ -1211,14 +1272,17 @@ export async function reconcileGovernanceContinuation(input) {
         // not retry pending tails, so pending-tail markers do not block later
         // markers. Stale tails are NOT auto-recoverable (substrate refuses to
         // re-arm them): they are counted separately below and reported.
+        const promotionRecoveryClause = input.conversationIngestionEnabled
+            ? `OR (a.host_kind = 'codex'
+              AND NOT EXISTS (SELECT 1 FROM governance_observations o
+                  WHERE o.promotion_ref = a.canonical_pain_id))`
+            : '';
         const markers = db.prepare(`SELECT a.logical_observation_key, a.canonical_pain_id, a.host_kind
       FROM governance_signal_admissions a
       WHERE a.decision = 'admitted'
         AND (
           a.diagnostician_task_id IS NULL
-          OR (a.host_kind = 'codex'
-              AND NOT EXISTS (SELECT 1 FROM governance_observations o
-                  WHERE o.promotion_ref = a.canonical_pain_id))
+          ${promotionRecoveryClause}
         )
       ORDER BY a.id LIMIT ?`).all(limit);
         for (const row of markers) {
@@ -1243,7 +1307,7 @@ export async function reconcileGovernanceContinuation(input) {
                 }
                 continue;
             }
-            const cont = await ensureGovernanceContinuation({ workspaceDir, logicalObservationKey: key, canonicalPainId: painId });
+            const cont = await ensureGovernanceContinuation({ workspaceDir, logicalObservationKey: key, canonicalPainId: painId, conversationIngestionEnabled: input.conversationIngestionEnabled });
             if (cont.ok) {
                 // Only count REAL actions: a task actually created, a link actually
                 // repaired (task existed but the marker link was missing). Healthy
@@ -1259,13 +1323,19 @@ export async function reconcileGovernanceContinuation(input) {
                     completedTails += 1;
             }
             else {
+                if (cont.taskCreated)
+                    tasksEnsured += 1;
+                if (cont.linkRepaired)
+                    linksRepaired += 1;
                 degradations.push(`${key}:${cont.reason}`);
             }
         }
         // Also report stale tails scoped to governance admissions.
-        const stale = db.prepare(`SELECT COUNT(*) AS n FROM governance_pending_promotion_tails t
-      WHERE t.state = 'stale'
-        AND EXISTS (SELECT 1 FROM governance_signal_admissions a WHERE a.canonical_pain_id = t.pain_ref)`).get();
+        const stale = input.conversationIngestionEnabled
+            ? db.prepare(`SELECT COUNT(*) AS n FROM governance_pending_promotion_tails t
+          WHERE t.state = 'stale'
+            AND EXISTS (SELECT 1 FROM governance_signal_admissions a WHERE a.canonical_pain_id = t.pain_ref)`).get()
+            : { n: 0 };
         const staleTails = typeof rowField(stale, 'n') === 'number' ? rowField(stale, 'n') : 0;
         return {
             ok: degradations.length === 0,

package/host-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@principles/host-runtime",
-  "version": "0.13.3",
+  "version": "0.14.0",
   "description": "Shared host-neutral orchestration for Principles Disciple MVP-Core hook paths.",
   "type": "module",
   "main": "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-principles-disciple",
-  "version": "1.145.28",
+  "version": "1.145.29",
   "description": "Interactive CLI installer for Principles Disciple OpenClaw plugin",
   "type": "module",
   "bin": {
@@ -89,6 +89,6 @@
     "directory": "packages/create-principles-disciple"
   },
   "pd": {
-    "bundledPluginVersion": "2.2.3"
+    "bundledPluginVersion": "2.2.4"
   }
 }

package/pd-cli/dist/commands/codex-reconcile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-reconcile.d.ts","sourceRoot":"","sources":["../../src/commands/codex-reconcile.ts"],"names":[],"mappings":"AAmBA,UAAU,qBAAqB;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2CxF"}
+{"version":3,"file":"codex-reconcile.d.ts","sourceRoot":"","sources":["../../src/commands/codex-reconcile.ts"],"names":[],"mappings":"AAoBA,UAAU,qBAAqB;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqExF"}

package/pd-cli/dist/commands/codex-reconcile.js

@@ -15,12 +15,41 @@
  * - cli-6: degraded results include reason + nextAction.
  */
 import { resolveWorkspaceDir } from '../resolve-workspace.js';
-import { reconcileGovernanceContinuation } from '@principles/host-runtime';
+import { loadPdConfigForPlugin, reconcileGovernanceContinuation } from '@principles/host-runtime';
+import { computeFeatureFlagsFromConfig } from '@principles/core/runtime-v2';
 export async function handleCodexReconcile(options) {
     const generatedAt = new Date().toISOString();
     const workspace = resolveWorkspaceDir(options.workspace);
+    const config = loadPdConfigForPlugin(workspace);
+    if (!config.ok) {
+        const [first] = config.errors;
+        const reason = `pd_config_invalid:${first?.reason ?? 'unknown'}`;
+        const nextAction = first?.nextAction ?? 'Repair the Workspace .pd/config.yaml before reconciling; the conversation-ingestion consent could not be verified.';
+        const report = {
+            generatedAt,
+            host: 'codex',
+            workspace,
+            ok: false,
+            reason,
+            nextAction,
+            tasksEnsured: 0,
+            linksRepaired: 0,
+            pendingTails: 0,
+            completedTails: 0,
+            staleTails: 0,
+            degradations: [reason],
+        };
+        if (options.json)
+            console.log(JSON.stringify(report));
+        else
+            console.log([`Codex governance reconciliation (${workspace})`, `  reason: ${reason}`, `  next action: ${nextAction}`].join('\n'));
+        process.exitCode = 1;
+        return;
+    }
+    const conversationIngestionEnabled = computeFeatureFlagsFromConfig(config.effective).flags.codex_conversation_ingestion?.enabled === true;
     const result = await reconcileGovernanceContinuation({
         workspaceDir: workspace,
+        conversationIngestionEnabled,
         ...(typeof options.limit === 'number' ? { limit: options.limit } : {}),
     });
     const report = {

package/pd-cli/dist/commands/codex-reconcile.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-reconcile.js","sourceRoot":"","sources":["../../src/commands/codex-reconcile.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAuB3E,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAA8B;IACvE,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEzD,MAAM,MAAM,GAAG,MAAM,+BAA+B,CAAC;QACnD,YAAY,EAAE,SAAS;QACvB,GAAG,CAAC,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE,CAAC,CAAC;IAEH,MAAM,MAAM,GAAyB;QACnC,WAAW;QACX,IAAI,EAAE,OAAO;QACb,SAAS;QACT,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,YAAY,EAAE,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;QACtC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,uBAAuB,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,8EAA8E,EAAE,CAAC;KAC5L,CAAC;IAEF,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrC,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,oCAAoC,SAAS,GAAG;QAChD,yBAAyB,MAAM,CAAC,YAAY,qBAAqB,MAAM,CAAC,aAAa,GAAG;QACxF,iCAAiC,MAAM,CAAC,YAAY,kBAAkB,MAAM,CAAC,cAAc,UAAU,MAAM,CAAC,UAAU,EAAE;KACzH,CAAC;IACF,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QAC9C,KAAK,CAAC,IAAI,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,aAAa,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"codex-reconcile.js","sourceRoot":"","sources":["../../src/commands/codex-reconcile.ts"],"names":[],"mappings":"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"}

package/pd-cli/dist/commands/pain-explicit.d.ts

@@ -0,0 +1,8 @@
+interface ExplicitOptions {
+    statement?: string;
+    workspace?: string;
+    json?: boolean;
+}
+export declare function handlePainExplicit(opts: ExplicitOptions): Promise<void>;
+export {};
+//# sourceMappingURL=pain-explicit.d.ts.map

package/pd-cli/dist/commands/pain-explicit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pain-explicit.d.ts","sourceRoot":"","sources":["../../src/commands/pain-explicit.ts"],"names":[],"mappings":"AAuBA,UAAU,eAAe;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AA+BD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAmC7E"}

package/pd-cli/dist/commands/pain-explicit.js

@@ -0,0 +1,89 @@
+/**
+ * pd pain explicit — agent-assisted explicit Owner pain registration from the
+ * LIVE Codex turn context (no `PD记录痛苦：` prefix).
+ *
+ * Usage:
+ *   pd pain explicit --statement "<Owner 原文>" [--workspace <path>] [--json]
+ *
+ * The command takes NO lineage flags by design: the Codex hook wrote the
+ * current turn's host-verified identity to `<workspace>/.state/`, and the
+ * bridge (registerCurrentTurnOwnerStatement) re-validates it — transcript
+ * existence, CODEX_HOME containment, workspace match — inside the SAME
+ * admission chain the prefix entry uses (governance admission marker,
+ * explicit rate-limit bucket, diagnostician task ensure). The model never
+ * supplies session/rollout/turn ids, so it cannot guess or fabricate them.
+ *
+ * This is NOT `pd pain record`: that command is the unbound operator/recovery
+ * entry (manual pain ids, no admission marker); this one is the bound
+ * agent-assisted counterpart of the prefix entry.
+ */
+import { registerCurrentTurnOwnerStatement } from '@principles/codex-adapter';
+import { MAX_OWNER_STATEMENT_CHARS } from '@principles/host-runtime';
+import { resolveWorkspaceDir } from '../resolve-workspace.js';
+const FAILURE_MESSAGES = {
+    statement_empty: 'The Owner statement is empty; nothing was recorded.',
+    statement_too_long: `The Owner statement exceeds ${MAX_OWNER_STATEMENT_CHARS} characters; nothing was recorded (never truncated).`,
+    turn_context_missing: 'No live Codex turn context: the turn already completed, the session restarted, or the PD hook did not run.',
+    turn_context_stale: 'The live Codex turn context is stale — the turn is treated as ended; nothing was recorded.',
+    turn_context_invalid: 'The Codex turn context file is malformed or unsupported; nothing was recorded.',
+    turn_context_workspace_mismatch: 'The live turn context belongs to a different PD workspace; nothing was recorded.',
+    turn_context_session_mismatch: 'The live turn context does not belong to this Codex session; nothing was recorded.',
+    caller_session_missing: 'No host-bound Codex session identity is available; nothing was recorded.',
+    caller_session_conflict: 'The host-bound Codex session and thread identities conflict; nothing was recorded.',
+    conversation_ingestion_config_invalid: 'The workspace configuration could not be validated, so conversation-ingestion consent could not be determined; nothing was recorded.',
+    transcript_unavailable: 'The Codex transcript for the live turn is unavailable; nothing was recorded.',
+    lineage_invalid: 'The live turn context failed lineage validation; nothing was recorded.',
+    rate_limited: 'The per-root-session explicit statement quota (5/hour) is exhausted; nothing was recorded.',
+    continuation_failed: 'The governance admission or diagnostician-task continuation failed; nothing was recorded.',
+    workspace_unresolvable: 'No PD workspace could be resolved for this invocation.',
+};
+function emitFailure(opts, failure) {
+    if (opts.json) {
+        console.log(JSON.stringify({ status: 'failed', reason: failure.reason, message: failure.message, nextAction: failure.nextAction }, null, 2));
+    }
+    else {
+        console.error(`Error: ${failure.message}`);
+        console.error(`Reason: ${failure.reason}`);
+        console.error(`Next action: ${failure.nextAction}`);
+    }
+    process.exit(1);
+}
+export async function handlePainExplicit(opts) {
+    let workspaceDir;
+    try {
+        workspaceDir = resolveWorkspaceDir(opts.workspace);
+    }
+    catch (error) {
+        const detail = error instanceof Error ? error.message : String(error);
+        emitFailure(opts, { reason: 'workspace_unresolvable', message: detail.slice(0, 400), nextAction: 'Pass --workspace explicitly or run from a directory inside a PD workspace.' });
+    }
+    const result = await registerCurrentTurnOwnerStatement({
+        workspaceDir,
+        statementText: opts.statement ?? '',
+    });
+    if (result.status !== 'received') {
+        emitFailure(opts, {
+            reason: result.reason,
+            message: FAILURE_MESSAGES[result.reason] ?? 'The explicit registration was rejected; nothing was recorded.',
+            nextAction: result.nextAction,
+        });
+    }
+    if (opts.json) {
+        console.log(JSON.stringify({
+            status: 'received',
+            disposition: result.disposition,
+            painId: result.painId,
+            taskId: result.taskId,
+            logicalObservationKey: result.logicalObservationKey,
+            ...(result.promotionDegraded !== undefined ? { promotionDegraded: result.promotionDegraded } : {}),
+        }, null, 2));
+    }
+    else {
+        const duplicateNote = result.disposition === 'already_admitted' ? ' (duplicate submission merged into the same signal)' : '';
+        console.log(`Pain registered${duplicateNote}: painId=${result.painId} taskId=${result.taskId}`);
+        if (result.promotionDegraded !== undefined) {
+            console.error(`Warning: session-evidence promotion degraded: ${result.promotionDegraded}`);
+        }
+    }
+}
+//# sourceMappingURL=pain-explicit.js.map

package/pd-cli/dist/commands/pain-explicit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pain-explicit.js","sourceRoot":"","sources":["../../src/commands/pain-explicit.ts"],"names":[],"mappings":"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"}

package/pd-cli/dist/index.js

@@ -7,6 +7,7 @@
  */
 import { Command, Option } from 'commander';
 import { handlePainRecord } from './commands/pain-record.js';
+import { handlePainExplicit } from './commands/pain-explicit.js';
 import { registerPainRetryCommand } from './commands/pain-retry.js';
 import { handlePainRecall, parsePainRecallLimit } from './commands/pain-recall.js';
 import { handlePainEvidence } from './commands/pain-evidence.js';
@@ -121,6 +122,15 @@ painCmd
     .action(async (opts) => {
     await handlePainRecord(opts);
 });
+painCmd
+    .command('explicit')
+    .description('Register an explicit Owner pain statement from the live Codex turn context (agent-assisted, no prefix; same admission chain as PD记录痛苦： — takes no lineage flags)')
+    .option('--statement <text>', 'Owner verbatim statement (1-500 chars, required; rejected when longer — never truncated)')
+    .option('-w, --workspace <path>', 'Workspace directory')
+    .option('--json', 'Output raw JSON')
+    .action(async (opts) => {
+    await handlePainExplicit(opts);
+});
 registerPainRetryCommand(painCmd);
 painCmd
     .command('list')