@productbrain/mcp 0.0.1-beta.12051 → 0.0.1-beta.12063
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1407,12 +1407,13 @@ Use \`context action=get\` to inspect the existing entry, or \`entries action=up
|
|
|
1407
1407
|
}
|
|
1408
1408
|
|
|
1409
1409
|
// src/tools/conflict-preflight.ts
|
|
1410
|
-
async function runConflictPreflight(name, description, collectionHint) {
|
|
1410
|
+
async function runConflictPreflight(name, description, collectionHint, subjectId) {
|
|
1411
1411
|
try {
|
|
1412
1412
|
const conflicts = await kernelQuery("chain.detectSemanticConflicts", {
|
|
1413
1413
|
name,
|
|
1414
1414
|
description,
|
|
1415
|
-
...collectionHint ? { collectionHint } : {}
|
|
1415
|
+
...collectionHint ? { collectionHint } : {},
|
|
1416
|
+
...subjectId ? { subjectId } : {}
|
|
1416
1417
|
});
|
|
1417
1418
|
return { conflicts: conflicts ?? [] };
|
|
1418
1419
|
} catch (err) {
|
|
@@ -1785,7 +1786,9 @@ async function handleCommitEntry({ entryId, preview, steeringOverrideReason, qua
|
|
|
1785
1786
|
const preflight = await runConflictPreflight(
|
|
1786
1787
|
entry.name,
|
|
1787
1788
|
descField,
|
|
1788
|
-
entry.collectionSlug ?? entry.collection?.slug ?? entry.collection?.name
|
|
1789
|
+
entry.collectionSlug ?? entry.collection?.slug ?? entry.collection?.name,
|
|
1790
|
+
entry.entryId
|
|
1791
|
+
// TASK-938: the reason names this entry
|
|
1789
1792
|
);
|
|
1790
1793
|
const advisoryWarnings = preflight.conflicts.map((conflict) => ({
|
|
1791
1794
|
entryId: conflict.chainEntryId,
|
|
@@ -1901,6 +1904,9 @@ No DB writes \u2014 call without \`preview:true\` to accept for real.` }],
|
|
|
1901
1904
|
}
|
|
1902
1905
|
}
|
|
1903
1906
|
}
|
|
1907
|
+
const heldFlag = typeof result2?.heldFlag === "string" && result2.heldFlag.trim() ? result2.heldFlag : void 0;
|
|
1908
|
+
const heldReason = heldFlag && typeof result2?.heldReason === "string" ? result2.heldReason : void 0;
|
|
1909
|
+
if (heldFlag) lines.push("", ...heldFlag.split("\n").map((flag) => `\u26A0 ${flag}`), ...heldReason ? [heldReason] : []);
|
|
1904
1910
|
const steeringAdvisory = typeof result2?.steeringAdvisory === "string" && result2.steeringAdvisory.trim() ? result2.steeringAdvisory : void 0;
|
|
1905
1911
|
if (steeringAdvisory) {
|
|
1906
1912
|
lines.push("");
|
|
@@ -1961,6 +1967,8 @@ No DB writes \u2014 call without \`preview:true\` to accept for real.` }],
|
|
|
1961
1967
|
contradictions: advisoryWarnings.length,
|
|
1962
1968
|
...epistemic ? { epistemicStatus: epistemic } : {},
|
|
1963
1969
|
...steeringAdvisory ? { steeringAdvisory } : {},
|
|
1970
|
+
...heldFlag ? { heldFlag, ...heldReason ? { heldReason } : {} } : {},
|
|
1971
|
+
// TASK-1159
|
|
1964
1972
|
// WP-485 Slice 2b round 2 (Codex P1, FEAT-1370): mirror the server's contradiction
|
|
1965
1973
|
// advisory into the structured payload so --json/agent consumers see it too.
|
|
1966
1974
|
...contradictionAdvisory ? { contradictionAdvisory } : {},
|
|
@@ -11862,4 +11870,4 @@ export {
|
|
|
11862
11870
|
SERVER_VERSION,
|
|
11863
11871
|
createProductBrainServer
|
|
11864
11872
|
};
|
|
11865
|
-
//# sourceMappingURL=chunk-
|
|
11873
|
+
//# sourceMappingURL=chunk-KMC5H4BZ.js.map
|