akm-cli 0.9.0-beta.54 → 0.9.0-beta.55

package/dist/commands/improve/extract-cli.js

@@ -16,13 +16,13 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { defineCommand } from "citty";
-import { EXIT_CODES, output, runWithJsonErrors } from "../../cli/shared.js";
+import { getStringArg } from "../../cli/parse-args.js";
+import { defineJsonCommand, EXIT_CODES, output } from "../../cli/shared.js";
 import { UsageError } from "../../core/errors.js";
 import { getAvailableHarnesses, getWatchTargets } from "../../integrations/session-logs/index.js";
 import { akmExtract } from "./extract.js";
 import { akmExtractWatch } from "./extract-watch.js";
-export const extractCommand = defineCommand({
+export const extractCommand = defineJsonCommand({
     meta: {
         name: "extract",
         description: "Extract durable insights from native session files (claude-code, opencode) and queue them as proposals. Replaces the legacy session-checkpoint hook.",
@@ -74,86 +74,84 @@ export const extractCommand = defineCommand({
         },
     },
     async run({ args }) {
-        await runWithJsonErrors(async () => {
-            const type = typeof args.type === "string" ? args.type.trim() : "";
-            const sessionId = typeof args["session-id"] === "string" ? args["session-id"].trim() : "";
-            const location = typeof args.location === "string" ? args.location.trim() : "";
-            const since = typeof args.since === "string" ? args.since.trim() : "";
-            const auto = args.auto === true;
-            const dryRun = args["dry-run"] === true;
-            const force = args.force === true;
-            const timeoutMs = typeof args["timeout-ms"] === "string" && args["timeout-ms"] !== ""
-                ? Number.parseInt(args["timeout-ms"], 10)
-                : undefined;
-            if (timeoutMs !== undefined && (!Number.isFinite(timeoutMs) || timeoutMs <= 0)) {
-                throw new UsageError(`--timeout-ms must be a positive integer (got "${args["timeout-ms"]}").`, "INVALID_FLAG_VALUE");
-            }
-            const watch = args.watch === true;
-            const debounceMs = typeof args["debounce-ms"] === "string" && args["debounce-ms"] !== ""
-                ? Number.parseInt(args["debounce-ms"], 10)
-                : 2000;
-            if (watch && (!Number.isFinite(debounceMs) || debounceMs <= 0)) {
-                throw new UsageError(`--debounce-ms must be a positive integer (got "${args["debounce-ms"]}").`, "INVALID_FLAG_VALUE");
-            }
-            if (watch) {
-                await runWatchMode({ debounceMs, dryRun, force, ...(since ? { since } : {}) });
-                return;
-            }
-            if (auto && type) {
-                throw new UsageError("--auto and --type are mutually exclusive. Pick one.", "INVALID_FLAG_VALUE");
-            }
-            if (!auto && !type) {
-                throw new UsageError("--type is required (or pass --auto to try every available harness).", "MISSING_REQUIRED_ARGUMENT");
-            }
-            const commonOptions = {
-                ...(sessionId ? { sessionId } : {}),
-                ...(location ? { location } : {}),
-                ...(since ? { since } : {}),
-                dryRun,
-                force,
-                ...(timeoutMs !== undefined ? { timeoutMs } : {}),
-            };
-            if (auto) {
-                const harnesses = getAvailableHarnesses();
-                if (harnesses.length === 0) {
-                    output("extract", {
-                        schemaVersion: 1,
-                        ok: false,
-                        shape: "extract-auto-result",
-                        warnings: ["no available harnesses found on this machine"],
-                        results: [],
-                    });
-                    return;
-                }
-                const results = [];
-                for (const h of harnesses) {
-                    const result = await akmExtract({ type: h.name, ...commonOptions });
-                    results.push(result);
-                }
-                const ok = results.every((r) => r.ok);
-                const totalProposals = results.reduce((sum, r) => sum + r.proposals.length, 0);
+        const type = getStringArg(args, "type") ?? "";
+        const sessionId = getStringArg(args, "session-id") ?? "";
+        const location = getStringArg(args, "location") ?? "";
+        const since = getStringArg(args, "since") ?? "";
+        const auto = args.auto === true;
+        const dryRun = args["dry-run"] === true;
+        const force = args.force === true;
+        const timeoutMs = typeof args["timeout-ms"] === "string" && args["timeout-ms"] !== ""
+            ? Number.parseInt(args["timeout-ms"], 10)
+            : undefined;
+        if (timeoutMs !== undefined && (!Number.isFinite(timeoutMs) || timeoutMs <= 0)) {
+            throw new UsageError(`--timeout-ms must be a positive integer (got "${args["timeout-ms"]}").`, "INVALID_FLAG_VALUE");
+        }
+        const watch = args.watch === true;
+        const debounceMs = typeof args["debounce-ms"] === "string" && args["debounce-ms"] !== ""
+            ? Number.parseInt(args["debounce-ms"], 10)
+            : 2000;
+        if (watch && (!Number.isFinite(debounceMs) || debounceMs <= 0)) {
+            throw new UsageError(`--debounce-ms must be a positive integer (got "${args["debounce-ms"]}").`, "INVALID_FLAG_VALUE");
+        }
+        if (watch) {
+            await runWatchMode({ debounceMs, dryRun, force, ...(since ? { since } : {}) });
+            return;
+        }
+        if (auto && type) {
+            throw new UsageError("--auto and --type are mutually exclusive. Pick one.", "INVALID_FLAG_VALUE");
+        }
+        if (!auto && !type) {
+            throw new UsageError("--type is required (or pass --auto to try every available harness).", "MISSING_REQUIRED_ARGUMENT");
+        }
+        const commonOptions = {
+            ...(sessionId ? { sessionId } : {}),
+            ...(location ? { location } : {}),
+            ...(since ? { since } : {}),
+            dryRun,
+            force,
+            ...(timeoutMs !== undefined ? { timeoutMs } : {}),
+        };
+        if (auto) {
+            const harnesses = getAvailableHarnesses();
+            if (harnesses.length === 0) {
                 output("extract", {
                     schemaVersion: 1,
-                    ok,
+                    ok: false,
                     shape: "extract-auto-result",
-                    dryRun,
-                    harnessesProcessed: results.length,
-                    totalProposals,
-                    results,
+                    warnings: ["no available harnesses found on this machine"],
+                    results: [],
                 });
-                // Signal failure to callers/cron when every harness failed. output()
-                // only renders; without this the */30 cron exits 0 on a total failure
-                // and the breakage is invisible to exit-code monitoring. process.exitCode
-                // (not process.exit) lets stdout flush and the watcher/timers settle.
-                if (!ok)
-                    process.exitCode = EXIT_CODES.GENERAL;
                 return;
             }
-            const result = await akmExtract({ type, ...commonOptions });
-            output("extract", result);
-            if (!result.ok)
+            const results = [];
+            for (const h of harnesses) {
+                const result = await akmExtract({ type: h.name, ...commonOptions });
+                results.push(result);
+            }
+            const ok = results.every((r) => r.ok);
+            const totalProposals = results.reduce((sum, r) => sum + r.proposals.length, 0);
+            output("extract", {
+                schemaVersion: 1,
+                ok,
+                shape: "extract-auto-result",
+                dryRun,
+                harnessesProcessed: results.length,
+                totalProposals,
+                results,
+            });
+            // Signal failure to callers/cron when every harness failed. output()
+            // only renders; without this the */30 cron exits 0 on a total failure
+            // and the breakage is invisible to exit-code monitoring. process.exitCode
+            // (not process.exit) lets stdout flush and the watcher/timers settle.
+            if (!ok)
                 process.exitCode = EXIT_CODES.GENERAL;
-        });
+            return;
+        }
+        const result = await akmExtract({ type, ...commonOptions });
+        output("extract", result);
+        if (!result.ok)
+            process.exitCode = EXIT_CODES.GENERAL;
     },
 });
 /**

package/dist/commands/improve/extract.js

@@ -32,7 +32,7 @@ import { ConfigError, UsageError } from "../../core/errors.js";
 import { appendEvent } from "../../core/events.js";
 import { probeLock, releaseLock, tryAcquireLockSync } from "../../core/file-lock.js";
 import { resolveStashStandards } from "../../core/standards/resolve-stash-standards.js";
-import { getExtractedSessionsMap, getLastExtractRunAt, getStateDbPath, openStateDatabase, shouldSkipAlreadyExtractedSession, upsertExtractedSession, withStateDb, } from "../../core/state-db.js";
+import { getStateDbPath, openStateDatabase, withStateDb } from "../../core/state-db.js";
 import { repairTruncatedDescription } from "../../core/text-truncation.js";
 import { warn } from "../../core/warn.js";
 import { indexWrittenAssets } from "../../indexer/index-written-assets.js";
@@ -44,10 +44,12 @@ import { chatCompletion } from "../../llm/client.js";
 import { embed } from "../../llm/embedder.js";
 import { tryLlmFeature } from "../../llm/feature-gate.js";
 import { sha256Hex } from "../../runtime.js";
-import { createProposal, isProposalSkipped } from "../proposal/validators/proposals.js";
+import { getExtractedSessionsMap, getLastExtractRunAt, shouldSkipAlreadyExtractedSession, upsertExtractedSession, } from "../../storage/repositories/extract-sessions-repository.js";
+import { createProposal, isProposalSkipped } from "../proposal/repository.js";
 import { buildExtractPrompt, EXTRACT_JSON_SCHEMA, parseExtractPayload } from "./extract-prompt.js";
-import { applySchemaSimilarityPenalty, buildHotProbationFrontmatter, loadDerivedLayerEmbeddings, } from "./homeostatic.js";
+import { buildHotProbationFrontmatter } from "./hot-probation.js";
 import { resolveProcessEnabled } from "./improve-profiles.js";
+import { applySchemaSimilarityPenalty, loadDerivedLayerEmbeddings, } from "./schema-similarity-gate.js";
 import { buildSessionSummaryPrompt, parseSessionSummary, SESSION_SUMMARY_JSON_SCHEMA, sessionMeetsDurationGate, writeSessionAsset, } from "./session-asset.js";
 import { resolveTriageConfig, scoreSessionTriage } from "./triage.js";
 /** Default minimum session duration (minutes) for session indexing (#561). */
@@ -462,7 +464,7 @@ standardsContext) {
             // existing derived-layer node, down-prioritize by multiplying confidence by
             // the penalty. PARITY: schemaSimilarityCtx is null when the flag is off →
             // applySchemaSimilarityPenalty returns the original confidence untouched and
-            // never embeds. (Logic lives in homeostatic.ts so it is unit-testable.)
+            // never embeds. (Logic lives in schema-similarity-gate.ts so it is unit-testable.)
             const gateResult = await applySchemaSimilarityPenalty(candidate, schemaSimilarityCtx, (text) => schemaSimilarityCtx?.embedFn
                 ? schemaSimilarityCtx.embedFn(text)
                 : embed(text, schemaSimilarityCtx?.embeddingConfig));

package/dist/commands/improve/hot-probation.js

@@ -0,0 +1,45 @@
+// 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/.
+/**
+ * WS-3b Step 0c — Hot-probation intake buffer (#604).
+ *
+ * New system-generated extractions enter `captureMode: hot-probation` and spend
+ * ONE consolidation cycle in probation before promotion to the main stash;
+ * dedup + quality second-pass runs against them. Stops noisy extractions from
+ * polluting the stash at the source. Reuses shared dedupHash + body_embeddings.
+ * Default OFF.
+ *
+ * @module hot-probation
+ */
+/**
+ * captureMode value for system-generated extractions in probation.
+ * Automatic counterpart to the user-explicit `captureMode: hot`.
+ */
+export const CAPTURE_MODE_HOT_PROBATION = "hot-probation";
+/**
+ * Returns true when an asset is in hot-probation (system-generated, not yet
+ * graduated from the intake dedup+quality pass).
+ */
+export function isHotProbation(captureModeValue) {
+    return captureModeValue === CAPTURE_MODE_HOT_PROBATION;
+}
+/**
+ * Returns true when an asset should be skipped by the consolidation LLM
+ * because it's still in hot-probation (hasn't completed the intake pass yet).
+ *
+ * Hot-probation assets are processed by the consolidation dedup pre-pass
+ * (runDeterministicDedup) but excluded from the LLM merge clustering, so
+ * noisy extractions can't pollute the LLM context.
+ */
+export function shouldSkipHotProbationInLlm(frontmatterData) {
+    return isHotProbation(frontmatterData.captureMode);
+}
+/**
+ * Build frontmatter fields to inject when creating a hot-probation proposal.
+ * The proposal will carry `captureMode: hot-probation` so downstream logic
+ * knows to run the intake dedup pass before graduating it.
+ */
+export function buildHotProbationFrontmatter() {
+    return { captureMode: CAPTURE_MODE_HOT_PROBATION };
+}

package/dist/commands/improve/improve-auto-accept.js

@@ -3,9 +3,10 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 import { loadConfig } from "../../core/config/config.js";
 import { appendEvent } from "../../core/events.js";
-import { getPhaseThreshold, withStateDb } from "../../core/state-db.js";
+import { withStateDb } from "../../core/state-db.js";
 import { info, warn } from "../../core/warn.js";
-import { getProposal, promoteProposal, recordGateDecision } from "../proposal/validators/proposals.js";
+import { getPhaseThreshold } from "../../storage/repositories/improve-runs-repository.js";
+import { getProposal, promoteProposal, recordGateDecision } from "../proposal/repository.js";
 async function sha256Hex(input) {
     const data = new TextEncoder().encode(input);
     const digest = await crypto.subtle.digest("SHA-256", data);

package/dist/commands/improve/improve-cli.js

@@ -8,11 +8,12 @@ import { output, runWithJsonErrors } from "../../cli/shared.js";
 import { loadConfig } from "../../core/config/config.js";
 import { UsageError } from "../../core/errors.js";
 import { getCacheDir } from "../../core/paths.js";
-import { getActiveCanaries, queryRecentCycleMetrics, withStateDb } from "../../core/state-db.js";
+import { withStateDb } from "../../core/state-db.js";
 import { clearLogFile, setLogFile } from "../../core/warn.js";
 import { closeDatabase, openExistingDatabase } from "../../indexer/db/db.js";
 import { resolveSourceEntries } from "../../indexer/search/search-source.js";
-import { getHyphenatedArg, getHyphenatedBoolean, parseFlagValue } from "../../output/context.js";
+import { parseFlagValue } from "../../output/context.js";
+import { getActiveCanaries, queryRecentCycleMetrics } from "../../storage/repositories/canaries-repository.js";
 import { refreshCanarySet } from "./collapse-detector.js";
 import { akmImprove } from "./improve.js";
 import { buildImproveRunId, recordTerminatedImproveRun, relativeImproveResultPath, writeImproveResultFile, } from "./improve-result-file.js";
@@ -137,7 +138,7 @@ export const improveCommand = defineCommand({
         // contain ":"): dispatch to the detector inspection verb instead of an
         // improve run.
         if (args.scope === "canary") {
-            await runWithJsonErrors(() => runCanaryInspection(getHyphenatedBoolean(args, "refresh") === true));
+            await runWithJsonErrors(() => runCanaryInspection(args.refresh));
             return;
         }
         await runWithJsonErrors(async () => {
@@ -146,31 +147,31 @@ export const improveCommand = defineCommand({
                 throw new UsageError(`akm improve does not accept --format. That flag controls output formatting for other commands (search, show, etc.).\n` +
                     `Did you mean: akm improve (no --format flag)?`, "INVALID_FLAG_VALUE");
             }
-            const jsonToStdout = getHyphenatedBoolean(args, "json-to-stdout");
-            const autoAcceptRaw = getHyphenatedArg(args, "auto-accept");
+            const jsonToStdout = args["json-to-stdout"];
+            const autoAcceptRaw = args["auto-accept"];
             const autoAccept = parseAutoAcceptFlag(autoAcceptRaw);
             const targetArg = getStringArg(args, "target");
             const taskArg = getStringArg(args, "task");
-            const dryRun = getHyphenatedBoolean(args, "dry-run");
+            const dryRun = args["dry-run"];
             const limitRaw = parsePositiveIntFlag(args.limit ?? undefined);
-            const timeoutMs = parsePositiveIntFlag(getHyphenatedArg(args, "timeout-ms"), "--timeout-ms");
-            const consolidateRecoveryRaw = getHyphenatedArg(args, "consolidate-recovery");
+            const timeoutMs = parsePositiveIntFlag(args["timeout-ms"], "--timeout-ms");
+            const consolidateRecoveryRaw = args["consolidate-recovery"];
             const consolidateRecovery = consolidateRecoveryRaw === undefined
                 ? undefined
                 : consolidateRecoveryRaw.trim().toLowerCase();
             if (consolidateRecovery !== undefined && consolidateRecovery !== "abort" && consolidateRecovery !== "clean") {
                 throw new UsageError(`Invalid --consolidate-recovery value: "${consolidateRecoveryRaw}". Must be one of: abort, clean.`, "INVALID_FLAG_VALUE");
             }
-            const minRetrievalCountRaw = getHyphenatedArg(args, "min-retrieval-count");
+            const minRetrievalCountRaw = args["min-retrieval-count"];
             const minRetrievalCount = parseNonNegativeIntFlag(minRetrievalCountRaw, "--min-retrieval-count");
-            const requireFeedbackSignal = getHyphenatedBoolean(args, "require-feedback-signal");
-            const skipIfLocked = getHyphenatedBoolean(args, "skip-if-locked");
+            const requireFeedbackSignal = args["require-feedback-signal"];
+            const skipIfLocked = args["skip-if-locked"];
             const profileArg = getStringArg(args, "profile");
             // Only set the keys the user actually passed (citty leaves the flag
             // undefined unless `--sync`/`--no-sync` / `--push`/`--no-push` appears),
             // so the resolved profile `sync` block wins by default.
-            const syncFlag = getHyphenatedArg(args, "sync");
-            const pushFlag = getHyphenatedArg(args, "push");
+            const syncFlag = args.sync;
+            const pushFlag = args.push;
             const syncOverride = {};
             if (syncFlag !== undefined)
                 syncOverride.enabled = syncFlag;

package/dist/commands/improve/improve-result-file.js

@@ -27,7 +27,8 @@
  */
 import crypto from "node:crypto";
 import path from "node:path";
-import { recordImproveRun, withStateDb } from "../../core/state-db.js";
+import { withStateDb } from "../../core/state-db.js";
+import { recordImproveRun } from "../../storage/repositories/improve-runs-repository.js";
 /**
  * Build a stable run-id for a single improve invocation.
  *

package/dist/commands/improve/improve.js

@@ -38,6 +38,7 @@ import { analyzeMemoryCleanup } from "./memory/memory-improve.js";
 import { runImprovePreparationStage } from "./preparation.js";
 import { DEFAULT_DUE_DAYS, filterProactiveDue } from "./proactive-maintenance.js";
 import { akmReflect } from "./reflect.js";
+import { errMessage } from "./shared.js";
 export { resetHeldProcessLocks } from "./locks.js";
 // Re-exported from ./loop-stages for test importers (improve-db-locking).
 export { runImproveMaintenancePasses } from "./loop-stages.js";
@@ -202,7 +203,7 @@ export async function akmImprove(options = {}) {
                 await ensureIndexFn(primaryStashDir, { mode: "blocking" });
             }
             catch (err) {
-                preEnsureCleanupWarnings.push(`ensureIndex failed: ${err instanceof Error ? err.message : String(err)}`);
+                preEnsureCleanupWarnings.push(`ensureIndex failed: ${errMessage(err)}`);
             }
             // #339 loud-fail: if the index was empty pre-ensureIndex but is now
             // populated, a version-upgrade-triggered rebuild just happened. Surface
@@ -241,7 +242,7 @@ export async function akmImprove(options = {}) {
             }
             catch (err) {
                 // Non-fatal: contradiction detection is a best-effort pass.
-                warn(`[improve] contradiction detection failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
+                warn(`[improve] contradiction detection failed (non-fatal): ${errMessage(err)}`);
             }
         }
         memoryCleanupPlan = shouldAnalyzeMemoryCleanup(scope, memorySummary.eligible, primaryStashDir)
@@ -302,7 +303,7 @@ export async function akmImprove(options = {}) {
                             });
                         }
                         catch (err) {
-                            warn(`[improve] triage pre-pass failed (non-fatal): ${err instanceof Error ? err.message : String(err)}`);
+                            warn(`[improve] triage pre-pass failed (non-fatal): ${errMessage(err)}`);
                         }
                         finally {
                             releaseProcessLock(triageLPath);
@@ -419,7 +420,7 @@ export async function akmImprove(options = {}) {
             };
         }
         catch (syncErr) {
-            const reason = syncErr instanceof Error ? syncErr.message : String(syncErr);
+            const reason = errMessage(syncErr);
             warn(`improve: stash sync failed (non-fatal): ${reason}`);
             appendEvent({
                 eventType: "stash_synced",
@@ -821,7 +822,7 @@ export async function akmImprove(options = {}) {
             eventType: "improve_failed",
             ref: scope.mode === "ref" ? scope.value : `improve:${scope.mode}:${scope.value ?? "all"}`,
             metadata: {
-                error: err instanceof Error ? err.message : String(err),
+                error: errMessage(err),
                 durationMs: Date.now() - startMs,
             },
         }, eventsCtx);

package/dist/commands/improve/loop-stages.js

@@ -9,7 +9,7 @@ import { UsageError } from "../../core/errors.js";
 import { appendEvent } from "../../core/events.js";
 import { openLogsDatabase, purgeOldTaskLogs } from "../../core/logs-db.js";
 import { getDbPath } from "../../core/paths.js";
-import { purgeOldCycleMetrics, purgeOldEvents, purgeOldImproveRuns, withStateDb, } from "../../core/state-db.js";
+import { withStateDb } from "../../core/state-db.js";
 import { info, warn } from "../../core/warn.js";
 import { closeDatabase, openIndexDatabase } from "../../indexer/db/db.js";
 import { runGraphExtractionPass } from "../../indexer/graph/graph-extraction.js";
@@ -20,7 +20,10 @@ import { getWritableStashDirs, resolveSourceEntries } from "../../indexer/search
 import { resolveImproveProcessRunnerFromProfile } from "../../integrations/agent/runner.js";
 import { isProcessEnabled } from "../../llm/feature-gate.js";
 import { withLlmStage } from "../../llm/usage-telemetry.js";
-import { createProposal, expireStaleProposals, isProposalSkipped, listProposals, purgeOrphanProposals, } from "../proposal/validators/proposals.js";
+import { purgeOldCycleMetrics } from "../../storage/repositories/canaries-repository.js";
+import { purgeOldEvents } from "../../storage/repositories/events-repository.js";
+import { purgeOldImproveRuns } from "../../storage/repositories/improve-runs-repository.js";
+import { createProposal, expireStaleProposals, isProposalSkipped, listProposals, purgeOrphanProposals, } from "../proposal/repository.js";
 import { checkDeadUrls } from "../url-checker.js";
 import { DEFAULT_RETENTION_DAYS as CYCLE_METRICS_RETENTION_DAYS, runCollapseDetector } from "./collapse-detector.js";
 import { deriveLessonRef } from "./distill.js";
@@ -35,6 +38,7 @@ import { maybeAutoTuneThreshold } from "./preparation.js";
 import { akmProcedural } from "./procedural.js";
 import { akmRecombine } from "./recombine.js";
 import { recordNoOp, resetConsecutiveNoOps } from "./salience.js";
+import { errMessage, refSlug } from "./shared.js";
 // ── improve loop / post-loop / maintenance stages ───────────────────
 // The cycle stages run by akmImprove, extracted from improve.ts.
 export async function runImproveLoopStage(args) {
@@ -504,10 +508,7 @@ export async function runImproveLoopStage(args) {
                     }
                 }
                 if (distillResult.outcome === "quality_rejected" && primaryStashDir) {
-                    const slug = planned.ref
-                        .replace(/[^a-z0-9]/gi, "-")
-                        .toLowerCase()
-                        .slice(0, 60);
+                    const slug = refSlug(planned.ref);
                     writeEvalCase(primaryStashDir, {
                         ref: planned.ref,
                         failureReason: distillResult.reason ?? "quality gate rejected",
@@ -520,10 +521,7 @@ export async function runImproveLoopStage(args) {
                 // D6: use pre-loaded map instead of per-iteration DB query
                 const rejectedProposalEvent = rejectedProposalsByRef.get(planned.ref);
                 if (rejectedProposalEvent && primaryStashDir) {
-                    const slug = planned.ref
-                        .replace(/[^a-z0-9]/gi, "-")
-                        .toLowerCase()
-                        .slice(0, 60);
+                    const slug = refSlug(planned.ref);
                     writeEvalCase(primaryStashDir, {
                         ref: planned.ref,
                         failureReason: rejectedProposalEvent.metadata?.reason ?? "proposal rejected",
@@ -562,7 +560,7 @@ export async function runImproveLoopStage(args) {
                 actions.push({
                     ref: planned.ref,
                     mode: "error",
-                    result: { ok: false, error: err instanceof Error ? err.message : String(err) },
+                    result: { ok: false, error: errMessage(err) },
                 });
             }
         }
@@ -585,7 +583,7 @@ export async function runImproveLoopStage(args) {
                 maybeAutoTuneThreshold(phaseCfg.phaseThreshold ?? options.autoAccept, options.config ?? loadConfig(), stateDbPathForTune, undefined, phase);
             }
             catch (err) {
-                warn(`[improve] calibration auto-tune (${phase}) skipped: ${err instanceof Error ? err.message : String(err)}`);
+                warn(`[improve] calibration auto-tune (${phase}) skipped: ${errMessage(err)}`);
             }
         }
     }
@@ -841,7 +839,7 @@ export async function runImproveMaintenancePasses(args) {
                 }
                 catch (err) {
                     memoryInferenceDurationMs = Date.now() - inferenceStart;
-                    allWarnings.push(`memory inference failed: ${err instanceof Error ? err.message : String(err)}`);
+                    allWarnings.push(`memory inference failed: ${errMessage(err)}`);
                 }
             }
             if (memoryInference && (memoryInference.splitParents > 0 || memoryInference.writtenFacts > 0)) {
@@ -852,7 +850,7 @@ export async function runImproveMaintenancePasses(args) {
                     info("[improve] reindex after memory inference complete");
                 }
                 catch (err) {
-                    allWarnings.push(`reindex after memory inference failed: ${err instanceof Error ? err.message : String(err)}`);
+                    allWarnings.push(`reindex after memory inference failed: ${errMessage(err)}`);
                 }
             }
             const graphEnabled = isProcessEnabled("index", "graph_extraction", config);
@@ -891,7 +889,7 @@ export async function runImproveMaintenancePasses(args) {
                             info("[improve] reindex after consolidation complete");
                         }
                         catch (err) {
-                            allWarnings.push(`reindex after consolidation failed: ${err instanceof Error ? err.message : String(err)}`);
+                            allWarnings.push(`reindex after consolidation failed: ${errMessage(err)}`);
                         }
                     }
                     // #584: no close/reopen needed here — reindexWithIndexDbReleased
@@ -930,7 +928,7 @@ export async function runImproveMaintenancePasses(args) {
                 }
                 catch (err) {
                     graphExtractionDurationMs = Date.now() - extractionStart;
-                    allWarnings.push(`graph extraction failed: ${err instanceof Error ? err.message : String(err)}`);
+                    allWarnings.push(`graph extraction failed: ${errMessage(err)}`);
                 }
             }
             else if (sources.length > 0 && !graphEnabled) {
@@ -959,7 +957,7 @@ export async function runImproveMaintenancePasses(args) {
                     }, eventsCtx);
                 }
                 catch (err) {
-                    allWarnings.push(`orphan purge failed: ${err instanceof Error ? err.message : String(err)}`);
+                    allWarnings.push(`orphan purge failed: ${errMessage(err)}`);
                 }
                 // Phase 6B (Advantage D6b): expire pending proposals that have aged past
                 // the retention window. Runs AFTER orphan purge so we never double-archive
@@ -986,7 +984,7 @@ export async function runImproveMaintenancePasses(args) {
                     }, eventsCtx);
                 }
                 catch (err) {
-                    allWarnings.push(`proposal expiration failed: ${err instanceof Error ? err.message : String(err)}`);
+                    allWarnings.push(`proposal expiration failed: ${errMessage(err)}`);
                 }
             }
             // Fix #2 (observability 0.8.0): trim the events table in state.db so it
@@ -1048,7 +1046,7 @@ export async function runImproveMaintenancePasses(args) {
                         }, { path: eventsCtx?.dbPath, borrowed: eventsCtx?.db });
                     }
                     catch (err) {
-                        allWarnings.push(`events purge failed: ${err instanceof Error ? err.message : String(err)}`);
+                        allWarnings.push(`events purge failed: ${errMessage(err)}`);
                     }
                     // task_logs in logs.db (#579) shares the same retention window as
                     // events/improve_runs — all three are observability data governed by
@@ -1069,7 +1067,7 @@ export async function runImproveMaintenancePasses(args) {
                         }, eventsCtx);
                     }
                     catch (err) {
-                        allWarnings.push(`task_logs purge failed: ${err instanceof Error ? err.message : String(err)}`);
+                        allWarnings.push(`task_logs purge failed: ${errMessage(err)}`);
                     }
                     finally {
                         if (logsDb) {
@@ -1099,7 +1097,7 @@ export async function runImproveMaintenancePasses(args) {
                         allWarnings.push(`[improve] staleness detection: ${w}`);
                 }
                 catch (err) {
-                    allWarnings.push(`staleness detection failed: ${err instanceof Error ? err.message : String(err)}`);
+                    allWarnings.push(`staleness detection failed: ${errMessage(err)}`);
                 }
             }
         }

package/dist/commands/improve/preparation.js

@@ -9,14 +9,16 @@ import { daysToMs } from "../../core/common.js";
 import { getDefaultLlmConfig, loadConfig } from "../../core/config/config.js";
 import { rethrowIfTestIsolationError } from "../../core/errors.js";
 import { appendEvent, readEvents } from "../../core/events.js";
-import { listProposalGateDecisions, listStateProposals, openStateDatabase, persistPhaseThreshold, withStateDb, } from "../../core/state-db.js";
+import { openStateDatabase, withStateDb } from "../../core/state-db.js";
 import { info, warn } from "../../core/warn.js";
 import { closeDatabase, getRetrievalCounts, getZeroResultSearches, openExistingDatabase } from "../../indexer/db/db.js";
 import { countUsageEventsByType } from "../../indexer/usage/usage-events.js";
 import { getAvailableHarnesses } from "../../integrations/session-logs/index.js";
 import { withLlmStage } from "../../llm/usage-telemetry.js";
+import { persistPhaseThreshold } from "../../storage/repositories/improve-runs-repository.js";
+import { listProposalGateDecisions, listStateProposals } from "../../storage/repositories/proposals-repository.js";
 import { akmLint } from "../lint/index.js";
-import { getProposal, listProposals } from "../proposal/validators/proposals.js";
+import { getProposal, listProposals } from "../proposal/repository.js";
 import { runSchemaRepairPass } from "../sources/schema-repair.js";
 import { computeThresholdAutoTune, gateDecisionsToSamples, summarizeCalibration, } from "./calibration.js";
 import { akmConsolidate, isSessionCaptureMemoryName } from "./consolidate.js";