@kawacode/mcp 5.2.2 → 6.1.1

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

@@ -1,40 +1,106 @@
 import { z } from 'zod';
 export declare const activateIntentSchema: 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;
     intentId: z.ZodString;
+    force: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
     repoPath: string;
+    force: boolean;
     intentId: string;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
 }, {
     repoPath: string;
     intentId: string;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    force?: boolean | undefined;
 }>;
 export type ActivateIntentInput = z.infer<typeof activateIntentSchema>;
+export interface ActiveIntentLockConflict {
+    existingIntentId: string;
+    title?: string;
+    createdBy?: string;
+    author?: string;
+}
 export interface ActivateIntentResponse {
     success: boolean;
     intentId: string;
+    action?: 'activated' | 'already_active' | 'conflict';
     previousActiveId?: string;
     message: string;
+    lockConflict?: ActiveIntentLockConflict;
 }
 export declare function activateIntent(input: ActivateIntentInput): Promise<ActivateIntentResponse>;
 export declare const activateIntentTool: {
     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;
         intentId: z.ZodString;
+        force: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
         repoPath: string;
+        force: boolean;
         intentId: string;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
     }, {
         repoPath: string;
         intentId: string;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        force?: boolean | undefined;
     }>;
     handler: typeof activateIntent;
 };

package/build/tools/activate-intent.js

@@ -1,10 +1,13 @@
 import { z } from 'zod';
 import { request } from '../services/muninn-ipc.js';
 import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.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.'),
+    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);
@@ -15,24 +18,61 @@ export async function activateIntent(input) {
         return {
             success: true,
             intentId: input.intentId,
+            action: 'already_active',
             previousActiveId,
             message: `Intent ${input.intentId.substring(0, 8)} is already active`,
         };
     }
     // Set the intent as active
-    await request('intent', 'set-active', {
+    const setRes = 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)})`
             : `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.
@@ -41,11 +81,27 @@ 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
+- Resume an "abandoned" or "pending" intent (see below)
 
 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.`,
+Resuming abandoned / pending 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.`,
     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":"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"}
+{"version":3,"file":"activate-intent.js","sourceRoot":"","sources":["../../src/tools/activate-intent.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,39 @@
 import { z } from 'zod';
 export declare const checkActiveIntentSchema: 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;
 }, "strip", z.ZodTypeAny, {
     repoPath: string;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
 }, {
     repoPath: string;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
 }>;
 export type CheckActiveIntentInput = z.infer<typeof checkActiveIntentSchema>;
 export interface IntentBlock {
@@ -25,7 +51,19 @@ export interface ActiveIntentResponse {
         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.
+         */
         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[];
@@ -36,14 +74,40 @@ export declare const checkActiveIntentTool: {
     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;
     }, "strip", z.ZodTypeAny, {
         repoPath: string;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
     }, {
         repoPath: string;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
     }>;
     handler: typeof checkActiveIntent;
 };

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

@@ -1,14 +1,17 @@
 import { z } from 'zod';
 import { request } from '../services/muninn-ipc.js';
 import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.js';
 export const checkActiveIntentSchema = 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')
+    repoPath: z.string().describe('Local path to the repository root'),
+    ...forkFieldsExtensions,
 });
 export async function checkActiveIntent(input) {
     const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
     const res = await request('intent', 'get-active', {
         repoOrigin: actualOrigin,
+        ...extractForkFields(input),
     });
     // Muninn returns { hasActiveIntent, intentId, intent }
     const intent = res.intent;
@@ -24,6 +27,7 @@ export async function checkActiveIntent(input) {
             templateType: (intent.templateType || 'feature'),
             constraints: intent.constraints || [],
             status: intent.status || 'active',
+            pendingReason: intent.pendingReason,
             branch: intent.branch || '',
             forkedFrom: intent.forkedFrom,
             blocks: [] // Blocks are tracked separately by intent-block service
@@ -40,7 +44,17 @@ you should ask the user to confirm intent details and then call create_and_activ
 An active intent tracks what the user is working on, enabling:
 - Better code context for AI-generated changes
 - Conflict detection with team members
-- Automatic assignment of code blocks to the intent`,
+- Automatic assignment of code blocks to the intent
+
+Status semantics:
+- "active" — normal, in-progress.
+- "pending" — auto-finalized by the orphan-recovery sweeper or blocked at
+  completion by conflicts. Pending is treated as live context for the repo:
+  prompt the user to resume the work (activate_intent) or finalize it
+  (complete_intent) before starting new unrelated work. Inspect "pendingReason"
+  to tell the user WHY the intent went pending — "sweeper-auto-finalize"
+  (24h idle) or "sweeper-blocked-conflicts" (decisions contradicted standards
+  on the auto-finalize attempt).`,
     inputSchema: checkActiveIntentSchema,
     handler: checkActiveIntent
 };

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;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"}
+{"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;AACnD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE3E,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;IAClE,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAuCF,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;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,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,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,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;;;;;;;;;;;;;;;;;;iCAkBkB;IAC/B,WAAW,EAAE,uBAAuB;IACpC,OAAO,EAAE,iBAAiB;CAC3B,CAAA"}

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

@@ -1,5 +1,19 @@
 import { z } from 'zod';
 export declare const completeIntentSchema: 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;
     intentId: z.ZodOptional<z.ZodString>;
@@ -7,34 +21,119 @@ export declare const completeIntentSchema: z.ZodObject<{
     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" | "superseded";
+    repoPath: string;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
     intentId?: string | undefined;
     commitSha?: string | undefined;
     supersededBy?: string | undefined;
 }, {
     repoPath: string;
-    repoOrigin?: string | undefined;
     status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
     intentId?: string | undefined;
     commitSha?: string | undefined;
     supersededBy?: string | undefined;
 }>;
 export type CompleteIntentInput = z.infer<typeof completeIntentSchema>;
+/**
+ * One contradiction between a distilled proposed decision and an existing
+ * standard decision in the repo. Surfaced when distillation produces decisions
+ * that conflict with previously-recorded ones (PRD §5.2 step 5b / §7.2).
+ */
+export interface ConflictMatch {
+    proposedDecisionSummary: string;
+    proposedDecisionRationale: string;
+    conflictsWith: {
+        decisionId: string;
+        summary: string;
+        intentTitle?: string;
+        author?: string;
+    };
+    sharedConcern?: string;
+    description?: string;
+}
 export interface CompleteIntentResponse {
     success: boolean;
     intentId: string;
     previousStatus: string;
+    /**
+     * The status after this call. Stays "active" when distillation surfaces
+     * conflicts (PRD §5.2 step 5b — no decisions written, no transition).
+     */
     newStatus: string;
     commitSha?: string;
     message: string;
+    /**
+     * Number of distilled standard decisions written to the API on a clean
+     * completion. Omitted when there were no ephemerals, when the v2 pipeline
+     * is disabled, or when conflicts blocked the write.
+     *
+     * Decision *content* is intentionally not surfaced here — it's already
+     * visible via the orchestration panel and via get_intent_decisions /
+     * get_relevant_context. Inlining the full list would just duplicate that
+     * channel and add noise to the agent's reply.
+     */
+    committedDecisionCount?: number;
+    /**
+     * Non-empty when the proposed-decision distillation contradicted existing
+     * standard decisions. Each entry pairs the proposed decision with the
+     * specific standard decision it contradicts, so the agent can surface the
+     * pair to the user. When conflicts is non-empty, success=false and
+     * newStatus stays "active" — the user resolves and retries.
+     */
+    conflicts?: ConflictMatch[];
+    /**
+     * Set when success=false to discriminate between:
+     *  - "conflicts" → see `conflicts[]`
+     *  - "transient-failure" → distiller LLM call or /check-conflicts API errored;
+     *     `failedStage` and `error` carry diagnostics, the user retries.
+     */
+    reason?: 'conflicts' | 'transient-failure';
+    failedStage?: string;
+    error?: string;
+    /**
+     * Phase 3.5 — true when an API write call (decisions/sync, intents/PATCH)
+     * was queued for later replay because the API was unreachable. Work is
+     * "done" from the user's perspective; surface a heads-up. `deferredStages`
+     * names which write(s) were queued.
+     */
+    apiSyncDeferred?: boolean;
+    deferredStages?: string[];
+    deferredDecisionCount?: number;
+    deferredError?: string;
 }
 export declare function completeIntent(input: CompleteIntentInput): Promise<CompleteIntentResponse>;
 export declare const completeIntentTool: {
     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;
         intentId: z.ZodOptional<z.ZodString>;
@@ -42,16 +141,28 @@ export declare const completeIntentTool: {
         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" | "superseded";
+        repoPath: string;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;
     }, {
         repoPath: string;
-        repoOrigin?: string | undefined;
         status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;