@productbrain/cli 0.1.0-beta.1409 → 0.1.0-beta.14097

package/dist/commands/codex-prep.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-prep.js","sourceRoot":"","sources":["../../src/commands/codex-prep.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAA0B,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQvD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAyB;IAC1D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEjC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,QAAQ,CAAC,+BAA+B,EAAE;YAClD,IAAI,EAAE,SAAS,CAAC,iBAAiB;YACjC,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,yCAAyC;SACpD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,QAAQ,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,MAAM,UAAU,CAAoB,qBAAqB,EAAE;QAC5E,IAAI;QACJ,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;KACzC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAClD,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;AAChF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAuB,EAAE,IAAY;IAC1E,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"codex-prep.js","sourceRoot":"","sources":["../../src/commands/codex-prep.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAA0B,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQvD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAyB;IAC1D,MAAM,gBAAgB,EAAE,CAAC;IAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEjC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,QAAQ,CAAC,+BAA+B,EAAE;YAClD,IAAI,EAAE,SAAS,CAAC,iBAAiB;YACjC,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,yCAAyC;SACpD,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,IAAI,QAAQ,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,MAAM,UAAU,CAAkD,qBAAqB,EAAE;QAC1G,IAAI;QACJ,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU;KACzC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAClD,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IAC1D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;AAChF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAuB,EAAE,IAAY;IAC1E,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC"}

package/dist/commands/collections.d.ts

@@ -6,7 +6,7 @@
  * Subcommands:
  *   pb collections list         — table: slug, name, field count, icon
  *   pb collections get <slug>   — full collection detail
- *   pb collections audit        — health report: classification, icon, displayHints, schema gaps
+ *   pb collections audit        — health report: classification, displayHints, schema gaps
  */
 export declare function runCollectionsList(): Promise<void>;
 export declare function runCollectionsGet(options: {

package/dist/commands/collections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../src/commands/collections.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAcH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAwBxD;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBhF;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQzD;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ1D"}
+{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../src/commands/collections.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAeH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuBxD;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhF;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC,CAOzD;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAO1D"}

package/dist/commands/collections.js

@@ -6,7 +6,7 @@
  * Subcommands:
  *   pb collections list         — table: slug, name, field count, icon
  *   pb collections get <slug>   — full collection detail
- *   pb collections audit        — health report: classification, icon, displayHints, schema gaps
+ *   pb collections audit        — health report: classification, displayHints, schema gaps
  */
 import { getConfigOrGuide } from '../lib/config.js';
 import { kernelCall } from '../lib/client.js';
@@ -14,9 +14,7 @@ import { runCliCommand } from '../lib/runner.js';
 import { formatCollectionList, formatCollectionDescribe, formatCollectionAudit, } from '../formatters/collections.js';
 import { CLIError, ErrorCode } from '../lib/errors.js';
 export async function runCollectionsList() {
-    const config = await getConfigOrGuide(() => runCollectionsList());
-    if (!config)
-        return;
+    await getConfigOrGuide();
     await runCliCommand({
         fn: async () => {
             const rawCollections = await kernelCall('chain.listCollections', {});
@@ -33,9 +31,7 @@ export async function runCollectionsList() {
     });
 }
 export async function runCollectionsGet(options) {
-    const config = await getConfigOrGuide(() => runCollectionsGet(options));
-    if (!config)
-        return;
+    await getConfigOrGuide();
     await runCliCommand({
         fn: async () => {
             const result = await kernelCall('chain.getCollection', { slug: options.slug });
@@ -52,9 +48,7 @@ export async function runCollectionsGet(options) {
     });
 }
 export async function runCollectionsAudit() {
-    const config = await getConfigOrGuide(() => runCollectionsAudit());
-    if (!config)
-        return;
+    await getConfigOrGuide();
     await runCliCommand({
         fn: () => kernelCall('chain.auditCollections', {}),
         formatPretty: (result) => formatCollectionAudit(result),
@@ -66,9 +60,7 @@ export async function runCollectionsAudit() {
  * Admin only (enforced by the HTTP route).
  */
 export async function runCollectionsExport() {
-    const config = await getConfigOrGuide(() => runCollectionsExport());
-    if (!config)
-        return;
+    await getConfigOrGuide();
     await runCliCommand({
         fn: () => kernelCall('chain.exportDefinitions', {}),
         formatPretty: (result) => JSON.stringify(result, null, 2),

package/dist/commands/collections.js.map

@@ -1 +1 @@
-{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/commands/collections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../src/commands/collections.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,qBAAqB,GAGtB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,gBAAgB,EAAE,CAAC;IAEzB,MAAM,aAAa,CAAuB;QACxC,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,cAAc,GAAG,MAAM,UAAU,CAMnC,uBAAuB,EAAE,EAAE,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACrD,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,UAAU,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM;gBACnC,IAAI,EAAE,CAAC,CAAC,IAAI;aACb,CAAC,CAAC,CAAC;YACJ,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC;QACpD,CAAC;QACD,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC;KACvD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAyB;IAC/D,MAAM,gBAAgB,EAAE,CAAC;IAEzB,MAAM,aAAa,CAA0B;QAC3C,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,MAAM,GAAG,MAAM,UAAU,CAC7B,qBAAqB,EACrB,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CACvB,CAAC;YACF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,QAAQ,CAChB,eAAe,OAAO,CAAC,IAAI,cAAc,EACzC;oBACE,IAAI,EAAE,SAAS,CAAC,iBAAiB;oBACjC,QAAQ,EAAE,YAAY;oBACtB,QAAQ,EAAE,yDAAyD;iBACpE,CACF,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;KAC3D,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,MAAM,gBAAgB,EAAE,CAAC;IAEzB,MAAM,aAAa,CAAwB;QACzC,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,CAAqD,wBAAwB,EAAE,EAAE,CAAC;QACtG,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,MAAM,gBAAgB,EAAE,CAAC;IAEzB,MAAM,aAAa,CAA4B;QAC7C,EAAE,EAAE,GAAG,EAAE,CAAC,UAAU,CAA4B,yBAAyB,EAAE,EAAE,CAAC;QAC9E,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;KAC1D,CAAC,CAAC;AACL,CAAC"}

package/dist/commands/conflicts.d.ts

@@ -0,0 +1,47 @@
+import { Command } from 'commander';
+/**
+ * C2 (WP-468/FEAT-1407, DEC-1491): `pb conflicts list` now defaults to the ACTIONABLE view
+ * (open, unverdicted, unsnoozed) — the shared actionable-predicate helper
+ * (convex/agentKnowledge/conflictQueue.ts's isActionableConflictIssue). `--all` requests the
+ * full open debt pile server-side (verdicted + snoozed rows included, with per-row guidance
+ * text). `--status open` is the PRE-C2 flag, kept as a back-compat ALIAS for `--all` — review
+ * finding (PR #528 P2): the option no longer carries a Commander default, so `options.status`
+ * is `undefined` when the flag is omitted and `'open'` only when a caller EXPLICITLY passes it
+ * (an omitted flag and an explicit `--status open` must not collapse to the same value, or the
+ * alias can never be told apart from silence, ST22).
+ */
+export declare function runConflictsList(options: {
+    status?: string;
+    all?: boolean;
+}): Promise<void>;
+export declare function runConflictsResolve(issueId: string, options: {
+    verdict?: string;
+    as?: string;
+    target?: string;
+    reason?: string;
+}): Promise<void>;
+/** TASK-1560 (QUE-518, DEC-2454 addendum): `pb conflicts propose <id> --as <choice>` records an agent's answer on the row; the owner
+ *  confirms it. The kernel checks it as it checks an answer and words the receipt. */
+export declare function runConflictsPropose(issueId: string, options: {
+    as?: string;
+    target?: string;
+    reason?: string;
+}): Promise<void>;
+export declare function runConflictsSummary(options: Record<string, never>): Promise<void>;
+/** `pb conflicts snooze <id> --until <days> --reason "<why>"` — bounded, logged debt (Q6,
+ *  DEC-1491). Never an ack: it does not touch humanVerdict/status. */
+export declare function runConflictsSnooze(issueId: string, options: {
+    until: string;
+    reason: string;
+}): Promise<void>;
+/** `pb conflicts reverdict <id> --verdict real|noise --reason "<why>"` — a logged amendment
+ *  to an already-verdicted row (point 3). The double-verdict guard on `resolve` still blocks
+ *  a SILENT re-verdict; this is the explicit, reasoned exception. */
+export declare function runConflictsReverdict(issueId: string, options: {
+    verdict?: string;
+    as?: string;
+    target?: string;
+    reason: string;
+}): Promise<void>;
+export declare function createConflictsCommand(): Command;
+//# sourceMappingURL=conflicts.d.ts.map

package/dist/commands/conflicts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/commands/conflicts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwCpC;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBjG;AAgCD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCtJ;AAED;sFACsF;AACtF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CASpI;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAMvF;AAID;sEACsE;AACtE,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;qEAEqE;AACrE,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC1E,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED,wBAAgB,sBAAsB,IAAI,OAAO,CA6ChD"}

package/dist/commands/conflicts.js

@@ -0,0 +1,241 @@
+import { Command } from 'commander';
+import { getConfigOrGuide } from '../lib/config.js';
+import { kernelCall, kernelCallWithSession } from '../lib/client.js';
+import { CLIError, ErrorCode } from '../lib/errors.js';
+import { runCliCommand } from '../lib/runner.js';
+import { readSession } from '../lib/session.js';
+import { copy } from '../lib/style.js';
+import { formatConflictsList, formatConflictResolve, formatConflictsSummary, formatConflictSnooze, formatConflictReverdict, } from '../formatters/conflicts.js';
+import { CLASH, CONFLICT_RESOLUTIONS, RESOLUTION_WORDS, isConflictResolution } from '../lib/conflictResolution.js';
+/**
+ * `pb conflicts` — agent/CLI reachability for the human/agent conflict-verdict loop
+ * (TEN-2744, WP-499 Slice A). Structurally mirrors packages/cli/src/commands/feedback.ts:
+ * `list`/`summary` are plain reads (kernelCall, no session), `resolve` is a workspace
+ * write that is session-attributed (kernelCallWithSession + a requireTriageSession-style
+ * gate), same shape as feedback's note/group/status verbs.
+ */
+function requireConflictsSession() {
+    const session = readSession();
+    if (!session) {
+        throw new CLIError(copy.noSession, {
+            code: ErrorCode.SESSION_REQUIRED,
+            category: 'session',
+            guidance: copy.noSessionGuidance,
+        });
+    }
+    return session;
+}
+const SUPPORTED_LIST_STATUS = 'open';
+/**
+ * C2 (WP-468/FEAT-1407, DEC-1491): `pb conflicts list` now defaults to the ACTIONABLE view
+ * (open, unverdicted, unsnoozed) — the shared actionable-predicate helper
+ * (convex/agentKnowledge/conflictQueue.ts's isActionableConflictIssue). `--all` requests the
+ * full open debt pile server-side (verdicted + snoozed rows included, with per-row guidance
+ * text). `--status open` is the PRE-C2 flag, kept as a back-compat ALIAS for `--all` — review
+ * finding (PR #528 P2): the option no longer carries a Commander default, so `options.status`
+ * is `undefined` when the flag is omitted and `'open'` only when a caller EXPLICITLY passes it
+ * (an omitted flag and an explicit `--status open` must not collapse to the same value, or the
+ * alias can never be told apart from silence, ST22).
+ */
+export async function runConflictsList(options) {
+    if (options.status !== undefined && options.status !== SUPPORTED_LIST_STATUS) {
+        throw new CLIError(`Only --status open is supported today (got "${options.status}").`, {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: `Use --all to list the open ${CLASH.many} and the latest closed ones.`,
+        });
+    }
+    await getConfigOrGuide();
+    // --all OR an explicitly-passed --status open both mean "the full debt pile" (legacy alias).
+    const mode = options.all || options.status === SUPPORTED_LIST_STATUS ? 'all' : 'actionable';
+    await runCliCommand({
+        fn: async () => (await kernelCall('conflicts.list', { mode })),
+        formatPretty: (value) => formatConflictsList(value, { mode }),
+    });
+}
+const VERDICT_ALIASES = {
+    real: 'real',
+    noise: 'false_alarm',
+};
+/** TASK-1361 (KR-7): `--as replaces|refines|unrelated` with `--target` or `--reason`; the kernel checks both. */
+function choiceArgs(options) {
+    if (options.as === undefined)
+        return null;
+    if (options.verdict !== undefined)
+        throw validation(RESOLUTION_WORDS.both);
+    if (!isConflictResolution(options.as))
+        throw validation(RESOLUTION_WORDS.choose);
+    return { resolution: options.as, ...(options.target ? { resolutionTarget: options.target } : {}), ...(options.reason ? { resolutionReason: options.reason } : {}) };
+}
+function validation(message) {
+    return new CLIError(message, { code: ErrorCode.VALIDATION_FAILED, category: 'validation', guidance: `pb conflicts propose <id> --as ${CONFLICT_RESOLUTIONS.join('|')}` });
+}
+/** TASK-1571 (QUE-554, DEC-2299): answering a possible clash is person-only, so the gateway refuses every caller with the floor's
+ *  sentence (who decides, where to open it); the CLI adds the agent's own next step, its propose command. */
+const proposeInstead = (issueId) => (err) => {
+    if (err instanceof Error && err.message.includes(RESOLUTION_WORDS.answerMatch)) { // stable across QUE-540's pick
+        throw new CLIError(err.message, { code: ErrorCode.VALIDATION_FAILED, category: 'validation',
+            guidance: `pb conflicts propose ${issueId} --as ${CONFLICT_RESOLUTIONS.join('|')}` });
+    }
+    throw err;
+};
+const lineOf = (value) => value && typeof value === 'object' && typeof value.line === 'string' ? value.line : null;
+export async function runConflictsResolve(issueId, options) {
+    const choice = choiceArgs(options);
+    if (choice) {
+        await getConfigOrGuide();
+        requireConflictsSession();
+        await runCliCommand({
+            fn: () => kernelCallWithSession('conflicts.resolve', { issueId, ...choice }).catch(proposeInstead(issueId)),
+            formatPretty: (value) => lineOf(value) ?? JSON.stringify(value, null, 2),
+        });
+        return;
+    }
+    if (options.verdict === undefined)
+        throw validation(RESOLUTION_WORDS.choose);
+    const verdict = VERDICT_ALIASES[options.verdict];
+    if (!verdict) {
+        throw new CLIError(`--verdict must be "real" or "noise" (got "${options.verdict}").`, {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: `"noise" means the ${CLASH.one} is a false alarm.`,
+        });
+    }
+    await getConfigOrGuide();
+    // Client-side session gate only (matches requireTriageSession's discipline) — identity
+    // for the write itself is gateway-derived (workspaceId/personId/apiKeyId injection,
+    // resolveConflictIssueFromGateway), never sessionId. kernelCallWithSession touches the
+    // session TTL internally via its own readSession() call after a successful write; it
+    // does not need (and resolveConflictIssueFromGateway's validator does not declare)
+    // sessionId as a wire argument.
+    requireConflictsSession();
+    await runCliCommand({
+        fn: () => kernelCallWithSession('conflicts.resolve', {
+            issueId,
+            verdict,
+        }).catch(proposeInstead(issueId)),
+        formatPretty: (value) => formatConflictResolve(value, verdict),
+    });
+}
+/** TASK-1560 (QUE-518, DEC-2454 addendum): `pb conflicts propose <id> --as <choice>` records an agent's answer on the row; the owner
+ *  confirms it. The kernel checks it as it checks an answer and words the receipt. */
+export async function runConflictsPropose(issueId, options) {
+    const choice = choiceArgs(options);
+    if (!choice)
+        throw validation(RESOLUTION_WORDS.choose);
+    await getConfigOrGuide();
+    const session = requireConflictsSession();
+    await runCliCommand({
+        fn: () => kernelCallWithSession('conflicts.propose', { issueId, ...choice, sessionId: session.sessionId }),
+        formatPretty: (value) => lineOf(value) ?? JSON.stringify(value, null, 2),
+    });
+}
+export async function runConflictsSummary(options) {
+    await getConfigOrGuide();
+    await runCliCommand({
+        fn: () => kernelCall('conflicts.summary', {}),
+        formatPretty: (value) => formatConflictsSummary(value),
+    });
+}
+const MAX_SNOOZE_DAYS = 14;
+/** `pb conflicts snooze <id> --until <days> --reason "<why>"` — bounded, logged debt (Q6,
+ *  DEC-1491). Never an ack: it does not touch humanVerdict/status. */
+export async function runConflictsSnooze(issueId, options) {
+    const untilDays = Number(options.until);
+    if (!Number.isFinite(untilDays) || untilDays < 1 || untilDays > MAX_SNOOZE_DAYS) {
+        throw new CLIError(`--until must be a number of days between 1 and ${MAX_SNOOZE_DAYS} (got "${options.until}").`, {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: `Snoozes are bounded to ${MAX_SNOOZE_DAYS} days — logged debt, never an ack.`,
+        });
+    }
+    if (!options.reason?.trim()) {
+        throw new CLIError('--reason is required — a snooze is logged debt, not a silent dismissal.', {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: 'Pass --reason "<why you are deferring this>".',
+        });
+    }
+    await getConfigOrGuide();
+    requireConflictsSession();
+    await runCliCommand({
+        fn: () => kernelCallWithSession('conflicts.snooze', {
+            issueId,
+            untilDays,
+            reason: options.reason,
+        }),
+        formatPretty: (value) => formatConflictSnooze(value),
+    });
+}
+/** `pb conflicts reverdict <id> --verdict real|noise --reason "<why>"` — a logged amendment
+ *  to an already-verdicted row (point 3). The double-verdict guard on `resolve` still blocks
+ *  a SILENT re-verdict; this is the explicit, reasoned exception. */
+export async function runConflictsReverdict(issueId, options) {
+    // TASK-1361: --as amends the choice; an unrelated choice keeps --reason as its one-line reason (the kernel says so).
+    const choice = choiceArgs({ as: options.as, target: options.target, verdict: options.verdict });
+    const verdict = choice ? undefined : VERDICT_ALIASES[options.verdict ?? ''];
+    if (!choice && !verdict) {
+        throw new CLIError(`--verdict must be "real" or "noise" (got "${options.verdict}").`, {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: `"noise" means the ${CLASH.one} is a false alarm.`,
+        });
+    }
+    if (!options.reason?.trim()) {
+        throw new CLIError('--reason is required — an amendment is logged, not a silent overwrite.', {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: 'Pass --reason "<why you are amending the earlier answer>".',
+        });
+    }
+    await getConfigOrGuide();
+    requireConflictsSession();
+    await runCliCommand({
+        fn: () => kernelCallWithSession('conflicts.reverdict', {
+            issueId,
+            ...(choice ?? { verdict }),
+            reason: options.reason,
+        }).catch(proposeInstead(issueId)),
+        formatPretty: (value) => lineOf(value) ?? formatConflictReverdict(value, verdict ?? 'real'),
+    });
+}
+export function createConflictsCommand() {
+    const command = new Command('conflicts').description(`List ${CLASH.many} and propose answers`);
+    command.command('list')
+        .description(`List ${CLASH.many} for this workspace (default: open, unanswered, unsnoozed)`)
+        // No default value: an OMITTED --status must read as undefined, distinct from an
+        // EXPLICITLY passed "--status open" (the legacy alias) — see runConflictsList's doc comment.
+        .option('--status <status>', 'Older form: "open" does the same as --all')
+        .option('--all', `Also list answered and snoozed ${CLASH.many}, and the latest closed ones with who answered and how`)
+        .action(runConflictsList);
+    command.command('resolve <issue-id>')
+        .description(RESOLUTION_WORDS.answerHelp)
+        .option('--as <choice>', CONFLICT_RESOLUTIONS.join(', '))
+        .option('--target <entry-id>', RESOLUTION_WORDS.target)
+        .option('--reason <reason>', RESOLUTION_WORDS.reason)
+        .option('--verdict <verdict>', 'Older form: real or noise')
+        .action(runConflictsResolve);
+    command.command('propose <issue-id>')
+        .description(RESOLUTION_WORDS.proposeHelp)
+        .requiredOption('--as <choice>', CONFLICT_RESOLUTIONS.join(', '))
+        .option('--target <entry-id>', RESOLUTION_WORDS.target)
+        .option('--reason <reason>', RESOLUTION_WORDS.reason)
+        .action(runConflictsPropose);
+    command.command('reverdict <issue-id>')
+        .description(RESOLUTION_WORDS.answerHelp)
+        .option('--as <choice>', CONFLICT_RESOLUTIONS.join(', '))
+        .option('--target <entry-id>', RESOLUTION_WORDS.target)
+        .option('--verdict <verdict>', 'Older form: real or noise')
+        .requiredOption('--reason <reason>', RESOLUTION_WORDS.reason)
+        .action(runConflictsReverdict);
+    command.command('snooze <issue-id>')
+        .description(`Defer an unanswered ${CLASH.one}, or one answered as real, for up to ${MAX_SNOOZE_DAYS} days; it is logged, never a dismissal`)
+        .requiredOption('--until <days>', `Days to snooze for (1-${MAX_SNOOZE_DAYS})`)
+        .requiredOption('--reason <reason>', 'Why you are deferring this')
+        .action(runConflictsSnooze);
+    command.command('summary')
+        .description(`Read how many ${CLASH.many} were answered as real or as a false alarm, and the confidence bar for human answers`)
+        .action(runConflictsSummary);
+    return command;
+}
+//# sourceMappingURL=conflicts.js.map

package/dist/commands/conflicts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/commands/conflicts.ts"],"names":[],"mappings":"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"}

package/dist/commands/conflicts.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=conflicts.test.d.ts.map

package/dist/commands/conflicts.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflicts.test.d.ts","sourceRoot":"","sources":["../../src/commands/conflicts.test.ts"],"names":[],"mappings":""}