@kawacode/mcp 6.1.5 → 6.8.0

package/build/tools/activate-intent.js

@@ -6,12 +6,11 @@ export const activateIntentSchema = 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'),
     intentId: z.string().describe('The cloud ID (preferred) or local UUID of the existing intent to activate.'),
-    force: z.boolean().optional().default(false).describe('Bypass the per-repo active-intent lock. Set to true after the user has reviewed the lock conflict and chosen to take over.'),
     ...forkFieldsExtensions,
 });
 export async function activateIntent(input) {
     const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
-    // Check if there's already an active intent
+    // This session's current focus before the switch.
     const activeRes = await request('intent', 'get-active', { repoOrigin: actualOrigin });
     const previousActiveId = activeRes.intentId || activeRes.intent?.id || '';
     if (previousActiveId === input.intentId) {
@@ -20,88 +19,50 @@ export async function activateIntent(input) {
             intentId: input.intentId,
             action: 'already_active',
             previousActiveId,
-            message: `Intent ${input.intentId.substring(0, 8)} is already active`,
+            message: `Intent ${input.intentId.substring(0, 8)} is already your current intent`,
         };
     }
-    // Set the intent as active
-    const setRes = await request('intent', 'set-active', {
+    // Move THIS session's `current` pointer to the target intent. Under the
+    // multi-active model (no lock) this never conflicts — other sessions keep
+    // their own current pointers, and the API holds the full active set.
+    await request('intent', 'set-active', {
         repoOrigin: actualOrigin,
         intentId: input.intentId,
-        force: input.force || false,
         ...extractForkFields(input),
     });
-    if (setRes.conflict === true && setRes.conflictType === 'active_intent_lock') {
-        const lockConflict = await buildLockConflictDetails(actualOrigin, setRes.existingIntentId);
-        const idShort = setRes.existingIntentId.substring(0, 8);
-        const who = lockConflict.author ? ` by ${lockConflict.author}` : '';
-        const titlePart = lockConflict.title ? ` "${lockConflict.title}"` : '';
-        return {
-            success: false,
-            intentId: input.intentId,
-            action: 'conflict',
-            lockConflict,
-            message: `Active-intent lock: repo already owns intent ${idShort}${titlePart}${who}. ` +
-                `Call activate_intent again with force=true to take over, complete_intent on ${idShort} first, ` +
-                `or choose a different intent.`,
-        };
-    }
     return {
         success: true,
         intentId: input.intentId,
         action: 'activated',
         previousActiveId: previousActiveId || undefined,
         message: previousActiveId
-            ? `Activated intent ${input.intentId.substring(0, 8)} (was: ${previousActiveId.substring(0, 8)})`
+            ? `Switched current intent to ${input.intentId.substring(0, 8)} (was: ${previousActiveId.substring(0, 8)})`
             : `Activated intent ${input.intentId.substring(0, 8)}`,
     };
 }
-async function buildLockConflictDetails(repoOrigin, existingIntentId) {
-    try {
-        const res = await request('intent', 'get-active', { repoOrigin });
-        const intent = res.intent;
-        if (intent && intent.id === existingIntentId) {
-            return {
-                existingIntentId,
-                title: intent.title,
-                createdBy: intent.createdBy,
-                author: intent.authorInfo?.name || intent.author,
-            };
-        }
-    }
-    catch {
-        // Fall through to ID-only response
-    }
-    return { existingIntentId };
-}
 export const activateIntentTool = {
     name: 'activate_intent',
-    description: `Activate an existing intent by ID without creating a new one.
+    description: `Activate an existing intent by ID — sets it as THIS session's current focus.
 
 Use this to:
-- Switch to a different intent found via list_team_intents or get_relevant_context
+- Switch your current focus to a different intent found via list_team_intents or get_relevant_context
 - Re-activate an intent that was deactivated (e.g., to complete it)
 - Resume work on a previously created intent
-- Resume an "abandoned" or "pending" intent (see below)
+- Resume an "abandoned" intent (see below)
 
 Accepts both cloud IDs (from get_relevant_context / API) and local UUIDs (from list_team_intents).
 
-Resuming abandoned / pending intents:
+Multi-active model: activating an intent only moves YOUR session's current
+pointer. Many intents can be active on a repo at once (one current per
+session/teammate), so this never blocks on or displaces another session's
+active intent — there is no lock to take over.
+
+Resuming abandoned intents:
 - Abandoned intents have their decisions soft-deleted (invisible to recall and
   get_relevant_context). Activating one transparently restores them — single-intent
   decisions for this intent get their soft-delete cleared so the prior reasoning
   becomes visible again. Multi-intent decisions stay visible throughout (they were
-  never soft-deleted).
-- Pending intents are intents auto-finalized by the orphan-recovery sweeper (24h
-  inactivity) — possibly with conflicts blocking the finalization. Their decisions
-  were never soft-deleted, so activating one is a clean resume; new ephemerals
-  accumulate in a fresh bucket and the next complete_intent distills only the new work.
-
-Per-repo active-intent lock: if another session already has a different intent active on
-this repo, the tool returns action="conflict" with lockConflict details. Present the
-conflict to the user and choose one of:
-- Take over: retry with force=true (displaces the other session's active intent).
-- Complete first: call complete_intent on the existing intent, then retry.
-- Cancel: choose a different intent or stop.`,
+  never soft-deleted).`,
     inputSchema: activateIntentSchema,
     handler: activateIntent,
 };

package/build/tools/activate-intent.js.map

@@ -1 +1 @@
-{"version":3,"file":"activate-intent.js","sourceRoot":"","sources":["../../src/tools/activate-intent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"activate-intent.js","sourceRoot":"","sources":["../../src/tools/activate-intent.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,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,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,4EAA4E,CAAC;IAC3G,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAYF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAA0B;IAC7D,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAEpE,kDAAkD;IAClD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAA;IACrF,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAA;IAEzE,IAAI,gBAAgB,KAAK,KAAK,CAAC,QAAQ,EAAE,CAAC;QACxC,OAAO;YACL,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,MAAM,EAAE,gBAAgB;YACxB,gBAAgB;YAChB,OAAO,EAAE,UAAU,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,iCAAiC;SACnF,CAAA;IACH,CAAC;IAED,wEAAwE;IACxE,0EAA0E;IAC1E,qEAAqE;IACrE,MAAM,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE;QACpC,UAAU,EAAE,YAAY;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,MAAM,EAAE,WAAW;QACnB,gBAAgB,EAAE,gBAAgB,IAAI,SAAS;QAC/C,OAAO,EAAE,gBAAgB;YACvB,CAAC,CAAC,8BAA8B,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;YAC3G,CAAC,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;KACzD,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,iBAAiB;IACvB,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;uBAoBQ;IACrB,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,cAAc;CACxB,CAAA"}

package/build/tools/arbiter-apply.d.ts

@@ -0,0 +1,132 @@
+import { z } from 'zod';
+export declare const arbiterApplySchema: 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>;
+    repoPath: z.ZodString;
+    repoOrigin: z.ZodOptional<z.ZodString>;
+    intentId: z.ZodOptional<z.ZodString>;
+    overlaps: z.ZodArray<z.ZodObject<{
+        peerUid: z.ZodString;
+        filePath: z.ZodString;
+        ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+    }, "strip", z.ZodTypeAny, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }>, "many">;
+}, "strip", z.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;
+}>;
+export type ArbiterApplyInput = z.infer<typeof arbiterApplySchema>;
+export declare function arbiterApply(input: ArbiterApplyInput): Promise<any>;
+export declare const arbiterApplyTool: {
+    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>;
+        repoPath: z.ZodString;
+        repoOrigin: z.ZodOptional<z.ZodString>;
+        intentId: z.ZodOptional<z.ZodString>;
+        overlaps: z.ZodArray<z.ZodObject<{
+            peerUid: z.ZodString;
+            filePath: z.ZodString;
+            ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+        }, "strip", z.ZodTypeAny, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }>, "many">;
+    }, "strip", z.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 arbiterApply;
+};

package/build/tools/arbiter-apply.js

@@ -0,0 +1,59 @@
+import { z } from 'zod';
+import { request } from '../services/muninn-ipc.js';
+import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.js';
+/**
+ * arbiter_apply — thin forwarder to Muninn `arbiter:apply` (Arbiter v2).
+ * Judges → adversarially verifies → auto-applies only the trivial tier, and ONLY
+ * in an agent-owned worktree. All judgment/verify/write/republish lives in Muninn;
+ * this is a stateless adapter.
+ */
+const overlapSchema = z.object({
+    peerUid: z
+        .string()
+        .describe('The peer HAI whose live edits overlap — a collision `uid` from the Stop report.'),
+    filePath: z.string().describe('File with the overlap, relative to repoPath.'),
+    ranges: z
+        .array(z.array(z.number()))
+        .describe('Overlapping [start, end] line ranges (cSHA line space) from the collision.'),
+});
+export const arbiterApplySchema = z.object({
+    repoPath: z.string().describe('Local path to the repository root'),
+    repoOrigin: z
+        .string()
+        .optional()
+        .describe('Git remote origin URL. Auto-detected from repoPath via git if not provided.'),
+    intentId: z
+        .string()
+        .optional()
+        .describe('Active intent ID (advisory; the auto-resolution decision is recorded under it).'),
+    overlaps: z
+        .array(overlapSchema)
+        .describe('The overlaps to resolve — each { peerUid, filePath, ranges } from the Stop collision report.'),
+    ...forkFieldsExtensions,
+});
+export async function arbiterApply(input) {
+    const repoOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    const res = await request('arbiter', 'apply', {
+        repoOrigin,
+        repoPath: input.repoPath,
+        intentId: input.intentId,
+        overlaps: input.overlaps,
+        ...extractForkFields(input),
+    });
+    return res;
+}
+export const arbiterApplyTool = {
+    name: 'arbiter_apply',
+    description: 'Resolve live code overlaps and AUTO-APPLY the safe tier. Kawa judges → adversarially verifies → and, ' +
+        'for the trivial tier only (high-confidence single-range merge that passes verify), writes the merge to ' +
+        'your worktree, records a decision, and republishes. Writes happen ONLY in an agent-owned worktree (a ' +
+        'linked git worktree); on a human checkout — or when a peer holds the file-set lock — it behaves like ' +
+        'arbiter_resolve (suggest-only, no writes). Returns per-overlap outcomes { tier, applied, announcement, ' +
+        'verifyIssue?, verdict }. Call it when you are ready to incorporate the result, then RE-READ any file it ' +
+        'applied to (it changed on disk). For surfaced (not-applied) overlaps, use get_resolution_context to see ' +
+        'the peer code and resolve manually.',
+    inputSchema: arbiterApplySchema,
+    handler: arbiterApply,
+};
+//# sourceMappingURL=arbiter-apply.js.map

package/build/tools/arbiter-apply.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arbiter-apply.js","sourceRoot":"","sources":["../../src/tools/arbiter-apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,CAAC,iFAAiF,CAAC;IAC9F,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8CAA8C,CAAC;IAC7E,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SAC1B,QAAQ,CAAC,4EAA4E,CAAC;CAC1F,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAClE,UAAU,EAAE,CAAC;SACV,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6EAA6E,CAAC;IAC1F,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,iFAAiF,CAAC;IAC9F,QAAQ,EAAE,CAAC;SACR,KAAK,CAAC,aAAa,CAAC;SACpB,QAAQ,CAAC,8FAA8F,CAAC;IAC3G,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAIF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAwB;IACzD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE;QAC5C,UAAU;QACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,eAAe;IACrB,WAAW,EACT,uGAAuG;QACvG,yGAAyG;QACzG,uGAAuG;QACvG,uGAAuG;QACvG,yGAAyG;QACzG,0GAA0G;QAC1G,0GAA0G;QAC1G,qCAAqC;IACvC,WAAW,EAAE,kBAAkB;IAC/B,OAAO,EAAE,YAAY;CACtB,CAAA"}

package/build/tools/arbiter-resolve.d.ts

@@ -0,0 +1,132 @@
+import { z } from 'zod';
+export declare const arbiterResolveSchema: 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>;
+    repoPath: z.ZodString;
+    repoOrigin: z.ZodOptional<z.ZodString>;
+    intentId: z.ZodOptional<z.ZodString>;
+    overlaps: z.ZodArray<z.ZodObject<{
+        peerUid: z.ZodString;
+        filePath: z.ZodString;
+        ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+    }, "strip", z.ZodTypeAny, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }>, "many">;
+}, "strip", z.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;
+}>;
+export type ArbiterResolveInput = z.infer<typeof arbiterResolveSchema>;
+export declare function arbiterResolve(input: ArbiterResolveInput): Promise<any>;
+export declare const arbiterResolveTool: {
+    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>;
+        repoPath: z.ZodString;
+        repoOrigin: z.ZodOptional<z.ZodString>;
+        intentId: z.ZodOptional<z.ZodString>;
+        overlaps: z.ZodArray<z.ZodObject<{
+            peerUid: z.ZodString;
+            filePath: z.ZodString;
+            ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+        }, "strip", z.ZodTypeAny, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }>, "many">;
+    }, "strip", z.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;
+};

package/build/tools/arbiter-resolve.js

@@ -0,0 +1,58 @@
+import { z } from 'zod';
+import { request } from '../services/muninn-ipc.js';
+import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.js';
+/**
+ * arbiter_resolve — thin forwarder to Muninn `arbiter:resolve` (Arbiter v2).
+ * Suggest-only: judges live code overlaps with peers and returns verdicts; never
+ * writes. All decrypt + judgment lives in Muninn (zero-knowledge); this is a
+ * stateless adapter.
+ */
+const overlapSchema = z.object({
+    peerUid: z
+        .string()
+        .describe('The peer HAI whose live edits overlap — a collision `uid` from the Stop report.'),
+    filePath: z.string().describe('File with the overlap, relative to repoPath.'),
+    ranges: z
+        .array(z.array(z.number()))
+        .describe('Overlapping [start, end] line ranges (cSHA line space) from the collision.'),
+});
+export const arbiterResolveSchema = z.object({
+    repoPath: z.string().describe('Local path to the repository root'),
+    repoOrigin: z
+        .string()
+        .optional()
+        .describe('Git remote origin URL. Auto-detected from repoPath via git if not provided.'),
+    intentId: z
+        .string()
+        .optional()
+        .describe('Active intent ID (advisory). Auto-detected by Kawa Code when omitted.'),
+    overlaps: z
+        .array(overlapSchema)
+        .describe('The overlaps to judge — each { peerUid, filePath, ranges } from the Stop collision report.'),
+    ...forkFieldsExtensions,
+});
+export async function arbiterResolve(input) {
+    const repoOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    const res = await request('arbiter', 'resolve', {
+        repoOrigin,
+        repoPath: input.repoPath,
+        intentId: input.intentId,
+        overlaps: input.overlaps,
+        ...extractForkFields(input),
+    });
+    return res;
+}
+export const arbiterResolveTool = {
+    name: 'arbiter_resolve',
+    description: 'Get Kawa Code\'s AI verdict for live code overlaps with peers — SUGGEST-ONLY, never writes. ' +
+        'For each overlap ({peerUid, filePath, ranges} from the Stop collision report), Kawa decrypts the ' +
+        "peer's version locally (zero-knowledge) and judges it compatible / auto_resolvable / conflict, with " +
+        'confidence, a perf/security risk read, and a tier (0 no-op · 1 trivially auto-appliable · 2 ' +
+        'draft-and-confirm · 3 conflict). Use it to understand a forming conflict before acting. For a ' +
+        'surfaced tier-2/3 overlap, call get_resolution_context to read the peer\'s actual code. To actually ' +
+        'apply the safe tier, use arbiter_apply.',
+    inputSchema: arbiterResolveSchema,
+    handler: arbiterResolve,
+};
+//# sourceMappingURL=arbiter-resolve.js.map

package/build/tools/arbiter-resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arbiter-resolve.js","sourceRoot":"","sources":["../../src/tools/arbiter-resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,CAAC,iFAAiF,CAAC;IAC9F,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8CAA8C,CAAC;IAC7E,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SAC1B,QAAQ,CAAC,4EAA4E,CAAC;CAC1F,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAClE,UAAU,EAAE,CAAC;SACV,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6EAA6E,CAAC;IAC1F,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,uEAAuE,CAAC;IACpF,QAAQ,EAAE,CAAC;SACR,KAAK,CAAC,aAAa,CAAC;SACpB,QAAQ,CAAC,4FAA4F,CAAC;IACzG,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAIF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAA0B;IAC7D,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE;QAC9C,UAAU;QACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,iBAAiB;IACvB,WAAW,EACT,8FAA8F;QAC9F,mGAAmG;QACnG,sGAAsG;QACtG,8FAA8F;QAC9F,gGAAgG;QAChG,sGAAsG;QACtG,yCAAyC;IAC3C,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,cAAc;CACxB,CAAA"}

package/build/tools/check-active-intent.d.ts

@@ -43,27 +43,36 @@ export interface IntentBlock {
     endLine: number;
     contentSnippet: string;
 }
+/**
+ * One entry in the repo's active set. Under the multi-active model many intents
+ * can be `status:active` at once (one focus per session/teammate); this is a
+ * lightweight summary for the orchestration view, distinct from the calling
+ * session's own `current` intent (the top-level `intent`).
+ */
+export interface ActiveIntentSummary {
+    id: string;
+    title: string;
+    status: string;
+    createdBy?: string;
+    author?: string;
+}
 export interface ActiveIntentResponse {
     hasActiveIntent: boolean;
+    /**
+     * The repo's full active set — every session/teammate's currently-active
+     * intent — for orchestration/awareness. Independent of `hasActiveIntent`,
+     * which reports only whether THIS session has a current focus.
+     */
+    activeIntents?: ActiveIntentSummary[];
     intent?: {
         id: string;
         title: string;
         description: string;
         templateType: 'feature' | 'refactor' | 'exploration';
         constraints: string[];
-        /**
-         * `active` — currently being worked on (default).
-         * `pending` — auto-finalized by the sweeper or blocked at completion by
-         * conflicts; reportable as "live context" so the agent can prompt the
-         * user to resume via activate_intent or finalize via complete_intent.
-         */
+        /** `active` — currently being worked on (default). Terminal states:
+         * committed/pushed/done/abandoned/superseded. */
         status: string;
-        /**
-         * Set when status === 'pending'. One of `sweeper-auto-finalize` (24h
-         * inactivity, no conflicts) or `sweeper-blocked-conflicts` (24h
-         * inactivity, distilled decisions contradicted standards).
-         */
-        pendingReason?: string;
         branch: string;
         forkedFrom?: string;
         blocks: IntentBlock[];