@kawacode/mcp 6.1.5 → 6.8.0

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

@@ -2,6 +2,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';
+import { emitInjection, estimateTokens } from '../telemetry.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'),
@@ -13,33 +14,64 @@ export async function checkActiveIntent(input) {
         repoOrigin: actualOrigin,
         ...extractForkFields(input),
     });
-    // Muninn returns { hasActiveIntent, intentId, intent }
+    // Muninn returns { hasActiveIntent, intentId, intent, activeIntents }.
+    // The active set is present regardless of whether THIS session has a current.
+    const activeIntents = Array.isArray(res.activeIntents)
+        ? res.activeIntents.map((it) => ({
+            id: it.id || it._id || '',
+            title: it.title || '',
+            status: it.status || 'active',
+            createdBy: it.createdBy || undefined,
+            author: it.authorInfo?.name || it.author || undefined,
+        }))
+        : [];
     const intent = res.intent;
+    let response;
     if (!intent) {
-        return { hasActiveIntent: false };
+        response = { hasActiveIntent: false, activeIntents };
     }
-    return {
-        hasActiveIntent: true,
-        intent: {
-            id: intent.id || res.intentId || '',
-            title: intent.title || '',
-            description: intent.description || '',
-            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
-        }
-    };
+    else {
+        response = {
+            hasActiveIntent: true,
+            activeIntents,
+            intent: {
+                id: intent.id || res.intentId || '',
+                title: intent.title || '',
+                description: intent.description || '',
+                templateType: (intent.templateType || 'feature'),
+                constraints: intent.constraints || [],
+                status: intent.status || 'active',
+                branch: intent.branch || '',
+                forkedFrom: intent.forkedFrom,
+                blocks: [] // Blocks are tracked separately by intent-block service
+            }
+        };
+    }
+    // Track-B injection telemetry (VALUE_METRICS Phase 2): size the serialized
+    // result (≈ chars/4); itemCount = active-set size + 1 if this session has a
+    // current intent. Fire-and-forget — never blocks the tool result.
+    void emitInjection({
+        type: 'check_active',
+        tokensEst: estimateTokens(JSON.stringify(response)),
+        itemCount: activeIntents.length + (intent ? 1 : 0),
+        repoOrigin: actualOrigin,
+    });
+    return response;
 }
 export const checkActiveIntentTool = {
     name: 'check_active_intent',
     description: `REQUIRED: Call this tool BEFORE writing any code.
 
-Returns the currently active intent if one exists. If no active intent is set,
-you should ask the user to confirm intent details and then call create_and_activate_intent.
+Returns THIS session's current intent (\`intent\` / \`hasActiveIntent\`) if one is
+set. If not, ask the user to confirm intent details and then call
+create_and_activate_intent.
+
+Multi-active model: the active intent is PER SESSION. Many intents can be active
+on a repo at once — your current is independent of other sessions'/teammates'.
+The response also includes \`activeIntents\`: the repo's full active set (every
+session's current intent, with id/title/status/createdBy/author) for awareness
+and orchestration. \`hasActiveIntent\` reflects only YOUR session; \`activeIntents\`
+may be non-empty even when you have no current.
 
 An active intent tracks what the user is working on, enabling:
 - Better code context for AI-generated changes
@@ -47,14 +79,9 @@ An active intent tracks what the user is working on, enabling:
 - 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).`,
+- "active" — normal, in-progress. A stale intent simply stays "active"; the
+  sweeper preserves its work without any status transition.
+- terminal states — committed / pushed / done / abandoned / superseded.`,
     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;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"}
+{"version":3,"file":"check-active-intent.js","sourceRoot":"","sources":["../../src/tools/check-active-intent.ts"],"names":[],"mappings":"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"}

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

@@ -20,6 +20,7 @@ export declare const completeIntentSchema: z.ZodObject<{
     commitSha: z.ZodOptional<z.ZodString>;
     status: z.ZodDefault<z.ZodEnum<["committed", "pushed", "done", "abandoned", "superseded"]>>;
     supersededBy: z.ZodOptional<z.ZodString>;
+    humanApproved: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     status: "committed" | "pushed" | "done" | "abandoned" | "superseded";
     repoPath: string;
@@ -33,6 +34,7 @@ export declare const completeIntentSchema: z.ZodObject<{
     intentId?: string | undefined;
     commitSha?: string | undefined;
     supersededBy?: string | undefined;
+    humanApproved?: boolean | undefined;
 }, {
     repoPath: string;
     status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
@@ -46,14 +48,20 @@ export declare const completeIntentSchema: z.ZodObject<{
     intentId?: string | undefined;
     commitSha?: string | undefined;
     supersededBy?: string | undefined;
+    humanApproved?: boolean | 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).
+ * that conflict with previously-recorded ones. Since COMPLETION_CONFLICT_DECOUPLE.md
+ * these no longer block completion — the commit (status + blocks) already landed;
+ * each conflicting decision is *parked* for an async disposition in the
+ * Orchestration panel (supersede / keep-both / reject).
  */
 export interface ConflictMatch {
+    /** Stable distillation id of the proposed decision; the panel keys the disposition on it. */
+    proposedDecisionId?: string;
     proposedDecisionSummary: string;
     proposedDecisionRationale: string;
     conflictsWith: {
@@ -65,6 +73,22 @@ export interface ConflictMatch {
     sharedConcern?: string;
     description?: string;
 }
+/**
+ * A live collaborator (HAI: teammate or AI agent) whose published in-progress
+ * diff overlaps the work just completed, grouped by HAI across all files
+ * (Layer C completion-time collision query). Advisory awareness only — it does
+ * not block completion; the overlap is exact (both sides are in the shared
+ * baseline / cSHA line-space).
+ */
+export interface CompletionCollision {
+    uid: string;
+    isAgent: boolean;
+    label: string;
+    files: {
+        fpath: string;
+        ranges: number[][];
+    }[];
+}
 export interface CompleteIntentResponse {
     success: boolean;
     intentId: string;
@@ -88,20 +112,19 @@ export interface CompleteIntentResponse {
      */
     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.
+     * Non-empty when distillation produced decisions that contradict existing
+     * standards. Since COMPLETION_CONFLICT_DECOUPLE.md the completion still
+     * SUCCEEDED (success=true, status flipped, blocks captured) — these decisions
+     * are *deferred*: parked for an async disposition in the Orchestration panel
+     * (supersede / keep-both / reject). There is nothing to retry.
      */
-    conflicts?: ConflictMatch[];
+    deferredConflicts?: ConflictMatch[];
     /**
-     * Set when success=false to discriminate between:
-     *  - "conflicts" → see `conflicts[]`
+     * Set when success=false to discriminate the failure mode:
      *  - "transient-failure" → distiller LLM call or /check-conflicts API errored;
      *     `failedStage` and `error` carry diagnostics, the user retries.
      */
-    reason?: 'conflicts' | 'transient-failure';
+    reason?: 'transient-failure';
     failedStage?: string;
     error?: string;
     /**
@@ -114,6 +137,13 @@ export interface CompleteIntentResponse {
     deferredStages?: string[];
     deferredDecisionCount?: number;
     deferredError?: string;
+    /**
+     * Layer C completion-time collision query: live HAIs whose published diffs
+     * overlap the work just completed (grouped by HAI). Present only on a
+     * successful completion when at least one overlap exists. Advisory — surface
+     * it to the user as a coordination heads-up; it does not affect success.
+     */
+    collisions?: CompletionCollision[];
 }
 export declare function completeIntent(input: CompleteIntentInput): Promise<CompleteIntentResponse>;
 export declare const completeIntentTool: {
@@ -140,6 +170,7 @@ export declare const completeIntentTool: {
         commitSha: z.ZodOptional<z.ZodString>;
         status: z.ZodDefault<z.ZodEnum<["committed", "pushed", "done", "abandoned", "superseded"]>>;
         supersededBy: z.ZodOptional<z.ZodString>;
+        humanApproved: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         status: "committed" | "pushed" | "done" | "abandoned" | "superseded";
         repoPath: string;
@@ -153,6 +184,7 @@ export declare const completeIntentTool: {
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;
+        humanApproved?: boolean | undefined;
     }, {
         repoPath: string;
         status?: "committed" | "pushed" | "done" | "abandoned" | "superseded" | undefined;
@@ -166,6 +198,7 @@ export declare const completeIntentTool: {
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;
+        humanApproved?: boolean | undefined;
     }>;
     handler: typeof completeIntent;
 };

package/build/tools/complete-intent.js

@@ -5,41 +5,23 @@ 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'),
-    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).'),
+    intentId: z.string().optional().describe('Target intent to complete/abandon. When omitted, completes THIS session\'s current intent. When provided, targets that specific intent directly — this is how you force-close an intent that is not your current one (e.g. another session\'s). Completing an intent created by ANOTHER team member additionally requires humanApproved=true (see below).'),
     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".'),
+    humanApproved: z.boolean().optional().describe('Set to true ONLY when the human has explicitly confirmed closing an intent created by ANOTHER team member. Required for that cross-author case; ignored for your own intents. NEVER set this on your own initiative — always ask the user first and only set it after they approve.'),
     ...forkFieldsExtensions,
 });
 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.`
-            };
-        }
-    }
+    // Multi-active model (IMPLEMENTATION_PLAN_MULTI_ACTIVE_INTENTS.md §7): `intentId`
+    // is a TARGET, forwarded to Muninn directly. When omitted, Muninn completes this
+    // session's current pointer; when provided, it targets that specific intent
+    // (force-close). There is no per-repo single "active" intent to verify against
+    // anymore, so the old get-active match-or-reject guard is gone. The same-user vs
+    // cross-user authorization (and the humanApproved requirement for closing a
+    // teammate's intent) is hard-enforced API-side.
     // Muninn's v2 distillation pipeline (Sonnet distill + per-pair Haiku conflict
     // judge + recall embeddings) can run well past the 30s default — measured
     // 51s for superseded on an M3 (see kawa.muninn intent.rs). Override the
@@ -49,53 +31,27 @@ export async function completeIntent(input) {
     const COMPLETE_TIMEOUT_MS = 180_000;
     const res = await request('intent', 'complete', {
         repoOrigin: actualOrigin,
+        intentId: input.intentId,
         status: input.status,
         commitSha: input.commitSha,
         supersededBy: input.supersededBy,
+        humanApproved: input.humanApproved,
         ...extractForkFields(input),
     }, COMPLETE_TIMEOUT_MS);
     const intentId = res.intentId || '';
     const intentTitle = res.intentTitle || 'Intent';
     const previousStatus = res.previousStatus || 'active';
     const success = res.success !== false;
-    const conflicts = Array.isArray(res.conflicts) ? res.conflicts : [];
+    const deferredConflicts = Array.isArray(res.deferredConflicts) ? res.deferredConflicts : [];
     const committedDecisionCount = typeof res.committedDecisionCount === 'number' ? res.committedDecisionCount : undefined;
-    const reason = res.reason === 'conflicts' || res.reason === 'transient-failure' ? res.reason : undefined;
+    const reason = 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.
+    const completionCollisions = Array.isArray(res.collisions) ? res.collisions : [];
+    // Branch on the outcome shape — 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') {
+    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';
@@ -130,7 +86,21 @@ export async function completeIntent(input) {
         const deferredPart = apiSyncDeferred
             ? ` — API sync deferred (${(res.deferredStages || []).join(', ')}); will retry on the next sync tick`
             : '';
-        message = statusMsg + shaPart + distilledPart + deferredPart;
+        // Layer C: a live HAI's in-progress diff overlaps the work just completed.
+        // Advisory coordination heads-up appended to the success message.
+        const collisionPart = completionCollisions.length > 0
+            ? ` — heads-up: ${completionCollisions.length} live collaborator(s) overlap this work: ` +
+                completionCollisions
+                    .map(c => `${c.label}${c.isAgent ? ' (agent)' : ''} on ${c.files.map(f => f.fpath).join(', ')}`)
+                    .join('; ')
+            : '';
+        // COMPLETION_CONFLICT_DECOUPLE.md: distilled decisions that conflicted with
+        // standards did NOT block the completion — they're parked for a disposition
+        // in the Orchestration panel. Surface the count; there is nothing to retry.
+        const deferredConflictPart = deferredConflicts.length > 0
+            ? ` — ${deferredConflicts.length} distilled decision(s) need a disposition in the Orchestration panel (supersede / keep-both / reject)`
+            : '';
+        message = statusMsg + shaPart + distilledPart + deferredPart + collisionPart + deferredConflictPart;
     }
     return {
         success,
@@ -140,7 +110,7 @@ export async function completeIntent(input) {
         commitSha: input.commitSha,
         message,
         committedDecisionCount,
-        conflicts: conflicts.length > 0 ? conflicts : undefined,
+        deferredConflicts: deferredConflicts.length > 0 ? deferredConflicts : undefined,
         reason,
         failedStage: res.failedStage,
         error: res.error,
@@ -148,6 +118,7 @@ export async function completeIntent(input) {
         deferredStages: Array.isArray(res.deferredStages) ? res.deferredStages : undefined,
         deferredDecisionCount: typeof res.deferredDecisionCount === 'number' ? res.deferredDecisionCount : undefined,
         deferredError: res.deferredError,
+        collisions: completionCollisions.length > 0 ? completionCollisions : undefined,
     };
 }
 export const completeIntentTool = {
@@ -165,7 +136,7 @@ Status values:
 - "done": Work is fully complete
 - "abandoned": Work was discarded without committing
 
-REQUIRED: Inspect the response after calling this tool. Four outcomes:
+REQUIRED: Inspect the response after calling this tool. Three outcomes:
 
 1. response.success === true:
    The task is complete. Briefly acknowledge the commit and — if
@@ -175,33 +146,29 @@ REQUIRED: Inspect the response after calling this tool. Four outcomes:
    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.
+   If response.collisions is non-empty, a live collaborator's (HAI's)
+   in-progress edits overlap the work you just completed — surface it as a
+   coordination heads-up (who, and which files), naming response.collisions[].label
+   and the files. It's advisory, not a failure; the completion still succeeded.
+   If response.deferredConflicts is non-empty, the distillation produced N
+   decisions that conflict with existing standards — the completion STILL
+   SUCCEEDED (the commit landed: status flipped, code blocks captured). Those
+   decisions are deferred: parked for a disposition in the Orchestration panel,
+   where the user picks per decision: supersede the standard, keep both (records
+   a "contradicts" edge for a deliberate divergence / false positive), or reject
+   the distilled decision. Tell the user "N decision(s) need a disposition in
+   the panel." There is NOTHING to retry — do NOT re-run complete_intent.
 
-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":
+2. 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.`,
+3. In a non-interactive (autonomous) session: if response.deferredConflicts is
+   non-empty, log it at INFO and continue — the commit already landed and the
+   decisions await disposition in the panel. There is no blocking state.`,
     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

@@ -65,32 +65,12 @@ 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' | 'lock_conflict' | 'pending_blocked';
+    action: 'created' | 'reactivated' | 'conflict';
     message: string;
     conflicts?: ConflictInfo[];
-    lockConflict?: ActiveIntentLockConflict;
-    pendingIntent?: PendingIntentBlocking;
 }
 export declare function createAndActivateIntent(input: CreateIntentInput): Promise<CreateIntentResponse>;
 export declare const createAndActivateIntentTool: {