@productbrain/cli 0.1.0-beta.14115 → 0.1.0-beta.14130
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.
- package/dist/commands/conflicts.test.js +13 -8
- package/dist/commands/conflicts.test.js.map +1 -1
- package/dist/lib/conflictResolution.d.ts +30 -6
- package/dist/lib/conflictResolution.d.ts.map +1 -1
- package/dist/lib/conflictResolution.js +24 -7
- package/dist/lib/conflictResolution.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ vi.mock('../lib/client.js', () => ({ kernelCall, kernelCallWithSession }));
|
|
|
11
11
|
vi.mock('../lib/runner.js', () => ({ runCliCommand }));
|
|
12
12
|
vi.mock('../lib/session.js', () => ({ readSession }));
|
|
13
13
|
import { createConflictsCommand, runConflictsList, runConflictsPropose, runConflictsResolve, runConflictsSummary, runConflictsSnooze, runConflictsReverdict, } from './conflicts.js';
|
|
14
|
-
import { RESOLUTION_WORDS } from '../lib/conflictResolution.js';
|
|
14
|
+
import { CONFLICT_RESOLUTIONS, RESOLUTION_WORDS } from '../lib/conflictResolution.js';
|
|
15
15
|
describe('pb conflicts command surface (WP-499 Slice A, TEN-2744)', () => {
|
|
16
16
|
beforeEach(() => {
|
|
17
17
|
vi.clearAllMocks();
|
|
@@ -23,6 +23,10 @@ describe('pb conflicts command surface (WP-499 Slice A, TEN-2744)', () => {
|
|
|
23
23
|
it('exposes list, resolve, propose, reverdict, snooze, and summary in help metadata', () => {
|
|
24
24
|
const command = createConflictsCommand();
|
|
25
25
|
expect(command.commands.map((item) => item.name())).toEqual(['list', 'resolve', 'propose', 'reverdict', 'snooze', 'summary']);
|
|
26
|
+
// TASK-711 (RULE-664): every --as offers the constant's four answers, update first, and nothing else.
|
|
27
|
+
const offered = ['resolve', 'propose', 'reverdict'].map((name) => command.commands.find((c) => c.name() === name).options.find((o) => o.long === '--as').description);
|
|
28
|
+
expect(offered).toEqual(Array(3).fill('update, replaces, both_stand, unrelated'));
|
|
29
|
+
expect(CONFLICT_RESOLUTIONS).toEqual(['update', 'replaces', 'both_stand', 'unrelated']);
|
|
26
30
|
});
|
|
27
31
|
// TASK-1571 (QUE-554): the gateway refuses every answer with the person-only floor's words; the CLI adds its propose command.
|
|
28
32
|
it('a refused answer reads the floor words and names pb conflicts propose', async () => {
|
|
@@ -30,8 +34,8 @@ describe('pb conflicts command surface (WP-499 Slice A, TEN-2744)', () => {
|
|
|
30
34
|
runCliCommand.mockImplementationOnce(async ({ fn }) => { await fn(); });
|
|
31
35
|
const floor = 'Only a person answers a possible clash. A person in the role that owns [DEC-2] or [DEC-1]: open it in Product Brain and answer it.';
|
|
32
36
|
kernelCallWithSession.mockRejectedValueOnce(new Error(floor));
|
|
33
|
-
await expect(runConflictsResolve('issue-1', { as: '
|
|
34
|
-
.rejects.toMatchObject({ message: floor, guidance: 'pb conflicts propose issue-1 --as replaces|
|
|
37
|
+
await expect(runConflictsResolve('issue-1', { as: 'update', target: 'DEC-1' }))
|
|
38
|
+
.rejects.toMatchObject({ message: floor, guidance: 'pb conflicts propose issue-1 --as update|replaces|both_stand|unrelated' });
|
|
35
39
|
expect(floor).toContain(RESOLUTION_WORDS.answerVerb); // the one word both read
|
|
36
40
|
});
|
|
37
41
|
// TASK-1560 (QUE-518): an agent proposes the answer on the row; the kernel records it beside the session's seat.
|
|
@@ -165,15 +169,16 @@ describe('pb conflicts command surface (WP-499 Slice A, TEN-2744)', () => {
|
|
|
165
169
|
});
|
|
166
170
|
it('refuses an unknown choice, a choice beside --verdict, and neither, before any call', async () => {
|
|
167
171
|
readSession.mockReturnValue({ sessionId: 'session-1' });
|
|
168
|
-
await expect(runConflictsResolve('issue-7', { as: 'real' })).rejects.toThrow('Choose replaces,
|
|
169
|
-
await expect(runConflictsResolve('issue-7', { as: 'refines'
|
|
170
|
-
await expect(runConflictsResolve('issue-7', {})).rejects.toThrow('
|
|
172
|
+
await expect(runConflictsResolve('issue-7', { as: 'real' })).rejects.toThrow('Choose update, replaces, both_stand or unrelated.');
|
|
173
|
+
await expect(runConflictsResolve('issue-7', { as: 'refines' })).rejects.toThrow('Choose update, replaces, both_stand or unrelated.'); // no longer offered (TASK-711)
|
|
174
|
+
await expect(runConflictsResolve('issue-7', { as: 'update', verdict: 'real' })).rejects.toThrow('Give either the answer (real or false alarm) or the choice, not both.');
|
|
175
|
+
await expect(runConflictsResolve('issue-7', {})).rejects.toThrow('Choose update, replaces, both_stand or unrelated.');
|
|
171
176
|
expect(kernelCallWithSession).not.toHaveBeenCalled();
|
|
172
177
|
});
|
|
173
178
|
it('reverdict --as sends the choice with the amendment reason', async () => {
|
|
174
179
|
readSession.mockReturnValue({ sessionId: 'session-1' });
|
|
175
|
-
await runConflictsReverdict('issue-7', { as: '
|
|
176
|
-
expect(kernelCallWithSession).toHaveBeenCalledWith('conflicts.reverdict', { issueId: 'issue-7', resolution: '
|
|
180
|
+
await runConflictsReverdict('issue-7', { as: 'update', target: 'DEC-1', reason: 'It narrows it.' });
|
|
181
|
+
expect(kernelCallWithSession).toHaveBeenCalledWith('conflicts.reverdict', { issueId: 'issue-7', resolution: 'update', resolutionTarget: 'DEC-1', reason: 'It narrows it.' });
|
|
177
182
|
});
|
|
178
183
|
});
|
|
179
184
|
describe('pb conflicts snooze (C2, bounded logged debt — DEC-1491)', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflicts.test.js","sourceRoot":"","sources":["../../src/commands/conflicts.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conflicts.test.js","sourceRoot":"","sources":["../../src/commands/conflicts.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,32 @@
|
|
|
1
|
-
/** The
|
|
2
|
-
*
|
|
3
|
-
|
|
1
|
+
/** The four answers an owner gives a possible clash, in the order offered (TASK-711, DEC-2592 update first, KR-7; RULE-664; Voice signs):
|
|
2
|
+
* update the older entry, replace it, both stand, unrelated. Generated copies go to both connectors; the door-only lines are DOOR_WORDS
|
|
3
|
+
* in conflictFlags.ts. */
|
|
4
|
+
export declare const CONFLICT_RESOLUTIONS: readonly ["update", "replaces", "both_stand", "unrelated"];
|
|
4
5
|
export type ConflictResolution = (typeof CONFLICT_RESOLUTIONS)[number];
|
|
5
6
|
export declare const isConflictResolution: (value: unknown) => value is ConflictResolution;
|
|
7
|
+
/** TASK-711: an answer stored before the four, read and taken at the doors for an older client, never offered or written again: the
|
|
8
|
+
* doors store it as update, and shownResolution shows a stored one as update. Its dated delete follows (DEC-1042 clause 5). */
|
|
9
|
+
export declare const LEGACY_CONFLICT_RESOLUTIONS: readonly ["refines"];
|
|
10
|
+
/** Every value the stored field and the doors take: the four, then the legacy one (additive only, AGENTS.md §3). */
|
|
11
|
+
export declare const STORED_CONFLICT_RESOLUTIONS: readonly ["update", "replaces", "both_stand", "unrelated", "refines"];
|
|
12
|
+
export type StoredConflictResolution = (typeof STORED_CONFLICT_RESOLUTIONS)[number];
|
|
13
|
+
/** A stored answer as every surface shows it (DEC-2006's pattern: derived, never rewritten). */
|
|
14
|
+
export declare const shownResolution: (stored: StoredConflictResolution) => ConflictResolution;
|
|
15
|
+
/** The answers that name the older entry; both stand and unrelated name neither. */
|
|
16
|
+
export declare const TARGETED_RESOLUTIONS: readonly ["update", "replaces"];
|
|
17
|
+
export declare const namesTarget: (choice: ConflictResolution) => boolean;
|
|
18
|
+
/** The answers that take a one-line reason and close the possible clash on the answer (QUE-570, DEC-1521 amended): both stand, unrelated. */
|
|
19
|
+
export declare const REASONED_RESOLUTIONS: readonly ["both_stand", "unrelated"];
|
|
20
|
+
export type ReasonedResolution = (typeof REASONED_RESOLUTIONS)[number];
|
|
21
|
+
export declare const needsReason: (choice: ConflictResolution) => choice is ReasonedResolution;
|
|
22
|
+
/** The four answers as a person reads them (Voice signed, TASK-711): "Update <X>", "Replace <X>", "Both stand", "Unrelated", X the older entry. */
|
|
23
|
+
export declare const RESOLUTION_LABELS: {
|
|
24
|
+
readonly update: "Update";
|
|
25
|
+
readonly replaces: "Replace";
|
|
26
|
+
readonly both_stand: "Both stand";
|
|
27
|
+
readonly unrelated: "Unrelated";
|
|
28
|
+
};
|
|
29
|
+
export declare const answerLabel: (choice: ConflictResolution, older: string) => string;
|
|
6
30
|
/** The longest unrelated reason, one line. */
|
|
7
31
|
export declare const CONFLICT_RESOLUTION_REASON_MAX = 200;
|
|
8
32
|
/** A line Voice signed (DEC-2442, DEC-2443). The clash doors refuse only with one of these, so a hand-written line does not compile. */
|
|
@@ -40,8 +64,8 @@ export declare const RESOLUTION_WORDS: {
|
|
|
40
64
|
readonly choose: SignedLine;
|
|
41
65
|
readonly both: SignedLine;
|
|
42
66
|
readonly reasonTooLong: SignedLine;
|
|
43
|
-
readonly target:
|
|
44
|
-
readonly reason:
|
|
67
|
+
readonly target: `${string}: the entry to update or replace, one of the two`;
|
|
68
|
+
readonly reason: `For ${string}: one line on why (200 characters at most); for an amendment: why the answer changes`;
|
|
45
69
|
/** The receipt an older backend's answer gets when it carries no line of its own (the MCP's fallback): the choice in words. */
|
|
46
70
|
readonly recorded: (choice: ConflictResolution) => string;
|
|
47
71
|
/** TASK-1560 (QUE-518, QUE-501): what the propose verb does, as pb's help and the MCP tool say it (Voice signs). */
|
|
@@ -51,7 +75,7 @@ export declare const RESOLUTION_WORDS: {
|
|
|
51
75
|
readonly answerVerb: "answers a possible clash";
|
|
52
76
|
/** What the CLI and MCP match the gateway's answer refusal by: stable across QUE-540's pick (see CLASH). */
|
|
53
77
|
readonly answerMatch: "answers a possible ";
|
|
54
|
-
readonly tool: "List possible clashes; propose
|
|
78
|
+
readonly tool: "List possible clashes; propose; a person answers.";
|
|
55
79
|
/** TASK-1571 (TEN-6206): the answer verbs' help on the CLI and MCP, which the gateway now refuses for every caller (QUE-554). */
|
|
56
80
|
readonly answerHelp: "A key proposes; a person answers in Cortex.";
|
|
57
81
|
/** The list's header, one for the CLI and the MCP (DEC-2443): the open possible clashes, then the closed ones beside them when `closed` is given.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictResolution.d.ts","sourceRoot":"","sources":["../../src/lib/conflictResolution.ts"],"names":[],"mappings":"AAIA;
|
|
1
|
+
{"version":3,"file":"conflictResolution.d.ts","sourceRoot":"","sources":["../../src/lib/conflictResolution.ts"],"names":[],"mappings":"AAIA;;2BAE2B;AAC3B,eAAO,MAAM,oBAAoB,4DAA6D,CAAC;AAC/F,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvE,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,kBAC0B,CAAC;AAE1F;gIACgI;AAChI,eAAO,MAAM,2BAA2B,sBAAuB,CAAC;AAChE,oHAAoH;AACpH,eAAO,MAAM,2BAA2B,uEAAqE,CAAC;AAC9G,MAAM,MAAM,wBAAwB,GAAG,CAAC,OAAO,2BAA2B,CAAC,CAAC,MAAM,CAAC,CAAC;AACpF,gGAAgG;AAChG,eAAO,MAAM,eAAe,GAAI,QAAQ,wBAAwB,KAAG,kBAAgE,CAAC;AAEpI,oFAAoF;AACpF,eAAO,MAAM,oBAAoB,iCAA0E,CAAC;AAC5G,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,KAAG,OAAuE,CAAC;AACjI,6IAA6I;AAC7I,eAAO,MAAM,oBAAoB,sCAA+E,CAAC;AACjH,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AACvE,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,KAAG,MAAM,IAAI,kBAAkF,CAAC;AACtJ,mJAAmJ;AACnJ,eAAO,MAAM,iBAAiB;;;;;CAAoJ,CAAC;AACnL,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,EAAE,OAAO,MAAM,KAAG,MAAqG,CAAC;AAE9K,8CAA8C;AAC9C,eAAO,MAAM,8BAA8B,MAAM,CAAC;AAElD,wIAAwI;AACxI,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAA;CAAE,CAAC;AAC9D,eAAO,MAAM,MAAM,GAAI,MAAM,MAAM,KAAG,UAAgC,CAAC;AAEvE;;;;;iCAKiC;AACjC,eAAO,MAAM,KAAK;;;;;oBAE0D,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IACjG,4IAA4I;wBACtB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtJ,CAAC;AACX,iEAAiE;AACjE,eAAO,MAAM,SAAS,GAAI,GAAG,MAAM,EAAE,MAAM,MAAM,KAAG,MAA+G,CAAC;AACpK,2GAA2G;AAC3G,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,KAAG,MAAmC,CAAC;AAC7E,mDAAmD;AACnD,eAAO,MAAM,KAAK;;;CAA+H,CAAC;AAClJ,8HAA8H;AAC9H,eAAO,MAAM,UAAU,GAAI,GAAG,MAAM,EAAE,cAAY,WAA0E,CAAC;AAE7H,eAAO,MAAM,gBAAgB;;;;;;IAM5B,+HAA+H;gCAC5G,kBAAkB;IACrC,oHAAoH;;IAEpH;mGAC+F;;IAE/F,4GAA4G;;;IAG5G,iIAAiI;;IAEjI;0EACsE;gCACnD;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE,WAAW;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,OAAO,CAAA;KAAE;IAEtF,6HAA6H;;;IAG7H,mEAAmE;8BAClD,MAAM,GAAG,aAAa;IACvC,mGAAmG;kCAC9E,MAAM,GAAG,aAAa;CAElC,CAAC"}
|
|
@@ -1,10 +1,27 @@
|
|
|
1
1
|
// GENERATED by scripts/generate-mcp-embedded-copies.mjs from kernel/coherency/conflictResolution.ts.
|
|
2
2
|
// DO NOT EDIT. Run `npm run mcp:embedded-copies` to regenerate.
|
|
3
3
|
// Local runtime copy for the isolated connector build.
|
|
4
|
-
/** The
|
|
5
|
-
*
|
|
6
|
-
|
|
4
|
+
/** The four answers an owner gives a possible clash, in the order offered (TASK-711, DEC-2592 update first, KR-7; RULE-664; Voice signs):
|
|
5
|
+
* update the older entry, replace it, both stand, unrelated. Generated copies go to both connectors; the door-only lines are DOOR_WORDS
|
|
6
|
+
* in conflictFlags.ts. */
|
|
7
|
+
export const CONFLICT_RESOLUTIONS = ['update', 'replaces', 'both_stand', 'unrelated'];
|
|
7
8
|
export const isConflictResolution = (value) => typeof value === 'string' && CONFLICT_RESOLUTIONS.includes(value);
|
|
9
|
+
/** TASK-711: an answer stored before the four, read and taken at the doors for an older client, never offered or written again: the
|
|
10
|
+
* doors store it as update, and shownResolution shows a stored one as update. Its dated delete follows (DEC-1042 clause 5). */
|
|
11
|
+
export const LEGACY_CONFLICT_RESOLUTIONS = ['refines'];
|
|
12
|
+
/** Every value the stored field and the doors take: the four, then the legacy one (additive only, AGENTS.md §3). */
|
|
13
|
+
export const STORED_CONFLICT_RESOLUTIONS = [...CONFLICT_RESOLUTIONS, ...LEGACY_CONFLICT_RESOLUTIONS];
|
|
14
|
+
/** A stored answer as every surface shows it (DEC-2006's pattern: derived, never rewritten). */
|
|
15
|
+
export const shownResolution = (stored) => (stored === 'refines' ? 'update' : stored);
|
|
16
|
+
/** The answers that name the older entry; both stand and unrelated name neither. */
|
|
17
|
+
export const TARGETED_RESOLUTIONS = ['update', 'replaces'];
|
|
18
|
+
export const namesTarget = (choice) => TARGETED_RESOLUTIONS.includes(choice);
|
|
19
|
+
/** The answers that take a one-line reason and close the possible clash on the answer (QUE-570, DEC-1521 amended): both stand, unrelated. */
|
|
20
|
+
export const REASONED_RESOLUTIONS = ['both_stand', 'unrelated'];
|
|
21
|
+
export const needsReason = (choice) => REASONED_RESOLUTIONS.includes(choice);
|
|
22
|
+
/** The four answers as a person reads them (Voice signed, TASK-711): "Update <X>", "Replace <X>", "Both stand", "Unrelated", X the older entry. */
|
|
23
|
+
export const RESOLUTION_LABELS = { update: 'Update', replaces: 'Replace', both_stand: 'Both stand', unrelated: 'Unrelated' };
|
|
24
|
+
export const answerLabel = (choice, older) => (namesTarget(choice) ? `${RESOLUTION_LABELS[choice]} ${older}` : RESOLUTION_LABELS[choice]);
|
|
8
25
|
/** The longest unrelated reason, one line. */
|
|
9
26
|
export const CONFLICT_RESOLUTION_REASON_MAX = 200;
|
|
10
27
|
export const signed = (line) => line;
|
|
@@ -32,10 +49,10 @@ export const RESOLUTION_WORDS = {
|
|
|
32
49
|
choose: signed(`Choose ${CONFLICT_RESOLUTIONS.slice(0, -1).join(', ')} or ${CONFLICT_RESOLUTIONS[CONFLICT_RESOLUTIONS.length - 1]}.`),
|
|
33
50
|
both: signed('Give either the answer (real or false alarm) or the choice, not both.'),
|
|
34
51
|
reasonTooLong: signed(`Keep the reason to one line of ${CONFLICT_RESOLUTION_REASON_MAX} characters or fewer.`),
|
|
35
|
-
target: '
|
|
36
|
-
reason: `For
|
|
52
|
+
target: `${TARGETED_RESOLUTIONS.join(' or ')}: the entry to update or replace, one of the two`,
|
|
53
|
+
reason: `For ${REASONED_RESOLUTIONS.join(' or ')}: one line on why (${CONFLICT_RESOLUTION_REASON_MAX} characters at most); for an amendment: why the answer changes`,
|
|
37
54
|
/** The receipt an older backend's answer gets when it carries no line of its own (the MCP's fallback): the choice in words. */
|
|
38
|
-
recorded: (choice) => `Recorded: ${choice
|
|
55
|
+
recorded: (choice) => `Recorded: ${answerLabel(choice, 'the other entry')}.`,
|
|
39
56
|
/** TASK-1560 (QUE-518, QUE-501): what the propose verb does, as pb's help and the MCP tool say it (Voice signs). */
|
|
40
57
|
proposeHelp: `Propose the answer to a ${CLASH.one}; its owner confirms it`,
|
|
41
58
|
/** TASK-1571 (QUE-554, DEC-2299): what only a person does, as the person-only floor says it ("Only a person answers a possible
|
|
@@ -43,7 +60,7 @@ export const RESOLUTION_WORDS = {
|
|
|
43
60
|
answerVerb: `answers a ${CLASH.one}`,
|
|
44
61
|
/** What the CLI and MCP match the gateway's answer refusal by: stable across QUE-540's pick (see CLASH). */
|
|
45
62
|
answerMatch: 'answers a possible ',
|
|
46
|
-
tool: `List ${CLASH.many}; propose
|
|
63
|
+
tool: `List ${CLASH.many}; propose; a person answers.`, // the MCP tool's served description, short for the 64 KB budget (DEC-1981)
|
|
47
64
|
/** TASK-1571 (TEN-6206): the answer verbs' help on the CLI and MCP, which the gateway now refuses for every caller (QUE-554). */
|
|
48
65
|
answerHelp: 'A key proposes; a person answers in Cortex.',
|
|
49
66
|
/** The list's header, one for the CLI and the MCP (DEC-2443): the open possible clashes, then the closed ones beside them when `closed` is given.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflictResolution.js","sourceRoot":"","sources":["../../src/lib/conflictResolution.ts"],"names":[],"mappings":"AAAA,qGAAqG;AACrG,gEAAgE;AAChE,uDAAuD;AAEvD;
|
|
1
|
+
{"version":3,"file":"conflictResolution.js","sourceRoot":"","sources":["../../src/lib/conflictResolution.ts"],"names":[],"mappings":"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"}
|