@kawacode/mcp 5.2.2 → 6.0.0

package/build/kawacode-on-stop.d.ts

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+/**
+ * kawacode-on-stop — Claude Code Stop hook dispatcher.
+ *
+ * Reads the Stop hook payload from stdin (session_id, transcript_path, cwd)
+ * and sends two short IPCs to Muninn:
+ *
+ *   1. capture-thoughts:capture { sessionId, transcriptPath, cwd }
+ *        → Muninn reads the transcript, filters thinking blocks, appends
+ *          JSONL to ~/.kawa-code/thoughts/active/session-{id}.jsonl
+ *   2. extractor:trigger { session_id, cwd }
+ *        → Muninn wakes the (debounced) extractor service which reads the
+ *          fresh JSONL and emits ephemeral decisions.
+ *
+ * Replaces the legacy kawacode-capture-thoughts (Node CLI that did the file
+ * I/O itself, never merged to main) AND kawacode-extract-trigger (separate
+ * Node CLI that did the second IPC). The whole capture pipeline now lives
+ * in Muninn — this dispatcher's only job is to fire the two pings.
+ *
+ * Failure discipline: every error path exits 0. Claude Code's Stop hook
+ * must never block the turn loop on capture failure. This is the ONLY
+ * place fail-soft is allowed under the no-Muninn-independence rule —
+ * because the hook script is the boundary between the harness (which
+ * can't recover) and Muninn (which can re-derive missing captures from
+ * the transcript on the next Stop).
+ *
+ * Opt out with KAWA_THOUGHT_CAPTURE=off.
+ */
+export {};

package/build/kawacode-on-stop.js

@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+/**
+ * kawacode-on-stop — Claude Code Stop hook dispatcher.
+ *
+ * Reads the Stop hook payload from stdin (session_id, transcript_path, cwd)
+ * and sends two short IPCs to Muninn:
+ *
+ *   1. capture-thoughts:capture { sessionId, transcriptPath, cwd }
+ *        → Muninn reads the transcript, filters thinking blocks, appends
+ *          JSONL to ~/.kawa-code/thoughts/active/session-{id}.jsonl
+ *   2. extractor:trigger { session_id, cwd }
+ *        → Muninn wakes the (debounced) extractor service which reads the
+ *          fresh JSONL and emits ephemeral decisions.
+ *
+ * Replaces the legacy kawacode-capture-thoughts (Node CLI that did the file
+ * I/O itself, never merged to main) AND kawacode-extract-trigger (separate
+ * Node CLI that did the second IPC). The whole capture pipeline now lives
+ * in Muninn — this dispatcher's only job is to fire the two pings.
+ *
+ * Failure discipline: every error path exits 0. Claude Code's Stop hook
+ * must never block the turn loop on capture failure. This is the ONLY
+ * place fail-soft is allowed under the no-Muninn-independence rule —
+ * because the hook script is the boundary between the harness (which
+ * can't recover) and Muninn (which can re-derive missing captures from
+ * the transcript on the next Stop).
+ *
+ * Opt out with KAWA_THOUGHT_CAPTURE=off.
+ */
+import { readFileSync } from 'node:fs';
+import { connectToMuninn, request, disconnect } from './services/muninn-ipc.js';
+function readStdin() {
+    try {
+        return readFileSync(0, 'utf8');
+    }
+    catch {
+        return '';
+    }
+}
+async function main() {
+    if (process.env.KAWA_THOUGHT_CAPTURE === 'off') {
+        process.exit(0);
+    }
+    const raw = readStdin();
+    if (!raw)
+        process.exit(0);
+    let payload;
+    try {
+        payload = JSON.parse(raw);
+    }
+    catch {
+        process.exit(0);
+    }
+    const sessionId = payload.session_id;
+    const transcriptPath = payload.transcript_path;
+    const cwd = payload.cwd;
+    if (!sessionId || !transcriptPath)
+        process.exit(0);
+    try {
+        await connectToMuninn();
+    }
+    catch {
+        // Muninn down. Capture happens whenever Muninn is next up — the
+        // extractor's checkpoint advances on the next successful capture.
+        process.exit(0);
+    }
+    // Fire both IPCs in parallel; each is independent and tolerant of the
+    // other's failure. allSettled because we never want one to short-circuit
+    // the other on transient failure.
+    await Promise.allSettled([
+        request('capture-thoughts', 'capture', {
+            sessionId,
+            transcriptPath,
+            cwd: cwd ?? null,
+        }),
+        request('extractor', 'trigger', {
+            session_id: sessionId,
+            cwd: cwd ?? '',
+        }),
+    ]);
+    disconnect();
+    process.exit(0);
+}
+main().catch(() => process.exit(0));
+//# sourceMappingURL=kawacode-on-stop.js.map

package/build/kawacode-on-stop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kawacode-on-stop.js","sourceRoot":"","sources":["../src/kawacode-on-stop.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAS/E,SAAS,SAAS;IAChB,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAA;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,KAAK,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,MAAM,GAAG,GAAG,SAAS,EAAE,CAAA;IACvB,IAAI,CAAC,GAAG;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAEzB,IAAI,OAAoB,CAAA;IACxB,IAAI,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAA;IACpC,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAA;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;IACvB,IAAI,CAAC,SAAS,IAAI,CAAC,cAAc;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAElD,IAAI,CAAC;QACH,MAAM,eAAe,EAAE,CAAA;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,gEAAgE;QAChE,kEAAkE;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IAED,sEAAsE;IACtE,yEAAyE;IACzE,kCAAkC;IAClC,MAAM,OAAO,CAAC,UAAU,CAAC;QACvB,OAAO,CAAC,kBAAkB,EAAE,SAAS,EAAE;YACrC,SAAS;YACT,cAAc;YACd,GAAG,EAAE,GAAG,IAAI,IAAI;SACjB,CAAC;QACF,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE;YAC9B,UAAU,EAAE,SAAS;YACrB,GAAG,EAAE,GAAG,IAAI,EAAE;SACf,CAAC;KACH,CAAC,CAAA;IAEF,UAAU,EAAE,CAAA;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA"}

package/build/prompts/intent-first-workflow.js

@@ -37,7 +37,7 @@ Before using MCP tools, assess the task complexity. Match your workflow to the t
 | **Before coding** | Check/create intent | \`check_active_intent\`, \`create_and_activate_intent\` |
 | **On "done"/"commit"/"worked"/etc.** | Verify diff → Git commit → Complete | \`get_intent_changes\`, \`complete_intent\` |
 
-> **Note**: Code blocks are attached to the intent automatically when you call \`complete_intent\` with a commit SHA. Muninn reads the commit diff, computes semantic anchors for each modified range, and sends the encrypted blocks to the API in the same call that updates the intent status. There is no manual "assign blocks" step.
+> **Note**: Code blocks are attached to the intent automatically when you call \`complete_intent\` with a commit SHA. There is no manual "assign blocks" step.
 
 **Trigger phrases for commit flow**: "this worked", "let's commit", "done", "close this", "ship it", "looks good"
 
@@ -124,7 +124,7 @@ When the user chooses to commit (or explicitly requests it):
    Intent-ID: <intent-id>
    Co-Authored-By: Claude <noreply@anthropic.com>"
    \`\`\`
-6. **Complete intent**: Call \`complete_intent\` with the commit SHA and status='committed'. Muninn will auto-capture the modified code blocks from the commit diff, compute semantic anchors, and send them together with the status update in one API call.
+6. **Complete intent**: Call \`complete_intent\` with the commit SHA and status='committed'. The modified code blocks are auto-captured and attached to the intent as part of the same call.
 7. **Report**: Tell the user the commit SHA and that the intent is complete
 
 - If user had a new request that triggered the commit, proceed to create a new intent for it

package/build/tools/_fork-fields.d.ts

@@ -0,0 +1,84 @@
+/**
+ * Shared Zod schema fragment for the forkAuthor + workspaceId attribution
+ * fields added in REPO_FORKS_IMPLEMENTATION_PLAN_PHASE_1.md §5.
+ *
+ * Every MCP tool that accepts `repoOrigin` spreads `forkFieldsExtensions`
+ * into its Zod input schema and forwards `extractForkFields(input)` to the
+ * IPC payload. Both fields are OPTIONAL — Muninn resolves them
+ * automatically from `repoPath` (fork detection + workspace registry, §4.2 +
+ * §4.3). Callers only need to pass them in advanced override / testing
+ * scenarios where the desktop app's auto-resolution should be bypassed.
+ *
+ * Keep the field shape in lockstep with:
+ *   - kawa.api/src/models/intents.model.ts / decisions.model.ts
+ *   - kawa.muninn/src-tauri/src/gardener/handlers/intent.rs (OutboundIdentity)
+ *
+ * Drift across repos will cause silent rejection (Yup validators strip
+ * unknown fields on the API side) or runtime errors on the Muninn side.
+ */
+import { z } from 'zod';
+/**
+ * Fork attribution payload. Optional in its entirety; when present, all
+ * three subfields are required (so the API can persist a coherent record).
+ */
+export declare const forkAuthorSchema: 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;
+}>;
+export type ForkAuthor = z.infer<typeof forkAuthorSchema>;
+/**
+ * Spread into each tool's Zod input schema. The two fields are independent —
+ * a tool can accept `workspaceId` alone (override for the override target)
+ * without `forkAuthor` (canonical clone) and vice versa.
+ */
+export declare const forkFieldsExtensions: {
+    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>;
+};
+/**
+ * Subset of a tool input shape carrying just the §5 fields.
+ *
+ * Tools have many other fields; this is the narrow type the
+ * `extractForkFields` helper accepts so it stays usable across all 20 tools
+ * without each one importing a full input type.
+ */
+export interface ForkFieldsInput {
+    forkAuthor?: ForkAuthor;
+    workspaceId?: string;
+}
+/**
+ * Pluck the §5 fields off a tool input for IPC payload forwarding.
+ *
+ * Returns an object suitable for spreading into the `request(...)` call:
+ *
+ *   await request('intent', 'create', {
+ *     repoOrigin: actualOrigin,
+ *     ...extractForkFields(input),
+ *     ...
+ *   })
+ *
+ * Fields are only included when defined, so canonical-clone callers don't
+ * spam Muninn with explicit nulls.
+ */
+export declare function extractForkFields(input: ForkFieldsInput): ForkFieldsInput;

package/build/tools/_fork-fields.js

@@ -0,0 +1,65 @@
+/**
+ * Shared Zod schema fragment for the forkAuthor + workspaceId attribution
+ * fields added in REPO_FORKS_IMPLEMENTATION_PLAN_PHASE_1.md §5.
+ *
+ * Every MCP tool that accepts `repoOrigin` spreads `forkFieldsExtensions`
+ * into its Zod input schema and forwards `extractForkFields(input)` to the
+ * IPC payload. Both fields are OPTIONAL — Muninn resolves them
+ * automatically from `repoPath` (fork detection + workspace registry, §4.2 +
+ * §4.3). Callers only need to pass them in advanced override / testing
+ * scenarios where the desktop app's auto-resolution should be bypassed.
+ *
+ * Keep the field shape in lockstep with:
+ *   - kawa.api/src/models/intents.model.ts / decisions.model.ts
+ *   - kawa.muninn/src-tauri/src/gardener/handlers/intent.rs (OutboundIdentity)
+ *
+ * Drift across repos will cause silent rejection (Yup validators strip
+ * unknown fields on the API side) or runtime errors on the Muninn side.
+ */
+import { z } from 'zod';
+/**
+ * Fork attribution payload. Optional in its entirety; when present, all
+ * three subfields are required (so the API can persist a coherent record).
+ */
+export const forkAuthorSchema = z
+    .object({
+    platform: z.enum(['github', 'gitlab']),
+    user: z.string(),
+    forkOrigin: z.string(),
+})
+    .describe('Fork attribution; usually resolved by Muninn automatically — pass only for override / testing.');
+/**
+ * Spread into each tool's Zod input schema. The two fields are independent —
+ * a tool can accept `workspaceId` alone (override for the override target)
+ * without `forkAuthor` (canonical clone) and vice versa.
+ */
+export const forkFieldsExtensions = {
+    forkAuthor: forkAuthorSchema.optional(),
+    workspaceId: z
+        .string()
+        .optional()
+        .describe('Workspace identifier; usually resolved by Muninn automatically — pass only for override / testing.'),
+};
+/**
+ * Pluck the §5 fields off a tool input for IPC payload forwarding.
+ *
+ * Returns an object suitable for spreading into the `request(...)` call:
+ *
+ *   await request('intent', 'create', {
+ *     repoOrigin: actualOrigin,
+ *     ...extractForkFields(input),
+ *     ...
+ *   })
+ *
+ * Fields are only included when defined, so canonical-clone callers don't
+ * spam Muninn with explicit nulls.
+ */
+export function extractForkFields(input) {
+    const out = {};
+    if (input.forkAuthor !== undefined)
+        out.forkAuthor = input.forkAuthor;
+    if (input.workspaceId !== undefined)
+        out.workspaceId = input.workspaceId;
+    return out;
+}
+//# sourceMappingURL=_fork-fields.js.map

package/build/tools/_fork-fields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_fork-fields.js","sourceRoot":"","sources":["../../src/tools/_fork-fields.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC;KAC9B,MAAM,CAAC;IACN,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;CACvB,CAAC;KACD,QAAQ,CACP,gGAAgG,CACjG,CAAA;AAIH;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,UAAU,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACvC,WAAW,EAAE,CAAC;SACX,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,oGAAoG,CACrG;CACJ,CAAA;AAcD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAsB;IACtD,MAAM,GAAG,GAAoB,EAAE,CAAA;IAC/B,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS;QAAE,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAA;IACrE,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS;QAAE,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;IACxE,OAAO,GAAG,CAAA;AACZ,CAAC"}

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
 };