akm-cli 0.9.0-beta.5 → 0.9.0-beta.51

package/dist/commands/proposal/validators/proposals.js

@@ -50,7 +50,8 @@ import { makeAssetRef, parseAssetRef } from "../../../core/asset/asset-ref.js";
 import { resolveAssetPathFromName, TYPE_DIRS } from "../../../core/asset/asset-spec.js";
 import { NotFoundError, UsageError } from "../../../core/errors.js";
 import { appendEvent } from "../../../core/events.js";
-import { getStateDbPath, getStateProposal, hasImportedFsProposals, insertProposalIfAbsent, listStateProposalIdsByPrefix, listStateProposals, openStateDatabase, recordFsProposalsImport, upsertProposal, } from "../../../core/state-db.js";
+import { getStateProposal, hasImportedFsProposals, insertProposalIfAbsent, listStateProposalIdsByPrefix, listStateProposals, recordFsProposalsImport, upsertProposal, withImmediateTransaction, withStateDb, } from "../../../core/state-db.js";
+import { repairTruncatedDescription } from "../../../core/text-truncation.js";
 import { warn } from "../../../core/warn.js";
 import { commitWriteTargetBoundary, formatRefForMessage, resolveWriteTarget, writeAssetToSource, } from "../../../core/write-source.js";
 import { runProposalValidators } from "./proposal-validators.js";
@@ -74,6 +75,8 @@ export const PROPOSAL_SOURCES = [
     "consolidate",
     "extract",
     "improve",
+    "recombine",
+    "procedural",
     // Semi-automated / tool-driven.
     "feedback",
     // Human-initiated / CLI-driven.
@@ -91,6 +94,8 @@ export const AUTOMATED_PROPOSAL_SOURCES = [
     "consolidate",
     "extract",
     "improve",
+    "recombine",
+    "procedural",
     "schema-repair",
 ];
 /**
@@ -156,14 +161,10 @@ function newId(ctx) {
  * guaranteed to have run before any read or write.
  */
 function withProposalsDb(stashDir, ctx, fn) {
-    const db = openStateDatabase(ctx?.dbPath ?? getStateDbPath());
-    try {
+    return withStateDb((db) => {
         importLegacyProposalFiles(db, stashDir);
         return fn(db);
-    }
-    finally {
-        db.close();
-    }
+    }, { path: ctx?.dbPath });
 }
 // ── Legacy filesystem import (#578) ─────────────────────────────────────────
 /** Legacy (pre-0.9.0) proposal directory: `<stashDir>/.akm/proposals[/archive]`. */
@@ -334,37 +335,42 @@ export function createProposal(stashDir, input, ctx) {
     }
     const normalizedRef = makeAssetRef(parsedRef.type, parsedRef.name, parsedRef.origin);
     return withProposalsDb(stashDir, ctx, (db) => {
-        if (!input.force) {
-            const skip = checkDedupAndCooldown(db, stashDir, normalizedRef, input, ctx);
-            if (skip)
-                return skip;
-        }
-        const created = nowIso(ctx);
-        // Phase 6A: validate confidence is a finite number in [0, 1]. Anything else
-        // is dropped silently — we never store NaN, Infinity, or out-of-range values.
-        // Callers that mis-report confidence should not poison the auto-accept gate.
-        const sanitizedConfidence = typeof input.confidence === "number" &&
-            Number.isFinite(input.confidence) &&
-            input.confidence >= 0 &&
-            input.confidence <= 1
-            ? input.confidence
-            : undefined;
-        const proposal = {
-            id: newId(ctx),
-            ref: normalizedRef,
-            status: "pending",
-            source: input.source,
-            ...(input.sourceRun !== undefined ? { sourceRun: input.sourceRun } : {}),
-            createdAt: created,
-            updatedAt: created,
-            payload: {
-                content: input.payload.content,
-                ...(input.payload.frontmatter !== undefined ? { frontmatter: input.payload.frontmatter } : {}),
-            },
-            ...(sanitizedConfidence !== undefined ? { confidence: sanitizedConfidence } : {}),
-        };
-        upsertProposal(db, proposal, stashDir);
-        return proposal;
+        return withImmediateTransaction(db, () => {
+            if (!input.force) {
+                const skip = checkDedupAndCooldown(db, stashDir, normalizedRef, input, ctx);
+                if (skip)
+                    return skip;
+            }
+            const created = nowIso(ctx);
+            // Phase 6A: validate confidence is a finite number in [0, 1]. Anything else
+            // is dropped silently — we never store NaN, Infinity, or out-of-range values.
+            // Callers that mis-report confidence should not poison the auto-accept gate.
+            const sanitizedConfidence = typeof input.confidence === "number" &&
+                Number.isFinite(input.confidence) &&
+                input.confidence >= 0 &&
+                input.confidence <= 1
+                ? input.confidence
+                : undefined;
+            const proposal = {
+                id: newId(ctx),
+                ref: normalizedRef,
+                status: "pending",
+                source: input.source,
+                ...(input.sourceRun !== undefined ? { sourceRun: input.sourceRun } : {}),
+                createdAt: created,
+                updatedAt: created,
+                payload: {
+                    content: input.payload.content,
+                    ...(input.payload.frontmatter !== undefined ? { frontmatter: input.payload.frontmatter } : {}),
+                },
+                ...(sanitizedConfidence !== undefined ? { confidence: sanitizedConfidence } : {}),
+                // Attribution tagging: persist the eligibility lane so it survives to
+                // accept/reject/revert time. See EligibilitySource.
+                ...(input.eligibilitySource !== undefined ? { eligibilitySource: input.eligibilitySource } : {}),
+            };
+            upsertProposal(db, proposal, stashDir);
+            return proposal;
+        });
     });
 }
 /**
@@ -517,19 +523,25 @@ export function resolveProposalId(stashDir, idOrRef, ctx) {
  */
 export function archiveProposal(stashDir, id, status, reason, ctx) {
     return withProposalsDb(stashDir, ctx, (db) => {
-        const existing = requireProposal(db, stashDir, id);
-        const updated = {
-            ...existing,
-            status,
-            updatedAt: nowIso(ctx),
-            review: {
-                outcome: status,
-                ...(reason !== undefined ? { reason } : {}),
-                decidedAt: nowIso(ctx),
-            },
-        };
-        upsertProposal(db, updated, stashDir);
-        return updated;
+        return withImmediateTransaction(db, () => {
+            const existing = requireProposal(db, stashDir, id);
+            if (existing.status !== "pending") {
+                throw new UsageError(`Proposal ${id} is not pending (current status: ${existing.status}). Only pending proposals can be ${status}.`, "INVALID_FLAG_VALUE");
+            }
+            const decidedAt = nowIso(ctx);
+            const updated = {
+                ...existing,
+                status,
+                updatedAt: decidedAt,
+                review: {
+                    outcome: status,
+                    ...(reason !== undefined ? { reason } : {}),
+                    decidedAt,
+                },
+            };
+            upsertProposal(db, updated, stashDir);
+            return updated;
+        });
     });
 }
 /**
@@ -548,15 +560,17 @@ export function archiveProposal(stashDir, id, status, reason, ctx) {
  */
 export function recordGateDecision(stashDir, id, decision, ctx) {
     return withProposalsDb(stashDir, ctx, (db) => {
-        const existing = getStateProposal(db, id, stashDir);
-        if (!existing)
-            return undefined;
-        const updated = {
-            ...existing,
-            gateDecision: { ...decision, decidedAt: decision.decidedAt ?? nowIso(ctx) },
-        };
-        upsertProposal(db, updated, stashDir);
-        return updated;
+        return withImmediateTransaction(db, () => {
+            const existing = getStateProposal(db, id, stashDir);
+            if (!existing || existing.status !== "pending")
+                return undefined;
+            const updated = {
+                ...existing,
+                gateDecision: { ...decision, decidedAt: decision.decidedAt ?? nowIso(ctx) },
+            };
+            upsertProposal(db, updated, stashDir);
+            return updated;
+        });
     });
 }
 /**
@@ -699,6 +713,99 @@ export function expireStaleProposals(stashDir, config, ctx) {
 export function validateProposal(proposal) {
     return runProposalValidators(proposal);
 }
+// ── Content repair ──────────────────────────────────────────────────────────
+/**
+ * Attempt bounded, deterministic repair of mechanically-fixable defects in a
+ * proposal's markdown content. NEVER fabricates text — only strips known-bad
+ * structure and applies {@link repairTruncatedDescription} to a truncated
+ * description when one is detected.
+ *
+ * Repairs performed (in order):
+ *   1. Strip body lines that restate frontmatter fields as pseudo-frontmatter
+ *      (e.g. `**description**: …` or `when_to_use: …` in the body).
+ *   2. Remove stray body `---` horizontal-rule lines (leaving exactly the two
+ *      frontmatter fences when the content has a valid frontmatter block).
+ *   3. Apply {@link repairTruncatedDescription} to a truncated/hanging
+ *      `description` field in the frontmatter.
+ *
+ * Returns the repaired content string. When no repairs apply the input is
+ * returned byte-identical so callers can use strict equality to detect
+ * whether a repair actually happened.
+ *
+ * CRITICAL: This function is CONTENT-PRESERVING. Callers MUST re-validate the
+ * repaired output via {@link validateProposal} / {@link runProposalValidators}
+ * before promotion — a repair that makes things *worse* (or is simply
+ * insufficient) must be caught by the existing gate.
+ */
+export function repairProposalContent(content) {
+    if (typeof content !== "string" || content.trim() === "")
+        return content;
+    // Determine whether the content has a frontmatter block so we know how
+    // many `---` fence lines are expected.
+    const hasFrontmatter = /^---\r?\n[\s\S]*?\r?\n---/.test(content);
+    // Split into lines for structural repairs.
+    const lines = content.split(/\r?\n/);
+    // Track whether we are inside the opening frontmatter block so we can
+    // leave it untouched and only repair the body.
+    let inFrontmatter = false;
+    // Frontmatter fence index tracking: first fence opens FM, second closes it.
+    let fmOpenSeen = false;
+    let fmCloseSeen = false;
+    const repairedLines = [];
+    for (const line of lines) {
+        const isFence = /^---\s*$/.test(line);
+        // Track frontmatter fences (first two `---` fences delimit the FM block).
+        if (isFence && !fmCloseSeen) {
+            if (!fmOpenSeen) {
+                fmOpenSeen = true;
+                inFrontmatter = true;
+                repairedLines.push(line);
+                continue;
+            }
+            if (inFrontmatter) {
+                fmCloseSeen = true;
+                inFrontmatter = false;
+                repairedLines.push(line);
+                continue;
+            }
+        }
+        // We are now in the body (past the frontmatter or no frontmatter).
+        if (inFrontmatter) {
+            // Still inside the frontmatter — keep as-is.
+            repairedLines.push(line);
+            continue;
+        }
+        // Repair 1: Strip pseudo-frontmatter restatements in the body.
+        // Matches lines like `**description**: …` or `when_to_use: …`.
+        if (/^\s*(\*\*|__)?\s*(description|when_to_use)\s*(\*\*|__)?\s*:/i.test(line)) {
+            // Drop the line — it is a structural defect, not user content.
+            continue;
+        }
+        // Repair 2: Remove stray `---` horizontal-rule lines in the body.
+        // We keep these only when the content has NO frontmatter (in that case
+        // `---` is a legitimate thematic break in plain-body content).
+        if (isFence && hasFrontmatter) {
+            // Drop: these are extra `---` fences beyond the two frontmatter delimiters.
+            continue;
+        }
+        repairedLines.push(line);
+    }
+    let repaired = repairedLines.join("\n");
+    // Repair 3: Apply repairTruncatedDescription to the description field.
+    // We operate on the raw text rather than re-parsing YAML to avoid
+    // reformatting unrelated frontmatter keys.
+    if (hasFrontmatter) {
+        // Extract the body text (after the second `---`) so we can pass it to
+        // repairTruncatedDescription as context for the swap-in heuristic.
+        const bodyMatch = repaired.match(/^---\r?\n[\s\S]*?\r?\n---\r?\n?([\s\S]*)$/);
+        const bodyText = bodyMatch?.[1] ?? "";
+        repaired = repaired.replace(/^(description:\s*)(.*?)(\r?\n)/m, (_match, prefix, rawDesc, nl) => {
+            const fixed = repairTruncatedDescription(rawDesc.trim(), bodyText);
+            return `${prefix}${fixed}${nl}`;
+        });
+    }
+    return repaired;
+}
 /**
  * Validate a proposal, then promote it through the canonical
  * {@link writeAssetToSource} dispatch (the single place that branches on
@@ -716,12 +823,31 @@ export async function promoteProposal(stashDir, config, id, options = {}, ctx) {
     if (proposal.status !== "pending") {
         throw new UsageError(`Proposal ${id} is not pending (current status: ${proposal.status}). Only pending proposals can be accepted.`, "INVALID_FLAG_VALUE");
     }
-    const report = validateProposal(proposal);
+    // Attempt bounded auto-repair of mechanically-fixable structural defects
+    // (pseudo-frontmatter-in-body, stray `---` fences, truncated description)
+    // BEFORE running validation. If the repair produces valid content, we
+    // promote the repaired version; if validation still fails, the original
+    // error path throws as before. The repair is content-preserving and
+    // deterministic — it never invents text.
+    const repairedContent = repairProposalContent(proposal.payload.content);
+    const proposalToValidate = repairedContent !== proposal.payload.content
+        ? { ...proposal, payload: { ...proposal.payload, content: repairedContent } }
+        : proposal;
+    const report = validateProposal(proposalToValidate);
     if (!report.ok) {
         const message = report.findings.map((f) => `[${f.kind}] ${f.message}`).join("\n");
         throw new UsageError(`Proposal ${id} failed validation:\n${message}`, "MISSING_REQUIRED_ARGUMENT", "Fix the proposal payload (frontmatter / content) and try again, or reject the proposal with a reason.");
     }
-    const ref = parseAssetRef(proposal.ref);
+    // Use the (possibly repaired) payload for the promotion write. Persist the
+    // repaired content back onto the DB row so the audit trail reflects the
+    // final promoted payload (not the defective original).
+    if (repairedContent !== proposal.payload.content) {
+        withProposalsDb(stashDir, ctx, (db) => {
+            const updated = { ...proposal, payload: { ...proposal.payload, content: repairedContent } };
+            upsertProposal(db, updated, stashDir);
+        });
+    }
+    const ref = parseAssetRef(proposalToValidate.ref);
     if (!TYPE_DIRS[ref.type]) {
         throw new UsageError(`Proposal ${id} targets unknown asset type "${ref.type}".`, "INVALID_FLAG_VALUE");
     }
@@ -743,7 +869,7 @@ export async function promoteProposal(stashDir, config, id, options = {}, ctx) {
         // missing-revert path is visible.
         warn(`[proposals] promoteProposal: failed to capture backup for ${id}: ${err instanceof Error ? err.message : String(err)}`);
     }
-    const written = await writeAssetToSource(target.source, target.config, ref, proposal.payload.content);
+    const written = await writeAssetToSource(target.source, target.config, ref, repairedContent);
     // 0.9.0 (issue #507): single batch commit at the write boundary for git
     // targets. No-op for filesystem/primary-stash targets.
     commitWriteTargetBoundary(target, `Update ${formatRefForMessage(ref)}`);