duocode 0.1.0

package/.env.example

@@ -0,0 +1,36 @@
+# ─── DuoCode Environment Configuration ───
+
+# Provider API Keys
+# Preferred: one OpenRouter key for multi-provider routing
+OPENROUTER_API_KEY=sk-or-...
+# Optional fallback provider keys
+OPENAI_API_KEY=sk-...
+ANTHROPIC_API_KEY=sk-ant-...
+
+# GitHub Integration
+GITHUB_TOKEN=ghp_...
+GITHUB_WEBHOOK_SECRET=your-webhook-secret-here
+
+# MCP Server Configuration
+# The GitHub MCP server command (used by duocode github sync)
+MCP_GITHUB_COMMAND=npx
+MCP_GITHUB_ARGS=-y,@modelcontextprotocol/server-github
+MCP_GITHUB_TIMEOUT_MS=15000
+
+# Webhook Server
+WEBHOOK_PORT=3000
+WEBHOOK_HOST=0.0.0.0
+
+# Testing
+# Set to "1" to enable smoke tests that require a real git repo
+DUOCODE_SMOKE_TEST=0
+# Set to "1" to enable MCP GitHub smoke connectivity checks
+DUOCODE_MCP_SMOKE=0
+SMOKE_GITHUB_OWNER=your-org
+SMOKE_GITHUB_REPO=your-repo
+
+# Database (optional; defaults configured in duocode.yaml)
+# DUOCODE_DB_PATH=.duocode/duocode.db
+
+# Budget Limits (optional)
+# DUOCODE_MAX_TOTAL_USD=100

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 duocode contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,52 @@
+# DuoCode
+
+DuoCode is a multi-agent coding orchestration CLI with AST ownership, negotiation, provider routing, and GitHub MCP integration.
+
+## Prerequisites
+- Node.js 20+
+- npm
+- Git
+
+## Quick Start
+```bash
+npm install
+npm run typecheck
+npm run build
+npm run test
+```
+
+## Environment
+Copy `.env.example` values into your shell or `.env`.
+
+Important variables:
+- `OPENAI_API_KEY`
+- `ANTHROPIC_API_KEY`
+- `GITHUB_TOKEN`
+- `GITHUB_WEBHOOK_SECRET`
+- `MCP_GITHUB_COMMAND`
+- `MCP_GITHUB_ARGS`
+- `MCP_GITHUB_TIMEOUT_MS`
+
+Smoke-test variables:
+- `DUOCODE_SMOKE_TEST=1`
+- `DUOCODE_MCP_SMOKE=1`
+- `SMOKE_GITHUB_OWNER=<owner>`
+- `SMOKE_GITHUB_REPO=<repo>`
+
+## Test Stack
+Run full local validation:
+```bash
+./scripts/test-e2e.sh
+```
+
+Run strict release gate (includes smoke requirements):
+```bash
+./scripts/release-gate.sh
+```
+
+## CLI Commands
+- `duocode init`
+- `duocode task create|list|show`
+- `duocode negotiation run|show`
+- `duocode github sync`
+- `duocode github webhook-serve`

package/dist/ast/context.d.ts

@@ -0,0 +1,16 @@
+import type Database from "better-sqlite3";
+export interface SharePairInput {
+    taskId: string;
+    filePath: string;
+    ownershipPaths: string[];
+    leftAgentId: string;
+    rightAgentId: string;
+    leftContext: string;
+    rightContext: string;
+}
+export declare class CrossAgentContextHub {
+    private readonly db;
+    constructor(db: Database.Database);
+    shareBetweenAgents(input: SharePairInput): void;
+    getContextForAgent(taskId: string, agentId: string, filePath: string): string[];
+}

package/dist/ast/context.js

@@ -0,0 +1,37 @@
+import { createSharedContext, listSharedContextForAgent, } from "../db/schema.js";
+function visibilityCsv(agents) {
+    const unique = [...new Set(agents.map((agent) => agent.trim()).filter(Boolean))];
+    return `,${unique.join(",")},`;
+}
+export class CrossAgentContextHub {
+    db;
+    constructor(db) {
+        this.db = db;
+    }
+    shareBetweenAgents(input) {
+        const sharedOwnership = input.ownershipPaths.length > 0
+            ? input.ownershipPaths.join(" | ")
+            : null;
+        createSharedContext(this.db, {
+            taskId: input.taskId,
+            filePath: input.filePath,
+            ownershipPath: sharedOwnership,
+            publisherAgentId: input.leftAgentId,
+            content: input.leftContext,
+            visibilityCsv: visibilityCsv([input.rightAgentId]),
+        });
+        createSharedContext(this.db, {
+            taskId: input.taskId,
+            filePath: input.filePath,
+            ownershipPath: sharedOwnership,
+            publisherAgentId: input.rightAgentId,
+            content: input.rightContext,
+            visibilityCsv: visibilityCsv([input.leftAgentId]),
+        });
+    }
+    getContextForAgent(taskId, agentId, filePath) {
+        const rows = listSharedContextForAgent(this.db, taskId, agentId, filePath);
+        return rows.map((row) => row.content);
+    }
+}
+//# sourceMappingURL=context.js.map

package/dist/ast/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/ast/context.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AAYzB,SAAS,aAAa,CAAC,MAAgB;IACrC,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACjF,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;AACjC,CAAC;AAED,MAAM,OAAO,oBAAoB;IACF;IAA7B,YAA6B,EAAqB;QAArB,OAAE,GAAF,EAAE,CAAmB;IAAG,CAAC;IAEtD,kBAAkB,CAAC,KAAqB;QACtC,MAAM,eAAe,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;YACrD,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;YAClC,CAAC,CAAC,IAAI,CAAC;QAET,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE;YAC3B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,aAAa,EAAE,eAAe;YAC9B,gBAAgB,EAAE,KAAK,CAAC,WAAW;YACnC,OAAO,EAAE,KAAK,CAAC,WAAW;YAC1B,aAAa,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SACnD,CAAC,CAAC;QAEH,mBAAmB,CAAC,IAAI,CAAC,EAAE,EAAE;YAC3B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,aAAa,EAAE,eAAe;YAC9B,gBAAgB,EAAE,KAAK,CAAC,YAAY;YACpC,OAAO,EAAE,KAAK,CAAC,YAAY;YAC3B,aAAa,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;SAClD,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,MAAc,EAAE,OAAe,EAAE,QAAgB;QAClE,MAAM,IAAI,GAAG,yBAAyB,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;CACF"}

package/dist/ast/diff.d.ts

@@ -0,0 +1,27 @@
+import { type SupportedLanguage } from "./parser.js";
+import { type OwnershipUnit } from "./ownership.js";
+export type AstChangeType = "added" | "removed" | "modified" | "unchanged";
+export interface AstOwnershipChange {
+    type: AstChangeType;
+    path: string;
+    before?: OwnershipUnit;
+    after?: OwnershipUnit;
+}
+export interface AstDiffResult {
+    language: SupportedLanguage;
+    filePath: string;
+    changes: AstOwnershipChange[];
+    summary: {
+        added: number;
+        removed: number;
+        modified: number;
+        unchanged: number;
+    };
+}
+export interface DiffAstParams {
+    language: SupportedLanguage;
+    filePath: string;
+    beforeSource: string;
+    afterSource: string;
+}
+export declare function diffAstOwnership(params: DiffAstParams): AstDiffResult;

package/dist/ast/diff.js

@@ -0,0 +1,44 @@
+import { MultiLanguageAstParser } from "./parser.js";
+import { createOwnershipSnapshot, ownershipMapByPath, } from "./ownership.js";
+export function diffAstOwnership(params) {
+    const parser = new MultiLanguageAstParser();
+    const before = createOwnershipSnapshot(parser.parseSource(params.language, params.beforeSource), params.filePath);
+    const after = createOwnershipSnapshot(parser.parseSource(params.language, params.afterSource), params.filePath);
+    const beforeByPath = ownershipMapByPath(before);
+    const afterByPath = ownershipMapByPath(after);
+    const allPaths = new Set([...beforeByPath.keys(), ...afterByPath.keys()]);
+    const changes = [];
+    for (const path of [...allPaths].sort()) {
+        const b = beforeByPath.get(path);
+        const a = afterByPath.get(path);
+        if (!b && a) {
+            changes.push({ type: "added", path, after: a });
+            continue;
+        }
+        if (b && !a) {
+            changes.push({ type: "removed", path, before: b });
+            continue;
+        }
+        if (b && a) {
+            if (b.hash === a.hash) {
+                changes.push({ type: "unchanged", path, before: b, after: a });
+            }
+            else {
+                changes.push({ type: "modified", path, before: b, after: a });
+            }
+        }
+    }
+    const summary = {
+        added: changes.filter((change) => change.type === "added").length,
+        removed: changes.filter((change) => change.type === "removed").length,
+        modified: changes.filter((change) => change.type === "modified").length,
+        unchanged: changes.filter((change) => change.type === "unchanged").length,
+    };
+    return {
+        language: params.language,
+        filePath: params.filePath,
+        changes,
+        summary,
+    };
+}
+//# sourceMappingURL=diff.js.map

package/dist/ast/diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/ast/diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAA0B,MAAM,aAAa,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,kBAAkB,GAEnB,MAAM,gBAAgB,CAAC;AA8BxB,MAAM,UAAU,gBAAgB,CAAC,MAAqB;IACpD,MAAM,MAAM,GAAG,IAAI,sBAAsB,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,uBAAuB,CACpC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,YAAY,CAAC,EACxD,MAAM,CAAC,QAAQ,CAChB,CAAC;IACF,MAAM,KAAK,GAAG,uBAAuB,CACnC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,EACvD,MAAM,CAAC,QAAQ,CAChB,CAAC;IAEF,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,EAAE,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAE1E,MAAM,OAAO,GAAyB,EAAE,CAAC;IAEzC,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAChD,SAAS;QACX,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YACnD,SAAS;QACX,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACjE,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,MAAM;QACjE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,MAAM;QACrE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,MAAM;QACvE,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,MAAM;KAC1E,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,OAAO;QACP,OAAO;KACR,CAAC;AACJ,CAAC"}

package/dist/ast/locks.d.ts

@@ -0,0 +1,47 @@
+export interface OwnershipLock {
+    key: string;
+    ownerId: string;
+    token: string;
+    acquiredAt: number;
+    expiresAt: number;
+    metadata?: Record<string, string>;
+}
+export interface AcquireLockRequest {
+    key: string;
+    ownerId: string;
+    ttlMs: number;
+    metadata?: Record<string, string>;
+    now?: number;
+}
+export interface RenewLockRequest {
+    key: string;
+    token: string;
+    ttlMs: number;
+    now?: number;
+}
+export interface ReleaseLockRequest {
+    key: string;
+    token: string;
+}
+export interface OwnershipLockStore {
+    get(key: string): Promise<OwnershipLock | null>;
+    set(lock: OwnershipLock): Promise<void>;
+    delete(key: string): Promise<void>;
+    list(): Promise<OwnershipLock[]>;
+}
+export declare class InMemoryOwnershipLockStore implements OwnershipLockStore {
+    private readonly locks;
+    get(key: string): Promise<OwnershipLock | null>;
+    set(lock: OwnershipLock): Promise<void>;
+    delete(key: string): Promise<void>;
+    list(): Promise<OwnershipLock[]>;
+}
+export declare class DistributedOwnershipLockManager {
+    private readonly store;
+    constructor(store: OwnershipLockStore);
+    acquire(request: AcquireLockRequest): Promise<OwnershipLock | null>;
+    renew(request: RenewLockRequest): Promise<OwnershipLock | null>;
+    release(request: ReleaseLockRequest): Promise<boolean>;
+    listActive(now?: number): Promise<OwnershipLock[]>;
+    clearExpired(now?: number): Promise<number>;
+}

package/dist/ast/locks.js

@@ -0,0 +1,88 @@
+export class InMemoryOwnershipLockStore {
+    locks = new Map();
+    async get(key) {
+        return this.locks.get(key) ?? null;
+    }
+    async set(lock) {
+        this.locks.set(lock.key, lock);
+    }
+    async delete(key) {
+        this.locks.delete(key);
+    }
+    async list() {
+        return [...this.locks.values()];
+    }
+}
+function makeToken() {
+    return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
+}
+export class DistributedOwnershipLockManager {
+    store;
+    constructor(store) {
+        this.store = store;
+    }
+    async acquire(request) {
+        const now = request.now ?? Date.now();
+        const existing = await this.store.get(request.key);
+        if (existing && existing.expiresAt > now) {
+            return null;
+        }
+        const lock = {
+            key: request.key,
+            ownerId: request.ownerId,
+            token: makeToken(),
+            acquiredAt: now,
+            expiresAt: now + request.ttlMs,
+            metadata: request.metadata,
+        };
+        await this.store.set(lock);
+        return lock;
+    }
+    async renew(request) {
+        const now = request.now ?? Date.now();
+        const existing = await this.store.get(request.key);
+        if (!existing) {
+            return null;
+        }
+        if (existing.token !== request.token) {
+            return null;
+        }
+        if (existing.expiresAt <= now) {
+            await this.store.delete(request.key);
+            return null;
+        }
+        const renewed = {
+            ...existing,
+            expiresAt: now + request.ttlMs,
+        };
+        await this.store.set(renewed);
+        return renewed;
+    }
+    async release(request) {
+        const existing = await this.store.get(request.key);
+        if (!existing) {
+            return false;
+        }
+        if (existing.token !== request.token) {
+            return false;
+        }
+        await this.store.delete(request.key);
+        return true;
+    }
+    async listActive(now = Date.now()) {
+        const locks = await this.store.list();
+        return locks.filter((lock) => lock.expiresAt > now);
+    }
+    async clearExpired(now = Date.now()) {
+        const locks = await this.store.list();
+        let cleared = 0;
+        for (const lock of locks) {
+            if (lock.expiresAt <= now) {
+                await this.store.delete(lock.key);
+                cleared += 1;
+            }
+        }
+        return cleared;
+    }
+}
+//# sourceMappingURL=locks.js.map

package/dist/ast/locks.js.map

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

package/dist/ast/merge.d.ts

@@ -0,0 +1,22 @@
+import { type SupportedLanguage } from "./parser.js";
+import { type OwnershipUnit } from "./ownership.js";
+export interface MergeConflict {
+    path: string;
+    reason: string;
+    base?: OwnershipUnit;
+    left?: OwnershipUnit;
+    right?: OwnershipUnit;
+}
+export interface AstMergeResult {
+    mergedSource: string;
+    conflicts: MergeConflict[];
+    appliedChanges: string[];
+}
+export interface MergeAstParams {
+    language: SupportedLanguage;
+    filePath: string;
+    baseSource: string;
+    leftSource: string;
+    rightSource: string;
+}
+export declare function mergeAstThreeWay(params: MergeAstParams): AstMergeResult;

package/dist/ast/merge.js

@@ -0,0 +1,120 @@
+import { MultiLanguageAstParser } from "./parser.js";
+import { createOwnershipSnapshot, ownershipMapByPath, } from "./ownership.js";
+function isSame(a, b) {
+    if (!a && !b) {
+        return true;
+    }
+    if (!a || !b) {
+        return false;
+    }
+    return a.hash === b.hash;
+}
+function changedFromBase(base, candidate) {
+    return !isSame(base, candidate);
+}
+function applyTextEdits(baseSource, edits) {
+    const ordered = [...edits].sort((a, b) => b.start - a.start);
+    let output = baseSource;
+    for (const edit of ordered) {
+        output = `${output.slice(0, edit.start)}${edit.text}${output.slice(edit.end)}`;
+    }
+    return output;
+}
+export function mergeAstThreeWay(params) {
+    const parser = new MultiLanguageAstParser();
+    const base = createOwnershipSnapshot(parser.parseSource(params.language, params.baseSource), params.filePath);
+    const left = createOwnershipSnapshot(parser.parseSource(params.language, params.leftSource), params.filePath);
+    const right = createOwnershipSnapshot(parser.parseSource(params.language, params.rightSource), params.filePath);
+    const baseByPath = ownershipMapByPath(base);
+    const leftByPath = ownershipMapByPath(left);
+    const rightByPath = ownershipMapByPath(right);
+    const allPaths = [...new Set([
+            ...baseByPath.keys(),
+            ...leftByPath.keys(),
+            ...rightByPath.keys(),
+        ])].sort();
+    const edits = [];
+    const appendBlocks = [];
+    const conflicts = [];
+    const appliedChanges = [];
+    for (const path of allPaths) {
+        const b = baseByPath.get(path);
+        const l = leftByPath.get(path);
+        const r = rightByPath.get(path);
+        const leftChanged = changedFromBase(b, l);
+        const rightChanged = changedFromBase(b, r);
+        if (!leftChanged && !rightChanged) {
+            continue;
+        }
+        if (leftChanged && !rightChanged) {
+            if (b && !l) {
+                edits.push({ start: b.range.startIndex, end: b.range.endIndex, text: "", path });
+                appliedChanges.push(`${path}: removed (left)`);
+                continue;
+            }
+            if (!b && l) {
+                appendBlocks.push(l.text);
+                appliedChanges.push(`${path}: added (left)`);
+                continue;
+            }
+            if (b && l) {
+                edits.push({ start: b.range.startIndex, end: b.range.endIndex, text: l.text, path });
+                appliedChanges.push(`${path}: modified (left)`);
+                continue;
+            }
+        }
+        if (!leftChanged && rightChanged) {
+            if (b && !r) {
+                edits.push({ start: b.range.startIndex, end: b.range.endIndex, text: "", path });
+                appliedChanges.push(`${path}: removed (right)`);
+                continue;
+            }
+            if (!b && r) {
+                appendBlocks.push(r.text);
+                appliedChanges.push(`${path}: added (right)`);
+                continue;
+            }
+            if (b && r) {
+                edits.push({ start: b.range.startIndex, end: b.range.endIndex, text: r.text, path });
+                appliedChanges.push(`${path}: modified (right)`);
+                continue;
+            }
+        }
+        // Both sides changed from base.
+        if (isSame(l, r)) {
+            if (b && !l) {
+                edits.push({ start: b.range.startIndex, end: b.range.endIndex, text: "", path });
+                appliedChanges.push(`${path}: removed (both)`);
+                continue;
+            }
+            if (!b && l) {
+                appendBlocks.push(l.text);
+                appliedChanges.push(`${path}: added (both)`);
+                continue;
+            }
+            if (b && l) {
+                edits.push({ start: b.range.startIndex, end: b.range.endIndex, text: l.text, path });
+                appliedChanges.push(`${path}: modified (both)`);
+                continue;
+            }
+        }
+        conflicts.push({
+            path,
+            reason: "Both sides changed this ownership node differently",
+            base: b,
+            left: l,
+            right: r,
+        });
+    }
+    let mergedSource = applyTextEdits(params.baseSource, edits);
+    if (appendBlocks.length > 0) {
+        const suffix = appendBlocks.join("\n\n");
+        mergedSource = mergedSource.trimEnd() + "\n\n" + suffix + "\n";
+    }
+    return {
+        mergedSource,
+        conflicts,
+        appliedChanges,
+    };
+}
+//# sourceMappingURL=merge.js.map

package/dist/ast/merge.js.map

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

package/dist/ast/ownership.d.ts

@@ -0,0 +1,31 @@
+import { type AstParseResult, type SupportedLanguage } from "./parser.js";
+export interface OwnershipRange {
+    startIndex: number;
+    endIndex: number;
+    startLine: number;
+    startColumn: number;
+    endLine: number;
+    endColumn: number;
+}
+export interface OwnershipUnit {
+    id: string;
+    language: SupportedLanguage;
+    filePath: string;
+    nodeType: string;
+    name: string;
+    path: string;
+    parentPath: string | null;
+    range: OwnershipRange;
+    hash: string;
+    text: string;
+}
+export interface OwnershipSnapshot {
+    language: SupportedLanguage;
+    filePath: string;
+    units: OwnershipUnit[];
+}
+export declare function extractOwnershipUnits(parseResult: AstParseResult, filePath: string): OwnershipUnit[];
+export declare function createOwnershipSnapshot(parseResult: AstParseResult, filePath: string): OwnershipSnapshot;
+export declare function serializeOwnershipSnapshot(snapshot: OwnershipSnapshot): string;
+export declare function deserializeOwnershipSnapshot(serialized: string): OwnershipSnapshot;
+export declare function ownershipMapByPath(snapshot: OwnershipSnapshot): Map<string, OwnershipUnit>;