kibi-cli 1.0.1 → 2.0.0

package/dist/operations/planning/apply-plan.js

@@ -1,6 +1,7 @@
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { existsSync, realpathSync } from "node:fs";
 import path from "node:path";
+import { OperationError } from "../../cli-errors.js";
 import { branchEnsureCommand, branchMigrateCommand, branchRecoverCommand, } from "../../commands/branch.js";
 import { migrateCommand } from "../../commands/migrate.js";
 import { syncCommand } from "../../commands/sync.js";
@@ -13,6 +14,7 @@ import { bootstrapEmptyKbSnapshotId, bootstrapPlanHash, } from "../bootstrap/typ
 import { executeDelete } from "../mutation/delete.js";
 import { writePendingSourceReceipt } from "../mutation/source-authoring.js";
 import { executeUpsert } from "../mutation/upsert.js";
+import { acquireWorkspaceMutationLock, releaseWorkspaceMutationLock, } from "../mutation/workspace-mutation-lock.js";
 import { compilePlanHash, } from "./compile-intent.js";
 // implements REQ-kibi-change-to-proof-plan-compiler
 export const PLAN_APPLY_RESULT_VERSION = "kibi.plan-apply-result.v1";
@@ -96,6 +98,21 @@ function isMigrationApplyArgs(args) {
 function isBootstrapApplyArgs(args) {
     return "plan" in args && args.plan.version === "kibi.bootstrap-plan.v1";
 }
+export function assertSourceWriteStaysInWorkspace(root, absolute, writePath) {
+    if (absolute !== root && !absolute.startsWith(`${root}${path.sep}`)) {
+        throw new Error(`Apply plan failed: sourceWrites.path escapes workspace: ${writePath}`);
+    }
+}
+export function assertBootstrapRecoveryDependencies(remaining, applied) {
+    for (const action of remaining) {
+        for (const dependency of action.dependsOn ?? []) {
+            if (!applied.has(dependency) &&
+                !remaining.some((candidate) => candidate.id === dependency)) {
+                throw new Error(`Bootstrap recovery journal is missing dependency '${dependency}' for '${action.id}'`);
+            }
+        }
+    }
+}
 export function orderBootstrapActions(actions, completed = new Set()) {
     const byId = new Map();
     for (const action of actions) {
@@ -274,7 +291,7 @@ async function validateSources(context, sourceHashes) {
     }
     return checked;
 }
-async function applySourceWrites(context, writes, planHash, allowReplay = false) {
+async function applySourceWrites(context, writes, planHash, allowReplay = false, onCommitted = () => undefined) {
     if (writes.length === 0) {
         return { paths: [], rollback: async () => undefined, journalId: null };
     }
@@ -338,6 +355,7 @@ async function applySourceWrites(context, writes, planHash, allowReplay = false)
             if (!allowReplay) {
                 throw new Error(`MUTATION_ALREADY_COMMITTED: source plan ${planHash} already crossed the authoritative commit boundary; use kb_apply_plan recoveryJournalId=${journalId} instead of retrying the original mutation`);
             }
+            onCommitted();
             for (const entry of prior.entries) {
                 if (entry.mode === "write" && entry.afterHash !== null) {
                     writePendingSourceReceipt(context.workspaceRoot, entry.path, entry.afterHash);
@@ -378,6 +396,7 @@ async function applySourceWrites(context, writes, planHash, allowReplay = false)
     const originals = [];
     const entries = [];
     const paths = [];
+    let sourceCommitted = false;
     try {
         // Validate every target and hash before touching the working tree.
         for (const write of writes) {
@@ -388,9 +407,7 @@ async function applySourceWrites(context, writes, planHash, allowReplay = false)
             }
             const absolute = path.resolve(context.workspaceRoot, write.path);
             const root = path.resolve(context.workspaceRoot);
-            if (absolute !== root && !absolute.startsWith(`${root}${path.sep}`)) {
-                throw new Error(`Apply plan failed: sourceWrites.path escapes workspace: ${write.path}`);
-            }
+            assertSourceWriteStaysInWorkspace(root, absolute, write.path);
             const workspaceRelative = path
                 .relative(root, absolute)
                 .split(path.sep)
@@ -471,22 +488,33 @@ async function applySourceWrites(context, writes, planHash, allowReplay = false)
                 await context.fs.unlink(absolute);
             }
             else {
-                const staged = `${absolute}.kibi-stage-${journalId}-${index}`;
-                await context.fs.writeFile(staged, write.body ?? "");
-                if (context.fs.rename) {
-                    await context.fs.rename(staged, absolute);
+                const staged = `${absolute}.kibi-stage-${journalId}-${index}-${randomUUID()}`;
+                try {
+                    await context.fs.writeFile(staged, write.body ?? "");
+                    if (context.fs.rename) {
+                        await context.fs.rename(staged, absolute);
+                    }
+                    else {
+                        // Test and constrained host ports may not expose rename. Keep the
+                        // compatibility fallback explicit; production nodeFilesystem uses
+                        // same-directory rename for atomic replacement.
+                        await context.fs.writeFile(absolute, write.body ?? "");
+                        if (context.fs.unlink)
+                            await context.fs.unlink(staged).catch(() => undefined);
+                    }
                 }
-                else {
-                    // Test and constrained host ports may not expose rename. Keep the
-                    // compatibility fallback explicit; production nodeFilesystem uses
-                    // same-directory rename for atomic replacement.
-                    await context.fs.writeFile(absolute, write.body ?? "");
+                catch (error) {
+                    // A failed rename must not leak the unique staged temp file into
+                    // the authored tree; rollback of originals happens in the caller.
                     if (context.fs.unlink)
                         await context.fs.unlink(staged).catch(() => undefined);
+                    throw error;
                 }
             }
         }
         await context.fs.writeFile(journalPath, `${JSON.stringify({ version: 1, planHash, state: "sources_committed", entries }, null, 2)}\n`);
+        sourceCommitted = true;
+        onCommitted();
         // A newly authored file is intentionally excluded from ordinary Git
         // discovery until the operator stages it. The receipt binds that pending
         // input to the exact bytes committed by this plan.
@@ -497,6 +525,17 @@ async function applySourceWrites(context, writes, planHash, allowReplay = false)
         }
     }
     catch (error) {
+        if (sourceCommitted) {
+            // The authoritative source bytes must remain in place once the commit
+            // milestone has fired. A pending receipt failure is repair metadata
+            // failure, not permission to roll back the committed mutation. Surface
+            // the recovery journal instead of a generic exception so callers never
+            // read the committed plan as retryable.
+            await markSourceJournal(context, journalId, "repair_required");
+            if (error instanceof OperationError)
+                throw error;
+            throw new OperationError("SOURCE_COMMIT_REPAIR_REQUIRED", `Source plan ${planHash} committed its authoritative bytes, but postcommit repair metadata failed: ${error instanceof Error ? error.message : String(error)}; recovery journal ${journalId} is marked repair_required; use kb_apply_plan recoveryJournalId=${journalId} instead of retrying the original mutation`, false);
+        }
         for (const original of [...originals].reverse()) {
             try {
                 if (original.body === undefined && context.fs.unlink) {
@@ -542,7 +581,7 @@ async function markSourceJournal(context, journalId, state) {
         // authoritative operation result behind a best-effort metadata write.
     }
 }
-async function executeSourceRecovery(args, context) {
+async function executeSourceRecovery(args, context, onCommitted = () => undefined) {
     if (!context.fs)
         throw new Error("Source recovery requires a filesystem-capable runtime");
     if (!/^[A-Za-z0-9._-]+$/.test(args.recoveryJournalId)) {
@@ -569,7 +608,7 @@ async function executeSourceRecovery(args, context) {
             ...(body === undefined ? {} : { body }),
         });
     }
-    const sourceWrites = await applySourceWrites(context, writes, journal.planHash, true);
+    const sourceWrites = await applySourceWrites(context, writes, journal.planHash, true, onCommitted);
     for (const write of writes) {
         if (write.mode === "write" && write.afterHash !== null) {
             writePendingSourceReceipt(context.workspaceRoot, write.path, write.afterHash);
@@ -613,7 +652,7 @@ async function executeSourceRecovery(args, context) {
         },
     };
 }
-async function executeBootstrapPlan(args, context, recovery = false, remainingActions, priorResults = []) {
+async function executeBootstrapPlan(args, context, recovery = false, remainingActions, priorResults = [], onCommitted = () => undefined) {
     const actions = recovery
         ? [...(remainingActions ?? args.plan.actions)]
         : validateBootstrapPlanShape(args);
@@ -700,6 +739,7 @@ async function executeBootstrapPlan(args, context, recovery = false, remainingAc
                 activeActionId = action.id;
                 await writeJournal("applying", activeActionId);
                 const result = await executeUpsert(asUpsert(action.payload), operationContext);
+                onCommitted();
                 const payload = result.structuredContent;
                 if (payload && typeof payload === "object") {
                     const row = payload;
@@ -924,7 +964,7 @@ async function executeBootstrapPlan(args, context, recovery = false, remainingAc
     };
 }
 // implements REQ-kibi-change-to-proof-plan-compiler, REQ-agent-guided-migration-orchestration
-export async function executeApplyPlan(args, context) {
+async function executeApplyPlanUnlocked(args, context, onCommitted = () => undefined) {
     if ("recoveryJournalId" in args) {
         if (args.recoveryJournalId.startsWith("bootstrap-")) {
             if (!context.fs)
@@ -980,13 +1020,7 @@ export async function executeApplyPlan(args, context) {
                     applied.add(row.actionId);
             }
             const remaining = orderBootstrapActions(ordered.filter((action) => !applied.has(action.id)), applied);
-            for (const action of remaining) {
-                for (const dependency of action.dependsOn ?? []) {
-                    if (!applied.has(dependency) &&
-                        !remaining.some((candidate) => candidate.id === dependency))
-                        throw new Error(`Bootstrap recovery journal is missing dependency '${dependency}' for '${action.id}'`);
-                }
-            }
+            assertBootstrapRecoveryDependencies(remaining, applied);
             return executeBootstrapPlan({ plan: journal.plan, approvedPlanHash: journal.plan.planHash }, context, true, remaining, (journal.results ?? []).flatMap((row) => row &&
                 typeof row.actionId === "string" &&
                 (row.outcome === "applied" ||
@@ -1002,18 +1036,18 @@ export async function executeApplyPlan(args, context) {
                         },
                     ]
                     : []
-                : []));
+                : []), onCommitted);
         }
-        return executeSourceRecovery(args, context);
+        return executeSourceRecovery(args, context, onCommitted);
     }
     if (isBootstrapApplyArgs(args))
-        return executeBootstrapPlan(args, context);
+        return executeBootstrapPlan(args, context, false, undefined, [], onCommitted);
     if (isMigrationApplyArgs(args)) {
-        return applyMigrationPlan(args, context);
+        return applyMigrationPlan(args, context, onCommitted);
     }
     if (isEntityDeletionApplyArgs(args)) {
         validateEntityDeletionPlan(args);
-        const sourceWrites = await applySourceWrites(context, args.plan.sourceWrites ?? [], args.plan.planHash);
+        const sourceWrites = await applySourceWrites(context, args.plan.sourceWrites ?? [], args.plan.planHash, false, onCommitted);
         const operationContext = {
             ...context,
             sourceFirst: false,
@@ -1025,6 +1059,7 @@ export async function executeApplyPlan(args, context) {
         try {
             const result = await executeDelete({ ids: args.plan.entityIds }, operationContext);
             payload = result.structuredContent;
+            onCommitted();
             await markSourceJournal(operationContext, sourceWrites.journalId, "compiled_published");
         }
         catch (error) {
@@ -1090,18 +1125,24 @@ export async function executeApplyPlan(args, context) {
         throw new Error("Apply plan failed: workspace snapshot changed since compilation");
     const sourceHashesChecked = await validateSources(operationContext, args.plan.expected.sourceHashes);
     const steps = args.plan.steps.map((step) => asUpsert(step));
-    const sourceWrites = await applySourceWrites(operationContext, args.plan.sourceWrites, args.plan.planHash);
+    const sourceWrites = await applySourceWrites(operationContext, args.plan.sourceWrites, args.plan.planHash, false, onCommitted);
     const notes = [
         "Plan steps and tracked source writes are validated before sequential application; source writes are journaled for replay.",
     ];
     let changedEntities = 0;
     let changedRelationships = 0;
+    let appliedSteps = 0;
     const effectFailures = [];
     const nextActions = [];
     let compiledCommit = false;
     try {
         for (const step of steps) {
             const result = await executeUpsert(step, operationContext);
+            appliedSteps += 1;
+            // Each step's compiled commit is an authoritative mutation boundary.
+            // Mark it immediately so a later step's failure can never be mistaken
+            // for a retryable whole-plan failure.
+            onCommitted();
             const payload = result.structuredContent;
             if (payload && typeof payload === "object") {
                 const row = payload;
@@ -1117,6 +1158,7 @@ export async function executeApplyPlan(args, context) {
             }
         }
         compiledCommit = true;
+        onCommitted();
     }
     catch (error) {
         if (sourceWrites.journalId !== null) {
@@ -1131,8 +1173,18 @@ export async function executeApplyPlan(args, context) {
                 reason: "Authoritative source files are committed but compiled effects failed; replay the recovery journal instead of retrying the original mutation.",
                 required: true,
             });
+            onCommitted();
             await markSourceJournal(operationContext, sourceWrites.journalId, "repair_required");
         }
+        else if (appliedSteps > 0) {
+            // A journalless plan (sourceWrites: []) already committed earlier steps
+            // when a later step failed. Expose an explicit non-retryable
+            // partial-commit error instead of a generic exception that invites a
+            // blind retry of the whole plan.
+            if (error instanceof OperationError)
+                throw error;
+            throw new OperationError("PARTIAL_COMMIT_REPAIR_REQUIRED", `Plan ${args.plan.planHash} committed ${appliedSteps} of ${steps.length} step(s) before failing: ${error instanceof Error ? error.message : String(error)}. This plan carries no recovery journal; do not retry the original plan; inspect the committed snapshot and apply a fresh plan for the remaining steps`, false);
+        }
         else {
             throw error;
         }
@@ -1220,7 +1272,31 @@ export async function executeApplyPlan(args, context) {
         structuredContent: payload,
     };
 }
-async function applyMigrationPlan(args, context) {
+export async function executeApplyPlan(args, context) {
+    if (!context.fs || context.sourceMutationLockHeld === true)
+        return executeApplyPlanUnlocked(args, context);
+    const lock = await acquireWorkspaceMutationLock(context.workspaceRoot);
+    let operationFailure;
+    let committed = false;
+    try {
+        const result = await executeApplyPlanUnlocked(args, {
+            ...context,
+            sourceMutationLockHeld: true,
+        }, () => {
+            committed = true;
+        });
+        committed = true;
+        return result;
+    }
+    catch (error) {
+        operationFailure = { error };
+        throw error;
+    }
+    finally {
+        releaseWorkspaceMutationLock(lock, operationFailure, committed);
+    }
+}
+async function applyMigrationPlan(args, context, onCommitted = () => undefined) {
     const actions = topologicalActions(validateMigrationPlanShape(args));
     const initialStatus = (await executeStatus({}, context)).structuredContent;
     if (!initialStatus)
@@ -1258,6 +1334,7 @@ async function applyMigrationPlan(args, context) {
         }
         try {
             await applyMigrationAction(action, context);
+            onCommitted();
             results.push({
                 actionId: action.id,
                 outcome: "applied",
@@ -1329,11 +1406,11 @@ async function applyMigrationPlan(args, context) {
                 : finalStatus.syncState === "fresh"
                     ? "clean_fresh"
                     : "not_evaluated";
-    const verificationState = finalStatus.verificationSnapshotAvailable === false
+    const snapshotState = finalStatus.proofSnapshotAvailable === false
         ? "unavailable"
-        : finalStatus.verificationSnapshotDirty === true
+        : finalStatus.proofSnapshotDirty === true
             ? "dirty"
-            : finalStatus.verificationSnapshotDirty === false
+            : finalStatus.proofSnapshotDirty === false
                 ? "fresh"
                 : "not_evaluated";
     const proven = coverageSummary?.proofProven;
@@ -1366,7 +1443,7 @@ async function applyMigrationPlan(args, context) {
                     ? "blocked"
                     : "interim",
             kbState,
-            verificationState,
+            snapshotState,
             proofState,
             limitationDisposition: "not_applicable",
         },

package/dist/operations/planning/compile-intent.d.ts

@@ -24,6 +24,8 @@ export type TestDraft = Readonly<{
     id?: string;
     title: string;
     body: string;
+    /** Stable IDs of the scenario drafts that this test verifies. */
+    scenarioIds?: readonly string[];
     verificationScope?: "unit" | "integration" | "end_to_end";
     verificationPerspective?: "internal" | "consumer";
 }>;

package/dist/operations/planning/compile-intent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile-intent.d.ts","sourceRoot":"","sources":["../../../src/operations/planning/compile-intent.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,cAAc,EAEpB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,KAAK,EACV,gBAAgB,EAEjB,MAAM,0CAA0C,CAAC;AAIlD,OAAO,KAAK,EAEV,2BAA2B,EAE5B,MAAM,8BAA8B,CAAC;AAGtC,eAAO,MAAM,oBAAoB,EAAG,sBAA+B,CAAC;AAGpE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IAC5C,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACpC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,SAAS,2BAA2B,EAAE,CAAC;IACzD,cAAc,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,UAAU,CAAC,EAAE,SAAS,SAAS,EAAE,CAAC;IAClC,iBAAiB,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;CACjD,CAAC,CAAC;AAGH,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACnC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAAC,CAAC;AAGH,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,GAAG,aAAa,GAAG,YAAY,CAAC;IAC1D,uBAAuB,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;CACnD,CAAC,CAAC;AAGH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC/B,CAAC,CAAC;AAGH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAGH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC;IAC1C,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,QAAQ,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnE,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;CAC3C,CAAC,CAAC;AAGH,MAAM,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAGzD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACtC,MAAM,CAGR;AAGD,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC;IACnC,OAAO,EAAE,OAAO,oBAAoB,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,GAAG,kBAAkB,GAAG,SAAS,CAAC;IACjD,QAAQ,EAAE;QACR,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;KACvD,CAAC;IACF,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;IACF,SAAS,EAAE;QACT,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;QACzC,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC;IACF,YAAY,EAAE,SAAS;QACrB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;QACrC,WAAW,EACP,iBAAiB,GACjB,WAAW,GACX,MAAM,GACN,aAAa,GACb,YAAY,CAAC;QACjB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,cAAc,GAAG,YAAY,CAAC;QAChE,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC;KAClC,EAAE,CAAC;IACJ,qBAAqB,EAAE;QACrB,OAAO,EAAE,aAAa,GAAG,UAAU,GAAG,YAAY,CAAC;QACnD,SAAS,EAAE,SAAS,oBAAoB,EAAE,CAAC;KAC5C,CAAC;IACF,SAAS,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAC3C,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IAC3B,YAAY,EAAE,SAAS,eAAe,EAAE,CAAC;IACzC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AA6ZH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,iBAAiB,EACvB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IACT,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,iBAAiB,EAAE,aAAa,CAAC;CAClC,CAAC,CA0RD"}
+{"version":3,"file":"compile-intent.d.ts","sourceRoot":"","sources":["../../../src/operations/planning/compile-intent.ts"],"names":[],"mappings":"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"}

package/dist/operations/planning/compile-intent.js

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import path from "node:path";
 import { dump as dumpYaml } from "js-yaml";
 import { executeIntentSearch, } from "../../intent-search.js";
-import { parseTriples } from "../../prolog/codec.js";
+import { normalizeEntityId, parseTriples } from "../../prolog/codec.js";
 import { loadEntities } from "../../public/operations/discovery-entities.js";
 import { executeStatus } from "../../public/operations/discovery-executors.js";
 import { configuredSourceTarget } from "../mutation/source-authoring.js";
@@ -227,8 +227,16 @@ async function contradictionAnalysis(prolog, requirementId) {
         return { outcome: "unresolved", witnesses: [] };
     const rows = parseTriples(result.bindings.Rows ?? "[]");
     const witnesses = rows
-        .filter(([left, right]) => left === requirementId || right === requirementId)
-        .map(([left, right, reason]) => ({ requirements: [left, right], reason }));
+        .map(([left, right, reason]) => ({
+        left: normalizeEntityId(left),
+        right: normalizeEntityId(right),
+        reason,
+    }))
+        .filter(({ left, right }) => left === requirementId || right === requirementId)
+        .map(({ left, right, reason }) => ({
+        requirements: [left, right],
+        reason,
+    }));
     return {
         outcome: witnesses.length > 0 ? "conflict" : "no_conflict",
         witnesses,
@@ -282,12 +290,20 @@ function applyAcceptedProposals(steps, proposals) {
 function draftId(prefix, title, index) {
     return `${prefix}-${slug(title)}-${shortHash(`${title}\0${index}`).toUpperCase()}`;
 }
+// implements REQ-kibi-change-to-proof-plan-compiler
 function draftSteps(requirementId, scenarios, tests) {
     const diagnostics = [];
     const steps = [];
     const scenarioIds = [];
+    const linkedScenarioIds = new Set();
+    const duplicateScenarioIds = new Set();
+    const testIds = new Set();
     scenarios.forEach((scenario, index) => {
         const id = text(scenario.id) || draftId("SCEN", scenario.title, index);
+        if (scenarioIds.includes(id)) {
+            duplicateScenarioIds.add(id);
+            diagnostics.push(`unresolved duplicate scenario draft ID ${id}; scenario associations are ambiguous.`);
+        }
         scenarioIds.push(id);
         steps.push({
             type: "scenario",
@@ -303,9 +319,42 @@ function draftSteps(requirementId, scenarios, tests) {
     });
     tests.forEach((test, index) => {
         const id = text(test.id) || draftId("TEST", test.title, index);
-        if (scenarioIds.length === 0)
-            diagnostics.push(`Test draft ${id} has no scenario draft; proof-bearing tests require a scenario relationship.`);
-        const scenarioId = scenarioIds[index] ?? scenarioIds[0];
+        if (testIds.has(id)) {
+            diagnostics.push(`unresolved duplicate test draft ID ${id}; test associations are ambiguous.`);
+        }
+        testIds.add(id);
+        const requestedScenarioIds = test.scenarioIds?.map(text) ?? null;
+        const soleScenarioId = scenarioIds.length === 1 ? scenarioIds[0] : undefined;
+        const associatedScenarioIds = requestedScenarioIds !== null
+            ? Array.from(new Set(requestedScenarioIds.filter(Boolean)))
+            : soleScenarioId !== undefined
+                ? [soleScenarioId]
+                : [];
+        if (scenarioIds.length === 0) {
+            diagnostics.push(`unresolved test draft ${id} has no scenario draft; proof-bearing tests require a scenario relationship.`);
+        }
+        else if (requestedScenarioIds === null && scenarioIds.length > 1) {
+            diagnostics.push(`unresolved test draft ${id} must declare scenarioIds when multiple scenario drafts exist; positional association is not supported.`);
+        }
+        else if (requestedScenarioIds !== null &&
+            associatedScenarioIds.length === 0) {
+            diagnostics.push(`unresolved test draft ${id} must reference at least one scenario ID in scenarioIds.`);
+        }
+        if (requestedScenarioIds !== null &&
+            (requestedScenarioIds.some((scenarioId) => !scenarioId) ||
+                requestedScenarioIds.filter(Boolean).length !==
+                    associatedScenarioIds.length)) {
+            diagnostics.push(`unresolved test draft ${id} repeats or omits scenario IDs; associations must be unique and non-empty.`);
+        }
+        const validScenarioIds = associatedScenarioIds.filter((scenarioId) => scenarioIds.includes(scenarioId) &&
+            !duplicateScenarioIds.has(scenarioId));
+        for (const scenarioId of associatedScenarioIds) {
+            if (!scenarioIds.includes(scenarioId)) {
+                diagnostics.push(`unresolved test draft ${id} references unknown scenario ID ${scenarioId}.`);
+            }
+        }
+        for (const scenarioId of validScenarioIds)
+            linkedScenarioIds.add(scenarioId);
         steps.push({
             type: "test",
             id,
@@ -314,14 +363,21 @@ function draftSteps(requirementId, scenarios, tests) {
                 status: "draft",
                 body: test.body.trim(),
                 source: "mcp://kibi/compile-intent",
-                verification_scope: test.verificationScope ?? "end_to_end",
-                verification_perspective: test.verificationPerspective ?? "consumer",
+                verification_scope: test.verificationScope ?? "integration",
+                verification_perspective: test.verificationPerspective ?? "internal",
             },
-            relationships: scenarioId
-                ? [{ type: "verified_by", from: scenarioId, to: id }]
-                : [],
+            relationships: validScenarioIds.map((scenarioId) => ({
+                type: "verified_by",
+                from: scenarioId,
+                to: id,
+            })),
         });
     });
+    for (const scenarioId of scenarioIds) {
+        if (!linkedScenarioIds.has(scenarioId)) {
+            diagnostics.push(`unresolved scenario draft ${scenarioId} has no test draft; add a test with scenarioIds to establish executable coverage.`);
+        }
+    }
     if (scenarioIds.length > 0) {
         steps.push({
             type: "req",
@@ -348,13 +404,13 @@ export async function executeCompileIntent(args, context) {
     const status = statusResult.structuredContent;
     if (!status)
         throw new Error("Compile intent failed: status query returned no payload");
-    const snapshotEvidence = status?.verificationSnapshot;
+    const snapshotEvidence = status?.proofSnapshot;
     const workspaceSnapshot = snapshotEvidence
         ? {
             version: "kibi.workspace-snapshot.v2",
             hash: snapshotEvidence,
-            dirty: status?.verificationSnapshotDirty ?? false,
-            fileCount: status?.verificationSnapshotFileCount ?? 0,
+            dirty: status?.proofSnapshotDirty ?? false,
+            fileCount: status?.proofSnapshotFileCount ?? 0,
         }
         : {
             version: "kibi.workspace-snapshot.v2",

package/dist/operations/proof/ingest-proof.d.ts

@@ -0,0 +1,34 @@
+import { type ProofGap } from "../../proof/evaluate.js";
+import type { OperationContext } from "../../public/operations/runtime-types.js";
+import { type ProofReceipt } from "../../public/proof-receipt.js";
+export type IngestProofArgs = Readonly<{
+    snapshot: string;
+    artifact: Readonly<Record<string, unknown>>;
+    testIds?: readonly string[];
+}>;
+export type IngestProofTestResult = Readonly<{
+    testId: string;
+    outcome: ProofReceipt["outcome"];
+    receiptId: string;
+    applied: boolean;
+    duplicate: boolean;
+    receiptCount: number;
+    gaps: readonly ProofGap[];
+}>;
+export type IngestProofResult = Readonly<{
+    artifactDigest: string;
+    environmentHash: string;
+    integration: string | null;
+    passed: number;
+    failed: number;
+    unchanged: number;
+    results: readonly IngestProofTestResult[];
+}>;
+export declare function executeIngestProof(args: IngestProofArgs, context: OperationContext): Promise<{
+    content: Array<{
+        type: "text";
+        text: string;
+    }>;
+    structuredContent: IngestProofResult;
+}>;
+//# sourceMappingURL=ingest-proof.d.ts.map

package/dist/operations/proof/ingest-proof.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ingest-proof.d.ts","sourceRoot":"","sources":["../../../src/operations/proof/ingest-proof.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEd,MAAM,yBAAyB,CAAC;AAOjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAkBjF,OAAO,EAEL,KAAK,YAAY,EAGlB,MAAM,+BAA+B,CAAC;AAYvC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7B,CAAC,CAAC;AAEH,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAAC;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;CAC3B,CAAC,CAAC;AAGH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,SAAS,qBAAqB,EAAE,CAAC;CAC3C,CAAC,CAAC;AAqFH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC;IACT,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC,CA2RD"}