@kawacode/mcp 6.1.2 → 6.6.1

package/build/tools/arbiter-apply.d.ts

@@ -0,0 +1,132 @@
+import { z } from 'zod';
+export declare const arbiterApplySchema: 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>;
+    repoPath: z.ZodString;
+    repoOrigin: z.ZodOptional<z.ZodString>;
+    intentId: z.ZodOptional<z.ZodString>;
+    overlaps: z.ZodArray<z.ZodObject<{
+        peerUid: z.ZodString;
+        filePath: z.ZodString;
+        ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+    }, "strip", z.ZodTypeAny, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }>, "many">;
+}, "strip", z.ZodTypeAny, {
+    repoPath: string;
+    overlaps: {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }[];
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    intentId?: string | undefined;
+}, {
+    repoPath: string;
+    overlaps: {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }[];
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    intentId?: string | undefined;
+}>;
+export type ArbiterApplyInput = z.infer<typeof arbiterApplySchema>;
+export declare function arbiterApply(input: ArbiterApplyInput): Promise<any>;
+export declare const arbiterApplyTool: {
+    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>;
+        repoPath: z.ZodString;
+        repoOrigin: z.ZodOptional<z.ZodString>;
+        intentId: z.ZodOptional<z.ZodString>;
+        overlaps: z.ZodArray<z.ZodObject<{
+            peerUid: z.ZodString;
+            filePath: z.ZodString;
+            ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+        }, "strip", z.ZodTypeAny, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        repoPath: string;
+        overlaps: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }[];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }, {
+        repoPath: string;
+        overlaps: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }[];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }>;
+    handler: typeof arbiterApply;
+};

package/build/tools/arbiter-apply.js

@@ -0,0 +1,59 @@
+import { z } from 'zod';
+import { request } from '../services/muninn-ipc.js';
+import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.js';
+/**
+ * arbiter_apply — thin forwarder to Muninn `arbiter:apply` (Arbiter v2).
+ * Judges → adversarially verifies → auto-applies only the trivial tier, and ONLY
+ * in an agent-owned worktree. All judgment/verify/write/republish lives in Muninn;
+ * this is a stateless adapter.
+ */
+const overlapSchema = z.object({
+    peerUid: z
+        .string()
+        .describe('The peer HAI whose live edits overlap — a collision `uid` from the Stop report.'),
+    filePath: z.string().describe('File with the overlap, relative to repoPath.'),
+    ranges: z
+        .array(z.array(z.number()))
+        .describe('Overlapping [start, end] line ranges (cSHA line space) from the collision.'),
+});
+export const arbiterApplySchema = z.object({
+    repoPath: z.string().describe('Local path to the repository root'),
+    repoOrigin: z
+        .string()
+        .optional()
+        .describe('Git remote origin URL. Auto-detected from repoPath via git if not provided.'),
+    intentId: z
+        .string()
+        .optional()
+        .describe('Active intent ID (advisory; the auto-resolution decision is recorded under it).'),
+    overlaps: z
+        .array(overlapSchema)
+        .describe('The overlaps to resolve — each { peerUid, filePath, ranges } from the Stop collision report.'),
+    ...forkFieldsExtensions,
+});
+export async function arbiterApply(input) {
+    const repoOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    const res = await request('arbiter', 'apply', {
+        repoOrigin,
+        repoPath: input.repoPath,
+        intentId: input.intentId,
+        overlaps: input.overlaps,
+        ...extractForkFields(input),
+    });
+    return res;
+}
+export const arbiterApplyTool = {
+    name: 'arbiter_apply',
+    description: 'Resolve live code overlaps and AUTO-APPLY the safe tier. Kawa judges → adversarially verifies → and, ' +
+        'for the trivial tier only (high-confidence single-range merge that passes verify), writes the merge to ' +
+        'your worktree, records a decision, and republishes. Writes happen ONLY in an agent-owned worktree (a ' +
+        'linked git worktree); on a human checkout — or when a peer holds the file-set lock — it behaves like ' +
+        'arbiter_resolve (suggest-only, no writes). Returns per-overlap outcomes { tier, applied, announcement, ' +
+        'verifyIssue?, verdict }. Call it when you are ready to incorporate the result, then RE-READ any file it ' +
+        'applied to (it changed on disk). For surfaced (not-applied) overlaps, use get_resolution_context to see ' +
+        'the peer code and resolve manually.',
+    inputSchema: arbiterApplySchema,
+    handler: arbiterApply,
+};
+//# sourceMappingURL=arbiter-apply.js.map

package/build/tools/arbiter-apply.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arbiter-apply.js","sourceRoot":"","sources":["../../src/tools/arbiter-apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,CAAC,iFAAiF,CAAC;IAC9F,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8CAA8C,CAAC;IAC7E,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SAC1B,QAAQ,CAAC,4EAA4E,CAAC;CAC1F,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAClE,UAAU,EAAE,CAAC;SACV,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6EAA6E,CAAC;IAC1F,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,iFAAiF,CAAC;IAC9F,QAAQ,EAAE,CAAC;SACR,KAAK,CAAC,aAAa,CAAC;SACpB,QAAQ,CAAC,8FAA8F,CAAC;IAC3G,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAIF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAwB;IACzD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE;QAC5C,UAAU;QACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,IAAI,EAAE,eAAe;IACrB,WAAW,EACT,uGAAuG;QACvG,yGAAyG;QACzG,uGAAuG;QACvG,uGAAuG;QACvG,yGAAyG;QACzG,0GAA0G;QAC1G,0GAA0G;QAC1G,qCAAqC;IACvC,WAAW,EAAE,kBAAkB;IAC/B,OAAO,EAAE,YAAY;CACtB,CAAA"}

package/build/tools/arbiter-resolve.d.ts

@@ -0,0 +1,132 @@
+import { z } from 'zod';
+export declare const arbiterResolveSchema: 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>;
+    repoPath: z.ZodString;
+    repoOrigin: z.ZodOptional<z.ZodString>;
+    intentId: z.ZodOptional<z.ZodString>;
+    overlaps: z.ZodArray<z.ZodObject<{
+        peerUid: z.ZodString;
+        filePath: z.ZodString;
+        ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+    }, "strip", z.ZodTypeAny, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }, {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }>, "many">;
+}, "strip", z.ZodTypeAny, {
+    repoPath: string;
+    overlaps: {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }[];
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    intentId?: string | undefined;
+}, {
+    repoPath: string;
+    overlaps: {
+        filePath: string;
+        peerUid: string;
+        ranges: number[][];
+    }[];
+    repoOrigin?: string | undefined;
+    forkAuthor?: {
+        platform: "github" | "gitlab";
+        user: string;
+        forkOrigin: string;
+    } | undefined;
+    workspaceId?: string | undefined;
+    intentId?: string | undefined;
+}>;
+export type ArbiterResolveInput = z.infer<typeof arbiterResolveSchema>;
+export declare function arbiterResolve(input: ArbiterResolveInput): Promise<any>;
+export declare const arbiterResolveTool: {
+    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>;
+        repoPath: z.ZodString;
+        repoOrigin: z.ZodOptional<z.ZodString>;
+        intentId: z.ZodOptional<z.ZodString>;
+        overlaps: z.ZodArray<z.ZodObject<{
+            peerUid: z.ZodString;
+            filePath: z.ZodString;
+            ranges: z.ZodArray<z.ZodArray<z.ZodNumber, "many">, "many">;
+        }, "strip", z.ZodTypeAny, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }, {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        repoPath: string;
+        overlaps: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }[];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }, {
+        repoPath: string;
+        overlaps: {
+            filePath: string;
+            peerUid: string;
+            ranges: number[][];
+        }[];
+        repoOrigin?: string | undefined;
+        forkAuthor?: {
+            platform: "github" | "gitlab";
+            user: string;
+            forkOrigin: string;
+        } | undefined;
+        workspaceId?: string | undefined;
+        intentId?: string | undefined;
+    }>;
+    handler: typeof arbiterResolve;
+};

package/build/tools/arbiter-resolve.js

@@ -0,0 +1,58 @@
+import { z } from 'zod';
+import { request } from '../services/muninn-ipc.js';
+import { resolveOrigin } from './resolve-origin.js';
+import { forkFieldsExtensions, extractForkFields } from './_fork-fields.js';
+/**
+ * arbiter_resolve — thin forwarder to Muninn `arbiter:resolve` (Arbiter v2).
+ * Suggest-only: judges live code overlaps with peers and returns verdicts; never
+ * writes. All decrypt + judgment lives in Muninn (zero-knowledge); this is a
+ * stateless adapter.
+ */
+const overlapSchema = z.object({
+    peerUid: z
+        .string()
+        .describe('The peer HAI whose live edits overlap — a collision `uid` from the Stop report.'),
+    filePath: z.string().describe('File with the overlap, relative to repoPath.'),
+    ranges: z
+        .array(z.array(z.number()))
+        .describe('Overlapping [start, end] line ranges (cSHA line space) from the collision.'),
+});
+export const arbiterResolveSchema = z.object({
+    repoPath: z.string().describe('Local path to the repository root'),
+    repoOrigin: z
+        .string()
+        .optional()
+        .describe('Git remote origin URL. Auto-detected from repoPath via git if not provided.'),
+    intentId: z
+        .string()
+        .optional()
+        .describe('Active intent ID (advisory). Auto-detected by Kawa Code when omitted.'),
+    overlaps: z
+        .array(overlapSchema)
+        .describe('The overlaps to judge — each { peerUid, filePath, ranges } from the Stop collision report.'),
+    ...forkFieldsExtensions,
+});
+export async function arbiterResolve(input) {
+    const repoOrigin = resolveOrigin(input.repoOrigin, input.repoPath);
+    const res = await request('arbiter', 'resolve', {
+        repoOrigin,
+        repoPath: input.repoPath,
+        intentId: input.intentId,
+        overlaps: input.overlaps,
+        ...extractForkFields(input),
+    });
+    return res;
+}
+export const arbiterResolveTool = {
+    name: 'arbiter_resolve',
+    description: 'Get Kawa Code\'s AI verdict for live code overlaps with peers — SUGGEST-ONLY, never writes. ' +
+        'For each overlap ({peerUid, filePath, ranges} from the Stop collision report), Kawa decrypts the ' +
+        "peer's version locally (zero-knowledge) and judges it compatible / auto_resolvable / conflict, with " +
+        'confidence, a perf/security risk read, and a tier (0 no-op · 1 trivially auto-appliable · 2 ' +
+        'draft-and-confirm · 3 conflict). Use it to understand a forming conflict before acting. For a ' +
+        'surfaced tier-2/3 overlap, call get_resolution_context to read the peer\'s actual code. To actually ' +
+        'apply the safe tier, use arbiter_apply.',
+    inputSchema: arbiterResolveSchema,
+    handler: arbiterResolve,
+};
+//# sourceMappingURL=arbiter-resolve.js.map

package/build/tools/arbiter-resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"arbiter-resolve.js","sourceRoot":"","sources":["../../src/tools/arbiter-resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,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;;;;;GAKG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,OAAO,EAAE,CAAC;SACP,MAAM,EAAE;SACR,QAAQ,CAAC,iFAAiF,CAAC;IAC9F,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,8CAA8C,CAAC;IAC7E,MAAM,EAAE,CAAC;SACN,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;SAC1B,QAAQ,CAAC,4EAA4E,CAAC;CAC1F,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAClE,UAAU,EAAE,CAAC;SACV,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,6EAA6E,CAAC;IAC1F,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,uEAAuE,CAAC;IACpF,QAAQ,EAAE,CAAC;SACR,KAAK,CAAC,aAAa,CAAC;SACpB,QAAQ,CAAC,4FAA4F,CAAC;IACzG,GAAG,oBAAoB;CACxB,CAAC,CAAA;AAIF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAA0B;IAC7D,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAA;IAClE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE;QAC9C,UAAU;QACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,iBAAiB,CAAC,KAAK,CAAC;KAC5B,CAAC,CAAA;IACF,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,IAAI,EAAE,iBAAiB;IACvB,WAAW,EACT,8FAA8F;QAC9F,mGAAmG;QACnG,sGAAsG;QACtG,8FAA8F;QAC9F,gGAAgG;QAChG,sGAAsG;QACtG,yCAAyC;IAC3C,WAAW,EAAE,oBAAoB;IACjC,OAAO,EAAE,cAAc;CACxB,CAAA"}

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

@@ -43,27 +43,36 @@ export interface IntentBlock {
     endLine: number;
     contentSnippet: string;
 }
+/**
+ * One entry in the repo's active set. Under the multi-active model many intents
+ * can be `status:active` at once (one focus per session/teammate); this is a
+ * lightweight summary for the orchestration view, distinct from the calling
+ * session's own `current` intent (the top-level `intent`).
+ */
+export interface ActiveIntentSummary {
+    id: string;
+    title: string;
+    status: string;
+    createdBy?: string;
+    author?: string;
+}
 export interface ActiveIntentResponse {
     hasActiveIntent: boolean;
+    /**
+     * The repo's full active set — every session/teammate's currently-active
+     * intent — for orchestration/awareness. Independent of `hasActiveIntent`,
+     * which reports only whether THIS session has a current focus.
+     */
+    activeIntents?: ActiveIntentSummary[];
     intent?: {
         id: string;
         title: string;
         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.
-         */
+        /** `active` — currently being worked on (default). Terminal states:
+         * committed/pushed/done/abandoned/superseded. */
         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[];

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

@@ -13,13 +13,24 @@ 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;
     if (!intent) {
-        return { hasActiveIntent: false };
+        return { hasActiveIntent: false, activeIntents };
     }
     return {
         hasActiveIntent: true,
+        activeIntents,
         intent: {
             id: intent.id || res.intentId || '',
             title: intent.title || '',
@@ -27,7 +38,6 @@ 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
@@ -38,8 +48,16 @@ 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 +65,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":"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;AAiDF,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,uEAAuE;IACvE,8EAA8E;IAC9E,MAAM,aAAa,GAA0B,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC3E,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,CAAC;YAClC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE;YACzB,KAAK,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;YACrB,MAAM,EAAE,EAAE,CAAC,MAAM,IAAI,QAAQ;YAC7B,SAAS,EAAE,EAAE,CAAC,SAAS,IAAI,SAAS;YACpC,MAAM,EAAE,EAAE,CAAC,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,MAAM,IAAI,SAAS;SACtD,CAAC,CAAC;QACL,CAAC,CAAC,EAAE,CAAA;IAEN,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;IACzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA;IAClD,CAAC;IAED,OAAO;QACL,eAAe,EAAE,IAAI;QACrB,aAAa;QACb,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;;;;;;;;;;;;;;;;;;;;;wEAqByD;IACtE,WAAW,EAAE,uBAAuB;IACpC,OAAO,EAAE,iBAAiB;CAC3B,CAAA"}

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,6 +48,7 @@ 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>;
 /**
@@ -65,6 +68,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;
@@ -114,6 +133,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 +166,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 +180,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 +194,7 @@ export declare const completeIntentTool: {
         intentId?: string | undefined;
         commitSha?: string | undefined;
         supersededBy?: string | undefined;
+        humanApproved?: boolean | undefined;
     }>;
     handler: typeof completeIntent;
 };