@kawacode/mcp 5.1.1 → 5.2.2

package/build/tools/activate-intent.js

@@ -0,0 +1,52 @@
+import { z } from 'zod';
+import { request } from '../services/muninn-ipc.js';
+import { resolveOrigin } from './resolve-origin.js';
+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.'),
+});
+export async function activateIntent(input) {
+    const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    // Check if there's already an active intent
+    const activeRes = await request('intent', 'get-active', { repoOrigin: actualOrigin });
+    const previousActiveId = activeRes.intentId || activeRes.intent?.id || '';
+    if (previousActiveId === input.intentId) {
+        return {
+            success: true,
+            intentId: input.intentId,
+            previousActiveId,
+            message: `Intent ${input.intentId.substring(0, 8)} is already active`,
+        };
+    }
+    // Set the intent as active
+    await request('intent', 'set-active', {
+        repoOrigin: actualOrigin,
+        intentId: input.intentId,
+    });
+    return {
+        success: true,
+        intentId: input.intentId,
+        previousActiveId: previousActiveId || undefined,
+        message: previousActiveId
+            ? `Activated intent ${input.intentId.substring(0, 8)} (was: ${previousActiveId.substring(0, 8)})`
+            : `Activated intent ${input.intentId.substring(0, 8)}`,
+    };
+}
+export const activateIntentTool = {
+    name: 'activate_intent',
+    description: `Activate an existing intent by ID without creating a new one.
+
+Use this to:
+- Switch 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
+
+Accepts both cloud IDs (from get_relevant_context / API) and local UUIDs (from list_team_intents).
+
+If another intent is currently active, it will be replaced (not completed).
+To complete the previous intent first, call complete_intent before this tool.`,
+    inputSchema: activateIntentSchema,
+    handler: activateIntent,
+};
+//# sourceMappingURL=activate-intent.js.map

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

@@ -0,0 +1 @@
+{"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;AAEnD,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;CAC5G,CAAC,CAAA;AAWF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAA0B;IAC7D,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAEpE,4CAA4C;IAC5C,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,gBAAgB;YAChB,OAAO,EAAE,UAAU,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,oBAAoB;SACtE,CAAA;IACH,CAAC;IAED,2BAA2B;IAC3B,MAAM,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE;QACpC,UAAU,EAAE,YAAY;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,gBAAgB,EAAE,gBAAgB,IAAI,SAAS;QAC/C,OAAO,EAAE,gBAAgB;YACvB,CAAC,CAAC,oBAAoB,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;YACjG,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;;;;;;;;;;8EAU+D;IAC5E,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,cAAc;CACxB,CAAA"}

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

@@ -21,7 +21,6 @@ export interface ActiveIntentResponse {
     hasActiveIntent: boolean;
     intent?: {
         id: string;
-        localId: string;
         title: string;
         description: string;
         templateType: 'feature' | 'refactor' | 'exploration';

package/build/tools/check-active-intent.js

@@ -10,16 +10,15 @@ export async function checkActiveIntent(input) {
     const res = await request('intent', 'get-active', {
         repoOrigin: actualOrigin,
     });
-    // Muninn returns { success, activeIntentId, activeIntent }
-    const intent = res.activeIntent;
+    // Muninn returns { hasActiveIntent, intentId, intent }
+    const intent = res.intent;
     if (!intent) {
         return { hasActiveIntent: false };
     }
     return {
         hasActiveIntent: true,
         intent: {
-            id: intent.id || res.activeIntentId || '',
-            localId: intent.id || res.activeIntentId || '',
+            id: intent.id || res.intentId || '',
             title: intent.title || '',
             description: intent.description || '',
             templateType: (intent.templateType || 'feature'),

package/build/tools/check-active-intent.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-active-intent.js","sourceRoot":"","sources":["../../src/tools/check-active-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;AAEnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,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;CACnE,CAAC,CAAA;AA4BF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B;IACnE,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAEpE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE;QAChD,UAAU,EAAE,YAAY;KACzB,CAAC,CAAA;IAEF,2DAA2D;IAC3D,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAA;IAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IACnC,CAAC;IAED,OAAO;QACL,eAAe,EAAE,IAAI;QACrB,MAAM,EAAE;YACN,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,cAAc,IAAI,EAAE;YACzC,OAAO,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,cAAc,IAAI,EAAE;YAC9C,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;YACzB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YACrC,YAAY,EAAE,CAAC,MAAM,CAAC,YAAY,IAAI,SAAS,CAA2C;YAC1F,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,MAAM,EAAE,EAAE,CAAC,wDAAwD;SACpE;KACF,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE;;;;;;;;oDAQqC;IAClD,WAAW,EAAE,uBAAuB;IACpC,OAAO,EAAE,iBAAiB;CAC3B,CAAA"}
+{"version":3,"file":"check-active-intent.js","sourceRoot":"","sources":["../../src/tools/check-active-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;AAEnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9C,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;CACnE,CAAC,CAAA;AA2BF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,KAA6B;IACnE,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAEpE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE;QAChD,UAAU,EAAE,YAAY;KACzB,CAAC,CAAA;IAEF,uDAAuD;IACvD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,CAAA;IACnC,CAAC;IAED,OAAO;QACL,eAAe,EAAE,IAAI;QACrB,MAAM,EAAE;YACN,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,QAAQ,IAAI,EAAE;YACnC,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;YACzB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YACrC,YAAY,EAAE,CAAC,MAAM,CAAC,YAAY,IAAI,SAAS,CAA2C;YAC1F,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE;YACrC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,QAAQ;YACjC,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,MAAM,EAAE,EAAE,CAAC,wDAAwD;SACpE;KACF,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE;;;;;;;;oDAQqC;IAClD,WAAW,EAAE,uBAAuB;IACpC,OAAO,EAAE,iBAAiB;CAC3B,CAAA"}

package/build/tools/complete-intent.d.ts

@@ -2,18 +2,24 @@ import { z } from 'zod';
 export declare const completeIntentSchema: z.ZodObject<{
     repoOrigin: z.ZodOptional<z.ZodString>;
     repoPath: z.ZodString;
+    intentId: z.ZodOptional<z.ZodString>;
     commitSha: z.ZodOptional<z.ZodString>;
-    status: z.ZodDefault<z.ZodEnum<["committed", "pushed", "done", "abandoned"]>>;
+    status: z.ZodDefault<z.ZodEnum<["committed", "pushed", "done", "abandoned", "superseded"]>>;
+    supersededBy: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     repoPath: string;
-    status: "committed" | "pushed" | "done" | "abandoned";
+    status: "committed" | "pushed" | "done" | "abandoned" | "superseded";
     repoOrigin?: string | undefined;
+    intentId?: string | undefined;
     commitSha?: string | undefined;
+    supersededBy?: string | undefined;
 }, {
     repoPath: string;
     repoOrigin?: string | undefined;
-    status?: "committed" | "pushed" | "done" | "abandoned" | undefined;
+    status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
+    intentId?: string | undefined;
     commitSha?: string | undefined;
+    supersededBy?: string | undefined;
 }>;
 export type CompleteIntentInput = z.infer<typeof completeIntentSchema>;
 export interface CompleteIntentResponse {
@@ -31,18 +37,24 @@ export declare const completeIntentTool: {
     inputSchema: z.ZodObject<{
         repoOrigin: z.ZodOptional<z.ZodString>;
         repoPath: z.ZodString;
+        intentId: z.ZodOptional<z.ZodString>;
         commitSha: z.ZodOptional<z.ZodString>;
-        status: z.ZodDefault<z.ZodEnum<["committed", "pushed", "done", "abandoned"]>>;
+        status: z.ZodDefault<z.ZodEnum<["committed", "pushed", "done", "abandoned", "superseded"]>>;
+        supersededBy: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         repoPath: string;
-        status: "committed" | "pushed" | "done" | "abandoned";
+        status: "committed" | "pushed" | "done" | "abandoned" | "superseded";
         repoOrigin?: string | undefined;
+        intentId?: string | undefined;
         commitSha?: string | undefined;
+        supersededBy?: string | undefined;
     }, {
         repoPath: string;
         repoOrigin?: string | undefined;
-        status?: "committed" | "pushed" | "done" | "abandoned" | undefined;
+        status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
+        intentId?: string | undefined;
         commitSha?: string | undefined;
+        supersededBy?: string | undefined;
     }>;
     handler: typeof completeIntent;
 };

package/build/tools/complete-intent.js

@@ -4,16 +4,45 @@ import { resolveOrigin } from './resolve-origin.js';
 export const completeIntentSchema = 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().optional().describe('Expected intent ID to complete. If provided, the tool verifies this matches the active intent and rejects if mismatched (prevents race conditions with concurrent sessions).'),
     commitSha: z.string().optional().describe('The git commit SHA to associate with this intent (if already committed)'),
-    status: z.enum(['committed', 'pushed', 'done', 'abandoned']).default('committed')
-        .describe('The new status for the intent. Use "committed" after git commit, "done" when work is complete, "abandoned" to discard.')
+    status: z.enum(['committed', 'pushed', 'done', 'abandoned', 'superseded']).default('committed')
+        .describe('The new status for the intent. Use "committed" after git commit, "done" when work is complete, "abandoned" to discard, "superseded" when another intent replaces this one.'),
+    supersededBy: z.string().optional().describe('Intent ID that supersedes this one. Required when status is "superseded".')
 });
 export async function completeIntent(input) {
     const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    // If intentId provided, verify it matches the active intent before completing
+    if (input.intentId) {
+        const activeRes = await request('intent', 'get-active', { repoOrigin: actualOrigin });
+        const activeId = activeRes.intentId || activeRes.intent?.id || '';
+        if (!activeId) {
+            return {
+                success: false,
+                intentId: input.intentId,
+                previousStatus: 'unknown',
+                newStatus: input.status,
+                commitSha: input.commitSha,
+                message: `No active intent found. Expected intent ${input.intentId.substring(0, 8)} but nothing is active.`
+            };
+        }
+        if (activeId !== input.intentId) {
+            const activeTitle = activeRes.intent?.title || 'unknown';
+            return {
+                success: false,
+                intentId: input.intentId,
+                previousStatus: 'unknown',
+                newStatus: input.status,
+                commitSha: input.commitSha,
+                message: `Intent mismatch: expected ${input.intentId.substring(0, 8)} but active intent is "${activeTitle}" (${activeId.substring(0, 8)}). Another session may have changed the active intent.`
+            };
+        }
+    }
     const res = await request('intent', 'complete', {
         repoOrigin: actualOrigin,
         status: input.status,
         commitSha: input.commitSha,
+        supersededBy: input.supersededBy,
     });
     const intentId = res.intentId || '';
     const intentTitle = res.intentTitle || 'Intent';

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

@@ -1 +1 @@
-{"version":3,"file":"complete-intent.js","sourceRoot":"","sources":["../../src/tools/complete-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;AAEnD,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,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,yEAAyE,CAAC;IACpH,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;SAC9E,QAAQ,CAAC,wHAAwH,CAAC;CACtI,CAAC,CAAA;AAaF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAA0B;IAC7D,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAEpE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE;QAC9C,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAA;IACnC,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAA;IAC/C,MAAM,cAAc,GAAG,GAAG,CAAC,cAAc,IAAI,QAAQ,CAAA;IAErD,MAAM,cAAc,GAA2B;QAC7C,SAAS,EAAE,WAAW,WAAW,uBAAuB;QACxD,MAAM,EAAE,WAAW,WAAW,oBAAoB;QAClD,IAAI,EAAE,WAAW,WAAW,kBAAkB;QAC9C,SAAS,EAAE,WAAW,WAAW,aAAa;KAC/C,CAAA;IAED,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO,KAAK,KAAK;QAC9B,QAAQ;QACR,cAAc;QACd,SAAS,EAAE,KAAK,CAAC,MAAM;QACvB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;KACjH,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,iBAAiB;IACvB,WAAW,EAAE;;;;;;;;;;;qDAWsC;IACnD,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,cAAc;CACxB,CAAA"}
+{"version":3,"file":"complete-intent.js","sourceRoot":"","sources":["../../src/tools/complete-intent.ts"],"names":[],"mappings":"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"}

package/build/tools/create-intent.d.ts

@@ -6,11 +6,13 @@ export declare const createAndActivateIntentSchema: z.ZodObject<{
     description: z.ZodString;
     templateType: z.ZodDefault<z.ZodEnum<["feature", "refactor", "exploration"]>>;
     constraints: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    force: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
     repoPath: string;
     title: string;
     description: string;
     templateType: "feature" | "refactor" | "exploration";
+    force: boolean;
     repoOrigin?: string | undefined;
     constraints?: string[] | undefined;
 }, {
@@ -20,13 +22,29 @@ export declare const createAndActivateIntentSchema: z.ZodObject<{
     repoOrigin?: string | undefined;
     templateType?: "feature" | "refactor" | "exploration" | undefined;
     constraints?: string[] | undefined;
+    force?: boolean | undefined;
 }>;
 export type CreateIntentInput = z.infer<typeof createAndActivateIntentSchema>;
+interface ConflictInfo {
+    intentId: string;
+    title: string;
+    author: string;
+    status: string;
+    createdBy: string;
+    staleness: 'fresh' | 'aging' | 'likely_stale';
+    severity: 'high' | 'medium' | 'low';
+    overlapType: string;
+    overlappingFiles: string[];
+    similarityScore: number;
+    oppositionDetected: boolean;
+    oppositionDetail: string | null;
+}
 export interface CreateIntentResponse {
     success: boolean;
     intentId: string;
-    localId: string;
+    action: 'created' | 'reactivated' | 'conflict';
     message: string;
+    conflicts?: ConflictInfo[];
 }
 export declare function createAndActivateIntent(input: CreateIntentInput): Promise<CreateIntentResponse>;
 export declare const createAndActivateIntentTool: {
@@ -39,11 +57,13 @@ export declare const createAndActivateIntentTool: {
         description: z.ZodString;
         templateType: z.ZodDefault<z.ZodEnum<["feature", "refactor", "exploration"]>>;
         constraints: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+        force: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
         repoPath: string;
         title: string;
         description: string;
         templateType: "feature" | "refactor" | "exploration";
+        force: boolean;
         repoOrigin?: string | undefined;
         constraints?: string[] | undefined;
     }, {
@@ -53,6 +73,8 @@ export declare const createAndActivateIntentTool: {
         repoOrigin?: string | undefined;
         templateType?: "feature" | "refactor" | "exploration" | undefined;
         constraints?: string[] | undefined;
+        force?: boolean | undefined;
     }>;
     handler: typeof createAndActivateIntent;
 };
+export {};

package/build/tools/create-intent.js

@@ -7,11 +7,15 @@ export const createAndActivateIntentSchema = z.object({
     title: z.string().max(200).describe('Short, descriptive title for the intent'),
     description: z.string().max(2000).describe('What this intent accomplishes'),
     templateType: z.enum(['feature', 'refactor', 'exploration']).default('feature').describe('Type of work'),
-    constraints: z.array(z.string()).optional().describe('Requirements or constraints for this work')
+    constraints: z.array(z.string()).optional().describe('Requirements or constraints for this work'),
+    force: z.boolean().optional().default(false).describe('Bypass conflict detection. Set to true after the user has reviewed detected conflicts and chosen to proceed anyway.'),
 });
 export async function createAndActivateIntent(input) {
     const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
-    // Step 1: Create the intent
+    // Step 1: Create (or find-and-reactivate) the intent.
+    // The Muninn handler proxies to API POST /intents/find-or-create which
+    // dedups by embedding similarity (≥ 0.85) and runs automatic conflict
+    // detection against all other intents for the repo.
     const createRes = await request('intent', 'create', {
         repoOrigin: actualOrigin,
         title: input.title,
@@ -19,18 +23,63 @@ export async function createAndActivateIntent(input) {
         templateType: input.templateType,
         constraints: input.constraints || [],
         scope: { type: 'repo', paths: [] },
+        force: input.force || false,
     });
+    // Handle conflict detection — API returned 409 with conflict data.
+    // Return the conflicts to the caller (Claude Code) so it can present
+    // them to the user and optionally retry with force=true.
+    if (createRes.conflict === true && createRes.conflicts) {
+        const conflicts = createRes.conflicts;
+        const highCount = conflicts.filter((c) => c.severity === 'high').length;
+        const mediumCount = conflicts.filter((c) => c.severity === 'medium').length;
+        const lines = [
+            `Found ${conflicts.length} potential conflict(s) with existing intents:`,
+            '',
+        ];
+        for (const c of conflicts) {
+            const badge = c.severity === 'high' ? '[HIGH]' : c.severity === 'medium' ? '[MEDIUM]' : '[LOW]';
+            lines.push(`${badge} "${c.title}" by ${c.author} (${c.status}, ${c.staleness})`);
+            if (c.overlappingFiles.length > 0) {
+                lines.push(`  Files: ${c.overlappingFiles.join(', ')}`);
+            }
+            if (c.oppositionDetected) {
+                lines.push(`  Semantic opposition: ${c.oppositionDetail}`);
+            }
+            lines.push(`  Similarity: ${(c.similarityScore * 100).toFixed(0)}%`);
+            lines.push('');
+        }
+        lines.push('To proceed anyway, call create_and_activate_intent again with force=true.');
+        return {
+            success: false,
+            intentId: '',
+            action: 'conflict',
+            message: lines.join('\n'),
+            conflicts,
+        };
+    }
+    // Propagate Muninn-side errors (e.g. not signed in, API unreachable) to the AI
+    // so it can tell the user how to recover instead of silently proceeding.
+    if (createRes.success === false) {
+        throw new Error(createRes.error || 'Intent creation failed');
+    }
     const intentId = createRes.intent?.id || createRes.intentId || '';
+    if (!intentId) {
+        throw new Error('Intent creation succeeded but no intent ID was returned');
+    }
+    const action = createRes.action === 'reactivated' ? 'reactivated' : 'created';
     // Step 2: Set it as active
     await request('intent', 'set-active', {
         repoOrigin: actualOrigin,
         intentId,
     });
+    const message = action === 'reactivated'
+        ? `Reactivated existing similar intent: "${input.title}" — resuming previous work instead of creating a duplicate.`
+        : `Created and activated intent: "${input.title}"`;
     return {
         success: true,
         intentId,
-        localId: intentId,
-        message: `Created and activated intent: "${input.title}"`
+        action,
+        message,
     };
 }
 export const createAndActivateIntentTool = {
@@ -42,7 +91,11 @@ Call this when check_active_intent returns no active intent. Before calling:
 2. Ask the user to confirm the intent details (title, description, type)
 3. Then call this tool with the confirmed details
 
-This ensures all AI-generated code gets properly tracked and attributed.`,
+This ensures all AI-generated code gets properly tracked and attributed.
+
+If the tool returns conflicts (action="conflict"), present the conflict
+details to the user and ask whether to proceed. If yes, retry with
+force=true to bypass conflict detection.`,
     inputSchema: createAndActivateIntentSchema,
     handler: createAndActivateIntent
 };

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

@@ -1 +1 @@
-{"version":3,"file":"create-intent.js","sourceRoot":"","sources":["../../src/tools/create-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;AAEnD,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IACpD,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,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,yCAAyC,CAAC;IAC9E,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,+BAA+B,CAAC;IAC3E,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC;IACxG,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,2CAA2C,CAAC;CAClG,CAAC,CAAA;AAWF,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAAwB;IACpE,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAEpE,4BAA4B;IAC5B,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE;QAClD,UAAU,EAAE,YAAY;QACxB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;QACpC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;KACnC,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,EAAE,EAAE,IAAI,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAA;IAEjE,2BAA2B;IAC3B,MAAM,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE;QACpC,UAAU,EAAE,YAAY;QACxB,QAAQ;KACT,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,IAAI;QACb,QAAQ;QACR,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,kCAAkC,KAAK,CAAC,KAAK,GAAG;KAC1D,CAAA;AACH,CAAC;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,IAAI,EAAE,4BAA4B;IAClC,WAAW,EAAE;;;;;;;yEAO0D;IACvE,WAAW,EAAE,6BAA6B;IAC1C,OAAO,EAAE,uBAAuB;CACjC,CAAA"}
+{"version":3,"file":"create-intent.js","sourceRoot":"","sources":["../../src/tools/create-intent.ts"],"names":[],"mappings":"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"}