@askdkc/kiokuko 0.1.16 → 0.1.19

package/dist/context/feedback.js

@@ -1,12 +1,39 @@
 import { createHash } from 'node:crypto';
+import { isProxy } from 'node:util/types';
 import { withImmediateTransaction } from '../db/transaction.js';
 import { KiokukoError } from '../errors.js';
 import { sanitizeJson } from '../security/sanitize.js';
 import { canonicalContentHash } from '../serialization/validate.js';
+import { entryOriginMatchesWorkspace, isContextEntryOrigin } from './origin.js';
 export const MAX_FEEDBACK_COMMENT_BYTES = 4 * 1024;
+export const MAX_FEEDBACK_OUTCOME_BYTES = 4 * 1024;
 export const MAX_FEEDBACK_IDENTIFIER_LENGTH = 256;
 export const CONTEXT_FEEDBACK_VERDICTS = ['helpful', 'irrelevant', 'stale', 'conflicting'];
 export const RUN_FEEDBACK_RECOMMENDATION_VERDICTS = ['accepted', 'dismissed', 'resolved'];
+/** Shared cross-run feedback evidence for retrieval policy consumers. */
+export function contextFeedbackSignals(database, entryId) {
+    const rows = database.prepare(`
+    SELECT verdict, COUNT(DISTINCT run_id) AS distinctRuns
+      FROM context_feedback
+     WHERE entry_id = ?
+     GROUP BY verdict
+  `).all(entryId);
+    const byVerdict = new Map();
+    for (const row of rows) {
+        if (typeof row.verdict !== 'string'
+            || !CONTEXT_FEEDBACK_VERDICTS.includes(row.verdict)
+            || typeof row.distinctRuns !== 'number'
+            || !Number.isSafeInteger(row.distinctRuns)
+            || row.distinctRuns < 1) {
+            throw new KiokukoError('INTEGRITY_ERROR', 'Stored context feedback aggregate is invalid');
+        }
+        byVerdict.set(row.verdict, row.distinctRuns);
+    }
+    return CONTEXT_FEEDBACK_VERDICTS.flatMap((verdict) => {
+        const distinctRuns = byVerdict.get(verdict);
+        return distinctRuns === undefined ? [] : [{ verdict, distinctRuns, boundedInfluence: Math.min(2, distinctRuns) }];
+    });
+}
 const CONTEXT_INPUT_FIELDS = new Set([
     'workspace', 'feedbackId', 'deliveryId', 'entryId', 'entryRevision', 'runId', 'verdict',
     'comment', 'actor', 'idempotencyKey', 'createdAt',
@@ -41,20 +68,75 @@ function databaseFailure() {
     return fail('DATABASE_ERROR', DATABASE_MESSAGE);
 }
 function isPlainObject(value) {
-    if (typeof value !== 'object' || value === null || Array.isArray(value))
+    if (typeof value !== 'object' || value === null || Array.isArray(value) || isProxy(value))
         return false;
     const prototype = Object.getPrototypeOf(value);
     return prototype === Object.prototype || prototype === null;
 }
+function inputFields(value, allowed, exact = false) {
+    if (!isPlainObject(value))
+        validation();
+    const keys = Reflect.ownKeys(value);
+    if (exact && keys.length !== allowed.size)
+        validation();
+    const descriptors = Object.getOwnPropertyDescriptors(value);
+    const result = Object.create(null);
+    for (const key of keys) {
+        if (typeof key !== 'string' || !allowed.has(key))
+            validation();
+        const descriptor = descriptors[key];
+        if (!descriptor || !('value' in descriptor) || descriptor.enumerable !== true)
+            validation();
+        result[key] = descriptor.value;
+    }
+    return result;
+}
 function isKiokukoError(error) {
     return error instanceof KiokukoError;
 }
-function normalizeDatabaseError(error) {
+const SQLITE_CONSTRAINT_PRIMARY_KEY = 1_555;
+const SQLITE_CONSTRAINT_UNIQUE = 2_067;
+const NO_UNIQUENESS_FAILURES = new Set();
+const SQLITE_OPERATIONAL_PRIMARY_CODES = new Set([5, 6, 7, 8, 9, 10, 13, 14, 15, 22, 23]);
+const SQLITE_INTEGRITY_PRIMARY_CODES = new Set([11, 24, 26]);
+const CONTEXT_FEEDBACK_UNIQUENESS_FAILURES = new Set([
+    'UNIQUE constraint failed: context_feedback.feedback_id',
+    'UNIQUE constraint failed: context_feedback.run_id, context_feedback.actor, context_feedback.idempotency_key',
+]);
+const RUN_FEEDBACK_UNIQUENESS_FAILURES = new Set([
+    'UNIQUE constraint failed: run_feedback.feedback_id',
+    'UNIQUE constraint failed: run_feedback.run_id, run_feedback.actor, run_feedback.idempotency_key',
+]);
+const INTAKE_FEEDBACK_UNIQUENESS_FAILURES = new Set([
+    'UNIQUE constraint failed: intake_feedback.feedback_id',
+    'UNIQUE constraint failed: intake_feedback.run_id, intake_feedback.actor, intake_feedback.idempotency_key',
+]);
+function nodeSqliteFailure(error) {
+    if (!(error instanceof Error))
+        return null;
+    const failure = error;
+    if (failure.code !== 'ERR_SQLITE_ERROR'
+        || typeof failure.errcode !== 'number'
+        || !Number.isSafeInteger(failure.errcode)
+        || failure.errcode < 0)
+        return null;
+    return failure;
+}
+function normalizeDatabaseError(error, uniquenessFailures = NO_UNIQUENESS_FAILURES) {
     if (isKiokukoError(error))
         throw error;
-    if (error instanceof Error && /unique|constraint/i.test(error.message))
+    const failure = nodeSqliteFailure(error);
+    if (failure === null)
+        throw error;
+    if ((failure.errcode === SQLITE_CONSTRAINT_PRIMARY_KEY || failure.errcode === SQLITE_CONSTRAINT_UNIQUE)
+        && uniquenessFailures.has(failure.message))
         conflict();
-    databaseFailure();
+    const primaryResultCode = failure.errcode & 0xff;
+    if (SQLITE_INTEGRITY_PRIMARY_CODES.has(primaryResultCode))
+        integrity();
+    if (SQLITE_OPERATIONAL_PRIMARY_CODES.has(primaryResultCode))
+        databaseFailure();
+    throw error;
 }
 function requiredString(value) {
     if (typeof value !== 'string' || value.length === 0 || value.length > MAX_FEEDBACK_IDENTIFIER_LENGTH)
@@ -68,13 +150,23 @@ function optionalText(value, maximum) {
         validation();
     return value;
 }
-function normalizeTimestamp(value) {
-    if (typeof value !== 'string' || value.length === 0)
+function optionalUtf8Text(value, maximumBytes) {
+    if (value === undefined || value === null)
+        return null;
+    if (typeof value !== 'string' || value.length === 0 || Buffer.byteLength(value, 'utf8') > maximumBytes)
         validation();
-    const date = new Date(value);
-    if (Number.isNaN(date.getTime()))
+    return value;
+}
+function isCanonicalFeedbackTimestamp(value) {
+    if (typeof value !== 'string' || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value))
+        return false;
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) && new Date(parsed).toISOString() === value;
+}
+export function validateFeedbackTimestamp(value) {
+    if (!isCanonicalFeedbackTimestamp(value))
         validation();
-    return date.toISOString();
+    return value;
 }
 function normalizeComment(value, workspace) {
     if (value === undefined || value === null)
@@ -83,13 +175,7 @@ function normalizeComment(value, workspace) {
         validation();
     if (value.trim().length === 0)
         return null;
-    let sanitized;
-    try {
-        sanitized = sanitizeJson(value, { workspace }).value;
-    }
-    catch {
-        validation();
-    }
+    const sanitized = sanitizeJson(value, { workspace }).value;
     if (typeof sanitized !== 'string')
         validation();
     if (sanitized.trim().length === 0)
@@ -129,168 +215,127 @@ function runBodyHash(input) {
     });
 }
 function validateContextFeedbackInput(value) {
-    try {
-        if (!isPlainObject(value))
-            validation();
-        for (const field of Object.keys(value)) {
-            if (!CONTEXT_INPUT_FIELDS.has(field))
-                validation();
-        }
-        const workspace = requiredString(value.workspace);
-        const feedbackId = requiredString(value.feedbackId);
-        const deliveryId = requiredString(value.deliveryId);
-        const entryId = requiredString(value.entryId);
-        const entryRevision = value.entryRevision === undefined
-            ? undefined
-            : typeof value.entryRevision === 'number' && Number.isSafeInteger(value.entryRevision) && value.entryRevision > 0
-                ? value.entryRevision
-                : validation();
-        const runId = requiredString(value.runId);
-        if (typeof value.verdict !== 'string' || !CONTEXT_FEEDBACK_VERDICTS.includes(value.verdict))
-            validation();
-        const verdict = value.verdict;
-        const actor = requiredString(value.actor);
-        const idempotencyKey = requiredString(value.idempotencyKey);
-        const createdAt = normalizeTimestamp(value.createdAt);
-        const comment = normalizeComment(value.comment, workspace);
-        return {
-            feedbackId,
-            workspace,
-            deliveryId,
-            entryId,
-            ...(entryRevision === undefined ? {} : { entryRevision }),
-            runId,
-            verdict,
-            comment,
-            actor,
-            idempotencyKeyHash: hashIdempotencyKey(idempotencyKey),
-            createdAt,
-        };
-    }
-    catch (error) {
-        if (isKiokukoError(error) && error.code === 'VALIDATION_ERROR')
-            validation();
+    const fields = inputFields(value, CONTEXT_INPUT_FIELDS);
+    const workspace = requiredString(fields.workspace);
+    const feedbackId = requiredString(fields.feedbackId);
+    const deliveryId = requiredString(fields.deliveryId);
+    const entryId = requiredString(fields.entryId);
+    const entryRevision = fields.entryRevision === undefined
+        ? undefined
+        : typeof fields.entryRevision === 'number' && Number.isSafeInteger(fields.entryRevision) && fields.entryRevision > 0
+            ? fields.entryRevision
+            : validation();
+    const runId = requiredString(fields.runId);
+    if (typeof fields.verdict !== 'string' || !CONTEXT_FEEDBACK_VERDICTS.includes(fields.verdict))
         validation();
-    }
+    const verdict = fields.verdict;
+    const actor = requiredString(fields.actor);
+    const idempotencyKey = requiredString(fields.idempotencyKey);
+    const createdAt = validateFeedbackTimestamp(fields.createdAt);
+    const comment = normalizeComment(fields.comment, workspace);
+    return {
+        feedbackId,
+        workspace,
+        deliveryId,
+        entryId,
+        ...(entryRevision === undefined ? {} : { entryRevision }),
+        runId,
+        verdict,
+        comment,
+        actor,
+        idempotencyKeyHash: hashIdempotencyKey(idempotencyKey),
+        createdAt,
+    };
 }
 function validateContextFeedbackListInput(value) {
-    try {
-        if (!isPlainObject(value))
-            validation();
-        for (const field of Object.keys(value)) {
-            if (!CONTEXT_LIST_FIELDS.has(field))
-                validation();
-        }
-        const workspace = requiredString(value.workspace);
-        const runId = value.runId === undefined ? undefined : requiredString(value.runId);
-        const deliveryId = value.deliveryId === undefined ? undefined : requiredString(value.deliveryId);
-        const entryId = value.entryId === undefined ? undefined : requiredString(value.entryId);
-        const limit = value.limit === undefined ? 100 : value.limit;
-        if (typeof limit !== 'number' || !Number.isInteger(limit) || limit < 1 || limit > 100)
-            validation();
-        return {
-            workspace,
-            ...(runId === undefined ? {} : { runId }),
-            ...(deliveryId === undefined ? {} : { deliveryId }),
-            ...(entryId === undefined ? {} : { entryId }),
-            limit,
-        };
-    }
-    catch (error) {
-        if (isKiokukoError(error) && error.code === 'VALIDATION_ERROR')
-            validation();
+    const fields = inputFields(value, CONTEXT_LIST_FIELDS);
+    const workspace = requiredString(fields.workspace);
+    const runId = fields.runId === undefined ? undefined : requiredString(fields.runId);
+    const deliveryId = fields.deliveryId === undefined ? undefined : requiredString(fields.deliveryId);
+    const entryId = fields.entryId === undefined ? undefined : requiredString(fields.entryId);
+    const limit = fields.limit === undefined ? 100 : fields.limit;
+    if (typeof limit !== 'number' || !Number.isInteger(limit) || limit < 1 || limit > 100)
         validation();
-    }
+    return {
+        workspace,
+        ...(runId === undefined ? {} : { runId }),
+        ...(deliveryId === undefined ? {} : { deliveryId }),
+        ...(entryId === undefined ? {} : { entryId }),
+        limit,
+    };
 }
 function validateRunFeedbackListInput(value) {
-    try {
-        if (!isPlainObject(value))
-            validation();
-        for (const field of Object.keys(value)) {
-            if (!RUN_LIST_FIELDS.has(field))
-                validation();
-        }
-        const workspace = requiredString(value.workspace);
-        const runId = value.runId === undefined ? undefined : requiredString(value.runId);
-        const limit = value.limit === undefined ? 100 : value.limit;
-        if (typeof limit !== 'number' || !Number.isInteger(limit) || limit < 1 || limit > 100)
-            validation();
-        return { workspace, ...(runId === undefined ? {} : { runId }), limit };
-    }
-    catch (error) {
-        if (isKiokukoError(error) && error.code === 'VALIDATION_ERROR')
-            validation();
+    const fields = inputFields(value, RUN_LIST_FIELDS);
+    const workspace = requiredString(fields.workspace);
+    const runId = fields.runId === undefined ? undefined : requiredString(fields.runId);
+    const limit = fields.limit === undefined ? 100 : fields.limit;
+    if (typeof limit !== 'number' || !Number.isInteger(limit) || limit < 1 || limit > 100)
         validation();
-    }
+    return { workspace, ...(runId === undefined ? {} : { runId }), limit };
 }
 function validateRunFeedbackInput(value) {
-    try {
-        if (!isPlainObject(value))
-            validation();
-        for (const field of Object.keys(value)) {
-            if (!RUN_INPUT_FIELDS.has(field))
-                validation();
-        }
-        const workspace = requiredString(value.workspace);
-        const feedbackId = requiredString(value.feedbackId);
-        const runId = requiredString(value.runId);
-        const outcome = optionalText(value.outcome, MAX_FEEDBACK_COMMENT_BYTES);
-        const recommendationCode = optionalText(value.recommendationCode, MAX_FEEDBACK_IDENTIFIER_LENGTH);
-        const rawRecommendationVerdict = value.recommendationVerdict;
-        const recommendationVerdict = rawRecommendationVerdict === undefined || rawRecommendationVerdict === null
-            ? null
-            : typeof rawRecommendationVerdict === 'string' && RUN_FEEDBACK_RECOMMENDATION_VERDICTS.includes(rawRecommendationVerdict)
-                ? rawRecommendationVerdict
-                : validation();
-        if ((recommendationCode === null) !== (recommendationVerdict === null))
-            validation();
-        const rawRating = value.rating;
-        const rating = rawRating === undefined || rawRating === null
-            ? null
-            : typeof rawRating === 'number' && Number.isInteger(rawRating) && rawRating >= 1 && rawRating <= 5
-                ? rawRating
-                : validation();
-        if (outcome === null && recommendationCode === null && rating === null)
-            validation();
-        const actor = requiredString(value.actor);
-        const idempotencyKey = requiredString(value.idempotencyKey);
-        const createdAt = normalizeTimestamp(value.createdAt);
-        const comment = normalizeComment(value.comment, workspace);
-        return {
-            feedbackId,
-            workspace,
-            runId,
-            outcome,
-            recommendationCode,
-            recommendationVerdict,
-            rating,
-            comment,
-            actor,
-            idempotencyKeyHash: hashIdempotencyKey(idempotencyKey),
-            createdAt,
-        };
-    }
-    catch (error) {
-        if (isKiokukoError(error) && error.code === 'VALIDATION_ERROR')
-            validation();
+    const fields = inputFields(value, RUN_INPUT_FIELDS);
+    const workspace = requiredString(fields.workspace);
+    const feedbackId = requiredString(fields.feedbackId);
+    const runId = requiredString(fields.runId);
+    const outcome = optionalUtf8Text(fields.outcome, MAX_FEEDBACK_OUTCOME_BYTES);
+    const recommendationCode = optionalText(fields.recommendationCode, MAX_FEEDBACK_IDENTIFIER_LENGTH);
+    const rawRecommendationVerdict = fields.recommendationVerdict;
+    const recommendationVerdict = rawRecommendationVerdict === undefined || rawRecommendationVerdict === null
+        ? null
+        : typeof rawRecommendationVerdict === 'string' && RUN_FEEDBACK_RECOMMENDATION_VERDICTS.includes(rawRecommendationVerdict)
+            ? rawRecommendationVerdict
+            : validation();
+    if ((recommendationCode === null) !== (recommendationVerdict === null))
         validation();
-    }
+    const rawRating = fields.rating;
+    const rating = rawRating === undefined || rawRating === null
+        ? null
+        : typeof rawRating === 'number' && Number.isInteger(rawRating) && rawRating >= 1 && rawRating <= 5
+            ? rawRating
+            : validation();
+    if (outcome === null && recommendationCode === null && rating === null)
+        validation();
+    const actor = requiredString(fields.actor);
+    const idempotencyKey = requiredString(fields.idempotencyKey);
+    const createdAt = validateFeedbackTimestamp(fields.createdAt);
+    const comment = normalizeComment(fields.comment, workspace);
+    return {
+        feedbackId,
+        workspace,
+        runId,
+        outcome,
+        recommendationCode,
+        recommendationVerdict,
+        rating,
+        comment,
+        actor,
+        idempotencyKeyHash: hashIdempotencyKey(idempotencyKey),
+        createdAt,
+    };
 }
 function assertContextTarget(database, input) {
     const target = database.prepare(`
-    SELECT cde.entry_revision AS entry_revision
+    SELECT cde.entry_revision AS entry_revision, cde.origin_scope AS origin_scope,
+           e.workspace AS entry_workspace, er.workspace AS revision_workspace
     FROM context_deliveries AS cd
     JOIN ledger_runs AS lr ON lr.run_id = cd.run_id
     JOIN context_delivery_entries AS cde
       ON cde.delivery_id = cd.delivery_id AND cde.entry_id = ?
     JOIN entries AS e ON e.id = cde.entry_id
+    JOIN entry_revisions AS er
+      ON er.entry_id = cde.entry_id AND er.revision = cde.entry_revision
     WHERE cd.delivery_id = ?
       AND cd.run_id = ?
       AND lr.workspace = ?
-      AND ((cde.origin_scope = 'global' AND e.workspace = 'global') OR (cde.origin_scope = 'project' AND e.workspace = ?))
-  `).get(input.entryId, input.deliveryId, input.runId, input.workspace, input.workspace);
+  `).get(input.entryId, input.deliveryId, input.runId, input.workspace);
     if (!target)
         notFound();
+    if (!isContextEntryOrigin(target.origin_scope)
+        || typeof target.entry_workspace !== 'string'
+        || target.revision_workspace !== target.entry_workspace
+        || !entryOriginMatchesWorkspace({ origin: target.origin_scope, runWorkspace: input.workspace, entryWorkspace: target.entry_workspace }))
+        notFound();
     if (input.entryRevision !== undefined && target.entry_revision !== input.entryRevision)
         conflict();
 }
@@ -306,6 +351,7 @@ function selectContextByKey(database, input) {
       cde.entry_id AS linked_entry_id,
       cde.entry_revision AS entry_revision,
       e.workspace AS entry_workspace,
+      er.workspace AS revision_workspace,
       cde.origin_scope AS origin_scope
     FROM context_feedback AS cf
     LEFT JOIN ledger_runs AS lr ON lr.run_id = cf.run_id
@@ -313,6 +359,8 @@ function selectContextByKey(database, input) {
     LEFT JOIN context_delivery_entries AS cde
       ON cde.delivery_id = cf.delivery_id AND cde.entry_id = cf.entry_id
     LEFT JOIN entries AS e ON e.id = cf.entry_id
+    LEFT JOIN entry_revisions AS er
+      ON er.entry_id = cde.entry_id AND er.revision = cde.entry_revision
     WHERE cf.run_id = ? AND cf.actor = ? AND cf.idempotency_key = ?
   `).get(input.runId, input.actor, input.idempotencyKeyHash);
 }
@@ -330,13 +378,7 @@ function storedHash(value) {
     return value;
 }
 function storedTimestamp(value) {
-    if (typeof value !== 'string')
-        integrity();
-    const date = new Date(value);
-    if (Number.isNaN(date.getTime()))
-        integrity();
-    const normalized = date.toISOString();
-    if (normalized !== value)
+    if (!isCanonicalFeedbackTimestamp(value))
         integrity();
     return value;
 }
@@ -357,10 +399,10 @@ function rowToContextFeedback(row, workspace) {
         integrity();
     if (storedString(row.linked_entry_id) !== entryId)
         integrity();
-    const origin = row.origin_scope === 'global' ? 'global' : row.origin_scope === 'project' ? 'project' : integrity();
-    if (origin === 'project' && storedString(row.entry_workspace) !== workspace)
-        integrity();
-    if (origin === 'global' && storedString(row.entry_workspace) !== 'global')
+    const origin = isContextEntryOrigin(row.origin_scope) ? row.origin_scope : integrity();
+    const entryWorkspace = storedString(row.entry_workspace);
+    if (storedString(row.revision_workspace) !== entryWorkspace
+        || !entryOriginMatchesWorkspace({ origin, runWorkspace: workspace, entryWorkspace }))
         integrity();
     if (typeof row.verdict !== 'string' || !CONTEXT_FEEDBACK_VERDICTS.includes(row.verdict))
         integrity();
@@ -372,13 +414,7 @@ function rowToContextFeedback(row, workspace) {
     else if (typeof row.comment === 'string') {
         if (row.comment.length === 0 || Buffer.byteLength(row.comment, 'utf8') > MAX_FEEDBACK_COMMENT_BYTES)
             integrity();
-        let sanitized;
-        try {
-            sanitized = normalizeComment(row.comment, workspace);
-        }
-        catch {
-            integrity();
-        }
+        const sanitized = normalizeComment(row.comment, workspace);
         if (sanitized !== row.comment)
             integrity();
         comment = row.comment;
@@ -399,7 +435,7 @@ function rowToContextFeedback(row, workspace) {
         createdAt: storedTimestamp(row.created_at),
     };
 }
-function writeContextFeedback(database, input) {
+function preflightContextFeedbackWrite(database, input) {
     assertContextTarget(database, input);
     const existingByKey = selectContextByKey(database, input);
     if (existingByKey) {
@@ -410,6 +446,22 @@ function writeContextFeedback(database, input) {
     }
     if (hasContextFeedbackId(database, input.feedbackId))
         conflict();
+    return undefined;
+}
+/** Validate a context-feedback write and its exact persisted target without mutating state. */
+export function assertContextFeedbackRecordable(database, input) {
+    const validated = validateContextFeedbackInput(input);
+    try {
+        preflightContextFeedbackWrite(database, validated);
+    }
+    catch (error) {
+        normalizeDatabaseError(error, CONTEXT_FEEDBACK_UNIQUENESS_FAILURES);
+    }
+}
+function writeContextFeedback(database, input) {
+    const existing = preflightContextFeedbackWrite(database, input);
+    if (existing !== undefined)
+        return existing;
     database.prepare(`
     INSERT INTO context_feedback (
       feedback_id, delivery_id, entry_id, run_id, verdict, comment, actor, idempotency_key, created_at
@@ -426,7 +478,7 @@ export function recordContextFeedbackInTransaction(database, input) {
         return writeContextFeedback(database, validated);
     }
     catch (error) {
-        normalizeDatabaseError(error);
+        normalizeDatabaseError(error, CONTEXT_FEEDBACK_UNIQUENESS_FAILURES);
     }
 }
 export function recordContextFeedback(database, input) {
@@ -435,7 +487,7 @@ export function recordContextFeedback(database, input) {
         return withImmediateTransaction(database, () => writeContextFeedback(database, validated));
     }
     catch (error) {
-        normalizeDatabaseError(error);
+        normalizeDatabaseError(error, CONTEXT_FEEDBACK_UNIQUENESS_FAILURES);
     }
 }
 function runOptionalStoredText(value, maximum) {
@@ -445,18 +497,19 @@ function runOptionalStoredText(value, maximum) {
         integrity();
     return value;
 }
+function runOptionalStoredUtf8Text(value, maximumBytes) {
+    if (value === null)
+        return null;
+    if (typeof value !== 'string' || value.length === 0 || Buffer.byteLength(value, 'utf8') > maximumBytes)
+        integrity();
+    return value;
+}
 function runStoredComment(value, workspace) {
     if (value === null)
         return null;
     if (typeof value !== 'string' || value.length === 0 || Buffer.byteLength(value, 'utf8') > MAX_FEEDBACK_COMMENT_BYTES)
         integrity();
-    let sanitized;
-    try {
-        sanitized = normalizeComment(value, workspace);
-    }
-    catch {
-        integrity();
-    }
+    const sanitized = normalizeComment(value, workspace);
     if (sanitized !== value)
         integrity();
     return value;
@@ -489,7 +542,7 @@ function rowToRunFeedback(row, workspace) {
     const runWorkspace = storedString(row.run_workspace);
     if (runWorkspace !== workspace)
         integrity();
-    const outcome = runOptionalStoredText(row.outcome, MAX_FEEDBACK_COMMENT_BYTES);
+    const outcome = runOptionalStoredUtf8Text(row.outcome, MAX_FEEDBACK_OUTCOME_BYTES);
     const recommendationCode = runOptionalStoredText(row.recommendation_code, MAX_FEEDBACK_IDENTIFIER_LENGTH);
     let recommendationVerdict;
     if (row.recommendation_verdict === null) {
@@ -554,7 +607,7 @@ export function recordRunFeedbackInTransaction(database, input) {
         return writeRunFeedback(database, validated);
     }
     catch (error) {
-        normalizeDatabaseError(error);
+        normalizeDatabaseError(error, RUN_FEEDBACK_UNIQUENESS_FAILURES);
     }
 }
 export function recordRunFeedback(database, input) {
@@ -563,7 +616,7 @@ export function recordRunFeedback(database, input) {
         return withImmediateTransaction(database, () => writeRunFeedback(database, validated));
     }
     catch (error) {
-        normalizeDatabaseError(error);
+        normalizeDatabaseError(error, RUN_FEEDBACK_UNIQUENESS_FAILURES);
     }
 }
 export function listRunFeedback(database, input) {
@@ -621,6 +674,7 @@ export function listContextFeedback(database, input) {
         cde.entry_id AS linked_entry_id,
         cde.entry_revision AS entry_revision,
         e.workspace AS entry_workspace,
+        er.workspace AS revision_workspace,
         cde.origin_scope AS origin_scope
       FROM context_feedback AS cf
       LEFT JOIN ledger_runs AS lr ON lr.run_id = cf.run_id
@@ -628,6 +682,8 @@ export function listContextFeedback(database, input) {
       LEFT JOIN context_delivery_entries AS cde
         ON cde.delivery_id = cf.delivery_id AND cde.entry_id = cf.entry_id
       LEFT JOIN entries AS e ON e.id = cf.entry_id
+      LEFT JOIN entry_revisions AS er
+        ON er.entry_id = cde.entry_id AND er.revision = cde.entry_revision
       WHERE ${conditions.join(' AND ')}
       ORDER BY cf.created_at ASC, cf.feedback_id ASC
       LIMIT ?
@@ -645,59 +701,23 @@ const INTAKE_FEEDBACK_FIELDS = new Set([
     'verdict', 'comment', 'actor', 'idempotencyKey', 'createdAt',
 ]);
 const INTAKE_PROFILE_FIELDS = new Set(['taskType', 'target', 'expected', 'constraints']);
-function initialInputFields(value) {
-    try {
-        if (!isPlainObject(value))
-            validation();
-        const keys = Reflect.ownKeys(value);
-        if (keys.length !== INTAKE_FEEDBACK_FIELDS.size || keys.some((key) => typeof key !== 'string' || !INTAKE_FEEDBACK_FIELDS.has(key)))
-            validation();
-        const descriptors = Object.getOwnPropertyDescriptors(value);
-        const result = {};
-        for (const field of INTAKE_FEEDBACK_FIELDS) {
-            const descriptor = descriptors[field];
-            if (!descriptor || !('value' in descriptor) || descriptor.enumerable !== true)
-                validation();
-            result[field] = descriptor.value;
-        }
-        structuredClone(value);
-        return result;
-    }
-    catch {
-        validation();
-    }
-}
 function initialInputIdentifier(value) {
     if (typeof value !== 'string' || value.length === 0 || Buffer.byteLength(value, 'utf8') > MAX_FEEDBACK_IDENTIFIER_LENGTH || /\p{Cc}/u.test(value))
         validation();
     return value;
 }
-function initialInputTimestamp(value) {
-    if (typeof value !== 'string' || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value))
-        validation();
-    const date = new Date(value);
-    if (Number.isNaN(date.getTime()) || date.toISOString() !== value)
-        validation();
-    return value;
-}
 function initialInputComment(value, workspace) {
     if (value === null)
         return null;
     if (typeof value !== 'string' || value.length === 0)
         validation();
-    let sanitized;
-    try {
-        sanitized = sanitizeJson(value, { workspace }).value;
-    }
-    catch {
-        validation();
-    }
+    const sanitized = sanitizeJson(value, { workspace }).value;
     if (typeof sanitized !== 'string' || sanitized.length === 0 || Buffer.byteLength(sanitized, 'utf8') > MAX_FEEDBACK_COMMENT_BYTES)
         validation();
     return sanitized;
 }
 function validateInitialIntakeFeedbackInput(value) {
-    const fields = initialInputFields(value);
+    const fields = inputFields(value, INTAKE_FEEDBACK_FIELDS, true);
     const workspace = initialInputIdentifier(fields.workspace);
     const feedbackId = initialInputIdentifier(fields.feedbackId);
     const runId = initialInputIdentifier(fields.runId);
@@ -729,7 +749,7 @@ function validateInitialIntakeFeedbackInput(value) {
         comment: initialInputComment(fields.comment, workspace),
         actor,
         idempotencyKeyHash: hashIdempotencyKey(idempotencyKey),
-        createdAt: initialInputTimestamp(fields.createdAt),
+        createdAt: validateFeedbackTimestamp(fields.createdAt),
     };
 }
 function initialIntakeTarget(database, input) {
@@ -813,26 +833,12 @@ function initialStoredHash(value) {
         integrity();
     return value;
 }
-function initialStoredTimestamp(value) {
-    if (typeof value !== 'string' || !/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(value))
-        integrity();
-    const date = new Date(value);
-    if (Number.isNaN(date.getTime()) || date.toISOString() !== value)
-        integrity();
-    return value;
-}
 function initialStoredComment(value, workspace) {
     if (value === null)
         return null;
     if (typeof value !== 'string' || value.length === 0 || Buffer.byteLength(value, 'utf8') > MAX_FEEDBACK_COMMENT_BYTES)
         integrity();
-    let sanitized;
-    try {
-        sanitized = normalizeComment(value, workspace);
-    }
-    catch {
-        integrity();
-    }
+    const sanitized = initialInputComment(value, workspace);
     if (sanitized !== value)
         integrity();
     return value;
@@ -875,7 +881,7 @@ function rowToInitialIntakeFeedback(row, workspace) {
         comment: initialStoredComment(row.comment, workspace),
         actor,
         idempotencyKeyHash: initialStoredHash(row.idempotency_key),
-        createdAt: initialStoredTimestamp(row.created_at),
+        createdAt: storedTimestamp(row.created_at),
     };
 }
 function recordInitialIntakeFeedback(database, input) {
@@ -905,7 +911,7 @@ export function recordIntakeFeedback(database, input) {
         return withImmediateTransaction(database, () => recordInitialIntakeFeedback(database, validated));
     }
     catch (error) {
-        normalizeDatabaseError(error);
+        normalizeDatabaseError(error, INTAKE_FEEDBACK_UNIQUENESS_FAILURES);
     }
 }
 export function recordIntakeFeedbackInTransaction(database, input) {
@@ -914,36 +920,12 @@ export function recordIntakeFeedbackInTransaction(database, input) {
         return recordInitialIntakeFeedback(database, validated);
     }
     catch (error) {
-        normalizeDatabaseError(error);
+        normalizeDatabaseError(error, INTAKE_FEEDBACK_UNIQUENESS_FAILURES);
     }
 }
 const INTAKE_FEEDBACK_LIST_FIELDS = new Set(['workspace', 'runId', 'sessionId', 'questionId', 'profileField', 'limit']);
-function initialListInputFields(value) {
-    try {
-        if (!isPlainObject(value))
-            validation();
-        const keys = Reflect.ownKeys(value);
-        if (keys.some((key) => typeof key !== 'string' || !INTAKE_FEEDBACK_LIST_FIELDS.has(key)))
-            validation();
-        const descriptors = Object.getOwnPropertyDescriptors(value);
-        const result = {};
-        for (const key of keys) {
-            if (typeof key !== 'string')
-                validation();
-            const descriptor = descriptors[key];
-            if (!descriptor || !('value' in descriptor) || descriptor.enumerable !== true)
-                validation();
-            result[key] = descriptor.value;
-        }
-        structuredClone(value);
-        return result;
-    }
-    catch {
-        validation();
-    }
-}
 function validateInitialIntakeFeedbackListInput(value) {
-    const fields = initialListInputFields(value);
+    const fields = inputFields(value, INTAKE_FEEDBACK_LIST_FIELDS);
     const workspace = initialInputIdentifier(fields.workspace);
     const runId = fields.runId === undefined ? undefined : initialInputIdentifier(fields.runId);
     const sessionId = fields.sessionId === undefined ? undefined : initialInputIdentifier(fields.sessionId);