akm-cli 0.9.0-rc.8 → 0.9.0

package/dist/commands/improve/distill/promote-memory.js

@@ -19,7 +19,7 @@
 import fs from "node:fs";
 import { parseFrontmatter } from "../../../core/asset/frontmatter.js";
 import { appendEvent } from "../../../core/events.js";
-import { parseEmbeddedJsonResponse } from "../../../llm/client.js";
+import { parseEmbeddedJsonResponse } from "../../../core/parse.js";
 import { isProposalSkipped } from "../../proposal/repository.js";
 import { assessMemoryKnowledgePromotionCandidate } from "../distill-promotion-policy.js";
 import { emitProposal } from "../proposal-envelope.js";
@@ -38,7 +38,7 @@ import { persistOutputEncodingSalience, runLessonQualityJudge, writeQualityRejec
 async function resolveKnowledgePromotionContent(ctx, baseContent, knowledgeRef) {
     const durableInputRef = ctx.durableInputRef ?? ctx.inputRef;
     let resolvedPromotionContent = baseContent;
-    const existingKnowledgePath = await ctx.lookup(durableImproveRef(knowledgeRef, ctx.sourceName));
+    const existingKnowledgePath = await ctx.lookup(durableImproveRef(knowledgeRef));
     const existingKnowledgeContent = existingKnowledgePath && fs.existsSync(existingKnowledgePath)
         ? (() => {
             try {
@@ -77,11 +77,11 @@ async function resolveKnowledgePromotionContent(ctx, baseContent, knowledgeRef)
                 // Existing content is authoritative — no update needed.
                 appendEvent({
                     eventType: "distill_invoked",
-                    // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+                    // Use item_ref when resolved, otherwise the input conceptId.
                     ref: ctx.itemRef ?? durableInputRef,
                     metadata: {
                         outcome: "skipped",
-                        lessonRef: knowledgeRef,
+                        proposalRef: knowledgeRef,
                         message: "D-1: LLM resolved destination conflict as NOOP — existing content kept",
                         ...ctx.eligMeta,
                     },
@@ -92,7 +92,8 @@ async function resolveKnowledgePromotionContent(ctx, baseContent, knowledgeRef)
                         ok: true,
                         outcome: "skipped",
                         inputRef: ctx.inputRef,
-                        lessonRef: knowledgeRef,
+                        proposalRef: knowledgeRef,
+                        skipReason: "conflict_noop",
                         message: "Existing knowledge content unchanged (contradiction resolution: NOOP)",
                     },
                 };
@@ -198,11 +199,11 @@ export async function promoteMemoryToKnowledge(ctx) {
     if (isProposalSkipped(proposalResult)) {
         appendEvent({
             eventType: "distill_invoked",
-            // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+            // Use item_ref when resolved, otherwise the input conceptId.
             ref: ctx.itemRef ?? durableInputRef,
             metadata: {
                 outcome: "skipped",
-                lessonRef: promotion.knowledgeRef,
+                proposalRef: promotion.knowledgeRef,
                 message: proposalResult.message,
                 skipReason: proposalResult.reason,
                 ...eligMeta,
@@ -213,21 +214,21 @@ export async function promoteMemoryToKnowledge(ctx) {
             ok: true,
             outcome: "skipped",
             inputRef,
-            lessonRef: promotion.knowledgeRef,
+            proposalRef: promotion.knowledgeRef,
+            skipReason: proposalResult.reason,
             message: proposalResult.message,
         };
     }
     const proposal = proposalResult;
     // G4: content-score the distilled OUTPUT so it carries a real encoding
     // salience (encoding_source='content') from creation.
-    persistOutputEncodingSalience(durableImproveRef(promotion.knowledgeRef, ctx.sourceName), resolvedPromotionContent, existingRefVocabulary, outcomeWeightEnabled);
+    persistOutputEncodingSalience(durableImproveRef(promotion.knowledgeRef), resolvedPromotionContent, existingRefVocabulary, outcomeWeightEnabled);
     appendEvent({
         eventType: "distill_invoked",
-        // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+        // Use item_ref when resolved, otherwise the input conceptId.
         ref: ctx.itemRef ?? durableInputRef,
         metadata: {
             outcome: "queued",
-            lessonRef: promotion.knowledgeRef,
             proposalRef: promotion.knowledgeRef,
             proposalKind: "knowledge",
             proposalId: proposal.id,
@@ -244,7 +245,6 @@ export async function promoteMemoryToKnowledge(ctx) {
         ok: true,
         outcome: "queued",
         inputRef,
-        lessonRef: promotion.knowledgeRef,
         proposalRef: promotion.knowledgeRef,
         proposalKind: "knowledge",
         proposalId: proposal.id,

package/dist/commands/improve/distill/quality-gate.js

@@ -13,9 +13,9 @@ import path from "node:path";
 import { parseRefInput } from "../../../core/asset/resolve-ref.js";
 import { timestampForFilename } from "../../../core/common.js";
 import { appendEvent } from "../../../core/events.js";
+import { parseEmbeddedJsonResponse } from "../../../core/parse.js";
 import { withStateDb } from "../../../core/state-db.js";
 import { getDefaultLlmConfig } from "../../../integrations/agent/engine-resolution.js";
-import { parseEmbeddedJsonResponse } from "../../../llm/client.js";
 import { callStructured } from "../../../llm/structured-call.js";
 import { akmSearch } from "../../read/search.js";
 import { scoreEncodingSalience } from "../encoding-salience.js";
@@ -234,26 +234,26 @@ export async function runReflectQualityJudge(config, candidateContent, sourceCon
  *
  * @param stash     - Root stash directory.
  * @param inputRef  - The original input ref (for the event).
- * @param lessonRef - The proposed lesson/knowledge ref.
+ * @param proposalRef - The proposed lesson/knowledge ref.
  * @param content   - The raw content that failed the quality gate.
  * @param score     - Quality score from the judge.
  * @param reason    - Human-readable rejection reason.
  * @param extraMeta - Optional additional metadata for the event.
  * @param eventsCtx - Events context so the emit takes appendEvent's fast path (R25).
  */
-export function writeQualityRejection(stash, inputRef, lessonRef, content, score, reason, extraMeta = {}, eligibilitySource, eventsCtx) {
+export function writeQualityRejection(stash, inputRef, proposalRef, content, score, reason, extraMeta = {}, eligibilitySource, eventsCtx) {
     // D-5 / #388: reviewNeeded flag selects "review_needed" vs "quality_rejected" outcome.
     const outcome = extraMeta.reviewNeeded ? "review_needed" : "quality_rejected";
     const rejectDir = path.join(stash, ".akm", "distill-rejected");
     fs.mkdirSync(rejectDir, { recursive: true });
     const ts = timestampForFilename();
-    fs.writeFileSync(path.join(rejectDir, `${ts}-${lessonRef.replace(/[:/\\]/g, "-")}.md`), `---\nscore: ${score}\nreason: ${reason}\noutcome: ${outcome}\n---\n\n${content}`, "utf8");
+    fs.writeFileSync(path.join(rejectDir, `${ts}-${proposalRef.replace(/[:/\\]/g, "-")}.md`), `---\nscore: ${score}\nreason: ${reason}\noutcome: ${outcome}\n---\n\n${content}`, "utf8");
     appendEvent({
         eventType: "distill_invoked",
         ref: inputRef,
         metadata: {
             outcome,
-            lessonRef,
+            proposalRef,
             score,
             reason,
             ...extraMeta,
@@ -267,7 +267,7 @@ export function writeQualityRejection(stash, inputRef, lessonRef, content, score
         ok: true,
         outcome,
         inputRef,
-        lessonRef,
+        proposalRef,
         score,
         reason,
         ...extraMeta,

package/dist/commands/improve/distill.js

@@ -35,7 +35,7 @@
  * # Lesson-name derivation rule
  *
  * A nested input preserves its first legitimate scope segment
- * (`memory:project-a/deploy` → `lesson:project-a/memory-deploy-lesson`). An
+ * (`memories/project-a/deploy` → `lessons/project-a/memory-deploy-lesson`). An
  * unscoped input stays flat; asset types are not project scopes. Origin prefixes
  * remain durable provenance but are not embedded in the output path.
  *
@@ -58,6 +58,7 @@ import { getImproveProcessConfig, loadConfig } from "../../core/config/config.js
 import { UsageError } from "../../core/errors.js";
 import { appendEvent, readEvents } from "../../core/events.js";
 import { lintLessonContent } from "../../core/lesson-lint.js";
+import { parseEmbeddedJsonResponse } from "../../core/parse.js";
 import { getDbPath } from "../../core/paths.js";
 import { resolveStandardsContext } from "../../core/standards/resolve-standards-context.js";
 import { withStateDb } from "../../core/state-db.js";
@@ -65,7 +66,7 @@ import { warnVerbose } from "../../core/warn.js";
 import { resolveAssetPath } from "../../indexer/walk/path-resolver.js";
 import { getDefaultLlmConfig } from "../../integrations/agent/engine-resolution.js";
 import { materializeLlmRunnerConnection, resolveImproveProcessRunner } from "../../integrations/agent/runner.js";
-import { chatCompletion, parseEmbeddedJsonResponse } from "../../llm/client.js";
+import { chatCompletion } from "../../llm/client.js";
 import { callStructured } from "../../llm/structured-call.js";
 import { closeDatabase, openIndexDatabase } from "../../storage/repositories/index-connection.js";
 import { getAllEntries } from "../../storage/repositories/index-entries-repository.js";
@@ -82,16 +83,13 @@ import { emitProposal } from "./proposal-envelope.js";
 import { createRunContext, resolveRunStashDir } from "./run-context.js";
 import { computeSalience, upsertAssetSalience } from "./salience.js";
 import { MAX_REJECTED_PROPOSALS } from "./shared.js";
-import { bareImproveRef, durableImproveRef } from "./source-identity.js";
-// Re-exported for `reflect.ts`, which applies the same LLM-as-judge gate to
-// reflect proposals (R-5 / #374).
-export { runLessonQualityJudge };
+import { durableImproveRef } from "./source-identity.js";
 /**
  * Asset-ref types that `akm distill` structurally refuses as inputs.
  *
  * Distill *produces* lessons from non-lesson sources (memory, skill, knowledge,
- * etc.). Calling distill on an existing `lesson:*` ref would derive
- * `lesson:lesson-<name>-lesson-lesson` (double `-lesson` suffix) — the
+ * etc.). Calling distill on an existing `lessons/*` ref would derive
+ * `lessons/lesson-<name>-lesson-lesson` (double `-lesson` suffix) — the
  * recursive-ref defect observed across 323 archived rejected proposals.
  *
  * 08-F2: `env` and `secret` are refused as a STRUCTURAL floor — distill reads
@@ -122,8 +120,8 @@ export function isDistillRefusedInputType(type) {
 /** Derive the proposed lesson ref from the input ref. See module docblock. */
 export function deriveLessonRef(inputRef) {
     const parsed = parseRefInput(inputRef);
-    // Strip origin: a feedback signal recorded against `team//skill:deploy`
-    // distils into the same lesson namespace as `skill:deploy`. The proposal
+    // Strip the bundle: a feedback signal recorded against `team//skills/deploy`
+    // distils into the same lesson namespace as `skills/deploy`. The proposal
     // id (a UUID) keeps the queue entries distinct, so collisions are not a
     // problem — and reviewers want to see them next to each other anyway.
     const parts = parsed.name.split("/");
@@ -146,20 +144,17 @@ export function deriveLessonRef(inputRef) {
 //
 // The actual implementations now live in `core/proposal-quality-validators.ts`
 // so the same checks run inside `runProposalValidators` on `proposal accept`.
-// We re-export the public-facing helpers here so existing imports
-// (`from "../../src/commands/distill"`) continue to resolve.
-import { detectDoubleFrontmatter, isValidDescription, isValidWhenToUse, } from "../proposal/validators/proposal-quality-validators.js";
-export { detectDoubleFrontmatter, isValidDescription, isValidWhenToUse };
+import { detectDoubleFrontmatter, isValidDescription } from "../proposal/validators/proposal-quality-validators.js";
 // ── Prompt assembly ─────────────────────────────────────────────────────────
 const LESSON_SYSTEM_PROMPT = distillLessonSystemPrompt;
 const KNOWLEDGE_SYSTEM_PROMPT = distillKnowledgeSystemPrompt;
 // ── Structured-output schemas (responseSchema lift) ─────────────────────────
 //
-// PR 1 of the asset-writers decision (see knowledge:projects/akm/
+// PR 1 of the asset-writers decision (see knowledge/projects/akm/
 // asset-writers-investigation/00-synthesis): on providers that honour
 // `response_format: json_schema`, ask the LLM for a typed JSON object and
-// re-assemble the markdown locally. The previous "emit raw markdown with
-// embedded frontmatter" path remains as a fallback for providers that ignore
+// re-assemble the markdown locally. The "emit raw markdown with embedded
+// frontmatter" path supports providers that ignore
 // the schema (and for the `chat` test seam, which is wired to return strings
 // today). Shape-level rejection codes — MALFORMED_FRONTMATTER_BLOCK,
 // FRONTMATTER_NOT_OBJECT, INVALID_YAML, UNBALANCED_CODE_FENCE — become
@@ -334,7 +329,11 @@ export function buildDistillPrompt(input) {
     }
     lines.push("Asset content:");
     if (input.assetContent) {
-        const body = input.assetContent.trim().slice(0, 3000);
+        // The output contract also uses YAML fences. Feeding source frontmatter
+        // verbatim caused local models to copy it into the lesson body, producing
+        // deterministic double-frontmatter rejection. Distillation needs the
+        // source body; its metadata is not evidence to reproduce.
+        const body = parseFrontmatter(input.assetContent).content.trim().slice(0, 3000);
         lines.push("```");
         lines.push(body);
         lines.push("```");
@@ -523,7 +522,7 @@ async function loadAndScoreInputSalience(args) {
 /**
  * Recursive-distillation + secret-material input guard. Distill produces
  * *lessons* from non-lesson sources; a lesson input would derive a recursive
- * `lesson:lesson-<name>` ref (the 323-archived-proposals defect) and
+ * `lessons/lesson-<name>` ref (the 323-archived-proposals defect) and
  * env/secret inputs must never be read or sent to the LLM. Emits the
  * `distill_invoked(skipped)` event and returns the terminal skipped result,
  * or `null` when the input type is allowed. Extracted verbatim from
@@ -542,12 +541,11 @@ function refuseDisallowedDistillInput(args) {
         : "Distill refuses lesson inputs — lessons are the distilled form, not a source.";
     appendEvent({
         eventType: "distill_invoked",
-        // Chunk-5 flip F5f — key on item_ref when the planner resolved one, else
-        // the pre-flip source-qualified durable ref (dormant: item_ref NULL today).
+        // Key on item_ref when the planner resolved one, otherwise the conceptId.
         ref: options.itemRef ?? durableInputRef,
         metadata: {
             outcome: "skipped",
-            lessonRef: skippedRef,
+            proposalRef: skippedRef,
             message,
             skipReason: isSecretInput ? "refused_secret_input" : "recursive_lesson_input",
             ...eligMeta,
@@ -558,7 +556,8 @@ function refuseDisallowedDistillInput(args) {
         ok: true,
         outcome: "skipped",
         inputRef,
-        lessonRef: skippedRef,
+        proposalRef: skippedRef,
+        skipReason: isSecretInput ? "refused_secret_input" : "recursive_lesson_input",
         message,
     };
 }
@@ -569,11 +568,26 @@ export async function akmDistill(options) {
     }
     // Validate the ref shape up front so a typo never reaches the LLM.
     const parsedInputRef = parseRefInput(inputRef);
-    const durableInputRef = durableImproveRef(inputRef, options.sourceName);
-    // Chunk-5 flip F5e — the input asset's durable salience write key: item_ref
-    // when the planner resolved one, else the pre-flip source-qualified spelling.
+    const durableInputRef = durableImproveRef(inputRef);
+    // The input asset's durable salience write key is item_ref when resolved,
+    // otherwise the input conceptId.
     const salienceWriteKey = options.itemRef ?? durableInputRef;
     const targetKind = options.proposalKind ?? "lesson";
+    const config = options.config ?? loadConfig();
+    const improveProfile = options.improveProfile ?? resolveImproveStrategy(undefined, config).config;
+    options = { ...options, improveProfile };
+    if (!resolveProcessEnabled("distill", improveProfile)) {
+        const proposalKind = targetKind === "knowledge" ? "knowledge" : "lesson";
+        return {
+            schemaVersion: 1,
+            ok: true,
+            outcome: "config_disabled",
+            inputRef,
+            proposalRef: proposalKind === "knowledge" ? deriveKnowledgeRef(inputRef) : deriveLessonRef(inputRef),
+            proposalKind,
+            message: "distill is disabled in config; enable processes.distill.enabled to activate.",
+        };
+    }
     // Attribution tagging: spread into every distill_invoked event's metadata so
     // the lane that selected this asset is recorded uniformly across all outcome
     // branches. Empty object when no lane was supplied (direct `akm distill`).
@@ -587,8 +601,6 @@ export async function akmDistill(options) {
     const refused = refuseDisallowedDistillInput({ options, parsedInputRef, inputRef, durableInputRef, eligMeta });
     if (refused)
         return refused;
-    const config = options.config ?? loadConfig();
-    options = { ...options, improveProfile: options.improveProfile ?? resolveImproveStrategy(undefined, config).config };
     const stash = resolveRunStashDir(options.stashDir);
     const chat = options.chat ?? chatCompletion;
     const distillLlm = Object.hasOwn(options, "llmConfig")
@@ -604,31 +616,17 @@ export async function akmDistill(options) {
     const outcomeWeightEnabled = config.improve?.salience?.outcomeWeightEnabled !== false;
     // D-4 / #390: similar-lessons retrieval seam (test-injectable).
     const fetchSimilarLessonsFn = options.fetchSimilarLessonsFn ?? ((query, n) => fetchTopSimilarLessons(query, n, options.stashDir));
-    // WI-9.10: construct this invocation's RunContext from values already
-    // resolved above — no second config load, no new db handle. distill has no
-    // `dryRun` option (only the best-effort salience stamp below writes a
-    // source asset, routed through `ctx.writeAsset`); `sourceRun` has no
-    // existing run-level convention here (unlike extract/consolidate, distill
-    // simply forwards `options.sourceRun` verbatim wherever it is set — see
-    // the `promoteMemoryToKnowledge` call below), so this is a fresh,
-    // independent token following the same `<verb>-<ms>` shape.
-    const ctx = createRunContext({
+    const assetCtx = createRunContext({
         stashDir: stash,
         config,
         eventsCtx: options.eventsCtx ?? {},
-        // Not yet wired into any proposal call site this stage (mirrors
-        // buildImproveRunContext's proposalsCtx comment in improve.ts).
         proposalsCtx: options.ctx ?? {},
         chat,
         getLlmConfig: () => distillLlm ?? null,
         sourceRun: options.sourceRun ?? `distill-${Date.now()}`,
         dryRun: false,
         signal: options.signal,
-    });
-    // D6: a fresh, per-invocation memo. loadAndScoreInputSalience below is the
-    // genuine content-read + write-back consumer (run-context.ts's D6 seam
-    // docblock cites this exact site).
-    const assetCtx = ctx.withFreshAssetMemo();
+    }).withFreshAssetMemo();
     const { assetContent, existingRefVocabulary } = await loadAndScoreInputSalience({
         inputRef,
         durableInputRef,
@@ -643,7 +641,6 @@ export async function akmDistill(options) {
         readEventsImpl,
         options,
         durableInputRef,
-        inputRef,
     });
     const feedback = filteredEvents.slice(-20).map((e) => ({
         ts: e.ts,
@@ -661,7 +658,6 @@ export async function akmDistill(options) {
         inputRef,
         durableInputRef,
         ...(options.itemRef ? { itemRef: options.itemRef } : {}),
-        sourceName: options.sourceName,
         assetContent,
         filteredEvents,
         config,
@@ -838,11 +834,11 @@ async function emitDistillLessonProposal(args) {
     if (isProposalSkipped(proposalResult2)) {
         appendEvent({
             eventType: "distill_invoked",
-            // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+            // Use item_ref when resolved, otherwise the input conceptId.
             ref: options.itemRef ?? durableInputRef,
             metadata: {
                 outcome: "skipped",
-                lessonRef: effectiveLessonRef,
+                proposalRef: effectiveLessonRef,
                 message: proposalResult2.message,
                 skipReason: proposalResult2.reason,
                 ...eligMeta,
@@ -853,7 +849,8 @@ async function emitDistillLessonProposal(args) {
             ok: true,
             outcome: "skipped",
             inputRef,
-            lessonRef: effectiveLessonRef,
+            proposalRef: effectiveLessonRef,
+            skipReason: proposalResult2.reason,
             message: proposalResult2.message,
         };
     }
@@ -861,14 +858,13 @@ async function emitDistillLessonProposal(args) {
     // G4: content-score the distilled OUTPUT so it carries a real encoding
     // salience (encoding_source='content') from creation — lessons never get
     // another chance (they are refused as distill inputs).
-    persistOutputEncodingSalience(durableImproveRef(effectiveLessonRef, options.sourceName), content, existingRefVocabulary, outcomeWeightEnabled);
+    persistOutputEncodingSalience(durableImproveRef(effectiveLessonRef), content, existingRefVocabulary, outcomeWeightEnabled);
     appendEvent({
         eventType: "distill_invoked",
-        // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+        // Use item_ref when resolved, otherwise the input conceptId.
         ref: options.itemRef ?? durableInputRef,
         metadata: {
             outcome: "queued",
-            lessonRef: effectiveLessonRef,
             proposalRef: effectiveLessonRef,
             proposalKind: effectiveProposalKind,
             proposalId: proposal2.id,
@@ -886,7 +882,6 @@ async function emitDistillLessonProposal(args) {
         ok: true,
         outcome: "queued",
         inputRef,
-        lessonRef: effectiveLessonRef,
         proposalRef: effectiveLessonRef,
         proposalKind: effectiveProposalKind,
         proposalId: proposal2.id,
@@ -906,8 +901,8 @@ function assembleAndValidateDistillContent(args) {
     const { raw, effectiveProposalKind, inputRef, durableInputRef, itemRef, effectiveLessonRef, exclusionSet, filteredFeedbackCount, eligMeta, eventsCtx, } = args;
     // Structured-output path: when the provider honoured the JSON schema, `raw`
     // is a JSON object string (not a markdown blob). Try to parse it and assemble
-    // the canonical `---\nfm\n---\n\nbody` form before falling through to the
-    // legacy markdown pipeline. Failure here (non-JSON response, missing
+    // the canonical `---\nfm\n---\n\nbody` form before using the markdown
+    // response path. Failure here (non-JSON response, missing
     // required field, unexpected types) is non-fatal — we drop down to the
     // markdown path which has its own auto-repair + lint pass.
     let content;
@@ -952,11 +947,11 @@ function assembleAndValidateDistillContent(args) {
     if (findings.length > 0) {
         appendEvent({
             eventType: "distill_invoked",
-            // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+            // Use item_ref when resolved, otherwise the input conceptId.
             ref: itemRef ?? durableInputRef,
             metadata: {
                 outcome: "validation_failed",
-                lessonRef: effectiveLessonRef,
+                proposalRef: effectiveLessonRef,
                 proposalKind: effectiveProposalKind,
                 findingKinds: findings.map((f) => f.kind),
                 ...(exclusionSet.size > 0 ? { filteredFeedbackCount } : {}),
@@ -1046,7 +1041,6 @@ function distillEmptyResponseResult(args) {
             ok: true,
             outcome: "config_disabled",
             inputRef,
-            lessonRef: effectiveLessonRef,
             proposalRef: effectiveLessonRef,
             proposalKind: effectiveProposalKind,
             message: "distill is disabled in config; enable processes.distill.enabled to activate.",
@@ -1058,11 +1052,11 @@ function distillEmptyResponseResult(args) {
     // is observable.
     appendEvent({
         eventType: "distill_invoked",
-        // Chunk-5 flip F5f — item_ref when resolved, else durable (dormant today).
+        // Use item_ref when resolved, otherwise the input conceptId.
         ref: itemRef ?? durableInputRef,
         metadata: {
             outcome: "llm_failed",
-            lessonRef: effectiveLessonRef,
+            proposalRef: effectiveLessonRef,
             proposalKind: effectiveProposalKind,
             ...(exclusionSet.size > 0 ? { filteredFeedbackCount } : {}),
             ...eligMeta,
@@ -1073,7 +1067,6 @@ function distillEmptyResponseResult(args) {
         ok: true,
         outcome: "llm_failed",
         inputRef,
-        lessonRef: effectiveLessonRef,
         proposalRef: effectiveLessonRef,
         proposalKind: effectiveProposalKind,
         message: "LLM call returned no usable output (timeout, empty, or error).",
@@ -1124,22 +1117,18 @@ async function applyDistillQualityGate(args) {
  * carry. Extracted verbatim from `akmDistill`.
  */
 function readDistillFeedback(args) {
-    const { readEventsImpl, options, durableInputRef, inputRef } = args;
+    const { readEventsImpl, options, durableInputRef } = args;
     const { events: unfilteredEvents } = readEventsImpl({
-        ...(!options.legacyBareState ? { ref: durableInputRef } : {}),
+        ref: options.itemRef ?? durableInputRef,
         type: "feedback",
         excludeTags: options.excludeTags,
         includeTags: options.includeTags,
     });
-    const events = options.legacyBareState
-        ? unfilteredEvents.filter((event) => event.ref === durableInputRef || event.ref === bareImproveRef(inputRef))
-        : unfilteredEvents;
+    const events = unfilteredEvents;
     // #267 — feedback exclusion. Filter events whose `ref` matches the
     // exclusion list BEFORE the prompt is built. The original event stream
     // is never mutated; only the `feedback` slice that reaches the LLM is
-    // affected. The exclusion set is normalised through the durable/bare ref
-    // helpers so callers can pass canonical or origin-prefixed refs and the
-    // comparison still works against the event payload's `ref`.
+    // affected. Exclusion refs are compared with event refs exactly.
     const exclusionList = options.excludeFeedbackFromRefs ?? [];
     const exclusionSet = new Set(exclusionList.map((ref) => ref.trim()).filter((ref) => ref.length > 0));
     const originalEventCount = events.length;