akm-cli 0.8.7 → 0.8.14

package/dist/commands/{consolidate.js → improve/consolidate.js}

@@ -5,28 +5,28 @@ import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import readline from "node:readline";
-import { parse as yamlParse, stringify as yamlStringify } from "yaml";
-import { parseAssetRef } from "../core/asset-ref";
-import { assembleAssetFromString } from "../core/asset-serialize";
-import { resolveStashDir, timestampForFilename } from "../core/common";
-import { getDefaultLlmConfig, loadConfig } from "../core/config";
-import { ConfigError } from "../core/errors";
-import { appendEvent } from "../core/events";
-import { parseFrontmatter } from "../core/frontmatter";
-import { writeContradictEdge } from "../core/memory-belief";
-import { parseEmbeddedJsonResponse } from "../core/parse";
-import { hasHotCaptureMode, hasSupersededStatus, MERGE_ABSOLUTE_FLOOR_CHARS, MERGE_SHRINK_RATIO_MIN, validateProposalFrontmatter, } from "../core/proposal-quality-validators";
-import { createProposal, isProposalSkipped, listProposals } from "../core/proposals";
-import { detectTruncatedDescription } from "../core/text-truncation";
+import { parse as yamlParse } from "yaml";
+import { parseAssetRef } from "../../core/asset/asset-ref.js";
+import { assembleAssetFromString, serializeFrontmatter } from "../../core/asset/asset-serialize.js";
+import { parseFrontmatter } from "../../core/asset/frontmatter.js";
+import { resolveStashDir, timestampForFilename } from "../../core/common.js";
+import { getDefaultLlmConfig, loadConfig } from "../../core/config/config.js";
+import { ConfigError } from "../../core/errors.js";
+import { appendEvent } from "../../core/events.js";
+import { parseEmbeddedJsonResponse } from "../../core/parse.js";
+import { detectTruncatedDescription } from "../../core/text-truncation.js";
+import { hasHotCaptureMode, hasSupersededStatus, MERGE_ABSOLUTE_FLOOR_CHARS, MERGE_SHRINK_RATIO_MIN, validateProposalFrontmatter, } from "../proposal/validators/proposal-quality-validators.js";
+import { createProposal, isProposalSkipped, listProposals } from "../proposal/validators/proposals.js";
+import { writeContradictEdge } from "./memory/memory-belief.js";
 // Re-export the moved helpers so existing test imports continue to resolve.
 export { hasSupersededStatus, validateProposalFrontmatter };
-import { warn } from "../core/warn";
-import { deleteAssetFromSource, resolveWriteTarget, writeAssetToSource } from "../core/write-source";
-import { closeDatabase, findEntryIdByRef, getAllEntries, getEntryById, getNeighborsByEntryId, openExistingDatabase, } from "../indexer/db";
-import { resolveImproveProcessRunnerFromProfile } from "../integrations/agent/runner";
-import { chatCompletion } from "../llm/client";
-import { cosineSimilarity, embedBatch } from "../llm/embedder";
-import { isLlmFeatureEnabled, tryLlmFeature } from "../llm/feature-gate";
+import { warn } from "../../core/warn.js";
+import { commitWriteTargetBoundary, deleteAssetFromSource, resolveWriteTarget, writeAssetToSource, } from "../../core/write-source.js";
+import { closeDatabase, findEntryIdByRef, getAllEntries, getEntryById, getNeighborsByEntryId, openExistingDatabase, } from "../../indexer/db/db.js";
+import { resolveImproveProcessRunnerFromProfile, runnerIsLlm } from "../../integrations/agent/runner.js";
+import { chatCompletion } from "../../llm/client.js";
+import { cosineSimilarity, embedBatch } from "../../llm/embedder.js";
+import { isLlmFeatureEnabled, tryLlmFeature } from "../../llm/feature-gate.js";
 // ── Prompts ─────────────────────────────────────────────────────────────────
 const CONSOLIDATE_SYSTEM_PROMPT = `You are the akm consolidate assistant analyzing memory assets.
 
@@ -704,7 +704,7 @@ function archiveMemory(filePath, stashDir, ref, reason, opIndex, supersededBy, w
             ...(supersededBy ? { superseded_by: supersededBy } : {}),
             superseded_reason: reason,
         };
-        content = assembleAssetFromString(yamlStringify(newFm).trimEnd(), parsed.content);
+        content = assembleAssetFromString(serializeFrontmatter(newFm), parsed.content);
     }
     catch {
         if (warnings)
@@ -745,7 +745,7 @@ function archiveMemory(filePath, stashDir, ref, reason, opIndex, supersededBy, w
 function resolveConsolidateLlmConfig(config) {
     const consolidateProcess = config.profiles?.improve?.default?.processes?.consolidate;
     const runnerSpec = resolveImproveProcessRunnerFromProfile(consolidateProcess, config);
-    if (runnerSpec && runnerSpec.kind === "llm") {
+    if (runnerSpec && runnerIsLlm(runnerSpec)) {
         return runnerSpec.connection;
     }
     // Non-LLM runner modes (agent/sdk) don't apply to consolidate's HTTP path;
@@ -877,11 +877,12 @@ export async function akmConsolidate(opts = {}) {
     // health rollup can aggregate without regex-parsing English warning
     // strings. See `/tmp/akm-health-investigations/tuning-reasons-investigation.md` §Q2.
     const skipReasons = [];
-    // Tracks refs already emitted to skipReasons. A ref can only occupy one
-    // accounting bucket; subsequent skip ops for the same ref are recorded as
-    // warnings but must not push a second skipReasons entry (that would inflate
+    // Per-ref grouping of skipReasons entries. A ref occupies exactly one
+    // accounting bucket and therefore exactly one skipReasons array entry;
+    // subsequent skip ops for the same ref append to that entry's `skips[]`
+    // rather than pushing a second array entry (that would inflate
     // Σ(skipReasons) and break the invariant by +1 per duplicate).
-    const skipReasonEmittedRefs = new Set();
+    const skipReasonByRef = new Map();
     const pushSkipReason = (op, ref, reason) => {
         // 2026-05-27 cross-chunk double-count fix: if `ref` already contributed
         // to judgedNoAction in its own chunk (a different chunk proposed an op
@@ -891,14 +892,17 @@ export async function akmConsolidate(opts = {}) {
         // Σ(skipReasons) + failedChunkMemories.
         if (judgedNoActionRefs.delete(ref))
             judgedNoAction--;
-        if (skipReasonEmittedRefs.has(ref)) {
-            // Already counted once. Record the extra skip for observability but
-            // don't push to skipReasons — that would break the accounting invariant.
-            warnings.push(`Skip: ${ref} already in skipReasons (${reason} via ${op}); not re-counted.`);
+        const existing = skipReasonByRef.get(ref);
+        if (existing) {
+            // Already counted once for accounting. Append the extra skip to the
+            // ref's grouped entry for observability without adding a new array
+            // entry (which would break the accounting invariant).
+            existing.skips.push({ op, reason });
             return;
         }
-        skipReasonEmittedRefs.add(ref);
-        skipReasons.push({ op, ref, reason });
+        const entry = { ref, skips: [{ op, reason }] };
+        skipReasonByRef.set(ref, entry);
+        skipReasons.push(entry);
     };
     // judgedNoAction tracks memories the LLM saw inside a chunk but proposed
     // no op for. Computed per chunk as `chunk.length − unique(targetRefs in ops)`.
@@ -1560,7 +1564,7 @@ export async function akmConsolidate(opts = {}) {
                     ...(parsedMemory.data ?? {}),
                     description,
                 };
-                const serializedMergedFm = yamlStringify(mergedBodyFm).trimEnd();
+                const serializedMergedFm = serializeFrontmatter(mergedBodyFm);
                 const proposalContent = assembleAssetFromString(serializedMergedFm, parsedMemory.content);
                 // Pre-emit dedup against pending consolidate proposals from the
                 // same improve run (slug-variant match). The cross-run content-hash
@@ -1634,6 +1638,14 @@ export async function akmConsolidate(opts = {}) {
             }
         }
     }
+    // 0.9.0 (issue #507): batch-at-boundary commit. The merge/delete loop above
+    // wrote one merged primary and deleted N secondaries to the resolved target
+    // with NO per-asset commit. If the target is a writable git source and any
+    // asset was mutated, commit the whole batch ONCE here (stages .akm/ +
+    // siblings together). No-op for filesystem/primary-stash targets.
+    if (merged > 0 || deleted > 0) {
+        commitWriteTargetBoundary(target, `Consolidate: ${merged} merged, ${deleted} removed`);
+    }
     cleanupJournal(stashDir, timestamp);
     // TTL cleanup: remove archive entries older than archiveRetentionDays (default 90).
     // C-5 / #391: emit an `archive_cleanup` event before each deletion so the
@@ -1828,7 +1840,7 @@ export function sanitizeMergedContent(raw) {
     // Recovery: if the strict yaml library fails, fall back to the lenient
     // hand-rolled parseFrontmatter parser, which tolerates common LLM YAML
     // quirks (unescaped special chars, bare scalars, etc.). If it recovers
-    // at least one key, proceed — yamlStringify below will re-serialize
+    // at least one key, proceed — serializeFrontmatter below will re-serialize
     // cleanly. Only reject if both parsers fail to extract any data.
     let parsedFm;
     try {
@@ -1855,7 +1867,7 @@ export function sanitizeMergedContent(raw) {
     // Re-serialise via yaml.stringify to fix any quoting quirks.
     let serialized;
     try {
-        serialized = yamlStringify(fm).trimEnd();
+        serialized = serializeFrontmatter(fm);
     }
     catch (e) {
         return { ok: false, reason: `YAML_STRINGIFY_FAILED: ${e instanceof Error ? e.message : String(e)}` };
@@ -2218,7 +2230,7 @@ async function generateMergedContent(config, primaryRef, primaryBody, secondaryR
                         : secFm.data[key];
             }
             normalizeUpdatedField(repairedFmData);
-            const repairedYaml = yamlStringify(repairedFmData).trimEnd();
+            const repairedYaml = serializeFrontmatter(repairedFmData);
             const bodyPart = mergedFm.content ?? "";
             return { content: `---\n${repairedYaml}\n---\n${bodyPart}` };
         }

package/dist/commands/{distill-promotion-policy.js → improve/distill-promotion-policy.js}

@@ -1,9 +1,9 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { parseAssetRef } from "../core/asset-ref";
-import { assembleAsset } from "../core/asset-serialize";
-import { parseFrontmatter } from "../core/frontmatter";
+import { parseAssetRef } from "../../core/asset/asset-ref.js";
+import { assembleAsset } from "../../core/asset/asset-serialize.js";
+import { parseFrontmatter } from "../../core/asset/frontmatter.js";
 function hasNonEmptyList(value) {
     return Array.isArray(value) && value.some((item) => typeof item === "string" && item.trim().length > 0);
 }

package/dist/commands/{distill.js → improve/distill.js}

@@ -52,22 +52,22 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { parseAssetRef } from "../core/asset-ref";
-import { assembleAssetFromString } from "../core/asset-serialize";
-import { resolveStashDir, timestampForFilename } from "../core/common";
-import { getDefaultLlmConfig, loadConfig } from "../core/config";
-import { ConfigError, UsageError } from "../core/errors";
-import { appendEvent, readEvents } from "../core/events";
-import { parseFrontmatter } from "../core/frontmatter";
-import { lintLessonContent } from "../core/lesson-lint";
-import { stripMarkdownFences } from "../core/markdown";
-import { createProposal, isProposalSkipped, listProposals, } from "../core/proposals";
-import { warnVerbose } from "../core/warn";
-import { resolveAssetPath } from "../indexer/path-resolver";
-import { chatCompletion, parseEmbeddedJsonResponse } from "../llm/client";
-import { isLlmFeatureEnabled, tryLlmFeature } from "../llm/feature-gate";
-import { assessMemoryKnowledgePromotionCandidate, deriveKnowledgeRef } from "./distill-promotion-policy";
-import { akmSearch } from "./search";
+import { parseAssetRef } from "../../core/asset/asset-ref.js";
+import { assembleAssetFromString } from "../../core/asset/asset-serialize.js";
+import { parseFrontmatter } from "../../core/asset/frontmatter.js";
+import { stripMarkdownFences } from "../../core/asset/markdown.js";
+import { resolveStashDir, timestampForFilename } from "../../core/common.js";
+import { getDefaultLlmConfig, loadConfig } from "../../core/config/config.js";
+import { ConfigError, UsageError } from "../../core/errors.js";
+import { appendEvent, readEvents } from "../../core/events.js";
+import { lintLessonContent } from "../../core/lesson-lint.js";
+import { warnVerbose } from "../../core/warn.js";
+import { resolveAssetPath } from "../../indexer/walk/path-resolver.js";
+import { chatCompletion, parseEmbeddedJsonResponse } from "../../llm/client.js";
+import { isLlmFeatureEnabled, tryLlmFeature } from "../../llm/feature-gate.js";
+import { createProposal, isProposalSkipped, listProposals, } from "../proposal/validators/proposals.js";
+import { akmSearch } from "../read/search.js";
+import { assessMemoryKnowledgePromotionCandidate, deriveKnowledgeRef } from "./distill-promotion-policy.js";
 /**
  * Asset-ref types that `akm distill` structurally refuses as inputs.
  *
@@ -112,13 +112,14 @@ export function deriveLessonRef(inputRef) {
         .replace(/^-|-$/g, "");
     return `lesson:${safe}-lesson`;
 }
+import { repairTruncatedDescription } from "../../core/text-truncation.js";
 // ── Content quality validators ──────────────────────────────────────────────
 //
 // 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 "../core/proposal-quality-validators";
+// (`from "../../src/commands/distill"`) continue to resolve.
+import { detectDoubleFrontmatter, isValidDescription, isValidWhenToUse, } from "../proposal/validators/proposal-quality-validators.js";
 export { detectDoubleFrontmatter, isValidDescription, isValidWhenToUse };
 // ── Prompt assembly ─────────────────────────────────────────────────────────
 const LESSON_SYSTEM_PROMPT = [
@@ -1121,6 +1122,26 @@ export async function akmDistill(options) {
             }
         }
     }
+    // Post-generation truncation repair (#556): if the LLM sliced the
+    // description mid-sentence, deterministically complete it from its own text
+    // / the lesson body BEFORE the lint + quality validators run. No-op
+    // (byte-identical) for already-complete descriptions, so this never alters
+    // a valid proposal. Runs on the lesson path only (knowledge has no
+    // description field gate here).
+    if (effectiveProposalKind !== "knowledge") {
+        const parsedRepair = parseFrontmatter(content);
+        const fmRepair = (parsedRepair.data ?? {});
+        const descRepairRaw = typeof fmRepair.description === "string" ? fmRepair.description : "";
+        if (descRepairRaw) {
+            const repaired = repairTruncatedDescription(descRepairRaw, parsedRepair.content);
+            if (repaired !== descRepairRaw) {
+                const repairedFmLines = Object.entries({ ...fmRepair, description: repaired })
+                    .map(([k, v]) => `${k}: ${JSON.stringify(v)}`)
+                    .join("\n");
+                content = assembleAssetFromString(repairedFmLines, parsedRepair.content);
+            }
+        }
+    }
     // Parse + lint the lesson before creating the proposal. The lint is the
     // canonical gate for required frontmatter (v1 spec §13). On failure we
     // surface a structured error and exit non-zero — but still emit

package/dist/commands/{eval-cases.js → improve/eval-cases.js}

@@ -3,7 +3,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 import fs from "node:fs";
 import path from "node:path";
-import { writeFileAtomic } from "../core/common";
+import { writeFileAtomic } from "../../core/common.js";
 export function writeEvalCase(stashDir, evalCase) {
     const evalDir = path.join(stashDir, ".akm", "eval-cases");
     fs.mkdirSync(evalDir, { recursive: true });

package/dist/commands/{extract-cli.js → improve/extract-cli.js}

@@ -15,10 +15,10 @@
  * `--auto` runs multiple harnesses).
  */
 import { defineCommand } from "citty";
-import { output, runWithJsonErrors } from "../cli/shared";
-import { UsageError } from "../core/errors";
-import { getAvailableHarnesses } from "../integrations/session-logs";
-import { akmExtract } from "./extract";
+import { output, runWithJsonErrors } from "../../cli/shared.js";
+import { UsageError } from "../../core/errors.js";
+import { getAvailableHarnesses } from "../../integrations/session-logs/index.js";
+import { akmExtract } from "./extract.js";
 export const extractCommand = defineCommand({
     meta: {
         name: "extract",

package/dist/commands/{extract-prompt.js → improve/extract-prompt.js}

@@ -14,7 +14,7 @@
  * happy path. `additionalProperties: false` means any hallucinated keys
  * the model emits get dropped before we parse.
  */
-import promptTemplate from "../assets/prompts/extract-session.md" with { type: "text" };
+import promptTemplate from "../../assets/prompts/extract-session.md" with { type: "text" };
 /**
  * JSON Schema for the structured extract output. Passed to `chatCompletion`
  * when the configured LLM connection has `supportsJsonSchema: true`.
@@ -55,7 +55,7 @@ export const EXTRACT_JSON_SCHEMA = {
                         type: "string",
                         minLength: 20,
                         maxLength: 400,
-                        description: "One-sentence summary of the candidate.",
+                        description: "One-sentence summary of the candidate. Must be a complete sentence; do not end mid-clause.",
                     },
                     when_to_use: {
                         type: "string",