@kawacode/mcp 5.2.2 → 6.0.0

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;

package/build/tools/complete-intent.js

@@ -1,6 +1,7 @@
 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 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'),
@@ -8,7 +9,8 @@ export const completeIntentSchema = z.object({
     commitSha: z.string().optional().describe('The git commit SHA to associate with this intent (if already committed)'),
     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".')
+    supersededBy: z.string().optional().describe('Intent ID that supersedes this one. Required when status is "superseded".'),
+    ...forkFieldsExtensions,
 });
 export async function completeIntent(input) {
     const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
@@ -43,23 +45,102 @@ export async function completeIntent(input) {
         status: input.status,
         commitSha: input.commitSha,
         supersededBy: input.supersededBy,
+        ...extractForkFields(input),
     });
     const intentId = res.intentId || '';
     const intentTitle = res.intentTitle || 'Intent';
     const previousStatus = res.previousStatus || 'active';
-    const statusMessages = {
-        committed: `Intent "${intentTitle}" marked as committed`,
-        pushed: `Intent "${intentTitle}" marked as pushed`,
-        done: `Intent "${intentTitle}" marked as done`,
-        abandoned: `Intent "${intentTitle}" abandoned`
-    };
+    const success = res.success !== false;
+    const conflicts = Array.isArray(res.conflicts) ? res.conflicts : [];
+    const committedDecisionCount = typeof res.committedDecisionCount === 'number' ? res.committedDecisionCount : undefined;
+    const reason = res.reason === 'conflicts' || res.reason === 'transient-failure' ? res.reason : undefined;
+    const apiSyncDeferred = res.apiSyncDeferred === true;
+    // Branch on the four §7.2 / §7.3 outcome shapes — pick the message that
+    // tells the agent exactly what to surface to the user.
+    let newStatus;
+    let message;
+    if (!success && reason === 'conflicts') {
+        // PRD §5.2 step 5b — distilled decisions contradicted standards. No write,
+        // no transition, bucket preserved. The agent's job is to surface each
+        // conflict to the user and ask how to resolve.
+        newStatus = res.status || 'active';
+        const lines = [
+            `Cannot complete: ${conflicts.length} conflict(s) between proposed decisions and existing standards.`,
+            '',
+            'For each conflict below, surface BOTH sides side-by-side to the user and ask how to resolve.',
+            'Common resolution paths:',
+            '  (A) Record a superseding decision: record_decision(type="fork", supersedes=["<existing-decision-id>"], rationale=...). Then retry complete_intent.',
+            '  (B) Abandon the intent: complete_intent(status="abandoned"). Decisions are soft-deleted but recoverable via activate_intent.',
+            '  (C) Keep the intent active and continue working.',
+            '',
+            'DO NOT silently retry — every retry runs the distiller again and produces the same conflicts.',
+            '',
+        ];
+        conflicts.forEach((c, i) => {
+            lines.push(`[${i + 1}] Proposed: ${c.proposedDecisionSummary}`);
+            const cw = c.conflictsWith || {};
+            const author = cw.author ? ` by ${cw.author}` : '';
+            const intentPart = cw.intentTitle ? ` (intent: "${cw.intentTitle}")` : '';
+            lines.push(`    Conflicts with: ${cw.summary || cw.decisionId || '(unknown)'}${intentPart}${author}`);
+            if (c.description)
+                lines.push(`    ${c.description}`);
+            lines.push('');
+        });
+        message = lines.join('\n');
+    }
+    else if (!success && reason === 'transient-failure') {
+        // Distiller LLM error or /check-conflicts API error. Bucket re-populated,
+        // intent stays active. User decides whether to wait + retry or abandon.
+        newStatus = res.status || 'active';
+        const stage = res.failedStage ? ` (${res.failedStage})` : '';
+        const errPart = res.error ? `: ${res.error}` : '';
+        message =
+            `Could not complete intent "${intentTitle}" — transient failure${stage}${errPart}. ` +
+                `The ephemerals were preserved. Wait for the underlying issue to clear, then retry complete_intent. ` +
+                `If retrying repeatedly fails, the user can abandon the intent (complete_intent(status="abandoned")).`;
+    }
+    else if (!success) {
+        // Catch-all for legacy / unexpected error shapes.
+        newStatus = res.newStatus || res.status || input.status;
+        message = `Failed to complete intent "${intentTitle}".`;
+    }
+    else {
+        // Clean completion. Note: Phase 3.5 may have queued writes for later
+        // replay — the response is success=true but apiSyncDeferred=true.
+        newStatus = res.newStatus || input.status;
+        const statusMessages = {
+            committed: `Intent "${intentTitle}" marked as committed`,
+            pushed: `Intent "${intentTitle}" marked as pushed`,
+            done: `Intent "${intentTitle}" marked as done`,
+            abandoned: `Intent "${intentTitle}" abandoned`,
+            superseded: `Intent "${intentTitle}" marked as superseded`,
+        };
+        const statusMsg = statusMessages[input.status] || `Intent "${intentTitle}" updated`;
+        const shaPart = input.commitSha ? ` (commit: ${input.commitSha.substring(0, 7)})` : '';
+        const distilledPart = committedDecisionCount && committedDecisionCount > 0
+            ? ` — ${committedDecisionCount} distilled decision(s) recorded`
+            : '';
+        const deferredPart = apiSyncDeferred
+            ? ` — API sync deferred (${(res.deferredStages || []).join(', ')}); will retry on the next sync tick`
+            : '';
+        message = statusMsg + shaPart + distilledPart + deferredPart;
+    }
     return {
-        success: res.success !== false,
+        success,
         intentId,
         previousStatus,
-        newStatus: input.status,
+        newStatus,
         commitSha: input.commitSha,
-        message: statusMessages[input.status] + (input.commitSha ? ` (commit: ${input.commitSha.substring(0, 7)})` : '')
+        message,
+        committedDecisionCount,
+        conflicts: conflicts.length > 0 ? conflicts : undefined,
+        reason,
+        failedStage: res.failedStage,
+        error: res.error,
+        apiSyncDeferred: apiSyncDeferred ? true : undefined,
+        deferredStages: Array.isArray(res.deferredStages) ? res.deferredStages : undefined,
+        deferredDecisionCount: typeof res.deferredDecisionCount === 'number' ? res.deferredDecisionCount : undefined,
+        deferredError: res.deferredError,
     };
 }
 export const completeIntentTool = {
@@ -75,7 +156,45 @@ Status values:
 - "committed": Code is committed locally (default)
 - "pushed": Code has been pushed to remote
 - "done": Work is fully complete
-- "abandoned": Work was discarded without committing`,
+- "abandoned": Work was discarded without committing
+
+REQUIRED: Inspect the response after calling this tool. Four outcomes:
+
+1. response.success === true:
+   The task is complete. Briefly acknowledge the commit and — if
+   response.committedDecisionCount > 0 — mention that N distilled architectural
+   decisions were recorded for the intent. Do NOT enumerate the decisions
+   inline; they're visible via the orchestration panel and via
+   get_intent_decisions / get_relevant_context if the user wants details.
+   If response.apiSyncDeferred === true, also mention that the API sync was
+   deferred; the queued writes will replay on the next sync tick.
+
+2. response.success === false AND response.conflicts is non-empty:
+   The distillation produced decisions that contradict existing standards in
+   this repo. Status stays "active" and NO decisions were written.
+   Surface EACH conflict to the user with the proposed decision and the
+   conflicting standard decision side-by-side. Then ask the user how to
+   resolve. Common options to suggest:
+     (A) Record a superseding decision via record_decision(type="fork",
+         supersedes=["<existing-decision-id>"], rationale=...). Then retry
+         complete_intent — the distiller may now find the new superseding
+         decision in recall and the conflict resolves.
+     (B) Abandon the intent: complete_intent(status="abandoned"). Decisions
+         are soft-deleted but recoverable via activate_intent if the user
+         changes their mind.
+     (C) Keep the intent active and continue working.
+   DO NOT silently retry — every retry runs the distiller (and the per-pair
+   judge) again. Wait for the user's decision.
+
+3. response.success === false AND response.reason === "transient-failure":
+   The distiller LLM call or the conflict-check API call errored. The
+   ephemerals are preserved (the bucket is intact), and the intent stays
+   "active". Tell the user the failure stage (response.failedStage) and the
+   underlying error, then suggest retrying once the issue clears, or
+   abandoning if the failure persists.
+
+4. In a non-interactive (autonomous) session: log the conflicts at WARN level
+   and leave the intent active. A human review path exists via the panel.`,
     inputSchema: completeIntentSchema,
     handler: completeIntent
 };

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

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

@@ -1,5 +1,19 @@
 import { z } from 'zod';
 export declare const createAndActivateIntentSchema: 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;
     title: z.ZodString;
@@ -14,12 +28,24 @@ export declare const createAndActivateIntentSchema: z.ZodObject<{
     templateType: "feature" | "refactor" | "exploration";
     force: boolean;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
     constraints?: string[] | undefined;
 }, {
     repoPath: string;
     title: string;
     description: string;
     repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
     templateType?: "feature" | "refactor" | "exploration" | undefined;
     constraints?: string[] | undefined;
     force?: boolean | undefined;
@@ -39,18 +65,52 @@ interface ConflictInfo {
     oppositionDetected: boolean;
     oppositionDetail: string | null;
 }
+export interface ActiveIntentLockConflict {
+    existingIntentId: string;
+    title?: string;
+    createdBy?: string;
+    author?: string;
+}
+/**
+ * Soft-lock surfaced when a `pending` intent blocks creating a new one on
+ * the same repo. PRD_AGENT_COORDINATION_LAYER_02 §6.3 — the agent must prompt
+ * the user to abandon-or-finalize the pending one before proceeding.
+ */
+export interface PendingIntentBlocking {
+    intentId: string;
+    title?: string;
+    pendingReason?: string;
+    lastActivityAt?: string;
+    distilledDecisionCount?: number;
+}
 export interface CreateIntentResponse {
     success: boolean;
     intentId: string;
-    action: 'created' | 'reactivated' | 'conflict';
+    action: 'created' | 'reactivated' | 'conflict' | 'lock_conflict' | 'pending_blocked';
     message: string;
     conflicts?: ConflictInfo[];
+    lockConflict?: ActiveIntentLockConflict;
+    pendingIntent?: PendingIntentBlocking;
 }
 export declare function createAndActivateIntent(input: CreateIntentInput): Promise<CreateIntentResponse>;
 export declare const createAndActivateIntentTool: {
     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;
         title: z.ZodString;
@@ -65,12 +125,24 @@ export declare const createAndActivateIntentTool: {
         templateType: "feature" | "refactor" | "exploration";
         force: boolean;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
         constraints?: string[] | undefined;
     }, {
         repoPath: string;
         title: string;
         description: string;
         repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
         templateType?: "feature" | "refactor" | "exploration" | undefined;
         constraints?: string[] | undefined;
         force?: boolean | undefined;

package/build/tools/create-intent.js

@@ -1,6 +1,7 @@
 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 createAndActivateIntentSchema = 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'),
@@ -9,13 +10,12 @@ export const createAndActivateIntentSchema = z.object({
     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'),
     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.'),
+    ...forkFieldsExtensions,
 });
 export async function createAndActivateIntent(input) {
     const actualOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
-    // 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.
+    // Step 1: Create the intent. If a sufficiently similar one already exists, the
+    // server may reactivate it instead of creating a duplicate.
     const createRes = await request('intent', 'create', {
         repoOrigin: actualOrigin,
         title: input.title,
@@ -24,7 +24,14 @@ export async function createAndActivateIntent(input) {
         constraints: input.constraints || [],
         scope: { type: 'repo', paths: [] },
         force: input.force || false,
+        ...extractForkFields(input),
     });
+    // Pending-intent soft lock — surfaced before any API write per PRD §6.3.
+    // The agent's job is to ask the user to dispose of the pending one before
+    // proceeding. force=true bypasses this for autonomous runs.
+    if (createRes.pendingIntentBlocking) {
+        return buildPendingBlockedResponse(createRes.pendingIntentBlocking);
+    }
     // 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.
@@ -67,11 +74,38 @@ export async function createAndActivateIntent(input) {
         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', {
+    // Step 2: Set it as active.
+    // The per-repo lock may reject this step even though the intent itself was created —
+    // forward force to Muninn and surface the lock conflict separately from the
+    // content-similarity conflict that createRes handles above.
+    const setRes = await request('intent', 'set-active', {
         repoOrigin: actualOrigin,
         intentId,
+        force: input.force || false,
+        ...extractForkFields(input),
     });
+    // The set-active step has its own pending-intent soft-lock check (the lock
+    // holder may have transitioned to pending between steps 1 and 2, or the
+    // pre-check on create may have been skipped because the active intent was
+    // not the lock holder). Surface the same shaped response.
+    if (setRes.pendingIntentBlocking) {
+        return buildPendingBlockedResponse(setRes.pendingIntentBlocking, intentId);
+    }
+    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,
+            action: 'lock_conflict',
+            lockConflict,
+            message: `Intent "${input.title}" was ${action} (id: ${intentId.substring(0, 8)}), but could not be activated: ` +
+                `repo already owns intent ${idShort}${titlePart}${who}. ` +
+                `Retry with force=true to take over, complete_intent on ${idShort} first, or abandon this new intent.`,
+        };
+    }
     const message = action === 'reactivated'
         ? `Reactivated existing similar intent: "${input.title}" — resuming previous work instead of creating a duplicate.`
         : `Created and activated intent: "${input.title}"`;
@@ -82,6 +116,49 @@ export async function createAndActivateIntent(input) {
         message,
     };
 }
+function buildPendingBlockedResponse(blocker, intentId = '') {
+    const pendingIntent = {
+        intentId: blocker.intentId || '',
+        title: blocker.title || undefined,
+        pendingReason: blocker.pendingReason || undefined,
+        lastActivityAt: blocker.lastActivityAt || undefined,
+        distilledDecisionCount: typeof blocker.distilledDecisionCount === 'number'
+            ? blocker.distilledDecisionCount
+            : undefined,
+    };
+    const idShort = pendingIntent.intentId ? pendingIntent.intentId.substring(0, 8) : 'pending';
+    const titlePart = pendingIntent.title ? ` "${pendingIntent.title}"` : '';
+    const reasonPart = pendingIntent.pendingReason ? ` (reason: ${pendingIntent.pendingReason})` : '';
+    return {
+        success: false,
+        intentId,
+        action: 'pending_blocked',
+        pendingIntent,
+        message: `Pending intent ${idShort}${titlePart}${reasonPart} exists on this repo. ` +
+            `Ask the user how to proceed: ` +
+            `(A) abandon it via complete_intent(intentId="${pendingIntent.intentId}", status="abandoned"), ` +
+            `(C) complete and finalize it via complete_intent(intentId="${pendingIntent.intentId}", status="committed"), ` +
+            `then retry. To proceed without prompting, retry with force=true.`,
+    };
+}
+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 createAndActivateIntentTool = {
     name: 'create_and_activate_intent',
     description: `Create a new intent from the user's request and mark it as active.
@@ -95,7 +172,28 @@ 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.`,
+force=true to bypass conflict detection.
+
+Three distinct block types exist:
+
+- action="conflict": content-similarity conflict from intent creation (another
+  team member's intent overlaps semantically or in files). Bypassed by
+  force=true after the user reviews and chooses to proceed.
+
+- action="lock_conflict": per-repo active-intent lock — another session on this
+  repo already owns the active intent slot. The new intent was still created
+  and can be activated later; or call complete_intent on the existing one first.
+  Bypassed by force=true (takes over the active slot).
+
+- action="pending_blocked": a "pending" intent exists on this repo (auto-finalized
+  by the orphan-recovery sweeper, or blocked by conflicts at completion). Surface
+  the pendingIntent details to the user and ask how to dispose of it before
+  starting new work:
+  (A) Abandon it: call complete_intent(intentId=..., status="abandoned").
+  (C) Complete and finalize: call complete_intent(intentId=..., status="committed").
+  After the user decides and the pending intent is disposed, retry create_and_activate_intent.
+  In autonomous (non-interactive) sessions, retry with force=true to proceed
+  without prompting — the pending intent stays pending.`,
     inputSchema: createAndActivateIntentSchema,
     handler: createAndActivateIntent
 };