@lmzhen/dsh-evolution-merge 0.46.0 → 0.48.0

package/lib/types/merge-routes.js

@@ -1,6 +1,11 @@
+/**
+ * Four read-only merge routes: view / rows / body / history.
+ * The host loads one snapshot; these handlers only project wire envelopes.
+ * There is no second (legacy rows/runs/history) source: the production constructor has
+ * always provided the snapshot, and the legacy branches were the only consumers of
+ * facts.ts / wire-projection.ts (W11 D2b).
+ */
 import { HOST_ROUTES, json, methodNotAllowed } from '@lmzhen/dsh-evolution-core/http-routes';
-import { buildFacts as buildLegacyFacts } from "./facts.js";
-import { toBodyView, toHistoryView, toQueuePage } from "./wire-projection.js";
 import { buildBodyView, buildFacts as buildSnapshotFacts, buildHistoryView, buildQueuePage } from "./surface/merge-view.js";
 const MERGE_PATHS = HOST_ROUTES.merge;
 const MERGE_BASE = MERGE_PATHS.view.slice(0, -'view'.length);
@@ -13,17 +18,16 @@ export const MERGE_ROUTES = {
 };
 export function makeMergeRoutes(deps, _audit) {
     const absent = () => json(404, { wireVersion: 1, code: 'E-325', message: 'merge service is not mounted' });
-    const blocked = (readiness) => json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness });
+    const blocked = (snapshot) => snapshot.blocked === undefined ? null : json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness: snapshot.blocked.readiness });
     const hostOnly = (snapshot) => snapshot.hostOnly === undefined ? null : json(503, { wireVersion: 1, code: 'E-323', message: snapshot.hostOnly.detail ?? 'host data plane unavailable' });
-    const notReady = async (source) => {
-        if (source.readiness === undefined)
-            return null;
-        const readiness = await source.readiness();
-        return readiness.ok ? null : blocked(readiness);
-    };
     const bad = (message) => json(400, { wireVersion: 1, code: 'merge-bad-query', message });
     const get = (request) => (request.method === 'GET' ? null : methodNotAllowed(['GET']));
     const url = (request) => new URL(request.url, 'http://local');
+    const snapshotOf = async () => {
+        const source = deps.getSource();
+        return source === undefined ? null : await source.snapshot();
+    };
+    const unavailable = (snapshot) => snapshot === null ? absent() : blocked(snapshot) ?? hostOnly(snapshot);
     return [
         {
             path: MERGE_ROUTES.view,
@@ -33,25 +37,11 @@ export function makeMergeRoutes(deps, _audit) {
                 const denied = get(request);
                 if (denied !== null)
                     return denied;
-                const source = deps.getSource();
-                if (source === undefined)
-                    return absent();
-                if (source.snapshot !== undefined) {
-                    const snapshot = await source.snapshot();
-                    if (snapshot.blocked !== undefined)
-                        return json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness: snapshot.blocked.readiness });
-                    const capability = hostOnly(snapshot);
-                    if (capability !== null)
-                        return capability;
-                    return json(200, buildSnapshotFacts(snapshot));
-                }
-                const readiness = await notReady(source);
-                if (readiness !== null)
-                    return readiness;
-                const readAt = Date.now();
-                const rows = await source.rows?.() ?? [];
-                const runs = await source.runs?.(undefined, 20) ?? [];
-                return json(200, buildLegacyFacts({ rows, runs, approval: source.approval?.() === true, readAt }));
+                const snapshot = await snapshotOf();
+                const notReady = unavailable(snapshot);
+                if (notReady !== null)
+                    return notReady;
+                return json(200, buildSnapshotFacts(snapshot));
             },
         },
         {
@@ -62,9 +52,6 @@ export function makeMergeRoutes(deps, _audit) {
                 const denied = get(request);
                 if (denied !== null)
                     return denied;
-                const source = deps.getSource();
-                if (source === undefined)
-                    return absent();
                 const query = url(request).searchParams;
                 const queue = query.get('queue') ?? 'verify';
                 if (queue !== 'verify' && queue !== 'pending' && queue !== 'fuse' && queue !== 'skipped')
@@ -73,27 +60,16 @@ export function makeMergeRoutes(deps, _audit) {
                 if (expiredOnly && queue !== 'pending')
                     return bad('expired is only allowed for pending');
                 const limit = Number.parseInt(query.get('limit') ?? '50', 10);
-                if (source.snapshot !== undefined) {
-                    const snapshot = await source.snapshot();
-                    if (snapshot.blocked !== undefined)
-                        return json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness: snapshot.blocked.readiness });
-                    const capability = hostOnly(snapshot);
-                    if (capability !== null)
-                        return capability;
-                    try {
-                        return json(200, buildQueuePage(snapshot, queue, expiredOnly, query.get('cursor') ?? undefined, Number.isFinite(limit) ? limit : 50));
-                    }
-                    catch (error) {
-                        return bad(error instanceof Error ? error.message : 'queue cursor is stale');
-                    }
+                const snapshot = await snapshotOf();
+                const notReady = unavailable(snapshot);
+                if (notReady !== null)
+                    return notReady;
+                try {
+                    return json(200, buildQueuePage(snapshot, queue, expiredOnly, query.get('cursor') ?? undefined, Number.isFinite(limit) ? limit : 50));
+                }
+                catch (error) {
+                    return bad(error instanceof Error ? error.message : 'queue cursor is stale');
                 }
-                const readiness = await notReady(source);
-                if (readiness !== null)
-                    return readiness;
-                const offset = Number.parseInt(query.get('cursor') ?? '0', 10);
-                const rows = await source.rows?.() ?? [];
-                const page = toQueuePage(rows, queue, expiredOnly, Date.now(), Number.isFinite(limit) ? limit : 50);
-                return json(200, Number.isFinite(offset) && offset > 0 ? { ...page, rows: page.rows.slice(offset) } : page);
             },
         },
         {
@@ -113,36 +89,26 @@ export function makeMergeRoutes(deps, _audit) {
                 const side = query.get('side');
                 if ((id === null || id === '') && (name === null || name === ''))
                     return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge body requires id or name' });
-                if (source.snapshot !== undefined) {
-                    const snapshot = await source.snapshot();
-                    if (snapshot.blocked !== undefined)
-                        return json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness: snapshot.blocked.readiness });
-                    // Body/history are read-only projections of already-written files; a host without
-                    // the live agent data plane can still read past reports and archived bodies.
-                    const sideFilter = side === 'a' ? 'live' : side === 'b' ? 'archive' : side === 'live' || side === 'archive' ? side : undefined;
-                    const refs = snapshot.bodyRefs.filter(ref => (id === null || id === '' || ref.rowId === id)
-                        && (name === null || name === '' || ref.name === name)
-                        && (sideFilter === undefined || ref.side === sideFilter));
-                    if (refs.length === 0)
-                        return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge body not found' });
-                    if (refs.length > 1)
-                        return bad('merge body is ambiguous; pass id, name and side');
-                    const row = snapshot.rows.find(item => item.row.id === refs[0].rowId);
-                    if (row?.stage?.state === 'lost' || row?.stage?.state === 'expired')
-                        return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge stage is lost' });
-                    const ref = refs[0];
-                    const content = source.bodyRef === undefined ? null : await source.bodyRef(ref);
-                    return json(200, buildBodyView(snapshot, ref, content ?? ''));
-                }
-                const readiness = await notReady(source);
-                if (readiness !== null)
-                    return readiness;
-                if (id === null || id === '' || (side !== 'a' && side !== 'b'))
-                    return bad('id and side=a|b are required');
-                const content = await source.body?.(id, side) ?? null;
-                return content === null
-                    ? json(200, { wireVersion: 1, code: 'merge-body-missing', message: 'merge body not found: ' + id })
-                    : json(200, toBodyView(id, side === 'a' ? 'live' : 'archive', content, Date.now()));
+                const snapshot = await source.snapshot();
+                const notReady = blocked(snapshot);
+                if (notReady !== null)
+                    return notReady;
+                // Body/history are read-only projections of already-written files; a host without
+                // the live agent data plane can still read past reports and archived bodies.
+                const sideFilter = side === 'a' ? 'live' : side === 'b' ? 'archive' : side === 'live' || side === 'archive' ? side : undefined;
+                const refs = snapshot.bodyRefs.filter(ref => (id === null || id === '' || ref.rowId === id)
+                    && (name === null || name === '' || ref.name === name)
+                    && (sideFilter === undefined || ref.side === sideFilter));
+                if (refs.length === 0)
+                    return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge body not found' });
+                if (refs.length > 1)
+                    return bad('merge body is ambiguous; pass id, name and side');
+                const row = snapshot.rows.find(item => item.row.id === refs[0].rowId);
+                if (row?.stage?.state === 'lost' || row?.stage?.state === 'expired')
+                    return json(404, { wireVersion: 1, code: 'merge-body-not-found', message: 'merge stage is lost' });
+                const ref = refs[0];
+                const content = source.bodyRef === undefined ? null : await source.bodyRef(ref);
+                return json(200, buildBodyView(snapshot, ref, content ?? ''));
             },
         },
         {
@@ -153,19 +119,13 @@ export function makeMergeRoutes(deps, _audit) {
                 const denied = get(request);
                 if (denied !== null)
                     return denied;
-                const source = deps.getSource();
-                if (source === undefined)
+                const snapshot = await snapshotOf();
+                if (snapshot === null)
                     return absent();
-                if (source.snapshot !== undefined) {
-                    const snapshot = await source.snapshot();
-                    if (snapshot.blocked !== undefined)
-                        return json(503, { wireVersion: 1, code: 'merge-state-blocked', readiness: snapshot.blocked.readiness });
-                    return json(200, buildHistoryView(snapshot));
-                }
-                const readiness = await notReady(source);
-                if (readiness !== null)
-                    return readiness;
-                return json(200, toHistoryView(await source.history?.() ?? [], Date.now()));
+                const notReady = blocked(snapshot);
+                if (notReady !== null)
+                    return notReady;
+                return json(200, buildHistoryView(snapshot));
             },
         },
         {

package/lib/types/new-child-authoring.js

@@ -10,21 +10,15 @@ import { buildValidationPlan } from "./domain/validation-plan.js";
 import { commitStagedRun } from "./commit-execute.js";
 import { manifestFilesOf, missingManifestFile, parseAuthoringManifest } from "./domain/authoring-manifest.js";
 import { MERGE_PROMPT_VERSION, promptHashOf } from "./prompts.js";
+import { targetAdmission } from "./authoring-flow.js";
 /** Commit-side causes that mean "the world moved"; they must not be retried blindly. */
 const STALE_CAUSES = new Set(['target-changed', 'source-changed', 'support-changed', 'target-taken', 'target-gone']);
 export async function runNewChildAuthoring(options, row, decision, signal) {
-    if (decision.target.includes('/') || decision.target.includes(':'))
-        return { kind: 'failed', failure: { stage: 'author', code: 'target-invalid', message: 'target must be a bare skill name: ' + decision.target, retryable: false, retryFrom: 'none' } };
     const targetCard = options.cards.find(card => card.name === decision.target);
     const createMode = decision.mode === 'create-umbrella';
-    if (!createMode && targetCard !== undefined) {
-        if (targetCard.managed !== true)
-            return { kind: 'failed', failure: { stage: 'author', code: 'target-not-managed', message: 'target is not family-managed: ' + decision.target, retryable: false, retryFrom: 'none' } };
-        if (targetCard.protectionUnknown === true || targetCard.protectedBy != null)
-            return { kind: 'failed', failure: { stage: 'author', code: 'target-protected', message: 'target is protected: ' + decision.target, retryable: false, retryFrom: 'none' } };
-    }
-    if (!createMode && await options.isBlocked?.(decision.target) === true)
-        return { kind: 'failed', failure: { stage: 'author', code: 'target-blocked', message: 'target is blocked by curator: ' + decision.target, retryable: false, retryFrom: 'none' } };
+    const targetRefusal = await targetAdmission(decision.target, targetCard, createMode, options.isBlocked);
+    if (targetRefusal !== null)
+        return { kind: 'failed', failure: { stage: 'author', code: targetRefusal.code, message: targetRefusal.message, retryable: false, retryFrom: 'none' } };
     const at = options.now();
     // NFR-06: an expired stage is never reused and never re-presented. Drop its tree and
     // index and author into a fresh one; the recorded decision anchors still guard the

package/lib/types/prompts.d.ts

@@ -9,5 +9,4 @@ export declare function buildRound1Prompt(candidate: {
     readonly b: string;
 }, cards: readonly SkillCard[]): string;
 export declare function buildRound2Prompt(row: MergeRow, decision: MergeDecision, mode?: 'continue' | 'fresh'): string;
-export declare function buildStandbyPrompt(): string;
 //# sourceMappingURL=prompts.d.ts.map

package/lib/types/prompts.js

@@ -69,5 +69,4 @@ export function buildRound2Prompt(row, decision, mode = 'continue') {
     ];
     return (mode === 'fresh' ? ['基于已持久化的 decision。', ...head, ...body] : [...head, ...body]).join('\n');
 }
-export function buildStandbyPrompt() { return STANDBY_PROMPT; }
 //# sourceMappingURL=prompts.js.map

package/lib/types/read-commands.d.ts

@@ -7,5 +7,4 @@ import type { LiveRowFacts } from './domain/live-facts.ts';
 export declare function handleReadOnlyMergeCommand(command: MergeCliCommand, io: EvolutionIoLike, home: string, cards?: readonly {
     readonly name: string;
 }[], runs?: readonly RunRecord[], approval?: boolean, live?: () => Promise<LiveRowFacts | undefined>): Promise<string | null>;
-export declare function mergeCommandHelp(): string;
 //# sourceMappingURL=read-commands.d.ts.map

package/lib/types/read-commands.js

@@ -1,7 +1,6 @@
 import { readMergeSnapshot } from "./domain/merge-snapshot.js";
 import { buildFacts, toRowFact } from "./surface/merge-view.js";
 import { formatFacts, formatSnapshotQueue, formatSnapshotStatus } from "./status.js";
-import { mergeUsage } from "./commands.js";
 export async function handleReadOnlyMergeCommand(command, io, home, cards, runs, approval = false, live) {
     if (!['status', 'pending', 'candidates', 'skipped'].includes(command.verb))
         return null;
@@ -27,7 +26,4 @@ export async function handleReadOnlyMergeCommand(command, io, home, cards, runs,
     }
     return formatSnapshotQueue(rows.filter(row => row.queue === 'skipped'), 'skipped');
 }
-export function mergeCommandHelp() {
-    return mergeUsage();
-}
 //# sourceMappingURL=read-commands.js.map

package/lib/types/recovery-projection.js

@@ -3,7 +3,6 @@ import { mergeReportPath, readMergeReport, writeMergeReport } from "./report.js"
 import { pairLedger, readPairLedgerV4 } from "./domain/pair-ledger.js";
 import { readAllStages, readStageTree, writeStageIndex } from "./domain/stage-aggregate.js";
 import { dropStage } from "./domain/stage-aggregate.js";
-import { recordPair } from "./domain/pair-index-store.js";
 import { readRunMeta, writeRunMeta } from "./domain/run-coordinator.js";
 import { evidenceSha256 } from "./domain/evidence-hash.js";
 export async function projectRecoveredUnit(options) {
@@ -79,8 +78,6 @@ export async function projectRecoveredUnit(options) {
         await options.onPhase?.('stage-drop');
         await dropStage(options.io, options.home, stageRowId);
     }
-    await options.onPhase?.('pair-index');
-    await recordPair(options.io, options.home, { pairKey, runId: options.runId, result: 'merged', target });
     await options.onPhase?.('run-meta');
     const meta = await readRunMeta(options.io, options.home, options.runId);
     await writeRunMeta(options.io, options.home, { version: 1, runId: options.runId, ...(meta?.pid === undefined ? {} : { pid: meta.pid }), phase: 'settled', ...(options.interrupted === true ? { stopReason: 'interrupted' } : {}), reportRef: reportPath, pairCount: 1, ...(meta?.parentRunId === undefined ? {} : { parentRunId: meta.parentRunId }), ...(meta?.stagingRef === undefined ? {} : { stagingRef: meta.stagingRef }), ...(meta?.pairs === undefined ? {} : { pairs: meta.pairs }), createdAt: meta?.createdAt ?? new Date(at).toISOString(), updatedAt: new Date(at).toISOString() });

package/lib/types/round2-outcome.js

@@ -2,7 +2,6 @@ import { v4ToLegacy } from "./domain/row-v4.js";
 import { pairLedger } from "./domain/pair-ledger.js";
 import { dropStage } from "./domain/stage-aggregate.js";
 import { casExpiredHook } from "./domain/failure-route.js";
-import { recordPair } from "./domain/run-coordinator.js";
 export async function recordRound2Outcome(io, home, now, row, outcome, deferProjection = false, fence) {
     void now;
     const reportExtra = {
@@ -10,9 +9,13 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
         ...(outcome.criteria === undefined ? {} : { criteria: outcome.criteria }),
         ...(outcome.validationIssues === undefined ? {} : { validation: { issues: outcome.validationIssues } }),
     };
+    const pair = (outcomeName, extra = {}, withDecision = true) => ({
+        id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue,
+        ...(withDecision && row.decision !== undefined ? { decision: row.decision } : {}),
+        outcome: outcomeName, archived: [], ...extra,
+    });
     if (outcome.kind === 'merged') {
         const unitRef = { unitId: outcome.unitId ?? 'unknown', evidenceSha256: outcome.evidenceSha256 ?? 'unknown' };
-        const target = outcome.target?.actual ?? outcome.target?.requested ?? row.decision?.target;
         const finalize = async () => {
             const removed = await pairLedger(io, home, fence).transact(tx => {
                 const current = tx.rows().find(item => item.id === row.id);
@@ -21,31 +24,20 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
             if (!removed.ok)
                 throw new Error('row changed before commit record: ' + row.id);
             await dropStage(io, home, row.id);
-            await recordPair(io, home, {
-                pairKey: row.pairKey,
-                runId: row.runId ?? 'merge',
-                result: 'merged',
-                ...(target === undefined ? {} : { target }),
-                ...(outcome.unitId === undefined ? {} : { reportRef: outcome.unitId }),
-            });
         };
         if (deferProjection)
-            return { merged: true, finalize, pair: { id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue, ...(row.decision === undefined ? {} : { decision: row.decision }), outcome: 'merged', archived: outcome.archived ?? [], ...(outcome.lengths === undefined ? {} : { lengths: outcome.lengths }), ...(outcome.unitId === undefined ? {} : { unitId: outcome.unitId }), ...(outcome.target === undefined ? {} : { target: outcome.target }), ...reportExtra } };
-        {
-            await finalize();
-        }
+            return { merged: true, finalize, pair: pair('merged', { ...(outcome.lengths === undefined ? {} : { lengths: outcome.lengths }), ...(outcome.unitId === undefined ? {} : { unitId: outcome.unitId }), ...(outcome.target === undefined ? {} : { target: outcome.target }), ...reportExtra }) };
+        await finalize();
         return {
             merged: true,
-            pair: {
-                id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue,
-                ...(row.decision === undefined ? {} : { decision: row.decision }),
-                outcome: 'merged', archived: outcome.archived ?? [],
+            pair: pair('merged', {
+                ...(outcome.archived === undefined ? {} : { archived: outcome.archived }),
                 ...(outcome.lengths === undefined ? {} : { lengths: outcome.lengths }),
                 ...reportExtra,
                 ...(outcome.unitId === undefined ? {} : { unitId: outcome.unitId }),
                 ...(outcome.target === undefined ? {} : { target: outcome.target }),
                 ...(outcome.validationPlan === undefined ? {} : { validationPlan: outcome.validationPlan }),
-            },
+            }),
         };
     }
     const failure = outcome.failure ?? { stage: 'author', code: 'merge-failed', message: 'round2 failed', retryable: true, retryFrom: 'agent2' };
@@ -57,7 +49,7 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
         });
         if (skipped)
             await dropStage(io, home, row.id);
-        return { merged: false, pair: { id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue, ...(row.decision === undefined ? {} : { decision: row.decision }), outcome: 'failed', archived: [], failure, ...reportExtra } };
+        return { merged: false, pair: pair('failed', { failure, ...reportExtra }) };
     }
     const cas = casExpiredHook(failure.code);
     if (cas !== null) {
@@ -70,7 +62,7 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
             return moved.ok;
         });
         await dropStage(io, home, row.id);
-        return { merged: false, pair: { id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue, ...(row.decision === undefined ? {} : { decision: row.decision }), outcome: 'failed', archived: [], failure: terminalFailure, ...reportExtra } };
+        return { merged: false, pair: pair('failed', { failure: terminalFailure, ...reportExtra }) };
     }
     if (failure.code === 'commit-failed' || failure.code === 'validation-failed') {
         // FR-EXEC-11/14: report-only failure. The pair leaves the active queue (so a later scan
@@ -81,7 +73,6 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
         });
         if (dropped) {
             await dropStage(io, home, row.id, row.stagingRef);
-            await recordPair(io, home, { pairKey: row.pairKey, runId: row.runId ?? 'merge', result: 'failed', ...(row.decision?.target === undefined ? {} : { target: row.decision.target }) });
         }
     }
     if (failure.code === 'source-gone') {
@@ -91,7 +82,7 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
         });
         if (dropped)
             await dropStage(io, home, row.id, row.stagingRef);
-        return { merged: false, pair: { id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue, outcome: 'failed', archived: [], failure } };
+        return { merged: false, pair: pair('failed', { failure }, false) };
     }
     const projected = await pairLedger(io, home, fence).transact(tx => {
         const current = tx.rows().find(item => item.id === row.id);
@@ -101,23 +92,10 @@ export async function recordRound2Outcome(io, home, now, row, outcome, deferProj
         return moved.ok && moved.row !== null ? v4ToLegacy(moved.row) : null;
     });
     if (projected === null)
-        return { merged: false, pair: { id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue, outcome: 'failed', archived: [], failure: { ...failure, code: 'row-changed', message: 'row changed before failure record' }, ...reportExtra } };
-    {
-        await recordPair(io, home, {
-            pairKey: row.pairKey,
-            runId: row.runId ?? 'merge',
-            result: 'failed',
-            ...(row.decision?.target === undefined ? {} : { target: row.decision.target }),
-        });
-    }
+        return { merged: false, pair: pair('failed', { failure: { ...failure, code: 'row-changed', message: 'row changed before failure record' }, ...reportExtra }, false) };
     return {
         merged: false,
-        pair: {
-            id: row.id, pairKey: row.pairKey, a: row.a, b: row.b, queue: row.queue,
-            ...(row.decision === undefined ? {} : { decision: row.decision }),
-            outcome: 'failed', archived: [], failure,
-            ...reportExtra,
-        },
+        pair: pair('failed', { failure, ...reportExtra }),
     };
 }
 //# sourceMappingURL=round2-outcome.js.map

package/lib/types/scan-run.js

@@ -6,7 +6,6 @@ import { pairKey, rowIdOf, } from "./contracts.js";
 import { loadMergeState } from "./state.js";
 import { pairLedger } from "./domain/pair-ledger.js";
 import { presentStage, dropStage } from "./domain/stage-aggregate.js";
-import { recordPair } from "./domain/run-coordinator.js";
 import { v4ToLegacy } from "./domain/row-v4.js";
 import { criteriaFrom } from "./domain/engine-criteria.js";
 import { withDecisionRevisions } from "./revision.js";
@@ -176,7 +175,6 @@ export async function runScan(options) {
                 continue;
             }
             row = projected;
-            await recordPair(options.io, options.home, { pairKey: row.pairKey, runId: row.runId ?? 'merge', result: 'kept' });
             pairs.push(pairOf(row, candidate, 'kept', { ...(round1.decision === undefined ? {} : { decision: round1.decision }), ...(round1.usage === undefined ? {} : { usage: round1.usage }) }));
             totals.kept += 1;
             continue;
@@ -324,7 +322,6 @@ export async function runScan(options) {
             });
             if (dropped) {
                 await dropStage(options.io, options.home, row.id, row.stagingRef);
-                await recordPair(options.io, options.home, { pairKey: row.pairKey, runId: row.runId ?? 'merge', result: 'failed', ...(row.decision?.target === undefined ? {} : { target: row.decision.target }) });
             }
             pairs.push(pairOf(row, candidate, 'failed', { decision: mergeDecision, failure: failed, ...(round2.manifestFiles === undefined ? {} : { manifestFiles: round2.manifestFiles }), ...(round2.criteria === undefined ? {} : { criteria: round2.criteria }), ...(round2.validationIssues === undefined ? {} : { validation: { issues: round2.validationIssues } }) }));
             totals.failed += 1;

package/lib/types/skipped.d.ts

@@ -2,7 +2,6 @@
  * Skipped filtering: a pair the operator marked as not-worth-merging stays out of automatic
  * screening until mergeSkippedTtlDays expires. Explicit /merge pair ignores this set.
  */
-import { type MergeRow } from './contracts.ts';
+import type { MergeRow } from './contracts.ts';
 export declare function skippedPairKeys(rows: readonly MergeRow[], ttlDays: number, now: number): ReadonlySet<string>;
-export declare function isSkippedPair(keys: ReadonlySet<string>, a: string, b: string): boolean;
 //# sourceMappingURL=skipped.d.ts.map

package/lib/types/skipped.js

@@ -1,8 +1,3 @@
-/**
- * Skipped filtering: a pair the operator marked as not-worth-merging stays out of automatic
- * screening until mergeSkippedTtlDays expires. Explicit /merge pair ignores this set.
- */
-import { pairKey } from "./contracts.js";
 export function skippedPairKeys(rows, ttlDays, now) {
     const keys = new Set();
     for (const row of rows) {
@@ -18,7 +13,4 @@ export function skippedPairKeys(rows, ttlDays, now) {
     }
     return keys;
 }
-export function isSkippedPair(keys, a, b) {
-    return keys.has(pairKey(a, b));
-}
 //# sourceMappingURL=skipped.js.map

package/lib/types/staging.d.ts

@@ -43,9 +43,7 @@ export interface StagedView {
     readonly manifest: StagingManifest;
 }
 export declare function readStaging(io: EvolutionIoLike, home: string, runId: string): Promise<Probe<StagedView>>;
-export declare function ensureStaging(io: EvolutionIoLike, home: string, input: CreateStagingInput): Promise<CreateStagingResult>;
 export declare function setStagingTarget(io: EvolutionIoLike, home: string, stageKey: string, target: string, mode?: 'merge-into-existing' | 'create-umbrella' | 'keep'): Promise<boolean>;
-export declare function dropStaging(io: EvolutionIoLike, home: string, stageKey: string): Promise<void>;
 export interface StagingCleanupResult {
     readonly removed: readonly string[];
     readonly kept: readonly string[];

package/lib/types/staging.js

@@ -93,12 +93,6 @@ export async function readStaging(io, home, runId) {
         return probeUnknown('staging manifest is not JSON: ' + (error instanceof Error ? error.message : String(error)));
     }
 }
-export async function ensureStaging(io, home, input) {
-    const existing = await readStaging(io, home, input.runId);
-    if (existing.kind === 'present')
-        return { ok: true, path: stagingRoot(home, input.runId), manifest: existing.value.manifest };
-    return createStaging(io, home, input);
-}
 export async function setStagingTarget(io, home, stageKey, target, mode) {
     const view = await readStaging(io, home, stageKey);
     if (view.kind !== 'present')
@@ -107,9 +101,6 @@ export async function setStagingTarget(io, home, stageKey, target, mode) {
     await io.writeText(join(stagingRoot(home, stageKey), 'manifest.json'), JSON.stringify(manifest, null, 2) + '\n');
     return true;
 }
-export async function dropStaging(io, home, stageKey) {
-    await io.remove(stagingRoot(home, stageKey));
-}
 /** Remove expired run-level staging trees; `keep` names runs a live row still points at. */
 export async function cleanupExpiredStaging(io, home, now, keep = new Set()) {
     let runs;

package/lib/types/state.d.ts

@@ -1,7 +1,5 @@
 import type { EvolutionIoLike } from '@lmzhen/dsh-evolution-core';
-import { type MergePairState, type MergeQueue, type MergeRow, type MergeState } from './contracts.ts';
-import type { RowWriteResult } from './domain/row-tx.ts';
-import type { SkippedRowV3, V3Event, V3Row, VerifyRowV3 } from './domain/row-v3.ts';
+import { type MergeQueue, type MergeRow, type MergeState } from './contracts.ts';
 export declare function mergeStatePath(home: string): string;
 export interface LoadMergeStateResult {
     readonly ok: boolean;
@@ -10,41 +8,5 @@ export interface LoadMergeStateResult {
 }
 /** Pure read: never writes, never deletes a row. */
 export declare function loadMergeState(io: EvolutionIoLike, home: string): Promise<LoadMergeStateResult>;
-/** Schema probe for doctor; the only other reader of mergeStatePath. */
-export declare function loadStateSchema(io: EvolutionIoLike, home: string): Promise<number | null>;
-export interface RowTx {
-    rows(): readonly V3Row[];
-    createVerify(row: VerifyRowV3): RowWriteResult;
-    createSkipped(row: SkippedRowV3): RowWriteResult;
-    transition(id: string, event: V3Event, expectedVersion: number): RowWriteResult;
-}
-/** G3-5 runtime write API: only createVerify/createSkipped/transition. v2 writes are rejected. */
-export declare function transactRows<T>(_io: EvolutionIoLike, _home: string, _fn: (tx: RowTx) => T): Promise<T>;
-/** The ONE write point. The callback returns the whole row set, not a delta. */
-export declare function mutateMergeState<T>(_io: EvolutionIoLike, _home: string, _now: () => number, _fn: (rows: readonly MergeRow[]) => {
-    rows: readonly MergeRow[];
-    result: T;
-}): Promise<T>;
-export interface MoveRowPatch {
-    readonly queue: MergeQueue;
-    readonly state?: MergePairState;
-    readonly failure?: MergeRow['failure'];
-    readonly runId?: string;
-    readonly unitId?: string;
-    readonly origin?: MergeRow['origin'];
-    readonly attempts?: number;
-}
-export type UpsertExpect = 'any' | 'absent' | 'verify' | 'pending' | 'fuse' | 'skipped';
-export type UpsertResult = {
-    readonly ok: true;
-} | {
-    readonly ok: false;
-    readonly current: MergeRow;
-};
-export declare function upsertRow(io: EvolutionIoLike, home: string, now: () => number, row: MergeRow, expect?: UpsertExpect, cas?: string | null): Promise<UpsertResult>;
-export declare function moveRow(io: EvolutionIoLike, home: string, now: () => number, id: string, patch: MoveRowPatch): Promise<MergeRow | undefined>;
-/** G3-5 v3-aware drop: only terminal events. */
-export declare function dropRowV3(_io: EvolutionIoLike, _home: string, _id: string, _event: 'committed' | 'superseded' | 'restored', _unitId?: string): Promise<boolean>;
-export declare function dropRow(io: EvolutionIoLike, home: string, now: () => number, id: string): Promise<boolean>;
 export declare function rowsOf(io: EvolutionIoLike, home: string, queue?: MergeQueue): Promise<readonly MergeRow[]>;
 //# sourceMappingURL=state.d.ts.map