@kawacode/mcp 6.1.5 → 6.6.1

package/build/tools/get-relevant-context.js.map

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

package/build/tools/get-resolution-context.d.ts

@@ -0,0 +1,154 @@
+import { z } from 'zod';
+/**
+ * Thin proxy to Muninn's `pre-edit-check:resolution-context` handler (Layer C,
+ * Phase 2 — proactive pre-edit conflict resolution).
+ *
+ * Two-call protocol:
+ *   1. DETECT (cheap, once per turn) — the Stop hook surfaces a live-HAI
+ *      collision report (per-peer `uid` + overlapping file ranges) when a peer
+ *      is editing the same lines this turn. (Detection was relocated off the
+ *      per-edit pre_edit_decision_check to the Stop hook —
+ *      COLLISION_SURFACE_RELOCATION.md.)
+ *   2. RESOLVE (expensive, opt-in) — for a peer surfaced in that report, call
+ *      THIS tool with their `uid` + ranges. Muninn decrypts the peer's
+ *      overlapping diff (it holds the repo key; the API only stores ciphertext)
+ *      and returns it + the file's recorded decisions + a guardrail policy, so
+ *      you can adapt.
+ *
+ * All assembly + the encryption boundary live in Muninn. This tool only
+ * validates input, resolves the origin, and forwards the request.
+ */
+export declare const getResolutionContextSchema: z.ZodObject<{
+    forkAuthor: z.ZodOptional<z.ZodObject<{
+        platform: z.ZodEnum<["github", "gitlab"]>;
+        user: z.ZodString;
+        forkOrigin: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    }, {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    }>>;
+    workspaceId: z.ZodOptional<z.ZodString>;
+    repoOrigin: z.ZodOptional<z.ZodString>;
+    repoPath: z.ZodString;
+    peerUid: z.ZodString;
+    filePath: z.ZodString;
+    ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+    intentId: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    repoPath: string;
+    filePath: string;
+    peerUid: string;
+    ranges: number[][];
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    intentId?: string | undefined;
+}, {
+    repoPath: string;
+    filePath: string;
+    peerUid: string;
+    ranges: number[][];
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    intentId?: string | undefined;
+}>;
+export type GetResolutionContextInput = z.infer<typeof getResolutionContextSchema>;
+export interface ResolutionRangeSnippet {
+    range: number[];
+    lines: string[];
+}
+export interface ResolutionGuardrail {
+    triggerConfidence: number;
+    rule_committed: string;
+    reversibility: string;
+    mustRecord: string;
+    weidner: string;
+}
+export interface GetResolutionContextResponse {
+    peer: {
+        uid: string;
+        label: string;
+        sha?: string;
+    };
+    filePath: string;
+    ranges: number[][];
+    baselineSha?: string;
+    /** True when the peer's live diff for this file was found and decrypted. */
+    peerDiffAvailable: boolean;
+    /** The peer's reconstructed code at each overlapping range. */
+    peerSnippet: ResolutionRangeSnippet[];
+    /** File-scoped recorded decisions (region context; not peer-uid filtered). */
+    decisions: any[];
+    /** Deferred until an intents-by-file endpoint exists (see `note`). */
+    peerIntents: any[];
+    note?: string;
+    guardrail: ResolutionGuardrail;
+}
+export declare function getResolutionContext(input: GetResolutionContextInput): Promise<GetResolutionContextResponse>;
+export declare const getResolutionContextTool: {
+    name: string;
+    description: string;
+    inputSchema: z.ZodObject<{
+        forkAuthor: z.ZodOptional<z.ZodObject<{
+            platform: z.ZodEnum<["github", "gitlab"]>;
+            user: z.ZodString;
+            forkOrigin: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }>>;
+        workspaceId: z.ZodOptional<z.ZodString>;
+        repoOrigin: z.ZodOptional<z.ZodString>;
+        repoPath: z.ZodString;
+        peerUid: z.ZodString;
+        filePath: z.ZodString;
+        ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+        intentId: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        repoPath: string;
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }, {
+        repoPath: string;
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }>;
+    handler: typeof getResolutionContext;
+};

package/build/tools/get-resolution-context.js

@@ -0,0 +1,78 @@
+import { z } from 'zod';
+import { request } from '../services/muninn-ipc.js';
+import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.js';
+/**
+ * Thin proxy to Muninn's `pre-edit-check:resolution-context` handler (Layer C,
+ * Phase 2 — proactive pre-edit conflict resolution).
+ *
+ * Two-call protocol:
+ *   1. DETECT (cheap, once per turn) — the Stop hook surfaces a live-HAI
+ *      collision report (per-peer `uid` + overlapping file ranges) when a peer
+ *      is editing the same lines this turn. (Detection was relocated off the
+ *      per-edit pre_edit_decision_check to the Stop hook —
+ *      COLLISION_SURFACE_RELOCATION.md.)
+ *   2. RESOLVE (expensive, opt-in) — for a peer surfaced in that report, call
+ *      THIS tool with their `uid` + ranges. Muninn decrypts the peer's
+ *      overlapping diff (it holds the repo key; the API only stores ciphertext)
+ *      and returns it + the file's recorded decisions + a guardrail policy, so
+ *      you can adapt.
+ *
+ * All assembly + the encryption boundary live in Muninn. This tool only
+ * validates input, resolves the origin, and forwards the request.
+ */
+export const getResolutionContextSchema = z.object({
+    repoOrigin: z
+        .string()
+        .optional()
+        .describe('Git remote origin URL. Auto-detected from repoPath via git if not provided.'),
+    repoPath: z
+        .string()
+        .describe('Local path to the repository root'),
+    peerUid: z
+        .string()
+        .describe('The peer HAI whose live edits overlap — the `uid` of a collision from the Stop hook collision report.'),
+    filePath: z
+        .string()
+        .describe('Path to the file being edited (relative to repoPath)'),
+    ranges: z
+        .array(z.array(z.number()))
+        .describe('Overlapping [start, end] line ranges (from the collision) to fetch the peer code for.'),
+    intentId: z
+        .string()
+        .optional()
+        .describe('Active intent ID (advisory). Auto-detected by Kawa Code when omitted.'),
+    ...forkFieldsExtensions,
+});
+export async function getResolutionContext(input) {
+    const repoOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    const forkFields = extractForkFields(input);
+    const res = await request('pre-edit-check', 'resolution-context', {
+        repoOrigin,
+        repoPath: input.repoPath,
+        peerUid: input.peerUid,
+        filePath: input.filePath,
+        ranges: input.ranges,
+        intentId: input.intentId,
+        ...forkFields,
+    });
+    return res;
+}
+export const getResolutionContextTool = {
+    name: 'get_resolution_context',
+    description: `Resolve a live code collision with a peer BEFORE you write (Layer C resolution handoff).
+
+Call this when the Stop hook's collision report (or complete_intent's resolution_required gate) surfaced a live peer (a teammate or AI agent editing the same lines). Pass that collision's uid as peerUid and its overlapping ranges. You get back:
+- peerSnippet — the peer's actual (decrypted) code at the overlapping lines, so you can see what they wrote.
+- decisions — recorded reasoning attached to this file (region context).
+- guardrail — the policy you must follow when resolving:
+  • Never overwrite a peer's COMMITTED work — yield or merge. Only override an uncommitted live diff, and only with a recorded rationale.
+  • Your resolution is an ordinary git edit (revert/diff is the undo) — stay in your own working tree; build no bespoke undo.
+  • Before completing, record_decision(type=fork|tradeoff, …) explaining how you resolved (and supersedes the peer's decision if you overrode it).
+  • Choose or synthesize ONE coherent result — never blindly interleave both diffs.
+
+This is advisory and proactive (no lock). Use it to adapt your edit and avoid the conflict.`,
+    inputSchema: getResolutionContextSchema,
+    handler: getResolutionContext,
+};
+//# sourceMappingURL=get-resolution-context.js.map

package/build/tools/get-resolution-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-resolution-context.js","sourceRoot":"","sources":["../../src/tools/get-resolution-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE3E;;;;;;;;;;;;;;;;;;GAkBG;AAEH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IACjD,UAAU,EAAE,CAAC;SACV,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6EAA6E,CAAC;IAC1F,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,CAAC,mCAAmC,CAAC;IAChD,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,CAAC,uGAAuG,CAAC;IACpH,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,CAAC,sDAAsD,CAAC;IACnE,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SAC1B,QAAQ,CAAC,uFAAuF,CAAC;IACpG,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,uEAAuE,CAAC;IACpF,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAkCF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,KAAgC;IAEhC,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAClE,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;IAE3C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,gBAAgB,EAAE,oBAAoB,EAAE;QAChE,UAAU;QACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,UAAU;KACd,CAAC,CAAA;IAEF,OAAO,GAAmC,CAAA;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE;;;;;;;;;;;4FAW6E;IAC1F,WAAW,EAAE,0BAA0B;IACvC,OAAO,EAAE,oBAAoB;CAC9B,CAAA"}

package/build/tools/get-session-decisions.d.ts

@@ -49,11 +49,6 @@ export interface DecisionPoint {
     timestamp: string;
     type: 'fork' | 'abandoned' | 'discovery' | 'constraint' | 'tradeoff' | 'dependency';
     summary: string;
-    rationale: string;
-    context?: string;
-    alternatives: string[];
-    consequences?: string;
-    symptom?: string;
     relatedFiles: string[];
     constraintsChecked: string[];
     constraintViolations: ConstraintViolation[];

package/build/tools/get-session-decisions.js

@@ -20,10 +20,10 @@ export async function getSessionDecisions(input) {
         timestamp: d.timestamp || d.created_at || d.createdAt || '',
         type: d.decision_type || d.decisionType || d.type,
         summary: d.summary || '',
-        rationale: d.rationale || '',
-        context: d.context,
-        alternatives: d.alternatives || [],
-        consequences: d.consequences,
+        // Lean payload (INTENT_INTELLIGENCE.md §5.8): unbounded free-text fields
+        // (rationale/context/consequences/alternatives/symptom) are dropped from this
+        // recall surface. Fetch them on demand via get_decision_detail(decisionId).
+        // appliesWhen is retained — it is short, high-signal, and excluded from embeddings.
         relatedFiles: d.related_files || d.relatedFiles || [],
         constraintsChecked: d.constraints_checked || d.constraintsChecked || [],
         constraintViolations: d.constraint_violations || d.constraintViolations || [],
@@ -45,7 +45,7 @@ Decisions are presented for user review and can be edited or removed before bein
 
 Returns:
 - intentId: The intent these decisions belong to
-- decisions: Array of decision points with full details
+- decisions: Array of decision points (summary-only — call get_decision_detail(decisionId) for full rationale/context/consequences/alternatives)
 - count: Number of decisions recorded`,
     inputSchema: getSessionDecisionsSchema,
     handler: getSessionDecisions

package/build/tools/get-session-decisions.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-session-decisions.js","sourceRoot":"","sources":["../../src/tools/get-session-decisions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE3E,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6EAA6E,CAAC;IACzH,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAClE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,oCAAoC,CAAC;IACnE,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAiCF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAA+B;IACvE,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IACpE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE;QAC5C,UAAU,EAAE,YAAY;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IAEF,MAAM,SAAS,GAAoB,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QACxE,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE;QACxD,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE;QAC3D,IAAI,EAAE,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,IAAI;QACjD,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE;QACxB,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,EAAE;QAC5B,OAAO,EAAE,CAAC,CAAC,OAAO;QAClB,YAAY,EAAE,CAAC,CAAC,YAAY,IAAI,EAAE;QAClC,YAAY,EAAE,CAAC,CAAC,YAAY;QAC5B,YAAY,EAAE,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,YAAY,IAAI,EAAE;QACrD,kBAAkB,EAAE,CAAC,CAAC,mBAAmB,IAAI,CAAC,CAAC,kBAAkB,IAAI,EAAE;QACvE,oBAAoB,EAAE,CAAC,CAAC,qBAAqB,IAAI,CAAC,CAAC,oBAAoB,IAAI,EAAE;QAC7E,WAAW,EAAE,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,EAAE,IAAI,SAAS;KAClE,CAAC,CAAC,CAAA;IAEH,OAAO;QACL,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,SAAS,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC3B,SAAS;QACT,KAAK,EAAE,SAAS,CAAC,MAAM;KACxB,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE;;;;;;;;sCAQuB;IACpC,WAAW,EAAE,yBAAyB;IACtC,OAAO,EAAE,mBAAmB;CAC7B,CAAA"}
+{"version":3,"file":"get-session-decisions.js","sourceRoot":"","sources":["../../src/tools/get-session-decisions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE3E,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,6EAA6E,CAAC;IACzH,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAClE,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,oCAAoC,CAAC;IACnE,GAAG,oBAAoB;CACxB,CAAC,CAAA;AA4BF,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAA+B;IACvE,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IACpE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE;QAC5C,UAAU,EAAE,YAAY;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IAEF,MAAM,SAAS,GAAoB,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;QACxE,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE;QACxD,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE;QAC3D,IAAI,EAAE,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,IAAI;QACjD,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE;QACxB,yEAAyE;QACzE,8EAA8E;QAC9E,4EAA4E;QAC5E,oFAAoF;QACpF,YAAY,EAAE,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,YAAY,IAAI,EAAE;QACrD,kBAAkB,EAAE,CAAC,CAAC,mBAAmB,IAAI,CAAC,CAAC,kBAAkB,IAAI,EAAE;QACvE,oBAAoB,EAAE,CAAC,CAAC,qBAAqB,IAAI,CAAC,CAAC,oBAAoB,IAAI,EAAE;QAC7E,WAAW,EAAE,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,EAAE,IAAI,SAAS;KAClE,CAAC,CAAC,CAAA;IAEH,OAAO;QACL,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,SAAS,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;QAC3B,SAAS;QACT,KAAK,EAAE,SAAS,CAAC,MAAM;KACxB,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE;;;;;;;;sCAQuB;IACpC,WAAW,EAAE,yBAAyB;IACtC,OAAO,EAAE,mBAAmB;CAC7B,CAAA"}

package/build/tools/index.d.ts

@@ -12,6 +12,7 @@ import { logWorkTool, logWork, logWorkSchema } from './log-work.js';
 import { recordDecisionTool, recordDecision, recordDecisionSchema } from './record-decision.js';
 import { getSessionDecisionsTool, getSessionDecisions, getSessionDecisionsSchema } from './get-session-decisions.js';
 import { getProjectDecisionsTool, getProjectDecisions, getProjectDecisionsSchema } from './get-project-decisions.js';
+import { getDecisionDetailTool, getDecisionDetail, getDecisionDetailSchema } from './get-decision-detail.js';
 import { editSessionDecisionTool, editSessionDecision, editSessionDecisionSchema } from './edit-session-decision.js';
 import { detectIntentConflictsTool, detectIntentConflicts, detectIntentConflictsSchema } from './detect-intent-conflicts.js';
 import { inferHistoryTool, inferHistory, inferHistorySchema } from './infer-history.js';
@@ -19,7 +20,10 @@ import { evolveDecisionsTool, evolveDecisions, evolveDecisionsSchema } from './e
 import { updateFeaturesTool, updateFeatures, updateFeaturesSchema } from './update-features.js';
 import { preEditDecisionCheckTool, preEditDecisionCheck, preEditDecisionCheckSchema } from './pre-edit-decision-check.js';
 import { preEditAcknowledgeTool, preEditAcknowledge, preEditAcknowledgeSchema } from './pre-edit-acknowledge.js';
-export { getRelevantContextTool, getRelevantContext, getRelevantContextSchema, checkActiveIntentTool, checkActiveIntent, checkActiveIntentSchema, createAndActivateIntentTool, createAndActivateIntent, createAndActivateIntentSchema, activateIntentTool, activateIntent, activateIntentSchema, getIntentsForFileTool, getIntentsForFile, getIntentsForFileSchema, getIntentsForLinesTool, getIntentsForLines, getIntentsForLinesSchema, listTeamIntentsTool, listTeamIntents, listTeamIntentsSchema, getIntentChangesTool, getIntentChanges, getIntentChangesSchema, completeIntentTool, completeIntent, completeIntentSchema, updateIntentTool, updateIntent, updateIntentSchema, logWorkTool, logWork, logWorkSchema, recordDecisionTool, recordDecision, recordDecisionSchema, getSessionDecisionsTool, getSessionDecisions, getSessionDecisionsSchema, getProjectDecisionsTool, getProjectDecisions, getProjectDecisionsSchema, editSessionDecisionTool, editSessionDecision, editSessionDecisionSchema, detectIntentConflictsTool, detectIntentConflicts, detectIntentConflictsSchema, inferHistoryTool, inferHistory, inferHistorySchema, evolveDecisionsTool, evolveDecisions, evolveDecisionsSchema, updateFeaturesTool, updateFeatures, updateFeaturesSchema, preEditDecisionCheckTool, preEditDecisionCheck, preEditDecisionCheckSchema, preEditAcknowledgeTool, preEditAcknowledge, preEditAcknowledgeSchema };
+import { getResolutionContextTool, getResolutionContext, getResolutionContextSchema } from './get-resolution-context.js';
+import { arbiterResolveTool, arbiterResolve, arbiterResolveSchema } from './arbiter-resolve.js';
+import { arbiterApplyTool, arbiterApply, arbiterApplySchema } from './arbiter-apply.js';
+export { getRelevantContextTool, getRelevantContext, getRelevantContextSchema, checkActiveIntentTool, checkActiveIntent, checkActiveIntentSchema, createAndActivateIntentTool, createAndActivateIntent, createAndActivateIntentSchema, activateIntentTool, activateIntent, activateIntentSchema, getIntentsForFileTool, getIntentsForFile, getIntentsForFileSchema, getIntentsForLinesTool, getIntentsForLines, getIntentsForLinesSchema, listTeamIntentsTool, listTeamIntents, listTeamIntentsSchema, getIntentChangesTool, getIntentChanges, getIntentChangesSchema, completeIntentTool, completeIntent, completeIntentSchema, updateIntentTool, updateIntent, updateIntentSchema, logWorkTool, logWork, logWorkSchema, recordDecisionTool, recordDecision, recordDecisionSchema, getSessionDecisionsTool, getSessionDecisions, getSessionDecisionsSchema, getProjectDecisionsTool, getProjectDecisions, getProjectDecisionsSchema, getDecisionDetailTool, getDecisionDetail, getDecisionDetailSchema, editSessionDecisionTool, editSessionDecision, editSessionDecisionSchema, detectIntentConflictsTool, detectIntentConflicts, detectIntentConflictsSchema, inferHistoryTool, inferHistory, inferHistorySchema, evolveDecisionsTool, evolveDecisions, evolveDecisionsSchema, updateFeaturesTool, updateFeatures, updateFeaturesSchema, preEditDecisionCheckTool, preEditDecisionCheck, preEditDecisionCheckSchema, preEditAcknowledgeTool, preEditAcknowledge, preEditAcknowledgeSchema, getResolutionContextTool, getResolutionContext, getResolutionContextSchema, arbiterResolveTool, arbiterResolve, arbiterResolveSchema, arbiterApplyTool, arbiterApply, arbiterApplySchema };
 export declare const allTools: ({
     name: string;
     description: string;
@@ -191,10 +195,8 @@ export declare const allTools: ({
         repoOrigin: import("zod").ZodOptional<import("zod").ZodString>;
         repoPath: import("zod").ZodString;
         intentId: import("zod").ZodString;
-        force: import("zod").ZodDefault<import("zod").ZodOptional<import("zod").ZodBoolean>>;
     }, "strip", import("zod").ZodTypeAny, {
         repoPath: string;
-        force: boolean;
         intentId: string;
         repoOrigin?: string | undefined;
         forkAuthor?: {
@@ -213,7 +215,6 @@ export declare const allTools: ({
             forkOrigin: string;
         } | undefined;
         workspaceId?: string | undefined;
-        force?: boolean | undefined;
     }>;
     handler: typeof activateIntent;
 } | {
@@ -328,7 +329,7 @@ export declare const allTools: ({
         workspaceId: import("zod").ZodOptional<import("zod").ZodString>;
         repoOrigin: import("zod").ZodOptional<import("zod").ZodString>;
         repoPath: import("zod").ZodString;
-        status: import("zod").ZodOptional<import("zod").ZodEnum<["active", "pending", "committed", "pushed", "done", "abandoned"]>>;
+        status: import("zod").ZodOptional<import("zod").ZodEnum<["active", "committed", "pushed", "done", "abandoned"]>>;
         author: import("zod").ZodOptional<import("zod").ZodString>;
         since: import("zod").ZodOptional<import("zod").ZodString>;
         until: import("zod").ZodOptional<import("zod").ZodString>;
@@ -338,7 +339,7 @@ export declare const allTools: ({
         repoPath: string;
         limit: number;
         offset: number;
-        status?: "pending" | "active" | "committed" | "pushed" | "done" | "abandoned" | undefined;
+        status?: "active" | "committed" | "pushed" | "done" | "abandoned" | undefined;
         repoOrigin?: string | undefined;
         forkAuthor?: {
             platform: "github" | "gitlab";
@@ -351,7 +352,7 @@ export declare const allTools: ({
         until?: string | undefined;
     }, {
         repoPath: string;
-        status?: "pending" | "active" | "committed" | "pushed" | "done" | "abandoned" | undefined;
+        status?: "active" | "committed" | "pushed" | "done" | "abandoned" | undefined;
         repoOrigin?: string | undefined;
         forkAuthor?: {
             platform: "github" | "gitlab";
@@ -430,6 +431,7 @@ export declare const allTools: ({
         commitSha: import("zod").ZodOptional<import("zod").ZodString>;
         status: import("zod").ZodDefault<import("zod").ZodEnum<["committed", "pushed", "done", "abandoned", "superseded"]>>;
         supersededBy: import("zod").ZodOptional<import("zod").ZodString>;
+        humanApproved: import("zod").ZodOptional<import("zod").ZodBoolean>;
     }, "strip", import("zod").ZodTypeAny, {
         status: "committed" | "pushed" | "done" | "abandoned" | "superseded";
         repoPath: string;
@@ -443,6 +445,7 @@ export declare const allTools: ({
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;
+        humanApproved?: boolean | undefined;
     }, {
         repoPath: string;
         status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
@@ -456,6 +459,7 @@ export declare const allTools: ({
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;
+        humanApproved?: boolean | undefined;
     }>;
     handler: typeof completeIntent;
 } | {
@@ -622,6 +626,28 @@ export declare const allTools: ({
         confidence: import("zod").ZodOptional<import("zod").ZodEnum<["high", "medium", "low"]>>;
         sourceThoughtIds: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodString, "many">>;
         appliesWhen: import("zod").ZodOptional<import("zod").ZodString>;
+        resolvedCollision: import("zod").ZodOptional<import("zod").ZodObject<{
+            peerUid: import("zod").ZodString;
+            peerLabel: import("zod").ZodOptional<import("zod").ZodString>;
+            filePath: import("zod").ZodString;
+            ranges: import("zod").ZodArray<import("zod").ZodArray<import("zod").ZodNumber, "many">, "many">;
+            peerIntentId: import("zod").ZodOptional<import("zod").ZodString>;
+            baselineSha: import("zod").ZodOptional<import("zod").ZodString>;
+        }, "strip", import("zod").ZodTypeAny, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+            peerLabel?: string | undefined;
+            peerIntentId?: string | undefined;
+            baselineSha?: string | undefined;
+        }, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+            peerLabel?: string | undefined;
+            peerIntentId?: string | undefined;
+            baselineSha?: string | undefined;
+        }>>;
     }, "strip", import("zod").ZodTypeAny, {
         type: "abandoned" | "constraint" | "fork" | "discovery" | "tradeoff" | "dependency";
         repoPath: string;
@@ -651,6 +677,14 @@ export declare const allTools: ({
         confidence?: "high" | "medium" | "low" | undefined;
         sourceThoughtIds?: string[] | undefined;
         appliesWhen?: string | undefined;
+        resolvedCollision?: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+            peerLabel?: string | undefined;
+            peerIntentId?: string | undefined;
+            baselineSha?: string | undefined;
+        } | undefined;
     }, {
         type: "abandoned" | "constraint" | "fork" | "discovery" | "tradeoff" | "dependency";
         repoPath: string;
@@ -680,6 +714,14 @@ export declare const allTools: ({
         confidence?: "high" | "medium" | "low" | undefined;
         sourceThoughtIds?: string[] | undefined;
         appliesWhen?: string | undefined;
+        resolvedCollision?: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+            peerLabel?: string | undefined;
+            peerIntentId?: string | undefined;
+            baselineSha?: string | undefined;
+        } | undefined;
     }>;
     handler: typeof recordDecision;
 } | {
@@ -765,6 +807,49 @@ export declare const allTools: ({
         workspaceId?: string | undefined;
     }>;
     handler: typeof getProjectDecisions;
+} | {
+    name: string;
+    description: string;
+    inputSchema: import("zod").ZodObject<{
+        forkAuthor: import("zod").ZodOptional<import("zod").ZodObject<{
+            platform: import("zod").ZodEnum<["github", "gitlab"]>;
+            user: import("zod").ZodString;
+            forkOrigin: import("zod").ZodString;
+        }, "strip", import("zod").ZodTypeAny, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }>>;
+        workspaceId: import("zod").ZodOptional<import("zod").ZodString>;
+        repoOrigin: import("zod").ZodOptional<import("zod").ZodString>;
+        repoPath: import("zod").ZodString;
+        decisionId: import("zod").ZodString;
+    }, "strip", import("zod").ZodTypeAny, {
+        repoPath: string;
+        decisionId: string;
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+    }, {
+        repoPath: string;
+        decisionId: string;
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+    }>;
+    handler: typeof getDecisionDetail;
 } | {
     name: string;
     description: string;
@@ -1128,4 +1213,122 @@ export declare const allTools: ({
         sessionToken?: string | undefined;
     }>;
     handler: typeof preEditAcknowledge;
+} | {
+    name: string;
+    description: string;
+    inputSchema: import("zod").ZodObject<{
+        forkAuthor: import("zod").ZodOptional<import("zod").ZodObject<{
+            platform: import("zod").ZodEnum<["github", "gitlab"]>;
+            user: import("zod").ZodString;
+            forkOrigin: import("zod").ZodString;
+        }, "strip", import("zod").ZodTypeAny, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }>>;
+        workspaceId: import("zod").ZodOptional<import("zod").ZodString>;
+        repoOrigin: import("zod").ZodOptional<import("zod").ZodString>;
+        repoPath: import("zod").ZodString;
+        peerUid: import("zod").ZodString;
+        filePath: import("zod").ZodString;
+        ranges: import("zod").ZodArray<import("zod").ZodArray<import("zod").ZodNumber, "many">, "many">;
+        intentId: import("zod").ZodOptional<import("zod").ZodString>;
+    }, "strip", import("zod").ZodTypeAny, {
+        repoPath: string;
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }, {
+        repoPath: string;
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }>;
+    handler: typeof getResolutionContext;
+} | {
+    name: string;
+    description: string;
+    inputSchema: import("zod").ZodObject<{
+        forkAuthor: import("zod").ZodOptional<import("zod").ZodObject<{
+            platform: import("zod").ZodEnum<["github", "gitlab"]>;
+            user: import("zod").ZodString;
+            forkOrigin: import("zod").ZodString;
+        }, "strip", import("zod").ZodTypeAny, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }, {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        }>>;
+        workspaceId: import("zod").ZodOptional<import("zod").ZodString>;
+        repoPath: import("zod").ZodString;
+        repoOrigin: import("zod").ZodOptional<import("zod").ZodString>;
+        intentId: import("zod").ZodOptional<import("zod").ZodString>;
+        overlaps: import("zod").ZodArray<import("zod").ZodObject<{
+            peerUid: import("zod").ZodString;
+            filePath: import("zod").ZodString;
+            ranges: import("zod").ZodArray<import("zod").ZodArray<import("zod").ZodNumber, "many">, "many">;
+        }, "strip", import("zod").ZodTypeAny, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }>, "many">;
+    }, "strip", import("zod").ZodTypeAny, {
+        repoPath: string;
+        overlaps: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }[];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }, {
+        repoPath: string;
+        overlaps: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }[];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }>;
+    handler: typeof arbiterResolve;
 })[];